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

Merge pull request #44 from Danakcorp/mrtz

Browse Source 
Mrtz
This commit is contained in:
morteza-mortezai
2025-10-31 17:36:39 +03:30
committed by GitHub
parent a9ee1016c0 ddd662b3b6
commit 932ef2be13
8 changed files with 92 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/enums/order.enum.ts
+1
View File
@@ -6,6 +6,7 @@ export enum PaymentStatus {
export enum OrdersStatus {
wait_payment = "wait_payment",
process_by_seller = "process_by_sellers",
shipped = "shipped",
cancelled_system = "cancelled_system",
Cancelled = "cancelled",
Delivered = "Delivered",
src/common/types/query.type.ts
+1
View File
@@ -51,6 +51,7 @@ export type SellerOrdersQueries = {
limit: number;
shipperId: string;
status: string;
paymentStatus: string;
since: number;
maxPrice: number;
minPrice: number;
src/modules/admin/controllers/order.controller.ts
+14 -2
View File
@@ -159,7 +159,11 @@ export class AdminOrderController extends BaseController {
@ApiQuery("limit", "the limit of return data")
@ApiQuery("page", "the page want to get")
@ApiQuery("shipperId", "shipper id")
@ApiQuery("status", "status of payment ==> value = Completed | Cancelled | Pending ")
@ApiQuery(
"status",
"status of payment ==> value = wait_payment | process_by_sellers | shipped | cancelled_system | cancelled | Delivered",
)
@ApiQuery("paymentStatus", "status of order ==> value = Completed | Cancelled | Pending ")
@ApiQuery(
"since",
"time of order created ==> value should be standard timestamp since that time user want like == > Date.now() - (7 * 24 * 60 * 60 * 1000) ==> this mean from a week ago till now ",
@@ -174,6 +178,7 @@ export class AdminOrderController extends BaseController {
@queryParam("page") page: string,
@queryParam("shipperId") shipperId: string,
@queryParam("status") status: string,
@queryParam("paymentStatus") paymentStatus: string,
@queryParam("since") since: string,
@queryParam("maxPrice") maxPrice: string,
@queryParam("minPrice") minPrice: string,
@@ -183,6 +188,7 @@ export class AdminOrderController extends BaseController {
page: parseInt(page),
shipperId,
status,
paymentStatus,
since: +since,
maxPrice: +maxPrice,
minPrice: +minPrice,
@@ -198,7 +204,11 @@ export class AdminOrderController extends BaseController {
@ApiQuery("limit", "the limit of return data")
@ApiQuery("page", "the page want to get")
@ApiQuery("shipperId", "shipper id")
@ApiQuery("status", "status of payment ==> value = Completed | Cancelled | Pending ")
@ApiQuery(
"status",
"status of payment ==> value = wait_payment | process_by_sellers | shipped | cancelled_system | cancelled | Delivered",
)
@ApiQuery("paymentStatus", "status of order ==> value = Completed | Cancelled | Pending ")
@ApiQuery(
"since",
"time of order created ==> value should be standard timestamp since that time user want like == > Date.now() - (7 * 24 * 60 * 60 * 1000) ==> this mean from a week ago till now ",
@@ -212,6 +222,7 @@ export class AdminOrderController extends BaseController {
@queryParam("page") page: string,
@queryParam("shipperId") shipperId: string,
@queryParam("status") status: string,
@queryParam("paymentStatus") paymentStatus: string,
@queryParam("since") since: string,
@queryParam("maxPrice") maxPrice: string,
@queryParam("minPrice") minPrice: string,
@@ -221,6 +232,7 @@ export class AdminOrderController extends BaseController {
page: parseInt(page),
shipperId,
status,
paymentStatus,
since: +since,
maxPrice: +maxPrice,
minPrice: +minPrice,
src/modules/order/order.repository.ts
+5 -2
View File
@@ -768,7 +768,10 @@ class OrderItemRepo extends BaseRepository<IOrderItem> {
{
$match: {
...(queries.status && {
"order.payment.paymentStatus": queries.status,
"order.orderStatus": queries.status,
}),
...(queries.paymentStatus && {
"order.payment.paymentStatus": queries.paymentStatus,
}),
...(queries.shipperId && {
shipper: +queries.shipperId,
@@ -882,7 +885,7 @@ class OrderItemRepo extends BaseRepository<IOrderItem> {
},
{
$sort: {
"order.createdAt": -1,
createdAt: -1,
},
},
{
src/modules/order/order.service.ts
+13 -2
View File
@@ -210,15 +210,26 @@ class OrderService {
//#######################################################
//#######################################################
async insertNativeShopTrackCode(orderId: number, adminId: string, insertDto: InsertTrackCodeDTO) {
const { orderItem } = await this.validateSellerOrder(orderId, adminId);
const { orderItem, order } = await this.validateSellerOrder(orderId, adminId);
order.orderStatus = OrdersStatus.shipped;
orderItem.trackCode = insertDto.trackCode;
orderItem.postingDate = insertDto.postingDate;
orderItem.postingReceipt = insertDto.postingReceipt;
orderItem.status = OrderItemsStatus.Shipped;
await orderItem.save();
const session = await startSession();
session.startTransaction();
try {
await orderItem.save();
await order.save();
} catch (error) {
await session.abortTransaction();
throw error;
} finally {
await session.endSession();
}
return {
message: OrderMessage.TrackingDetailInserted,
orderItem,
src/modules/return/DTO/return.dto.ts
+10 -4
View File
@@ -64,12 +64,18 @@ export class ReturnOrderDTO {
@Expose()
total_price: number;
@Expose()
@Transform(({ value }) => new Date(value).toISOString())
@Transform(({ value }) => {
if (!value) return null;
const date = new Date(value);
return isNaN(date.getTime()) ? null : date.toISOString();
})
createdAt: string;
@Expose()
@Transform(({ value }) => new Date(value).toISOString())
@Transform(({ value }) => {
if (!value) return null;
const date = new Date(value);
return isNaN(date.getTime()) ? null : date.toISOString();
})
updatedAt: string;
@Expose()
src/modules/return/return.repository.ts
+41 -14
View File
@@ -14,8 +14,8 @@ export class ReturnOrderRepo extends BaseRepository<IReturnOrder> {
}
async getAllReturnsForAdmin(skip: number, limit: number) {
const [result] = await this.model.aggregate([
// --- 1. Lookup order ---
const docs = await this.model.aggregate([
// 1) lookup order
{
$lookup: {
from: "orders",
@@ -26,7 +26,7 @@ export class ReturnOrderRepo extends BaseRepository<IReturnOrder> {
},
{ $unwind: { path: "$order", preserveNullAndEmptyArrays: true } },
// --- 2. Lookup return order items ---
// 2) lookup return order items
{
$lookup: {
from: "returnorderitems",
@@ -36,8 +36,22 @@ export class ReturnOrderRepo extends BaseRepository<IReturnOrder> {
},
},
{ $unwind: { path: "$returnOrderItems", preserveNullAndEmptyArrays: true } },
{
$lookup: {
from: "returnreasons", // collection name of ReturnReasonModel
localField: "returnOrderItems.reason",
foreignField: "_id",
as: "returnOrderItems.reason",
},
},
{
$unwind: {
path: "$returnOrderItems.reason",
preserveNullAndEmptyArrays: true,
},
},
// --- 3. Lookup order items ---
// 4) lookup orderItem (the original order item)
{
$lookup: {
from: "orderitems",
@@ -49,7 +63,7 @@ export class ReturnOrderRepo extends BaseRepository<IReturnOrder> {
{ $unwind: { path: "$orderItem", preserveNullAndEmptyArrays: true } },
{ $addFields: { "returnOrderItems.orderItem": "$orderItem" } },
// --- 4. Lookup shop ---
// 5) lookup shop from the orderItem
{
$lookup: {
from: "shops",
@@ -61,10 +75,24 @@ export class ReturnOrderRepo extends BaseRepository<IReturnOrder> {
{ $unwind: { path: "$shop", preserveNullAndEmptyArrays: true } },
{ $addFields: { shopName: "$shop.shopName" } },
// --- 5. Sort before pagination ---
// 6) group back so each return order is a single document with array of items
{
$group: {
_id: "$_id",
order: { $first: "$order" },
status: { $first: "$status" },
total_price: { $first: "$total_price" },
shopName: { $first: "$shopName" },
createdAt: { $first: "$createdAt" },
updatedAt: { $first: "$updatedAt" },
returnOrderItems: { $push: "$returnOrderItems" },
},
},
// 7) sort (by createdAt) before pagination
{ $sort: { createdAt: -1 } },
// --- 6. Facet for pagination + count ---
// 8) facet for pagination + count
{
$facet: {
data: [
@@ -85,10 +113,7 @@ export class ReturnOrderRepo extends BaseRepository<IReturnOrder> {
comment: 1,
reason: 1,
imagesUrl: 1,
orderItem: {
_id: 1,
totalSellingPrice: 1,
},
orderItem: 1,
},
},
},
@@ -97,7 +122,7 @@ export class ReturnOrderRepo extends BaseRepository<IReturnOrder> {
},
},
// --- 7. Flatten count field ---
// // 9) flatten count field
{
$addFields: {
totalCount: { $ifNull: [{ $arrayElemAt: ["$totalCount.count", 0] }, 0] },
@@ -105,9 +130,11 @@ export class ReturnOrderRepo extends BaseRepository<IReturnOrder> {
},
]);
const result = docs[0] || { data: [], totalCount: 0 };
return {
count: result?.totalCount || 0,
docs: result?.data || [],
count: result.totalCount || 0,
docs: result.data || [],
};
}
src/modules/seller/seller.controller.ts
+7 -1
View File
@@ -75,7 +75,11 @@ class SellerController extends BaseController {
@ApiQuery("limit", "the limit of return data")
@ApiQuery("page", "the page want to get")
@ApiQuery("shipperId", "shipper id")
@ApiQuery("status", "status of payment ==> value = Completed | Cancelled | Pending ")
@ApiQuery(
"status",
"status of payment ==> value = wait_payment | process_by_sellers | shipped | cancelled_system | cancelled | Delivered",
)
@ApiQuery("paymentStatus", "status of order ==> value = Completed | Cancelled | Pending ")
@ApiQuery(
"since",
"time of order created ==> value should be standard timestamp since that time user want like == > Date.now() - (7 * 24 * 60 * 60 * 1000) ==> this mean from a week ago till now ",
@@ -91,6 +95,7 @@ class SellerController extends BaseController {
@queryParam("page") page: string,
@queryParam("shipperId") shipperId: string,
@queryParam("status") status: string,
@queryParam("paymentStatus") paymentStatus: string,
@queryParam("since") since: string,
@queryParam("maxPrice") maxPrice: string,
@queryParam("minPrice") minPrice: string,
@@ -101,6 +106,7 @@ class SellerController extends BaseController {
page: parseInt(page),
shipperId,
status,
paymentStatus,
since: +since,
maxPrice: +maxPrice,
minPrice: +minPrice,