From 23126a92cdcbd856fdbeddcb9b5c46a3b766537f Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 22 Sep 2025 13:04:45 -0700 Subject: [PATCH] move v1 controllers to v1 dir --- server/src/config/controllers.js | 24 +++++++++---------- .../{ => v1}/announcementsController.js | 2 +- .../controllers/{ => v1}/authController.js | 2 +- .../controllers/{ => v1}/baseController.js | 2 +- .../controllers/{ => v1}/checkController.js | 2 +- .../controllers/{ => v1}/controllerUtils.js | 0 .../{ => v1}/diagnosticController.js | 0 .../controllers/{ => v1}/inviteController.js | 2 +- .../src/controllers/{ => v1}/logController.js | 0 .../{ => v1}/maintenanceWindowController.js | 2 +- .../controllers/{ => v1}/monitorController.js | 2 +- .../{ => v1}/notificationController.js | 2 +- .../controllers/{ => v1}/queueController.js | 0 .../{ => v1}/settingsController.js | 4 ++-- .../{ => v1}/statusPageController.js | 2 +- server/src/routes/v1/monitorRoute.js | 2 +- 16 files changed, 24 insertions(+), 24 deletions(-) rename server/src/controllers/{ => v1}/announcementsController.js (96%) rename server/src/controllers/{ => v1}/authController.js (99%) rename server/src/controllers/{ => v1}/baseController.js (97%) rename server/src/controllers/{ => v1}/checkController.js (99%) rename server/src/controllers/{ => v1}/controllerUtils.js (100%) rename server/src/controllers/{ => v1}/diagnosticController.js (100%) rename server/src/controllers/{ => v1}/inviteController.js (99%) rename server/src/controllers/{ => v1}/logController.js (100%) rename server/src/controllers/{ => v1}/maintenanceWindowController.js (99%) mode change 100755 => 100644 rename server/src/controllers/{ => v1}/monitorController.js (99%) mode change 100755 => 100644 rename server/src/controllers/{ => v1}/notificationController.js (98%) mode change 100755 => 100644 rename server/src/controllers/{ => v1}/queueController.js (100%) rename server/src/controllers/{ => v1}/settingsController.js (95%) mode change 100755 => 100644 rename server/src/controllers/{ => v1}/statusPageController.js (99%) mode change 100755 => 100644 diff --git a/server/src/config/controllers.js b/server/src/config/controllers.js index 693e35ab8..5c54579eb 100644 --- a/server/src/config/controllers.js +++ b/server/src/config/controllers.js @@ -1,19 +1,19 @@ -import { createCommonDependencies } from "../controllers/baseController.js"; +import { createCommonDependencies } from "../controllers/v1/baseController.js"; // Services // Controllers -import MonitorController from "../controllers/monitorController.js"; -import AuthController from "../controllers/authController.js"; -import SettingsController from "../controllers/settingsController.js"; -import CheckController from "../controllers/checkController.js"; -import InviteController from "../controllers/inviteController.js"; -import MaintenanceWindowController from "../controllers/maintenanceWindowController.js"; -import QueueController from "../controllers/queueController.js"; -import LogController from "../controllers/logController.js"; -import StatusPageController from "../controllers/statusPageController.js"; -import NotificationController from "../controllers/notificationController.js"; -import DiagnosticController from "../controllers/diagnosticController.js"; +import MonitorController from "../controllers/v1/monitorController.js"; +import AuthController from "../controllers/v1/authController.js"; +import SettingsController from "../controllers/v1/settingsController.js"; +import CheckController from "../controllers/v1/checkController.js"; +import InviteController from "../controllers/v1/inviteController.js"; +import MaintenanceWindowController from "../controllers/v1/maintenanceWindowController.js"; +import QueueController from "../controllers/v1/queueController.js"; +import LogController from "../controllers/v1/logController.js"; +import StatusPageController from "../controllers/v1/statusPageController.js"; +import NotificationController from "../controllers/v1/notificationController.js"; +import DiagnosticController from "../controllers/v1/diagnosticController.js"; export const initializeControllers = (services) => { const controllers = {}; diff --git a/server/src/controllers/announcementsController.js b/server/src/controllers/v1/announcementsController.js similarity index 96% rename from server/src/controllers/announcementsController.js rename to server/src/controllers/v1/announcementsController.js index 430859791..0425b44aa 100755 --- a/server/src/controllers/announcementsController.js +++ b/server/src/controllers/v1/announcementsController.js @@ -1,4 +1,4 @@ -import { createAnnouncementValidation } from "../validation/joi.js"; +import { createAnnouncementValidation } from "../../validation/joi.js"; import BaseController from "./baseController.js"; const SERVICE_NAME = "announcementController"; diff --git a/server/src/controllers/authController.js b/server/src/controllers/v1/authController.js similarity index 99% rename from server/src/controllers/authController.js rename to server/src/controllers/v1/authController.js index c186e8423..17ed517eb 100755 --- a/server/src/controllers/authController.js +++ b/server/src/controllers/v1/authController.js @@ -10,7 +10,7 @@ import { editUserByIdParamValidation, editUserByIdBodyValidation, editSuperadminUserByIdBodyValidation, -} from "../validation/joi.js"; +} from "../../validation/joi.js"; const SERVICE_NAME = "authController"; diff --git a/server/src/controllers/baseController.js b/server/src/controllers/v1/baseController.js similarity index 97% rename from server/src/controllers/baseController.js rename to server/src/controllers/v1/baseController.js index 910cf57b4..314905c82 100644 --- a/server/src/controllers/baseController.js +++ b/server/src/controllers/v1/baseController.js @@ -1,4 +1,4 @@ -import { AppError } from "../service/infrastructure/errorService.js"; +import { AppError } from "../../service/infrastructure/errorService.js"; export const createCommonDependencies = (db, errorService, logger, stringService) => { return { diff --git a/server/src/controllers/checkController.js b/server/src/controllers/v1/checkController.js similarity index 99% rename from server/src/controllers/checkController.js rename to server/src/controllers/v1/checkController.js index 4069df3ff..ea293d74d 100755 --- a/server/src/controllers/checkController.js +++ b/server/src/controllers/v1/checkController.js @@ -9,7 +9,7 @@ import { ackCheckBodyValidation, ackAllChecksParamValidation, ackAllChecksBodyValidation, -} from "../validation/joi.js"; +} from "../../validation/joi.js"; const SERVICE_NAME = "checkController"; diff --git a/server/src/controllers/controllerUtils.js b/server/src/controllers/v1/controllerUtils.js similarity index 100% rename from server/src/controllers/controllerUtils.js rename to server/src/controllers/v1/controllerUtils.js diff --git a/server/src/controllers/diagnosticController.js b/server/src/controllers/v1/diagnosticController.js similarity index 100% rename from server/src/controllers/diagnosticController.js rename to server/src/controllers/v1/diagnosticController.js diff --git a/server/src/controllers/inviteController.js b/server/src/controllers/v1/inviteController.js similarity index 99% rename from server/src/controllers/inviteController.js rename to server/src/controllers/v1/inviteController.js index a377234c0..1ec586f31 100755 --- a/server/src/controllers/inviteController.js +++ b/server/src/controllers/v1/inviteController.js @@ -1,4 +1,4 @@ -import { inviteBodyValidation, inviteVerificationBodyValidation } from "../validation/joi.js"; +import { inviteBodyValidation, inviteVerificationBodyValidation } from "../../validation/joi.js"; import BaseController from "./baseController.js"; const SERVICE_NAME = "inviteController"; diff --git a/server/src/controllers/logController.js b/server/src/controllers/v1/logController.js similarity index 100% rename from server/src/controllers/logController.js rename to server/src/controllers/v1/logController.js diff --git a/server/src/controllers/maintenanceWindowController.js b/server/src/controllers/v1/maintenanceWindowController.js old mode 100755 new mode 100644 similarity index 99% rename from server/src/controllers/maintenanceWindowController.js rename to server/src/controllers/v1/maintenanceWindowController.js index 2fdb1ee15..be373ace5 --- a/server/src/controllers/maintenanceWindowController.js +++ b/server/src/controllers/v1/maintenanceWindowController.js @@ -6,7 +6,7 @@ import { getMaintenanceWindowsByMonitorIdParamValidation, getMaintenanceWindowsByTeamIdQueryValidation, deleteMaintenanceWindowByIdParamValidation, -} from "../validation/joi.js"; +} from "../../validation/joi.js"; import BaseController from "./baseController.js"; const SERVICE_NAME = "maintenanceWindowController"; diff --git a/server/src/controllers/monitorController.js b/server/src/controllers/v1/monitorController.js old mode 100755 new mode 100644 similarity index 99% rename from server/src/controllers/monitorController.js rename to server/src/controllers/v1/monitorController.js index 0f40a4a01..462d5a278 --- a/server/src/controllers/monitorController.js +++ b/server/src/controllers/v1/monitorController.js @@ -11,7 +11,7 @@ import { getCertificateParamValidation, getHardwareDetailsByIdParamValidation, getHardwareDetailsByIdQueryValidation, -} from "../validation/joi.js"; +} from "../../validation/joi.js"; import sslChecker from "ssl-checker"; import { fetchMonitorCertificate } from "./controllerUtils.js"; import BaseController from "./baseController.js"; diff --git a/server/src/controllers/notificationController.js b/server/src/controllers/v1/notificationController.js old mode 100755 new mode 100644 similarity index 98% rename from server/src/controllers/notificationController.js rename to server/src/controllers/v1/notificationController.js index e00dd5b6f..37c2b4e60 --- a/server/src/controllers/notificationController.js +++ b/server/src/controllers/v1/notificationController.js @@ -1,4 +1,4 @@ -import { createNotificationBodyValidation } from "../validation/joi.js"; +import { createNotificationBodyValidation } from "../../validation/joi.js"; import BaseController from "./baseController.js"; const SERVICE_NAME = "NotificationController"; diff --git a/server/src/controllers/queueController.js b/server/src/controllers/v1/queueController.js similarity index 100% rename from server/src/controllers/queueController.js rename to server/src/controllers/v1/queueController.js diff --git a/server/src/controllers/settingsController.js b/server/src/controllers/v1/settingsController.js old mode 100755 new mode 100644 similarity index 95% rename from server/src/controllers/settingsController.js rename to server/src/controllers/v1/settingsController.js index 7da724d23..3db73a05a --- a/server/src/controllers/settingsController.js +++ b/server/src/controllers/v1/settingsController.js @@ -1,5 +1,5 @@ -import { updateAppSettingsBodyValidation } from "../validation/joi.js"; -import { sendTestEmailBodyValidation } from "../validation/joi.js"; +import { updateAppSettingsBodyValidation } from "../../validation/joi.js"; +import { sendTestEmailBodyValidation } from "../../validation/joi.js"; import BaseController from "./baseController.js"; const SERVICE_NAME = "SettingsController"; diff --git a/server/src/controllers/statusPageController.js b/server/src/controllers/v1/statusPageController.js old mode 100755 new mode 100644 similarity index 99% rename from server/src/controllers/statusPageController.js rename to server/src/controllers/v1/statusPageController.js index a46688590..de6a1ca7c --- a/server/src/controllers/statusPageController.js +++ b/server/src/controllers/v1/statusPageController.js @@ -1,4 +1,4 @@ -import { createStatusPageBodyValidation, getStatusPageParamValidation, getStatusPageQueryValidation, imageValidation } from "../validation/joi.js"; +import { createStatusPageBodyValidation, getStatusPageParamValidation, getStatusPageQueryValidation, imageValidation } from "../../validation/joi.js"; import BaseController from "./baseController.js"; const SERVICE_NAME = "statusPageController"; diff --git a/server/src/routes/v1/monitorRoute.js b/server/src/routes/v1/monitorRoute.js index f8f219b83..dde72e256 100755 --- a/server/src/routes/v1/monitorRoute.js +++ b/server/src/routes/v1/monitorRoute.js @@ -1,7 +1,7 @@ import { Router } from "express"; import { isAllowed } from "../../middleware/isAllowed.js"; import multer from "multer"; -import { fetchMonitorCertificate } from "../../controllers/controllerUtils.js"; +import { fetchMonitorCertificate } from "../../controllers/v1/controllerUtils.js"; const upload = multer({ storage: multer.memoryStorage(), // Store file in memory as Buffer });