fix(ocme): corrections to posting data for the response was added

server/services/ocme/controller/postRunningNr.ts

@@ -1,43 +1,76 @@
-import {db} from "../../../../database/dbclient.js";
+import { db } from "../../../../database/dbclient.js";
-import {ocmeData} from "../../../../database/schema/ocme.js";
+import { ocmeData } from "../../../../database/schema/ocme.js";
-import {createSSCC} from "../../../globalUtils/createSSCC.js";
+import { createSSCC } from "../../../globalUtils/createSSCC.js";
-import {createLog} from "../../logger/logger.js";
+import { createLog } from "../../logger/logger.js";
-import {query} from "../../sqlServer/prodSqlServer.js";
+import { query } from "../../sqlServer/prodSqlServer.js";
-import {labelData} from "../../sqlServer/querys/materialHelpers/labelInfo.js";
+import { labelData } from "../../sqlServer/querys/materialHelpers/labelInfo.js";
 
 export const postLabelData = async (data: any) => {
-    // if we have sscc we will do everything here and ignore the rn even it its sent over
+    console.log(data);
-    if (data.sscc && !data.runningNr) {
+    let newData = data;
-        data.runningNr = data.sscc.slice(10, -1);
+    if (Array.isArray(data)) {
+        newData = {
+            sscc: data[1],
+            areaFrom: data[0],
+            completed: true,
+        };
     }
 
-    if (!data.sscc && !data.runningNr) {
+    if (newData.sscc && !newData.runningNr) {
-        // data.runningNr = data.sscc.slice(10, -1);
+        newData.runningNr = newData.sscc.slice(10, -1);
-        return {success: false, message: "Missing data please try again", data: []};
+    }
+    if (!newData.sscc && !newData.runningNr) {
+        return {
+            success: false,
+            message: "Missing data please try again",
+            data: [],
+        };
     }
-
     let label;
-    const filterQuery = labelData.replaceAll("[rn]", data.runningNr);
+    const filterQuery = labelData.replaceAll("[rn]", newData.runningNr);
-
     try {
         label = await query(filterQuery, "Label data");
     } catch (error) {
-        createLog("error", "ocme", "ocme", "There was an error getting the labelData");
+        createLog(
+            "error",
+            "ocme",
+            "ocme",
+            "There was an error getting the labelData"
+        );
     }
     const newPost = {
-        sscc: data.sscc ? data.sscc : await createSSCC(data.runningNr),
+        sscc: newData.sscc ? newData.sscc : await createSSCC(newData.runningNr),
-        runningNr: data.runningNr,
+        runningNr: newData.runningNr,
-        completed: data.completed,
+        completed: newData.completed ? newData.completed : true,
-        lineNum: label[0].machineLocation,
+        lineNum: label[0]?.machineLocation,
-        areaFrom: data.areaFrom,
+        areaFrom: newData.areaFrom,
         pickedUp: false,
     };
-
     try {
-        const enterNewData = await db.insert(ocmeData).values(newPost).returning({sscc: ocmeData.sscc});
+        const enterNewData = await db
-        return {success: true, message: "Data was posted to ocme info", data: enterNewData};
+            .insert(ocmeData)
+            .values(newPost)
+            .returning({
+                sscc: ocmeData.sscc,
+                runningNr: ocmeData.runningNr,
+                areaFrom: ocmeData.areaFrom,
+                lineNum: ocmeData.lineNum,
+                completed: ocmeData.completed,
+                pickedUp: ocmeData.pickedUp,
+            });
+
+        //console.log(enterNewData);
+        return {
+            success: true,
+            message: "Data was posted to ocme info",
+            data: enterNewData,
+        };
     } catch (error) {
-        console.log(error);
+        //console.log(error);
-        return {success: false, message: "Data was posted to ocme info", data: newPost};
+        return {
+            success: false,
+            message: "Data was posted to ocme info",
+            data: [],
+        };
     }
 };

server/services/ocme/route/postRunningNumber.ts

@@ -1,15 +1,18 @@
-import {createRoute, OpenAPIHono, z} from "@hono/zod-openapi";
+import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
-import {getInfo} from "../controller/getInfo.js";
+import { getInfo } from "../controller/getInfo.js";
-import {postLabelData} from "../controller/postRunningNr.js";
+import { postLabelData } from "../controller/postRunningNr.js";
-import {apiHit} from "../../../globalUtils/apiHits.js";
+import { apiHit } from "../../../globalUtils/apiHits.js";
 
 const app = new OpenAPIHono();
 
 const PostRunningNr = z.object({
-    sscc: z.string().optional().openapi({example: "00090103830005710997"}),
+  sscc: z.string().optional().openapi({ example: "00090103830005710997" }),
-    runningNr: z.string().optional().openapi({example: "localhost"}),
+  runningNr: z.string().optional().openapi({ example: "localhost" }),
-    areaFrom: z.string().optional().openapi({example: "The server we are going to connect to"}),
+  areaFrom: z
-    completed: z.boolean().optional().openapi({example: true}),
+    .string()
+    .optional()
+    .openapi({ example: "The server we are going to connect to" }),
+  completed: z.boolean().optional().openapi({ example: true }),
 });
 
 app.openapi(
@@ -17,11 +20,11 @@ app.openapi(
     tags: ["ocme"],
     summary: "Post New running number to be picked up.",
     method: "post",
-        path: "/postrunningnumber",
+    path: "/postRunningNumber",
     request: {
       body: {
         content: {
-                    "application/json": {schema: PostRunningNr},
+          "application/json": { schema: PostRunningNr },
         },
       },
     },
@@ -30,8 +33,8 @@ app.openapi(
         content: {
           "application/json": {
             schema: z.object({
-                            success: z.boolean().openapi({example: true}),
+              success: z.boolean().openapi({ example: true }),
-                            message: z.string().openapi({example: "Starter"}),
+              message: z.string().openapi({ example: "Starter" }),
               // data: z
               // .array(z.object({sscc: z.string().optional()}))
               // .optional()
@@ -45,9 +48,12 @@ app.openapi(
         content: {
           "application/json": {
             schema: z.object({
-                            success: z.boolean().openapi({example: false}),
+              success: z.boolean().openapi({ example: false }),
-                            message: z.string().optional().openapi({example: "Internal Server error"}),
+              message: z
-                            data: z.array(z.object({})).optional().openapi({example: []}),
+                .string()
+                .optional()
+                .openapi({ example: "Internal Server error" }),
+              data: z.array(z.object({})).optional().openapi({ example: [] }),
             }),
           },
         },
@@ -75,11 +81,25 @@ app.openapi(
     // make sure we have a vaid user being accessed thats really logged in
     try {
       const data = await c.req.json();
-            apiHit(c, {endpoint: "api/ocme/postRunningNumber", lastBody: data});
+      apiHit(c, { endpoint: "api/ocme/postRunningNumber", lastBody: data });
       const postPallet = await postLabelData(data);
-            return c.json({success: postPallet.success, message: postPallet.message, data: postPallet.data ?? []}, 200);
+      return c.json(
+        {
+          success: postPallet.success,
+          message: postPallet.message,
+          data: postPallet.data ?? [],
+        },
+        200
+      );
     } catch (error) {
-            return c.json({success: false, message: "There was an error getting ocmeInfo data", data: error}, 400);
+      return c.json(
+        {
+          success: false,
+          message: "There was an error getting ocmeInfo data",
+          data: error,
+        },
+        400
+      );
     }
   }
 );

server/services/ocme/route/postSSCC.ts

@@ -1,15 +1,18 @@
-import {createRoute, OpenAPIHono, z} from "@hono/zod-openapi";
+import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
-import {getInfo} from "../controller/getInfo.js";
+import { getInfo } from "../controller/getInfo.js";
-import {postLabelData} from "../controller/postRunningNr.js";
+import { postLabelData } from "../controller/postRunningNr.js";
-import {apiHit} from "../../../globalUtils/apiHits.js";
+import { apiHit } from "../../../globalUtils/apiHits.js";
 
 const app = new OpenAPIHono();
 
 const PostRunningNr = z.object({
-    sscc: z.string().optional().openapi({example: "00090103830005710997"}),
+  sscc: z.string().optional().openapi({ example: "00090103830005710997" }),
-    runningNr: z.string().optional().openapi({example: "localhost"}),
+  runningNr: z.string().optional().openapi({ example: "localhost" }),
-    areaFrom: z.string().optional().openapi({example: "The server we are going to connect to"}),
+  areaFrom: z
-    completed: z.boolean().optional().openapi({example: true}),
+    .string()
+    .optional()
+    .openapi({ example: "The server we are going to connect to" }),
+  completed: z.boolean().optional().openapi({ example: true }),
 });
 
 app.openapi(
@@ -17,11 +20,11 @@ app.openapi(
     tags: ["ocme"],
     summary: "Post New running number to be picked up.",
     method: "post",
-        path: "/postsscc",
+    path: "/postSSCC",
     request: {
       body: {
         content: {
-                    "application/json": {schema: PostRunningNr},
+          "application/json": { schema: PostRunningNr },
         },
       },
     },
@@ -30,8 +33,8 @@ app.openapi(
         content: {
           "application/json": {
             schema: z.object({
-                            success: z.boolean().openapi({example: true}),
+              success: z.boolean().openapi({ example: true }),
-                            message: z.string().openapi({example: "Starter"}),
+              message: z.string().openapi({ example: "Starter" }),
               // data: z
               // .array(z.object({sscc: z.string().optional()}))
               // .optional()
@@ -45,9 +48,12 @@ app.openapi(
         content: {
           "application/json": {
             schema: z.object({
-                            success: z.boolean().openapi({example: false}),
+              success: z.boolean().openapi({ example: false }),
-                            message: z.string().optional().openapi({example: "Internal Server error"}),
+              message: z
-                            data: z.array(z.object({})).optional().openapi({example: []}),
+                .string()
+                .optional()
+                .openapi({ example: "Internal Server error" }),
+              data: z.array(z.object({})).optional().openapi({ example: [] }),
             }),
           },
         },
@@ -75,11 +81,25 @@ app.openapi(
     // make sure we have a vaid user being accessed thats really logged in
     try {
       const data = await c.req.json();
-            apiHit(c, {endpoint: "api/ocme/postRunningNumber", lastBody: data});
+      apiHit(c, { endpoint: "api/ocme/postRunningNumber", lastBody: data });
       const postPallet = await postLabelData(data);
-            return c.json({success: postPallet.success, message: postPallet.message, data: postPallet.data ?? []}, 200);
+      return c.json(
+        {
+          success: postPallet.success,
+          message: postPallet.message,
+          data: postPallet.data ?? [],
+        },
+        200
+      );
     } catch (error) {
-            return c.json({success: false, message: "There was an error getting ocmeInfo data", data: error}, 400);
+      return c.json(
+        {
+          success: false,
+          message: "There was an error getting ocmeInfo data",
+          data: error,
+        },
+        400
+      );
     }
   }
 );