[1/2] WCProductVariationModel to Room: working app

.buildkite/commands/run-unit-tests.sh

@@ -8,20 +8,18 @@ install_gems
 echo "--- :closed_lock_with_key: Installing Secrets"
 bundle exec fastlane run configure_apply
 
-echo "--- 🧪 Testing"
+echo "+++ 🧪 Testing"
 set +e
-./gradlew testJalapenoDebugUnitTest testDebugUnitTest
+./gradlew testJalapenoDebugUnitTest testDebugUnitTest jacocoTestReport
 TESTS_EXIT_STATUS=$?
 set -e
 
-if [[ "$TESTS_EXIT_STATUS" -ne 0 ]]; then
-  # Keep the (otherwise collapsed) current "Testing" section open in Buildkite logs on error. See https://buildkite.com/docs/pipelines/managing-log-output#collapsing-output
-  echo "^^^ +++"
-  echo "Unit Tests failed!"
+if [[ "$TESTS_EXIT_STATUS" -eq 0 ]]; then
+  echo -e "\n--- ⚒️ Uploading code coverage"
+  .buildkite/commands/upload-code-coverage.sh
 fi
 
-
-echo "--- 🚦 Report Tests Status"
+echo -e "\n--- 🚦 Report Tests Status"
 results_file="WooCommerce/build/test-results/merged-test-results.xml"
 # Merge JUnit results into a single file (for performance reasons with reporting)
 # See https://github.com/woocommerce/woocommerce-android/pull/12064
@@ -33,10 +31,6 @@ else
     annotate_test_failures "$results_file"
 fi
 
-echo "--- ⚒️ Generating and uploading code coverage"
-./gradlew jacocoTestReport
-.buildkite/commands/upload-code-coverage.sh
-
 echo "--- 🧪 Copying test logs for test collector"
 mkdir WooCommerce/build/buildkite-test-analytics && cp "$results_file" WooCommerce/build/buildkite-test-analytics
 

WooCommerce/src/main/kotlin/com/woocommerce/android/model/ProductVariation.kt

@@ -134,49 +134,71 @@ open class ProductVariation(
             } ?: ""
         }
 
-        return (cachedVariation ?: WCProductVariationModel()).also {
-            it.remoteProductId = remoteProductId
-            it.remoteVariationId = remoteVariationId
-            it.sku = sku
-            it.globalUniqueId = globalUniqueId
-            it.image = imageToJson()
-            it.regularPrice = if (regularPrice.isNotSet()) "" else regularPrice.toString()
-            it.salePrice = if (salePrice.isNotSet()) "" else salePrice.toString()
-            if (isSaleScheduled) {
-                saleStartDateGmt?.let { dateOnSaleFrom ->
-                    it.dateOnSaleFromGmt = dateOnSaleFrom.formatToYYYYmmDDhhmmss()
-                }
-                it.dateOnSaleToGmt = saleEndDateGmt?.formatToYYYYmmDDhhmmss() ?: ""
+        fun getDateOnSaleFromGmt(): String {
+            return if (isSaleScheduled) {
+                saleStartDateGmt?.formatToYYYYmmDDhhmmss() ?: ""
             } else {
-                it.dateOnSaleFromGmt = ""
-                it.dateOnSaleToGmt = ""
+                ""
             }
-            it.stockStatus = ProductStockStatus.fromStockStatus(stockStatus)
-            it.backorders = ProductBackorderStatus.fromBackorderStatus(backorderStatus)
-            it.stockQuantity = stockQuantity
-            it.purchasable = isPurchasable
-            it.virtual = isVirtual
-            it.downloadable = isDownloadable
-            it.manageStock = isStockManaged
-            it.description = description
-            it.status = if (isVisible) PUBLISH.value else PRIVATE.value
-            it.shippingClass = shippingClass
-            it.shippingClassId = shippingClassId.toInt()
-            it.menuOrder = menuOrder
-            it.attributes = JsonArray().toString()
-            attributes.takeIf { list -> list.isNotEmpty() }
-                ?.forEach { variant -> it.addVariant(variant.asSourceModel()) }
-            it.length = if (length == 0f) "" else length.formatToString()
-            it.width = if (width == 0f) "" else width.formatToString()
-            it.weight = if (weight == 0f) "" else weight.formatToString()
-            it.height = if (height == 0f) "" else height.formatToString()
-            it.minAllowedQuantity = minAllowedQuantity ?: -1
-            it.maxAllowedQuantity = maxAllowedQuantity ?: -1
-            it.groupOfQuantity = groupOfQuantity ?: -1
-            it.overrideProductQuantities = overrideProductQuantities ?: false
-            if (this is SubscriptionProductVariation) {
+        }
+
+        fun getDateOnSaleToGmt(): String {
+            return if (isSaleScheduled) {
+                saleEndDateGmt?.formatToYYYYmmDDhhmmss() ?: ""
+            } else {
+                ""
+            }
+        }
+
+        fun attributesToJson(): String {
+            val jsonArray = JsonArray()
+            attributes.forEach { variantOption ->
+                JsonObject().apply {
+                    addProperty("id", variantOption.id)
+                    addProperty("name", variantOption.name)
+                    addProperty("option", variantOption.option)
+                }.also { jsonArray.add(it) }
+            }
+            return jsonArray.toString()
+        }
+
+        return (cachedVariation ?: WCProductVariationModel()).copy(
+            remoteProductId = remoteProductId,
+            remoteVariationId = remoteVariationId,
+            sku = sku,
+            globalUniqueId = globalUniqueId,
+            image = imageToJson(),
+            regularPrice = if (regularPrice.isNotSet()) "" else regularPrice.toString(),
+            salePrice = if (salePrice.isNotSet()) "" else salePrice.toString(),
+            dateOnSaleFromGmt = getDateOnSaleFromGmt(),
+            dateOnSaleToGmt = getDateOnSaleToGmt(),
+            stockStatus = ProductStockStatus.fromStockStatus(stockStatus),
+            backorders = ProductBackorderStatus.fromBackorderStatus(backorderStatus),
+            stockQuantity = stockQuantity,
+            purchasable = isPurchasable,
+            virtual = isVirtual,
+            downloadable = isDownloadable,
+            manageStock = isStockManaged,
+            description = description,
+            status = if (isVisible) PUBLISH.value else PRIVATE.value,
+            shippingClass = shippingClass,
+            shippingClassId = shippingClassId.toInt(),
+            menuOrder = menuOrder,
+            attributes = attributesToJson(),
+            length = if (length == 0f) "" else length.formatToString(),
+            width = if (width == 0f) "" else width.formatToString(),
+            weight = if (weight == 0f) "" else weight.formatToString(),
+            height = if (height == 0f) "" else height.formatToString(),
+            minAllowedQuantity = minAllowedQuantity ?: -1,
+            maxAllowedQuantity = maxAllowedQuantity ?: -1,
+            groupOfQuantity = groupOfQuantity ?: -1,
+            overrideProductQuantities = overrideProductQuantities ?: false,
+        ).let {
+            if (this@ProductVariation is SubscriptionProductVariation) {
                 // Subscription details are currently the only editable metadata fields from the app.
-                it.metadata = subscriptionDetails?.toMetadataJson().toString()
+                it.copy(metadata = subscriptionDetails?.toMetadataJson().toString())
+            } else {
+                it
             }
         }
     }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/details/ProductDetailBottomSheetBuilder.kt

@@ -105,7 +105,7 @@ class ProductDetailBottomSheetBuilder(
         }
     }
 
-    private fun ProductAggregate.getShipping(): ProductDetailBottomSheetUiItem? {
+    private suspend fun ProductAggregate.getShipping(): ProductDetailBottomSheetUiItem? {
         return if (!product.isVirtual && !hasShipping) {
             ProductDetailBottomSheetUiItem(
                 ProductDetailBottomSheetType.PRODUCT_SHIPPING,

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/details/ProductDetailCardBuilder.kt

@@ -85,6 +85,7 @@ import com.woocommerce.android.util.CurrencyFormatter
 import com.woocommerce.android.util.PriceUtils
 import com.woocommerce.android.util.StringUtils
 import com.woocommerce.android.viewmodel.ResourceProvider
+import kotlinx.coroutines.runBlocking
 import java.math.BigDecimal
 
 @Suppress("LargeClass", "LongParameterList")
@@ -518,9 +519,11 @@ class ProductDetailCardBuilder(
                                         subscription?.supportsOneTimeShipping ?: false
                                     } else {
                                         // For variable subscription products, we need to check against the variations
-                                        variationRepository.getProductVariationList(product.remoteId).all {
-                                            (it as? SubscriptionProductVariation)?.subscriptionDetails
-                                                ?.supportsOneTimeShipping ?: false
+                                        runBlocking {
+                                            variationRepository.getProductVariationList(product.remoteId).all {
+                                                (it as? SubscriptionProductVariation)?.subscriptionDetails
+                                                    ?.supportsOneTimeShipping ?: false
+                                            }
                                         }
                                     }
                                 )
@@ -951,7 +954,7 @@ class ProductDetailCardBuilder(
         }
     )
 
-    private fun Product.warning(): ProductProperty? {
+    private suspend fun Product.warning(): ProductProperty? {
         val variations = variationRepository.getProductVariationList(this.remoteId)
 
         val missingPriceVariation = variations

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/details/ProductDetailRepository.kt

@@ -331,7 +331,7 @@ class ProductDetailRepository @Inject constructor(
 
     fun isSkuAvailableLocally(sku: String) = runBlocking { !productStore.isProductExists(selectedSite.get(), sku) }
 
-    fun getCachedVariationCount(remoteProductId: Long) =
+    suspend fun getCachedVariationCount(remoteProductId: Long) =
         productStore.getVariationsForProduct(selectedSite.get(), remoteProductId).size
 
     fun getTaxClassesForSite(): List<TaxClass> =

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/variations/VariationDetailRepository.kt

@@ -90,7 +90,7 @@ class VariationDetailRepository @Inject constructor(
             }
         }
 
-    private fun getCachedWCVariation(remoteProductId: Long, remoteVariationId: Long): WCProductVariationModel? =
+    private suspend fun getCachedWCVariation(remoteProductId: Long, remoteVariationId: Long): WCProductVariationModel? =
         productStore.getVariationByRemoteId(selectedSite.get(), remoteProductId, remoteVariationId)
 
     suspend fun getQuantityRules(remoteProductId: Long, remoteVariationId: Long): QuantityRules? {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/variations/VariationRepository.kt

@@ -74,7 +74,7 @@ class VariationRepository @Inject constructor(
     /**
      * Returns all product variations for a product and current site that are in the database
      */
-    fun getProductVariationList(remoteProductId: Long): List<ProductVariation> {
+    suspend fun getProductVariationList(remoteProductId: Long): List<ProductVariation> {
         val product = productStore.getProductByRemoteId(selectedSite.get(), remoteProductId)
         return productStore.getVariationsForProduct(selectedSite.get(), remoteProductId)
             .map {

config/gradle/jacoco.gradle

@@ -16,6 +16,8 @@ rootProject.afterEvaluate {
                 ':libs:fluxc-plugin:testDebugUnitTest',
                 ':libs:fluxc-tests:testDebugUnitTest',
                 ':libs:login:testDebugUnitTest',
+                ':libs:apifaker:testDebugUnitTest',
+                ':libs:commons:testDebugUnitTest',
         )
 
         group = "Reporting"