CC link OTP check key changed to HIP ID

dimagi · Oct 1, 2023 · 775fd06 · 775fd06
1 parent 65c7b69
commit 775fd06
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/CCVerifyOtpFragment.kt b/app/src/main/java/org/commcare/dalvik/abha/ui/main/fragment/CCVerifyOtpFragment.kt
@@ -70,17 +70,20 @@ class CCVerifyOtpFragment : BaseFragment<GenerateCCOtpBinding>(GenerateCCOtpBind
 
     private fun requestOtp() {
         lifecycleScope.launch {
-            viewModel.checkForBlockedState(CareContextViewModel.CC_OTP_KEY).collect {
-                when (it) {
-                    OtpCallState.OtpReqAvailable -> {
-                        viewModel.generateCareContextOtp()
-                    }
+            viewModel.linkCareContextModel.hipId.let {hipId ->
+                viewModel.checkForBlockedState(hipId).collect {
+                    when (it) {
+                        OtpCallState.OtpReqAvailable -> {
+                            viewModel.generateCareContextOtp()
+                        }
 
-                    is OtpCallState.OtpReqBlocked -> {
-                        viewModel.otpRequestBlocked.value = it.otpRequestCallModel
-                        binding.resendCCOtp.isEnabled = false
+                        is OtpCallState.OtpReqBlocked -> {
+                            viewModel.otpRequestBlocked.value = it.otpRequestCallModel
+                            binding.resendCCOtp.isEnabled = false
+                        }
                     }
                 }
+
             }
         }
 

diff --git a/app/src/main/java/org/commcare/dalvik/abha/viewmodel/CareContextViewModel.kt b/app/src/main/java/org/commcare/dalvik/abha/viewmodel/CareContextViewModel.kt
@@ -40,11 +40,6 @@ class CareContextViewModel @Inject constructor(
     lateinit var selectedAuthMethod: String
     lateinit var confirmAuthModel: ConfirmAuthModel
 
-    companion object{
-        val CC_OTP_KEY ="cc_otp_key"
-    }
-
-
 
     fun init(model: LinkCareContextModel) {
         linkCareContextModel = model
@@ -104,7 +99,7 @@ class CareContextViewModel @Inject constructor(
             selectedAuthMethod.let { authMethod ->
                 linkCareContextModel.getAuthModesRequestModel(authMethod)?.let { ccAuthReqModel ->
                     //save otp req call count
-                    saveOtpRequestCallCount(CC_OTP_KEY)
+                    saveOtpRequestCallCount(linkCareContextModel.hipId)
 
                     generateCareContextOtpUsecase.execute(ccAuthReqModel).collect { hqRespModel ->
                         when (hqRespModel) {