Merge pull request #40 from Danakcorp/mrtz

fix : returned and canncell status

src/modules/order/order.repository.ts

@@ -117,12 +117,13 @@ class OrderRepository extends BaseRepository<IOrder> {
   async getUserOrders(userId: string, statusQuery: OrderStatusQuery) {
     const matchQuery: { [k: string]: unknown } = {
       user: new Types.ObjectId(userId),
+      $or: [],
     };
     const orderItemsMatchQuery: { [k: string]: unknown } = {};
 
     switch (statusQuery) {
       case "Cancelled":
-        matchQuery.$or = [{ status: OrdersStatus.cancelled_system }, { status: OrdersStatus.Cancelled }];
+        matchQuery.$or = [{ orderStatus: OrdersStatus.cancelled_system }, { orderStatus: OrdersStatus.Cancelled }];
         orderItemsMatchQuery.$or = [
           { "orderItems.status": OrderItemsStatus.cancelled_system },
           { "orderItems.status": OrderItemsStatus.cancelled_shop },
@@ -147,6 +148,7 @@ class OrderRepository extends BaseRepository<IOrder> {
       default:
         break;
     }
+    console.log("matchQuery", matchQuery);
     return this.model.aggregate([
       {
         $match: matchQuery,