From 29fdcee7e351420d6965d189393d1bda2162de54 Mon Sep 17 00:00:00 2001
From: Varun <varun@armintasolutions.com>
Date: Fri, 4 Apr 2025 12:44:53 +0530
Subject: [PATCH] changes

---
 src/controllers/supplierOrderController.js | 37 ++++------------------
 src/routes/supplierOrdersRoutes.js         |  8 ++---
 2 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/src/controllers/supplierOrderController.js b/src/controllers/supplierOrderController.js
index da64f0e0..adf428a2 100644
--- a/src/controllers/supplierOrderController.js
+++ b/src/controllers/supplierOrderController.js
@@ -784,41 +784,18 @@ exports.medicine = async (req, reply) => {
 
 
 
+exports.getOrdersByCustomerId = async (req, reply) => {
+  const { customerId } = req.query;
 
-exports.getOrdersByStatus = async (req, reply) => {
-  const { customerId, orderStatus } = req.query;
-
-  const query = { orderStatus };
-  if (customerId) {
-    query.customerId = customerId;
+  if (!customerId) {
+    return reply.status(400).send({ message: "customerId is required" });
   }
 
   try {
-    const orders = await Tankerbooking.find(query).exec();
-
-    let enrichedOrders = orders;
-
-    if (orderStatus === "accepted") {
-      enrichedOrders = await Promise.all(
-        orders.map(async (order) => {
-          const deliveryBoy = await DeliveryBoy.findOne({ phone: order.delivery_agent_mobile });
-          return {
-            ...order.toJSON(),
-            deliveryBoyLocation: deliveryBoy
-              ? {
-                  deliveryboy_latitude: deliveryBoy.latitude,
-                  deliveryboy_longitude: deliveryBoy.longitude,
-                  deliveryboy_address: deliveryBoy.address
-                }
-              : null
-          };
-        })
-      );
-    }
-
-    reply.send({ status_code: 200, data: enrichedOrders, count: enrichedOrders.length });
+    const orders = await Tankerbooking.find({ customerId }).exec();
+    reply.send({ status_code: 200, data: orders, count: orders.length });
   } catch (err) {
-    reply.status(400).send({ message: err.message });
+    reply.status(500).send({ message: err.message });
   }
 };
 
diff --git a/src/routes/supplierOrdersRoutes.js b/src/routes/supplierOrdersRoutes.js
index c80ecf91..2942ee49 100644
--- a/src/routes/supplierOrdersRoutes.js
+++ b/src/routes/supplierOrdersRoutes.js
@@ -594,17 +594,13 @@ module.exports = function (fastify, opts, next) {
         type: "object",
         properties: {
           customerId: { type: "string", description: "Customer ID (optional)" },
-          orderStatus: { 
-            type: "string", 
-            enum: ["accepted", "rejected", "delivered", "pending"], 
-            description: "Order status to filter by"
-          }
+         
         },
         required: ["orderStatus"]
       },
       security: [{ basicAuth: [] }]
     },
-    handler: supplierOrderController.getOrdersByStatus
+    handler: supplierOrderController.getOrdersByCustomerId
   });