Merge branch 'main' into cherrypick_3243

opensrp · May 24, 2024 · 44efd1f · 44efd1f
2 parents b0ee362 + e88724e
commit 44efd1f
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 2 deletions.
diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/rulesengine/RulesFactory.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/rulesengine/RulesFactory.kt
@@ -351,6 +351,11 @@ constructor(
               SharedPreferenceKey.PRACTITIONER_LOCATION.name,
               "",
             )
+          SharedPreferenceKey.PRACTITIONER_LOCATION_ID ->
+            configurationRegistry.sharedPreferencesHelper.read(
+              SharedPreferenceKey.PRACTITIONER_LOCATION_ID.name,
+              "",
+            )
           else -> ""
         }
       } catch (exception: Exception) {

diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/SharedPreferenceKey.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/SharedPreferenceKey.kt
@@ -24,6 +24,7 @@ enum class SharedPreferenceKey {
   PRACTITIONER_DETAILS,
   PRACTITIONER_LOCATION_HIERARCHIES,
   PRACTITIONER_LOCATION,
+  PRACTITIONER_LOCATION_ID,
   REMOTE_SYNC_RESOURCES,
   LOGIN_CREDENTIAL_KEY,
   LOGIN_PIN_KEY,

diff --git a/...id/engine/src/test/java/org/smartregister/fhircore/engine/rulesengine/RulesFactoryTest.kt b/...id/engine/src/test/java/org/smartregister/fhircore/engine/rulesengine/RulesFactoryTest.kt
@@ -977,7 +977,23 @@ class RulesFactoryTest : RobolectricTest() {
   @Test
   fun testExtractSharedPrefValuesReturnsPractitionerLocation() {
     val sharedPreferenceKey = "PRACTITIONER_LOCATION"
-    val expectedValue = "1234"
+    val expectedValue = "Demo Facility"
+    every {
+      configurationRegistry.sharedPreferencesHelper.read(
+        sharedPreferenceKey,
+        "",
+      )
+    } returns expectedValue
+    val result = rulesEngineService.extractPractitionerInfoFromSharedPrefs(sharedPreferenceKey)
+
+    verify { configurationRegistry.sharedPreferencesHelper.read(sharedPreferenceKey, "") }
+    Assert.assertEquals(expectedValue, result)
+  }
+
+  @Test
+  fun testExtractSharedPrefValuesReturnsPractitionerLocationId() {
+    val sharedPreferenceKey = "PRACTITIONER_LOCATION_ID"
+    val expectedValue = "ABCD1234"
     every {
       configurationRegistry.sharedPreferencesHelper.read(
         sharedPreferenceKey,

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
@@ -415,7 +415,7 @@ constructor(
     )
   }
 
-  private fun writePractitionerDetailsToShredPref(
+  fun writePractitionerDetailsToShredPref(
     careTeam: List<String>,
     organization: List<String>,
     location: List<String>,
@@ -452,6 +452,10 @@ constructor(
       key = SharedPreferenceKey.ORGANIZATION.name,
       value = organization.joinToString(separator = ""),
     )
+    sharedPreferences.write(
+      key = SharedPreferenceKey.PRACTITIONER_LOCATION_ID.name,
+      value = locations.joinToString(separator = ""),
+    )
   }
 
   fun downloadNowWorkflowConfigs(isInitialLogin: Boolean = true) {

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
@@ -33,6 +33,7 @@ import io.mockk.verify
 import java.net.SocketTimeoutException
 import java.net.UnknownHostException
 import javax.inject.Inject
+import kotlin.test.assertEquals
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.runBlocking
 import okhttp3.internal.http.RealResponseBody
@@ -638,6 +639,25 @@ internal class LoginViewModelTest : RobolectricTest() {
     verify { workManager.enqueue(any<OneTimeWorkRequest>()) }
   }
 
+  @Test
+  fun testWritePractitionerDetailsToShredPrefSavesPractitionerLocationId() {
+    val locationId = "ABCD123"
+    loginViewModel.writePractitionerDetailsToShredPref(
+      careTeams = listOf(""),
+      careTeam = listOf(""),
+      organization = listOf(""),
+      organizations = listOf(""),
+      location = listOf(""),
+      locations = listOf(locationId),
+      fhirPractitionerDetails = PractitionerDetails(),
+      locationHierarchies = listOf(LocationHierarchy()),
+    )
+    assertEquals(
+      locationId,
+      sharedPreferencesHelper.read(SharedPreferenceKey.PRACTITIONER_LOCATION_ID.name),
+    )
+  }
+
   private fun updateCredentials() {
     loginViewModel.run {
       onUsernameUpdated(thisUsername)