Configs Versioning

android/engine/src/main/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistry.kt

@@ -44,6 +44,7 @@
 import org.hl7.fhir.r4.model.Binary
 import org.hl7.fhir.r4.model.Bundle
 import org.hl7.fhir.r4.model.Composition
+import org.hl7.fhir.r4.model.ImplementationGuide
 import org.hl7.fhir.r4.model.ListResource
 import org.hl7.fhir.r4.model.MetadataResource
 import org.hl7.fhir.r4.model.Resource
@@ -404,7 +405,7 @@
     sharedPreferencesHelper.read(SharedPreferenceKey.APP_ID.name, null)?.let { appId ->
       val parsedAppId = appId.substringBefore(TYPE_REFERENCE_DELIMITER).trim()
       val patientRelatedResourceTypes = mutableListOf<ResourceType>()
-      val compositionResource = fetchRemoteComposition(parsedAppId)
+      val compositionResource = fetchRemoteCompositionByAppId(parsedAppId)
       compositionResource?.let { composition ->
         composition
           .retrieveCompositionSections()
@@ -451,11 +452,42 @@
     }
   }
 
-  suspend fun fetchRemoteComposition(appId: String?): Composition? {
-    Timber.i("Fetching configs for app $appId")
-    val urlPath =
-      "${ResourceType.Composition.name}?${Composition.SP_IDENTIFIER}=$appId&_count=$DEFAULT_COUNT"
+  suspend fun fetchRemoteImplementationGuide(
+    appId: String?,
+    version: String?,
+  ): ImplementationGuide? {
+    Timber.i("Fetching ImplementationGuide config for app $appId version $version")
 
+    val urlPath = "ImplementationGuide?url=ImplementationGuide/$appId&version=$version"
+    return fhirResourceDataSource.getResource(urlPath).entryFirstRep.let {
+      if (!it.hasResource()) {
+        Timber.w("No response for ImplementationGuide resource on path $urlPath")
+        return null
+      }
+
+      it.resource as ImplementationGuide
+    }
+  }
+
+  suspend fun fetchRemoteCompositionById(
+    id: String?,
+    version: String?,
+  ): Composition? {
+    Timber.i("Fetching Composition config id $id version $version")
+    val urlPath = "Composition/$id/_history/$version"
+    return fhirResourceDataSource.getResource(urlPath).entryFirstRep.let {
+      if (!it.hasResource()) {
+        Timber.w("No response for composition resource on path $urlPath")
+        return null
+      }
+
+      it.resource as Composition
+    }
+  }
+
+  suspend fun fetchRemoteCompositionByAppId(appId: String?): Composition? {
+    Timber.i("Fetching Composition config for app $appId")
+    val urlPath = "Composition?identifier=$appId&_count=$DEFAULT_COUNT"
     return fhirResourceDataSource.getResource(urlPath).entryFirstRep.let {
       if (!it.hasResource()) {
         Timber.w("No response for composition resource on path $urlPath")

android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/ResourceExtension.kt

@@ -44,6 +44,7 @@
 import org.hl7.fhir.r4.model.Group
 import org.hl7.fhir.r4.model.HumanName
 import org.hl7.fhir.r4.model.Immunization
+import org.hl7.fhir.r4.model.ImplementationGuide
 import org.hl7.fhir.r4.model.Location
 import org.hl7.fhir.r4.model.Observation
 import org.hl7.fhir.r4.model.Patient
@@ -382,6 +383,14 @@
   }
 }
 
+fun ImplementationGuide.retrieveImplementationGuideDefinitionResources():
+  List<ImplementationGuide.ImplementationGuideDefinitionResourceComponent> {
+  val resources =
+    mutableListOf<ImplementationGuide.ImplementationGuideDefinitionResourceComponent>()
+  this.definition.resource.forEach { resources.add(it) }
+  return resources
+}
+
 /**
  * Composition sections can be nested. This function retrieves all the nested composition sections
  * and returns a flattened list of all [Composition.SectionComponent] for the given [Composition]

android/engine/src/main/res/values/strings.xml

@@ -12,6 +12,7 @@
     <string name="app_logo">Application logo</string>
     <string name="powered_by">Powered By</string>
     <string name="app_version">App version %1$d(%2$s)</string>
+    <string name="ig_version">ImplementationGuide version %s</string>
     <string name="last_sync">Last sync %1$s</string>
     <string name="login_text">LOGIN</string>
     <string name="login_call_fail_error_message">Failed to verify credentials from the server. Check your internet connection</string>

android/engine/src/test/assets/configs/app/implementation_guide_config.json

@@ -0,0 +1,55 @@
+{
+  "resourceType": "ImplementationGuide",
+  "id": "12967310",
+  "url": "ImplementationGuide/quest",
+  "version": "1.1.0",
+  "name": "quest",
+  "title": "Quest Implementation Guide",
+  "status": "draft",
+  "packageId": "org.smartregister.fhircore",
+  "date": "2024-04-01",
+  "publisher": "Ona Systems, Inc.",
+  "fhirVersion": [
+    {
+      "code": {
+        "coding": [
+          {
+            "system": "http://hl7.org/fhir/FHIR-version",
+            "code": "4.3.0",
+            "display": "4.3.0"
+          }
+        ],
+        "text": "FHIR Release 4B."
+      }
+    }
+  ],
+  "useContext": {
+    "code": {
+      "coding": [
+        {
+          "system": "http://terminology.hl7.org/CodeSystem/usage-context-type",
+          "code": "program",
+          "display": "Program"
+        }
+      ],
+      "text": "Program"
+    },
+    "valueRange": {
+      "low": {
+        "value": 1
+      },
+      "high": {
+        "value": 10
+      }
+    }
+  },
+  "definition": {
+    "resource": [
+      {
+        "reference": {
+          "reference": "Composition/8294"
+        }
+      }
+    ]
+  }
+}

android/gradle.properties

@@ -22,4 +22,3 @@ android.defaults.buildfeatures.buildconfig=true
 android.suppressUnsupportedCompileSdk=34
 android.jetifier.ignorelist=jackson-core
 org.gradle.warning.mode=all
-android.suppressUnsupportedCompileSdk=34

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/appsetting/AppSettingViewModel.kt

@@ -53,6 +53,8 @@ import org.smartregister.fhircore.quest.ui.login.LoginActivity
 import retrofit2.HttpException
 import timber.log.Timber
 
+typealias QuestBuildConfig = org.smartregister.fhircore.quest.BuildConfig
+
 @HiltViewModel
 class AppSettingViewModel
 @Inject
@@ -93,20 +95,45 @@ constructor(
     if (!appId.isNullOrEmpty()) {
       when {
         hasDebugSuffix() -> loadConfigurations(context)
-        else -> fetchRemoteConfigurations(appId, context)
+        else -> fetchRemoteConfigurations(appId, QuestBuildConfig.VERSION_NAME.substringBefore("-"), context)
       }
     }
   }
 
-  private fun fetchRemoteConfigurations(appId: String?, context: Context) {
+  private fun fetchRemoteConfigurations(appId: String?, appVersion: String?, context: Context) {
     viewModelScope.launch {
       try {
         showProgressBar.postValue(true)
-        Timber.i("Fetching configs for app $appId")
-        val compositionResource =
-          withContext(dispatcherProvider.io()) {
-            configurationRegistry.fetchRemoteComposition(appId)
-          }
+
+        Timber.i("Fetching configs for app $appId version $appVersion")
+
+        var compositionResource: Composition? = null
+        try {
+          val implementationGuideResource =
+            configurationRegistry.fetchRemoteImplementationGuide(appId, appVersion)
+
+          compositionResource =
+            if (implementationGuideResource != null) {
+              configurationRegistry.addOrUpdate(implementationGuideResource)
+
+              val compositionReference =
+                implementationGuideResource.definition.resource[0].reference.reference
+
+              val compositionIdWithHistory = compositionReference?.substringAfter('/')
+              val compositionId = compositionIdWithHistory?.substringBefore('/')
+              val compositionVersion = compositionIdWithHistory?.substringAfterLast('/', "")
+
+              withContext(dispatcherProvider.io()) {
+                configurationRegistry.fetchRemoteCompositionById(compositionId, compositionVersion)
+              }
+            } else {
+              withContext(dispatcherProvider.io()) {
+                configurationRegistry.fetchRemoteCompositionByAppId(appId)
+              }
+            }
+        } catch (e: Exception) {
+          Timber.e(e)
+        }
 
         if (compositionResource == null) {
           showProgressBar.postValue(false)

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/usersetting/UserSettingScreen.kt

@@ -125,6 +125,7 @@
   allowP2PSync: Boolean,
   lastSyncTime: String?,
   showProgressIndicatorFlow: MutableStateFlow<Boolean>,
+  implementationGuideVersion: String? = null,
 ) {
   val context = LocalContext.current
   val (showProgressBar, messageResource) = progressBarState
@@ -380,6 +381,16 @@
           modifier = modifier.padding(top = 8.dp).align(Alignment.CenterHorizontally),
         )
 
+        if (implementationGuideVersion != null) {
+          Text(
+            color = contentColor,
+            fontSize = 16.sp,
+            text = stringResource(id = R.string.ig_version, implementationGuideVersion),
+            modifier =
+              modifier.padding(bottom = 12.dp, top = 2.dp).align(Alignment.CenterHorizontally),
+          )
+        }
+
         Text(
           color = contentColor,
           fontSize = 16.sp,
@@ -496,5 +507,6 @@
     allowP2PSync = true,
     lastSyncTime = "05:30 PM, Mar 3",
     showProgressIndicatorFlow = MutableStateFlow(false),
+    implementationGuideVersion = "10",
   )
 }

android/quest/src/test/java/org/smartregister/fhircore/quest/app/ConfigurationRegistryTest.kt

@@ -35,6 +35,7 @@ import kotlinx.coroutines.runBlocking
 import org.hl7.fhir.r4.model.Bundle
 import org.hl7.fhir.r4.model.Composition
 import org.hl7.fhir.r4.model.Identifier
+import org.hl7.fhir.r4.model.ImplementationGuide
 import org.hl7.fhir.r4.model.ListResource
 import org.hl7.fhir.r4.model.Reference
 import org.hl7.fhir.r4.model.StructureMap
@@ -101,6 +102,21 @@ class ConfigurationRegistryTest : RobolectricTest() {
 
   @Test
   fun testFetchNonWorkflowConfigurations() = runBlocking {
+    val implementationGuide =
+      ImplementationGuide().apply {
+        url = "ImplementationGuide/1"
+        name = "testImplementationGuide"
+        definition =
+          ImplementationGuide.ImplementationGuideDefinitionComponent().apply {
+            resource =
+              mutableListOf(
+                ImplementationGuide.ImplementationGuideDefinitionResourceComponent(
+                  Reference().apply { reference = "Composition/_history/12" },
+                ),
+              )
+          }
+      }
+
     val composition =
       Composition().apply {
         addSection().apply {
@@ -120,7 +136,10 @@ class ConfigurationRegistryTest : RobolectricTest() {
       }
 
     every { secureSharedPreference.retrieveSessionUsername() } returns "demo"
+    coEvery { configurationRegistry.fetchRemoteImplementationGuide(any()) } returns
+      implementationGuide
     coEvery { configurationRegistry.fetchRemoteComposition(any()) } returns composition
+    coEvery { configurationRegistry.fhirResourceDataSource.getResource(any()) } returns bundle
     coEvery { configurationRegistry.fhirResourceDataSource.post(any(), any()) } returns bundle
     every { sharedPreferencesHelper.read(SharedPreferenceKey.APP_ID.name, null) } returns "demo"
     coEvery { configurationRegistry.saveSyncSharedPreferences(any()) } just runs
@@ -131,6 +150,21 @@ class ConfigurationRegistryTest : RobolectricTest() {
 
   @Test
   fun testFetchListResourceNonProxy() = runBlocking {
+    val implementationGuide =
+      ImplementationGuide().apply {
+        url = "ImplementationGuide/1"
+        name = "testImplementationGuide"
+        definition =
+          ImplementationGuide.ImplementationGuideDefinitionComponent().apply {
+            resource =
+              mutableListOf(
+                ImplementationGuide.ImplementationGuideDefinitionResourceComponent(
+                  Reference().apply { reference = "Composition" },
+                ),
+              )
+          }
+      }
+
     val composition =
       Composition().apply {
         addSection().apply {
@@ -148,8 +182,10 @@ class ConfigurationRegistryTest : RobolectricTest() {
 
     configurationRegistry.setNonProxy(true)
     every { secureSharedPreference.retrieveSessionUsername() } returns "demo"
-    coEvery { configurationRegistry.fetchRemoteComposition(any()) } returns composition
-
+    coEvery { configurationRegistry.fetchRemoteImplementationGuide(any()) } returns
+      implementationGuide
+    coEvery { configurationRegistry.fetchRemoteCompositionWiByVersion(any(), any()) } returns
+      composition
     coEvery { configurationRegistry.fhirResourceDataSource.getResource(any()) } returns bundle
     every { sharedPreferencesHelper.read(SharedPreferenceKey.APP_ID.name, null) } returns "demo"
     coEvery { configurationRegistry.saveSyncSharedPreferences(any()) } just runs
@@ -162,6 +198,21 @@ class ConfigurationRegistryTest : RobolectricTest() {
 
   @Test
   fun testFetchListResource() = runBlocking {
+    val implementationGuide =
+      ImplementationGuide().apply {
+        url = "ImplementationGuide/1"
+        name = "testImplementationGuide"
+        definition =
+          ImplementationGuide.ImplementationGuideDefinitionComponent().apply {
+            resource =
+              mutableListOf(
+                ImplementationGuide.ImplementationGuideDefinitionResourceComponent(
+                  Reference().apply { reference = "Composition" },
+                ),
+              )
+          }
+      }
+
     val composition =
       Composition().apply {
         addSection().apply {
@@ -184,7 +235,10 @@ class ConfigurationRegistryTest : RobolectricTest() {
       }
 
     every { secureSharedPreference.retrieveSessionUsername() } returns "demo"
-    coEvery { configurationRegistry.fetchRemoteComposition(any()) } returns composition
+    coEvery { configurationRegistry.fetchRemoteImplementationGuide(any()) } returns
+      implementationGuide
+    coEvery { configurationRegistry.fetchRemoteCompositionWiByVersion(any(), any()) } returns
+      composition
     coEvery {
       fhirResourceService.getResourceWithGatewayModeHeader(
         ConfigurationRegistry.FHIR_GATEWAY_MODE_HEADER_VALUE,