2 Commits

Author SHA1 Message Date
ddcb7e76a3 fixed imports on several files 2026-03-25 06:56:19 -05:00
191cb2b698 changed limas folder after migration 2026-03-25 06:56:01 -05:00
17 changed files with 89 additions and 45 deletions

3
.gitignore vendored
View File

@@ -6,6 +6,9 @@ builds
temp
.scriptCreds
node-v24.14.0-x64.msi
postgresql-17.9-2-windows-x64.exe
VSCodeUserSetup-x64-1.112.0.exe
# Logs
logs
*.log

View File

@@ -3,6 +3,8 @@
"workbench.colorTheme": "Default Dark+",
"terminal.integrated.env.windows": {},
"editor.formatOnSave": true,
"typescript.preferences.importModuleSpecifier": "relative",
"javascript.preferences.importModuleSpecifier": "relative",
"editor.codeActionsOnSave": {
"source.fixAll.biome": "explicit",
"source.organizeImports.biome": "explicit"

View File

@@ -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" });

View File

@@ -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;

View File

@@ -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";

View File

@@ -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";

View File

@@ -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();

View File

@@ -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";

View File

@@ -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";

View File

@@ -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";

View File

@@ -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[] = [
{

View File

@@ -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";

View File

@@ -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";

View File

@@ -10,14 +10,6 @@ get {
auth: inherit
}
body:json {
{
"userId":"0kHd6Kkdub4GW6rK1qa1yjWwqXtvykqT",
"notificationId": "0399eb2a-39df-48b7-9f1c-d233cec94d2e",
"emails": ["blake.mattes@alpla.com"]
}
}
settings {
encodeUrl: true
timeout: 0

View File

@@ -16,8 +16,8 @@ params:path {
body:json {
{
"active" : false,
"options": [{"prodId": 5}]
"active" : true,
"options": []
}
}

View File

@@ -15,7 +15,7 @@ $Servers = @(
[PSCustomObject]@{
server = "uslim1vms006"
token = "uslim1"
loc = "E$\LST_V3"
loc = "D$\LST_V3"
},
[PSCustomObject]@{
server = "usmcd1vms036"
@@ -74,8 +74,9 @@ function Show-Menu {
Write-Host "==============================="
Write-Host "1. Build app"
Write-Host "2. Deploy New Release"
Write-Host "3. Restart Service"
Write-Host "4. Exit"
Write-Host "3. Upgrade Node"
Write-Host "4. Update Postgres"
Write-Host "5. Exit"
Write-Host ""
}
@@ -393,9 +394,57 @@ do {
}
}
"3" {
Write-Host "Restart selected"
Write-Host "Choose Server to upgrade node on"
$server = Select-Server -List $Servers
if($server -eq "all") {
Write-Host "Updating all servers"
for ($i = 0; $i -lt $Servers.Count; $i++) {
Write-Host "Updating $($Servers[$i].server)"
# Update-Server -Server $Servers[$i].server -Destination $Servers[$i].loc -Token $Servers[$i].token
Start-Sleep -Seconds 1
}
Read-Host -Prompt "Press Enter to continue..."
}
if ($server -ne "all") {
Write-Host "You selected $($server.server)"
# Update-Server -Server $server.server -Destination $server.loc -Token $server.token
# validate we have a node file to install in the folder
# stop service
# do update script on the server
# delete the .exe file
Read-Host -Prompt "Press Enter to continue..."
}
}
"4" {
Write-Host "Choose Server to upgrade postgres on"
$server = Select-Server -List $Servers
if($server -eq "all") {
Write-Host "Updating all servers"
for ($i = 0; $i -lt $Servers.Count; $i++) {
Write-Host "Updating $($Servers[$i].server)"
# Update-Server -Server $Servers[$i].server -Destination $Servers[$i].loc -Token $Servers[$i].token
Start-Sleep -Seconds 1
}
Read-Host -Prompt "Press Enter to continue..."
}
if ($server -ne "all") {
Write-Host "You selected $($server.server)"
# Update-Server -Server $server.server -Destination $server.loc -Token $server.token
# validate we have a postgres file to install in the folder
# stop service
# do update script on the server
# delete the .exe file
Read-Host -Prompt "Press Enter to continue..."
}
}
"5" {
Write-Host "Exiting..."
exit
}

View File

@@ -18,7 +18,7 @@
"exactOptionalPropertyTypes": true,
"baseUrl": "./backend",
"paths": {
"@/*": ["src/*"]
"@/*": ["*"]
},
"esModuleInterop": true,
"skipLibCheck": true,
@@ -27,8 +27,7 @@
//"allowImportingTsExtensions": true,
"noEmit": false
},
"include": ["backend/**/*"
],
"include": ["backend/**/*"],
"exclude": [
"node_modules",
"frontend",