fixed NoSuchElementException when list has no item (#2804)

Co-authored-by: Peter Lubell-Doughtie <[email protected]>
opensrp · Oct 10, 2023 · b886649 · b886649
1 parent ace5140
commit b886649
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 3 deletions.
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
@@ -278,10 +278,10 @@ constructor(
     resourceIds.forEach {
       val responseBundle =
         fhirResourceDataSource.getResource("$resourceType?${Composition.SP_RES_ID}=$it")
-      responseBundle?.let {
+      responseBundle.let {
         bundleEntryComponents.add(
           Bundle.BundleEntryComponent().apply {
-            resource = responseBundle.entry?.first()?.resource
+            resource = responseBundle.entry?.firstOrNull()?.resource
           },
         )
       }

diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/login/LoginViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/login/LoginViewModel.kt
@@ -344,7 +344,7 @@ constructor(
         } else {
           // The assumption here is that only 1 practitioner is returned from the server in the
           // practitioner details
-          practitioners.first().identifier.forEach { identifier ->
+          practitioners.firstOrNull()?.identifier?.forEach { identifier ->
             if (
               identifier.hasUse() &&
                 identifier.use == org.hl7.fhir.r4.model.Identifier.IdentifierUse.SECONDARY &&

diff --git a/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/login/LoginViewModelTest.kt b/android/quest/src/test/java/org/smartregister/fhircore/quest/ui/login/LoginViewModelTest.kt
@@ -517,6 +517,42 @@ internal class LoginViewModelTest : RobolectricTest() {
     )
   }
 
+  @Test
+  fun testSavePractitionerDetailsChaRoleWithIdentifier() {
+    coEvery { defaultRepository.createRemote(true, any()) } just runs
+    loginViewModel.savePractitionerDetails(
+      Bundle()
+        .addEntry(
+          Bundle.BundleEntryComponent().apply {
+            resource =
+              practitionerDetails().apply {
+                fhirPractitionerDetails =
+                  FhirPractitionerDetails().apply {
+                    practitioners =
+                      listOf(
+                        Practitioner().apply {
+                          identifier =
+                            listOf(
+                              Identifier().apply {
+                                use = Identifier.IdentifierUse.SECONDARY
+                                value = "cha"
+                              },
+                            )
+                        },
+                      )
+                  }
+              }
+          },
+        ),
+      UserInfo(
+        keycloakUuid = "cha",
+      ),
+    ) {}
+    Assert.assertNotNull(
+      sharedPreferencesHelper.read(SharedPreferenceKey.PRACTITIONER_DETAILS.name),
+    )
+  }
+
   @Test
   fun testSavePractitionerDetailsSupervisorRole() {
     coEvery { defaultRepository.createRemote(false, any()) } just runs