Move common files to common

src/app.test.ts

@@ -2,7 +2,7 @@
 
 import { describe, expect, test, it } from "@jest/globals";
 
-import { get } from "./testTools";
+import { get } from "./common/testTools";
 import { StatusCode } from "status-code-enum";
 
 describe("sanity tests for app", () => {

src/app.ts

@@ -1,4 +1,4 @@
-import "./types";
+import "./common/types";
 import morgan from "morgan";
 import express, { Request, Response } from "express";
 import swaggerUi from "swagger-ui-express";
@@ -22,10 +22,10 @@ import userRouter from "./services/user/user-router";
 // import { InitializeConfigReader } from "./middleware/config-reader";
 import { ErrorHandler } from "./middleware/error-handler";
 import { StatusCode } from "status-code-enum";
-import Config from "./config";
+import Config from "./common/config";
 import database from "./middleware/database";
 import corsSelector from "./middleware/cors-selector";
-import { getOpenAPISpec } from "./openapi";
+import { getOpenAPISpec } from "./common/openapi";
 
 const app = express();
 

src/metadata.ts → src/common/metadata.ts

@@ -1,4 +1,4 @@
-import Config from "./config";
+import Config from "../config";
 import axios from "axios";
 
 interface MetadataFormat {

src/openapi.ts → src/common/openapi.ts

@@ -2,7 +2,7 @@ import { OpenApiGeneratorV31, OpenAPIRegistry, RouteConfig } from "@asteasolutio
 import { AnyZodObject } from "zod";
 import type { OpenAPIObject } from "openapi3-ts/oas31";
 import Config from "./config";
-import { ResponsesObject, Specification } from "./middleware/specification";
+import { ResponsesObject, Specification } from "../middleware/specification";
 
 let openAPISpec: OpenAPIObject | undefined = undefined;
 export const Registry = new OpenAPIRegistry();

src/testTools.ts → src/common/testTools.ts

@@ -1,6 +1,6 @@
 import request from "supertest";
 
-import { Provider, Role } from "./services/auth/auth-models";
+import { Provider, Role } from "../services/auth/auth-models";
 
 // The tester is the user that will be making requests
 // We provide this object so you can do proper testing based on JWT auth

src/middleware/cors-selector.ts

@@ -1,5 +1,5 @@
 import cors, { CorsOptions } from "cors";
-import Config from "../config";
+import Config from "../common/config";
 
 // Only allow a certain set of regexes to be allowed via CORS
 const allowedOrigins = [new RegExp(Config.CORS.PROD_REGEX), new RegExp(Config.CORS.DEPLOY_REGEX)];

src/middleware/database.ts

@@ -1,4 +1,4 @@
-import Config from "../config";
+import Config from "../common/config";
 import { Request, Response, NextFunction } from "express";
 import mongoose from "mongoose";
 

src/middleware/select-auth.ts

@@ -2,7 +2,7 @@ import { AuthenticateOptions } from "passport";
 import { RequestHandler } from "express-serve-static-core";
 
 import { authenticateFunction } from "../services/auth/auth-lib";
-import Config from "../config";
+import Config from "../common/config";
 
 const googleOptions: AuthenticateOptions = {
     session: false,

src/middleware/specification.ts

@@ -2,7 +2,7 @@ import { RequestHandler } from "express";
 import { AnyZodObject, z } from "zod";
 import StatusCode from "status-code-enum";
 import { Response, Request, NextFunction } from "express";
-import { registerPathSpecification } from "../openapi";
+import { registerPathSpecification } from "../common/openapi";
 import { RouteConfig } from "@asteasolutions/zod-to-openapi";
 import { Role } from "../services/auth/auth-models";
 import { decodeJwtToken } from "../services/auth/auth-lib";

src/middleware/verify-jwt.ts

@@ -2,7 +2,7 @@ import { Request, Response, NextFunction } from "express";
 import { decodeJwtToken } from "../services/auth/auth-lib";
 import jsonwebtoken from "jsonwebtoken";
 import { StatusCode } from "status-code-enum";
-import Config from "../config";
+import Config from "../common/config";
 
 // TODO: Remove all usages of these
 

src/services/admission/admission-formats.ts

@@ -1,4 +1,4 @@
-import { isArrayOfType, isBoolean, isEnumOfType, isNumber, isString } from "../../formatTools";
+import { isArrayOfType, isBoolean, isEnumOfType, isNumber, isString } from "../../common/formatTools";
 import { AdmissionDecision, DecisionResponse, DecisionStatus } from "../../database/admission-db";
 
 export function isValidApplicantFormat(obj: AdmissionDecision[]): boolean {

src/services/admission/admission-router.test.ts

@@ -2,9 +2,9 @@ import { beforeEach, describe, expect, it, jest } from "@jest/globals";
 import Models from "../../database/models";
 import { DecisionStatus, DecisionResponse, AdmissionDecision } from "../../database/admission-db";
 import { RegistrationFormat } from "../registration/registration-formats";
-import { RegistrationTemplates } from "./../../config";
+import { RegistrationTemplates } from "../../common/config";
 import { Gender, Degree, Race, HackInterest, HackOutreach } from "../registration/registration-models";
-import { getAsStaff, getAsUser, putAsStaff, putAsUser, getAsAttendee, putAsApplicant, TESTER } from "../../testTools";
+import { getAsStaff, getAsUser, putAsStaff, putAsUser, getAsAttendee, putAsApplicant, TESTER } from "../../common/testTools";
 import { StatusCode } from "status-code-enum";
 import type * as MailLib from "../../services/mail/mail-lib";
 import type { AxiosResponse } from "axios";

src/services/admission/admission-router.ts

@@ -11,7 +11,7 @@ import { NextFunction } from "express-serve-static-core";
 import { RouterError } from "../../middleware/error-handler";
 import { performRSVP } from "./admission-lib";
 import { MailInfoFormat } from "../mail/mail-formats";
-import { RegistrationTemplates } from "../../config";
+import { RegistrationTemplates } from "../../common/config";
 import { getApplication } from "../registration/registration-lib";
 import { sendMail } from "../mail/mail-lib";
 

src/services/auth/auth-lib.ts

@@ -3,7 +3,7 @@ import jsonwebtoken, { SignOptions } from "jsonwebtoken";
 import { RequestHandler } from "express-serve-static-core";
 import passport, { AuthenticateOptions, Profile } from "passport";
 
-import Config from "../../config";
+import Config from "../../common/config";
 
 import { Role, JwtPayload, Provider, ProfileData, RoleOperation } from "./auth-models";
 

src/services/auth/auth-router.test.ts

@@ -2,8 +2,17 @@ import { jest, describe, it, expect, beforeEach } from "@jest/globals";
 import { SpiedFunction } from "jest-mock";
 import { RequestHandler } from "express";
 import { StatusCode } from "status-code-enum";
-import { AUTH_ROLE_TO_ROLES, TESTER, get, getAsAttendee, getAsStaff, getAsUser, putAsAdmin, putAsStaff } from "../../testTools";
-import Config, { Device } from "../../config";
+import {
+    AUTH_ROLE_TO_ROLES,
+    TESTER,
+    get,
+    getAsAttendee,
+    getAsStaff,
+    getAsUser,
+    putAsAdmin,
+    putAsStaff,
+} from "../../common/testTools";
+import Config, { Device } from "../../common/config";
 import * as selectAuthMiddleware from "../../middleware/select-auth";
 import { mockGenerateJwtTokenWithWrapper, mockGetJwtPayloadFromProfile } from "./mocks/auth";
 import { JwtPayload, ProfileData, Provider, Role, RoleOperation } from "./auth-models";

src/services/auth/auth-router.ts

@@ -4,7 +4,7 @@ import express, { Request, Response, Router } from "express";
 import GitHubStrategy, { Profile as GithubProfile } from "passport-github";
 import { Strategy as GoogleStrategy, Profile as GoogleProfile } from "passport-google-oauth20";
 
-import Config, { Device } from "../../config";
+import Config, { Device } from "../../common/config";
 import { StatusCode } from "status-code-enum";
 import { strongJwtVerification } from "../../middleware/verify-jwt";
 import { SelectAuthProvider } from "../../middleware/select-auth";

src/services/event/event-formats.ts

@@ -1,5 +1,5 @@
-import { isArrayOfType, isBoolean, isEnumOfType, isNumber, isObject, isString } from "../../formatTools";
-import Config from "../../config";
+import { isArrayOfType, isBoolean, isEnumOfType, isNumber, isObject, isString } from "../../common/formatTools";
+import Config from "../../common/config";
 import { Event, Location } from "../../database/event-db";
 import { PUBLIC_EVENT_TYPE, STAFF_EVENT_TYPE } from "./event-models";
 

src/services/event/event-router.test.ts

@@ -3,7 +3,7 @@ import { EventFollowers } from "../../database/event-db";
 import { AttendeeFollowing } from "../../database/attendee-db";
 import Models from "../../database/models";
 import { StatusCode } from "status-code-enum";
-import { TESTER, getAsAttendee, getAsStaff } from "../../testTools";
+import { TESTER, getAsAttendee, getAsStaff } from "../../common/testTools";
 
 const TESTER_EVENT_FOLLOWERS = {
     eventId: "other-event",

src/services/event/event-router.ts

@@ -18,7 +18,7 @@ import Models from "../../database/models";
 import { RouterError } from "../../middleware/error-handler";
 
 import crypto from "crypto";
-import Config from "../../config";
+import Config from "../../common/config";
 
 const eventsRouter = Router();
 eventsRouter.use(cors({ origin: "*" }));

src/services/mail/mail-formats.ts

@@ -1,4 +1,4 @@
-import { isString, isArrayOfType } from "../../formatTools";
+import { isString, isArrayOfType } from "../../common/formatTools";
 
 export interface MailInfoFormat {
     templateId: string;

src/services/mail/mail-lib.ts

@@ -1,4 +1,4 @@
-import Config from "../../config";
+import Config from "../../common/config";
 import axios, { AxiosResponse } from "axios";
 import { Response, NextFunction } from "express";
 import { StatusCode } from "status-code-enum";

src/services/mentor/mentor-router.test.ts

@@ -3,7 +3,7 @@ import { describe, expect, it } from "@jest/globals";
 import Models from "../../database/models";
 import { StatusCode } from "status-code-enum";
 import { OfficeHoursFormat } from "./mentor-formats";
-import { postAsAdmin, postAsAttendee, getAsAttendee, getAsAdmin, delAsAttendee, delAsAdmin } from "../../testTools";
+import { postAsAdmin, postAsAttendee, getAsAttendee, getAsAdmin, delAsAttendee, delAsAdmin } from "../../common/testTools";
 
 const TESTER_OFFICE_HOURS_1 = {
     mentorName: "asdf",

src/services/mentor/mentor-router.ts

@@ -8,7 +8,7 @@ import { hasElevatedPerms } from "../auth/auth-lib";
 import { RouterError } from "../../middleware/error-handler";
 import { NextFunction } from "express-serve-static-core";
 import { updatePointsAndCoins } from "../profile/profile-lib";
-import Config from "../../config";
+import Config from "../../common/config";
 import crypto from "crypto";
 
 const mentorRouter = Router();

src/services/notification/notification-formats.ts

@@ -1,4 +1,4 @@
-import { isEnumOfType, isNumber, isString } from "../../formatTools";
+import { isEnumOfType, isNumber, isString } from "../../common/formatTools";
 import { Role } from "../auth/auth-models";
 
 export interface NotificationSendFormat {

src/services/notification/notification-router.ts

@@ -7,7 +7,7 @@ import { StaffShift } from "../../database/staff-db";
 import { JwtPayload } from "../auth/auth-models";
 import { hasAdminPerms, hasStaffPerms } from "../auth/auth-lib";
 import { NotificationSendFormat, isValidNotificationSendFormat } from "./notification-formats";
-import Config from "../../config";
+import Config from "../../common/config";
 import { sendNotification } from "./notification-service";
 
 const notificationsRouter = Router();

src/services/notification/notification-service.ts

@@ -1,5 +1,5 @@
 import { Message } from "firebase-admin/lib/messaging/messaging-api";
-import Config from "../../config";
+import Config from "../../common/config";
 import admin, { ServiceAccount } from "firebase-admin";
 
 function initializeFCM(): void {

src/services/profile/profile-router.test.ts

@@ -1,9 +1,9 @@
 import { beforeEach, describe, expect, it } from "@jest/globals";
 import { StatusCode } from "status-code-enum";
-import Config from "../../config";
+import Config from "../../common/config";
 import { AttendeeProfile } from "../../database/attendee-db";
 import Models from "../../database/models";
-import { TESTER, delAsUser, getAsAdmin, getAsUser, postAsAttendee, postAsStaff, postAsUser } from "../../testTools";
+import { TESTER, delAsUser, getAsAdmin, getAsUser, postAsAttendee, postAsStaff, postAsUser } from "../../common/testTools";
 
 const TESTER_USER = {
     userId: TESTER.id,

src/services/profile/profile-router.ts

@@ -2,7 +2,7 @@ import cors from "cors";
 import { Request, Router } from "express";
 import { NextFunction, Response } from "express-serve-static-core";
 
-import Config, { Avatars } from "../../config";
+import Config, { Avatars } from "../../common/config";
 import { AttendeeProfile } from "../../database/attendee-db";
 import { RegistrationApplication } from "../../database/registration-db";
 import { isValidLimit, updatePointsAndCoins } from "./profile-lib";
@@ -16,7 +16,7 @@ import { strongJwtVerification } from "../../middleware/verify-jwt";
 import { hasElevatedPerms } from "../auth/auth-lib";
 import { JwtPayload } from "../auth/auth-models";
 
-import { isNumber } from "../../formatTools";
+import { isNumber } from "../../common/formatTools";
 import { RouterError } from "../../middleware/error-handler";
 import { isValidProfileFormat } from "./profile-formats";
 

src/services/puzzle/puzzle-lib.ts

@@ -1,4 +1,4 @@
-import Config from "../../config";
+import Config from "../../common/config";
 import Models from "../../database/models";
 import { PuzzleItem } from "../../database/puzzle-db";
 import { UpdateQuery } from "mongoose";

src/services/puzzle/puzzle-router.ts

@@ -6,9 +6,9 @@ import { RouterError } from "../../middleware/error-handler";
 import { strongJwtVerification, weakJwtVerification } from "../../middleware/verify-jwt";
 import { JwtPayload } from "../auth/auth-models";
 import { PuzzleItem } from "../../database/puzzle-db";
-import Config from "../../config";
+import Config from "../../common/config";
 import { updatePuzzle } from "./puzzle-lib";
-import { isString } from "../../formatTools";
+import { isString } from "../../common/formatTools";
 
 const puzzleRouter = Router();
 

src/services/registration/registration-formats.ts

@@ -1,5 +1,5 @@
 import { Degree, Gender, HackInterest, HackOutreach, Race } from "./registration-models";
-import { isString, isBoolean, isArrayOfType, isNumber, isEnumOfType } from "../../formatTools";
+import { isString, isBoolean, isArrayOfType, isNumber, isEnumOfType } from "../../common/formatTools";
 
 export interface RegistrationFormat {
     userId: string;

src/services/registration/registration-lib.ts

@@ -1,4 +1,4 @@
-import Config from "../../config";
+import Config from "../../common/config";
 import Models from "../../database/models";
 import { RegistrationApplication } from "../../database/registration-db";
 

src/services/registration/registration-router.test.ts

@@ -2,8 +2,8 @@ import { beforeEach, describe, expect, it, jest } from "@jest/globals";
 import { StatusCode } from "status-code-enum";
 import Models from "../../database/models";
 import { RegistrationApplication } from "../../database/registration-db";
-import { RegistrationTemplates } from "./../../config";
-import { TESTER, getAsUser, getAsAdmin, postAsUser } from "../../testTools";
+import { RegistrationTemplates } from "../../common/config";
+import { TESTER, getAsUser, getAsAdmin, postAsUser } from "../../common/testTools";
 import { RegistrationFormat } from "./registration-formats";
 import { Degree, Gender, HackInterest, HackOutreach, Race } from "./registration-models";
 import type * as MailLib from "../../services/mail/mail-lib";

src/services/registration/registration-router.ts

@@ -2,7 +2,7 @@ import { StatusCode } from "status-code-enum";
 import { NextFunction } from "express-serve-static-core";
 import { Request, Response, Router } from "express";
 
-import { RegistrationTemplates } from "../../config";
+import { RegistrationTemplates } from "../../common/config";
 import { strongJwtVerification } from "../../middleware/verify-jwt";
 import { RouterError } from "../../middleware/error-handler";
 

src/services/s3/s3-service.ts

@@ -1,5 +1,5 @@
 import { GetObjectCommand, S3 } from "@aws-sdk/client-s3";
-import Config from "../../config";
+import Config from "../../common/config";
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
 import { createPresignedPost, PresignedPost } from "@aws-sdk/s3-presigned-post";
 

src/services/shop/shop-formats.ts

@@ -1,4 +1,4 @@
-import Config from "../../config";
+import Config from "../../common/config";
 import { ShopItem } from "../../database/shop-db";
 export interface FilteredShopItemFormat {
     itemId: string;

src/services/shop/shop-router.ts

@@ -3,7 +3,7 @@ import { ShopItem } from "../../database/shop-db";
 import { Request, Response, Router } from "express";
 import { NextFunction } from "express-serve-static-core";
 import { StatusCode } from "status-code-enum";
-import Config from "../../config";
+import Config from "../../common/config";
 import Models from "../../database/models";
 import { RouterError } from "../../middleware/error-handler";
 import { strongJwtVerification, weakJwtVerification } from "../../middleware/verify-jwt";

src/services/staff/staff-formats.ts

@@ -1,6 +1,6 @@
 import { RouterError } from "../../middleware/error-handler";
 import { StaffShift } from "../../database/staff-db";
-import { isArrayOfType, isString } from "../../formatTools";
+import { isArrayOfType, isString } from "../../common/formatTools";
 import { AttendeeProfile } from "../../database/attendee-db";
 
 // Format for default staff attendance input

src/services/staff/staff-lib.ts

@@ -3,7 +3,7 @@ import { StatusCode } from "status-code-enum";
 import { checkInResult } from "./staff-formats";
 import { RouterError } from "../../middleware/error-handler";
 import { updatePointsAndCoins } from "../profile/profile-lib";
-import { isNumber } from "../../formatTools";
+import { isNumber } from "../../common/formatTools";
 
 export async function performCheckIn(eventId: string, userId: string, points: number = 0): Promise<checkInResult> {
     const eventAttendance = await Models.EventAttendance.findOne({ eventId: eventId });

src/services/staff/staff-router.test.ts

@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, it } from "@jest/globals";
-import { AUTH_ROLE_TO_ROLES, putAsAttendee, putAsStaff } from "../../testTools";
+import { AUTH_ROLE_TO_ROLES, putAsAttendee, putAsStaff } from "../../common/testTools";
 import { generateJwtToken } from "../auth/auth-lib";
 
 import { EventAttendance } from "../../database/event-db";

src/services/staff/staff-router.ts

@@ -6,7 +6,7 @@ import { decodeJwtToken } from "../auth/auth-lib";
 import { hasAdminPerms, hasStaffPerms } from "../auth/auth-lib";
 
 import { AttendanceFormat, isValidStaffShiftFormat } from "./staff-formats";
-import Config from "../../config";
+import Config from "../../common/config";
 
 import Models from "../../database/models";
 import { StatusCode } from "status-code-enum";

src/services/user/user-router.test.ts

@@ -1,10 +1,10 @@
 import { beforeEach, afterEach, describe, expect, it } from "@jest/globals";
-import { AUTH_ROLE_TO_ROLES, TESTER, get, getAsAdmin, getAsAttendee, getAsStaff, putAsAttendee } from "../../testTools";
+import { AUTH_ROLE_TO_ROLES, TESTER, get, getAsAdmin, getAsAttendee, getAsStaff, putAsAttendee } from "../../common/testTools";
 
 import { AttendeeFollowing, AttendeeProfile } from "../../database/attendee-db";
 import { EventFollowers, EventAttendance, Event } from "../../database/event-db";
 import { StatusCode } from "status-code-enum";
-import Config from "../../config";
+import Config from "../../common/config";
 import { AuthInfo } from "../../database/auth-db";
 import Models from "../../database/models";
 import { UserInfo } from "../../database/user-db";

src/services/user/user-router.ts

@@ -9,7 +9,7 @@ import { performCheckIn } from "../staff/staff-lib";
 
 import { UserInfo } from "../../database/user-db";
 import Models from "../../database/models";
-import Config from "../../config";
+import Config from "../../common/config";
 import { NextFunction } from "express-serve-static-core";
 import { RouterError } from "../../middleware/error-handler";
 

src/services/version/version-router.ts

@@ -1,5 +1,5 @@
 import { Router } from "express";
-import Metadata from "../../metadata";
+import Metadata from "../../common/metadata";
 import { StatusCode } from "status-code-enum";
 import specification, { Tag } from "../../middleware/specification";
 import { versionResponseSchema } from "./version-schema";