From 0e924449d60c994c29b95abba675309e31c04383 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Sat, 5 Dec 2020 18:45:47 +0100 Subject: [PATCH] Cleanup: Renamed the creation folder to the more fitting "actions" ref #11 #13 --- src/controllers/AuthController.ts | 6 ++--- src/controllers/RunnerController.ts | 2 +- .../RunnerOrganisationController.ts | 2 +- src/controllers/RunnerTeamController.ts | 2 +- src/controllers/TrackController.ts | 2 +- src/controllers/UserController.ts | 2 +- src/controllers/UserGroupController.ts | 2 +- .../{creation => actions}/CreateAddress.ts | 0 .../{creation => actions}/CreateAuth.ts | 0 .../CreateGroupContact.ts | 0 .../CreateParticipant.ts | 0 .../{creation => actions}/CreateRunner.ts | 0 .../CreateRunnerGroup.ts | 0 .../CreateRunnerOrganisation.ts | 0 .../{creation => actions}/CreateRunnerTeam.ts | 0 .../{creation => actions}/CreateTrack.ts | 0 .../{creation => actions}/CreateUser.ts | 0 .../{creation => actions}/CreateUserGroup.ts | 0 .../{creation => actions}/HandleLogout.ts | 0 .../{creation => actions}/RefreshAuth.ts | 0 src/tests.ts | 23 +++++++++++++++++++ 21 files changed, 32 insertions(+), 9 deletions(-) rename src/models/{creation => actions}/CreateAddress.ts (100%) rename src/models/{creation => actions}/CreateAuth.ts (100%) rename src/models/{creation => actions}/CreateGroupContact.ts (100%) rename src/models/{creation => actions}/CreateParticipant.ts (100%) rename src/models/{creation => actions}/CreateRunner.ts (100%) rename src/models/{creation => actions}/CreateRunnerGroup.ts (100%) rename src/models/{creation => actions}/CreateRunnerOrganisation.ts (100%) rename src/models/{creation => actions}/CreateRunnerTeam.ts (100%) rename src/models/{creation => actions}/CreateTrack.ts (100%) rename src/models/{creation => actions}/CreateUser.ts (100%) rename src/models/{creation => actions}/CreateUserGroup.ts (100%) rename src/models/{creation => actions}/HandleLogout.ts (100%) rename src/models/{creation => actions}/RefreshAuth.ts (100%) create mode 100644 src/tests.ts diff --git a/src/controllers/AuthController.ts b/src/controllers/AuthController.ts index 4e5ced1..d5320a3 100644 --- a/src/controllers/AuthController.ts +++ b/src/controllers/AuthController.ts @@ -2,9 +2,9 @@ import { Body, JsonController, Post } from 'routing-controllers'; import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; import { IllegalJWTError, InvalidCredentialsError, JwtNotProvidedError, PasswordNeededError, RefreshTokenCountInvalidError, UsernameOrEmailNeededError } from '../errors/AuthError'; import { UserNotFoundError } from '../errors/UserErrors'; -import { CreateAuth } from '../models/creation/CreateAuth'; -import { HandleLogout } from '../models/creation/HandleLogout'; -import { RefreshAuth } from '../models/creation/RefreshAuth'; +import { CreateAuth } from '../models/actions/CreateAuth'; +import { HandleLogout } from '../models/actions/HandleLogout'; +import { RefreshAuth } from '../models/actions/RefreshAuth'; import { Auth } from '../models/responses/Auth'; import { Logout } from '../models/responses/Logout'; diff --git a/src/controllers/RunnerController.ts b/src/controllers/RunnerController.ts index 6508f67..8293f36 100644 --- a/src/controllers/RunnerController.ts +++ b/src/controllers/RunnerController.ts @@ -3,7 +3,7 @@ import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; import { getConnectionManager, Repository } from 'typeorm'; import { EntityFromBody, EntityFromParam } from 'typeorm-routing-controllers-extensions'; import { RunnerGroupNeededError, RunnerGroupNotFoundError, RunnerIdsNotMatchingError, RunnerNotFoundError, RunnerOnlyOneGroupAllowedError } from '../errors/RunnerErrors'; -import { CreateRunner } from '../models/creation/CreateRunner'; +import { CreateRunner } from '../models/actions/CreateRunner'; import { Runner } from '../models/entities/Runner'; import { ResponseRunner } from '../models/responses/ResponseRunner'; diff --git a/src/controllers/RunnerOrganisationController.ts b/src/controllers/RunnerOrganisationController.ts index 8cfef6a..1a598e5 100644 --- a/src/controllers/RunnerOrganisationController.ts +++ b/src/controllers/RunnerOrganisationController.ts @@ -3,7 +3,7 @@ import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; import { getConnectionManager, Repository } from 'typeorm'; import { EntityFromBody, EntityFromParam } from 'typeorm-routing-controllers-extensions'; import { RunnerOrganisationHasRunnersError, RunnerOrganisationHasTeamsError, RunnerOrganisationIdsNotMatchingError, RunnerOrganisationNotFoundError } from '../errors/RunnerOrganisationErrors'; -import { CreateRunnerOrganisation } from '../models/creation/CreateRunnerOrganisation'; +import { CreateRunnerOrganisation } from '../models/actions/CreateRunnerOrganisation'; import { RunnerOrganisation } from '../models/entities/RunnerOrganisation'; import { ResponseRunnerOrganisation } from '../models/responses/ResponseRunnerOrganisation'; import { RunnerController } from './RunnerController'; diff --git a/src/controllers/RunnerTeamController.ts b/src/controllers/RunnerTeamController.ts index 1b7627d..7b0a841 100644 --- a/src/controllers/RunnerTeamController.ts +++ b/src/controllers/RunnerTeamController.ts @@ -3,7 +3,7 @@ import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; import { getConnectionManager, Repository } from 'typeorm'; import { EntityFromBody, EntityFromParam } from 'typeorm-routing-controllers-extensions'; import { RunnerTeamHasRunnersError, RunnerTeamIdsNotMatchingError, RunnerTeamNotFoundError } from '../errors/RunnerTeamErrors'; -import { CreateRunnerTeam } from '../models/creation/CreateRunnerTeam'; +import { CreateRunnerTeam } from '../models/actions/CreateRunnerTeam'; import { RunnerTeam } from '../models/entities/RunnerTeam'; import { ResponseRunnerTeam } from '../models/responses/ResponseRunnerTeam'; import { RunnerController } from './RunnerController'; diff --git a/src/controllers/TrackController.ts b/src/controllers/TrackController.ts index 02370fc..149b837 100644 --- a/src/controllers/TrackController.ts +++ b/src/controllers/TrackController.ts @@ -3,7 +3,7 @@ import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; import { getConnectionManager, Repository } from 'typeorm'; import { EntityFromBody, EntityFromParam } from 'typeorm-routing-controllers-extensions'; import { TrackIdsNotMatchingError, TrackNotFoundError } from "../errors/TrackErrors"; -import { CreateTrack } from '../models/creation/CreateTrack'; +import { CreateTrack } from '../models/actions/CreateTrack'; import { Track } from '../models/entities/Track'; import { ResponseTrack } from '../models/responses/ResponseTrack'; diff --git a/src/controllers/UserController.ts b/src/controllers/UserController.ts index 01e743e..8c2f2ea 100644 --- a/src/controllers/UserController.ts +++ b/src/controllers/UserController.ts @@ -3,7 +3,7 @@ import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; import { getConnectionManager, Repository } from 'typeorm'; import { EntityFromBody, EntityFromParam } from 'typeorm-routing-controllers-extensions'; import { UserGroupNotFoundError, UserIdsNotMatchingError, UserNotFoundError } from '../errors/UserErrors'; -import { CreateUser } from '../models/creation/CreateUser'; +import { CreateUser } from '../models/actions/CreateUser'; import { User } from '../models/entities/User'; diff --git a/src/controllers/UserGroupController.ts b/src/controllers/UserGroupController.ts index c937f36..70e3c5a 100644 --- a/src/controllers/UserGroupController.ts +++ b/src/controllers/UserGroupController.ts @@ -3,7 +3,7 @@ import { OpenAPI, ResponseSchema } from 'routing-controllers-openapi'; import { getConnectionManager, Repository } from 'typeorm'; import { EntityFromBody, EntityFromParam } from 'typeorm-routing-controllers-extensions'; import { UserGroupIdsNotMatchingError, UserGroupNotFoundError } from '../errors/UserGroupErrors'; -import { CreateUserGroup } from '../models/creation/CreateUserGroup'; +import { CreateUserGroup } from '../models/actions/CreateUserGroup'; import { UserGroup } from '../models/entities/UserGroup'; diff --git a/src/models/creation/CreateAddress.ts b/src/models/actions/CreateAddress.ts similarity index 100% rename from src/models/creation/CreateAddress.ts rename to src/models/actions/CreateAddress.ts diff --git a/src/models/creation/CreateAuth.ts b/src/models/actions/CreateAuth.ts similarity index 100% rename from src/models/creation/CreateAuth.ts rename to src/models/actions/CreateAuth.ts diff --git a/src/models/creation/CreateGroupContact.ts b/src/models/actions/CreateGroupContact.ts similarity index 100% rename from src/models/creation/CreateGroupContact.ts rename to src/models/actions/CreateGroupContact.ts diff --git a/src/models/creation/CreateParticipant.ts b/src/models/actions/CreateParticipant.ts similarity index 100% rename from src/models/creation/CreateParticipant.ts rename to src/models/actions/CreateParticipant.ts diff --git a/src/models/creation/CreateRunner.ts b/src/models/actions/CreateRunner.ts similarity index 100% rename from src/models/creation/CreateRunner.ts rename to src/models/actions/CreateRunner.ts diff --git a/src/models/creation/CreateRunnerGroup.ts b/src/models/actions/CreateRunnerGroup.ts similarity index 100% rename from src/models/creation/CreateRunnerGroup.ts rename to src/models/actions/CreateRunnerGroup.ts diff --git a/src/models/creation/CreateRunnerOrganisation.ts b/src/models/actions/CreateRunnerOrganisation.ts similarity index 100% rename from src/models/creation/CreateRunnerOrganisation.ts rename to src/models/actions/CreateRunnerOrganisation.ts diff --git a/src/models/creation/CreateRunnerTeam.ts b/src/models/actions/CreateRunnerTeam.ts similarity index 100% rename from src/models/creation/CreateRunnerTeam.ts rename to src/models/actions/CreateRunnerTeam.ts diff --git a/src/models/creation/CreateTrack.ts b/src/models/actions/CreateTrack.ts similarity index 100% rename from src/models/creation/CreateTrack.ts rename to src/models/actions/CreateTrack.ts diff --git a/src/models/creation/CreateUser.ts b/src/models/actions/CreateUser.ts similarity index 100% rename from src/models/creation/CreateUser.ts rename to src/models/actions/CreateUser.ts diff --git a/src/models/creation/CreateUserGroup.ts b/src/models/actions/CreateUserGroup.ts similarity index 100% rename from src/models/creation/CreateUserGroup.ts rename to src/models/actions/CreateUserGroup.ts diff --git a/src/models/creation/HandleLogout.ts b/src/models/actions/HandleLogout.ts similarity index 100% rename from src/models/creation/HandleLogout.ts rename to src/models/actions/HandleLogout.ts diff --git a/src/models/creation/RefreshAuth.ts b/src/models/actions/RefreshAuth.ts similarity index 100% rename from src/models/creation/RefreshAuth.ts rename to src/models/actions/RefreshAuth.ts diff --git a/src/tests.ts b/src/tests.ts new file mode 100644 index 0000000..bf43e1e --- /dev/null +++ b/src/tests.ts @@ -0,0 +1,23 @@ +import * as dotenvSafe from "dotenv-safe"; +import "reflect-metadata"; +import { createExpressServer } from "routing-controllers"; +import authchecker from "./authchecker"; +import loaders from "./loaders/index"; +import { ErrorHandler } from './middlewares/ErrorHandler'; + +dotenvSafe.config(); +const PORT = process.env.APP_PORT || 4010; + +const app = createExpressServer({ + authorizationChecker: authchecker, + middlewares: [ErrorHandler], + development: process.env.NODE_ENV === "production", + cors: true, + routePrefix: "/api", + controllers: [__dirname + "/controllers/*.ts"], +}); + +async function main() { + await loaders(app); +} +main();