upd

server/src/index.ts

@@ -1,17 +1,17 @@
 import "dotenv/config";
 import express, { json } from "express";
-import connectDB from "./config/db.js";
+import connectDB from "./config/db";
 import cors from "cors";
-import loginRouter from "./routes/login.js";
-import registrationRouter from "./routes/registration.js";
-import authMiddleware from "./middlewares/auth.js";
-import appRouter from "./routes/app.js";
-import companiesRouter from "./routes/companies.js";
-import scheduledSessionsRouter from "./routes/scheduledSessions.js";
-import usersRouter from "./routes/users.js";
-import buildsRouter from "./routes/builds.js";
-import actionsRouter from "./routes/actions.js";
-import schedulesRouter from "./routes/schedules.js";
+import loginRouter from "./routes/login";
+import registrationRouter from "./routes/registration";
+import authMiddleware from "./middlewares/auth";
+import appRouter from "./routes/app";
+import companiesRouter from "./routes/companies";
+import scheduledSessionsRouter from "./routes/scheduledSessions";
+import usersRouter from "./routes/users";
+import buildsRouter from "./routes/builds";
+import actionsRouter from "./routes/actions";
+import schedulesRouter from "./routes/schedules";
 
 const app = express();
 const port = process.env.PORT || 3000;

server/src/middlewares/auth.ts

@@ -1,7 +1,7 @@
 import { Request, Response, NextFunction } from "express";
 import jwt, { Secret } from "jsonwebtoken";
-import Token from "../models/Token.js";
-import User from "../models/User.js";
+import Token from "../models/Token";
+import User from "../models/User";
 
 async function authMiddleware(req: Request, res: Response, next: NextFunction) {
   if (!req.headers.authorization || !req.headers.authorization.split(" ")[1]) {

server/src/routes/actions.ts

@@ -1,5 +1,5 @@
 import { Router } from "express";
-import Action from "../models/Action.js";
+import Action from "../models/Action";
 
 const actionsRouter = Router();
 

server/src/routes/app.ts

@@ -1,5 +1,5 @@
 import { Router } from "express";
-import Company from "../models/Company.js";
+import Company from "../models/Company";
 
 const appRouter = Router();
 

server/src/routes/builds.ts

@@ -1,5 +1,5 @@
 import { Router } from "express";
-import Build from "../models/Build.js";
+import Build from "../models/Build";
 
 const buildsRouter = Router();
 

server/src/routes/companies.ts

@@ -1,10 +1,10 @@
 import { Router } from "express";
-import Company from "../models/Company.js";
+import Company from "../models/Company";
 import { parseISO, startOfDay, endOfDay } from "date-fns";
-import ScheduledSession from "../models/ScheduledSession.js";
-import Schedule from "../models/Schedule.js";
-import BuildUser from "../models/BuildUser.js";
-import User from "../models/User.js";
+import ScheduledSession from "../models/ScheduledSession";
+import Schedule from "../models/Schedule";
+import BuildUser from "../models/BuildUser";
+import User from "../models/User";
 
 const companiesRouter = Router();
 

server/src/routes/login.ts

@@ -1,8 +1,8 @@
 import { Router } from "express";
 import jwt, { Secret } from "jsonwebtoken";
 import bcrypt from "bcrypt";
-import User from "../models/User.js";
-import Token from "../models/Token.js";
+import User from "../models/User";
+import Token from "../models/Token";
 
 const router = Router();
 

server/src/routes/registration.ts

@@ -1,8 +1,8 @@
 import { Router } from "express";
 import jwt, { Secret } from "jsonwebtoken";
 import bcrypt from "bcrypt";
-import User from "../models/User.js";
-import Token from "../models/Token.js";
+import User from "../models/User";
+import Token from "../models/Token";
 
 const router = Router();
 

server/src/routes/scheduledSessions.ts

@@ -1,8 +1,15 @@
 import { Router } from "express";
-import ScheduledSession from "../models/ScheduledSession.js";
-import Build from "../models/Build.js";
-import Schedule from "../models/Schedule.js";
-import { addMinutes, endOfDay, parseISO, startOfDay } from "date-fns";
+import ScheduledSession from "../models/ScheduledSession";
+import Build from "../models/Build";
+import Schedule from "../models/Schedule";
+import {
+  addMinutes,
+  areIntervalsOverlapping,
+  endOfDay,
+  isValid,
+  parseISO,
+  startOfDay,
+} from "date-fns";
 
 const scheduledSessionsRouter = Router();
 
@@ -70,61 +77,93 @@ scheduledSessionsRouter.get("/:buildId", async (req, res) => {
 });
 
 scheduledSessionsRouter.post("/", async (req, res) => {
-  if (!req.body.buildId) {
-    res.json({ error: "Parameter `buildId` is required" });
-    return;
-  }
-
-  if (!req.body.startAt) {
-    res.json({ error: "Parameter `startAt` is required" });
-    return;
-  }
-
-  if (!req.body.client) {
-    res.json({ error: "Parameter `client` is required" });
-    return;
-  }
-
   const { buildId, startAt, client } = req.body;
 
-  const build = await Build.findById(buildId);
-  const schedule = await Schedule.findOne({ buildId });
-  const scheduledSessions = await ScheduledSession.find({
+  if (!buildId || !startAt || !client) {
+    return res.json({
+      status: "error",
+      message:
+        "Parameters `compamyId`, `buildId`, `startAt`, `client` are required!", // Параметры `compamyId`, `buildId`, `startAt`, `client` обязательны!
+    });
+  }
+
+  const startAtISO = parseISO(startAt);
+
+  if (!isValid(startAtISO)) {
+    return res.json({
+      status: "error",
+      message: "Invalid date format", // Неверный формат даты
+    });
+  }
+
+  const schedule = await Schedule.findOne({
     buildId,
-    startAt,
+    startDate: { $lte: startAtISO },
+    endDate: { $gte: startAtISO },
   });
 
-  if (!build) {
-    res.json({ error: "`Build` not found in the database" });
-    return;
-  }
-
-  if (scheduledSessions.length === build.sessionLimit) {
-    res.json({
-      error: "No slots available",
-      scheduledSessionsLength: scheduledSessions.length,
-      buildSessionLimit: build.sessionLimit,
-    });
-    return;
-  }
-
   if (!schedule) {
-    res.json({ error: "`Schedule` not found in the database" });
-    return;
+    return res.json({
+      status: "error",
+      message: "No matching schedule found", // Подходящего расписания не найдено
+    });
   }
 
-  const endAt = addMinutes(parseISO(startAt), schedule.sessionDuration);
+  const build = await Build.findById(buildId);
 
-  const scheduleSession = await ScheduledSession.create({
+  if (!build) {
+    return res.json({
+      status: "error",
+      message: "An assembly with such a `buildId` was not found", // Сборка с таким `buildId` не найдена
+    });
+  }
+
+  const scheduledSessions = await ScheduledSession.find({
     buildId,
-    startAt,
-    endAt,
+    startAt: {
+      $gte: startOfDay(startAtISO),
+      $lte: endOfDay(startAtISO),
+    },
+  });
+
+  const endAtISO = addMinutes(startAtISO, schedule.sessionDuration);
+
+  if (scheduledSessions.length) {
+    const overlappingSessions = [];
+
+    for (const session of scheduledSessions) {
+      if (
+        areIntervalsOverlapping(
+          {
+            start: session.startAt,
+            end: addMinutes(session.endAt, schedule.sessionBreak),
+          },
+          { start: startAtISO, end: endAtISO }
+        )
+      ) {
+        overlappingSessions.push(session);
+      }
+    }
+
+    if (overlappingSessions.length >= build.sessionLimit) {
+      return res.json({
+        status: "error",
+        message:
+          "It is not possible to create a session because it overlaps with the time of another session", //Невозможно создать сеанс, поскольку он перекрывается со временем другого сеанса.
+      });
+    }
+  }
+
+  const scheduledSession = await ScheduledSession.create({
+    buildId,
+    startAt: startAtISO,
+    endAt: endAtISO,
     clientName: client.name,
     clientEmail: client.email,
     clientPhone: client.phone,
   });
 
-  res.json({ ok: 1, scheduleSession });
+  res.json({ status: "success", scheduledSession });
 });
 
 scheduledSessionsRouter.put("/:id", async (req, res) => {

server/src/routes/schedules.ts

@@ -1,5 +1,5 @@
 import { Router } from "express";
-import Schedule from "../models/Schedule.js";
+import Schedule from "../models/Schedule";
 
 const schedulesRouter = Router();