diff --git a/server/services/ocme/controller/postRunningNr.ts b/server/services/ocme/controller/postRunningNr.ts index 897b2ad..22cfa2a 100644 --- a/server/services/ocme/controller/postRunningNr.ts +++ b/server/services/ocme/controller/postRunningNr.ts @@ -1,43 +1,76 @@ -import {db} from "../../../../database/dbclient.js"; -import {ocmeData} from "../../../../database/schema/ocme.js"; -import {createSSCC} from "../../../globalUtils/createSSCC.js"; -import {createLog} from "../../logger/logger.js"; -import {query} from "../../sqlServer/prodSqlServer.js"; -import {labelData} from "../../sqlServer/querys/materialHelpers/labelInfo.js"; +import { db } from "../../../../database/dbclient.js"; +import { ocmeData } from "../../../../database/schema/ocme.js"; +import { createSSCC } from "../../../globalUtils/createSSCC.js"; +import { createLog } from "../../logger/logger.js"; +import { query } from "../../sqlServer/prodSqlServer.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 - if (data.sscc && !data.runningNr) { - data.runningNr = data.sscc.slice(10, -1); + console.log(data); + let newData = data; + if (Array.isArray(data)) { + newData = { + sscc: data[1], + areaFrom: data[0], + completed: true, + }; } - if (!data.sscc && !data.runningNr) { - // data.runningNr = data.sscc.slice(10, -1); - return {success: false, message: "Missing data please try again", data: []}; + if (newData.sscc && !newData.runningNr) { + newData.runningNr = newData.sscc.slice(10, -1); + } + 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), - runningNr: data.runningNr, - completed: data.completed, - lineNum: label[0].machineLocation, - areaFrom: data.areaFrom, + sscc: newData.sscc ? newData.sscc : await createSSCC(newData.runningNr), + runningNr: newData.runningNr, + completed: newData.completed ? newData.completed : true, + lineNum: label[0]?.machineLocation, + areaFrom: newData.areaFrom, pickedUp: false, }; - try { - const enterNewData = await db.insert(ocmeData).values(newPost).returning({sscc: ocmeData.sscc}); - return {success: true, message: "Data was posted to ocme info", data: enterNewData}; + const enterNewData = await db + .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); - return {success: false, message: "Data was posted to ocme info", data: newPost}; + //console.log(error); + return { + success: false, + message: "Data was posted to ocme info", + data: [], + }; } }; diff --git a/server/services/ocme/route/postRunningNumber.ts b/server/services/ocme/route/postRunningNumber.ts index 1c8721d..4afe104 100644 --- a/server/services/ocme/route/postRunningNumber.ts +++ b/server/services/ocme/route/postRunningNumber.ts @@ -1,86 +1,106 @@ -import {createRoute, OpenAPIHono, z} from "@hono/zod-openapi"; -import {getInfo} from "../controller/getInfo.js"; -import {postLabelData} from "../controller/postRunningNr.js"; -import {apiHit} from "../../../globalUtils/apiHits.js"; +import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi"; +import { getInfo } from "../controller/getInfo.js"; +import { postLabelData } from "../controller/postRunningNr.js"; +import { apiHit } from "../../../globalUtils/apiHits.js"; const app = new OpenAPIHono(); const PostRunningNr = z.object({ - sscc: z.string().optional().openapi({example: "00090103830005710997"}), - runningNr: z.string().optional().openapi({example: "localhost"}), - areaFrom: z.string().optional().openapi({example: "The server we are going to connect to"}), - completed: z.boolean().optional().openapi({example: true}), + sscc: z.string().optional().openapi({ example: "00090103830005710997" }), + runningNr: z.string().optional().openapi({ example: "localhost" }), + areaFrom: z + .string() + .optional() + .openapi({ example: "The server we are going to connect to" }), + completed: z.boolean().optional().openapi({ example: true }), }); app.openapi( - createRoute({ - tags: ["ocme"], - summary: "Post New running number to be picked up.", - method: "post", - path: "/postrunningnumber", - request: { - body: { - content: { - "application/json": {schema: PostRunningNr}, - }, - }, + createRoute({ + tags: ["ocme"], + summary: "Post New running number to be picked up.", + method: "post", + path: "/postRunningNumber", + request: { + body: { + content: { + "application/json": { schema: PostRunningNr }, }, - responses: { - 200: { - content: { - "application/json": { - schema: z.object({ - success: z.boolean().openapi({example: true}), - message: z.string().openapi({example: "Starter"}), - // data: z - // .array(z.object({sscc: z.string().optional()})) - // .optional() - // .openapi({example: []}), - }), - }, - }, - description: "Response message", - }, - 400: { - content: { - "application/json": { - schema: z.object({ - success: z.boolean().openapi({example: false}), - message: z.string().optional().openapi({example: "Internal Server error"}), - data: z.array(z.object({})).optional().openapi({example: []}), - }), - }, - }, - description: "Internal Server Error", - }, - // 401: { - // content: { - // "application/json": { - // schema: z.object({message: z.string().optional().openapi({example: "Unauthenticated"})}), - // }, - // }, - // description: "Unauthorized", - // }, - // 500: { - // content: { - // "application/json": { - // schema: z.object({message: z.string().optional().openapi({example: "Internal Server error"})}), - // }, - // }, - // description: "Internal Server Error", - // }, + }, + }, + responses: { + 200: { + content: { + "application/json": { + schema: z.object({ + success: z.boolean().openapi({ example: true }), + message: z.string().openapi({ example: "Starter" }), + // data: z + // .array(z.object({sscc: z.string().optional()})) + // .optional() + // .openapi({example: []}), + }), + }, }, - }), - async (c) => { - // 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}); - const postPallet = await postLabelData(data); - 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); - } + description: "Response message", + }, + 400: { + content: { + "application/json": { + schema: z.object({ + success: z.boolean().openapi({ example: false }), + message: z + .string() + .optional() + .openapi({ example: "Internal Server error" }), + data: z.array(z.object({})).optional().openapi({ example: [] }), + }), + }, + }, + description: "Internal Server Error", + }, + // 401: { + // content: { + // "application/json": { + // schema: z.object({message: z.string().optional().openapi({example: "Unauthenticated"})}), + // }, + // }, + // description: "Unauthorized", + // }, + // 500: { + // content: { + // "application/json": { + // schema: z.object({message: z.string().optional().openapi({example: "Internal Server error"})}), + // }, + // }, + // description: "Internal Server Error", + // }, + }, + }), + async (c) => { + // 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 }); + const postPallet = await postLabelData(data); + 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 + ); } + } ); export default app; diff --git a/server/services/ocme/route/postSSCC.ts b/server/services/ocme/route/postSSCC.ts index a049162..7e4ab4b 100644 --- a/server/services/ocme/route/postSSCC.ts +++ b/server/services/ocme/route/postSSCC.ts @@ -1,86 +1,106 @@ -import {createRoute, OpenAPIHono, z} from "@hono/zod-openapi"; -import {getInfo} from "../controller/getInfo.js"; -import {postLabelData} from "../controller/postRunningNr.js"; -import {apiHit} from "../../../globalUtils/apiHits.js"; +import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi"; +import { getInfo } from "../controller/getInfo.js"; +import { postLabelData } from "../controller/postRunningNr.js"; +import { apiHit } from "../../../globalUtils/apiHits.js"; const app = new OpenAPIHono(); const PostRunningNr = z.object({ - sscc: z.string().optional().openapi({example: "00090103830005710997"}), - runningNr: z.string().optional().openapi({example: "localhost"}), - areaFrom: z.string().optional().openapi({example: "The server we are going to connect to"}), - completed: z.boolean().optional().openapi({example: true}), + sscc: z.string().optional().openapi({ example: "00090103830005710997" }), + runningNr: z.string().optional().openapi({ example: "localhost" }), + areaFrom: z + .string() + .optional() + .openapi({ example: "The server we are going to connect to" }), + completed: z.boolean().optional().openapi({ example: true }), }); app.openapi( - createRoute({ - tags: ["ocme"], - summary: "Post New running number to be picked up.", - method: "post", - path: "/postsscc", - request: { - body: { - content: { - "application/json": {schema: PostRunningNr}, - }, - }, + createRoute({ + tags: ["ocme"], + summary: "Post New running number to be picked up.", + method: "post", + path: "/postSSCC", + request: { + body: { + content: { + "application/json": { schema: PostRunningNr }, }, - responses: { - 200: { - content: { - "application/json": { - schema: z.object({ - success: z.boolean().openapi({example: true}), - message: z.string().openapi({example: "Starter"}), - // data: z - // .array(z.object({sscc: z.string().optional()})) - // .optional() - // .openapi({example: []}), - }), - }, - }, - description: "Response message", - }, - 400: { - content: { - "application/json": { - schema: z.object({ - success: z.boolean().openapi({example: false}), - message: z.string().optional().openapi({example: "Internal Server error"}), - data: z.array(z.object({})).optional().openapi({example: []}), - }), - }, - }, - description: "Internal Server Error", - }, - // 401: { - // content: { - // "application/json": { - // schema: z.object({message: z.string().optional().openapi({example: "Unauthenticated"})}), - // }, - // }, - // description: "Unauthorized", - // }, - // 500: { - // content: { - // "application/json": { - // schema: z.object({message: z.string().optional().openapi({example: "Internal Server error"})}), - // }, - // }, - // description: "Internal Server Error", - // }, + }, + }, + responses: { + 200: { + content: { + "application/json": { + schema: z.object({ + success: z.boolean().openapi({ example: true }), + message: z.string().openapi({ example: "Starter" }), + // data: z + // .array(z.object({sscc: z.string().optional()})) + // .optional() + // .openapi({example: []}), + }), + }, }, - }), - async (c) => { - // 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}); - const postPallet = await postLabelData(data); - 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); - } + description: "Response message", + }, + 400: { + content: { + "application/json": { + schema: z.object({ + success: z.boolean().openapi({ example: false }), + message: z + .string() + .optional() + .openapi({ example: "Internal Server error" }), + data: z.array(z.object({})).optional().openapi({ example: [] }), + }), + }, + }, + description: "Internal Server Error", + }, + // 401: { + // content: { + // "application/json": { + // schema: z.object({message: z.string().optional().openapi({example: "Unauthenticated"})}), + // }, + // }, + // description: "Unauthorized", + // }, + // 500: { + // content: { + // "application/json": { + // schema: z.object({message: z.string().optional().openapi({example: "Internal Server error"})}), + // }, + // }, + // description: "Internal Server Error", + // }, + }, + }), + async (c) => { + // 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 }); + const postPallet = await postLabelData(data); + 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 + ); } + } ); export default app;