opensrp · pld · Nov 19, 2024 · Aug 16, 2024 · Aug 23, 2024 · Aug 23, 2024
diff --git a/android/buildSrc/src/main/kotlin/BuildConfigs.kt b/android/buildSrc/src/main/kotlin/BuildConfigs.kt
@@ -3,7 +3,7 @@ object BuildConfigs {
     const val compileSdk = 34
     const val targetSdk = 34
     const val versionCode = 11
-    const val versionName = "2.0.0"
+    const val versionName = "2.0.0.2"
     const val applicationId = "org.smartregister.opensrp"
     const val jvmToolchain = 17
     const val kotlinCompilerExtensionVersion = "1.5.8"

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
@@ -247,6 +247,10 @@
     fhirEngine.update(resource)
   }
 
+  suspend fun applyDbTransaction(block: suspend () -> Unit) {
+    fhirEngine.withTransaction { block.invoke() }
+  }
+
   suspend fun loadManagingEntity(group: Group) =
     group.managingEntity?.let { reference ->
       fhirEngine

diff --git a/.../src/main/java/org/smartregister/fhircore/engine/data/remote/shared/TokenAuthenticator.kt b/.../src/main/java/org/smartregister/fhircore/engine/data/remote/shared/TokenAuthenticator.kt
@@ -40,6 +40,8 @@ import java.util.Base64
 import javax.inject.Inject
 import javax.inject.Singleton
 import javax.net.ssl.SSLHandshakeException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.smartregister.fhircore.engine.configuration.app.ConfigService
 import org.smartregister.fhircore.engine.data.remote.auth.OAuthService
@@ -215,8 +217,11 @@ constructor(
         addAccountExplicitly(newAccount, oAuthResponse.refreshToken, null)
         setAuthToken(newAccount, AUTH_TOKEN_TYPE, oAuthResponse.accessToken)
       }
+
       // Save credentials
-      secureSharedPreference.saveCredentials(username, password)
+      CoroutineScope(dispatcherProvider.io()).launch {
+        secureSharedPreference.saveCredentials(username, password)
+      }
     }
   }
 

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/datastore/ContentCache.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/datastore/ContentCache.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2021-2024 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.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.smartregister.fhircore.engine.datastore
+
+import androidx.collection.LruCache
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.hl7.fhir.r4.model.Resource
+import timber.log.Timber
+
+object ContentCache {
+  private val maxMemory: Int = (Runtime.getRuntime().maxMemory() / 1024).toInt()
+  private val cacheSize: Int = maxMemory / 8
+  private val cache = LruCache<String, Resource>(cacheSize)
+
+  @JvmStatic
+  suspend fun saveResource(resourceId: String, resource: Resource) =
+    withContext(Dispatchers.IO) {
+      cache.put("${resource::class.simpleName}/$resourceId", resource)
+      Timber.i("ContentCache:saveResource: $resourceId")
+    }
+
+  @JvmStatic
+  fun getResource(resourceId: String): Resource? {
+    return cache[resourceId]?.also { Timber.i("ContentCache:getResource: $resourceId") }
+  }
+
+  suspend fun invalidate() =
+    withContext(Dispatchers.IO) {
+      cache.evictAll()
+      Timber.i("ContentCache: clearing cache")
+    }
+}
diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirCarePlanGenerator.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirCarePlanGenerator.kt
@@ -57,6 +57,7 @@ import org.smartregister.fhircore.engine.R
 import org.smartregister.fhircore.engine.configuration.QuestionnaireConfig
 import org.smartregister.fhircore.engine.configuration.event.EventType
 import org.smartregister.fhircore.engine.data.local.DefaultRepository
+import org.smartregister.fhircore.engine.datastore.ContentCache
 import org.smartregister.fhircore.engine.util.extension.addResourceParameter
 import org.smartregister.fhircore.engine.util.extension.asReference
 import org.smartregister.fhircore.engine.util.extension.batchedSearch
@@ -214,8 +215,16 @@ constructor(
               }
             source.setParameter(Task.SP_PERIOD, period)
             source.setParameter(ActivityDefinition.SP_VERSION, IntegerType(index))
-
-            val structureMap = fhirEngine.get<StructureMap>(IdType(action.transform).idPart)
+            val structureMapId = IdType(action.transform).idPart
+            val structureMap =
+              ContentCache.getResource(ResourceType.StructureMap.name + "/" + structureMapId)?.let {
+                it as StructureMap
+              }
+                ?: run {
+                  fhirEngine.get<StructureMap>(structureMapId).also {
+                    ContentCache.saveResource(structureMapId, it)
+                  }
+                }
             structureMapUtilities.transform(
               transformSupportServices.simpleWorkerContext,
               source,

diff --git a/...quest/src/main/java/org/smartregister/fhircore/quest/ui/appsetting/AppSettingViewModel.kt b/...quest/src/main/java/org/smartregister/fhircore/quest/ui/appsetting/AppSettingViewModel.kt
@@ -29,7 +29,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.apache.commons.lang3.StringUtils
-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.ResourceType

diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/login/LoginActivity.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/login/LoginActivity.kt
@@ -24,10 +24,13 @@ import androidx.activity.viewModels
 import androidx.annotation.VisibleForTesting
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.core.os.bundleOf
+import androidx.lifecycle.viewModelScope
 import androidx.work.WorkManager
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
+import kotlinx.coroutines.launch
 import org.smartregister.fhircore.engine.data.remote.shared.TokenAuthenticator
+import org.smartregister.fhircore.engine.datastore.ContentCache
 import org.smartregister.fhircore.engine.p2p.dao.P2PReceiverTransferDao
 import org.smartregister.fhircore.engine.p2p.dao.P2PSenderTransferDao
 import org.smartregister.fhircore.engine.sync.AppSyncWorker
@@ -84,7 +87,7 @@ open class LoginActivity : BaseMultiLanguageActivity() {
           navigateToPinLogin(launchSetup = false)
         }
       }
-
+      viewModelScope.launch { ContentCache.invalidate() }
       navigateToHome.observe(loginActivity) { launchHomeScreen ->
         if (launchHomeScreen) {
           downloadNowWorkflowConfigs()

diff --git a/...src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt b/...src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
@@ -60,6 +60,7 @@
 import org.hl7.fhir.r4.model.RelatedPerson
 import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.ResourceType
+import org.hl7.fhir.r4.model.StructureMap
 import org.smartregister.fhircore.engine.BuildConfig
 import org.smartregister.fhircore.engine.configuration.ConfigType
 import org.smartregister.fhircore.engine.configuration.ConfigurationRegistry
@@ -69,6 +70,7 @@
 import org.smartregister.fhircore.engine.configuration.app.ApplicationConfiguration
 import org.smartregister.fhircore.engine.configuration.app.CodingSystemUsage
 import org.smartregister.fhircore.engine.data.local.DefaultRepository
+import org.smartregister.fhircore.engine.datastore.ContentCache
 import org.smartregister.fhircore.engine.domain.model.ActionParameter
 import org.smartregister.fhircore.engine.domain.model.ActionParameterType
 import org.smartregister.fhircore.engine.domain.model.isEditable
@@ -147,7 +149,21 @@
     questionnaireConfig: QuestionnaireConfig,
   ): Questionnaire? {
     if (questionnaireConfig.id.isEmpty() || questionnaireConfig.id.isBlank()) return null
-    return defaultRepository.loadResource<Questionnaire>(questionnaireConfig.id)
+    var result =
+      ContentCache.getResource(ResourceType.Questionnaire.name + "/" + questionnaireConfig.id)
+        ?.copy()
+    if (result == null) {
+      result =
+        defaultRepository.loadResource<Questionnaire>(questionnaireConfig.id)?.also { questionnaire,
+          ->
+          ContentCache.saveResource(
+            questionnaireConfig.id,
+            questionnaire.copy(),
+          )
+        }
+    }
+
+    return result as Questionnaire
   }
 
   /**
@@ -196,73 +212,93 @@
           context = context,
         )
 
-      saveExtractedResources(
-        bundle = bundle,
-        questionnaire = questionnaire,
-        questionnaireConfig = questionnaireConfig,
-        questionnaireResponse = currentQuestionnaireResponse,
-        context = context,
+      defaultRepository.applyDbTransaction {
+        performSave(
+          bundle,
+          questionnaire,
+          questionnaireConfig,
+          currentQuestionnaireResponse,
+          context,
+          actionParameters,
+        )
+      }
+
+      val idTypes =
+        bundle.entry?.map { IdType(it.resource.resourceType.name, it.resource.logicalId) }
+          ?: emptyList()
+
+      onSuccessfulSubmission(
+        idTypes,
+        currentQuestionnaireResponse,
       )
+    }
+  }
 
-      updateResourcesLastUpdatedProperty(actionParameters)
+  private suspend fun performSave(
+    bundle: Bundle,
+    questionnaire: Questionnaire,
+    questionnaireConfig: QuestionnaireConfig,
+    currentQuestionnaireResponse: QuestionnaireResponse,
+    context: Context,
+    actionParameters: List<ActionParameter>,
+  ) {
+    saveExtractedResources(
+      bundle = bundle,
+      questionnaire = questionnaire,
+      questionnaireConfig = questionnaireConfig,
+      questionnaireResponse = currentQuestionnaireResponse,
+      context = context,
+    )
 
-      // Important to load subject resource to retrieve ID (as reference) correctly
-      val subjectIdType: IdType? =
-        if (currentQuestionnaireResponse.subject.reference.isNullOrEmpty()) {
-          null
-        } else {
-          IdType(currentQuestionnaireResponse.subject.reference)
-        }
+    updateResourcesLastUpdatedProperty(actionParameters)
 
-      if (subjectIdType != null) {
-        val subject =
-          loadResource(
-            ResourceType.valueOf(subjectIdType.resourceType),
-            subjectIdType.idPart,
-          )
+    // Important to load subject resource to retrieve ID (as reference) correctly
+    val subjectIdType: IdType? =
+      if (currentQuestionnaireResponse.subject.reference.isNullOrEmpty()) {
+        null
+      } else {
+        IdType(currentQuestionnaireResponse.subject.reference)
+      }
 
-        if (subject != null && !questionnaireConfig.isReadOnly()) {
-          val newBundle = bundle.copyBundle(currentQuestionnaireResponse)
+    if (subjectIdType != null) {
+      val subject =
+        loadResource(
+          ResourceType.valueOf(subjectIdType.resourceType),
+          subjectIdType.idPart,
+        )
 
-          val extractedResources = newBundle.entry.map { it.resource }
-          validateWithFhirValidator(*extractedResources.toTypedArray())
+      if (subject != null && !questionnaireConfig.isReadOnly()) {
+        val newBundle = bundle.copyBundle(currentQuestionnaireResponse)
 
-          generateCarePlan(
-            subject = subject,
-            bundle = newBundle,
-            questionnaireConfig = questionnaireConfig,
-          )
+        val extractedResources = newBundle.entry.map { it.resource }
+        validateWithFhirValidator(*extractedResources.toTypedArray())
 
-          withContext(dispatcherProvider.io()) {
-            executeCql(
-              subject = subject,
-              bundle = newBundle,
-              questionnaire = questionnaire,
-              questionnaireConfig = questionnaireConfig,
-            )
-          }
+        generateCarePlan(
+          subject = subject,
+          bundle = newBundle,
+          questionnaireConfig = questionnaireConfig,
+        )
 
-          fhirCarePlanGenerator.conditionallyUpdateResourceStatus(
-            questionnaireConfig = questionnaireConfig,
+        withContext(dispatcherProvider.io()) {
+          executeCql(
             subject = subject,
             bundle = newBundle,
+            questionnaire = questionnaire,
+            questionnaireConfig = questionnaireConfig,
           )
         }
-      }
 
-      softDeleteResources(questionnaireConfig)
-
-      retireUsedQuestionnaireUniqueId(questionnaireConfig, currentQuestionnaireResponse)
+        fhirCarePlanGenerator.conditionallyUpdateResourceStatus(
+          questionnaireConfig = questionnaireConfig,
+          subject = subject,
+          bundle = newBundle,
+        )
+      }
+    }
 
-      val idTypes =
-        bundle.entry?.map { IdType(it.resource.resourceType.name, it.resource.logicalId) }
-          ?: emptyList()
+    softDeleteResources(questionnaireConfig)
 
-      onSuccessfulSubmission(
-        idTypes,
-        currentQuestionnaireResponse,
-      )
-    }
+    retireUsedQuestionnaireUniqueId(questionnaireConfig, currentQuestionnaireResponse)
   }
 
   suspend fun validateWithFhirValidator(vararg resource: Resource) {
@@ -637,8 +673,15 @@
               StructureMapExtractionContext(
                 transformSupportServices = transformSupportServices,
                 structureMapProvider = { structureMapUrl: String?, _: IWorkerContext ->
-                  structureMapUrl?.substringAfterLast("/")?.let {
-                    defaultRepository.loadResource(it)
+                  structureMapUrl?.substringAfterLast("/")?.let { smID ->
+                    ContentCache.getResource(ResourceType.StructureMap.name + "/" + smID)?.let {
+                      it as StructureMap
+                    }
+                      ?: run {
+                        defaultRepository.loadResource<StructureMap>(smID)?.also {
+                          ContentCache.saveResource(smID, it)
+                        }
+                      }
                   }
                 },
               ),