Fix for the family removal issue

opensrp · May 14, 2024 · 9e3ffc3 · 9e3ffc3
1 parent b2adf6e
commit 9e3ffc3
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 27 deletions.
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
@@ -830,7 +830,7 @@ constructor(
    * This function triggers removal of [Resource] s as per the [QuestionnaireConfig.groupResource]
    * or [QuestionnaireConfig.removeResource] config properties.
    */
-  fun softDeleteResources(questionnaireConfig: QuestionnaireConfig) {
+  suspend fun softDeleteResources(questionnaireConfig: QuestionnaireConfig) {
     if (questionnaireConfig.groupResource != null) {
       removeGroup(
         groupId = questionnaireConfig.groupResource!!.groupIdentifier,
@@ -860,40 +860,40 @@ constructor(
     }
   }
 
-  private fun removeGroup(groupId: String, removeGroup: Boolean, deactivateMembers: Boolean) {
+  private suspend fun removeGroup(
+    groupId: String,
+    removeGroup: Boolean,
+    deactivateMembers: Boolean,
+  ) {
     if (removeGroup) {
-      viewModelScope.launch(dispatcherProvider.io()) {
-        try {
-          defaultRepository.removeGroup(
-            groupId = groupId,
-            isDeactivateMembers = deactivateMembers,
-            configComputedRuleValues = emptyMap(),
-          )
-        } catch (exception: Exception) {
-          Timber.e(exception)
-        }
+      try {
+        defaultRepository.removeGroup(
+          groupId = groupId,
+          isDeactivateMembers = deactivateMembers,
+          configComputedRuleValues = emptyMap(),
+        )
+      } catch (exception: Exception) {
+        Timber.e(exception)
       }
     }
   }
 
-  private fun removeGroupMember(
+  private suspend fun removeGroupMember(
     memberId: String?,
     groupIdentifier: String?,
     memberResourceType: ResourceType?,
     removeMember: Boolean,
   ) {
     if (removeMember && !memberId.isNullOrEmpty()) {
-      viewModelScope.launch(dispatcherProvider.io()) {
-        try {
-          defaultRepository.removeGroupMember(
-            memberId = memberId,
-            groupId = groupIdentifier,
-            groupMemberResourceType = memberResourceType,
-            configComputedRuleValues = emptyMap(),
-          )
-        } catch (exception: Exception) {
-          Timber.e(exception)
-        }
+      try {
+        defaultRepository.removeGroupMember(
+          memberId = memberId,
+          groupId = groupIdentifier,
+          groupMemberResourceType = memberResourceType,
+          configComputedRuleValues = emptyMap(),
+        )
+      } catch (exception: Exception) {
+        Timber.e(exception)
       }
     }
   }

diff --git a/...test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModelTest.kt b/...test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModelTest.kt
@@ -812,7 +812,7 @@ class QuestionnaireViewModelTest : RobolectricTest() {
   }
 
   @Test
-  fun testSoftDeleteShouldTriggerDefaultRepositoryRemoveGroupFunction() {
+  fun testSoftDeleteShouldTriggerDefaultRepositoryRemoveGroupFunction() = runTest {
     val theQuestionnaireConfig =
       QuestionnaireConfig(
         id = samplePatientRegisterQuestionnaire.id,
@@ -836,7 +836,7 @@ class QuestionnaireViewModelTest : RobolectricTest() {
   }
 
   @Test
-  fun testSoftDeleteShouldTriggerDefaultRepositoryRemoveGroupMemberFunction() {
+  fun testSoftDeleteShouldTriggerDefaultRepositoryRemoveGroupMemberFunction() = runTest {
     val theQuestionnaireConfig =
       QuestionnaireConfig(
         id = samplePatientRegisterQuestionnaire.id,
@@ -863,7 +863,7 @@ class QuestionnaireViewModelTest : RobolectricTest() {
   }
 
   @Test
-  fun testSoftDeleteShouldTriggerDefaultRepositoryUpdateResourceFunction() {
+  fun testSoftDeleteShouldTriggerDefaultRepositoryUpdateResourceFunction() = runTest {
     val patient = Faker.buildPatient()
     val theQuestionnaireConfig =
       QuestionnaireConfig(