fix: Corrected cart creation with correct ID

Resolved an issue with incorrect cart ID assignment: - Fixed the logic to ensure the correct ID is used when creating a new cart.
D4rK7355608 · Nov 9, 2024 · 726b497 · 726b497
1 parent 2e01f4f
commit 726b497
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/app/src/main/kotlin/com/d4rk/cartcalculator/ui/screens/home/HomeScreen.kt b/app/src/main/kotlin/com/d4rk/cartcalculator/ui/screens/home/HomeScreen.kt
@@ -81,7 +81,7 @@ fun HomeScreen(context : Context , view : View , viewModel : HomeViewModel) {
                                 .weight(1f)
                                 .padding(bottom = uiState.fabAdHeight)
                     ) {
-                        items(uiState.carts) { cart ->
+                        items(items = uiState.carts , key = { cart -> cart.cartId }) { cart ->
                             CartItemComposable(cart ,
                                                onDelete = { viewModel.openDeleteCartDialog(it) } ,
                                                onCardClick = {

diff --git a/app/src/main/kotlin/com/d4rk/cartcalculator/ui/screens/home/HomeViewModel.kt b/app/src/main/kotlin/com/d4rk/cartcalculator/ui/screens/home/HomeViewModel.kt
@@ -41,11 +41,9 @@ class HomeViewModel(application : Application) : BaseViewModel(application) {
 
     fun addCart(cart : ShoppingCartTable) {
         viewModelScope.launch(coroutineExceptionHandler) {
-            repository.addCartRepository(cart) {
-                _uiState.update {
-                    val newList = it.carts.toMutableList()
-                    newList.add(cart)
-                    it.copy(carts = newList)
+            repository.addCartRepository(cart) { addedCart ->
+                _uiState.update { currentState ->
+                    currentState.copy(carts = (currentState.carts + addedCart).toMutableList())
                 }
             }
         }

diff --git a/app/src/main/kotlin/com/d4rk/cartcalculator/ui/screens/home/repository/HomeRepository.kt b/app/src/main/kotlin/com/d4rk/cartcalculator/ui/screens/home/repository/HomeRepository.kt
@@ -26,18 +26,18 @@ class HomeRepository(application : Application) :
         }
     }
 
-    suspend fun addCartRepository(cart : ShoppingCartTable , onSuccess : () -> Unit) {
+    suspend fun addCartRepository(cart : ShoppingCartTable , onSuccess : (ShoppingCartTable) -> Unit , ) {
         withContext(Dispatchers.IO) {
-            addCartImplementation(cart)
+            val addedCart = addCartImplementation(cart = cart)
             withContext(Dispatchers.Main) {
-                onSuccess()
+                onSuccess(addedCart)
             }
         }
     }
 
     suspend fun deleteCartRepository(cart : ShoppingCartTable , onSuccess : () -> Unit) {
         withContext(Dispatchers.IO) {
-            deleteCartImplementation(cart)
+            deleteCartImplementation(cart = cart)
             withContext(Dispatchers.Main) {
                 onSuccess()
             }

diff --git a/...kotlin/com/d4rk/cartcalculator/ui/screens/home/repository/HomeRepositoryImplementation.kt b/...kotlin/com/d4rk/cartcalculator/ui/screens/home/repository/HomeRepositoryImplementation.kt
@@ -13,22 +13,20 @@ abstract class HomeRepositoryImplementation(val application : Application) {
     }
 
     fun openCartImplementation(cart : ShoppingCartTable) {
-        println("Shopping Cart Calculator -> HomeRepositoryImplementation: Opening cart with ID: ${cart.cartId}")
-
         application.startActivity(
             Intent(application , CartActivity::class.java).putExtra("cartId" , cart.cartId)
                     .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK)
         )
     }
 
-    suspend fun addCartImplementation(cart : ShoppingCartTable) {
-        AppCoreManager.database.newCartDao().insert(cart)
+    suspend fun addCartImplementation(cart : ShoppingCartTable) : ShoppingCartTable {
+        return cart.copy(cartId = AppCoreManager.database.newCartDao().insert(cart = cart).toInt())
     }
 
     suspend fun deleteCartImplementation(cart : ShoppingCartTable) {
         with(AppCoreManager.database) {
-            newCartDao().delete(cart)
-            shoppingCartItemsDao().deleteItemsFromCart(cart.cartId)
+            newCartDao().delete(cart = cart)
+            shoppingCartItemsDao().deleteItemsFromCart(cartId = cart.cartId)
         }
     }
 }