refactor(ocme): corrections to endpoints to work with ocnme as intneeded

server/scripts/updateServers.ts

@@ -10,7 +10,10 @@ type UpdateServerResponse = {
   message: string;
 };
 
-export const updateServer = async (devApp: string, server: string | null): Promise<UpdateServerResponse> => {
+export const updateServer = async (
+  devApp: string,
+  server: string | null
+): Promise<UpdateServerResponse> => {
   const app = await getAppInfo(devApp);
   const serverInfo = await db
     .select()
@@ -26,7 +29,8 @@ export const updateServer = async (devApp: string, server: string | null): Promi
     );
     return {
       success: false,
-            message: "Looks like you are missing the plant token or have entered an incorrect one please try again.",
+      message:
+        "Looks like you are missing the plant token or have entered an incorrect one please try again.",
     };
   }
 
@@ -156,7 +160,12 @@ export const updateServer = async (devApp: string, server: string | null): Promi
 export async function processAllServers(devApp: string) {
   const servers = await db.select().from(serverData);
 
-    createLog("info", "lst", "serverUpdater", `Running the update on all servers`);
+  createLog(
+    "info",
+    "lst",
+    "serverUpdater",
+    `Running the update on all servers`
+  );
   let count = 1;
   for (const server of servers) {
     try {
@@ -166,7 +175,12 @@ export async function processAllServers(devApp: string) {
 
       //return {success: true, message: `${server.sName} was updated.`, data: updateToServer};
     } catch (error: any) {
-            createLog("info", "lst", "serverUpdater", `Error updating ${server.sName}: ${error.message}`);
+      createLog(
+        "info",
+        "lst",
+        "serverUpdater",
+        `Error updating ${server.sName}: ${error.message}`
+      );
       //return {success: false, message: `Error updating ${server.sName}: ${error.message}`};
     }
   }

server/scripts/zipUpBuild.ts

@@ -99,7 +99,7 @@ const updateBuildNumber = (appLock: string) => {
       // Auto-commit changes
       execSync("git add package.json");
       execSync(
-        `git commit -m "build: bump build number to ${pkgJson.admConfig.build}"`
+        `git commit -m "chore(release): bump build number to ${pkgJson.admConfig.build}"`
       );
     } else {
       createLog(

server/services/ocme/controller/cycleCount/ocmeInventory.ts

@@ -3,9 +3,14 @@ import axios from "axios";
 export const ocmeInv = async (data: any) => {
     try {
         const res = await axios.post(
-            "http://usday1vms010:3250/api/v1/getLaneData",
+            "http://usday1vms010:3250/api/v1/getlanedata",
             { lane: data.lane, laneType: data.laneType },
-            {headers: {"Content-Type": "application/json", Connection: "keep-alive"}}
+            {
+                headers: {
+                    "Content-Type": "application/json",
+                    Connection: "keep-alive",
+                },
+            }
         );
         // console.log(res.data.data);
 

server/services/ocme/controller/getInfo.ts

@@ -7,17 +7,31 @@ import {eq} from "drizzle-orm";
 export const getInfo = async () => {
   let ocmeInfo: any = [];
   try {
-        ocmeInfo = await db.select().from(ocmeData).where(eq(ocmeData.pickedUp, false));
+    ocmeInfo = await db
+      .select()
+      .from(ocmeData)
+      .where(eq(ocmeData.pickedUp, false));
 
     // add in the time difference
     ocmeInfo = ocmeInfo.map((o: any) => {
       const now = new Date(Date.now());
-            const diff = differenceInMinutes(now, o.add_Date!);
+      //const strippedDate = o.add_Date.replace("Z", "");
+      const diff = differenceInMinutes(now, o.add_Date);
       return { ...o, waitingFor: diff };
     });
-        createLog("info", "ocme", "ocme", `There are ${ocmeInfo.length} pallet(s) to be picked up.`);
+    createLog(
+      "info",
+      "ocme",
+      "ocme",
+      `There are ${ocmeInfo.length} pallet(s) to be picked up.`
+    );
   } catch (error) {
-        createLog("error", "ocme", "ocme", "There was an error trying to retrive the ocmeInfo.");
+    createLog(
+      "error",
+      "ocme",
+      "ocme",
+      "There was an error trying to retrive the ocmeInfo."
+    );
     throw Error("There was an error trying to retrive the.");
   }
 

server/services/ocme/ocmeService.ts

@@ -11,10 +11,19 @@ import {serve} from "@hono/node-server";
 import { createLog } from "../logger/logger.js";
 import { db } from "../../../database/dbclient.js";
 import { settings } from "../../../database/schema/settings.js";
+import manualTrigger from "./route/triggerCamera.js";
 
 const app = new OpenAPIHono();
 const port = process.env.OCME_PORT;
-const routes = [getInfo, postRunningNr, postsscc, pickedup, getShipments, cycleCount] as const;
+const routes = [
+  getInfo,
+  postRunningNr,
+  postsscc,
+  pickedup,
+  getShipments,
+  cycleCount,
+  manualTrigger,
+] as const;
 const setting = await db.select().from(settings);
 
 const isActive = setting.filter((n) => n.name === "ocmeService");
@@ -23,7 +32,10 @@ const appRoutes = routes.forEach((route) => {
 });
 
 app.all("/api/v1/*", (c) => {
-    return c.json({success: false, message: "you have encounted an ocme route that dose not exist."});
+  return c.json({
+    success: false,
+    message: "you have encounted an ocme route that dose not exist.",
+  });
 });
 if (port && isActive[0]?.value === "1") {
   serve(
@@ -33,7 +45,12 @@ if (port && isActive[0]?.value === "1") {
       hostname: "0.0.0.0",
     },
     (info) => {
-            createLog("info", "LST", "server", `Ocme section is listening on http://${info.address}:${info.port}`);
+      createLog(
+        "info",
+        "LST",
+        "server",
+        `Ocme section is listening on http://${info.address}:${info.port}`
+      );
     }
   );
 }

server/services/ocme/route/cycleCount.ts

@@ -18,7 +18,7 @@ app.openapi(
     tags: ["ocme"],
     summary: "Cycle counts a lane based on the lane Alias",
     method: "post",
-        path: "/cyclecount",
+    path: "/cycleCount",
     middleware: authMiddleware,
     request: {
       body: {
@@ -48,10 +48,21 @@ app.openapi(
 
     try {
       const cycleData = await cycleCount(body, user);
-            return c.json({success: true, message: `${body.lane} was just cycle counted.`, data: cycleData}, 200);
+      return c.json(
+        {
+          success: true,
+          message: `${body.lane} was just cycle counted.`,
+          data: cycleData,
+        },
+        200
+      );
     } catch (error) {
       return c.json(
-                {success: false, message: `There was an error cycle counting ${body.lane}`, data: error},
+        {
+          success: false,
+          message: `There was an error cycle counting ${body.lane}`,
+          data: error,
+        },
         400
       );
     }

server/services/ocme/route/getShipmentPallets.ts

@@ -13,7 +13,7 @@ app.openapi(
     tags: ["ocme"],
     summary: "Post New running number to be picked up.",
     method: "post",
-        path: "/getshipmentpallets",
+    path: "/GetShipmentPallets",
     request: {
       body: {
         content: {
@@ -42,7 +42,10 @@ app.openapi(
           "application/json": {
             schema: z.object({
               success: z.boolean().openapi({ example: false }),
-                            message: z.string().optional().openapi({example: "Internal Server error"}),
+              message: z
+                .string()
+                .optional()
+                .openapi({ example: "Internal Server error" }),
               data: z.array(z.object({})).optional().openapi({ example: [] }),
             }),
           },
@@ -73,9 +76,15 @@ app.openapi(
       const data = await c.req.json();
       apiHit(c, { endpoint: "api/ocme/getshipmentpallets", lastBody: data });
 
+      console.log;
+
       if (!data.shipmentID) {
         return c.json(
-                    {success: false, message: "You are missing the shipment id please try again.", data: []},
+          {
+            success: false,
+            message: "You are missing the shipment id please try again.",
+            data: [],
+          },
           400
         );
       }
@@ -83,11 +92,22 @@ app.openapi(
       const shiptmentData = await getShipmentPallets(data.shipmentID);
 
       return c.json(
-                {success: shiptmentData.success, message: shiptmentData.message, data: shiptmentData.data ?? []},
+        {
+          success: shiptmentData.success,
+          message: shiptmentData.message,
+          data: shiptmentData.data ?? [],
+        },
         200
       );
     } catch (error) {
-            return c.json({success: false, message: "There was an error getting the shipment data.", data: error}, 400);
+      return c.json(
+        {
+          success: false,
+          message: "There was an error getting the shipment data.",
+          data: error,
+        },
+        400
+      );
     }
   }
 );

server/services/rfid/controller/stations/wrappers.ts

@@ -18,18 +18,28 @@ export const wrapperStuff = async (tagData: TagData[]) => {
     tagStuff(tagData);
   } else {
     const tagdata = await tagStuff(tagData);
+    if (!tagData) {
+      createLog("error", "rfid", "rfid", `No tagData was grabbed.`);
+    }
 
     /**
      * we want to make sure this pallet came from a line as its last spot if not we need to have a manual check.
      */
-        const station3 = tagdata.some((n: any) => n.lastareaIn.includes("line3"));
+    if (
+      !Array.isArray(tagdata) &&
+      tagdata?.some((n: any) => n.lastareaIn.includes("line3"))
+    ) {
+      createLog("error", "rfid", "rfid", `Data passed over is not an array.`);
+      return;
+    }
+    const station3 = tagdata; //?.some((n: any) => n.lastareaIn.includes("line3"));
 
     if (!station3) {
       createLog(
         "error",
         "rfid",
         "rfid",
-                `${tagdata.tag}, Did not come from a line please check the pallet and manually print the label.`
+        `${tagdata[0].tag}, Did not come from a line please check the pallet and manually print the label.`
       );
 
       // when we manually run again we want to make sure we read from the 3rd antenna this way we do not get the wrong info.
@@ -38,9 +48,19 @@ export const wrapperStuff = async (tagData: TagData[]) => {
 
     // check if a running number exists
     if (station3.runningNumber) {
-            createLog("info", "rfid", "rfid", `Reprint label ${station3.runningNumber}`);
+      createLog(
+        "info",
+        "rfid",
+        "rfid",
+        `Reprint label ${station3.runningNumber}`
+      );
     } else {
-            createLog("info", "rfid", "rfid", `A new labels will be created and linked to this ${tagdata.tag} tag`);
+      createLog(
+        "info",
+        "rfid",
+        "rfid",
+        `A new labels will be created and linked to this ${tagdata.tag} tag`
+      );
     }
   }
 };