fix(dock door scanning): correction to how the data is posted
This commit is contained in:
@@ -4,6 +4,7 @@ import { eq } from "drizzle-orm";
|
|||||||
import { db } from "../db/db.controller.js";
|
import { db } from "../db/db.controller.js";
|
||||||
import { dockDoorScans } from "../db/schema/dockdoor.scans.schema.js";
|
import { dockDoorScans } from "../db/schema/dockdoor.scans.schema.js";
|
||||||
import { dockDoorScanners } from "../db/schema/dockdoor.schema.js";
|
import { dockDoorScanners } from "../db/schema/dockdoor.schema.js";
|
||||||
|
import { createLogger } from "../logger/logger.controller.js";
|
||||||
import { emitToRoom } from "../socket.io/roomEmitter.socket.js";
|
import { emitToRoom } from "../socket.io/roomEmitter.socket.js";
|
||||||
import { runProdApi } from "../utils/prodEndpoint.utils.js";
|
import { runProdApi } from "../utils/prodEndpoint.utils.js";
|
||||||
import { returnFunc } from "../utils/returnHelper.utils.js";
|
import { returnFunc } from "../utils/returnHelper.utils.js";
|
||||||
@@ -21,8 +22,8 @@ const postScan = async (data: any) => {
|
|||||||
await db.insert(dockDoorScans).values({
|
await db.insert(dockDoorScans).values({
|
||||||
dockId: data.dockId,
|
dockId: data.dockId,
|
||||||
loadingOrder: data.loadingOrder,
|
loadingOrder: data.loadingOrder,
|
||||||
loadingUnit: data.unit, // can be running number or sscc depending on where it came from
|
loadingUnit: data.loadingUnit.sscc ?? data.loadingUnit.runningNo, // can be running number or sscc depending on where it came from
|
||||||
loadingUnitStatus: data.unitStatus, // TODO: add enums on the status of each load.
|
loadingUnitStatus: data.loadingUnitStatus, // TODO: add enums on the status of each load.
|
||||||
message: data.message, // the response it gave when scanning
|
message: data.message, // the response it gave when scanning
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -31,13 +32,15 @@ const postScan = async (data: any) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const loadUnit = async (data: Data) => {
|
const loadUnit = async (data: Data) => {
|
||||||
|
const log = createLogger({ module: "dockdoor", subModule: "loadunit" });
|
||||||
|
log.info({ stack: data }, "Data Passed over from the scanner.");
|
||||||
// are we even active at this time?
|
// are we even active at this time?
|
||||||
const dockDoorActive = await db.query.settings.findFirst({
|
const dockDoorActive = await db.query.settings.findFirst({
|
||||||
where: (u, { eq }) => eq(u.name, "dockDoorScanning"),
|
where: (u, { eq }) => eq(u.name, "dockDoorScanning"),
|
||||||
});
|
});
|
||||||
|
|
||||||
const unitToScan = data.sscc
|
const unitToScan = data.sscc
|
||||||
? { sscc: data.sscc?.slice(2) }
|
? { sscc: data.sscc !== "noread" ? data.sscc?.slice(2) : data.sscc }
|
||||||
: { runningNo: Number(data.runningNo) };
|
: { runningNo: Number(data.runningNo) };
|
||||||
|
|
||||||
const dock = await db
|
const dock = await db
|
||||||
|
|||||||
Reference in New Issue
Block a user