orderiom-api-package 0.2.39 → 0.2.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orderiom-api-package",
-  "version": "0.2.39",
+  "version": "0.2.41",
   "description": "this package will install all neccessary api calls for every orderiom restaurant",
   "main": "index.js",
   "scripts": {

package/src/modules/product.js

@@ -113,6 +113,25 @@ const mutations = {
     }
 };
 const actions = {
+    calculateBasketIdParameter({ rootState }){
+        if(rootState.orderiomApiPackage.auth.privateToken) return undefined;
+        // localStorage might fail
+        let baskets = [];
+        try{
+            baskets = JSON.parse(localStorage.getItem("basket")) || [];
+        }catch(e){
+            console.error(e);
+            throw new Error('Basket not found');
+        }
+        const foundBasket = baskets.find(basket => basket.restaurantId === restaurantId);
+        if(!foundBasket){
+            throw new Error('Basket not found');
+        }
+        return foundBasket.basketId;
+    },
+    // TODO: note the axios in loop
+    // Orderiom api doesn't use this function
+    // check whether ordermood is using this function or not
     getCategoriesWithProducts({ commit, dispatch }, restaurantId) {
         return axios
             .get("api/restaurant/category", { params: { restaurantId: restaurantId } })
@@ -177,6 +196,8 @@ const actions = {
             .get("api/restaurant/category", { params: { restaurantId: restaurantId } })
             .then((res) => {
                 let categories = res.data.data;
+                //TODO: why calling an api write after another while we can do it together?
+                //TODO: this api call returns empty on restaurant refresh
                 axios
                     .get("api/restaurant/category", { params: { restaurantId: restaurantId, extra: 1 } })
                     .then((res) => {
@@ -230,16 +251,21 @@ const actions = {
                 }
             });
     },
-    getProducts({ commit, state }, data) {
+    getProducts({ commit, state, dispatch }, data) {
         commit("setSelectedCategory", data.category);
 
-        const params = {
+        let basketId = undefined;
+        try{
+            basketId = dispatch('calculateBasketIdParameter');
+        } catch {
+            return { type: 'error', msg: 'Basket not found' }
+        }
+
+        return axios.get("api/restaurant/products", {params: {
             categoryId: data.category.id,
             restaurantId: data.restaurantId,
-        };
-        if(data.deliveryType) params.deliveryType = data.deliveryType;
-
-        return axios.get("api/restaurant/products", { params }).then(res => {
+            basketId
+        }}).then(res => {
             let products = res.data.data;
             products.map(m => {
                 if (state.ShoppingCart.find(
@@ -431,20 +457,10 @@ const actions = {
     },
     changeDeliveryMethod({ commit, dispatch, rootState }, deliveryType){
         let basketId = undefined;
-
-        if(!rootState.orderiomApiPackage.auth.privateToken){
-            // localStorage might fail
-            let baskets = [];
-            try{
-                baskets = JSON.parse(localStorage.getItem("basket")) || [];
-            }catch(e){
-                console.error(e);
-            }
-            const foundBasket = baskets.find(basket => basket.restaurantId === restaurantId);
-            basketId = foundBasket ? foundBasket.basketId : null;
-            if(!basketId){
-                return { type: 'error', msg: 'Basket not found' }
-            }
+        try{
+            basketId = dispatch('calculateBasketIdParameter');
+        } catch {
+            return { type: 'error', msg: 'Basket not found' }
         }
 
         const shoppingCartItems = rootState.orderiomApiPackage.product.ShoppingCart.length;
@@ -459,6 +475,11 @@ const actions = {
                 return { type: 'error', msg: 'There was an error in updating the delivery type' }
             }
 
+            dispatch('getProducts', {
+                restaurantId,
+                category: state.selectedCategory || state.categories[0]
+            });
+
             const result = await dispatch("getBasket", restaurantId);
 
             return {