Rename property name to better clarify its role

Author: hichamboushaba

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/ShippableItemsMapper.kt

@@ -153,7 +153,7 @@ private fun getShipmentCostUI(
     currencyFormatter: (BigDecimal) -> String
 ): ShipmentCostUI? {
     return when {
-        shipmentUIModel.purchased -> {
+        shipmentUIModel.isPurchasedOrInProgress -> {
             requireNotNull(shipmentUIModel.label)
             ShipmentCostUI(
                 serviceName = shipmentUIModel.label.serviceName,

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/WooShippingLabelCreationViewModel.kt

@@ -202,7 +202,7 @@ class WooShippingLabelCreationViewModel @Inject constructor(
     }
 
     private suspend fun trackScreenShownEvent() {
-        val unfulfilledShipmentsCount = shipments.drop(1).first().count { !it.purchased }
+        val unfulfilledShipmentsCount = shipments.drop(1).first().count { !it.isPurchasedOrInProgress }
         analyticsTracker.track(
             AnalyticsEvent.WCS_CREATE_SHIPPING_LABEL_FORM_SHOWN,
             mapOf("unfulfilled_shipments_count" to unfulfilledShipmentsCount)
@@ -225,7 +225,7 @@ class WooShippingLabelCreationViewModel @Inject constructor(
         ) { shipments, selectedShipmentIndex ->
             shipments[selectedShipmentIndex]
         }.flatMapLatest { shipment ->
-            if (shipment.purchased) {
+            if (shipment.isPurchasedOrInProgress) {
                 flowOf(null)
             } else {
                 observeShippingLabelNotice(
@@ -582,7 +582,7 @@ class WooShippingLabelCreationViewModel @Inject constructor(
             uiState.map { it.selectedIndex }.distinctUntilChanged(),
         ) { order, destination, originAddresses, shipments, selectedIndex ->
             val currentShipment = shipments[selectedIndex]
-            val updatedAddress = if (currentShipment.purchased) {
+            val updatedAddress = if (currentShipment.isPurchasedOrInProgress) {
                 val selectedAddress = shippingAddresses.value.getOrNull(selectedShipmentIndex)
                 val shipFrom = selectedAddress?.shipFrom?.takeIf { it != OriginShippingAddress.EMPTY }
                     ?: currentShipment.label?.originAddress?.let { originAddress ->

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/models/ShipmentUIModel.kt

@@ -11,11 +11,7 @@ data class ShipmentUIModel(
     val isPurchaseAPILoading: Boolean = false,
     val label: ShippingLabelModel? = null,
 ) : Parcelable {
-    /**
-     * Whether the shipment has been purchased or not.
-     * A shipment is considered purchased if the label was already purchased or is in the process of being purchased.
-     */
-    val purchased: Boolean
+    val isPurchasedOrInProgress: Boolean
         get() = label?.status == ShippingLabelStatus.PURCHASE_IN_PROGRESS ||
             (label?.status == ShippingLabelStatus.PURCHASED && label.refund == null)
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/split/GetSplitMovements.kt

@@ -67,7 +67,7 @@ class GetSplitMovements @Inject constructor() {
         items: Map<Int, ShipmentUIModel>,
         isRemoveMovement: Boolean
     ): List<Int> {
-        val otherUnfulfilledKeys = items.filterNot { it.key == sourceShipmentKey || it.value.purchased }.keys.toList()
+        val otherUnfulfilledKeys = items.filterNot { it.key == sourceShipmentKey || it.value.isPurchasedOrInProgress }.keys.toList()
         if (isRemoveMovement) return otherUnfulfilledKeys
 
         val otherKeys = items.keys.filter { it != sourceShipmentKey }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/split/WooShippingSplitShipmentViewModel.kt

@@ -58,7 +58,7 @@ class WooShippingSplitShipmentViewModel @Inject constructor(
                         currencyFormatter = currencyFormatter,
                         dimensionUnit = storeOptions.dimensionUnit,
                         weightUnit = storeOptions.weightUnit,
-                        purchased = it.value.purchased
+                        purchased = it.value.isPurchasedOrInProgress
                     )
                 }
 
@@ -174,8 +174,8 @@ class WooShippingSplitShipmentViewModel @Inject constructor(
     }
 
     private fun mergeUnfulfilledShipments() {
-        val fulfilledShipments = currentShipments.value.filter { it.value.purchased }
-        val unfulfilledShipments = currentShipments.value.filterNot { it.value.purchased }
+        val fulfilledShipments = currentShipments.value.filter { it.value.isPurchasedOrInProgress }
+        val unfulfilledShipments = currentShipments.value.filterNot { it.value.isPurchasedOrInProgress }
         val firstUnfulfilledShipmentKey = unfulfilledShipments.keys.first()
         val firstUnfulfilledShipmentValue = unfulfilledShipments.values.first()
         val mergedShipmentUIModel = firstUnfulfilledShipmentValue.copy(

WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/wooshippinglabels/GetShipmentsTests.kt

@@ -228,7 +228,7 @@ class GetShipmentsTests : BaseUnitTest() {
         val result = sut.invoke(order)
         val shipmentUIModel = result.first()
 
-        assertFalse(shipmentUIModel.purchased)
+        assertFalse(shipmentUIModel.isPurchasedOrInProgress)
     }
 
     @Test
@@ -275,7 +275,7 @@ class GetShipmentsTests : BaseUnitTest() {
         val result = sut.invoke(order)
         val shipmentUIModel = result.first()
 
-        assertFalse(shipmentUIModel.purchased)
+        assertFalse(shipmentUIModel.isPurchasedOrInProgress)
     }
 
     @Test
@@ -322,7 +322,7 @@ class GetShipmentsTests : BaseUnitTest() {
         val result = sut.invoke(order)
         val shipmentUIModel = result.first()
 
-        assertTrue(shipmentUIModel.purchased)
+        assertTrue(shipmentUIModel.isPurchasedOrInProgress)
         assertNotNull(shipmentUIModel.label)
     }
 }