diff --git a/src/handler/order/order.router.ts b/src/handler/order/order.router.ts
index 05cdfc02badf3d7e7a84eb9a27be0ba1260520e8..0bee5979e8f6f26c13d78f58c4565d4ec8981ad0 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 883b9a46a632404667dafa343981cbb07b681f51..fe44e4927cb951c090b41a55c919e1cab2f4506a 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 91053881a0e56049b78b7cd62919e4e08a3c2a4f..e6fc76b5578fa5360fc584a41e4804274b68043c 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,