upd

server/src/index.ts

@@ -24,12 +24,12 @@ app.use(cors());
 app.use("/login", loginRouter);
 app.use("/registration", registrationRouter);
 app.use("/actions", actionsRouter);
+app.use("/builds", buildsRouter);
 app.use("/scheduled_sessions", scheduledSessionsRouter);
 app.use("/schedules", schedulesRouter);
 app.use("/app", authMiddleware, appRouter);
 app.use("/companies", authMiddleware, companiesRouter);
 app.use("/users", authMiddleware, usersRouter);
-app.use("/builds", authMiddleware, buildsRouter);
 
 app.listen(port, () => {
   console.log(`Server listening on port ${port}`);

server/src/models/ScheduledSession.ts

@@ -5,7 +5,7 @@ const scheduledSessionSchema = new Schema(
     companyId: {
       type: Schema.Types.ObjectId,
       ref: "Company",
-      required: true,
+      // required: true,
     },
     buildId: {
       type: Schema.Types.ObjectId,
@@ -36,6 +36,12 @@ const scheduledSessionSchema = new Schema(
       type: String,
       required: true,
     },
+    adminInviteKey: {
+      type: String,
+    },
+    userInviteKey: {
+      type: String,
+    },
   },
   {
     timestamps: true,

server/src/routes/builds.ts

@@ -3,16 +3,10 @@ import Build from "../models/Build.js";
 
 const buildsRouter = Router();
 
-buildsRouter.get("/", async (_req, res) => {
-  await Build.find();
+buildsRouter.get("/:id", async (req, res) => {
+  const build = await Build.findById(req.params.id);
 
-  res.json({ ok: 1 });
+  res.json(build);
 });
 
-// buildsRouter.post("/", async (req, res) => {
-//   const build = await Build.create(req.body);
-
-//   res.json(build);
-// });
-
 export default buildsRouter;

server/src/routes/companies.ts

@@ -16,7 +16,7 @@ const companiesRouter = Router();
 
 companiesRouter.get("/:id", async (req, res) => {
   if (req.params.id != res.locals.user.companyId) {
-    res.json({ error: "Access denied!" });
+    res.json({ error: "Access denied" });
     return;
   }
 
@@ -27,7 +27,7 @@ companiesRouter.get("/:id", async (req, res) => {
 
 companiesRouter.get("/:id/builds", async (req, res) => {
   if (req.params.id != res.locals.user.companyId) {
-    res.json({ error: "Access denied!" });
+    res.json({ error: "Access denied" });
     return;
   }
 
@@ -39,7 +39,7 @@ companiesRouter.get("/:id/builds", async (req, res) => {
 
 companiesRouter.get("/:id/users", async (req, res) => {
   if (req.params.id != res.locals.user.companyId) {
-    res.json({ error: "Access denied!" });
+    res.json({ error: "Access denied" });
     return;
   }
 
@@ -51,7 +51,7 @@ companiesRouter.get("/:id/users", async (req, res) => {
 
 companiesRouter.get("/:id/builds/:buildId/users", async (req, res) => {
   if (req.params.id != res.locals.user.companyId) {
-    res.json({ error: "Access denied!" });
+    res.json({ error: "Access denied" });
     return;
   }
 
@@ -73,12 +73,12 @@ companiesRouter.get(
   "/:id/builds/:buildId/scheduled_sessions",
   async (req, res) => {
     if (req.params.id != res.locals.user.companyId) {
-      res.json({ error: "Access denied!" });
+      res.json({ error: "Access denied" });
       return;
     }
 
     if (!req.query.date) {
-      res.json({ error: "req.query.date" });
+      res.json({ error: "Query parameter `date` is required" });
       return;
     }
 
@@ -106,34 +106,34 @@ companiesRouter.get(
   }
 );
 
-companiesRouter.post(
-  "/:id/builds/:buildId/scheduled_sessions",
-  async (req, res) => {
-    if (req.params.id != res.locals.user.companyId) {
-      res.json({ error: "Access denied!" });
-      return;
-    }
+// companiesRouter.post(
+//   "/:id/builds/:buildId/scheduled_sessions",
+//   async (req, res) => {
+//     if (req.params.id != res.locals.user.companyId) {
+//       res.json({ error: "Access denied" });
+//       return;
+//     }
 
-    if (!req.params.buildId) {
-      res.json({ error: "req.params.buildId" });
-      return;
-    }
+//     if (!req.params.buildId) {
+//       res.json({ error: "req.params.buildId" });
+//       return;
+//     }
 
-    const scheduledSession = await ScheduledSession.create({
-      companyId: req.params.id,
-      buildId: req.params.buildId,
-      ...req.body,
-    });
+//     const scheduledSession = await ScheduledSession.create({
+//       companyId: req.params.id,
+//       buildId: req.params.buildId,
+//       ...req.body,
+//     });
 
-    res.json(scheduledSession);
-  }
-);
+//     res.json(scheduledSession);
+//   }
+// );
 
 companiesRouter.put(
   "/:id/scheduled_sessions/:scheduledSessionId",
   async (req, res) => {
     if (req.params.id != res.locals.user.companyId) {
-      res.json({ error: "Access denied!" });
+      res.json({ error: "Access denied" });
       return;
     }
 
@@ -142,21 +142,18 @@ companiesRouter.put(
         req.params.scheduledSessionId
       );
 
-      const scheduledSessionAtSameTime = await ScheduledSession.find({
+      const scheduledSessionAtSameTime = await ScheduledSession.findOne({
         startAt: scheduledSession?.startAt,
         userId: req.body.userId,
       });
 
-      if (scheduledSessionAtSameTime.length) {
+      if (scheduledSessionAtSameTime) {
         res.json({ error: "Scheduled session at same time" });
         return;
       }
 
-      const updatedScheduledSession = await ScheduledSession.findOneAndUpdate(
-        {
-          _id: req.params.scheduledSessionId,
-          companyId: req.params.id,
-        },
+      const updatedScheduledSession = await ScheduledSession.findByIdAndUpdate(
+        req.params.scheduledSessionId,
         req.body,
         {
           new: true,
@@ -177,14 +174,11 @@ companiesRouter.get(
   "/:id/builds/:buildId/scheduled_sessions/:scheduledSessionId/availableManagers",
   async (req, res) => {
     if (!req.query.startAt) {
-      res.json({ error: "No param `startAt`" });
+      res.json({ error: "Query parameter `startAt` is required" });
       return;
     }
 
     try {
-      // const date = req.query.startAt;
-      // const sessions = ScheduledSession.find({ userId: res.locals.user.id });
-
       const scheduledSession = await ScheduledSession.findById(
         req.params.scheduledSessionId
       );
@@ -229,7 +223,7 @@ companiesRouter.get(
 
 companiesRouter.get("/:id/builds/:buildId/schedules", async (req, res) => {
   if (req.params.id != res.locals.user.companyId) {
-    res.json({ error: "Access denied!" });
+    res.json({ error: "Access denied" });
     return;
   }
 
@@ -243,7 +237,7 @@ companiesRouter.get("/:id/builds/:buildId/schedules", async (req, res) => {
 
 companiesRouter.post("/:id/builds/:buildId/schedules", async (req, res) => {
   if (req.params.id != res.locals.user.companyId) {
-    res.json({ error: "Access denied!" });
+    res.json({ error: "Access denied" });
     return;
   }
 

server/src/routes/scheduledSessions.ts

@@ -3,17 +3,33 @@ 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 { v4 as uuidv4 } from "uuid";
 
 const scheduledSessionsRouter = Router();
 
+scheduledSessionsRouter.get("/:id", async (req, res) => {
+  if (!req.query.inviteKeyType || !req.query.inviteKeyValue) {
+    res.json({
+      error:
+        "Query parameters `inviteKeyType` and `inviteKeyValue` is required",
+    });
+    return;
+  }
+
+  const scheduledSessionId = req.params.id;
+  const scheduledSession = await ScheduledSession.findById(scheduledSessionId);
+
+  res.json(scheduledSession);
+});
+
 scheduledSessionsRouter.get("/builds/:buildId", async (req, res) => {
   if (!req.params.buildId) {
-    res.json({ error: "Parameter `buildId` is required!" });
+    res.json({ error: "Parameter `buildId` is required" });
     return;
   }
 
   if (!req.query.date) {
-    res.json({ error: "Query parameter `date` is required!" });
+    res.json({ error: "Query parameter `date` is required" });
     return;
   }
 
@@ -32,12 +48,12 @@ scheduledSessionsRouter.get("/builds/:buildId", async (req, res) => {
 
 scheduledSessionsRouter.get("/:buildId", async (req, res) => {
   if (!req.params.buildId) {
-    res.json({ error: "Parameter `buildId` is required!" });
+    res.json({ error: "Parameter `buildId` is required" });
     return;
   }
 
   if (!req.query.date) {
-    res.json({ error: "Query parameter `date` is required!" });
+    res.json({ error: "Query parameter `date` is required" });
     return;
   }
 
@@ -55,44 +71,43 @@ scheduledSessionsRouter.get("/:buildId", async (req, res) => {
 });
 
 scheduledSessionsRouter.post("/", async (req, res) => {
-  if (!req.body.companyId) {
-    res.json({ error: "Parameter `companyId` is required!" });
-    return;
-  }
+  // if (!req.body.companyId) {
+  //   res.json({ error: "Parameter `companyId` is required" });
+  //   return;
+  // }
 
   if (!req.body.buildId) {
-    res.json({ error: "Parameter `buildId` is required!" });
+    res.json({ error: "Parameter `buildId` is required" });
     return;
   }
 
   if (!req.body.startAt) {
-    res.json({ error: "Parameter `startAt` is required!" });
+    res.json({ error: "Parameter `startAt` is required" });
     return;
   }
 
   if (!req.body.client) {
-    res.json({ error: "Parameter `client` is required!" });
+    res.json({ error: "Parameter `client` is required" });
     return;
   }
 
-  const { companyId, buildId, startAt, client } = req.body;
+  const { buildId, startAt, client } = req.body;
 
   const build = await Build.findById(buildId);
-  const schedule = await Schedule.findOne({ companyId, buildId });
+  const schedule = await Schedule.findOne({ buildId });
   const scheduledSessions = await ScheduledSession.find({
-    companyId,
     buildId,
     startAt,
   });
 
   if (!build) {
-    res.json({ error: "`Build` not found in the database!" });
+    res.json({ error: "`Build` not found in the database" });
     return;
   }
 
   if (scheduledSessions.length === build.sessionLimit) {
     res.json({
-      error: "No slots available!",
+      error: "No slots available",
       scheduledSessionsLength: scheduledSessions.length,
       buildSessionLimit: build.sessionLimit,
     });
@@ -100,20 +115,21 @@ scheduledSessionsRouter.post("/", async (req, res) => {
   }
 
   if (!schedule) {
-    res.json({ error: "`Schedule` not found in the database!" });
+    res.json({ error: "`Schedule` not found in the database" });
     return;
   }
 
   const endAt = addMinutes(parseISO(startAt), schedule.sessionDuration);
 
   const scheduleSession = await ScheduledSession.create({
-    companyId,
     buildId,
     startAt,
     endAt,
     clientName: client.name,
     clientEmail: client.email,
     clientPhone: client.phone,
+    adminInviteKey: uuidv4(),
+    userInviteKey: uuidv4(),
   });
 
   res.json({ ok: 1, scheduleSession });