Merge branch 'main' into upgrade-sdk-libraries

opensrp · Feb 7, 2024 · 9139ea3 · 9139ea3
2 parents 26c551b + 8d3f051
commit 9139ea3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...rc/main/java/org/smartregister/fhircore/engine/configuration/migration/MigrationConfig.kt b/...rc/main/java/org/smartregister/fhircore/engine/configuration/migration/MigrationConfig.kt
@@ -28,6 +28,7 @@ data class MigrationConfig(
   val rules: List<RuleConfig>,
   val version: Int,
   val purgeAffectedResources: Boolean = false,
+  val createLocalChangeEntitiesAfterPurge: Boolean = true,
   val resourceFilterExpression: ResourceFilterExpression? = null,
 ) : java.io.Serializable
 

diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/data/DataMigration.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/data/DataMigration.kt
@@ -208,7 +208,9 @@ constructor(
             if (migrationConfig.purgeAffectedResources) {
               defaultRepository.purge(updatedResource as Resource, forcePurge = true)
             }
-            defaultRepository.addOrUpdate(resource = updatedResource as Resource)
+            if (migrationConfig.createLocalChangeEntitiesAfterPurge) {
+              defaultRepository.addOrUpdate(resource = updatedResource as Resource)
+            } else defaultRepository.createRemote(resource = *arrayOf(updatedResource as Resource))
           }
         }
         Timber.i("Data migration completed successfully for version: ${migrationConfig.version}")