Rename methods names for better clarity

woocommerce · Nov 7, 2024 · 43b863b · 43b863b
1 parent 9ecd5d6
commit 43b863b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/...src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditFormFragment.kt b/...src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditFormFragment.kt
@@ -168,7 +168,7 @@ class OrderCreateEditFormFragment :
         handleCouponEditResult()
         handleProductDetailsEditResult()
         handleResult<String>(KEY_COUPON_SELECTOR_RESULT) {
-            viewModel.onCouponAdded(it)
+            viewModel.addCoupon(it)
         }
         handleTaxRateSelectionResult()
         viewModel.onDeviceConfigurationChanged(requireContext().windowSizeClass)
@@ -449,7 +449,7 @@ class OrderCreateEditFormFragment :
                             isEnabled = couponSection.isEnabled,
                             modifier = Modifier.padding(bottom = 1.dp),
                             onAdd = { viewModel.onAddCouponButtonClicked() },
-                            onRemove = { code -> viewModel.onCouponRemoved(code) }
+                            onRemove = { code -> viewModel.removeCoupon(code) }
                         )
                     }
                 }

diff --git a/...ce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditViewModel.kt b/...ce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditViewModel.kt
@@ -572,7 +572,7 @@ class OrderCreateEditViewModel @Inject constructor(
     private fun handleCouponEditResult(couponEditResult: OrderCreateCouponDetailsViewModel.CouponEditResult) {
         when (couponEditResult) {
             is OrderCreateCouponDetailsViewModel.CouponEditResult.RemoveCoupon -> {
-                onCouponRemoved(couponEditResult.couponCode)
+                removeCoupon(couponEditResult.couponCode)
             }
         }
     }
@@ -1809,7 +1809,7 @@ class OrderCreateEditViewModel @Inject constructor(
         }
     }
 
-    fun onCouponAdded(couponCode: String) {
+    fun addCoupon(couponCode: String) {
         if (_orderDraft.value.couponLines.any { it.code == couponCode }) return
         _orderDraft.update { draft ->
             val couponLines = draft.couponLines
@@ -1819,7 +1819,7 @@ class OrderCreateEditViewModel @Inject constructor(
         }
     }
 
-    fun onCouponRemoved(couponCode: String) {
+    fun removeCoupon(couponCode: String) {
         trackCouponRemoved()
         _orderDraft.update { draft ->
             val updatedCouponLines = draft.couponLines.filter { it.code != couponCode }

diff --git a/...com/woocommerce/android/ui/orders/creation/CreationFocusedOrderCreateEditViewModelTest.kt b/...com/woocommerce/android/ui/orders/creation/CreationFocusedOrderCreateEditViewModelTest.kt
@@ -1223,7 +1223,7 @@ class CreationFocusedOrderCreateEditViewModelTest : UnifiedOrderEditViewModelTes
         initMocksForAnalyticsWithOrder(defaultOrderValue)
         createSut()
 
-        sut.onCouponAdded("abc")
+        sut.addCoupon("abc")
 
         verify(tracker).track(
             AnalyticsEvent.ORDER_COUPON_ADD,
@@ -1266,7 +1266,7 @@ class CreationFocusedOrderCreateEditViewModelTest : UnifiedOrderEditViewModelTes
             lastReceivedEvent = it
         }
 
-        sut.onCouponAdded("abc")
+        sut.addCoupon("abc")
 
         with(lastReceivedEvent) {
             this == OnCouponRejectedByBackend
@@ -1608,7 +1608,7 @@ class CreationFocusedOrderCreateEditViewModelTest : UnifiedOrderEditViewModelTes
         }
         assertThat(sut.couponLinesLiveData.value!!.couponLines).isEmpty()
 
-        sut.onCouponAdded(dummyCouponCode)
+        sut.addCoupon(dummyCouponCode)
 
         assertThat(sut.couponLinesLiveData.value!!.couponLines).isNotEmpty
     }
@@ -1621,10 +1621,10 @@ class CreationFocusedOrderCreateEditViewModelTest : UnifiedOrderEditViewModelTes
         }
         sut.couponLinesLiveData.observeForever {
         }
-        sut.onCouponAdded(dummyCouponCode)
+        sut.addCoupon(dummyCouponCode)
         assertThat(sut.couponLinesLiveData.value!!.couponLines).isNotEmpty
 
-        sut.onCouponRemoved(dummyCouponCode)
+        sut.removeCoupon(dummyCouponCode)
 
         assertThat(sut.couponLinesLiveData.value!!.couponLines).isEmpty()
     }
@@ -1639,7 +1639,7 @@ class CreationFocusedOrderCreateEditViewModelTest : UnifiedOrderEditViewModelTes
         }
         sut.couponLinesLiveData.observeForever {
         }
-        sut.onCouponAdded("123")
+        sut.addCoupon("123")
         advanceUntilIdle()
         assertThat(sut.couponLinesLiveData.value!!.couponLines).isNotEmpty
 
@@ -1658,7 +1658,7 @@ class CreationFocusedOrderCreateEditViewModelTest : UnifiedOrderEditViewModelTes
         }
         sut.couponLinesLiveData.observeForever {
         }
-        sut.onCouponAdded("123")
+        sut.addCoupon("123")
         advanceUntilIdle()
         assertThat(sut.couponLinesLiveData.value!!.couponLines).isNotEmpty
         sut.onProductsSelected(listOf(ProductSelectorViewModel.SelectedItem.Product(1L)))

diff --git a/...lin/com/woocommerce/android/ui/orders/creation/EditFocusedOrderCreateEditViewModelTest.kt b/...lin/com/woocommerce/android/ui/orders/creation/EditFocusedOrderCreateEditViewModelTest.kt
@@ -204,7 +204,7 @@ class EditFocusedOrderCreateEditViewModelTest : UnifiedOrderEditViewModelTest()
             latestOrderDraft = it
         }
 
-        sut.onCouponAdded("new_code")
+        sut.addCoupon("new_code")
 
         latestOrderDraft!!.couponLines.filter { it.code == "new_code" }.apply {
             assertTrue(isNotEmpty())
@@ -222,7 +222,7 @@ class EditFocusedOrderCreateEditViewModelTest : UnifiedOrderEditViewModelTest()
             latestOrderDraft = it
         }
 
-        sut.onCouponAdded("new_code")
+        sut.addCoupon("new_code")
         latestOrderDraft!!.couponLines.filter { it.code == "new_code" }.apply {
             assertTrue(isNotEmpty())
             assertEquals(1, size)
@@ -245,8 +245,8 @@ class EditFocusedOrderCreateEditViewModelTest : UnifiedOrderEditViewModelTest()
         sut.orderDraft.observeForever {
             latestOrderDraft = it
         }
-        sut.onCouponAdded("new_code")
-        sut.onCouponAdded("new_code2")
+        sut.addCoupon("new_code")
+        sut.addCoupon("new_code2")
 
         // when
         sut.onCouponEditResult(OrderCreateCouponDetailsViewModel.CouponEditResult.RemoveCoupon("new_code"))
@@ -284,7 +284,7 @@ class EditFocusedOrderCreateEditViewModelTest : UnifiedOrderEditViewModelTest()
         sut.orderDraft.observeForever {
             orderDraft = it
         }
-        sut.onCouponAdded("new_code")
+        sut.addCoupon("new_code")
 
         // when
         sut.onCouponButtonClicked()
@@ -666,7 +666,7 @@ class EditFocusedOrderCreateEditViewModelTest : UnifiedOrderEditViewModelTest()
         initMocksForAnalyticsWithOrder(defaultOrderValue)
         createSut()
 
-        sut.onCouponAdded("code ")
+        sut.addCoupon("code ")
 
         verify(tracker).track(
             AnalyticsEvent.ORDER_COUPON_ADD,