From 0aa3d68d08ab19116b9b09bec739b4adb20943af Mon Sep 17 00:00:00 2001 From: Timothy-Gonzalez <105177619+Timothy-Gonzalez@users.noreply.github.com> Date: Wed, 9 Oct 2024 01:55:34 -0500 Subject: [PATCH] Move common files to common --- src/app.test.ts | 2 +- src/app.ts | 6 +++--- src/{ => common}/config.ts | 0 src/{ => common}/env.ts | 0 src/{ => common}/formatTools.ts | 0 src/{ => common}/metadata.ts | 2 +- src/{ => common}/openapi.ts | 2 +- src/{ => common}/testTools.ts | 2 +- src/{ => common}/types.ts | 0 src/middleware/cors-selector.ts | 2 +- src/middleware/database.ts | 2 +- src/middleware/select-auth.ts | 2 +- src/middleware/specification.ts | 2 +- src/middleware/verify-jwt.ts | 2 +- src/services/admission/admission-formats.ts | 2 +- src/services/admission/admission-router.test.ts | 4 ++-- src/services/admission/admission-router.ts | 2 +- src/services/auth/auth-lib.ts | 2 +- src/services/auth/auth-router.test.ts | 13 +++++++++++-- src/services/auth/auth-router.ts | 2 +- src/services/event/event-formats.ts | 4 ++-- src/services/event/event-router.test.ts | 2 +- src/services/event/event-router.ts | 2 +- src/services/mail/mail-formats.ts | 2 +- src/services/mail/mail-lib.ts | 2 +- src/services/mentor/mentor-router.test.ts | 2 +- src/services/mentor/mentor-router.ts | 2 +- src/services/notification/notification-formats.ts | 2 +- src/services/notification/notification-router.ts | 2 +- src/services/notification/notification-service.ts | 2 +- src/services/profile/profile-router.test.ts | 4 ++-- src/services/profile/profile-router.ts | 4 ++-- src/services/puzzle/puzzle-lib.ts | 2 +- src/services/puzzle/puzzle-router.ts | 4 ++-- src/services/registration/registration-formats.ts | 2 +- src/services/registration/registration-lib.ts | 2 +- .../registration/registration-router.test.ts | 4 ++-- src/services/registration/registration-router.ts | 2 +- src/services/s3/s3-service.ts | 2 +- src/services/shop/shop-formats.ts | 2 +- src/services/shop/shop-router.ts | 2 +- src/services/staff/staff-formats.ts | 2 +- src/services/staff/staff-lib.ts | 2 +- src/services/staff/staff-router.test.ts | 2 +- src/services/staff/staff-router.ts | 2 +- src/services/user/user-router.test.ts | 4 ++-- src/services/user/user-router.ts | 2 +- src/services/version/version-router.ts | 2 +- 48 files changed, 63 insertions(+), 54 deletions(-) rename src/{ => common}/config.ts (100%) rename src/{ => common}/env.ts (100%) rename src/{ => common}/formatTools.ts (100%) rename src/{ => common}/metadata.ts (95%) rename src/{ => common}/openapi.ts (97%) rename src/{ => common}/testTools.ts (98%) rename src/{ => common}/types.ts (100%) diff --git a/src/app.test.ts b/src/app.test.ts index 5ce0e7c5..f140dea3 100644 --- a/src/app.test.ts +++ b/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", () => { diff --git a/src/app.ts b/src/app.ts index 8fa806aa..514907f2 100644 --- a/src/app.ts +++ b/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(); diff --git a/src/config.ts b/src/common/config.ts similarity index 100% rename from src/config.ts rename to src/common/config.ts diff --git a/src/env.ts b/src/common/env.ts similarity index 100% rename from src/env.ts rename to src/common/env.ts diff --git a/src/formatTools.ts b/src/common/formatTools.ts similarity index 100% rename from src/formatTools.ts rename to src/common/formatTools.ts diff --git a/src/metadata.ts b/src/common/metadata.ts similarity index 95% rename from src/metadata.ts rename to src/common/metadata.ts index 8eaf56f4..f49a109a 100644 --- a/src/metadata.ts +++ b/src/common/metadata.ts @@ -1,4 +1,4 @@ -import Config from "./config"; +import Config from "../config"; import axios from "axios"; interface MetadataFormat { diff --git a/src/openapi.ts b/src/common/openapi.ts similarity index 97% rename from src/openapi.ts rename to src/common/openapi.ts index e943d3e8..928e7c6b 100644 --- a/src/openapi.ts +++ b/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(); diff --git a/src/testTools.ts b/src/common/testTools.ts similarity index 98% rename from src/testTools.ts rename to src/common/testTools.ts index a2e03638..9481f7a8 100644 --- a/src/testTools.ts +++ b/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 diff --git a/src/types.ts b/src/common/types.ts similarity index 100% rename from src/types.ts rename to src/common/types.ts diff --git a/src/middleware/cors-selector.ts b/src/middleware/cors-selector.ts index 27bb0821..1807a83a 100644 --- a/src/middleware/cors-selector.ts +++ b/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)]; diff --git a/src/middleware/database.ts b/src/middleware/database.ts index 074f13b8..6c3cfe0e 100644 --- a/src/middleware/database.ts +++ b/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"; diff --git a/src/middleware/select-auth.ts b/src/middleware/select-auth.ts index 2a817779..5d2082cc 100644 --- a/src/middleware/select-auth.ts +++ b/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, diff --git a/src/middleware/specification.ts b/src/middleware/specification.ts index 6d12c3bd..1317a700 100644 --- a/src/middleware/specification.ts +++ b/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"; diff --git a/src/middleware/verify-jwt.ts b/src/middleware/verify-jwt.ts index 24b2e121..70e4494a 100644 --- a/src/middleware/verify-jwt.ts +++ b/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 diff --git a/src/services/admission/admission-formats.ts b/src/services/admission/admission-formats.ts index 204b4728..2a499fef 100644 --- a/src/services/admission/admission-formats.ts +++ b/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 { diff --git a/src/services/admission/admission-router.test.ts b/src/services/admission/admission-router.test.ts index 2f507d48..703e3deb 100644 --- a/src/services/admission/admission-router.test.ts +++ b/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"; diff --git a/src/services/admission/admission-router.ts b/src/services/admission/admission-router.ts index b826a2c0..ad5a8c50 100644 --- a/src/services/admission/admission-router.ts +++ b/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"; diff --git a/src/services/auth/auth-lib.ts b/src/services/auth/auth-lib.ts index ef0a4d03..8ff70740 100644 --- a/src/services/auth/auth-lib.ts +++ b/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"; diff --git a/src/services/auth/auth-router.test.ts b/src/services/auth/auth-router.test.ts index 016ce547..e5afc664 100644 --- a/src/services/auth/auth-router.test.ts +++ b/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"; diff --git a/src/services/auth/auth-router.ts b/src/services/auth/auth-router.ts index cce8a07a..cd8274bd 100644 --- a/src/services/auth/auth-router.ts +++ b/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"; diff --git a/src/services/event/event-formats.ts b/src/services/event/event-formats.ts index 96a48558..7ca36983 100644 --- a/src/services/event/event-formats.ts +++ b/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"; diff --git a/src/services/event/event-router.test.ts b/src/services/event/event-router.test.ts index d3afc543..239dffdc 100644 --- a/src/services/event/event-router.test.ts +++ b/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", diff --git a/src/services/event/event-router.ts b/src/services/event/event-router.ts index 34970458..ae4a406d 100644 --- a/src/services/event/event-router.ts +++ b/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: "*" })); diff --git a/src/services/mail/mail-formats.ts b/src/services/mail/mail-formats.ts index ba2f31d6..1592c3e7 100644 --- a/src/services/mail/mail-formats.ts +++ b/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; diff --git a/src/services/mail/mail-lib.ts b/src/services/mail/mail-lib.ts index c2b8feb4..fd8b7596 100644 --- a/src/services/mail/mail-lib.ts +++ b/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"; diff --git a/src/services/mentor/mentor-router.test.ts b/src/services/mentor/mentor-router.test.ts index 74b0af83..0e3ef7e4 100644 --- a/src/services/mentor/mentor-router.test.ts +++ b/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", diff --git a/src/services/mentor/mentor-router.ts b/src/services/mentor/mentor-router.ts index b53aa636..b73faa87 100644 --- a/src/services/mentor/mentor-router.ts +++ b/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(); diff --git a/src/services/notification/notification-formats.ts b/src/services/notification/notification-formats.ts index 29ebeb23..45b072ef 100644 --- a/src/services/notification/notification-formats.ts +++ b/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 { diff --git a/src/services/notification/notification-router.ts b/src/services/notification/notification-router.ts index 791fe719..1ecf3ab6 100644 --- a/src/services/notification/notification-router.ts +++ b/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(); diff --git a/src/services/notification/notification-service.ts b/src/services/notification/notification-service.ts index 4c8b3831..bf64ec49 100644 --- a/src/services/notification/notification-service.ts +++ b/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 { diff --git a/src/services/profile/profile-router.test.ts b/src/services/profile/profile-router.test.ts index 873ed04e..cdd46d45 100644 --- a/src/services/profile/profile-router.test.ts +++ b/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, diff --git a/src/services/profile/profile-router.ts b/src/services/profile/profile-router.ts index 9b3d35e9..7c7c2bbf 100644 --- a/src/services/profile/profile-router.ts +++ b/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"; diff --git a/src/services/puzzle/puzzle-lib.ts b/src/services/puzzle/puzzle-lib.ts index 78f0a124..61982ea4 100644 --- a/src/services/puzzle/puzzle-lib.ts +++ b/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"; diff --git a/src/services/puzzle/puzzle-router.ts b/src/services/puzzle/puzzle-router.ts index 798cb97d..a7eb1fdd 100644 --- a/src/services/puzzle/puzzle-router.ts +++ b/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(); diff --git a/src/services/registration/registration-formats.ts b/src/services/registration/registration-formats.ts index 4a84fc32..df9316d8 100644 --- a/src/services/registration/registration-formats.ts +++ b/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; diff --git a/src/services/registration/registration-lib.ts b/src/services/registration/registration-lib.ts index d75617bc..ccf0cf29 100644 --- a/src/services/registration/registration-lib.ts +++ b/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"; diff --git a/src/services/registration/registration-router.test.ts b/src/services/registration/registration-router.test.ts index 564697e5..969261a1 100644 --- a/src/services/registration/registration-router.test.ts +++ b/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"; diff --git a/src/services/registration/registration-router.ts b/src/services/registration/registration-router.ts index 7c9d7626..b76fec33 100644 --- a/src/services/registration/registration-router.ts +++ b/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"; diff --git a/src/services/s3/s3-service.ts b/src/services/s3/s3-service.ts index 04b753da..a92c79b6 100644 --- a/src/services/s3/s3-service.ts +++ b/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"; diff --git a/src/services/shop/shop-formats.ts b/src/services/shop/shop-formats.ts index 1c279683..f487cf4d 100644 --- a/src/services/shop/shop-formats.ts +++ b/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; diff --git a/src/services/shop/shop-router.ts b/src/services/shop/shop-router.ts index 53e08271..5b076df1 100644 --- a/src/services/shop/shop-router.ts +++ b/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"; diff --git a/src/services/staff/staff-formats.ts b/src/services/staff/staff-formats.ts index 8cc7b0a6..b61a3ef3 100644 --- a/src/services/staff/staff-formats.ts +++ b/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 diff --git a/src/services/staff/staff-lib.ts b/src/services/staff/staff-lib.ts index 1be0053e..052e2b61 100644 --- a/src/services/staff/staff-lib.ts +++ b/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 { const eventAttendance = await Models.EventAttendance.findOne({ eventId: eventId }); diff --git a/src/services/staff/staff-router.test.ts b/src/services/staff/staff-router.test.ts index 0000afcd..1a84a874 100644 --- a/src/services/staff/staff-router.test.ts +++ b/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"; diff --git a/src/services/staff/staff-router.ts b/src/services/staff/staff-router.ts index e30d0957..2d4be508 100644 --- a/src/services/staff/staff-router.ts +++ b/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"; diff --git a/src/services/user/user-router.test.ts b/src/services/user/user-router.test.ts index 67cd7b1a..ad109781 100644 --- a/src/services/user/user-router.test.ts +++ b/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"; diff --git a/src/services/user/user-router.ts b/src/services/user/user-router.ts index e3e52109..0cc6d3f6 100644 --- a/src/services/user/user-router.ts +++ b/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"; diff --git a/src/services/version/version-router.ts b/src/services/version/version-router.ts index 83ba0157..bfbf27d5 100644 --- a/src/services/version/version-router.ts +++ b/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";