Changes fun deleteConversation parameter

Author: sollarp

.idea/deploymentTargetDropDown.xml

@@ -5,5 +5,5 @@ import com.chatgptlite.wanted.models.ConversationModel
 interface ConversationRepository {
     suspend fun fetchConversations() : MutableList<ConversationModel>
     fun newConversation(conversation: ConversationModel) : ConversationModel
-    fun deleteConversation(index: Int)
+    suspend fun deleteConversation(conversationId: String)
 }

app/src/main/java/com/chatgptlite/wanted/data/remote/ConversationRepository.kt

@@ -15,13 +15,11 @@ import javax.inject.Inject
 class ConversationRepositoryImpl @Inject constructor(
     private val fsInstance: FirebaseFirestore,
 ) : ConversationRepository {
-    private lateinit var result: QuerySnapshot
+
     override suspend fun fetchConversations(): MutableList<ConversationModel> {
-        result = fsInstance.collection(conversationCollection)
-            .orderBy("createdAt", Query.Direction.DESCENDING).get().await()
 
-        if (result.documents.isNotEmpty()) {
-            val documents = result.documents
+        if (getFireBaseSnapShot().documents.isNotEmpty()) {
+            val documents = getFireBaseSnapShot().documents
 
             return documents.map {
                 it.toObject(ConversationModel::class.java)
@@ -36,8 +34,18 @@ class ConversationRepositoryImpl @Inject constructor(
         return conversation
     }
 
-    override fun deleteConversation(index: Int) {
-        DataHolder.docPath = result.documents[index].id
+    override suspend fun deleteConversation(conversationId: String) {
+        var desiredKey: String? = null
+
+        getFireBaseSnapShot().documents.map { documentSnapshot ->
+            val id = documentSnapshot.getString("id")
+            if (id == conversationId) {
+                desiredKey = documentSnapshot.id
+            } else {
+                null
+            }
+        }
+        DataHolder.docPath = desiredKey.toString()
 
         val docRef = fsInstance
             .collection("conversations")
@@ -62,7 +70,9 @@ class ConversationRepositoryImpl @Inject constructor(
                     "Error deleting document", e
                 )
             }
-
     }
+    private suspend fun getFireBaseSnapShot() =
+        fsInstance.collection(conversationCollection)
+            .orderBy("createdAt", Query.Direction.DESCENDING).get().await()
 
 }

app/src/main/java/com/chatgptlite/wanted/data/remote/ConversationRepositoryImpl.kt

@@ -169,7 +169,7 @@ private fun ColumnScope.HistoryConversations(
                 },
                 onDeleteClicked = {
                     scope.launch {
-                        conversationViewModel.deleteConversation(index)
+                        conversationViewModel.deleteConversation(conversations[index].id)
                         conversationViewModel.deleteMessages(conversations[index].id)
                     }
                 }

app/src/main/java/com/chatgptlite/wanted/ui/common/AppDrawer.kt

@@ -179,7 +179,8 @@ class ConversationViewModel @Inject constructor(
         messageRepo.deleteMessage()
     }
 
-    fun deleteConversation(index: Int) = conversationRepo.deleteConversation(index)
+    suspend fun deleteConversation(conversationId: String) =
+        conversationRepo.deleteConversation(conversationId)
 
     private suspend fun fetchMessages() {
         if (_currentConversation.value.isEmpty() ||