Gitlab@Informatics

Skip to content
Snippets Groups Projects
Commit 8394d068 authored by 65160206's avatar 65160206
Browse files

delete order

parent 32f64e04
Branches
No related tags found
No related merge requests found
......@@ -9,5 +9,5 @@ export declare class OrdersController {
findAll(): Promise<import("./entities/order.entity").Order[]>;
findOne(id: string): Promise<import("./entities/order.entity").Order>;
update(id: string, updateOrderDto: UpdateOrderDto): Promise<import("./entities/order.entity").Order>;
remove(id: string): Promise<void>;
remove(id: string): Promise<import("./entities/order.entity").Order>;
}
......@@ -20,5 +20,5 @@ export declare class OrdersService {
findAll(): Promise<Order[]>;
findOne(id: number): Promise<Order>;
update(id: number, updateOrderDto: UpdateOrderDto): Promise<Order>;
remove(id: number): Promise<void>;
remove(id: number): Promise<Order>;
}
......@@ -171,12 +171,21 @@ let OrdersService = OrdersService_1 = class OrdersService {
}
async remove(id) {
this.logger.log(`Deleting order with ID ${id}`);
const result = await this.orderRepository.delete(id);
if (result.affected === 0) {
const order = await this.orderRepository.findOne({
where: { OrderID: id },
relations: ['orderDetails'],
});
if (!order) {
this.logger.error(`Order with ID ${id} not found for deletion`);
throw new common_1.NotFoundException(`Order with ID ${id} not found`);
}
this.logger.log(`Order with ID ${id} deleted successfully`);
if (order.orderDetails && order.orderDetails.length > 0) {
this.logger.log(`Deleting ${order.orderDetails.length} orderDetails for order ID ${id}`);
await this.orderDetailRepository.remove(order.orderDetails);
}
await this.orderRepository.remove(order);
this.logger.log(`Order with ID ${id} and its orderDetails deleted`);
return order;
}
};
exports.OrdersService = OrdersService;
......
{"version":3,"file":"orders.service.js","sourceRoot":"","sources":["../../src/orders/orders.service.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
{"version":3,"file":"orders.service.js","sourceRoot":"","sources":["../../src/orders/orders.service.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
Source diff could not be displayed: it is too large. Options to address this: view the blob.
......@@ -217,13 +217,33 @@ export class OrdersService {
return updatedOrder;
}
async remove(id: number): Promise<void> {
async remove(id: number): Promise<Order> {
this.logger.log(`Deleting order with ID ${id}`);
const result = await this.orderRepository.delete(id);
if (result.affected === 0) {
// ✅ หา order พร้อมดึง orderDetails มา
const order = await this.orderRepository.findOne({
where: { OrderID: id },
relations: ['orderDetails'],
});
if (!order) {
this.logger.error(`Order with ID ${id} not found for deletion`);
throw new NotFoundException(`Order with ID ${id} not found`);
}
this.logger.log(`Order with ID ${id} deleted successfully`);
// ✅ ลบ orderDetails ทีละตัว
if (order.orderDetails && order.orderDetails.length > 0) {
this.logger.log(
`Deleting ${order.orderDetails.length} orderDetails for order ID ${id}`,
);
await this.orderDetailRepository.remove(order.orderDetails);
}
// ✅ ลบ order หลังจากลบ orderDetails
await this.orderRepository.remove(order);
this.logger.log(`Order with ID ${id} and its orderDetails deleted`);
return order; // ส่งกลับ order ที่ลบไป (หรือจะเปลี่ยนเป็น message เฉยๆ ก็ได้)
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment