Added the performer and organization info for consent resource along … (

#3230) * Added the performer and organization info for consent resource along with unit tests (#3227) * Refactor implementation Signed-off-by: Elly Kitoto <[email protected]> --------- Signed-off-by: Elly Kitoto <[email protected]> Co-authored-by: Elly Kitoto <[email protected]>
opensrp · Jul 18, 2024 · 9ef20df · 9ef20df
1 parent 83595aa
commit 9ef20df
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/...ngine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt b/...ngine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt
@@ -38,6 +38,7 @@ import org.hl7.fhir.r4.model.CodeableConcept
 import org.hl7.fhir.r4.model.Coding
 import org.hl7.fhir.r4.model.Composition
 import org.hl7.fhir.r4.model.Condition
+import org.hl7.fhir.r4.model.Consent
 import org.hl7.fhir.r4.model.Encounter
 import org.hl7.fhir.r4.model.Enumerations
 import org.hl7.fhir.r4.model.Extension
@@ -298,6 +299,7 @@ fun Resource.appendOrganizationInfo(authenticatedOrganizationIds: List<String>?)
         is Group -> managingEntity = updateReference(managingEntity, organizationRef)
         is Encounter -> serviceProvider = updateReference(serviceProvider, organizationRef)
         is Location -> managingOrganization = updateReference(managingOrganization, organizationRef)
+        is Consent -> organization = updateReferenceList(organization, organizationRef)
         else -> {}
       }
     }
@@ -330,6 +332,7 @@ fun Resource.appendPractitionerInfo(practitionerId: String?) {
           } else {
             participant
           }
+      is Consent -> performer = updateReferenceList(performer, practitionerRef)
       else -> {}
     }
   }
@@ -368,6 +371,14 @@ fun Resource.appendRelatedEntityLocation(
     }
 }
 
+private fun updateReferenceList(
+  oldReferenceList: List<Reference>?,
+  newReference: Reference,
+): List<Reference> {
+  val list = oldReferenceList?.filter { !it.reference.isNullOrEmpty() }
+  return if (!list.isNullOrEmpty()) list else listOf(newReference)
+}
+
 private fun updateReference(oldReference: Reference?, newReference: Reference): Reference =
   if (oldReference == null || oldReference.reference.isNullOrEmpty()) {
     newReference

diff --git a/...e/src/test/java/org/smartregister/fhircore/engine/util/extension/ResourceExtensionTest.kt b/...e/src/test/java/org/smartregister/fhircore/engine/util/extension/ResourceExtensionTest.kt
@@ -39,6 +39,7 @@ import org.hl7.fhir.r4.model.BooleanType
 import org.hl7.fhir.r4.model.CodeableConcept
 import org.hl7.fhir.r4.model.Coding
 import org.hl7.fhir.r4.model.Condition
+import org.hl7.fhir.r4.model.Consent
 import org.hl7.fhir.r4.model.DateTimeType
 import org.hl7.fhir.r4.model.Encounter
 import org.hl7.fhir.r4.model.Enumerations
@@ -901,6 +902,13 @@ class ResourceExtensionTest : RobolectricTest() {
     Assert.assertEquals("Organization/12345", patient.managingOrganization.reference)
   }
 
+  @Test
+  fun `test Organization Info Appended on Consent Resource`() {
+    val consent = Consent().apply { this.id = "123456" }
+    consent.appendOrganizationInfo(listOf("Organization/12345"))
+    Assert.assertEquals("Organization/12345", consent.organization.first().reference)
+  }
+
   @Test
   fun `prepareQuestionsForEditing should set readOnly correctly when readOnlyLinkIds passed`() {
     val questionnaire = Questionnaire()

diff --git a/...test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModelTest.kt b/...test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModelTest.kt
@@ -53,6 +53,7 @@ import org.hl7.fhir.r4.model.BooleanType
 import org.hl7.fhir.r4.model.Bundle
 import org.hl7.fhir.r4.model.CodeableConcept
 import org.hl7.fhir.r4.model.Coding
+import org.hl7.fhir.r4.model.Consent
 import org.hl7.fhir.r4.model.DateType
 import org.hl7.fhir.r4.model.Encounter
 import org.hl7.fhir.r4.model.Enumerations
@@ -1248,6 +1249,13 @@ class QuestionnaireViewModelTest : RobolectricTest() {
     Assert.assertEquals("Practitioner/12345", flag.author.reference)
   }
 
+  @Test
+  fun testAddPractitionerInfoAppendedCorrectlyOnConsentResource() {
+    val consent = Consent().apply { this.id = "123456" }
+    consent.appendPractitionerInfo("12345")
+    Assert.assertEquals("Practitioner/12345", consent.performer.first().reference)
+  }
+
   @Test
   fun testSaveExtractedResourcesForEditedQuestionnaire() = runTest {
     val questionnaire = extractionQuestionnaire()