cowch/lst
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

feat(psi): more psi work

Browse Source
This commit is contained in:
Blake Matthes
2025-09-22 22:41:51 -05:00
parent edbc7cefd8
commit cb2e6252e0
15 changed files with 1262 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
lstV2/server/services/auth/controllers/login.ts
View File

@@ -1,22 +1,27 @@
import jwt from "jsonwebtoken";
import {db} from "../../../../database/dbclient.js";
import {users} from "../../../../database/schema/users.js";
import {eq, sql} from "drizzle-orm";
import {checkPassword} from "../utils/checkPassword.js";
import {roleCheck} from "./userRoles/getUserAccess.js";
import {createLog} from "../../logger/logger.js";
import {differenceInDays} from "date-fns";
import { db } from "../../../../database/dbclient.js";
import { users } from "../../../../database/schema/users.js";
import { eq, sql } from "drizzle-orm";
import { checkPassword } from "../utils/checkPassword.js";
import { roleCheck } from "./userRoles/getUserAccess.js";
import { createLog } from "../../logger/logger.js";
import { differenceInDays } from "date-fns";
import { tryCatch } from "../../../globalUtils/tryCatch.js";
import { settings } from "../../../../database/schema/settings.js";
/**
* Authenticate a user and return a JWT.
*/
const {sign} = jwt;
const { sign } = jwt;
export async function login(
username: string,
password: string
): Promise<{token: string; user: {user_id: string; username: string}}> {
const user = await db.select().from(users).where(eq(users.username, username));
): Promise<{ token: string; user: { user_id: string; username: string } }> {
const user = await db
.select()
.from(users)
.where(eq(users.username, username));
//console.log(user);
if (user.length === 0) {
@@ -47,24 +52,46 @@ export async function login(
// update the user last login
try {
const lastLog = await db
.update(users)
.set({lastLogin: sql`NOW()`})
.where(eq(users.user_id, user[0].user_id))
.returning({lastLogin: users.lastLogin});
.update(users)
.set({ lastLogin: sql`NOW()` })
.where(eq(users.user_id, user[0].user_id))
.returning({ lastLogin: users.lastLogin });
createLog(
"info",
"lst",
"auth",
`Its been ${differenceInDays(lastLog[0]?.lastLogin ?? "", new Date(Date.now()))} days since ${
user[0].username
} has logged in`
`Its been ${differenceInDays(
lastLog[0]?.lastLogin ?? "",
new Date(Date.now())
)} days since ${user[0].username} has logged in`
);
//]);
} catch (error) {
createLog("error", "lst", "auth", "There was an error updating the user last login");
createLog(
"error",
"lst",
"auth",
"There was an error updating the user last login"
);
}
const token = sign({user: userData}, secret, {expiresIn: expiresIn * 60});
const token = sign({ user: userData }, secret, {
expiresIn: expiresIn * 60,
});
return {token, user: userData};
return { token, user: userData };
}
// export const login = async (username: string, password: string) => {
// // get the settings so we know what server to call.
// const { data, error } = (await tryCatch(db.select().from(settings))) as any;
// if (error) {
// return {
// success: false,
// message: "Failed to get settings",
// data: error,
// };
// }
// };

47
lstV2/server/services/dataMart/controller/forecastByAvs.ts Normal file
View File

@@ -0,0 +1,47 @@
import { tryCatch } from "../../../globalUtils/tryCatch.js";
import { createLog } from "../../logger/logger.js";
import { query } from "../../sqlServer/prodSqlServer.js";
import { forecastByAvs } from "../../sqlServer/querys/dataMart/forecast.js";
// type ArticleData = {
// id: string
// }
export const getForecastByAv = async (avs: string) => {
let articles: any = [];
if (!avs) {
return {
success: false,
message: `Missing av's please send at least one over`,
data: [],
};
}
const { data, error } = (await tryCatch(
query(forecastByAvs.replace("[articles]", avs), "ForecastData by av")
)) as any;
if (error) {
createLog(
"error",
"datamart",
"datamart",
`There was an error getting the forecast info: ${JSON.stringify(
error
)}`
);
return {
success: false,
messsage: `There was an error getting the forecast info`,
data: error,
};
}
articles = data.data;
return {
success: true,
message: "Forecast Data",
data: articles,
};
};

84
lstV2/server/services/dataMart/controller/getDeliveryByDateRangeAndAv.ts Normal file
View File

@@ -0,0 +1,84 @@
import { query } from "../../sqlServer/prodSqlServer.js";
import { deliveryByDateRangeAndAv } from "../../sqlServer/querys/dataMart/deleveryByDateRange.js";
import { addDays, format } from "date-fns";
export const getDeliveryByDateRangeAndAv = async (
avs: string,
startDate: string,
endDate: string
) => {
// const { data: plantToken, error: plantError } = await tryCatch(
// db.select().from(settings).where(eq(settings.name, "plantToken"))
// );
// if (plantError) {
// return {
// success: false,
// message: "Error getting Settings",
// data: plantError,
// };
// }
let deliverys: any = [];
let updatedQuery = deliveryByDateRangeAndAv;
// start days can be sent over
if (startDate) {
updatedQuery = updatedQuery.replaceAll("[startDate]", startDate);
} else {
updatedQuery = updatedQuery.replaceAll("[startDate]", "1990-1-1");
}
// end days can be sent over
if (endDate) {
updatedQuery = updatedQuery.replaceAll("[endDate]", endDate);
} else {
const defaultEndDate = format(
addDays(new Date(Date.now()), 5),
"yyyy-M-d"
);
updatedQuery = updatedQuery.replaceAll("[endDate]", defaultEndDate);
}
try {
const res: any = await query(
updatedQuery.replace("[articles]", avs),
"Get Delivery by date range"
);
deliverys = res.data;
//console.log(res.data);
} catch (error) {
console.log(error);
return {
success: false,
message: "All Deliveries within the range.",
data: error,
};
}
// if (!data) {
// deliverys = deliverys.splice(1000, 0);
// }
// add plant token in
// const pOrders = deliverys.map((item: any) => {
// // const dateCon = new Date(item.loadingDate).toLocaleString("en-US", {
// // month: "numeric",
// // day: "numeric",
// // year: "numeric",
// // hour: "2-digit",
// // minute: "2-digit",
// // hour12: false,
// // });
// //const dateCon = new Date(item.loadingDate).toISOString().replace("T", " ").split(".")[0];
// const dateCon = new Date(item.loadingDate).toISOString().split("T")[0];
// //const delDate = new Date(item.deliveryDate).toISOString().replace("T", " ").split(".")[0];
// const delDate = new Date(item.deliveryDate).toISOString().split("T")[0];
// return {
// plantToken: plantToken[0].value,
// ...item,
// loadingDate: dateCon,
// deliveryDate: delDate,
// };
// });
return { success: true, message: "Current open orders", data: deliverys };
};

5
lstV2/server/services/dataMart/dataMartService.ts
View File

@@ -13,7 +13,8 @@ import psiArticleData from "./route/getPsiArticleData.js";
import psiPlanningData from "./route/getPsiPlanningData.js";
import psiProductionData from "./route/getPsiProductionData.js";
import psiInventory from "./route/getPsiinventory.js";
import getForecastByAv from "./route/getForecastDataByAv.js";
import getDeliveryByDateRangeAndAv from "./route/getDeliveryDateByRangeAndAv.js";
const app = new OpenAPIHono();
const routes = [
@@ -23,6 +24,8 @@ const routes = [
getCustomerInv,
getOpenOrders,
getDeliveryByDate,
getDeliveryByDateRangeAndAv,
getForecastByAv,
fakeEDI,
addressCorrections,
fifoIndex,

58
lstV2/server/services/dataMart/route/getDeliveryDateByRangeAndAv.ts Normal file
View File

@@ -0,0 +1,58 @@
import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
import { responses } from "../../../globalUtils/routeDefs/responses.js";
import { tryCatch } from "../../../globalUtils/tryCatch.js";
import { apiHit } from "../../../globalUtils/apiHits.js";
import { getDeliveryByDateRangeAndAv } from "../controller/getDeliveryByDateRangeAndAv.js";
const app = new OpenAPIHono({ strict: false });
const Body = z.object({
includeRunnningNumbers: z.string().openapi({ example: "x" }),
});
app.openapi(
createRoute({
tags: ["dataMart"],
summary: "Returns deliverys by daterange.",
method: "get",
path: "/deliverybydaterangeandav",
request: {
body: {
content: {
"application/json": { schema: Body },
},
},
},
responses: responses(),
}),
async (c) => {
const q: any = c.req.queries();
// make sure we have a vaid user being accessed thats really logged in
apiHit(c, { endpoint: "/deliverybydaterangeandav" });
const { data, error } = await tryCatch(
getDeliveryByDateRangeAndAv(
q["avs"] ? q["avs"][0] : null,
q["startDate"] ? q["startDate"][0] : null,
q["endDate"] ? q["endDate"][0] : null
)
);
if (error) {
console.log(error);
return c.json(
{
success: false,
message: "There was an error getting the deliveries.",
data: error,
},
400
);
}
return c.json({
success: data.success,
message: data.message,
data: data.data,
});
}
);
export default app;

61
lstV2/server/services/dataMart/route/getForecastDataByAv.ts Normal file
View File

@@ -0,0 +1,61 @@
import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
import { responses } from "../../../globalUtils/routeDefs/responses.js";
import { tryCatch } from "../../../globalUtils/tryCatch.js";
import { apiHit } from "../../../globalUtils/apiHits.js";
import { psiGetPlanningData } from "../controller/psiGetPlanningData.js";
import { getForecastByAv } from "../controller/forecastByAvs.js";
const app = new OpenAPIHono({ strict: false });
const Body = z.object({
includeRunnningNumbers: z.string().openapi({ example: "x" }),
});
app.openapi(
createRoute({
tags: ["dataMart"],
summary: "Returns the psiarticleData.",
method: "get",
path: "/forecastbyav",
request: {
body: {
content: {
"application/json": { schema: Body },
},
},
},
responses: responses(),
}),
async (c) => {
const q: any = c.req.queries();
// make sure we have a vaid user being accessed thats really logged in
apiHit(c, { endpoint: "/forecastbyav" });
//console.log(articles["avs"][0]);
const { data, error } = await tryCatch(
getForecastByAv(q["avs"] ? q["avs"][0] : null)
);
if (error) {
console.log(error);
return c.json(
{
success: false,
message: "There was an error getting the forecast data.",
data: error,
},
400
);
}
//console.log(data);
return c.json(
{
success: data.success,
message: data.message,
data: data.data,
},
data.success ? 200 : 400
);
}
);
export default app;

12
lstV2/server/services/logger/controller/logCleanup.ts
View File

@@ -15,7 +15,7 @@ export const logCleanup = async () => {
.delete(logs)
.where(
and(
lte(logs.created_at, sql`NOW() - INTERVAL '3 days'`),
lte(logs.created_at, sql`NOW() - INTERVAL '300 days'`),
//inArray(logs.service, ["server", "tcp", "sqlProd", "globalutils","notify", "logger", "serverupdater"]),
eq(logs.level, "info")
)
@@ -25,14 +25,14 @@ export const logCleanup = async () => {
"info",
"lst",
"logger",
`${delLogs.length} Server logs were just deleted that were older than 3 days`
`${delLogs.length} Server logs were just deleted that were older than 300 days`
);
} catch (error) {
createLog(
"error",
"lst",
"logger",
`There was an error deleteing server logs. ${error}`
`There was an error deleting server logs. ${error}`
);
}
@@ -42,7 +42,7 @@ export const logCleanup = async () => {
.delete(logs)
.where(
and(
lte(logs.created_at, sql`NOW() - INTERVAL '7 days'`),
lte(logs.created_at, sql`NOW() - INTERVAL '700 days'`),
//inArray(logs.service, ["server", "tcp", "sqlProd", "globalutils", "notify", "logger", "serverupdater"]),
ne(logs.level, "info")
)
@@ -52,14 +52,14 @@ export const logCleanup = async () => {
"info",
"lst",
"logger",
`${delLogs.length} Server logs were just deleted that were older than 7 days`
`${delLogs.length} Server logs were just deleted that were older than 700 days`
);
} catch (error) {
createLog(
"error",
"lst",
"logger",
`There was an error deleteing server logs. ${error}`
`There was an error deleting server logs. ${error}`
);
}
};

2
lstV2/server/services/ocp/controller/labeling/manualLabelLog.ts
View File

@@ -42,7 +42,7 @@ export const manualPrint = async (manualPrint: any) => {
manualTag(
manualPrint.rfidTag,
"wrapper1",
parseInt(label.data.SSCC.slice(10, -1))
parseInt(label?.data.SSCC.slice(10, -1))
);
}
return {

72
lstV2/server/services/sqlServer/querys/dataMart/deleveryByDateRange.ts
View File

@@ -70,3 +70,75 @@ where CONVERT(date, Upd_Date) BETWEEN @StartDate AND @EndDate
order by Bol_PrintDate desc
`;
export const deliveryByDateRangeAndAv = `
use [test1_AlplaPROD2.0_Read]
SELECT
r.[ArticleHumanReadableId]
,[ReleaseNumber]
,h.CustomerOrderNumber
,x.CustomerLineItemNumber
,[CustomerReleaseNumber]
,[ReleaseState]
,[DeliveryState]
,ea.JournalNummer
,[ReleaseConfirmationState]
,[PlanningState]
,format(r.[OrderDate], 'yyyy-MM-dd HH:mm') as OrderDate
,FORMAT(r.[DeliveryDate], 'yyyy-MM-dd HH:mm') as DeliveryDate
,FORMAT(r.[LoadingDate], 'yyyy-MM-dd HH:mm') as LoadingDate
,[Quantity]
,[DeliveredQuantity]
,r.[AdditionalInformation1]
,r.[AdditionalInformation2]
,[TradeUnits]
,[LoadingUnits]
,[Trucks]
,[LoadingToleranceType]
,[SalesPrice]
,[Currency]
,[QuantityUnit]
,[SalesPriceRemark]
,r.[Remark]
,[Irradiated]
,r.[CreatedByEdi]
,[DeliveryAddressHumanReadableId]
,[CustomerArtNo]
,[TotalPrice]
,r.[ArticleAlias]
FROM [order].[Release] (nolock) as r
left join
[order].LineItem as x on
r.LineItemId = x.id
left join
[order].Header as h on
x.HeaderId = h.id
--bol stuff
left join
AlplaPROD_test1.dbo.V_LadePlanungenLadeAuftragAbruf (nolock) as zz
on zz.AbrufIdAuftragsAbruf = r.ReleaseNumber
left join
(select * from (SELECT
ROW_NUMBER() OVER (PARTITION BY IdJournal ORDER BY add_date DESC) AS RowNum
,*
FROM [AlplaPROD_test1].[dbo].[T_Lieferungen] (nolock)) x
where RowNum = 1) as ea on
zz.IdLieferschein = ea.IdJournal
where
r.ArticleHumanReadableId in ([articles])
--r.ReleaseNumber = 1452
and r.DeliveryDate between '[startDate]' and '[endDate]'
order by DeliveryDate desc
`;

17
lstV2/server/services/sqlServer/querys/dataMart/forecast.ts Normal file
View File

@@ -0,0 +1,17 @@
export const forecastByAvs = `
SELECT
[DeliveryAddressHumanReadableId]
,[DeliveryAddressDescription]
,[ArticleHumanReadableId]
,[ArticleDescription]
,[QuantityType]
,[CustomerArticleNumber]
,format([RequirementDate],'yyyy-MM-dd') RequirementDate
,[Quantity]
,[TradeUnits]
,[LoadingUnits]
,[ArticleAlias]
FROM [test1_AlplaPROD2.0_Read].[forecast].[Forecast] (nolock)
where ArticleHumanReadableId in ([articles])
`;

11
lstV2/server/services/sqlServer/querys/ocp/getLabel.ts Normal file
View File

@@ -0,0 +1,11 @@
export const getCurrentLabel = `
SELECT FORMAT(Add_Date,'yyyy-MM-dd HH:mm') as PrintTime
,[IdMaschine]
,[LfdNr]
FROM [AlplaPROD_test1].[dbo].[T_EtikettenGedruckt] (nolock)
where IdMaschine = [macId]
and FORMAT(Add_Date,'yyyy-MM-dd HH:mm') like '[time]'
order by Add_Date desc
`;