inmake/crm.stream.graff.tech
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

upd

Browse Source
This commit is contained in:
inmake
2024-01-22 20:40:23 +05:00
parent 29148afe9c
commit c9e8de4d83
22 changed files with 498 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/ecosystem.config.cjs → server/ecosystem.config.js
View File
server/package.json
+3 -4
View File
@@ -2,11 +2,10 @@
"name": "server",
"private": true,
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "nodemon ./src/index.ts",
"build": "tsc",
"start": "node ./dist/index.js"
"dev": "nodemon src/index.ts",
"build": "npx tsc",
"start": "node dist/index.js"
},
"dependencies": {
"bcrypt": "^5.1.1",
server/src/index.ts
+11 -11
View File
@@ -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
+2 -2
View File
@@ -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 -1
View File
@@ -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 -1
View File
@@ -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 -1
View File
@@ -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
+5 -5
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+83 -44
View File
@@ -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 -1
View File
@@ -1,5 +1,5 @@
import { Router } from "express";
import Schedule from "../models/Schedule.js";
import Schedule from "../models/Schedule";
const schedulesRouter = Router();
server/tsconfig.json
+12 -107
View File
@@ -1,113 +1,18 @@
{
"compilerOptions": {
/* Visit https://aka.ms/tsconfig to read more about this file */
/* Projects */
// "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
// "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */
// "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */
// "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */
// "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */
/* Language and Environment */
"target": "ES6" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
// "lib": [] /* Specify a set of bundled library declaration files that describe the target runtime environment. */,
// "jsx": "preserve", /* Specify what JSX code is generated. */
// "experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */
// "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */
// "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
// "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
// "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
// "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
// "noLib": true, /* Disable including any library files, including the default lib.d.ts. */
// "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */
// "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */
/* Modules */
"module": "ESNext" /* Specify what module code is generated. */,
// "rootDir": "./", /* Specify the root folder within your source files. */
"moduleResolution": "Node" /* Specify how TypeScript looks up a file from a given module specifier. */,
// "baseUrl": "." /* Specify the base directory to resolve non-relative module names. */,
// "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
// "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */
// "types": [], /* Specify type package names to be included without being referenced in a source file. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
// "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */
// "allowImportingTsExtensions": true /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */,
// "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */
// "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */
// "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
"resolveJsonModule": true /* Enable importing .json files. */,
// "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */
// "noResolve": true, /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
/* JavaScript Support */
// "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
// "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */
// "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
/* Emit */
// "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
// "declarationMap": true, /* Create sourcemaps for d.ts files. */
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
// "sourceMap": true, /* Create source map files for emitted JavaScript files. */
// "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */
// "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
"outDir": "dist" /* Specify an output folder for all emitted files. */,
// "removeComments": true, /* Disable emitting comments. */
// "noEmit": true /* Disable emitting files from a compilation. */,
// "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
// "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */
// "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
// "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */
// "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
// "newLine": "crlf", /* Set the newline character for emitting files. */
// "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
// "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */
// "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */
// "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */
// "declarationDir": "./", /* Specify the output directory for generated declaration files. */
// "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
/* Interop Constraints */
"isolatedModules": true /* Ensure that each file can be safely transpiled without relying on other imports. */,
// "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
// "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */
"esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */,
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
"forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
/* Type Checking */
"strict": true /* Enable all strict type-checking options. */,
// "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */
// "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
// "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
// "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */
// "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */
// "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */
// "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
"noUnusedLocals": true /* Enable error reporting when local variables aren't read. */,
"noUnusedParameters": true /* Raise an error when a function parameter isn't read. */,
// "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
// "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
"noFallthroughCasesInSwitch": true /* Enable error reporting for fallthrough cases in switch statements. */,
// "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */
// "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */
/* Completeness */
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */
"skipLibCheck": true /* Skip type checking all .d.ts files. */
"target": "ESNext",
"module": "CommonJS",
"moduleResolution": "Node",
"outDir": "./dist",
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true,
"skipLibCheck": true
},
"include": ["./src/**/*"],
"ts-node": {
"esm": true
"transpileOnly": true
}
}
server/yarn.lock
+333 -298
View File
File diff suppressed because it is too large Load Diff