From 20bc1c5c2ae53782ef126fb80a5663c38af877c9 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Wed, 27 Dec 2023 12:01:13 +0100
Subject: [PATCH] fixed deleting objects

---
 vue/src/components/ShoppingLineItem.vue |  2 +-
 vue/src/stores/ShoppingListStore.js     | 26 +++++++++++--------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/vue/src/components/ShoppingLineItem.vue b/vue/src/components/ShoppingLineItem.vue
index 744f98a75..9d49518d5 100644
--- a/vue/src/components/ShoppingLineItem.vue
+++ b/vue/src/components/ShoppingLineItem.vue
@@ -48,7 +48,7 @@
 
                 <h6 class="mt-2">{{ $t('Entries') }}</h6>
 
-                <b-button variant="danger" block @click="detail_modal_visible = false;useShoppingListStore().deleteFood(food)">{{ $t('Delete_All') }}</b-button>
+                <b-button variant="danger" block @click="detail_modal_visible = false;useShoppingListStore().deleteEntries(entries)">{{ $t('Delete_All') }}</b-button>
 
                 <b-row v-for="e in entries" v-bind:key="e.id">
                     <b-col cold="12">
diff --git a/vue/src/stores/ShoppingListStore.js b/vue/src/stores/ShoppingListStore.js
index 3f95344d7..7d7182aac 100644
--- a/vue/src/stores/ShoppingListStore.js
+++ b/vue/src/stores/ShoppingListStore.js
@@ -96,11 +96,7 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
         deleteObject(object) {
             let apiClient = new ApiApiFactory()
             return apiClient.destroyShoppingListEntry(object.id).then((r) => {
-
-                Vue.delete(this.category_food_entries[this.getFoodCategory(object.food)]['foods'][object.food.id]['entries'], object.id)
-                if (Object.keys(this.category_food_entries[this.getFoodCategory(object.food)]['foods'][object.food.id]['entries']).length === 0) {
-                    Vue.delete(this.category_food_entries[this.getFoodCategory(object.food)]['foods'], object.food.id)
-                }
+                Vue.delete(this.entries, object.id)
             }).catch((err) => {
                 StandardToasts.makeStandardToast(this, StandardToasts.FAIL_DELETE, err)
             })
@@ -167,11 +163,11 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 this.updateObject(this.entries[i])
             }
         },
+        /**
+         * function to handle user "delaying" shopping entries
+         * @param {{}} entries set of entries
+         */
         delayEntries(entries) {
-            /**
-             * function to handle user "delaying" shopping entry
-             * takes a food object as an argument and delays all entries associated with the food
-             */
             let delay = 4 //TODO get delay from settings
             let delay_date = new Date(Date.now() + delay * (60 * 60 * 1000))
 
@@ -181,13 +177,13 @@ export const useShoppingListStore = defineStore(_STORE_ID, {
                 this.updateObject(this.entries[i])
             }
         },
-        deleteFood(food) {
-            /**
-             * function to handle user deleting all entries of a certain food
-             */
-            let entries = this.category_food_entries[this.getFoodCategory(food)]['foods'][food.id]['entries']
+        /**
+         * delete list of entries
+         * @param {{}} entries set of entries
+         */
+        deleteEntries(entries) {
             for (let i in entries) {
-                this.deleteObject(entries[i])
+                this.deleteObject(this.entries[i])
             }
         },
     },