Refactor/server controllers

server/src/controllers/affixesController.ts

@@ -1,6 +1,6 @@
 import { NextFunction, Request, Response } from "express";
 import { RequestParams, RequestSearch } from "@types";
-import { filterAffixesByUrlParams } from "./filters/affixesFilter";
+import { filterAffixesByUrlParams } from "./filters";
 import {
   createAffix,
   deleteAffixById,

server/src/controllers/chatCommandsController.ts

@@ -1,6 +1,6 @@
 import { NextFunction, Request, Response } from "express";
 import { RequestCommandsQuery, RequestParams } from "@types";
-import { filterCommandsByUrlParams } from "./filters/commandsFilter";
+import { filterCommandsByUrlParams } from "./filters";
 import {
   createChatCommand,
   deleteChatCommandById,

server/src/controllers/filters/index.ts

@@ -0,0 +1,11 @@
+export * from "./affixesFilter";
+export * from "./commandsFilter";
+export * from "./messageCategoriesFilter";
+export * from "./messagesFilter";
+export * from "./moodsFilter";
+export * from "./redemptionsFilter";
+export * from "./sessionFilter";
+export * from "./tagsFilter";
+export * from "./timersFilter";
+export * from "./triggersFilter";
+export * from "./usersFilter";

server/src/controllers/index.ts

@@ -0,0 +1,16 @@
+export * from "./affixesController";
+export * from "./authController";
+export * from "./chatCommandsController";
+export * from "./configsController";
+export * from "./filesController";
+export * from "./messageCategoriesController";
+export * from "./messagesController";
+export * from "./moodsController";
+export * from "./overlaysController";
+export * from "./redemptionsController";
+export * from "./streamSessionsController";
+export * from "./tagsController";
+export * from "./timersController";
+export * from "./triggersController";
+export * from "./usersController";
+export * from "./widgetsController";

server/src/controllers/messageCategoriesController.ts

@@ -8,7 +8,7 @@ import {
   MessageCategoryCreateData
 } from "@services";
 import { RequestParams, RequestQueryMessageCategories } from "@types";
-import { filterMessageCategoriesByUrlParams } from "./filters/messageCategoriesFilter";
+import { filterMessageCategoriesByUrlParams } from "./filters";
 
 export const getMessageCategoriesList = async (
   req: Request<{}, {}, {}, RequestQueryMessageCategories>,

server/src/controllers/messagesController.ts

@@ -1,6 +1,6 @@
 import { NextFunction, Request, Response } from "express";
 import { RequestQueryMessage } from "@types";
-import { filterMessagesByUrlParams } from "./filters/messagesFilter";
+import { filterMessagesByUrlParams } from "./filters";
 import { getMessages, getMessagesCount } from "@services";
 
 export const getMessagesList = async (

server/src/controllers/moodsController.ts

@@ -1,6 +1,6 @@
 import { NextFunction, Request, Response } from "express";
 import { RequestParams, RequestSearch } from "@types";
-import { filterMoodsByUrlParams } from "./filters/moodsFilter";
+import { filterMoodsByUrlParams } from "./filters";
 import {
   createMood,
   deleteMoodById,

server/src/controllers/redemptionsController.ts

@@ -1,6 +1,6 @@
 import { NextFunction, Request, Response } from "express";
 import { RequestRedemptionQuery } from "@types";
-import { filterRedemptionsByUrlParams } from "./filters/redemptionsFilter";
+import { filterRedemptionsByUrlParams } from "./filters";
 import { getRedemptions, getRedemptionsCount } from "@services";
 
 export const getRedemptionsList = async (

server/src/controllers/streamSessionsController.ts

@@ -1,6 +1,6 @@
 import { Request, Response, NextFunction } from "express";
 import { RequestParams, RequestQueryMessage, RequestQuerySession, RequestRedemptionQuery } from "@types";
-import { filterSessionByUrlParams } from "./filters/sessionFilter";
+import { filterSessionByUrlParams, filterMessagesByUrlParams, filterRedemptionsByUrlParams } from "./filters";
 import {
   getCurrentStreamSession,
   getStreamSessionStatistics,
@@ -13,8 +13,6 @@ import {
   getRedemptions,
   getRedemptionsCount
 } from "@services";
-import { filterMessagesByUrlParams } from "./filters/messagesFilter";
-import { filterRedemptionsByUrlParams } from "./filters/redemptionsFilter";
 import { AppError } from "@utils";
 
 export const getStreamSessionsList = async (

server/src/controllers/tagsController.ts

@@ -1,6 +1,6 @@
 import { NextFunction, Request, Response } from "express";
 import { RequestParams, RequestSearch } from "@types";
-import { filterTagsByUrlParams } from "./filters/tagsFilter";
+import { filterTagsByUrlParams } from "./filters";
 import {
   createTag,
   deleteTagById,

server/src/controllers/timersController.ts

@@ -1,6 +1,6 @@
 import { NextFunction, Request, Response } from "express";
 import { RequestParams, RequestTimerQuery } from "@types";
-import { filterTimersByUrlParams } from "./filters/timersFilter";
+import { filterTimersByUrlParams } from "./filters";
 import {
   createTimer,
   deleteTimerById,

server/src/controllers/triggersController.ts

@@ -1,6 +1,6 @@
 import { NextFunction, Request, Response } from "express";
 import { RequestParams, RequestTriggerQuery } from "@types";
-import { filterTriggersByUrlParams } from "./filters/triggersFilter";
+import { filterTriggersByUrlParams } from "./filters";
 import {
   createTrigger,
   deleteTriggerById,

server/src/controllers/usersController.ts

@@ -6,7 +6,7 @@ import {
   RequestQueryUser,
   RequestRedemptionQuery
 } from "@types";
-import { filterUsersByUrlParams } from "./filters/usersFilter";
+import { filterUsersByUrlParams, filterMessagesByUrlParams, filterRedemptionsByUrlParams } from "./filters";
 import {
   getUserById,
   getUserCount,
@@ -18,8 +18,6 @@ import {
   getRedemptions,
   getRedemptionsCount
 } from "@services";
-import { filterMessagesByUrlParams } from "./filters/messagesFilter";
-import { filterRedemptionsByUrlParams } from "./filters/redemptionsFilter";
 
 export const getUsersList = async (req: Request<{}, {}, {}, RequestQueryUser>, res: Response, next: NextFunction) => {
   const { page = 1, limit = 50, sortBy = "lastSeen", sortOrder = "desc" } = req.query;

server/src/routes/affixesRoute.ts

@@ -7,7 +7,7 @@ import {
   // getAffixById,
   editAffixById,
   deleteAffix
-} from "@controllers/affixesController";
+} from "@controllers";
 
 const affixesRouter = Router();
 

server/src/routes/authRoute.ts

@@ -1,5 +1,5 @@
 import { Router } from "express";
-import { afterTwitchAuthorization, getTwitchAuthorizeUrl } from "@controllers/authController";
+import { afterTwitchAuthorization, getTwitchAuthorizeUrl } from "@controllers";
 import { authorizationTwitch, twitchHandlersMiddleware } from "@middlewares";
 
 const auth = Router();

server/src/routes/chatCommandsRoute.ts

@@ -1,10 +1,5 @@
 import { Router } from "express";
-import {
-  getChatCommandsList,
-  addNewCommand,
-  editChatCommandById,
-  deleteCommandById
-} from "@controllers/chatCommandsController";
+import { getChatCommandsList, addNewCommand, editChatCommandById, deleteCommandById } from "@controllers";
 import { checkSearchParams, isParamObjectId } from "@middlewares";
 
 const chatCommandsRouter = Router();

server/src/routes/configsRoute.ts

@@ -1,5 +1,5 @@
 import { Router } from "express";
-import { getConfigsList, editConfigs, resetConfigsToDefaults } from "@controllers/configsController";
+import { getConfigsList, editConfigs, resetConfigsToDefaults } from "@controllers";
 
 const configsRouter = Router();
 

server/src/routes/filesRoute.ts

@@ -9,7 +9,7 @@ import {
   getAlertSoundsList,
   uploadAlertSound,
   deleteAlertSound
-} from "@controllers/filesController";
+} from "@controllers";
 const filesRouter = Router();
 
 filesRouter.get("/folder-list", getFoldersList);

server/src/routes/messageCategoriesRoute.ts

@@ -6,7 +6,7 @@ import {
   addNewCategory,
   deleteMessageCategoryById,
   updateUsesCategoryById
-} from "@controllers/messageCategoriesController";
+} from "@controllers";
 
 const messageCategoriesRouter = Router();
 

server/src/routes/messagesRoute.ts

@@ -1,5 +1,5 @@
 import { Router } from "express";
-import { getMessagesList } from "@controllers/messagesController";
+import { getMessagesList } from "@controllers";
 import { checkSearchParams } from "@middlewares";
 
 const messagesRouter = Router();

server/src/routes/moodsRoute.ts

@@ -7,7 +7,7 @@ import {
   // getMoodById,
   editMoodById,
   deleteMood
-} from "@controllers/moodsController";
+} from "@controllers";
 
 const moodsRouter = Router();
 

server/src/routes/overlayRoute.ts

@@ -1,11 +1,5 @@
 import { Router } from "express";
-import {
-  getOverlaysList,
-  addNewOverlay,
-  editOverlayById,
-  removeOverlayById,
-  getOverlayById
-} from "@controllers/overlaysController";
+import { getOverlaysList, addNewOverlay, editOverlayById, removeOverlayById, getOverlayById } from "@controllers";
 const overlayRouter = Router();
 
 overlayRouter.get("/", getOverlaysList);

server/src/routes/redemptionsRoute.ts

@@ -1,5 +1,5 @@
 import { Router } from "express";
-import { getRedemptionsList } from "@controllers/redemptionsController";
+import { getRedemptionsList } from "@controllers";
 import { checkSearchParams } from "@middlewares";
 
 const redemptionsRouter = Router();

server/src/routes/streamSessionsRoute.ts

@@ -9,7 +9,7 @@ import {
   getSessionRedemptions,
   getCurrentSessionMessages,
   getCurrentSessionRedemptions
-} from "@controllers/streamSessionsController";
+} from "@controllers";
 import { checkSearchParams, isParamObjectId } from "@middlewares";
 
 const streamSessionsRouter = Router();

server/src/routes/tagsRoute.ts

@@ -7,7 +7,7 @@ import {
   // getTagById,
   editTagById,
   deleteTag
-} from "@controllers/tagsController";
+} from "@controllers";
 
 const tagsRouter = Router();
 

server/src/routes/timersRoute.ts

@@ -1,7 +1,7 @@
 import { isParamObjectId, checkSearchParams } from "@middlewares";
 import { Router } from "express";
 
-import { getTimersList, addNewTimer, editTimerById, deleteTimer } from "@controllers/timersController";
+import { getTimersList, addNewTimer, editTimerById, deleteTimer } from "@controllers";
 
 const timersRouter = Router();
 

server/src/routes/triggersRoute.ts

@@ -7,7 +7,7 @@ import {
   //   getTriggerById,
   editTriggerById,
   deleteTrigger
-} from "@controllers/triggersController";
+} from "@controllers";
 
 const triggersRouter = Router();
 

server/src/routes/usersRoute.ts

@@ -6,7 +6,7 @@ import {
   getUserMessages,
   getUserRedemptions,
   getLatestEldestUserMessages
-} from "@controllers/usersController";
+} from "@controllers";
 import { checkSearchParams, isParamObjectId } from "@middlewares";
 
 const usersRouter = Router();

server/src/routes/widgetsRoute.ts

@@ -1,11 +1,5 @@
 import { Router } from "express";
-import {
-  getWidgetsList,
-  addNewWidget,
-  editWidgetById,
-  removeWidgetById,
-  getWidgetById
-} from "@controllers/widgetsController";
+import { getWidgetsList, addNewWidget, editWidgetById, removeWidgetById, getWidgetById } from "@controllers";
 const widgetsRouter = Router();
 
 widgetsRouter.get("/", getWidgetsList);

server/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "paths": {
-      "@controllers/*": ["controllers/*"],
+      "@controllers": ["controllers"],
       "@configs": ["configs"],
       "@middlewares": ["middlewares"],
       "@models": ["models"],