refactor out common dependenceis

This commit is contained in:
Alex Holliday committed 2025-07-25 10:16:29 -07:00
1 parent ddf3e8251d
commit dc321580c3
20 files changed
+170 -233

No files matched your search

+33 -47
View File
@@ -7,11 +7,13 @@ import express from "express";
import helmet from "helmet";
import cors from "cors";
import compression from "compression";
import { Logger } from "./utils/logger.js";
import logger from "./utils/logger.js";
import { verifyJWT } from "./middleware/verifyJWT.js";
import { handleErrors } from "./middleware/handleErrors.js";
import { responseHandler } from "./middleware/responseHandler.js";
import { fileURLToPath } from "url";
import { createCommonDependencies } from "./controllers/baseController.js";
import AuthRoutes from "./routes/authRoute.js";
import AuthController from "./controllers/authController.js";
@@ -248,6 +250,7 @@ const startApp = async () => {
db,
settingsService,
stringService,
errorService,
});
const diagnosticService = new DiagnosticService();
const inviteService = new InviteService({
@@ -261,6 +264,7 @@ const startApp = async () => {
db,
settingsService,
stringService,
errorService,
});
const monitorService = new MonitorService({
db,
@@ -275,6 +279,7 @@ const startApp = async () => {
// Register services
// ServiceRegistry.register(JobQueue.SERVICE_NAME, jobQueue);
// ServiceRegistry.register(JobQueue.SERVICE_NAME, pulseQueue);
ServiceRegistry.register(Logger.SERVICE_NAME, logger);
ServiceRegistry.register(JobQueue.SERVICE_NAME, superSimpleQueue);
ServiceRegistry.register(ErrorService.SERVICE_NAME, errorService);
ServiceRegistry.register(MongoDB.SERVICE_NAME, db);
@@ -305,82 +310,63 @@ const startApp = async () => {
process.on("SIGTERM", shutdown);
//Create controllers
const authController = new AuthController({
db: ServiceRegistry.get(MongoDB.SERVICE_NAME),
const commonDependencies = createCommonDependencies(
ServiceRegistry,
MongoDB.SERVICE_NAME,
Logger.SERVICE_NAME,
ErrorService.SERVICE_NAME,
StringService.SERVICE_NAME
);
const authController = new AuthController(commonDependencies, {
settingsService: ServiceRegistry.get(SettingsService.SERVICE_NAME),
emailService: ServiceRegistry.get(EmailService.SERVICE_NAME),
jobQueue: ServiceRegistry.get(JobQueue.SERVICE_NAME),
stringService: ServiceRegistry.get(StringService.SERVICE_NAME),
logger: logger,
userService: ServiceRegistry.get(UserService.SERVICE_NAME),
errorService: ServiceRegistry.get(ErrorService.SERVICE_NAME),
});
const monitorController = new MonitorController({
db: ServiceRegistry.get(MongoDB.SERVICE_NAME),
const monitorController = new MonitorController(commonDependencies, {
settingsService: ServiceRegistry.get(SettingsService.SERVICE_NAME),
jobQueue: ServiceRegistry.get(JobQueue.SERVICE_NAME),
stringService: ServiceRegistry.get(StringService.SERVICE_NAME),
emailService: ServiceRegistry.get(EmailService.SERVICE_NAME),
monitorService: ServiceRegistry.get(MonitorService.SERVICE_NAME),
errorService: ServiceRegistry.get(ErrorService.SERVICE_NAME),
});
const settingsController = new SettingsController({
db: ServiceRegistry.get(MongoDB.SERVICE_NAME),
const settingsController = new SettingsController(commonDependencies, {
settingsService: ServiceRegistry.get(SettingsService.SERVICE_NAME),
stringService: ServiceRegistry.get(StringService.SERVICE_NAME),
emailService: ServiceRegistry.get(EmailService.SERVICE_NAME),
errorService: ServiceRegistry.get(ErrorService.SERVICE_NAME),
});
const checkController = new CheckController({
db: ServiceRegistry.get(MongoDB.SERVICE_NAME),
const checkController = new CheckController(commonDependencies, {
settingsService: ServiceRegistry.get(SettingsService.SERVICE_NAME),
stringService: ServiceRegistry.get(StringService.SERVICE_NAME),
checkService: ServiceRegistry.get(CheckService.SERVICE_NAME),
errorService: ServiceRegistry.get(ErrorService.SERVICE_NAME),
});
const inviteController = new InviteController({
stringService: ServiceRegistry.get(StringService.SERVICE_NAME),
const inviteController = new InviteController(commonDependencies, {
inviteService: ServiceRegistry.get(InviteService.SERVICE_NAME),
errorService: ServiceRegistry.get(ErrorService.SERVICE_NAME),
});
const maintenanceWindowController = new MaintenanceWindowController({
db: ServiceRegistry.get(MongoDB.SERVICE_NAME),
const maintenanceWindowController = new MaintenanceWindowController(commonDependencies, {
settingsService: ServiceRegistry.get(SettingsService.SERVICE_NAME),
stringService: ServiceRegistry.get(StringService.SERVICE_NAME),
maintenanceWindowService: ServiceRegistry.get(MaintenanceWindowService.SERVICE_NAME),
errorService: ServiceRegistry.get(ErrorService.SERVICE_NAME),
});
const queueController = new QueueController({
const queueController = new QueueController(commonDependencies, {
jobQueue: ServiceRegistry.get(JobQueue.SERVICE_NAME),
stringService: ServiceRegistry.get(StringService.SERVICE_NAME),
errorService: ServiceRegistry.get(ErrorService.SERVICE_NAME),
});
const logController = new LogController({ logger, errorService: ServiceRegistry.get(ErrorService.SERVICE_NAME) });
const logController = new LogController(commonDependencies);
const statusPageController = new StatusPageController({
db: ServiceRegistry.get(MongoDB.SERVICE_NAME),
stringService: ServiceRegistry.get(StringService.SERVICE_NAME),
errorService: ServiceRegistry.get(ErrorService.SERVICE_NAME),
});
const statusPageController = new StatusPageController(commonDependencies);
const notificationController = new NotificationController({
const notificationController = new NotificationController(commonDependencies, {
notificationService: ServiceRegistry.get(NotificationService.SERVICE_NAME),
stringService: ServiceRegistry.get(StringService.SERVICE_NAME),
statusService: ServiceRegistry.get(StatusService.SERVICE_NAME),
db: ServiceRegistry.get(MongoDB.SERVICE_NAME),
errorService: ServiceRegistry.get(ErrorService.SERVICE_NAME),
});
const diagnosticController = new DiagnosticController({
const diagnosticController = new DiagnosticController(commonDependencies, {
diagnosticService: ServiceRegistry.get(DiagnosticService.SERVICE_NAME),
errorService: ServiceRegistry.get(ErrorService.SERVICE_NAME),
});
//Create routes
@@ -393,9 +379,9 @@ const startApp = async () => {
const queueRoutes = new QueueRoutes(queueController);
const logRoutes = new LogRoutes(logController);
const statusPageRoutes = new StatusPageRoutes(statusPageController);
const notificationRoutes = new NotificationRoutes(notificationController);
const diagnosticRoutes = new DiagnosticRoutes(diagnosticController);
// Middleware
app.use(express.static(frontendPath));
app.use(responseHandler);
@@ -438,16 +424,16 @@ const startApp = async () => {
//routes
app.use("/api/v1/auth", authRoutes.getRouter());
app.use("/api/v1/checks", verifyJWT, checkRoutes.getRouter());
app.use("/api/v1/diagnostic", verifyJWT, diagnosticRoutes.getRouter());
app.use("/api/v1/invite", inviteRoutes.getRouter());
app.use("/api/v1/logs", verifyJWT, logRoutes.getRouter());
app.use("/api/v1/maintenance-window", verifyJWT, maintenanceWindowRoutes.getRouter());
app.use("/api/v1/monitors", verifyJWT, monitorRoutes.getRouter());
app.use("/api/v1/notifications", verifyJWT, notificationRoutes.getRouter());
app.use("/api/v1/queue", verifyJWT, queueRoutes.getRouter());
app.use("/api/v1/settings", verifyJWT, settingsRoutes.getRouter());
app.use("/api/v1/checks", verifyJWT, checkRoutes.getRouter());
app.use("/api/v1/invite", inviteRoutes.getRouter());
app.use("/api/v1/maintenance-window", verifyJWT, maintenanceWindowRoutes.getRouter());
app.use("/api/v1/queue", verifyJWT, queueRoutes.getRouter());
app.use("/api/v1/logs", verifyJWT, logRoutes.getRouter());
app.use("/api/v1/status-page", statusPageRoutes.getRouter());
app.use("/api/v1/notifications", verifyJWT, notificationRoutes.getRouter());
app.use("/api/v1/diagnostic", verifyJWT, diagnosticRoutes.getRouter());
app.use("/api/v1/health", (req, res) => {
res.json({