Merge pull request #38 from Kasper24/restructure

refactor: move and rename files for better organization

Author: Kasper24

apps/backend/src/jest.setup.ts apps/backend/jest.setup.tsapps/backend/src/jest.setup.ts renamed to apps/backend/jest.setup.ts

@@ -19,7 +19,7 @@
       "^@repo/backend/(.*)$": "<rootDir>/src/$1"
     },
     "setupFilesAfterEnv": [
-      "<rootDir>/src/jest.setup.ts"
+      "<rootDir>/jest.setup.ts"
     ]
   },
   "dependencies": {

apps/backend/package.json

@@ -5,7 +5,7 @@ const timeSpanType = z
   .regex(/^\d+[smhd]$/, "Invalid format. Use formats like '15m', '1h', '7d'.")
   .transform((val) => val as `${number}${"s" | "m" | "h" | "d"}`);
 
-const environmentVariableSchema = z.object({
+const envSchema = z.object({
   // Node Environment
   NODE_ENV: z.enum(["development", "test", "production"]),
 
@@ -76,20 +76,18 @@ const environmentVariableSchema = z.object({
 
 const envValidate = () => {
   try {
-    environmentVariableSchema.parse(process.env);
+    envSchema.parse(process.env);
   } catch (error) {
     if (error instanceof ZodError) console.error(error.errors);
     process.exit(1);
   }
 };
 
-type EnvSchemaType = z.infer<typeof environmentVariableSchema>;
-
 declare global {
   // eslint-disable-next-line @typescript-eslint/no-namespace
   namespace NodeJS {
     // eslint-disable-next-line @typescript-eslint/no-empty-object-type
-    interface ProcessEnv extends EnvSchemaType {}
+    interface ProcessEnv extends z.infer<typeof environmentVariableSchema> {}
   }
 }
 

apps/backend/src/config/index.ts apps/backend/src/env/index.tsapps/backend/src/config/index.ts renamed to apps/backend/src/env/index.ts

@@ -1,5 +1,5 @@
 import { createServer } from "@repo/backend/server";
-import envValidate from "@repo/backend/config";
+import envValidate from "@repo/backend/env";
 import { dbPush, dbReset, dbSeed, dbWaitForConnection } from "@repo/database";
 
 envValidate();

apps/backend/src/utils/errors.ts apps/backend/src/errors/index.tsapps/backend/src/utils/errors.ts renamed to apps/backend/src/errors/index.ts

@@ -1,5 +1,5 @@
 import { Request, Response, NextFunction } from "express";
-import { AuthError } from "@repo/backend/utils/errors";
+import { AuthError } from "@repo/backend/errors";
 import { jwtVerifyAccessToken } from "@repo/backend/utils/jwt";
 
 export interface AuthenticatedRequest extends Request {

apps/backend/src/index.ts

@@ -1,6 +1,6 @@
 import { Request, Response, ErrorRequestHandler, NextFunction } from "express";
 import { ReasonPhrases, StatusCodes } from "http-status-codes";
-import { GenericError } from "@repo/backend/utils/errors";
+import { GenericError } from "@repo/backend/errors";
 
 const errorHandler: ErrorRequestHandler = (
   error: unknown,

apps/backend/src/middlewares/auth.ts

@@ -1,7 +1,7 @@
 import { Request, Response, NextFunction } from "express";
 import redis from "@repo/backend/redis";
 import { parseTimeSpan, type TimeSpan } from "@repo/backend/utils/time";
-import { RateLimitError } from "@repo/backend/utils/errors";
+import { RateLimitError } from "@repo/backend/errors";
 
 const rateLimitHandler = ({
   endpoint = "global",

apps/backend/src/middlewares/error.ts

@@ -1,6 +1,6 @@
 import { Request, Response, NextFunction } from "express";
 import { z, ZodError } from "zod";
-import { BadRequestError } from "@repo/backend/utils/errors";
+import { BadRequestError } from "@repo/backend/errors";
 
 const validateHandler = (schema: z.ZodSchema) => {
   return (req: Request, res: Response, next: NextFunction) => {
@@ -11,7 +11,8 @@ const validateHandler = (schema: z.ZodSchema) => {
       if (error instanceof ZodError) {
         const errorMessages = error.errors
           .map(
-            (issue: z.ZodIssue) => `${issue.path.join(".")} is ${issue.message}`
+            (issue: z.ZodIssue) =>
+              `${issue.path.join(".")} is ${issue.message}`,
           )
           .join(", ");
         throw new BadRequestError(errorMessages);

apps/backend/src/middlewares/rate-limit.ts

@@ -4,7 +4,7 @@ import twilio from "twilio";
 import { eq } from "drizzle-orm";
 import { db } from "@repo/database";
 import { otps, refreshTokens, users } from "@repo/database/schema";
-import { AuthError } from "@repo/backend/utils/errors";
+import { AuthError } from "@repo/backend/errors";
 import {
   jwtSignAccessToken,
   jwtSignRefreshToken,