Merge pull request #1 from AlanMorel/main

refactor: reorganize imports

src/app.ts

@@ -6,14 +6,14 @@ import { requestLogger, unknownEndpointHandler } from "@/src/middleware/middlewa
 import { apiRouter } from "@/src/routes/api";
 //import { testRouter } from "@/src/routes/test";
 import { cacheRouter } from "@/src/routes/cache";
-import { dynamicController } from "./routes/dynamic";
 import { customRouter } from "./routes/custom";
+import { dynamicController } from "./routes/dynamic";
 
 import bodyParser from "body-parser";
 
-import { connectDatabase } from "./services/mongoService";
 import morgan from "morgan";
 import { steamPacksController } from "./controllers/misc/steamPacksController";
+import { connectDatabase } from "./services/mongoService";
 
 void connectDatabase();
 

src/controllers/api/getAllianceController.ts

@@ -1,4 +1,4 @@
-import { RequestHandler } from "express-serve-static-core";
+import { RequestHandler } from "express";
 
 const getAllianceController: RequestHandler = (_req, res) => {
     res.sendStatus(200);

src/controllers/api/hostSessionController.ts

@@ -1,4 +1,5 @@
 import { RequestHandler } from "express";
+
 const hostSessionController: RequestHandler = (_req, res) => {
     res.json({ sessionId: { $oid: "123123123" }, rewardSeed: 123123123123 });
 };

src/controllers/api/inventoryController.ts

@@ -1,6 +1,5 @@
-import { Request, Response, RequestHandler } from "express";
-
 import inventory from "@/static/fixed_responses/inventory.json";
+import { Request, RequestHandler, Response } from "express";
 
 const inventorController: RequestHandler = (request: Request, response: Response) => {
     console.log(request.query);

src/controllers/api/loginController.ts

@@ -2,7 +2,7 @@ import { toLoginRequest } from "@/src/helpers/loginHelpers";
 import { Account } from "@/src/models/loginModel";
 import { createAccount, isCorrectPassword } from "@/src/services/loginService";
 import { ILoginResponse } from "@/src/types/loginTypes";
-import { DTLS, HUB, IRC, NRS, Nonce, groups, platformCDNs } from "@/static/fixed_responses/login_static";
+import { DTLS, groups, HUB, IRC, Nonce, NRS, platformCDNs } from "@/static/fixed_responses/login_static";
 import { RequestHandler } from "express";
 import config from "../../../config.json";
 

src/controllers/custom/createAccountController.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-misused-promises */
-import { toDatabaseAccount, toCreateAccount } from "@/src/helpers/customHelpers";
+import { toCreateAccount, toDatabaseAccount } from "@/src/helpers/customHelpers";
 import { createAccount } from "@/src/services/loginService";
 import { RequestHandler } from "express";
 
@@ -8,6 +8,7 @@ const createAccountController: RequestHandler = async (req, res) => {
     const databaseAccount = toDatabaseAccount(createAccountData);
 
     const account = await createAccount(databaseAccount);
+
     res.json(account);
 };
 

src/middleware/middleware.ts

@@ -1,4 +1,4 @@
-import { Request, Response, NextFunction } from "express";
+import { NextFunction, Request, Response } from "express";
 
 const unknownEndpointHandler = (request: Request, response: Response) => {
     console.error("[ERROR] Unknown Endpoint", request.url);

src/models/loginModel.ts

@@ -1,5 +1,6 @@
-import mongoose, { model, Schema, SchemaOptions } from "mongoose";
+import { model, Schema, SchemaOptions } from "mongoose";
 import { IDatabaseAccountDocument } from "../types/loginTypes";
+
 const opts = {
     toJSON: { virtuals: true },
     toObject: { virtuals: true }

src/routes/api.ts

@@ -1,25 +1,23 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-import express from "express";
-
-import purchaseController from "@/src/controllers/api/purchaseController";
 import getFriendsController from "@/src/controllers/api/getFriendsController";
 import inventoryController from "@/src/controllers/api/inventoryController";
-import { marketRecommendationsController } from "../controllers/api/marketRecommendationsController";
-import { loginController } from "../controllers/api/loginController";
-import { surveysController } from "../controllers/api/surveysController";
-import { getIgnoredUsersController } from "../controllers/api/getIgnoredUsersController";
-import { dronesController } from "../controllers/api/dronesController";
-import { updateChallengeProgressController } from "../controllers/api/updateChallengeProgressController";
-import { findSessionsController } from "../controllers/api/findSessionsController";
-import { viewController } from "../controllers/api/viewController";
-import { getAllianceController } from "../controllers/api/getAllianceController";
-import { loginRewardsController } from "../controllers/api/loginRewardsController";
+import purchaseController from "@/src/controllers/api/purchaseController";
+import express from "express";
 import { checkDailyMissionBonusController } from "../controllers/api/checkDailyMissionBonusController";
-import { getShipController } from "../controllers/api/getShipController";
-import { inboxController } from "../controllers/api/inboxController";
-import { hostSessionController } from "../controllers/api/hostSessionController";
+import { dronesController } from "../controllers/api/dronesController";
+import { findSessionsController } from "../controllers/api/findSessionsController";
+import { getAllianceController } from "../controllers/api/getAllianceController";
+import { getIgnoredUsersController } from "../controllers/api/getIgnoredUsersController";
 import { getNewRewardSeedController } from "../controllers/api/getNewRewardSeedController";
+import { getShipController } from "../controllers/api/getShipController";
+import { hostSessionController } from "../controllers/api/hostSessionController";
+import { inboxController } from "../controllers/api/inboxController";
+import { loginController } from "../controllers/api/loginController";
+import { loginRewardsController } from "../controllers/api/loginRewardsController";
+import { marketRecommendationsController } from "../controllers/api/marketRecommendationsController";
 import { setActiveQuestController } from "../controllers/api/setActiveQuestController";
+import { surveysController } from "../controllers/api/surveysController";
+import { updateChallengeProgressController } from "../controllers/api/updateChallengeProgressController";
+import { viewController } from "../controllers/api/viewController";
 
 const apiRouter = express.Router();
 

src/routes/dynamic.ts

@@ -1,6 +1,6 @@
 import express from "express";
-import { worldStateController } from "../controllers/dynamic/worldStateController";
 import { aggregateSessionsController } from "../controllers/dynamic/aggregateSessionsController";
+import { worldStateController } from "../controllers/dynamic/worldStateController";
 
 const dynamicController = express.Router();
 

src/types/loginTypes.ts

@@ -1,5 +1,3 @@
-import { Document } from "mongoose";
-
 export interface ILoginResponse extends Omit<IDatabaseAccountDocument, "email" | "password"> {
     Groups: IGroup[];
     Nonce: number;