Merge pull request #47 from zylcom/preview

update order service
zylcom · May 24, 2024 · fdcbc26 · fdcbc26
2 parents 2720fc0 + 6fb37bc
commit fdcbc26
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/__test__/order.test.js b/__test__/order.test.js
@@ -218,6 +218,8 @@ describe("GET /api/orders/:orderId", function () {
     expect(result.status).toBe(200);
     expect(result.body.data.id).toBe(order.body.data.id);
     expect(result.body.data.items).toBeDefined();
+    expect(result.body.data.shipment).toBeDefined();
+    expect(result.body.data.payment).toBeDefined();
     expect(result.body.data.username).toBe(order.body.data.username);
   });
 
@@ -237,6 +239,8 @@ describe("GET /api/orders/:orderId", function () {
     expect(result.status).toBe(200);
     expect(result.body.data.id).toBe(order.body.data.id);
     expect(result.body.data.items).toBeDefined();
+    expect(result.body.data.shipment).toBeDefined();
+    expect(result.body.data.payment).toBeDefined();
     expect(result.body.data.guestId).toBe(order.body.data.guestId);
   });
 
@@ -276,6 +280,8 @@ describe("POST /api/orders/:orderId/cancel", function () {
     expect(result.body.data.id).toBe(order.body.data.id);
     expect(result.body.data.status).toBe("canceled");
     expect(result.body.data.items).toBeDefined();
+    expect(result.body.data.shipment).toBeDefined();
+    expect(result.body.data.payment).toBeDefined();
   });
 
   it("should can cancel order as guest user", async () => {
@@ -295,6 +301,8 @@ describe("POST /api/orders/:orderId/cancel", function () {
     expect(result.body.data.id).toBe(order.body.data.id);
     expect(result.body.data.status).toBe("canceled");
     expect(result.body.data.items).toBeDefined();
+    expect(result.body.data.shipment).toBeDefined();
+    expect(result.body.data.payment).toBeDefined();
   });
 
   it("should reject if token is invalid", async () => {

diff --git a/src/services/order-service.js b/src/services/order-service.js
@@ -157,7 +157,11 @@ const cancel = async (request) => {
     throw new ResponseError(404, "Order not found");
   }
 
-  return prismaClient.order.update({ where: { id: order.id }, data: { status: "canceled" }, include: { items: { include: { product: true } } } });
+  return prismaClient.order.update({
+    where: { id: order.id },
+    data: { status: "canceled" },
+    include: { payment: true, shipment: true, items: { include: { product: true } } },
+  });
 };
 
 const listOrder = async (request) => {