danak/shop-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #40 from Danakcorp/mrtz

Browse Source 
fix : returned and canncell status
This commit is contained in:
morteza-mortezai
2025-10-29 12:36:25 +03:30
committed by GitHub
parent fc2dbc79e3 35ff18274e
commit 749ffca4b3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/order/order.repository.ts
+3 -1
View File
@@ -117,12 +117,13 @@ class OrderRepository extends BaseRepository<IOrder> {
async getUserOrders(userId: string, statusQuery: OrderStatusQuery) { async getUserOrders(userId: string, statusQuery: OrderStatusQuery) {
const matchQuery: { [k: string]: unknown } = { const matchQuery: { [k: string]: unknown } = {
user: new Types.ObjectId(userId), user: new Types.ObjectId(userId),
$or: [],
}; };
const orderItemsMatchQuery: { [k: string]: unknown } = {}; const orderItemsMatchQuery: { [k: string]: unknown } = {};
switch (statusQuery) { switch (statusQuery) {
case "Cancelled": case "Cancelled":
matchQuery.$or = [{ status: OrdersStatus.cancelled_system }, { status: OrdersStatus.Cancelled }]; matchQuery.$or = [{ orderStatus: OrdersStatus.cancelled_system }, { orderStatus: OrdersStatus.Cancelled }];
orderItemsMatchQuery.$or = [ orderItemsMatchQuery.$or = [
{ "orderItems.status": OrderItemsStatus.cancelled_system }, { "orderItems.status": OrderItemsStatus.cancelled_system },
{ "orderItems.status": OrderItemsStatus.cancelled_shop }, { "orderItems.status": OrderItemsStatus.cancelled_shop },
@@ -147,6 +148,7 @@ class OrderRepository extends BaseRepository<IOrder> {
default: default:
break; break;
} }
console.log("matchQuery", matchQuery);
return this.model.aggregate([ return this.model.aggregate([
{ {
$match: matchQuery, $match: matchQuery,