Refactor getting config sync params

LZRS · LZRS · commit ec39eb629b34 · 2024-05-21T16:32:02.000+03:00
diff --git a/android/dataclerk/src/main/java/org/dtree/fhircore/dataclerk/ui/home/HomeScreen.kt b/android/dataclerk/src/main/java/org/dtree/fhircore/dataclerk/ui/home/HomeScreen.kt
@@ -25,7 +25,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.BugReport
 import androidx.compose.material.icons.filled.Refresh
 import androidx.compose.material.icons.filled.Search
 import androidx.compose.material.icons.filled.Settings
diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDao.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDao.kt
@@ -16,6 +16,7 @@
 
 package org.smartregister.fhircore.engine.data.local.register.dao
 
+import ca.uhn.fhir.rest.gclient.DateClientParam
 import com.google.android.fhir.FhirEngine
 import com.google.android.fhir.logicalId
 import com.google.android.fhir.search.Operation
@@ -97,11 +98,10 @@ constructor(
     val patients =
       fhirEngine.search<Patient> {
         filter(Patient.ACTIVE, { value = of(true) })
-        sort(Patient.NAME, Order.ASCENDING)
-        count =
-          if (loadAll) {
-            countRegisterData(appFeatureName).toInt()
-          } else PaginationConstant.DEFAULT_PAGE_SIZE
+        sort(DateClientParam("_lastUpdated"), Order.DESCENDING)
+        if (!loadAll) {
+          count = PaginationConstant.DEFAULT_PAGE_SIZE
+        }
         from = currentPage * PaginationConstant.DEFAULT_PAGE_SIZE
       }
 
@@ -128,7 +128,7 @@ constructor(
         )
         filter(Patient.IDENTIFIER, { value = of(Identifier().apply { value = nameQuery }) })
         operation = Operation.OR
-        sort(Patient.NAME, Order.ASCENDING)
+        sort(DateClientParam("_lastUpdated"), Order.DESCENDING)
       }
 
     return patients
diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/sync/SyncListenerManager.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/sync/SyncListenerManager.kt
@@ -91,7 +91,7 @@ constructor(
   fun loadSyncParams(): Map<ResourceType, Map<String, String>> {
     val userInfo =
       sharedPreferencesHelper.read<UserClaimInfo>(SharedPreferenceKey.USER_CLAIM_INFO.name)
-    val pairs = mutableListOf<Pair<ResourceType, Map<String, String>>>()
+    val resourceTypeParamsMap = linkedMapOf<ResourceType, List<Pair<String, String>>>()
 
     val appConfig = configurationRegistry.getAppConfigs()
 
@@ -123,113 +123,99 @@ constructor(
         // ],..]
         sp.base.forEach { base ->
           val resourceType = ResourceType.fromCode(base)
-          val pair = pairs.find { it.first == resourceType }
-          if (pair == null) {
-            pairs.add(
-              Pair(
-                resourceType,
-                expressionValue?.let { mapOf(sp.code to expressionValue) } ?: mapOf(),
-              ),
-            )
-          } else {
-            expressionValue?.let {
-              // add another parameter if there is a matching resource type
-              // e.g. [(Patient, {organization=105})] to [(Patient, {organization=105, _count=100})]
-              val updatedPair = pair.second.toMutableMap().apply { put(sp.code, expressionValue) }
-              val index = pairs.indexOfFirst { it.first == resourceType }
-              resourceType.filterBasedOnPerResourceType(pairs)
-              pairs.set(index, Pair(resourceType, updatedPair))
+          expressionValue?.let { value ->
+            resourceTypeParamsMap.merge(resourceType, listOf(sp.code to value)) { list1, list2 ->
+              //                resourceType.filterBasedOnPerResourceType(this)
+              return@merge list1.toMutableList().apply { addAll(list2) }
             }
           }
         }
       }
 
-    val syncConfigParams = sharedPreferencesHelper.filterByResourceLocation(pairs)
-    Timber.i("SYNC CONFIG $syncConfigParams")
+    val filterByLocationParams =
+      sharedPreferencesHelper.filterByResourceLocation(resourceTypeParamsMap)
+    val filterBasedResourceParams =
+      resourceTypeParamsMap
+        .map {
+          val resourceType = it.key
+          val map = linkedMapOf<String, String>()
+          resourceType.filterBasedOnPerResourceType(map)
+          resourceType to map
+        }
+        .toMap()
+
+    val syncConfigParams =
+      resourceTypeParamsMap
+        //        .filter { it.key == ResourceType.Patient }
+        .map {
+          val resourceType = it.key
+          val paramsMap = linkedMapOf<String, String>("_total" to "none")
+          paramsMap.putAll(filterBasedResourceParams.getOrDefault(resourceType, emptyMap()))
+          paramsMap.putAll(filterByLocationParams.getOrDefault(resourceType, emptyList()))
+          paramsMap.putAll(it.value)
+          resourceType to paramsMap
+        }
+        .toMap()
+
+    val orderedSyncConfigParams =
+      linkedMapOf<ResourceType, Map<String, String>>().apply {
+        put(ResourceType.Binary, syncConfigParams.getOrDefault(ResourceType.Binary, emptyMap()))
+        put(
+          ResourceType.StructureMap,
+          syncConfigParams.getOrDefault(ResourceType.StructureMap, emptyMap())
+        )
+        put(
+          ResourceType.Questionnaire,
+          syncConfigParams.getOrDefault(ResourceType.Questionnaire, emptyMap())
+        )
+        putAll(syncConfigParams)
+      }
 
-    return mapOf(*syncConfigParams.toTypedArray())
+    Timber.i("SYNC CONFIG $orderedSyncConfigParams")
+    return orderedSyncConfigParams
   }
 }
 
 private fun ResourceType.filterBasedOnPerResourceType(
-  pairs: MutableList<Pair<ResourceType, Map<String, String>>>,
-) =
+  resourceTypePair: MutableMap<String, String>,
+) {
   when (this) {
-    ResourceType.RelatedPerson ->
-      pairs.addParam(resourceType = this, param = RelatedPerson.SP_ACTIVE, value = true.toString())
-    ResourceType.Patient ->
-      pairs.addParam(resourceType = this, param = Patient.SP_ACTIVE, value = true.toString())
-
-    //    ResourceType.CarePlan ->
-    //      pairs.addParam(
-    //        resourceType = this,
-    //        param = CarePlan.SP_STATUS,
-    //        value = CarePlan.CarePlanStatus.ACTIVE.toString().lowercase(),
-    //      )
-
-    ResourceType.Observation ->
-      pairs.addParam(
-        resourceType = this,
-        param = Observation.SP_STATUS,
-        value = Observation.ObservationStatus.FINAL.toString().lowercase(),
-      )
-
-    //    ResourceType.Task ->
-    //      pairs.addParam(
-    //        resourceType = this,
-    //        param = Task.SP_STATUS,
-    //        value =
-    //          String.format(
-    //            "%s,%s",
-    //            Task.TaskStatus.FAILED.toString().lowercase(),
-    //            Task.TaskStatus.INPROGRESS.toString().lowercase()
-    //          )
-    //      )
-
+    ResourceType.RelatedPerson -> resourceTypePair[RelatedPerson.SP_ACTIVE] = true.toString()
+    ResourceType.Patient -> resourceTypePair[Patient.SP_ACTIVE] = true.toString()
     ResourceType.Appointment ->
-      pairs.addParam(
-        resourceType = this,
-        param = Appointment.SP_STATUS,
-        value = Appointment.AppointmentStatus.BOOKED.toString().lowercase(),
-      )
+      resourceTypePair[Appointment.SP_STATUS] =
+        Appointment.AppointmentStatus.BOOKED.toString().lowercase()
     ResourceType.Encounter ->
-      pairs.addParam(
-        resourceType = this,
-        param = Encounter.SP_STATUS,
-        value = Encounter.EncounterStatus.INPROGRESS.toString().lowercase(),
-      )
+      resourceTypePair[Encounter.SP_STATUS] =
+        Encounter.EncounterStatus.INPROGRESS.toString().lowercase()
     ResourceType.List ->
-      pairs.addParam(
-        resourceType = this,
-        param = ListResource.SP_STATUS,
-        value = ListResource.ListStatus.CURRENT.toString().lowercase(),
-      )
+      resourceTypePair[ListResource.SP_STATUS] =
+        ListResource.ListStatus.CURRENT.toString().lowercase()
+    ResourceType.Observation ->
+      resourceTypePair[Observation.SP_STATUS] =
+        Observation.ObservationStatus.FINAL.toString().lowercase()
+    //    ResourceType.CarePlan -> resourceTypePair.put(CarePlan.SP_STATUS,
+    // CarePlan.CarePlanStatus.ACTIVE.toString().lowercase())
+    //    ResourceType.Task -> resourceTypePair.put(Task.SP_STATUS, String.format("%s,%s",
+    // Task.TaskStatus.FAILED.toString().lowercase(),
+    // Task.TaskStatus.INPROGRESS.toString().lowercase()))
     else -> Unit
   }
+}
 
 private fun SharedPreferencesHelper.filterByResourceLocation(
-  pairs: MutableList<Pair<ResourceType, Map<String, String>>>,
-): MutableList<Pair<ResourceType, Map<String, String>>> {
-  val resourcesTemp = mutableListOf<Pair<ResourceType, Map<String, String>>>()
-  val results = mutableListOf<Pair<ResourceType, Map<String, String>>>()
-  resourcesTemp.addAll(pairs)
-
+  resourceTypePairsMap: Map<ResourceType, List<Pair<String, String>>>,
+): Map<ResourceType, List<Pair<String, String>>> {
   val organisationSystem = context.getString(R.string.sync_strategy_organization_system)
   val organisationTag = "$organisationSystem|${organisationCode()}"
 
-  resourcesTemp.forEach {
-    val resourceType = it.first
-    if (
-      resourceType != ResourceType.Practitioner &&
-        resourceType != ResourceType.Questionnaire &&
-        resourceType != ResourceType.StructureMap
-    ) {
-      val tags = mutableMapOf("_tag" to organisationTag)
-      it.second.entries.forEach { entry -> tags[entry.key] = entry.value }
-      results.add(Pair(resourceType, tags))
-    } else results.add(it)
-  }
-  return results
+  return resourceTypePairsMap
+    .filter {
+      it.key !in
+        arrayOf(ResourceType.Practitioner, ResourceType.Questionnaire, ResourceType.StructureMap)
+    }
+    .map { it.key to listOf("_tag" to organisationTag) }
+    .toMap()
 }
 
 private fun MutableList<Pair<ResourceType, Map<String, String>>>.addParam(
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/models/ProfileViewData.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/shared/models/ProfileViewData.kt
@@ -27,7 +27,6 @@ import org.hl7.fhir.r4.model.Task
 import org.smartregister.fhircore.engine.data.domain.Guardian
 import org.smartregister.fhircore.engine.domain.model.FormButtonData
 import org.smartregister.fhircore.engine.domain.model.TracingAttempt
-import org.smartregister.fhircore.engine.util.extension.extractedTracingCategoryIsPhone
 import org.smartregister.fhircore.quest.ui.family.profile.model.FamilyMemberViewState
 
 sealed class ProfileViewData(
