fixed imports on several files

backend/notification/notification.controller.ts

@@ -1,10 +1,10 @@
-import { notificationSub } from "db/schema/notifications.sub.schema.js";
 import { eq } from "drizzle-orm";
-import { createLogger } from "logger/logger.controller.js";
-import { minutesToCron } from "utils/croner.minConvert.js";
-import { createCronJob, stopCronJob } from "utils/croner.utils.js";
 import { db } from "../db/db.controller.js";
 import { notifications } from "../db/schema/notifications.schema.js";
+import { notificationSub } from "../db/schema/notifications.sub.schema.js";
+import { createLogger } from "../logger/logger.controller.js";
+import { minutesToCron } from "../utils/croner.minConvert.js";
+import { createCronJob, stopCronJob } from "../utils/croner.utils.js";
 import { tryCatch } from "../utils/trycatch.utils.js";
 
 const log = createLogger({ module: "notifications", subModule: "start" });

backend/notification/notification.reprintLabels.ts

@@ -1,6 +1,10 @@
 const reprint = (data: any, emails: string) => {
+	// TODO: do the actual logic for the notification.
 	console.log(data);
 	console.log(emails);
+
+	// TODO send the error to systemAdmin users so they do not always need to be on the notifications.
+	// these errors are defined per notification.
 };
 
 export default reprint;

backend/notification/notification.route.ts

@@ -1,8 +1,9 @@
-import { notifications } from "db/schema/notifications.schema.js";
 import { eq } from "drizzle-orm";
 import { type Response, Router } from "express";
-import { auth } from "utils/auth.utils.js";
+
 import { db } from "../db/db.controller.js";
+import { notifications } from "../db/schema/notifications.schema.js";
+import { auth } from "../utils/auth.utils.js";
 import { apiReturn } from "../utils/returnHelper.utils.js";
 import { tryCatch } from "../utils/trycatch.utils.js";
 

backend/notification/notification.update.route.ts

@@ -1,8 +1,8 @@
-import { notifications } from "db/schema/notifications.schema.js";
 import { eq } from "drizzle-orm";
 import { type Response, Router } from "express";
 import z from "zod";
 import { db } from "../db/db.controller.js";
+import { notifications } from "../db/schema/notifications.schema.js";
 import { requirePermission } from "../middleware/auth.requiredPerms.middleware.js";
 import { apiReturn } from "../utils/returnHelper.utils.js";
 import { tryCatch } from "../utils/trycatch.utils.js";

backend/notification/notificationSub.delete.route.ts

@@ -1,23 +1,16 @@
-import { notificationSub } from "db/schema/notifications.sub.schema.js";
 import { and, eq } from "drizzle-orm";
 import { type Response, Router } from "express";
 import z from "zod";
 import { db } from "../db/db.controller.js";
+import { notificationSub } from "../db/schema/notifications.sub.schema.js";
 import { apiReturn } from "../utils/returnHelper.utils.js";
 import { tryCatch } from "../utils/trycatch.utils.js";
 import { modifiedNotification } from "./notification.controller.js";
 
 const newSubscribe = z.object({
-	emails: z
-		.email()
-		.array()
-
-		.describe("An array of emails"),
+	emails: z.email().array().describe("An array of emails"),
 	userId: z.string().describe("User id."),
-	notificationId: z
-		.string()
-
-		.describe("Notification id"),
+	notificationId: z.string().describe("Notification id"),
 });
 
 const r = Router();

backend/notification/notificationSub.get.route.ts

@@ -1,8 +1,8 @@
-import { notificationSub } from "db/schema/notifications.sub.schema.js";
 import { eq } from "drizzle-orm";
 import { type Response, Router } from "express";
-import { auth } from "utils/auth.utils.js";
 import { db } from "../db/db.controller.js";
+import { notificationSub } from "../db/schema/notifications.sub.schema.js";
+import { auth } from "../utils/auth.utils.js";
 import { apiReturn } from "../utils/returnHelper.utils.js";
 import { tryCatch } from "../utils/trycatch.utils.js";
 

backend/notification/notificationSub.post.route.ts

@@ -1,7 +1,7 @@
-import { notificationSub } from "db/schema/notifications.sub.schema.js";
 import { type Response, Router } from "express";
 import z from "zod";
 import { db } from "../db/db.controller.js";
+import { notificationSub } from "../db/schema/notifications.sub.schema.js";
 import { apiReturn } from "../utils/returnHelper.utils.js";
 import { tryCatch } from "../utils/trycatch.utils.js";
 import { modifiedNotification } from "./notification.controller.js";

backend/notification/notificationSub.update.route.ts

@@ -1,8 +1,8 @@
-import { notificationSub } from "db/schema/notifications.sub.schema.js";
 import { and, eq } from "drizzle-orm";
 import { type Response, Router } from "express";
 import z from "zod";
 import { db } from "../db/db.controller.js";
+import { notificationSub } from "../db/schema/notifications.sub.schema.js";
 import { apiReturn } from "../utils/returnHelper.utils.js";
 import { tryCatch } from "../utils/trycatch.utils.js";
 import { modifiedNotification } from "./notification.controller.js";

backend/notification/notifications.master.ts

@@ -1,11 +1,11 @@
-import { db } from "db/db.controller.js";
+import { sql } from "drizzle-orm";
+import { db } from "../db/db.controller.js";
 import {
 	type NewNotification,
 	notifications,
-} from "db/schema/notifications.schema.js";
-import { sql } from "drizzle-orm";
-import { tryCatch } from "utils/trycatch.utils.js";
+} from "../db/schema/notifications.schema.js";
 import { createLogger } from "../logger/logger.controller.js";
+import { tryCatch } from "../utils/trycatch.utils.js";
 
 const note: NewNotification[] = [
 	{

backend/routeHandler.routes.ts

@@ -1,9 +1,10 @@
 import type { Express } from "express";
-import { setupNotificationRoutes } from "notification/notification.routes.js";
+
 import { setupAuthRoutes } from "./auth/auth.routes.js";
 // import the routes and route setups
 import { setupApiDocsRoutes } from "./configs/scaler.config.js";
 import { setupDatamartRoutes } from "./datamart/datamart.routes.js";
+import { setupNotificationRoutes } from "./notification/notification.routes.js";
 import { setupOpendockRoutes } from "./opendock/opendock.routes.js";
 import { setupProdSqlRoutes } from "./prodSql/prodSql.routes.js";
 import { setupSystemRoutes } from "./system/system.routes.js";

backend/server.ts

@@ -1,12 +1,12 @@
 import { createServer } from "node:http";
 import os from "node:os";
-import { startNotifications } from "notification/notification.controller.js";
-import { createNotifications } from "notification/notifications.master.js";
 import createApp from "./app.js";
 import { db } from "./db/db.controller.js";
 import { dbCleanup } from "./db/dbCleanup.controller.js";
 import { type Setting, settings } from "./db/schema/settings.schema.js";
 import { createLogger } from "./logger/logger.controller.js";
+import { startNotifications } from "./notification/notification.controller.js";
+import { createNotifications } from "./notification/notifications.master.js";
 import { monitorReleaseChanges } from "./opendock/openDockRreleaseMonitor.utils.js";
 import { opendockSocketMonitor } from "./opendock/opendockSocketMonitor.utils.js";
 import { connectProdSql } from "./prodSql/prodSqlConnection.controller.js";