upd

server/package.json

@@ -2,10 +2,11 @@
   "name": "server",
   "private": true,
   "version": "0.0.0",
+  "type": "module",
   "scripts": {
-    "dev": "nodemon src/index.ts",
-    "build": "npx tsc",
-    "start": "node dist/index.js"
+    "dev": "nodemon --exec node --import=./register.js  ./src/index.ts",
+    "build": "npx tsc -p ./",
+    "start": "node ./dist/index.js"
   },
   "dependencies": {
     "bcrypt": "^5.1.1",

server/register.js

@@ -0,0 +1,4 @@
+import { register } from "module";
+import { pathToFileURL } from "url";
+
+register("ts-node/esm", pathToFileURL("./"));

server/src/index.ts

@@ -1,22 +1,25 @@
 import "dotenv/config";
 import express, { json } from "express";
-import connectDB from "./config/db";
+import connectDB from "./config/db.js";
 import cors from "cors";
-import loginRouter from "./routes/login";
-import registrationRouter from "./routes/registration";
-import authMiddleware from "./middlewares/auth";
-import companiesRouter from "./routes/companies";
-import usersRouter from "./routes/users";
-import buildsRouter from "./routes/builds";
-import actionsRouter from "./routes/actions";
-import schedulesRouter from "./routes/schedules";
-import scheduledSessionsRoute from "./routes/scheduledSessions";
+import loginRouter from "./routes/login.js";
+import registrationRouter from "./routes/registration.js";
+import authMiddleware from "./middlewares/auth.js";
+import companiesRouter from "./routes/companies.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 scheduledSessionsRoute from "./routes/scheduledSessions.js";
+import adminCompaniesRoute from "./routes/admin/adminCompaniesRoute.js";
+import adminBuildsRoute from "./routes/admin/adminBuildsRoute.js";
+import adminUsersRoute from "./routes/admin/adminUsersRoute.js";
+
+await connectDB();
 
 const app = express();
 const port = process.env.PORT || 3000;
 
-connectDB();
-
 app.use(json());
 app.use(cors({ origin: "*" }));
 
@@ -28,6 +31,9 @@ app.use("/scheduled_sessions", scheduledSessionsRoute);
 app.use("/schedules", schedulesRouter);
 app.use("/companies", authMiddleware, companiesRouter);
 app.use("/users", authMiddleware, usersRouter);
+app.use("/admin/companies", adminCompaniesRoute);
+app.use("/admin/builds", adminBuildsRoute);
+app.use("/admin/users", adminUsersRoute);
 
 app.listen(port, () => {
   console.log(`Server listening on port ${port}`);

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";
-import User from "../models/User";
+import Token from "../models/Token.js";
+import User from "../models/User.js";
 
 async function authMiddleware(req: Request, res: Response, next: NextFunction) {
   if (!req.headers.authorization || !req.headers.authorization.split(" ")[1]) {

server/src/models/BuildUser.ts

@@ -1,25 +0,0 @@
-import { model, Schema } from "mongoose";
-
-const buildUserSchema = new Schema(
-  {
-    buildId: {
-      type: Schema.Types.ObjectId,
-      ref: "Build",
-      required: true,
-    },
-    userId: {
-      type: Schema.Types.ObjectId,
-      ref: "User",
-      required: true,
-    },
-  },
-  {
-    timestamps: true,
-    toJSON: { virtuals: true },
-    toObject: { virtuals: true },
-  }
-);
-
-const BuildUser = model("Build_User", buildUserSchema);
-
-export default BuildUser;

server/src/models/User.ts

@@ -11,22 +11,26 @@ const userSchema = new Schema(
       type: String,
       required: true,
     },
-    companyId: {
-      type: Schema.Types.ObjectId,
-      ref: "Company",
+    role: {
+      type: String,
       required: true,
     },
     name: {
       type: String,
       required: true,
     },
-    role: {
-      type: String,
-      required: true,
-    },
     avatar: {
       type: String,
     },
+    companyId: {
+      type: Schema.Types.ObjectId,
+      ref: "Company",
+      required: true,
+    },
+    buildIds: {
+      type: [Schema.Types.ObjectId],
+      ref: "Build",
+    },
   },
   {
     timestamps: true,

server/src/routes/actions.ts

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

server/src/routes/admin/adminBuildsRoute.ts

@@ -0,0 +1,60 @@
+import { Router } from "express";
+import Build from "../../models/Build.js";
+
+const router = Router();
+
+router.get("/", async (req, res) => {
+  try {
+    const result = await Build.find(req.query);
+
+    res.json(result);
+  } catch (error) {
+    res.json({ error: (error as Error).message });
+  }
+});
+
+router.get("/:id", async (req, res) => {
+  try {
+    const result = await Build.findById(req.params.id);
+
+    res.json(result);
+  } catch (error) {
+    res.json({ error: (error as Error).message });
+  }
+});
+
+router.post("/", async (req, res) => {
+  try {
+    const result = await Build.create(req.body);
+
+    res.json(result);
+  } catch (error) {
+    res.json({ error: (error as Error).message });
+  }
+});
+
+router.put("/:id", async (req, res) => {
+  try {
+    const result = await Build.findByIdAndUpdate(req.params.id, req.body, {
+      new: true,
+    });
+
+    res.json(result);
+  } catch (error) {
+    res.json({ error: (error as Error).message });
+  }
+});
+
+router.delete("/:id", async (req, res) => {
+  try {
+    const result = await Build.findByIdAndRemove(req.params.id);
+
+    res.json(result);
+  } catch (error) {
+    res.json({ error: (error as Error).message });
+  }
+});
+
+const adminBuildsRoute = router;
+
+export default adminBuildsRoute;

server/src/routes/admin/adminCompaniesRoute.ts

@@ -0,0 +1,60 @@
+import { Router } from "express";
+import Company from "../../models/Company.js";
+
+const router = Router();
+
+router.get("/", async (req, res) => {
+  try {
+    const result = await Company.find(req.query);
+
+    res.json(result);
+  } catch (error) {
+    res.json({ error: (error as Error).message });
+  }
+});
+
+router.get("/:id", async (req, res) => {
+  try {
+    const result = await Company.findById(req.params.id);
+
+    res.json(result);
+  } catch (error) {
+    res.json({ error: (error as Error).message });
+  }
+});
+
+router.post("/", async (req, res) => {
+  try {
+    const result = await Company.create(req.body);
+
+    res.json(result);
+  } catch (error) {
+    res.json({ error: (error as Error).message });
+  }
+});
+
+router.put("/:id", async (req, res) => {
+  try {
+    const result = await Company.findByIdAndUpdate(req.params.id, req.body, {
+      new: true,
+    });
+
+    res.json(result);
+  } catch (error) {
+    res.json({ error: (error as Error).message });
+  }
+});
+
+router.delete("/:id", async (req, res) => {
+  try {
+    const result = await Company.findByIdAndRemove(req.params.id);
+
+    res.json(result);
+  } catch (error) {
+    res.json({ error: (error as Error).message });
+  }
+});
+
+const adminCompaniesRoute = router;
+
+export default adminCompaniesRoute;

server/src/routes/admin/adminUsersRoute.ts

@@ -0,0 +1,62 @@
+import bcrypt from "bcrypt";
+import { Router } from "express";
+import User from "../../models/User.js";
+
+const router = Router();
+
+router.get("/", async (req, res) => {
+  try {
+    const result = await User.find(req.query);
+
+    res.json(result);
+  } catch (error) {
+    res.json({ error: (error as Error).message });
+  }
+});
+
+router.get("/:id", async (req, res) => {
+  try {
+    const result = await User.findById(req.params.id);
+
+    res.json(result);
+  } catch (error) {
+    res.json({ error: (error as Error).message });
+  }
+});
+
+router.post("/", async (req, res) => {
+  try {
+    const passwordHash = bcrypt.hashSync(req.body.password, 12);
+    const result = await User.create({ ...req.body, password: passwordHash });
+
+    res.json(result);
+  } catch (error) {
+    res.json({ error: (error as Error).message });
+  }
+});
+
+router.put("/:id", async (req, res) => {
+  try {
+    const result = await User.findByIdAndUpdate(req.params.id, req.body, {
+      new: true,
+    });
+
+    res.json(result);
+  } catch (error) {
+    res.json({ error: (error as Error).message });
+  }
+});
+
+router.delete("/:id", async (req, res) => {
+  try {
+    const result = await User.findByIdAndRemove(req.params.id);
+
+    res.json(result);
+  } catch (error) {
+    res.json({ error: (error as Error).message });
+  }
+});
+
+const adminUsersRoute = router;
+
+export default adminUsersRoute;

server/src/routes/builds.ts

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

server/src/routes/companies.ts

@@ -1,10 +1,9 @@
 import { Router } from "express";
-import Company from "../models/Company";
 import { parseISO, startOfDay, endOfDay } from "date-fns";
-import ScheduledSession from "../models/ScheduledSession";
-import Schedule from "../models/Schedule";
-import BuildUser from "../models/BuildUser";
-import User from "../models/User";
+import Company from "../models/Company.js";
+import ScheduledSession from "../models/ScheduledSession.js";
+import Schedule from "../models/Schedule.js";
+import User from "../models/User.js";
 
 const router = Router();
 
@@ -55,8 +54,8 @@ router.get("/:id/builds/:buildId/users", async (req, res) => {
     return;
   }
 
-  const buildUsers: any = await BuildUser.find({
-    buildId: req.params.buildId,
+  const buildUsers: any = await User.find({
+    buildIds: req.params.buildId,
   });
 
   const users = [];
@@ -195,10 +194,8 @@ router.get(
         return;
       }
 
-      const buildUsers = await BuildUser.find({ buildId: req.params.buildId });
-      let buildUserIds = buildUsers.map((buildUser) =>
-        buildUser.userId.toString()
-      );
+      const buildUsers = await User.find({ buildIds: req.params.buildId });
+      let buildUserIds = buildUsers.map((buildUser) => buildUser.toString());
 
       const scheduledSessionsAtTime = await ScheduledSession.find({
         buildId: req.params.buildId,

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";
-import Token from "../models/Token";
+import User from "../models/User.js";
+import Token from "../models/Token.js";
 
 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";
-import Token from "../models/Token";
+import User from "../models/User.js";
+import Token from "../models/Token.js";
 
 const router = Router();
 

server/src/routes/scheduledSessions.ts

@@ -1,7 +1,7 @@
 import { Router } from "express";
-import ScheduledSession from "../models/ScheduledSession";
-import Build from "../models/Build";
-import Schedule from "../models/Schedule";
+import ScheduledSession from "../models/ScheduledSession.js";
+import Build from "../models/Build.js";
+import Schedule from "../models/Schedule.js";
 import {
   addMinutes,
   areIntervalsOverlapping,

server/src/routes/schedules.ts

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

server/src/routes/users.ts

@@ -1,21 +1,28 @@
 import { Router } from "express";
+import User from "../models/User.js";
 // import User from "../models/User.js";
 
 const router = Router();
 
-// usersRouter.get("/", async (_req, res) => {
-//   const users = await User.find();
-//   console.log(users);
+router.get("/", async (req, res) => {
+  try {
+    const result = await User.find(req.query);
 
-//   res.json(users);
-// });
+    res.json(result);
+  } catch (error) {
+    res.json({ error: (error as Error).message });
+  }
+});
 
-// usersRouter.get("/:id", async (req, res) => {
-//   const user = await User.findById(req.params.id);
-//   console.log(user);
+router.get("/:id", async (req, res) => {
+  try {
+    const result = await User.findById(req.params);
 
-//   res.json(user);
-// });
+    res.json(result);
+  } catch (error) {
+    res.json({ error: (error as Error).message });
+  }
+});
 
 const usersRouter = router;
 

server/tsconfig.json

@@ -1,18 +1,109 @@
 {
   "compilerOptions": {
-    "target": "ESNext",
-    "module": "CommonJS",
-    "moduleResolution": "Node",
-    "outDir": "./dist",
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noFallthroughCasesInSwitch": true,
-    "skipLibCheck": true,
-  },
-  "ts-node": {
-    "transpileOnly": true
+    /* 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": "ESNext" /* 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": "NodeNext" /* Specify what module code is generated. */,
+    // "rootDir": "./",                                  /* Specify the root folder within your source files. */
+    "moduleResolution": "NodeNext" /* 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. */
   }
 }