add event for order after removing dish and update related emitters

Author: VuXfi

libs/AwaitEmitter.d.ts

@@ -81,6 +81,7 @@ declare global {
         "promotion-process:debug": [number, OrderRecord, PromotionRecord, any];
         "core:adapter-rms-sync-out-of-stock-touch": [];
         "core:order-after-create": [OrderRecord];
+        "core:order-after-remove-dish": [OrderRecord, string, DishRecord, number, boolean];
     }
 }
 /**

libs/AwaitEmitter.ts

@@ -88,7 +88,8 @@ declare global {
     "core:add-product-before-write": [OrderRecord, DishRecord]
     "promotion-process:debug": [number, OrderRecord, PromotionRecord, any],
     "core:adapter-rms-sync-out-of-stock-touch": []
-    "core:order-after-create": [OrderRecord]
+    "core:order-after-create": [OrderRecord],
+    "core:order-after-remove-dish": [OrderRecord, string, DishRecord, number, boolean]
   }
 }
 

models/Order.js

@@ -470,9 +470,9 @@ let Model = {
         else {
             await OrderDish.destroy({ id: orderDish.id }).fetch();
         }
-        await emitter.emit.apply(emitter, ["core:order-after-remove-dish", ...arguments]);
         await Order.next(order.id, "CART");
-        await Order.countCart({ id: order.id });
+        const countedBasket = await Order.countCart({ id: order.id });
+        await emitter.emit.apply(emitter, ["core:order-after-remove-dish", countedBasket, ...arguments]);
     },
     async setCount(criteria, dish, amount) {
         await emitter.emit.apply(emitter, ["core:order-before-set-count", ...arguments]);
@@ -500,9 +500,9 @@ let Model = {
                 sails.log.info("destroy", get.id);
             }
             await Order.next(order.id, "CART");
-            await Order.countCart({ id: order.id });
+            const resultOrder = await Order.countCart({ id: order.id });
             Order.update({ id: order.id }, order).fetch();
-            await emitter.emit.apply(emitter, ["core:order-after-set-count", ...arguments]);
+            await emitter.emit.apply(emitter, ["core:order-after-set-count", resultOrder, ...arguments]);
         }
         else {
             await emitter.emit.apply(emitter, ["core:order-set-count-reject-no-orderdish", ...arguments]);

models/Order.ts

@@ -604,9 +604,9 @@ let Model = {
       await OrderDish.destroy({ id: orderDish.id }).fetch();
     }
 
-    await emitter.emit.apply(emitter, ["core:order-after-remove-dish", ...arguments]);
     await Order.next(order.id, "CART");
-    await Order.countCart({ id: order.id });
+    const countedBasket = await Order.countCart({ id: order.id });
+    await emitter.emit.apply(emitter, ["core:order-after-remove-dish", countedBasket, ...arguments]);
   },
 
   async setCount(criteria: CriteriaQuery<OrderRecord>, dish: OrderDishRecord, amount: number): Promise<void> {
@@ -638,9 +638,9 @@ let Model = {
       }
 
       await Order.next(order.id, "CART");
-      await Order.countCart({ id: order.id });
+      const resultOrder = await Order.countCart({ id: order.id });
       Order.update({ id: order.id }, order).fetch();
-      await emitter.emit.apply(emitter, ["core:order-after-set-count", ...arguments]);
+      await emitter.emit.apply(emitter, ["core:order-after-set-count", resultOrder, ...arguments]);
     } else {
       await emitter.emit.apply(emitter, ["core:order-set-count-reject-no-orderdish", ...arguments]);
       throw { body: `OrderDish dish id ${dish.id} not found`, code: 2 };