From 91220a5bdc28836e7440a9f291a388a183b8f6e0 Mon Sep 17 00:00:00 2001 From: Bruce Berrios <58147810+Bruception@users.noreply.github.com> Date: Thu, 5 May 2022 13:27:00 -0400 Subject: [PATCH] Move backend source files into src folder (#2943) --- .github/workflows/pr-check.yml | 6 +++--- backend/__tests__/api/controllers/user.spec.ts | 2 +- backend/__tests__/dal/user.spec.ts | 2 +- backend/package.json | 2 +- backend/setup-tests.ts | 4 ++-- backend/{ => src}/anticheat/index.ts | 0 backend/{ => src}/api/controllers/ape-key.ts | 0 backend/{ => src}/api/controllers/config.ts | 0 backend/{ => src}/api/controllers/leaderboard.ts | 0 backend/{ => src}/api/controllers/preset.ts | 0 backend/{ => src}/api/controllers/psa.ts | 0 backend/{ => src}/api/controllers/quote.ts | 0 backend/{ => src}/api/controllers/result.ts | 0 backend/{ => src}/api/controllers/user.ts | 0 backend/{ => src}/api/routes/ape-keys.ts | 0 backend/{ => src}/api/routes/configs.ts | 0 backend/{ => src}/api/routes/index.ts | 0 backend/{ => src}/api/routes/leaderboards.ts | 0 backend/{ => src}/api/routes/presets.ts | 0 backend/{ => src}/api/routes/psas.ts | 0 backend/{ => src}/api/routes/quotes.ts | 0 backend/{ => src}/api/routes/results.ts | 0 backend/{ => src}/api/routes/swagger.ts | 0 backend/{ => src}/api/routes/users.ts | 0 backend/{ => src}/api/schemas/config-schema.ts | 0 backend/{ => src}/api/schemas/result-schema.ts | 0 backend/{ => src}/app.ts | 0 backend/{ => src}/constants/base-configuration.ts | 0 backend/{ => src}/constants/monkey-status-codes.ts | 0 backend/{ => src}/constants/profanities.ts | 0 backend/{ => src}/credentials/.gitkeep | 0 backend/{ => src}/dal/ape-keys.ts | 0 backend/{ => src}/dal/bot.ts | 0 backend/{ => src}/dal/config.ts | 0 backend/{ => src}/dal/leaderboards.ts | 0 backend/{ => src}/dal/new-quotes.ts | 0 backend/{ => src}/dal/preset.ts | 0 backend/{ => src}/dal/psa.ts | 0 backend/{ => src}/dal/public-stats.ts | 0 backend/{ => src}/dal/quote-ratings.ts | 0 backend/{ => src}/dal/report.ts | 0 backend/{ => src}/dal/result.ts | 0 backend/{ => src}/dal/user.ts | 0 backend/{ => src}/documentation/internal-swagger.json | 0 backend/{ => src}/documentation/public-swagger.json | 0 backend/{ => src}/init/configuration.ts | 0 backend/{ => src}/init/db.ts | 6 +++--- backend/{ => src}/init/redis.ts | 0 backend/{ => src}/jobs/delete-old-logs.ts | 0 backend/{ => src}/jobs/index.ts | 0 backend/{ => src}/jobs/update-leaderboards.ts | 0 backend/{ => src}/middlewares/ape-rate-limit.ts | 0 backend/{ => src}/middlewares/api-utils.ts | 0 backend/{ => src}/middlewares/auth.ts | 0 backend/{ => src}/middlewares/context.ts | 0 backend/{ => src}/middlewares/error.ts | 0 backend/{ => src}/middlewares/rate-limit.ts | 0 backend/{ => src}/server.ts | 0 backend/{ => src}/tasks/george.ts | 0 backend/{ => src}/types/types.d.ts | 0 backend/{ => src}/utils/auth.ts | 0 backend/{ => src}/utils/captcha.ts | 0 backend/{ => src}/utils/discord.ts | 0 backend/{ => src}/utils/error.ts | 0 backend/{ => src}/utils/logger.ts | 0 backend/{ => src}/utils/misc.ts | 0 backend/{ => src}/utils/monkey-response.ts | 0 backend/{ => src}/utils/pb.ts | 0 backend/{ => src}/utils/prometheus.ts | 0 backend/{ => src}/utils/validation.ts | 0 backend/{ => src}/version.ts | 0 backend/tsconfig.json | 1 + 72 files changed, 12 insertions(+), 11 deletions(-) rename backend/{ => src}/anticheat/index.ts (100%) rename backend/{ => src}/api/controllers/ape-key.ts (100%) rename backend/{ => src}/api/controllers/config.ts (100%) rename backend/{ => src}/api/controllers/leaderboard.ts (100%) rename backend/{ => src}/api/controllers/preset.ts (100%) rename backend/{ => src}/api/controllers/psa.ts (100%) rename backend/{ => src}/api/controllers/quote.ts (100%) rename backend/{ => src}/api/controllers/result.ts (100%) rename backend/{ => src}/api/controllers/user.ts (100%) rename backend/{ => src}/api/routes/ape-keys.ts (100%) rename backend/{ => src}/api/routes/configs.ts (100%) rename backend/{ => src}/api/routes/index.ts (100%) rename backend/{ => src}/api/routes/leaderboards.ts (100%) rename backend/{ => src}/api/routes/presets.ts (100%) rename backend/{ => src}/api/routes/psas.ts (100%) rename backend/{ => src}/api/routes/quotes.ts (100%) rename backend/{ => src}/api/routes/results.ts (100%) rename backend/{ => src}/api/routes/swagger.ts (100%) rename backend/{ => src}/api/routes/users.ts (100%) rename backend/{ => src}/api/schemas/config-schema.ts (100%) rename backend/{ => src}/api/schemas/result-schema.ts (100%) rename backend/{ => src}/app.ts (100%) rename backend/{ => src}/constants/base-configuration.ts (100%) rename backend/{ => src}/constants/monkey-status-codes.ts (100%) rename backend/{ => src}/constants/profanities.ts (100%) rename backend/{ => src}/credentials/.gitkeep (100%) rename backend/{ => src}/dal/ape-keys.ts (100%) rename backend/{ => src}/dal/bot.ts (100%) rename backend/{ => src}/dal/config.ts (100%) rename backend/{ => src}/dal/leaderboards.ts (100%) rename backend/{ => src}/dal/new-quotes.ts (100%) rename backend/{ => src}/dal/preset.ts (100%) rename backend/{ => src}/dal/psa.ts (100%) rename backend/{ => src}/dal/public-stats.ts (100%) rename backend/{ => src}/dal/quote-ratings.ts (100%) rename backend/{ => src}/dal/report.ts (100%) rename backend/{ => src}/dal/result.ts (100%) rename backend/{ => src}/dal/user.ts (100%) rename backend/{ => src}/documentation/internal-swagger.json (100%) rename backend/{ => src}/documentation/public-swagger.json (100%) rename backend/{ => src}/init/configuration.ts (100%) rename backend/{ => src}/init/db.ts (94%) rename backend/{ => src}/init/redis.ts (100%) rename backend/{ => src}/jobs/delete-old-logs.ts (100%) rename backend/{ => src}/jobs/index.ts (100%) rename backend/{ => src}/jobs/update-leaderboards.ts (100%) rename backend/{ => src}/middlewares/ape-rate-limit.ts (100%) rename backend/{ => src}/middlewares/api-utils.ts (100%) rename backend/{ => src}/middlewares/auth.ts (100%) rename backend/{ => src}/middlewares/context.ts (100%) rename backend/{ => src}/middlewares/error.ts (100%) rename backend/{ => src}/middlewares/rate-limit.ts (100%) rename backend/{ => src}/server.ts (100%) rename backend/{ => src}/tasks/george.ts (100%) rename backend/{ => src}/types/types.d.ts (100%) rename backend/{ => src}/utils/auth.ts (100%) rename backend/{ => src}/utils/captcha.ts (100%) rename backend/{ => src}/utils/discord.ts (100%) rename backend/{ => src}/utils/error.ts (100%) rename backend/{ => src}/utils/logger.ts (100%) rename backend/{ => src}/utils/misc.ts (100%) rename backend/{ => src}/utils/monkey-response.ts (100%) rename backend/{ => src}/utils/pb.ts (100%) rename backend/{ => src}/utils/prometheus.ts (100%) rename backend/{ => src}/utils/validation.ts (100%) rename backend/{ => src}/version.ts (100%) diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index 4110ff93a..c1031f340 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -42,9 +42,9 @@ jobs: working-directory: ./frontend/src/ts/constants run: mv ./firebase-config-example.ts ./firebase-config-live.ts - - name: Check Anti-cheat - if: steps.filter.outputs.anti-cheat == 'true' - run: exit 1 + # - name: Check Anti-cheat + # if: steps.filter.outputs.anti-cheat == 'true' + # run: exit 1 - name: Cache node modules if: steps.filter.outputs.changes != '[]' diff --git a/backend/__tests__/api/controllers/user.spec.ts b/backend/__tests__/api/controllers/user.spec.ts index 04f7d6898..319086fe6 100644 --- a/backend/__tests__/api/controllers/user.spec.ts +++ b/backend/__tests__/api/controllers/user.spec.ts @@ -1,5 +1,5 @@ import request from "supertest"; -import server from "../../../app"; +import server from "../../../src/app"; describe("user controller test", () => { it("should be able to sign up", (done) => { diff --git a/backend/__tests__/dal/user.spec.ts b/backend/__tests__/dal/user.spec.ts index e50923517..539c96a40 100644 --- a/backend/__tests__/dal/user.spec.ts +++ b/backend/__tests__/dal/user.spec.ts @@ -1,4 +1,4 @@ -import { addUser, getUser } from "../../dal/user"; +import { addUser, getUser } from "../../src/dal/user"; describe("UserDal", () => { it("should be able to insert users", async () => { diff --git a/backend/package.json b/backend/package.json index 754be0aa2..72eebe114 100644 --- a/backend/package.json +++ b/backend/package.json @@ -9,7 +9,7 @@ "clean": "tsc --build --clean", "start": "npm run build && node ./build/server.js", "test": "jest", - "dev": "ts-node-dev server.ts -- --inspect --transpileOnly" + "dev": "ts-node-dev ./src/server.ts -- --inspect --transpileOnly" }, "engines": { "node": "16.13.2", diff --git a/backend/setup-tests.ts b/backend/setup-tests.ts index 2579148b5..78c5056d7 100644 --- a/backend/setup-tests.ts +++ b/backend/setup-tests.ts @@ -2,14 +2,14 @@ import { Collection, Db, MongoClient, WithId } from "mongodb"; process.env.MODE = "dev"; -jest.mock("./init/db", () => ({ +jest.mock("./src/init/db", () => ({ __esModule: true, getDb: (): Db => db, collection: (name: string): Collection> => db.collection>(name), })); -jest.mock("./utils/logger", () => ({ +jest.mock("./src/utils/logger", () => ({ __esModule: true, default: { error: console.error, diff --git a/backend/anticheat/index.ts b/backend/src/anticheat/index.ts similarity index 100% rename from backend/anticheat/index.ts rename to backend/src/anticheat/index.ts diff --git a/backend/api/controllers/ape-key.ts b/backend/src/api/controllers/ape-key.ts similarity index 100% rename from backend/api/controllers/ape-key.ts rename to backend/src/api/controllers/ape-key.ts diff --git a/backend/api/controllers/config.ts b/backend/src/api/controllers/config.ts similarity index 100% rename from backend/api/controllers/config.ts rename to backend/src/api/controllers/config.ts diff --git a/backend/api/controllers/leaderboard.ts b/backend/src/api/controllers/leaderboard.ts similarity index 100% rename from backend/api/controllers/leaderboard.ts rename to backend/src/api/controllers/leaderboard.ts diff --git a/backend/api/controllers/preset.ts b/backend/src/api/controllers/preset.ts similarity index 100% rename from backend/api/controllers/preset.ts rename to backend/src/api/controllers/preset.ts diff --git a/backend/api/controllers/psa.ts b/backend/src/api/controllers/psa.ts similarity index 100% rename from backend/api/controllers/psa.ts rename to backend/src/api/controllers/psa.ts diff --git a/backend/api/controllers/quote.ts b/backend/src/api/controllers/quote.ts similarity index 100% rename from backend/api/controllers/quote.ts rename to backend/src/api/controllers/quote.ts diff --git a/backend/api/controllers/result.ts b/backend/src/api/controllers/result.ts similarity index 100% rename from backend/api/controllers/result.ts rename to backend/src/api/controllers/result.ts diff --git a/backend/api/controllers/user.ts b/backend/src/api/controllers/user.ts similarity index 100% rename from backend/api/controllers/user.ts rename to backend/src/api/controllers/user.ts diff --git a/backend/api/routes/ape-keys.ts b/backend/src/api/routes/ape-keys.ts similarity index 100% rename from backend/api/routes/ape-keys.ts rename to backend/src/api/routes/ape-keys.ts diff --git a/backend/api/routes/configs.ts b/backend/src/api/routes/configs.ts similarity index 100% rename from backend/api/routes/configs.ts rename to backend/src/api/routes/configs.ts diff --git a/backend/api/routes/index.ts b/backend/src/api/routes/index.ts similarity index 100% rename from backend/api/routes/index.ts rename to backend/src/api/routes/index.ts diff --git a/backend/api/routes/leaderboards.ts b/backend/src/api/routes/leaderboards.ts similarity index 100% rename from backend/api/routes/leaderboards.ts rename to backend/src/api/routes/leaderboards.ts diff --git a/backend/api/routes/presets.ts b/backend/src/api/routes/presets.ts similarity index 100% rename from backend/api/routes/presets.ts rename to backend/src/api/routes/presets.ts diff --git a/backend/api/routes/psas.ts b/backend/src/api/routes/psas.ts similarity index 100% rename from backend/api/routes/psas.ts rename to backend/src/api/routes/psas.ts diff --git a/backend/api/routes/quotes.ts b/backend/src/api/routes/quotes.ts similarity index 100% rename from backend/api/routes/quotes.ts rename to backend/src/api/routes/quotes.ts diff --git a/backend/api/routes/results.ts b/backend/src/api/routes/results.ts similarity index 100% rename from backend/api/routes/results.ts rename to backend/src/api/routes/results.ts diff --git a/backend/api/routes/swagger.ts b/backend/src/api/routes/swagger.ts similarity index 100% rename from backend/api/routes/swagger.ts rename to backend/src/api/routes/swagger.ts diff --git a/backend/api/routes/users.ts b/backend/src/api/routes/users.ts similarity index 100% rename from backend/api/routes/users.ts rename to backend/src/api/routes/users.ts diff --git a/backend/api/schemas/config-schema.ts b/backend/src/api/schemas/config-schema.ts similarity index 100% rename from backend/api/schemas/config-schema.ts rename to backend/src/api/schemas/config-schema.ts diff --git a/backend/api/schemas/result-schema.ts b/backend/src/api/schemas/result-schema.ts similarity index 100% rename from backend/api/schemas/result-schema.ts rename to backend/src/api/schemas/result-schema.ts diff --git a/backend/app.ts b/backend/src/app.ts similarity index 100% rename from backend/app.ts rename to backend/src/app.ts diff --git a/backend/constants/base-configuration.ts b/backend/src/constants/base-configuration.ts similarity index 100% rename from backend/constants/base-configuration.ts rename to backend/src/constants/base-configuration.ts diff --git a/backend/constants/monkey-status-codes.ts b/backend/src/constants/monkey-status-codes.ts similarity index 100% rename from backend/constants/monkey-status-codes.ts rename to backend/src/constants/monkey-status-codes.ts diff --git a/backend/constants/profanities.ts b/backend/src/constants/profanities.ts similarity index 100% rename from backend/constants/profanities.ts rename to backend/src/constants/profanities.ts diff --git a/backend/credentials/.gitkeep b/backend/src/credentials/.gitkeep similarity index 100% rename from backend/credentials/.gitkeep rename to backend/src/credentials/.gitkeep diff --git a/backend/dal/ape-keys.ts b/backend/src/dal/ape-keys.ts similarity index 100% rename from backend/dal/ape-keys.ts rename to backend/src/dal/ape-keys.ts diff --git a/backend/dal/bot.ts b/backend/src/dal/bot.ts similarity index 100% rename from backend/dal/bot.ts rename to backend/src/dal/bot.ts diff --git a/backend/dal/config.ts b/backend/src/dal/config.ts similarity index 100% rename from backend/dal/config.ts rename to backend/src/dal/config.ts diff --git a/backend/dal/leaderboards.ts b/backend/src/dal/leaderboards.ts similarity index 100% rename from backend/dal/leaderboards.ts rename to backend/src/dal/leaderboards.ts diff --git a/backend/dal/new-quotes.ts b/backend/src/dal/new-quotes.ts similarity index 100% rename from backend/dal/new-quotes.ts rename to backend/src/dal/new-quotes.ts diff --git a/backend/dal/preset.ts b/backend/src/dal/preset.ts similarity index 100% rename from backend/dal/preset.ts rename to backend/src/dal/preset.ts diff --git a/backend/dal/psa.ts b/backend/src/dal/psa.ts similarity index 100% rename from backend/dal/psa.ts rename to backend/src/dal/psa.ts diff --git a/backend/dal/public-stats.ts b/backend/src/dal/public-stats.ts similarity index 100% rename from backend/dal/public-stats.ts rename to backend/src/dal/public-stats.ts diff --git a/backend/dal/quote-ratings.ts b/backend/src/dal/quote-ratings.ts similarity index 100% rename from backend/dal/quote-ratings.ts rename to backend/src/dal/quote-ratings.ts diff --git a/backend/dal/report.ts b/backend/src/dal/report.ts similarity index 100% rename from backend/dal/report.ts rename to backend/src/dal/report.ts diff --git a/backend/dal/result.ts b/backend/src/dal/result.ts similarity index 100% rename from backend/dal/result.ts rename to backend/src/dal/result.ts diff --git a/backend/dal/user.ts b/backend/src/dal/user.ts similarity index 100% rename from backend/dal/user.ts rename to backend/src/dal/user.ts diff --git a/backend/documentation/internal-swagger.json b/backend/src/documentation/internal-swagger.json similarity index 100% rename from backend/documentation/internal-swagger.json rename to backend/src/documentation/internal-swagger.json diff --git a/backend/documentation/public-swagger.json b/backend/src/documentation/public-swagger.json similarity index 100% rename from backend/documentation/public-swagger.json rename to backend/src/documentation/public-swagger.json diff --git a/backend/init/configuration.ts b/backend/src/init/configuration.ts similarity index 100% rename from backend/init/configuration.ts rename to backend/src/init/configuration.ts diff --git a/backend/init/db.ts b/backend/src/init/db.ts similarity index 94% rename from backend/init/db.ts rename to backend/src/init/db.ts index 2e99bc287..c05c8de40 100644 --- a/backend/init/db.ts +++ b/backend/src/init/db.ts @@ -31,9 +31,9 @@ export async function connect(): Promise { auth: !(DB_USERNAME && DB_PASSWORD) ? undefined : { - username: DB_USERNAME, - password: DB_PASSWORD, - }, + username: DB_USERNAME, + password: DB_PASSWORD, + }, authMechanism: DB_AUTH_MECHANISM as AuthMechanism | undefined, authSource: DB_AUTH_SOURCE, }; diff --git a/backend/init/redis.ts b/backend/src/init/redis.ts similarity index 100% rename from backend/init/redis.ts rename to backend/src/init/redis.ts diff --git a/backend/jobs/delete-old-logs.ts b/backend/src/jobs/delete-old-logs.ts similarity index 100% rename from backend/jobs/delete-old-logs.ts rename to backend/src/jobs/delete-old-logs.ts diff --git a/backend/jobs/index.ts b/backend/src/jobs/index.ts similarity index 100% rename from backend/jobs/index.ts rename to backend/src/jobs/index.ts diff --git a/backend/jobs/update-leaderboards.ts b/backend/src/jobs/update-leaderboards.ts similarity index 100% rename from backend/jobs/update-leaderboards.ts rename to backend/src/jobs/update-leaderboards.ts diff --git a/backend/middlewares/ape-rate-limit.ts b/backend/src/middlewares/ape-rate-limit.ts similarity index 100% rename from backend/middlewares/ape-rate-limit.ts rename to backend/src/middlewares/ape-rate-limit.ts diff --git a/backend/middlewares/api-utils.ts b/backend/src/middlewares/api-utils.ts similarity index 100% rename from backend/middlewares/api-utils.ts rename to backend/src/middlewares/api-utils.ts diff --git a/backend/middlewares/auth.ts b/backend/src/middlewares/auth.ts similarity index 100% rename from backend/middlewares/auth.ts rename to backend/src/middlewares/auth.ts diff --git a/backend/middlewares/context.ts b/backend/src/middlewares/context.ts similarity index 100% rename from backend/middlewares/context.ts rename to backend/src/middlewares/context.ts diff --git a/backend/middlewares/error.ts b/backend/src/middlewares/error.ts similarity index 100% rename from backend/middlewares/error.ts rename to backend/src/middlewares/error.ts diff --git a/backend/middlewares/rate-limit.ts b/backend/src/middlewares/rate-limit.ts similarity index 100% rename from backend/middlewares/rate-limit.ts rename to backend/src/middlewares/rate-limit.ts diff --git a/backend/server.ts b/backend/src/server.ts similarity index 100% rename from backend/server.ts rename to backend/src/server.ts diff --git a/backend/tasks/george.ts b/backend/src/tasks/george.ts similarity index 100% rename from backend/tasks/george.ts rename to backend/src/tasks/george.ts diff --git a/backend/types/types.d.ts b/backend/src/types/types.d.ts similarity index 100% rename from backend/types/types.d.ts rename to backend/src/types/types.d.ts diff --git a/backend/utils/auth.ts b/backend/src/utils/auth.ts similarity index 100% rename from backend/utils/auth.ts rename to backend/src/utils/auth.ts diff --git a/backend/utils/captcha.ts b/backend/src/utils/captcha.ts similarity index 100% rename from backend/utils/captcha.ts rename to backend/src/utils/captcha.ts diff --git a/backend/utils/discord.ts b/backend/src/utils/discord.ts similarity index 100% rename from backend/utils/discord.ts rename to backend/src/utils/discord.ts diff --git a/backend/utils/error.ts b/backend/src/utils/error.ts similarity index 100% rename from backend/utils/error.ts rename to backend/src/utils/error.ts diff --git a/backend/utils/logger.ts b/backend/src/utils/logger.ts similarity index 100% rename from backend/utils/logger.ts rename to backend/src/utils/logger.ts diff --git a/backend/utils/misc.ts b/backend/src/utils/misc.ts similarity index 100% rename from backend/utils/misc.ts rename to backend/src/utils/misc.ts diff --git a/backend/utils/monkey-response.ts b/backend/src/utils/monkey-response.ts similarity index 100% rename from backend/utils/monkey-response.ts rename to backend/src/utils/monkey-response.ts diff --git a/backend/utils/pb.ts b/backend/src/utils/pb.ts similarity index 100% rename from backend/utils/pb.ts rename to backend/src/utils/pb.ts diff --git a/backend/utils/prometheus.ts b/backend/src/utils/prometheus.ts similarity index 100% rename from backend/utils/prometheus.ts rename to backend/src/utils/prometheus.ts diff --git a/backend/utils/validation.ts b/backend/src/utils/validation.ts similarity index 100% rename from backend/utils/validation.ts rename to backend/src/utils/validation.ts diff --git a/backend/version.ts b/backend/src/version.ts similarity index 100% rename from backend/version.ts rename to backend/src/version.ts diff --git a/backend/tsconfig.json b/backend/tsconfig.json index 3efd018d9..f81257483 100644 --- a/backend/tsconfig.json +++ b/backend/tsconfig.json @@ -17,6 +17,7 @@ "ts-node": { "files": true }, + "include": ["./src/**/*"], "exclude": [ "node_modules", "build",