update

opensrp · sevenreup · Aug 1, 2023 · Apr 26, 2023 · May 26, 2023 · Jun 5, 2023
commit a4224b4de6dc6b9e6e1165675572454b8f6b5bb5
diff --git a/...ne/src/main/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistry.kt b/...ne/src/main/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistry.kt
@@ -17,25 +17,35 @@
 package org.smartregister.fhircore.engine.configuration
 
 import android.content.Context
+import com.google.android.fhir.FhirEngine
+import com.google.android.fhir.db.ResourceNotFoundException
+import com.google.android.fhir.get
+import com.google.android.fhir.logicalId
+import com.google.android.fhir.search.search
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.Json
 import org.hl7.fhir.r4.model.Binary
 import org.hl7.fhir.r4.model.Composition
+import org.hl7.fhir.r4.model.Identifier
+import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.ResourceType
 import org.smartregister.fhircore.engine.configuration.app.AppConfigClassification
 import org.smartregister.fhircore.engine.configuration.view.DataFiltersConfiguration
-import org.smartregister.fhircore.engine.data.local.DefaultRepository
 import org.smartregister.fhircore.engine.data.remote.fhir.resource.FhirResourceDataSource
 import org.smartregister.fhircore.engine.util.DispatcherProvider
 import org.smartregister.fhircore.engine.util.SharedPreferencesHelper
 import org.smartregister.fhircore.engine.util.extension.decodeJson
 import org.smartregister.fhircore.engine.util.extension.decodeResourceFromString
 import org.smartregister.fhircore.engine.util.extension.extractId
+import org.smartregister.fhircore.engine.util.extension.generateMissingId
+import org.smartregister.fhircore.engine.util.extension.updateFrom
+import org.smartregister.fhircore.engine.util.extension.updateLastUpdated
 import timber.log.Timber
 
 /**
@@ -50,10 +60,10 @@ class ConfigurationRegistry
 @Inject
 constructor(
   @ApplicationContext val context: Context,
+  val fhirEngine: FhirEngine,
   val fhirResourceDataSource: FhirResourceDataSource,
   val sharedPreferencesHelper: SharedPreferencesHelper,
-  val dispatcherProvider: DispatcherProvider,
-  val repository: DefaultRepository
+  val dispatcherProvider: DispatcherProvider
 ) {
 
   val configurationsMap = mutableMapOf<String, Configuration>()
@@ -124,8 +134,7 @@ constructor(
   suspend fun loadConfigurations(appId: String, configsLoadedCallback: (Boolean) -> Unit) {
     this.appId = appId
 
-    repository
-      .searchCompositionByIdentifier(appId)
+    searchCompositionByIdentifier(appId)
       .also { if (it == null) configsLoadedCallback(false) }
       ?.section
       ?.filter { isWorkflowPoint(it) }
@@ -135,7 +144,7 @@ constructor(
           WorkflowPoint(
             classification = it.focus.identifier.value,
             description = it.title,
-            resource = repository.getBinary(it.focus.extractId()),
+            resource = getBinary(it.focus.extractId()),
             workflowPoint = it.focus.identifier.value
           )
         workflowPointsMap[workflowPointName] = workflowPoint
@@ -207,8 +216,8 @@ constructor(
     CoroutineScope(ioDispatcher).launch {
       try {
         Timber.i("Fetching non-workflow resources for app $appId")
-        repository
-          .searchCompositionByIdentifier(appId)
+
+        searchCompositionByIdentifier(appId)
           ?.section
           ?.groupBy { it.focus.reference?.split(TYPE_REFERENCE_DELIMITER)?.get(0) ?: "" }
           ?.entries
@@ -221,9 +230,7 @@ constructor(
                 sectionComponent.focus.extractId()
               }
             val searchPath = resourceGroup.key + "?${Composition.SP_RES_ID}=$resourceIds"
-            fhirResourceDataSource.loadData(searchPath).entry.forEach {
-              repository.addOrUpdate(false, it.resource)
-            }
+            fhirResourceDataSource.loadData(searchPath).entry.forEach { addOrUpdate(it.resource) }
           }
       } catch (exception: Exception) {
         Timber.e("Error fetching non-workflow resources for app $appId")
@@ -242,6 +249,45 @@ constructor(
     }
   }
 
+  suspend fun searchCompositionByIdentifier(identifier: String): Composition? =
+    fhirEngine
+      .search<Composition> {
+        filter(Composition.IDENTIFIER, { value = of(Identifier().apply { value = identifier }) })
+      }
+      .firstOrNull()
+
+  suspend fun getBinary(id: String): Binary = fhirEngine.get(id)
+
+  /**
+   * Using this [FhirEngine] and [DispatcherProvider], update this stored resources with the passed
+   * resource, or create it if not found.
+   */
+  suspend fun <R : Resource> addOrUpdate(resource: R) {
+    withContext(dispatcherProvider.io()) {
+      resource.updateLastUpdated()
+      try {
+        fhirEngine.get(resource.resourceType, resource.logicalId).run {
+          fhirEngine.update(updateFrom(resource))
+        }
+      } catch (resourceNotFoundException: ResourceNotFoundException) {
+        create(resource)
+      }
+    }
+  }
+
+  /**
+   * Using this [FhirEngine] and [DispatcherProvider], for all passed resources, make sure they all
+   * have IDs or generate if they don't, then pass them to create.
+   *
+   * @param resources vararg of resources
+   */
+  suspend fun create(vararg resources: Resource): List<String> {
+    return withContext(dispatcherProvider.io()) {
+      resources.onEach { it.generateMissingId() }
+      fhirEngine.create(*resources)
+    }
+  }
+
   companion object {
     const val DEFAULT_APP_ID = "appId"
     const val BASE_CONFIG_PATH = "configs/$DEFAULT_APP_ID"

diff --git a/...id/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt b/...id/engine/src/main/java/org/smartregister/fhircore/engine/data/local/DefaultRepository.kt
@@ -63,11 +63,11 @@ import org.smartregister.fhircore.engine.util.extension.updateLastUpdated
 open class DefaultRepository
 @Inject
 constructor(
-        open val fhirEngine: FhirEngine,
-        open val dispatcherProvider: DispatcherProvider,
-        open val sharedPreferencesHelper: SharedPreferencesHelper,
-        open val configurationRegistry: ConfigurationRegistry,
-        open val configService: ConfigService
+  open val fhirEngine: FhirEngine,
+  open val dispatcherProvider: DispatcherProvider,
+  open val sharedPreferencesHelper: SharedPreferencesHelper,
+  open val configurationRegistry: ConfigurationRegistry,
+  open val configService: ConfigService
 ) {
 
   suspend inline fun <reified T : Resource> loadResource(resourceId: String): T? {

diff --git a/.../main/java/org/smartregister/fhircore/engine/data/local/register/AppRegisterRepository.kt b/.../main/java/org/smartregister/fhircore/engine/data/local/register/AppRegisterRepository.kt
@@ -38,22 +38,22 @@ import org.smartregister.fhircore.engine.util.SharedPreferencesHelper
 class AppRegisterRepository
 @Inject
 constructor(
-        override val fhirEngine: FhirEngine,
-        override val dispatcherProvider: DefaultDispatcherProvider,
-        override val sharedPreferencesHelper: SharedPreferencesHelper,
-        override val configurationRegistry: ConfigurationRegistry,
-        val registerDaoFactory: RegisterDaoFactory,
-        override val configService: ConfigService,
-        val tracer: PerformanceReporter
+  override val fhirEngine: FhirEngine,
+  override val dispatcherProvider: DefaultDispatcherProvider,
+  override val sharedPreferencesHelper: SharedPreferencesHelper,
+  override val configurationRegistry: ConfigurationRegistry,
+  val registerDaoFactory: RegisterDaoFactory,
+  override val configService: ConfigService,
+  val tracer: PerformanceReporter
 ) :
   RegisterRepository,
-        DefaultRepository(
-                fhirEngine = fhirEngine,
-                dispatcherProvider = dispatcherProvider,
-                sharedPreferencesHelper = sharedPreferencesHelper,
-                configurationRegistry = configurationRegistry,
-                configService = configService
-        ) {
+  DefaultRepository(
+    fhirEngine = fhirEngine,
+    dispatcherProvider = dispatcherProvider,
+    sharedPreferencesHelper = sharedPreferencesHelper,
+    configurationRegistry = configurationRegistry,
+    configService = configService
+  ) {
 
   override suspend fun loadRegisterData(
     currentPage: Int,

diff --git a/.../main/java/org/smartregister/fhircore/engine/data/local/register/dao/FamilyRegisterDao.kt b/.../main/java/org/smartregister/fhircore/engine/data/local/register/dao/FamilyRegisterDao.kt
@@ -213,15 +213,15 @@ constructor(
           family.member.map { member ->
             defaultRepository.loadResource<Patient>(member.entity.extractId())?.let { patient ->
               patient.active = false
-              defaultRepository.addOrUpdate(true,patient)
+              defaultRepository.addOrUpdate(true, patient)
             }
           }
         }
       }
       family.member.clear()
       family.active = false
 
-      defaultRepository.addOrUpdate(true,family)
+      defaultRepository.addOrUpdate(true, family)
     }
   }
 
@@ -253,7 +253,7 @@ constructor(
             }
         }
       }
-      defaultRepository.addOrUpdate(true,patient)
+      defaultRepository.addOrUpdate(true, patient)
     }
   }
 

diff --git a/...src/main/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDao.kt b/...src/main/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDao.kt
@@ -371,7 +371,7 @@ constructor(
         if (!this.active) throw IllegalStateException("Patient already deleted")
         this.active = false
       }
-    defaultRepository.addOrUpdate(true,patient)
+    defaultRepository.addOrUpdate(true, patient)
   }
 
   suspend fun transformChildrenPatientToRegisterData(patients: List<Patient>): List<RegisterData> {

diff --git a/...rc/main/java/org/smartregister/fhircore/engine/ui/questionnaire/QuestionnaireViewModel.kt b/...rc/main/java/org/smartregister/fhircore/engine/ui/questionnaire/QuestionnaireViewModel.kt
@@ -257,7 +257,7 @@ constructor(
             reference = "${ResourceType.RelatedPerson.name}/${resource.logicalId}"
           }
       }
-      defaultRepository.addOrUpdate(true,this)
+      defaultRepository.addOrUpdate(true, this)
     }
   }
 
@@ -467,7 +467,7 @@ constructor(
       it.valueCodeableConcept.coding.forEach { questionnaireResponse.meta.addTag(it) }
     }
 
-    defaultRepository.addOrUpdate(true,questionnaireResponse)
+    defaultRepository.addOrUpdate(true, questionnaireResponse)
   }
 
   suspend fun performExtraction(
@@ -489,7 +489,7 @@ constructor(
 
   suspend fun saveBundleResources(bundle: Bundle) {
     if (!bundle.isEmpty) {
-      bundle.entry.forEach { defaultRepository.addOrUpdate(true,it.resource) }
+      bundle.entry.forEach { defaultRepository.addOrUpdate(true, it.resource) }
     }
   }
 

diff --git a/...ine/src/main/java/org/smartregister/fhircore/engine/util/extension/FhirEngineExtension.kt b/...ine/src/main/java/org/smartregister/fhircore/engine/util/extension/FhirEngineExtension.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Ona Systems, Inc
+ * Copyright 2021 Ona Systems, Inc
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

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
@@ -22,6 +22,7 @@ import ca.uhn.fhir.rest.gclient.ReferenceClientParam
 import com.google.android.fhir.datacapture.extensions.createQuestionnaireResponseItem
 import com.google.android.fhir.logicalId
 import java.util.Date
+import java.util.LinkedList
 import java.util.UUID
 import org.hl7.fhir.r4.model.Base
 import org.hl7.fhir.r4.model.BaseDateTimeType
@@ -48,7 +49,6 @@ import org.json.JSONObject
 import org.smartregister.fhircore.engine.data.local.DefaultRepository
 import org.smartregister.fhircore.engine.util.fhirpath.FhirPathDataExtractor
 import timber.log.Timber
-import java.util.LinkedList
 
 private val fhirR4JsonParser = FhirContext.forR4Cached().newJsonParser()