upd
This commit is contained in:
@@ -9,10 +9,10 @@ buildsRouter.get("/", async (_req, res) => {
|
||||
res.json({ ok: 1 });
|
||||
});
|
||||
|
||||
buildsRouter.post("/", async (req, res) => {
|
||||
const build = await Build.create(req.body);
|
||||
// buildsRouter.post("/", async (req, res) => {
|
||||
// const build = await Build.create(req.body);
|
||||
|
||||
res.json(build);
|
||||
});
|
||||
// res.json(build);
|
||||
// });
|
||||
|
||||
export default buildsRouter;
|
||||
|
||||
@@ -83,6 +83,29 @@ 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;
|
||||
}
|
||||
|
||||
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,
|
||||
});
|
||||
|
||||
res.json(scheduledSession);
|
||||
}
|
||||
);
|
||||
|
||||
companiesRouter.put(
|
||||
"/:id/scheduled_sessions/:scheduledSessionId",
|
||||
async (req, res) => {
|
||||
@@ -140,6 +163,8 @@ companiesRouter.get(
|
||||
req.params.scheduledSessionId
|
||||
);
|
||||
|
||||
const scheduledSessionUserId = scheduledSession?.userId;
|
||||
|
||||
const scheduledSessionsAtSameTime = await ScheduledSession.find({
|
||||
companyId: req.params.id,
|
||||
buildId: req.params.buildId,
|
||||
@@ -150,27 +175,22 @@ companiesRouter.get(
|
||||
"users"
|
||||
);
|
||||
|
||||
let userIds = users.map((user: any) => user.id);
|
||||
const companyUserIds: any[] = users.map((user: any) => user.id);
|
||||
const sessionsUserIds: any[] = [];
|
||||
|
||||
console.log(scheduledSession?.userId);
|
||||
|
||||
for (const userId of userIds) {
|
||||
console.log(userId);
|
||||
}
|
||||
|
||||
let sessionsUserIds: any[] = [];
|
||||
|
||||
for (const session of scheduledSessionsAtSameTime) {
|
||||
if (session.userId) {
|
||||
sessionsUserIds.push(session.userId.toString());
|
||||
for (const sessionAtSameTime of scheduledSessionsAtSameTime) {
|
||||
if (sessionAtSameTime.userId) {
|
||||
sessionsUserIds.push(sessionAtSameTime.userId.toString());
|
||||
}
|
||||
}
|
||||
|
||||
const filteredUserIds = userIds.filter(
|
||||
const filteredUserIds = companyUserIds.filter(
|
||||
(userId: any) => !sessionsUserIds.includes(userId)
|
||||
);
|
||||
|
||||
filteredUserIds.push(scheduledSession?.userId);
|
||||
if (scheduledSessionUserId) {
|
||||
filteredUserIds.push(scheduledSessionUserId.toString());
|
||||
}
|
||||
|
||||
res.json(filteredUserIds);
|
||||
} catch (error) {
|
||||
|
||||
Reference in New Issue
Block a user