Database CRUD events extracted to dedicated methods

openfoodfacts · Apr 8, 2022 · 27d9ad9 · 27d9ad9
1 parent 31b6e7b
commit 27d9ad9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/...foodfacts/github/scrachx/openfood/features/product/view/summary/SummaryProductFragment.kt b/...foodfacts/github/scrachx/openfood/features/product/view/summary/SummaryProductFragment.kt
@@ -82,6 +82,7 @@ import openfoodfacts.github.scrachx.openfood.images.ProductImage
 import openfoodfacts.github.scrachx.openfood.models.*
 import openfoodfacts.github.scrachx.openfood.models.entities.ListedProduct
 import openfoodfacts.github.scrachx.openfood.models.entities.ListedProductDao
+import openfoodfacts.github.scrachx.openfood.models.entities.ProductLists
 import openfoodfacts.github.scrachx.openfood.models.entities.additive.AdditiveName
 import openfoodfacts.github.scrachx.openfood.models.entities.allergen.AllergenHelper
 import openfoodfacts.github.scrachx.openfood.models.entities.allergen.AllergenName
@@ -883,11 +884,7 @@ class SummaryProductFragment : BaseFragment(), ISummaryProductPresenter.View {
                 it.productDetails = product.getProductBrandsQuantityDetails()
                 it.imageUrl = product.getImageSmallUrl(localeManager.getLanguage())
             }
-            daoSession.listedProductDao.insertOrReplace(product)
-            daoSession.productListsDao.update(list.apply {
-                products.add(product)
-                numOfProducts++ }
-            )
+            addListedProductToDatabase(product, list)
             matomoAnalytics.trackEvent(AnalyticsEvent.ShoppingListProductAdded(product.barcode))
             dialog.dismiss()
             onRefresh()
@@ -902,7 +899,17 @@ class SummaryProductFragment : BaseFragment(), ISummaryProductPresenter.View {
         }
     }
 
-
+    private suspend fun addListedProductToDatabase(
+        product: ListedProduct,
+        list: ProductLists
+    ) {
+        daoSession.listedProductDao.insertOrReplace(product)
+        daoSession.productListsDao.update(list.apply {
+            products.add(product)
+            numOfProducts++
+        })
+    }
+
     private fun takeMorePicture() {
         sendOther = true
         doChooseOrTakePhotos()

diff --git a/...in/java/openfoodfacts/github/scrachx/openfood/features/productlist/ProductListActivity.kt b/...in/java/openfoodfacts/github/scrachx/openfood/features/productlist/ProductListActivity.kt
@@ -24,7 +24,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.squareup.picasso.Picasso
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
 import openfoodfacts.github.scrachx.openfood.AppFlavors.OFF
 import openfoodfacts.github.scrachx.openfood.AppFlavors.isFlavors
 import openfoodfacts.github.scrachx.openfood.BuildConfig
@@ -380,6 +379,15 @@ class ProductListActivity : BaseActivity(), SwipeController.Actions {
         if (adapter.products.isEmpty()) return
 
         val productToRemove = adapter.products[position]
+        removeListedProductFromDatabase(productToRemove)
+
+        matomoAnalytics.trackEvent(AnalyticsEvent.ShoppingListProductRemoved(
+            barcode = productToRemove.barcode
+        ))
+        adapter.remove(productToRemove)
+    }
+
+    private fun removeListedProductFromDatabase(productToRemove: ListedProduct) {
         daoSession.listedProductDao.delete(productToRemove)
 
         productList.apply {
@@ -389,11 +397,6 @@ class ProductListActivity : BaseActivity(), SwipeController.Actions {
 
         daoSession.listedProductDao.delete(productToRemove)
         daoSession.productListsDao.update(productList)
-
-        matomoAnalytics.trackEvent(AnalyticsEvent.ShoppingListProductRemoved(
-            barcode = productToRemove.barcode
-        ))
-        adapter.remove(productToRemove)
     }
 
     override fun onBackPressed() {