Show statin nudge for 90 calendar days and recalculate cvd risk after 90 days (#5185)

https://app.shortcut.com/simpledotorg/story/14495/statin-nudge-v2-android-engineering-discussions?team_id=1&iteration_ids=14465

---------

Co-authored-by: Siddharth Agarwal <[email protected]>
Co-authored-by: Sasikanth Miriyampalli <[email protected]>

Author: 3 people

app/src/debug/java/org/simple/clinic/FakeDataGenerationReceiver.kt

@@ -139,7 +139,7 @@ class FakeDataGenerationReceiver : BroadcastReceiver() {
         patient = patient,
         address = address,
         phoneNumbers = listOf(phoneNumber),
-        businessIds = emptyList()
+        businessIds = emptyList(),
     )
 
     val bloodPressureMeasurement = (1..10).map { bloodPressureMeasurement(user, facility, patient, now) }

app/src/main/java/org/simple/clinic/cvdrisk/CVDRiskCalculator.kt

@@ -62,9 +62,7 @@ class CVDRiskCalculator @Inject constructor(
   }
 
   private fun getSystolicRange(sbp: Int) = when (sbp) {
-    in 0..119 -> "< 120"
-    in 120..139 -> "120 - 139"
-    in 140..159 -> "140 - 159"
+    in 0..159 -> "140 - 159"
     in 160..179 -> "160 - 179"
     else -> ">= 180"
   }

app/src/main/java/org/simple/clinic/cvdrisk/CVDRiskRepository.kt

@@ -8,6 +8,7 @@ import org.simple.clinic.patient.SyncStatus.PENDING
 import org.simple.clinic.storage.Timestamps
 import org.simple.clinic.sync.SynceableRepository
 import org.simple.clinic.util.UtcClock
+import java.time.Instant
 import java.util.UUID
 import javax.inject.Inject
 
@@ -31,6 +32,13 @@ class CVDRiskRepository @Inject constructor(
     dao.saveRisk(cvdRisk)
   }
 
+  fun save(cvdRisk: CVDRisk, updateAt: Instant) {
+    val updatedCVDRisk = cvdRisk.copy(
+        syncStatus = PENDING,
+        timestamps = cvdRisk.timestamps.copy(updatedAt = updateAt))
+    dao.saveRisk(updatedCVDRisk)
+  }
+
   override fun save(records: List<CVDRisk>) {
     dao.saveRisks(records)
   }

app/src/main/java/org/simple/clinic/medicalhistory/MedicalHistory.kt

@@ -12,6 +12,7 @@ import androidx.room.Query
 import androidx.room.RawQuery
 import androidx.sqlite.db.SimpleSQLiteQuery
 import io.reactivex.Flowable
+import io.reactivex.Observable
 import kotlinx.parcelize.Parcelize
 import org.simple.clinic.medicalhistory.Answer.Unanswered
 import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.DiagnosedWithDiabetes
@@ -163,7 +164,7 @@ data class MedicalHistory(
         FROM MedicalHistory
         WHERE updatedAt > :instantToCompare AND syncStatus = :pendingStatus AND patientUuid = :patientUuid
     """)
-    fun hasMedicalHistoryForPatientChangedSince(
+    fun hasMedicalHistoryForPatientChangedSinceImmediate(
         patientUuid: UUID,
         instantToCompare: Instant,
         pendingStatus: SyncStatus

app/src/main/java/org/simple/clinic/medicalhistory/MedicalHistoryRepository.kt

@@ -6,6 +6,7 @@ import org.simple.clinic.medicalhistory.Answer.Unanswered
 import org.simple.clinic.medicalhistory.sync.MedicalHistoryPayload
 import org.simple.clinic.patient.PatientUuid
 import org.simple.clinic.patient.SyncStatus
+import org.simple.clinic.patient.SyncStatus.PENDING
 import org.simple.clinic.sync.SynceableRepository
 import org.simple.clinic.util.UtcClock
 import java.time.Instant

app/src/main/java/org/simple/clinic/patient/PatientProfile.kt

@@ -31,6 +31,7 @@ data class PatientProfile(
     )
     val businessIds: List<BusinessId>
 ) : Parcelable {
+
   val patientUuid: UUID
     get() = patient.uuid
 

app/src/main/java/org/simple/clinic/patient/PatientRepository.kt

@@ -167,7 +167,7 @@ class PatientRepository @Inject constructor(
         patient = patient,
         address = patientAddress,
         phoneNumbers = phoneNumbers,
-        businessIds = businessIds
+        businessIds = businessIds,
     )
   }
 
@@ -282,7 +282,7 @@ class PatientRepository @Inject constructor(
           patient = patient,
           address = address,
           phoneNumbers = phoneNumbers,
-          businessIds = businessIds
+          businessIds = businessIds,
       )
     }
   }
@@ -648,7 +648,7 @@ class PatientRepository @Inject constructor(
   fun hasMedicalHistoryForPatientChangedSince(patientUuid: UUID, instant: Instant): Boolean {
     return database
         .medicalHistoryDao()
-        .hasMedicalHistoryForPatientChangedSince(
+        .hasMedicalHistoryForPatientChangedSinceImmediate(
             patientUuid = patientUuid,
             instantToCompare = instant,
             pendingStatus = PENDING

app/src/main/java/org/simple/clinic/summary/PatientSummaryEffect.kt

@@ -1,13 +1,15 @@
 package org.simple.clinic.summary
 
+import org.simple.clinic.cvdrisk.CVDRisk
+import org.simple.clinic.cvdrisk.CVDRiskRange
 import org.simple.clinic.facility.Facility
 import org.simple.clinic.patient.Answer
-import org.simple.clinic.medicalhistory.Answer as MedicalHistoryAnswer
 import org.simple.clinic.patient.Patient
 import org.simple.clinic.patient.businessid.Identifier
 import org.simple.clinic.reassignpatient.ReassignPatientSheetOpenedFrom
 import java.time.Instant
 import java.util.UUID
+import org.simple.clinic.medicalhistory.Answer as MedicalHistoryAnswer
 
 sealed class PatientSummaryEffect
 
@@ -57,12 +59,20 @@ data class MarkDiabetesDiagnosis(val patientUuid: UUID) : PatientSummaryEffect()
 
 data class MarkHypertensionDiagnosis(val patientUuid: UUID) : PatientSummaryEffect()
 
-data class LoadStatinPrescriptionCheckInfo(val patient: Patient) : PatientSummaryEffect()
-
-data class LoadCVDRisk(val patientUuid: UUID) : PatientSummaryEffect()
+data class LoadStatinPrescriptionCheckInfo(val patientUuid: UUID) : PatientSummaryEffect()
 
 data class CalculateCVDRisk(val patient: Patient) : PatientSummaryEffect()
 
+data class SaveCVDRisk(
+    val patientUuid: UUID,
+    val cvdRiskRange: CVDRiskRange
+) : PatientSummaryEffect()
+
+data class UpdateCVDRisk(
+    val oldRisk: CVDRisk,
+    val newRiskRange: CVDRiskRange
+) : PatientSummaryEffect()
+
 data class LoadStatinInfo(val patientUuid: UUID) : PatientSummaryEffect()
 
 data class UpdateSmokingStatus(val patientId: UUID, val isSmoker: MedicalHistoryAnswer) : PatientSummaryEffect()