Update tobacco use answer on dialog selection (#5542)

Author: siddh1004

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

@@ -77,7 +77,11 @@ data class UpdateCVDRisk(
 
 data class LoadStatinInfo(val patientUuid: UUID) : PatientSummaryEffect()
 
-data class UpdateSmokingStatus(val patientId: UUID, val isSmoker: MedicalHistoryAnswer) : PatientSummaryEffect()
+data class UpdateTobaccoUse(
+    val patientId: UUID,
+    val isSmoker: MedicalHistoryAnswer,
+    val isUsingSmokelessTobacco: MedicalHistoryAnswer
+) : PatientSummaryEffect()
 
 sealed class PatientSummaryViewEffect : PatientSummaryEffect()
 

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

@@ -111,7 +111,7 @@ class PatientSummaryEffectHandler @AssistedInject constructor(
         .addTransformer(UpdateCVDRisk::class.java, updateCVDRisk())
         .addTransformer(SaveCVDRisk::class.java, saveCVDRisk())
         .addTransformer(LoadStatinInfo::class.java, loadStatinInfo())
-        .addConsumer(UpdateSmokingStatus::class.java, { updateSmokingStatus(it.patientId, it.isSmoker) }, schedulersProvider.io())
+        .addConsumer(UpdateTobaccoUse::class.java, { updateTobaccoUse(it.patientId, it.isSmoker, it.isUsingSmokelessTobacco) }, schedulersProvider.io())
         .build()
   }
 
@@ -302,14 +302,21 @@ class PatientSummaryEffectHandler @AssistedInject constructor(
     }
   }
 
-  private fun updateSmokingStatus(patientUuid: UUID, isSmoker: MedicalHistoryAnswer) {
+  private fun updateTobaccoUse(
+      patientUuid: UUID,
+      isSmoker: MedicalHistoryAnswer,
+      isUsingSmokelessTobacco: MedicalHistoryAnswer
+  ) {
     val medicalHistory = medicalHistoryRepository.historyForPatientOrDefaultImmediate(
         patientUuid = patientUuid,
         defaultHistoryUuid = uuidGenerator.v4()
     )
     val updatedMedicalHistory = medicalHistory.answered(
         question = MedicalHistoryQuestion.IsSmoking,
         answer = isSmoker
+    ).answered(
+        question = MedicalHistoryQuestion.IsUsingSmokelessTobacco,
+        answer = isUsingSmokelessTobacco
     )
 
     medicalHistoryRepository.save(updatedMedicalHistory, Instant.now(clock))

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

@@ -172,8 +172,9 @@ data class StatinInfoLoaded(
 
 data object AddTobaccoUseClicked : PatientSummaryEvent()
 
-data class SmokingStatusAnswered(
-    val isSmoker: Answer
+data class TobaccoUseAnswered(
+    val isSmoker: Answer,
+    val isUsingSmokelessTobacco: Answer = Answer.Unanswered
 ) : PatientSummaryEvent()
 
 data object BMIReadingAdded : PatientSummaryEvent()

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

@@ -714,11 +714,14 @@ class PatientSummaryScreen :
           checkedItems[index] = isChecked
         }
         .setPositiveButton(R.string.tobacco_status_dialog_title_positive_button) { _, _ ->
-          if (checkedItems[0]) {
-            hotEvents.onNext(SmokingStatusAnswered(Answer.Yes))
-          } else {
-            hotEvents.onNext(SmokingStatusAnswered(Answer.No))
-          }
+          val answeredNo = checkedItems[2]
+          val isSmoker = if (checkedItems[0] && !answeredNo) Answer.Yes else Answer.No
+          val isUsingSmokeless = if (checkedItems[1] && !answeredNo) Answer.Yes else Answer.No
+
+          hotEvents.onNext(TobaccoUseAnswered(
+              isSmoker = isSmoker,
+              isUsingSmokelessTobacco = isUsingSmokeless
+          ))
         }
         .setNegativeButton(R.string.tobacco_status_dialog_title_negative_button, null)
         .show()
@@ -738,8 +741,8 @@ class PatientSummaryScreen :
         }
         .setPositiveButton(R.string.tobacco_status_dialog_title_positive_button) { _, _ ->
           when (selectedOption) {
-            0 -> hotEvents.onNext(SmokingStatusAnswered(Answer.Yes))
-            1 -> hotEvents.onNext(SmokingStatusAnswered(Answer.No))
+            0 -> hotEvents.onNext(TobaccoUseAnswered(Answer.Yes))
+            1 -> hotEvents.onNext(TobaccoUseAnswered(Answer.No))
             else -> {}
           }
         }

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

@@ -106,7 +106,7 @@ class PatientSummaryUpdate(
       is CVDRiskUpdated -> dispatch(LoadStatinInfo(model.patientUuid))
       is StatinInfoLoaded -> statinInfoLoaded(event, model)
       is AddTobaccoUseClicked -> dispatch(ShowTobaccoStatusDialog)
-      is SmokingStatusAnswered -> dispatch(UpdateSmokingStatus(model.patientUuid, event.isSmoker))
+      is TobaccoUseAnswered -> dispatch(UpdateTobaccoUse(model.patientUuid, event.isSmoker, event.isUsingSmokelessTobacco))
       is BMIReadingAdded -> dispatch(CalculateNonLabBasedCVDRisk(model.patientSummaryProfile!!.patient))
       is AddBMIClicked -> dispatch(OpenBMIEntrySheet(model.patientUuid))
       is AddCholesterolClicked -> dispatch(OpenCholesterolEntrySheet(model.patientUuid))

app/src/test/java/org/simple/clinic/summary/PatientSummaryUpdateTest.kt

@@ -2535,11 +2535,12 @@ class PatientSummaryUpdateTest {
   fun `when smoking is answered, then update the smoking status`() {
     updateSpec
         .given(defaultModel)
-        .whenEvent(SmokingStatusAnswered(
-            isSmoker = No
+        .whenEvent(TobaccoUseAnswered(
+            isSmoker = No,
+            isUsingSmokelessTobacco = Yes
         ))
         .then(assertThatNext(
-            hasEffects(UpdateSmokingStatus(patientId = patientUuid, isSmoker = No)),
+            hasEffects(UpdateTobaccoUse(patientId = patientUuid, isSmoker = No, isUsingSmokelessTobacco = Yes)),
             hasNoModel()
         ))
   }