refactor(dockscanning): more work on the dock door scanning

ref #12

backend/db/schema/dockdoor.scans.schema.ts

@@ -0,0 +1,23 @@
+import { pgTable, text, timestamp, uuid } from "drizzle-orm/pg-core";
+import { createInsertSchema, createSelectSchema } from "drizzle-zod";
+import type { z } from "zod";
+
+export const dockDoorScans = pgTable("dock_door_scans", {
+	id: uuid("id").defaultRandom().primaryKey(),
+	dockId: text("dock_id").notNull(),
+	loadingOrder: text("loading_order").notNull(),
+	loadingUnit: text("loading_Unit").unique(), // can be running number or sscc depending on where it came from
+	loadingUnitStatus: text("loading_unit_status").default("loaded"), // TODO: add enums on the status of each load.
+	message: text("message"), // the response it gave when scanning
+	status: text("status").default("active"), // TODO: add in enums for this
+	add_date: timestamp("add_date", { withTimezone: true }).defaultNow(),
+	add_user: text("add_user").default("lst-system"),
+	upd_date: timestamp("upd_date", { withTimezone: true }).defaultNow(),
+	upd_user: text("upd_user").default("lst-system"),
+});
+
+export const dockDoorScansSchema = createSelectSchema(dockDoorScans);
+export const newDockDoorScansSchema = createInsertSchema(dockDoorScans);
+
+export type DockDoorScans = z.infer<typeof dockDoorScansSchema>;
+export type NewDockDoorScans = z.infer<typeof newDockDoorScansSchema>;

backend/dockdoorScanning/dockdoor.closeLoadingOrder.route.ts

@@ -2,7 +2,9 @@ import { eq, sql } from "drizzle-orm";
 import { Router } from "express";
 import z from "zod";
 import { db } from "../db/db.controller.js";
+import { dockDoorScans } from "../db/schema/dockdoor.scans.schema.js";
 import { dockDoorScanners } from "../db/schema/dockdoor.schema.js";
+import { runProdApi } from "../utils/prodEndpoint.utils.js";
 import { apiReturn } from "../utils/returnHelper.utils.js";
 import { tryCatch } from "../utils/trycatch.utils.js";
 
@@ -14,20 +16,52 @@ const endLoading = z.object({
 });
 
 r.post("/", async (req, res) => {
-	// close the loading order
-
-	// clear the loading order off the dock
+	// TODO: setup the emitter to just emit the data when we post to the db
 
 	try {
 		const validated = endLoading.parse(req.body);
 
+		const orders = (await runProdApi({
+			method: "post",
+			endpoint: `/public/v1.0/OutboundDeliveries/LoadingOrders/${req.body.loadingOrder}/Finish`,
+			data: [
+				{
+					printDeliveryDocuments: true,
+				},
+			],
+		})) as any;
+
+		if (orders?.data.errors) {
+			console.log(orders.data.errors);
+			return apiReturn(res, {
+				success: false,
+				level: "error",
+				module: "dockdoor",
+				subModule: "loadingOrder",
+				message: `Failed to finish the order.`,
+				data: (orders.data.errors as any) ?? [],
+				status: 400,
+			});
+		}
+
+		await tryCatch(
+			db
+				.update(dockDoorScans)
+				.set({
+					upd_date: sql`NOW()`,
+					upd_user: req.user?.username ?? "lst-dock-system",
+				})
+				.where(eq(dockDoorScanners.currentLoadingOrder, validated.loadingOrder))
+				.returning(),
+		);
+
 		const { data, error } = await tryCatch(
 			db
 				.update(dockDoorScanners)
 				.set({
 					currentLoadingOrder: "",
 					upd_date: sql`NOW()`,
-					upd_user: req.user?.username,
+					upd_user: req.user?.username ?? "lst-dock-system",
 				})
 				.where(eq(dockDoorScanners.dockId, validated.dockId))
 				.returning(),
@@ -46,13 +80,15 @@ r.post("/", async (req, res) => {
 		}
 
 		return apiReturn(res, {
-			success: true,
-			level: "info",
+			success: orders.data.errors ? false : true,
+			level: orders.data.errors ? "error" : "info",
 			module: "dockdoor",
 			subModule: "loadingOrder",
-			message: `Loading order ${validated.loadingOrder} was just closed.`,
+			message: orders.data.errors
+				? `Loading order was cleared but encountered an error: \n${orders.data.errors[0].message} \nPossible reason for this is the loading order was completed via scanner or other means.`
+				: `Loading order ${validated.loadingOrder} was just closed.`,
 			data: data ?? [],
-			status: 200,
+			status: orders.data.errors ? 400 : 200,
 		});
 	} catch (error) {
 		return apiReturn(res, {
@@ -60,7 +96,7 @@ r.post("/", async (req, res) => {
 			level: "error",
 			module: "dockdoor",
 			subModule: "loadingOrder",
-			message: `Failed to start loading order.`,
+			message: `Failed to Close loading order.`,
 			data: (error as any) ?? [],
 			status: 400,
 		});

backend/dockdoorScanning/dockdoor.loadUnits.ts

@@ -2,6 +2,7 @@
 
 import { eq } from "drizzle-orm";
 import { db } from "../db/db.controller.js";
+import { dockDoorScans } from "../db/schema/dockdoor.scans.schema.js";
 import { dockDoorScanners } from "../db/schema/dockdoor.schema.js";
 import { emitToRoom } from "../socket.io/roomEmitter.socket.js";
 import { runProdApi } from "../utils/prodEndpoint.utils.js";
@@ -15,12 +16,35 @@ type Data = {
 	runningNo?: string;
 };
 
+const postScan = async (data: any) => {
+	try {
+		await db.insert(dockDoorScans).values({
+			dockId: data.dockId,
+			loadingOrder: data.loadingOrder,
+			loadingUnit: data.unit, // can be running number or sscc depending on where it came from
+			loadingUnitStatus: data.unitStatus, // TODO: add enums on the status of each load.
+			message: data.message, // the response it gave when scanning
+		});
+	} catch (error) {
+		console.log("Error: ", error);
+	}
+};
+
 const loadUnit = async (data: Data) => {
 	// are we even active at this time?
 	const dockDoorActive = await db.query.settings.findFirst({
 		where: (u, { eq }) => eq(u.name, "dockDoorScanning"),
 	});
 
+	const unitToScan = data.sscc
+		? { sscc: data.sscc?.slice(2) }
+		: { runningNo: Number(data.runningNo) };
+
+	const dock = await db
+		.select()
+		.from(dockDoorScanners)
+		.where(eq(dockDoorScanners.dockId, data.dockId as string));
+
 	if (!dockDoorActive?.active) {
 		return returnFunc({
 			success: false,
@@ -33,29 +57,18 @@ const loadUnit = async (data: Data) => {
 			room: "",
 		});
 	}
-	// check if its a valids an sscc
-
-	if (data.sscc === "noread") {
-		return returnFunc({
-			success: false,
-			level: "error",
-			module: "dockdoor",
-			subModule: "loadUnit",
-			message:
-				"Failed to load the unit to the truck, there was no pallet read.",
-			data: [],
-			notify: false,
-			room: `dockDoorLoading:${data.dockId}`,
-		});
-	}
 
 	// check if we currently have a loading order attached to the dock door.
-	const dock = await db
-		.select()
-		.from(dockDoorScanners)
-		.where(eq(dockDoorScanners.dockId, data.dockId as string));
 
 	if (dock[0]?.currentLoadingOrder === "") {
+		postScan({
+			dockId: data.dockId,
+			loadingOrder: dock[0]?.currentLoadingOrder,
+			loadingUnit: unitToScan,
+			loadingUnitStatus: "notLoaded",
+			message:
+				"There are know current active loading orders please start one and try again.",
+		});
 		return returnFunc({
 			success: true,
 			level: "error",
@@ -68,6 +81,30 @@ const loadUnit = async (data: Data) => {
 			room: `dockDoorLoading:${data.dockId}`,
 		});
 	}
+	// check if its a valids an sscc
+
+	if (data.sscc === "noread") {
+		postScan({
+			dockId: data.dockId,
+			loadingOrder: dock[0]?.currentLoadingOrder,
+			loadingUnit: unitToScan,
+			loadingUnitStatus: "noread",
+			message:
+				"Failed to load the unit to the truck, there was no pallet read.",
+		});
+
+		return returnFunc({
+			success: false,
+			level: "error",
+			module: "dockdoor",
+			subModule: "loadUnit",
+			message:
+				"Failed to load the unit to the truck, there was no pallet read.",
+			data: [],
+			notify: false,
+			room: `dockDoorLoading:${data.dockId}`,
+		});
+	}
 
 	// TODO: pallet validation, check if we are on hold, then check if we have been in the staging warehouse for more than x time.
 
@@ -77,10 +114,6 @@ const loadUnit = async (data: Data) => {
 
 	// add the loading units
 	try {
-		const unitToScan = data.sscc
-			? { sscc: data.sscc?.slice(2) }
-			: { runningNo: Number(data.runningNo) };
-
 		const prod = (await runProdApi({
 			method: "post",
 			endpoint: `/public/v1.0/OutboundDeliveries/LoadingOrders/${dock[0]?.currentLoadingOrder}/LoadUnit`,
@@ -90,6 +123,13 @@ const loadUnit = async (data: Data) => {
 		//emitToRoom(`dockDoorLoading:${data.dockId}`, prod?.data ?? []);
 
 		if (!prod?.success) {
+			postScan({
+				dockId: data.dockId,
+				loadingOrder: dock[0]?.currentLoadingOrder,
+				loadingUnit: unitToScan,
+				loadingUnitStatus: "notLoaded",
+				message: prod?.data.errors[0].message,
+			});
 			emitToRoom(`dockDoorLoading:${data.dockId}`, prod?.data.errors[0]);
 			return returnFunc({
 				success: false,
@@ -107,6 +147,14 @@ const loadUnit = async (data: Data) => {
 				data: prod.data,
 				code: 0,
 			};
+
+			postScan({
+				dockId: data.dockId,
+				loadingOrder: dock[0]?.currentLoadingOrder,
+				loadingUnit: unitToScan,
+				loadingUnitStatus: "loaded",
+				message: emitData.message,
+			});
 			emitToRoom(`dockDoorLoading:${data.dockId}`, emitData as any);
 			return returnFunc({
 				success: true,

backend/notification/notification.update.route.ts

@@ -22,7 +22,6 @@ r.patch(
 	requirePermission({ notifications: ["update"] }),
 	async (req, res: Response) => {
 		const { id } = req.params;
-
 		try {
 			const validated = updateNote.parse(req.body);
 
@@ -37,6 +36,7 @@ r.patch(
 			await modifiedNotification(id as string);
 
 			if (nError) {
+
 				return apiReturn(res, {
 					success: false,
 					level: "error",
@@ -58,6 +58,7 @@ r.patch(
 				status: 200,
 			});
 		} catch (err) {
+
 			if (err instanceof z.ZodError) {
 				const flattened = z.flattenError(err);
 				// return res.status(400).json({

backend/socket.io/roomDefinitions.socket.ts

@@ -1,7 +1,8 @@
-import { desc } from "drizzle-orm";
+import { desc, eq } from "drizzle-orm";
 import { db } from "../db/db.controller.js";
 import { logs } from "../db/schema/logs.schema.js";
 import { ppoRun } from "../warehousing/warehousing.ppooMonitor.js";
+import { dockDoorScans } from "../db/schema/dockdoor.scans.schema.js";
 
 type RoomDefinition<T = unknown> = {
 	seed: (limit: number) => Promise<T[]>;
@@ -103,7 +104,18 @@ export const roomDefinition: Record<RoomId, RoomDefinition> = {
 	"dockDoorLoading:2": {
 		seed: async (limit) => {
 			console.log(limit);
-			return [];
+			try {
+				const rows = await db
+					.select()
+					.from(dockDoorScans).where(eq(dockDoorScans.status, "active"))
+					.orderBy(desc(dockDoorScans.upd_date))
+					.limit(limit);
+
+				return rows; //.reverse();
+			} catch (e) {
+				console.error("Failed to seed logs:", e);
+				return [];
+			}
 		},
 	},
 };