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

fix : user order count

Browse Source
This commit is contained in:
morteza-mortezai
2025-11-05 23:39:55 +03:30
parent f8edd3f358
commit 9817917bf1
1 changed files with 31 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/order/order.repository.ts
+31 -45
View File
@@ -18,9 +18,7 @@ class OrderRepository extends BaseRepository<IOrder> {
async getUserOrderCount(userId: string) {
const pipeline = [
{
$match: {
user: new Types.ObjectId(userId),
},
$match: { user: new Types.ObjectId(userId) },
},
{
$lookup: {
@@ -30,9 +28,7 @@ class OrderRepository extends BaseRepository<IOrder> {
as: "orderItems",
},
},
{
$unwind: "$orderItems",
},
{ $unwind: "$orderItems" },
{
$group: {
_id: {
@@ -49,34 +45,25 @@ class OrderRepository extends BaseRepository<IOrder> {
$sum: {
$cond: [
{
$or: [
{ $eq: ["$_id.orderStatus", OrdersStatus.process_by_seller] },
{ $eq: ["$_id.orderStatus", OrdersStatus.wait_payment] },
],
},
{
$cond: [
{
$or: [
{ $eq: ["$_id.itemStatus", OrderItemsStatus.Processing] },
{ $eq: ["$_id.itemStatus", OrderItemsStatus.Shipped] },
],
},
1,
0,
],
$or: [{ $eq: ["$_id.itemStatus", OrderItemsStatus.Processing] }],
},
1,
0,
],
},
},
delivered: {
$sum: {
$cond: [{ $eq: ["$_id.itemStatus", OrderItemsStatus.Delivered] }, 1, 0],
},
},
cancelled: {
$sum: {
$cond: [
{
$and: [
{ $eq: ["$_id.orderStatus", OrdersStatus.process_by_seller] },
{ $eq: ["$_id.itemStatus", OrderItemsStatus.Delivered] },
$in: [
"$_id.itemStatus",
[OrderItemsStatus.cancelled_system, OrderItemsStatus.cancelled_user, OrderItemsStatus.cancelled_shop],
],
},
1,
@@ -84,18 +71,14 @@ class OrderRepository extends BaseRepository<IOrder> {
],
},
},
cancelled: {
returned: {
$sum: {
$cond: [
{
$and: [
{ $eq: ["$_id.orderStatus", OrdersStatus.cancelled_system] },
{ $eq: ["$_id.itemStatus", OrderItemsStatus.cancelled_system] },
],
},
1,
0,
],
$cond: [{ $eq: ["$_id.itemStatus", OrderItemsStatus.Returned] }, 1, 0],
},
},
shipped: {
$sum: {
$cond: [{ $eq: ["$_id.itemStatus", OrderItemsStatus.Shipped] }, 1, 0],
},
},
},
@@ -106,12 +89,22 @@ class OrderRepository extends BaseRepository<IOrder> {
processing: 1,
delivered: 1,
cancelled: 1,
returned: 1,
shipped: 1,
},
},
];
const result = await this.model.aggregate(pipeline);
return result[0] || { processing: 0, delivered: 0, cancelled: 0 };
const [result] = await this.model.aggregate(pipeline);
return (
result || {
processing: 0,
delivered: 0,
cancelled: 0,
returned: 0,
shipped: 0,
}
);
}
async getUserOrders(userId: string, statusQuery: OrderStatusQuery) {
@@ -123,7 +116,6 @@ class OrderRepository extends BaseRepository<IOrder> {
switch (statusQuery) {
case "Cancelled":
// matchQuery.$or = [{ orderStatus: OrdersStatus.cancelled_system }, { orderStatus: OrdersStatus.Cancelled }];
orderItemsMatchQuery.$or = [
{ "orderItems.status": OrderItemsStatus.cancelled_system },
{ "orderItems.status": OrderItemsStatus.cancelled_shop },
@@ -131,21 +123,15 @@ class OrderRepository extends BaseRepository<IOrder> {
];
break;
case "Processing":
// matchQuery.$or = [{ orderStatus: OrdersStatus.process_by_seller }, { orderStatus: OrdersStatus.wait_payment }];
orderItemsMatchQuery["orderItems.status"] = OrderItemsStatus.Processing;
// { "orderItems.status": OrderItemsStatus.Shipped },
break;
case "Delivered":
// matchQuery.orderStatus = OrdersStatus.process_by_seller;
orderItemsMatchQuery["orderItems.status"] = OrderItemsStatus.Delivered;
break;
case "Returned":
// matchQuery.orderStatus = OrdersStatus.process_by_seller;
orderItemsMatchQuery["orderItems.status"] = OrderItemsStatus.Returned;
break;
case "Shipped":
// matchQuery.orderStatus = OrdersStatus.process_by_seller;
orderItemsMatchQuery["orderItems.status"] = OrderItemsStatus.Shipped;
break;
default: