feat: refactor tag handling in AccountViewModel and HomeBottomContent (#109)

Author: yogeshpaliyal

app/src/main/java/com/yogeshpaliyal/deepr/ui/screens/home/HomeBottomContent.kt

@@ -112,23 +112,12 @@ fun HomeBottomContent(
             viewModel.removeTagFromLink(deeprInfo.id, tagId)
         }
 
-        // Then add selected tags
-        selectedTags.forEach { tag ->
-            if (tag.id > 0) {
-                // Existing tag
-                viewModel.addTagToLink(deeprInfo.id, tag.id)
-            } else {
-                // New tag
-                viewModel.addTagToLinkByName(deeprInfo.id, tag.name)
-            }
-        }
-
         if (deeprInfo.id == 0L) {
             // New Account
-            viewModel.insertAccount(deeprInfo.link, deeprInfo.name, executeAfterSave)
+            viewModel.insertAccount(deeprInfo.link, deeprInfo.name, executeAfterSave, selectedTags)
         } else {
             // Edit
-            viewModel.updateDeeplink(deeprInfo.id, deeprInfo.link, deeprInfo.name)
+            viewModel.updateDeeplink(deeprInfo.id, deeprInfo.link, deeprInfo.name, selectedTags)
         }
         onSaveDialogInfoChange(SaveDialogInfo(deeprInfo, executeAfterSave))
     }

app/src/main/java/com/yogeshpaliyal/deepr/viewmodel/AccountViewModel.kt

@@ -116,21 +116,21 @@ class AccountViewModel(
     }
 
     // Add tag to link
-    fun addTagToLink(
+    private suspend fun addTagToLink(
         linkId: Long,
         tagId: Long,
     ) {
-        viewModelScope.launch(Dispatchers.IO) {
+        withContext(Dispatchers.IO) {
             deeprQueries.addTagToLink(linkId, tagId)
         }
     }
 
     // Add tag by name (creates tag if it doesn't exist)
-    fun addTagToLinkByName(
+    private suspend fun addTagToLinkByName(
         linkId: Long,
         tagName: String,
     ) {
-        viewModelScope.launch(Dispatchers.IO) {
+        withContext(Dispatchers.IO) {
             // Create the tag if it doesn't exist
             deeprQueries.insertTag(tagName)
 
@@ -200,9 +200,31 @@ class AccountViewModel(
         link: String,
         name: String,
         executed: Boolean,
+        tagsList: List<Tags>,
     ) {
         viewModelScope.launch(Dispatchers.IO) {
             deeprQueries.insertDeepr(link = link, name, if (executed) 1 else 0)
+            deeprQueries.lastInsertRowId().executeAsOneOrNull()?.let {
+                modifyTagsForLink(it, tagsList)
+            }
+        }
+    }
+
+    suspend fun modifyTagsForLink(
+        linkId: Long,
+        tagsList: List<Tags>,
+    ) {
+        withContext(Dispatchers.IO) {
+            // Then add selected tags
+            tagsList.forEach { tag ->
+                if (tag.id > 0) {
+                    // Existing tag
+                    addTagToLink(linkId, tag.id)
+                } else {
+                    // New tag
+                    addTagToLinkByName(linkId, tag.name)
+                }
+            }
         }
     }
 
@@ -222,9 +244,11 @@ class AccountViewModel(
         id: Long,
         newLink: String,
         newName: String,
+        tagsList: List<Tags>,
     ) {
         viewModelScope.launch(Dispatchers.IO) {
             deeprQueries.updateDeeplink(newLink, newName, id)
+            modifyTagsForLink(id, tagsList)
         }
     }