WCProductCategoryModel to Room

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/categories/AddProductCategoryFragment.kt

@@ -31,6 +31,7 @@ import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.ShowSnackbar
 import com.woocommerce.android.viewmodel.fixedHiltNavGraphViewModels
 import com.woocommerce.android.widgets.CustomProgressDialog
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.runBlocking
 import org.wordpress.android.util.ActivityUtils
 import javax.inject.Inject
 
@@ -111,7 +112,7 @@ class AddProductCategoryFragment :
         }
 
         with(binding.productCategoryParent) {
-            viewModel.getSelectedParentCategoryName()?.let { setText(it) }
+            runBlocking { viewModel.getSelectedParentCategoryName()?.let { setText(it) } }
             setClickListener {
                 val action = AddProductCategoryFragmentDirections
                     .actionAddProductCategoryFragmentToParentCategoryListFragment(
@@ -163,7 +164,7 @@ class AddProductCategoryFragment :
                 }
             }
             new.selectedParentId.takeIfNotEqualTo(old?.selectedParentId) {
-                val parentCategoryName = viewModel.getSelectedParentCategoryName()
+                val parentCategoryName = runBlocking { viewModel.getSelectedParentCategoryName() }
                 if (parentCategoryName != null) {
                     binding.productCategoryParent.setHtmlText(parentCategoryName)
                 } else {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/categories/AddProductCategoryViewModel.kt

@@ -220,7 +220,7 @@ class AddProductCategoryViewModel @Inject constructor(
 
     fun getSelectedParentId() = addProductCategoryViewState.selectedParentId ?: 0L
 
-    fun getSelectedParentCategoryName(): String? =
+    suspend fun getSelectedParentCategoryName(): String? =
         productCategoriesRepository.getProductCategoryByRemoteId(getSelectedParentId())?.name
 
     /**

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/categories/ProductCategoriesRepository.kt

@@ -76,26 +76,22 @@ class ProductCategoriesRepository @Inject constructor(
     /**
      * Returns all product categories for the current site that are in the database
      */
-    fun getProductCategoriesList(): List<ProductCategory> {
+    suspend fun getProductCategoriesList(): List<ProductCategory> {
         return productStore.getProductCategoriesForSite(selectedSite.get())
             .map { it.toProductCategory() }
     }
 
-    fun getProductCategoryByRemoteId(remoteId: Long) =
+    suspend fun getProductCategoryByRemoteId(remoteId: Long) =
         productStore.getProductCategoryByRemoteId(selectedSite.get(), remoteId)
 
-    fun getProductCategoryByNameAndParentId(categoryName: String, parentId: Long): ProductCategory? =
-        productStore.getProductCategoryByNameAndParentId(selectedSite.get(), categoryName, parentId)
-            ?.toProductCategory()
-
     suspend fun addProductCategories(categories: List<ProductCategory>): Result<List<ProductCategory>> {
         val result = productStore.addProductCategories(
             site = selectedSite.get(),
             categories = categories.map {
-                WCProductCategoryModel().apply {
-                    name = it.name
+                WCProductCategoryModel(
+                    name = it.name,
                     parent = it.parentId
-                }
+                )
             }
         )
 
@@ -115,10 +111,10 @@ class ProductCategoriesRepository @Inject constructor(
     suspend fun addProductCategory(categoryName: String, parentId: Long): Result<ProductCategory> {
         val result = productStore.addProductCategory(
             site = selectedSite.get(),
-            category = WCProductCategoryModel().apply {
-                name = categoryName
+            category = WCProductCategoryModel(
+                name = categoryName,
                 parent = parentId
-            }
+            )
         )
         return when {
             result.isError -> {
@@ -136,11 +132,11 @@ class ProductCategoriesRepository @Inject constructor(
     suspend fun updateProductCategory(remoteId: Long, categoryName: String, parentId: Long): Result<ProductCategory> {
         val result = productStore.updateProductCategory(
             site = selectedSite.get(),
-            category = WCProductCategoryModel().apply {
-                remoteCategoryId = remoteId
-                name = categoryName
+            category = WCProductCategoryModel(
+                remoteCategoryId = remoteId,
+                name = categoryName,
                 parent = parentId
-            }
+            )
         )
         return when {
             result.isError -> {

WooCommerce/src/test/kotlin/com/woocommerce/android/ui/products/GetCategoriesByIdsTest.kt

@@ -54,11 +54,11 @@ class GetCategoriesByIdsTest : BaseUnitTest() {
     }
 
     private val databaseCategories = List(3) { n ->
-        WCProductCategoryModel().apply {
-            localSiteId = 3
-            remoteCategoryId = n.toLong()
-            name = "category $n"
-        }
+        WCProductCategoryModel(
+            localSiteId = 3,
+            remoteCategoryId = n.toLong(),
+            name = "category $n",
+        )
     }
 
     private var productCategories = databaseCategories.map { it.toProductCategory() }