feature:EF-189 update count order analytics (#74)

Deco-Team · Mar 10, 2024 · 01285f3 · 01285f3
1 parent 084d75d
commit 01285f3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/src/analytic/services/analytic.service.ts b/src/analytic/services/analytic.service.ts
@@ -23,7 +23,12 @@ export class AnalyticService {
         $in: [OrderStatus.PENDING, OrderStatus.CONFIRMED, OrderStatus.DELIVERING, OrderStatus.COMPLETED]
       },
       transactionStatus: {
-        $in: [TransactionStatus.CAPTURED, TransactionStatus.DRAFT, TransactionStatus.ERROR]
+        $in: [
+          TransactionStatus.CAPTURED,
+          TransactionStatus.ERROR,
+          TransactionStatus.CANCELED,
+          TransactionStatus.REFUNDED
+        ]
       }
     }
     const [total, previousTotal] = await Promise.all([

diff --git a/src/order/services/order.service.ts b/src/order/services/order.service.ts
@@ -34,7 +34,12 @@ export class OrderService {
       {
         ...filter,
         transactionStatus: {
-          $ne: TransactionStatus.DRAFT
+          $in: [
+            TransactionStatus.CAPTURED,
+            TransactionStatus.ERROR,
+            TransactionStatus.CANCELED,
+            TransactionStatus.REFUNDED
+          ]
         },
         status: {
           $ne: OrderStatus.DELETED
@@ -53,7 +58,12 @@ export class OrderService {
       conditions: {
         ...filter,
         transactionStatus: {
-          $ne: TransactionStatus.DRAFT
+          $in: [
+            TransactionStatus.CAPTURED,
+            TransactionStatus.ERROR,
+            TransactionStatus.CANCELED,
+            TransactionStatus.REFUNDED
+          ]
         },
         status: {
           $ne: OrderStatus.DELETED
@@ -285,8 +295,8 @@ export class OrderService {
     const order = await this.orderRepository.findOneAndUpdate(
       {
         _id: orderId,
-        orderStatus: OrderStatus.DELIVERING
-        // transactionStatus: TransactionStatus.CAPTURED
+        orderStatus: OrderStatus.DELIVERING,
+        transactionStatus: TransactionStatus.CAPTURED
       },
       {
         $set: { orderStatus: OrderStatus.COMPLETED, completeDate: new Date() },