Merge pull request #5606 from simpledotorg/master

Author: tramline-github[bot]

app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryUpdate.kt

@@ -1,6 +1,7 @@
 package org.simple.clinic.medicalhistory.newentry
 
 import com.spotify.mobius.Next
+import com.spotify.mobius.Next.noChange
 import com.spotify.mobius.Update
 import org.simple.clinic.medicalhistory.Answer
 import org.simple.clinic.medicalhistory.MedicalHistoryQuestion
@@ -46,8 +47,16 @@ class NewMedicalHistoryUpdate : Update<NewMedicalHistoryModel, NewMedicalHistory
     }
   }
 
-  private fun registerPatient(model: NewMedicalHistoryModel): Next<NewMedicalHistoryModel, NewMedicalHistoryEffect> =
-      next(model.registeringPatient(), RegisterPatient(model.ongoingMedicalHistoryEntry))
+  private fun registerPatient(model: NewMedicalHistoryModel): Next<NewMedicalHistoryModel, NewMedicalHistoryEffect> {
+    return if (model.registeringPatient) {
+      noChange()
+    } else {
+      next(
+          model.registeringPatient(),
+          RegisterPatient(model.ongoingMedicalHistoryEntry)
+      )
+    }
+  }
 
   private fun currentFacilityLoaded(
       event: CurrentFacilityLoaded,

app/src/main/java/org/simple/clinic/registration/phone/RegistrationPhoneModel.kt

@@ -27,6 +27,9 @@ data class RegistrationPhoneModel(
   val isEnteredNumberValid: Boolean
     get() = phoneValidationResult != null && phoneValidationResult == RegistrationPhoneValidationResult.Valid
 
+  val isRegistrationOngoing: Boolean
+    get() = mode == RegistrationUiMode.RegistrationOngoing
+
   fun phoneNumberChanged(phoneNumber: String): RegistrationPhoneModel {
     return copy(
         ongoingRegistrationEntry = ongoingRegistrationEntry.withPhoneNumber(phoneNumber),

app/src/main/java/org/simple/clinic/registration/phone/RegistrationPhoneUpdate.kt

@@ -40,6 +40,9 @@ class RegistrationPhoneUpdate : Update<RegistrationPhoneModel, RegistrationPhone
       event: EnteredNumberValidated
   ): Next<RegistrationPhoneModel, RegistrationPhoneEffect> {
     val updatedModel = model.phoneNumberValidated(event.result)
+    if (updatedModel.isRegistrationOngoing) {
+      return noChange()
+    }
 
     return if (updatedModel.isEnteredNumberValid)
       next(updatedModel.clearPhoneRegistrationResult().switchToProgressMode(), SyncFacilities as RegistrationPhoneEffect)
@@ -52,15 +55,15 @@ class RegistrationPhoneUpdate : Update<RegistrationPhoneModel, RegistrationPhone
       model: RegistrationPhoneModel
   ): Next<RegistrationPhoneModel, RegistrationPhoneEffect> {
     return when (event.result) {
-      FacilitySyncResult.Synced -> dispatch(SearchForExistingUser(model.ongoingRegistrationEntry!!.phoneNumber!!) as RegistrationPhoneEffect)
+      FacilitySyncResult.Synced -> dispatch(SearchForExistingUser(model.ongoingRegistrationEntry.phoneNumber!!) as RegistrationPhoneEffect)
       FacilitySyncResult.NetworkError -> next(model.switchToPhoneEntryMode().withRegistrationResult(RegistrationResult.NetworkError))
       FacilitySyncResult.OtherError -> next(model.switchToPhoneEntryMode().withRegistrationResult(RegistrationResult.OtherError))
     }
   }
 
   private fun registerOrLoginUser(
       model: RegistrationPhoneModel,
-      result: SearchForExistingUserCompleted.Result
+      result: SearchUserResult
   ): Next<RegistrationPhoneModel, RegistrationPhoneEffect> {
     return when (result) {
       is SearchUserResult.Found -> saveFoundUserLocally(model, result.uuid, result.status)
@@ -75,7 +78,7 @@ class RegistrationPhoneUpdate : Update<RegistrationPhoneModel, RegistrationPhone
       foundUserUuid: UUID,
       foundUserStatus: UserStatus
   ): Next<RegistrationPhoneModel, RegistrationPhoneEffect> {
-    val number = model.ongoingRegistrationEntry!!.phoneNumber!!
+    val number = model.ongoingRegistrationEntry.phoneNumber!!
 
     return if (foundUserStatus is UserStatus.DisapprovedForSyncing)
       next(model.switchToPhoneEntryMode(), ShowAccessDeniedScreen(number) as RegistrationPhoneEffect)