WCProductTagModel to Room

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

@@ -53,7 +53,7 @@ fun List<ProductTag>.addTags(product: Product?): List<ProductTag> {
 
 fun WCProductTagModel.toProductTag(): ProductTag {
     return ProductTag(
-        remoteTagId = this.remoteTagId,
+        remoteTagId = this.remoteTagId.value,
         name = this.name,
         slug = this.slug,
         description = this.description

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

@@ -2404,13 +2404,15 @@ class ProductDetailViewModel @Inject constructor(
     fun onProductTagAdded(tagName: String) {
         // verify if the entered tagName exists for the site
         // It so, the tag should be added to the product directly
-        productTagsRepository.getProductTagByName(tagName)?.let {
-            onProductTagSelected(it)
-        } ?: run {
-            // Since the tag does not exist for the site, add the tag to
-            // a list of newly added tags
-            _addedProductTags.addNewItem(ProductTag(name = tagName))
-            loadProductTags()
+        viewModelScope.launch {
+            productTagsRepository.getProductTagByName(tagName)?.let {
+                onProductTagSelected(it)
+            } ?: run {
+                // Since the tag does not exist for the site, add the tag to
+                // a list of newly added tags
+                _addedProductTags.addNewItem(ProductTag(name = tagName))
+                loadProductTags()
+            }
         }
     }
 
@@ -2464,12 +2466,13 @@ class ProductDetailViewModel @Inject constructor(
      */
     fun setProductTagsFilter(filter: String) {
         productTagsViewState = productTagsViewState.copy(currentFilter = filter)
-        val productTags = productTagsRepository.getProductTags()
-        filterProductTagList(productTags)
 
-        // fetch from the backend when a filter exists in case not all tags have been fetched yet
-        if (filter.isNotEmpty()) {
-            launch {
+        launch {
+            val productTags = productTagsRepository.getProductTags()
+            filterProductTagList(productTags)
+
+            // fetch from the backend when a filter exists in case not all tags have been fetched yet
+            if (filter.isNotEmpty()) {
                 fetchProductTags(searchQuery = filter)
             }
         }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/tags/ProductTagsRepository.kt

@@ -59,7 +59,7 @@ class ProductTagsRepository @Inject constructor(
     /**
      * Returns all product tags for the current site that are in the database
      */
-    fun getProductTags(): List<ProductTag> {
+    suspend fun getProductTags(): List<ProductTag> {
         return productStore.getTagsForSite(selectedSite.get())
             .map { it.toProductTag() }
     }
@@ -80,9 +80,9 @@ class ProductTagsRepository @Inject constructor(
         }
     }
 
-    fun getProductTagsByNames(names: List<String>) =
+    private suspend fun getProductTagsByNames(names: List<String>) =
         productStore.getProductTagsByNames(selectedSite.get(), names).map { it.toProductTag() }
 
-    fun getProductTagByName(name: String) =
+    suspend fun getProductTagByName(name: String) =
         productStore.getProductTagByName(selectedSite.get(), name)?.toProductTag()
 }