Fix statin nudge not getting dismissed when a statin is added (#5082)

simpledotorg · Sep 13, 2024 · 801fd5b · 801fd5b
1 parent a454d92
commit 801fd5b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@
 - Bump AndroidX Lifecycle to v2.8.5
 - Check statin nudge status in patient summary screen
 - Add feature flag for statin nudge
+- Fix statin nudge not getting dismissed when a statin is added
 
 ### Features
 

diff --git a/app/src/main/java/org/simple/clinic/summary/PatientSummaryEffectHandler.kt b/app/src/main/java/org/simple/clinic/summary/PatientSummaryEffectHandler.kt
@@ -115,13 +115,18 @@ class PatientSummaryEffectHandler @AssistedInject constructor(
               Pair(patient, it)
             }
           }
-          .map { (patient, hasBPRecordedToday) ->
+          .flatMap { (patient, hasBPRecordedToday) ->
+            val prescriptionsObservable = prescriptionRepository.newestPrescriptionsForPatient(patient.uuid)
+            prescriptionsObservable.map { prescriptions ->
+              Triple(patient, prescriptions, hasBPRecordedToday)
+            }
+          }
+          .map { (patient, prescriptions, hasBPRecordedToday) ->
             val assignedFacility = getAssignedFacility(patient.assignedFacilityId).toNullable()
             val medicalHistory = medicalHistoryRepository.historyForPatientOrDefaultImmediate(
                 defaultHistoryUuid = uuidGenerator.v4(),
                 patientUuid = patient.uuid
             )
-            val prescriptions = prescriptionRepository.newestPrescriptionsForPatientImmediate(patient.uuid)
 
             StatinPrescriptionCheckInfoLoaded(
                 age = patient.ageDetails.estimateAge(userClock = userClock),

diff --git a/app/src/test/java/org/simple/clinic/summary/PatientSummaryEffectHandlerTest.kt b/app/src/test/java/org/simple/clinic/summary/PatientSummaryEffectHandlerTest.kt
@@ -842,7 +842,7 @@ class PatientSummaryEffectHandlerTest {
         patientUuid = patientUuid,
         defaultHistoryUuid = uuidGenerator.v4()
     )) doReturn medicalHistory
-    whenever(prescriptionRepository.newestPrescriptionsForPatientImmediate(patientUuid)) doReturn emptyList()
+    whenever(prescriptionRepository.newestPrescriptionsForPatient(patientUuid)) doReturn Observable.just(emptyList())
 
     // when
     testCase.dispatch(LoadStatinPrescriptionCheckInfo(patient))