Merge branch 'master' of ssh://85.143.175.152:222/bro-students/multy-stub

server/routers/dry-wash/arm-master.js

@@ -3,22 +3,23 @@ const { MasterModel } = require("./model/master");
 const mongoose = require("mongoose");
 const { OrderModel } = require("./model/order");
 
-router.get("/masters", async (req, res, next) => {
+router.post("/masters/list", async (req, res, next) => {
   try {
+    const { startDate, endDate } = req.body;
+
+    if (!startDate || !endDate) {
+      throw new Error("Missing startDate or endDate");
+    }
+
+    const start = new Date(startDate);
+    const end = new Date(endDate);
     const masters = await MasterModel.find({});
 
-    // Создаем объекты для начала и конца текущего дня
-    const today = new Date();
-    today.setHours(0, 0, 0, 0);
-    const tomorrow = new Date(today);
-    tomorrow.setDate(tomorrow.getDate() + 1);
-
     const orders = await OrderModel.find({
-      startWashTime: {
+      $or: [
-        $gte: today,
+        { startWashTime: { $lt: end }, endWashTime: { $gt: start } }
-        $lt: tomorrow,
+      ]
-      },
+    });
-    }); 
 
     const mastersWithOrders = masters.map((master) => {
       const masterOrders = orders.filter((order) => {