fixed imports on several files
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -6,6 +6,9 @@ builds
|
|||||||
temp
|
temp
|
||||||
.scriptCreds
|
.scriptCreds
|
||||||
node-v24.14.0-x64.msi
|
node-v24.14.0-x64.msi
|
||||||
|
postgresql-17.9-2-windows-x64.exe
|
||||||
|
VSCodeUserSetup-x64-1.112.0.exe
|
||||||
|
|
||||||
# Logs
|
# Logs
|
||||||
logs
|
logs
|
||||||
*.log
|
*.log
|
||||||
|
|||||||
2
.vscode/settings.json
vendored
2
.vscode/settings.json
vendored
@@ -3,6 +3,8 @@
|
|||||||
"workbench.colorTheme": "Default Dark+",
|
"workbench.colorTheme": "Default Dark+",
|
||||||
"terminal.integrated.env.windows": {},
|
"terminal.integrated.env.windows": {},
|
||||||
"editor.formatOnSave": true,
|
"editor.formatOnSave": true,
|
||||||
|
"typescript.preferences.importModuleSpecifier": "relative",
|
||||||
|
"javascript.preferences.importModuleSpecifier": "relative",
|
||||||
"editor.codeActionsOnSave": {
|
"editor.codeActionsOnSave": {
|
||||||
"source.fixAll.biome": "explicit",
|
"source.fixAll.biome": "explicit",
|
||||||
"source.organizeImports.biome": "explicit"
|
"source.organizeImports.biome": "explicit"
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
import { notificationSub } from "db/schema/notifications.sub.schema.js";
|
|
||||||
import { eq } from "drizzle-orm";
|
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 { db } from "../db/db.controller.js";
|
||||||
import { notifications } from "../db/schema/notifications.schema.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";
|
import { tryCatch } from "../utils/trycatch.utils.js";
|
||||||
|
|
||||||
const log = createLogger({ module: "notifications", subModule: "start" });
|
const log = createLogger({ module: "notifications", subModule: "start" });
|
||||||
|
|||||||
@@ -1,6 +1,10 @@
|
|||||||
const reprint = (data: any, emails: string) => {
|
const reprint = (data: any, emails: string) => {
|
||||||
|
// TODO: do the actual logic for the notification.
|
||||||
console.log(data);
|
console.log(data);
|
||||||
console.log(emails);
|
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;
|
export default reprint;
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
import { notifications } from "db/schema/notifications.schema.js";
|
|
||||||
import { eq } from "drizzle-orm";
|
import { eq } from "drizzle-orm";
|
||||||
import { type Response, Router } from "express";
|
import { type Response, Router } from "express";
|
||||||
import { auth } from "utils/auth.utils.js";
|
|
||||||
import { db } from "../db/db.controller.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 { apiReturn } from "../utils/returnHelper.utils.js";
|
||||||
import { tryCatch } from "../utils/trycatch.utils.js";
|
import { tryCatch } from "../utils/trycatch.utils.js";
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import { notifications } from "db/schema/notifications.schema.js";
|
|
||||||
import { eq } from "drizzle-orm";
|
import { eq } from "drizzle-orm";
|
||||||
import { type Response, Router } from "express";
|
import { type Response, Router } from "express";
|
||||||
import z from "zod";
|
import z from "zod";
|
||||||
import { db } from "../db/db.controller.js";
|
import { db } from "../db/db.controller.js";
|
||||||
|
import { notifications } from "../db/schema/notifications.schema.js";
|
||||||
import { requirePermission } from "../middleware/auth.requiredPerms.middleware.js";
|
import { requirePermission } from "../middleware/auth.requiredPerms.middleware.js";
|
||||||
import { apiReturn } from "../utils/returnHelper.utils.js";
|
import { apiReturn } from "../utils/returnHelper.utils.js";
|
||||||
import { tryCatch } from "../utils/trycatch.utils.js";
|
import { tryCatch } from "../utils/trycatch.utils.js";
|
||||||
|
|||||||
@@ -1,23 +1,16 @@
|
|||||||
import { notificationSub } from "db/schema/notifications.sub.schema.js";
|
|
||||||
import { and, eq } from "drizzle-orm";
|
import { and, eq } from "drizzle-orm";
|
||||||
import { type Response, Router } from "express";
|
import { type Response, Router } from "express";
|
||||||
import z from "zod";
|
import z from "zod";
|
||||||
import { db } from "../db/db.controller.js";
|
import { db } from "../db/db.controller.js";
|
||||||
|
import { notificationSub } from "../db/schema/notifications.sub.schema.js";
|
||||||
import { apiReturn } from "../utils/returnHelper.utils.js";
|
import { apiReturn } from "../utils/returnHelper.utils.js";
|
||||||
import { tryCatch } from "../utils/trycatch.utils.js";
|
import { tryCatch } from "../utils/trycatch.utils.js";
|
||||||
import { modifiedNotification } from "./notification.controller.js";
|
import { modifiedNotification } from "./notification.controller.js";
|
||||||
|
|
||||||
const newSubscribe = z.object({
|
const newSubscribe = z.object({
|
||||||
emails: z
|
emails: z.email().array().describe("An array of emails"),
|
||||||
.email()
|
|
||||||
.array()
|
|
||||||
|
|
||||||
.describe("An array of emails"),
|
|
||||||
userId: z.string().describe("User id."),
|
userId: z.string().describe("User id."),
|
||||||
notificationId: z
|
notificationId: z.string().describe("Notification id"),
|
||||||
.string()
|
|
||||||
|
|
||||||
.describe("Notification id"),
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const r = Router();
|
const r = Router();
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import { notificationSub } from "db/schema/notifications.sub.schema.js";
|
|
||||||
import { eq } from "drizzle-orm";
|
import { eq } from "drizzle-orm";
|
||||||
import { type Response, Router } from "express";
|
import { type Response, Router } from "express";
|
||||||
import { auth } from "utils/auth.utils.js";
|
|
||||||
import { db } from "../db/db.controller.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 { apiReturn } from "../utils/returnHelper.utils.js";
|
||||||
import { tryCatch } from "../utils/trycatch.utils.js";
|
import { tryCatch } from "../utils/trycatch.utils.js";
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { notificationSub } from "db/schema/notifications.sub.schema.js";
|
|
||||||
import { type Response, Router } from "express";
|
import { type Response, Router } from "express";
|
||||||
import z from "zod";
|
import z from "zod";
|
||||||
import { db } from "../db/db.controller.js";
|
import { db } from "../db/db.controller.js";
|
||||||
|
import { notificationSub } from "../db/schema/notifications.sub.schema.js";
|
||||||
import { apiReturn } from "../utils/returnHelper.utils.js";
|
import { apiReturn } from "../utils/returnHelper.utils.js";
|
||||||
import { tryCatch } from "../utils/trycatch.utils.js";
|
import { tryCatch } from "../utils/trycatch.utils.js";
|
||||||
import { modifiedNotification } from "./notification.controller.js";
|
import { modifiedNotification } from "./notification.controller.js";
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import { notificationSub } from "db/schema/notifications.sub.schema.js";
|
|
||||||
import { and, eq } from "drizzle-orm";
|
import { and, eq } from "drizzle-orm";
|
||||||
import { type Response, Router } from "express";
|
import { type Response, Router } from "express";
|
||||||
import z from "zod";
|
import z from "zod";
|
||||||
import { db } from "../db/db.controller.js";
|
import { db } from "../db/db.controller.js";
|
||||||
|
import { notificationSub } from "../db/schema/notifications.sub.schema.js";
|
||||||
import { apiReturn } from "../utils/returnHelper.utils.js";
|
import { apiReturn } from "../utils/returnHelper.utils.js";
|
||||||
import { tryCatch } from "../utils/trycatch.utils.js";
|
import { tryCatch } from "../utils/trycatch.utils.js";
|
||||||
import { modifiedNotification } from "./notification.controller.js";
|
import { modifiedNotification } from "./notification.controller.js";
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
import { db } from "db/db.controller.js";
|
import { sql } from "drizzle-orm";
|
||||||
|
import { db } from "../db/db.controller.js";
|
||||||
import {
|
import {
|
||||||
type NewNotification,
|
type NewNotification,
|
||||||
notifications,
|
notifications,
|
||||||
} from "db/schema/notifications.schema.js";
|
} from "../db/schema/notifications.schema.js";
|
||||||
import { sql } from "drizzle-orm";
|
|
||||||
import { tryCatch } from "utils/trycatch.utils.js";
|
|
||||||
import { createLogger } from "../logger/logger.controller.js";
|
import { createLogger } from "../logger/logger.controller.js";
|
||||||
|
import { tryCatch } from "../utils/trycatch.utils.js";
|
||||||
|
|
||||||
const note: NewNotification[] = [
|
const note: NewNotification[] = [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
import type { Express } from "express";
|
import type { Express } from "express";
|
||||||
import { setupNotificationRoutes } from "notification/notification.routes.js";
|
|
||||||
import { setupAuthRoutes } from "./auth/auth.routes.js";
|
import { setupAuthRoutes } from "./auth/auth.routes.js";
|
||||||
// import the routes and route setups
|
// import the routes and route setups
|
||||||
import { setupApiDocsRoutes } from "./configs/scaler.config.js";
|
import { setupApiDocsRoutes } from "./configs/scaler.config.js";
|
||||||
import { setupDatamartRoutes } from "./datamart/datamart.routes.js";
|
import { setupDatamartRoutes } from "./datamart/datamart.routes.js";
|
||||||
|
import { setupNotificationRoutes } from "./notification/notification.routes.js";
|
||||||
import { setupOpendockRoutes } from "./opendock/opendock.routes.js";
|
import { setupOpendockRoutes } from "./opendock/opendock.routes.js";
|
||||||
import { setupProdSqlRoutes } from "./prodSql/prodSql.routes.js";
|
import { setupProdSqlRoutes } from "./prodSql/prodSql.routes.js";
|
||||||
import { setupSystemRoutes } from "./system/system.routes.js";
|
import { setupSystemRoutes } from "./system/system.routes.js";
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
import { createServer } from "node:http";
|
import { createServer } from "node:http";
|
||||||
import os from "node:os";
|
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 createApp from "./app.js";
|
||||||
import { db } from "./db/db.controller.js";
|
import { db } from "./db/db.controller.js";
|
||||||
import { dbCleanup } from "./db/dbCleanup.controller.js";
|
import { dbCleanup } from "./db/dbCleanup.controller.js";
|
||||||
import { type Setting, settings } from "./db/schema/settings.schema.js";
|
import { type Setting, settings } from "./db/schema/settings.schema.js";
|
||||||
import { createLogger } from "./logger/logger.controller.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 { monitorReleaseChanges } from "./opendock/openDockRreleaseMonitor.utils.js";
|
||||||
import { opendockSocketMonitor } from "./opendock/opendockSocketMonitor.utils.js";
|
import { opendockSocketMonitor } from "./opendock/opendockSocketMonitor.utils.js";
|
||||||
import { connectProdSql } from "./prodSql/prodSqlConnection.controller.js";
|
import { connectProdSql } from "./prodSql/prodSqlConnection.controller.js";
|
||||||
|
|||||||
@@ -10,14 +10,6 @@ get {
|
|||||||
auth: inherit
|
auth: inherit
|
||||||
}
|
}
|
||||||
|
|
||||||
body:json {
|
|
||||||
{
|
|
||||||
"userId":"0kHd6Kkdub4GW6rK1qa1yjWwqXtvykqT",
|
|
||||||
"notificationId": "0399eb2a-39df-48b7-9f1c-d233cec94d2e",
|
|
||||||
"emails": ["blake.mattes@alpla.com"]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
settings {
|
settings {
|
||||||
encodeUrl: true
|
encodeUrl: true
|
||||||
timeout: 0
|
timeout: 0
|
||||||
|
|||||||
@@ -16,8 +16,8 @@ params:path {
|
|||||||
|
|
||||||
body:json {
|
body:json {
|
||||||
{
|
{
|
||||||
"active" : false,
|
"active" : true,
|
||||||
"options": [{"prodId": 5}]
|
"options": []
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
"exactOptionalPropertyTypes": true,
|
"exactOptionalPropertyTypes": true,
|
||||||
"baseUrl": "./backend",
|
"baseUrl": "./backend",
|
||||||
"paths": {
|
"paths": {
|
||||||
"@/*": ["src/*"]
|
"@/*": ["*"]
|
||||||
},
|
},
|
||||||
"esModuleInterop": true,
|
"esModuleInterop": true,
|
||||||
"skipLibCheck": true,
|
"skipLibCheck": true,
|
||||||
@@ -27,8 +27,7 @@
|
|||||||
//"allowImportingTsExtensions": true,
|
//"allowImportingTsExtensions": true,
|
||||||
"noEmit": false
|
"noEmit": false
|
||||||
},
|
},
|
||||||
"include": ["backend/**/*"
|
"include": ["backend/**/*"],
|
||||||
],
|
|
||||||
"exclude": [
|
"exclude": [
|
||||||
"node_modules",
|
"node_modules",
|
||||||
"frontend",
|
"frontend",
|
||||||
|
|||||||
Reference in New Issue
Block a user