From 775f24cffabe15ecbe7b90c75c65d1910a5c0ff4 Mon Sep 17 00:00:00 2001
From: ilnaz <237x237@gmail.com>
Date: Mon, 17 Mar 2025 21:05:48 +0300
Subject: [PATCH 1/2] feat: make the time of the master to be taken from the
body
---
server/routers/dry-wash/arm-master.js | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/server/routers/dry-wash/arm-master.js b/server/routers/dry-wash/arm-master.js
index 5403a43..9c61f10 100644
--- a/server/routers/dry-wash/arm-master.js
+++ b/server/routers/dry-wash/arm-master.js
@@ -3,22 +3,24 @@ 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 masters = await MasterModel.find({});
+ const { startDate, endDate } = req.body;
- // Создаем объекты для начала и конца текущего дня
- const today = new Date();
- today.setHours(0, 0, 0, 0);
- const tomorrow = new Date(today);
- tomorrow.setDate(tomorrow.getDate() + 1);
+ 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 orders = await OrderModel.find({
startWashTime: {
- $gte: today,
- $lt: tomorrow,
+ $gte: start,
+ $lt: end,
},
- });
+ });
const mastersWithOrders = masters.map((master) => {
const masterOrders = orders.filter((order) => {
--
2.45.2
From a63a229b64e6a094c295ecd218a0bd732f4e115f Mon Sep 17 00:00:00 2001
From: ilnaz <237x237@gmail.com>
Date: Mon, 17 Mar 2025 23:41:07 +0300
Subject: [PATCH 2/2] feat: rewrite the request to receive orders from the
masters
---
server/routers/dry-wash/arm-master.js | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/server/routers/dry-wash/arm-master.js b/server/routers/dry-wash/arm-master.js
index 9c61f10..7e95334 100644
--- a/server/routers/dry-wash/arm-master.js
+++ b/server/routers/dry-wash/arm-master.js
@@ -16,10 +16,9 @@ router.post("/masters/list", async (req, res, next) => {
const masters = await MasterModel.find({});
const orders = await OrderModel.find({
- startWashTime: {
- $gte: start,
- $lt: end,
- },
+ $or: [
+ { startWashTime: { $lt: end }, endWashTime: { $gt: start } }
+ ]
});
const mastersWithOrders = masters.map((master) => {
--
2.45.2