feat(labeling): added printers and machine and other data for preprinting
This commit is contained in:
@@ -8,10 +8,16 @@
|
||||
* layout
|
||||
*/
|
||||
|
||||
import { eq } from "drizzle-orm";
|
||||
import type { Logger } from "pino";
|
||||
import { db } from "../../../../pkg/db/db.js";
|
||||
import { printers } from "../../../../pkg/db/schema/printers.js";
|
||||
import { prodlabels } from "../../../../pkg/db/schema/prodLabels.js";
|
||||
import { createLogger } from "../../../../pkg/logger/logger.js";
|
||||
import { delay } from "../../../../pkg/utils/delay.js";
|
||||
import { getMachineData } from "../../../../pkg/utils/getMachineInfo.js";
|
||||
import { prodEndpoint } from "../../../../pkg/utils/prodEndpoint.js";
|
||||
import type { returnFunc } from "../../../../pkg/utils/return.js";
|
||||
import { tryCatch } from "../../../../pkg/utils/tryCatch.js";
|
||||
|
||||
export type Preprint = {
|
||||
scannerId: number;
|
||||
@@ -23,7 +29,49 @@ export type Preprint = {
|
||||
qtyToPrint: number;
|
||||
};
|
||||
|
||||
export const preprintLabels = async (preprint: Preprint) => {
|
||||
const addProdLabel = async (
|
||||
preprint: Preprint,
|
||||
runningNr: number,
|
||||
username: string,
|
||||
log: Logger,
|
||||
) => {
|
||||
// get the printers
|
||||
const printerName = await db
|
||||
.select()
|
||||
.from(printers)
|
||||
.where(eq(printers.humanReadableId, preprint.printerId.toString()));
|
||||
|
||||
// get the machine data
|
||||
const { data, error } = await tryCatch(getMachineData("all"));
|
||||
|
||||
if (error) {
|
||||
log.error({ error: error }, "There was an error getting machine data");
|
||||
}
|
||||
|
||||
const lineNumber = data.filter(
|
||||
(n: any) => n.HumanReadableId === preprint.machineId,
|
||||
);
|
||||
|
||||
const { data: prodLabel, error: prodLabelError } = await tryCatch(
|
||||
db
|
||||
.insert(prodlabels)
|
||||
.values({
|
||||
printerID: preprint.printerId,
|
||||
printerName: printerName[0]?.name,
|
||||
runningNr: runningNr,
|
||||
status: "printed",
|
||||
line: lineNumber[0]?.Location || 0,
|
||||
add_user: username,
|
||||
})
|
||||
.onConflictDoNothing(),
|
||||
);
|
||||
|
||||
if (prodLabelError) {
|
||||
log.error({ error: error }, "Error adding the label");
|
||||
}
|
||||
};
|
||||
|
||||
export const preprintLabels = async (preprint: Preprint, username?: string) => {
|
||||
const log = createLogger({
|
||||
module: "logistics",
|
||||
subModule: "preprint",
|
||||
@@ -67,6 +115,13 @@ export const preprintLabels = async (preprint: Preprint) => {
|
||||
};
|
||||
}
|
||||
labelsPrinted.push(parseInt(labels?.data.SSCC.slice(10, -1)));
|
||||
// add the label to our label db for tracking purposes
|
||||
addProdLabel(
|
||||
preprint,
|
||||
parseInt(labels?.data.SSCC.slice(10, -1)),
|
||||
username || "lst",
|
||||
log,
|
||||
);
|
||||
log.info(
|
||||
{},
|
||||
`Label just created ${parseInt(labels?.data.SSCC.slice(10, -1))} and printed, remaining to print ${preprint.qtyToPrint - x}`,
|
||||
@@ -118,6 +173,12 @@ export const preprintLabels = async (preprint: Preprint) => {
|
||||
}
|
||||
|
||||
labelsPrinted.push(parseInt(labels.data.SSCC.slice(10, -1)));
|
||||
addProdLabel(
|
||||
preprint,
|
||||
parseInt(labels?.data.SSCC.slice(10, -1)),
|
||||
username || "lst",
|
||||
log,
|
||||
);
|
||||
log.info(
|
||||
{},
|
||||
`Label just created ${parseInt(labels.data.SSCC.slice(10, -1))} and printed`,
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
import { Router } from "express";
|
||||
import { requireAuth } from "../../../../pkg/middleware/authMiddleware.js";
|
||||
import preprint from "./perprint.js";
|
||||
|
||||
const router = Router();
|
||||
|
||||
router.use("/", preprint);
|
||||
router.use("/", requireAuth(), preprint);
|
||||
|
||||
export default router;
|
||||
|
||||
@@ -17,7 +17,7 @@ const router = Router();
|
||||
|
||||
router.post("/preprint", async (req: Request, res: Response) => {
|
||||
const parsed = Preprint.safeParse(req.body);
|
||||
const print = await preprintLabels(req.body);
|
||||
const print = await preprintLabels(req.body, req.user?.username || "");
|
||||
|
||||
res
|
||||
.status(200)
|
||||
|
||||
@@ -1 +1,7 @@
|
||||
export const printers = () => {};
|
||||
import { updatePrinters } from "./updatePrinters.js";
|
||||
|
||||
export const printers = () => {
|
||||
setTimeout(() => {
|
||||
updatePrinters();
|
||||
}, 10 * 1000);
|
||||
};
|
||||
|
||||
73
app/src/internal/ocp/printers/updatePrinters.ts
Normal file
73
app/src/internal/ocp/printers/updatePrinters.ts
Normal file
@@ -0,0 +1,73 @@
|
||||
import { sql } from "drizzle-orm";
|
||||
import { db } from "../../../pkg/db/db.js";
|
||||
import { printers } from "../../../pkg/db/schema/printers.js";
|
||||
import { createLogger } from "../../../pkg/logger/logger.js";
|
||||
import { prodEndpoint } from "../../../pkg/utils/prodEndpoint.js";
|
||||
import { tryCatch } from "../../../pkg/utils/tryCatch.js";
|
||||
|
||||
export const updatePrinters = async () => {
|
||||
const log = createLogger({
|
||||
module: "ocp",
|
||||
subModule: "update Printers",
|
||||
});
|
||||
const currentTime = new Date(Date.now());
|
||||
|
||||
const { data: prodPrinters, error: prodError } = await tryCatch(
|
||||
prodEndpoint("GET", "/public/v1.0/Administration/Printers"),
|
||||
);
|
||||
|
||||
if (prodError || prodPrinters?.data.length > 10000) {
|
||||
//console.log(prodError);
|
||||
return {
|
||||
success: false,
|
||||
message: "there was an error getting the printers.",
|
||||
data: prodError,
|
||||
};
|
||||
}
|
||||
|
||||
// do the printer update into our db
|
||||
const prodPrinterInfo = prodPrinters?.data;
|
||||
|
||||
for (let i = 0; i < prodPrinterInfo.length; i++) {
|
||||
const printerStuff: any = {
|
||||
humanReadableId: prodPrinterInfo[i].humanReadableId,
|
||||
name: prodPrinterInfo[i].name,
|
||||
ipAddress: prodPrinterInfo[i].ipAddress,
|
||||
port: prodPrinterInfo[i].port,
|
||||
remark: prodPrinterInfo[i].remark,
|
||||
processes: prodPrinterInfo[i].processes,
|
||||
};
|
||||
const { data, error } = await tryCatch(
|
||||
db
|
||||
.insert(printers)
|
||||
.values(printerStuff)
|
||||
.onConflictDoUpdate({
|
||||
target: printers.humanReadableId,
|
||||
set: {
|
||||
//humanReadableId: prodPrinterInfo[i].humanReadableId,
|
||||
name: prodPrinterInfo[i].name,
|
||||
ipAddress: prodPrinterInfo[i].ipAddress,
|
||||
port: prodPrinterInfo[i].port,
|
||||
remark: prodPrinterInfo[i].remark,
|
||||
processes: prodPrinterInfo[i].processes,
|
||||
upd_date: sql`NOW()`,
|
||||
//printDelay: "90", // need to remove in a couple weeks
|
||||
},
|
||||
}),
|
||||
);
|
||||
|
||||
if (error) {
|
||||
log.error(
|
||||
{ error: error },
|
||||
`${
|
||||
prodPrinterInfo[i].name
|
||||
} encoutered and error adding/updating ${JSON.stringify(error)}`,
|
||||
);
|
||||
}
|
||||
log.debug({}, `${prodPrinterInfo[i].name} were just added/updated.`);
|
||||
}
|
||||
|
||||
//await assignedPrinters();
|
||||
|
||||
return { success: true, message: "Printers were just added or updated." };
|
||||
};
|
||||
Reference in New Issue
Block a user