From f5efca0d449fdbfb2ae51ab8b94e69ace78d7931 Mon Sep 17 00:00:00 2001
From: DewanaGustavus <76590469+DewanaGustavus@users.noreply.github.com>
Date: Fri, 17 Nov 2023 01:24:43 +0700
Subject: [PATCH] feat: get order by courier
---
src/handler/order/order.router.ts | 10 ++++++++++
src/handler/order/order.service.ts | 10 ++++++++--
src/handler/user/user.service.ts | 1 +
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/handler/order/order.router.ts b/src/handler/order/order.router.ts
index 05cdfc0..0bee597 100644
--- a/src/handler/order/order.router.ts
+++ b/src/handler/order/order.router.ts
@@ -13,6 +13,7 @@ OrderRouter.get('/available-order', async (request: Request, response: Response)
return response.status(500).json(error.message);
}
})
+
OrderRouter.get('/order/:id', async (request: Request, response: Response) => {
try {
const order = await OrderServices.getOrderById(parseInt(request.params.id));
@@ -30,3 +31,12 @@ OrderRouter.get('/order-details/:id', async (request: Request, response: Respons
return response.status(500).json(error.message);
}
})
+
+OrderRouter.get('/order-courier/:id', async (request: Request, response: Response) => {
+ try {
+ const orders = await OrderServices.getOrderByCourier(parseInt(request.params.id));
+ return response.status(200).json(orders);
+ } catch (error: any) {
+ return response.status(500).json(error.message);
+ }
+})
\ No newline at end of file
diff --git a/src/handler/order/order.service.ts b/src/handler/order/order.service.ts
index 883b9a4..fe44e49 100644
--- a/src/handler/order/order.service.ts
+++ b/src/handler/order/order.service.ts
@@ -1,4 +1,4 @@
-import { getPesananByIdPesanan, getPesananNoKurir } from "../soap-caller/PesananSoapCaller";
+import { getPesananByIdPesanan, getPesananByKurir, getPesananNoKurir } from "../soap-caller/PesananSoapCaller";
import OrderInterface from "../../interfaces/OrderInterface";
import { getDetailPesanan } from "../soap-caller/DetailPesananSoapCaller";
import OrderDetail from "../../interfaces/OrderDetail";
@@ -20,4 +20,10 @@ export async function getOrderDetails(orderId : number) {
const response = await getDetailPesanan(orderId);
const orderDetails = ConvertArray<OrderDetail>(response);
return orderDetails;
-}
\ No newline at end of file
+}
+
+export async function getOrderByCourier(courierId : number) {
+ const response = await getPesananByKurir(courierId);
+ const orderDetails = ConvertArray<OrderDetail>(response);
+ return orderDetails;
+}
diff --git a/src/handler/user/user.service.ts b/src/handler/user/user.service.ts
index 9105388..e6fc76b 100644
--- a/src/handler/user/user.service.ts
+++ b/src/handler/user/user.service.ts
@@ -106,6 +106,7 @@ export async function getUserByUsername(username : string) {
username : username,
},
select: {
+ id : true,
username : true,
name : true,
email : true,
--
GitLab