refactor(quality): added a check to monior #7 as well

LogisticsSupportTool_API_DOCS/LstV2/ocp/Logs.bru

@@ -0,0 +1,15 @@
+meta {
+  name: Logs
+  type: http
+  seq: 2
+}
+
+get {
+  url: 
+  body: none
+  auth: inherit
+}
+
+settings {
+  encodeUrl: true
+}

LogisticsSupportTool_API_DOCS/environments/lst.bru

@@ -1,5 +1,5 @@
 vars {
-  url: https://usflo1prod.alpla.net
+  url: https://usday1prod.alpla.net
   session_cookie: 
   urlv2: http://usbow1vms006:3000
   jwtV2: 

app/src/pkg/prodSql/prodQuery.ts

@@ -1,6 +1,12 @@
-import { returnFunc } from "../utils/return.js";
-import { connected, pool } from "./prodSqlConnect.js";
 import { validateEnv } from "../utils/envValidator.js";
+import { returnFunc } from "../utils/return.js";
+import {
+	closePool,
+	connected,
+	pool,
+	reconnecting,
+	reconnectToSql,
+} from "./prodSqlConnect.js";
 
 const env = validateEnv(process.env);
 /**
@@ -12,6 +18,19 @@ const env = validateEnv(process.env);
  */
 export async function prodQuery(queryToRun: string, name: string) {
 	if (!connected) {
+		reconnectToSql();
+
+		if (reconnecting) {
+			return returnFunc({
+				success: false,
+				module: "prodSql",
+				subModule: "query",
+				level: "error",
+				message: `The sql ${env.PROD_PLANT_TOKEN} is trying to reconnect already`,
+				notify: false,
+				data: [],
+			});
+		} else {
 			return returnFunc({
 				success: false,
 				module: "prodSql",
@@ -22,6 +41,8 @@ export async function prodQuery(queryToRun: string, name: string) {
 				data: [],
 			});
 		}
+	}
+
 	const query = queryToRun.replaceAll("test1", env.PROD_PLANT_TOKEN);
 	try {
 		const result = await pool.request().query(query);
@@ -33,6 +54,7 @@ export async function prodQuery(queryToRun: string, name: string) {
 	} catch (error: any) {
 		console.log(error);
 		if (error.code === "ETIMEOUT") {
+			closePool();
 			return returnFunc({
 				success: false,
 				module: "prodSql",
@@ -45,6 +67,7 @@ export async function prodQuery(queryToRun: string, name: string) {
 		}
 
 		if (error.code === "EREQUEST") {
+			closePool();
 			return returnFunc({
 				success: false,
 				module: "prodSql",

app/src/pkg/prodSql/prodSqlConnect.ts

@@ -1,15 +1,15 @@
 import sql from "mssql";
-import { checkHostnamePort } from "../utils/checkHostNamePort.js";
-import { sqlConfig } from "./prodSqlConfig.js";
 import { createLogger } from "../logger/logger.js";
-import { returnFunc } from "../utils/return.js";
+import { checkHostnamePort } from "../utils/checkHostNamePort.js";
 import { validateEnv } from "../utils/envValidator.js";
+import { returnFunc } from "../utils/return.js";
+import { sqlConfig } from "./prodSqlConfig.js";
 
 const env = validateEnv(process.env);
 
 export let pool: any;
 export let connected: boolean = false;
-let reconnecting = false;
+export let reconnecting = false;
 
 export const initializeProdPool = async () => {
 	const log = createLogger({ module: "prodSql" });
@@ -41,21 +41,19 @@ export const initializeProdPool = async () => {
 		pool = await sql.connect(sqlConfig);
 
 		log.info(
-            `Connected to ${sqlConfig?.server}, using DB: ${sqlConfig?.database}`
+			`Connected to ${sqlConfig?.server}, using DB: ${sqlConfig?.database}`,
 		);
 		connected = true;
 	} catch (error) {
 		log.fatal(
-            `${JSON.stringify(
+			`${JSON.stringify(error)}, "There was an error connecting to the pool."`,
-                error
-            )}, "There was an error connecting to the pool."`
 		);
 		reconnectToSql();
 		// throw new Error("There was an error closing the sql connection");
 	}
 };
 
-const reconnectToSql = async () => {
+export const reconnectToSql = async () => {
 	const log = createLogger({ module: "prodSql" });
 	if (reconnecting) return;
 	reconnecting = true;
@@ -67,9 +65,7 @@ const reconnectToSql = async () => {
 	while (!connected && attempts < maxAttempts) {
 		attempts++;
 		log.info(
-            `Reconnect attempt ${attempts}/${maxAttempts} in ${
+			`Reconnect attempt ${attempts}/${maxAttempts} in ${delay / 1000}s...`,
-                delay / 1000
-            }s...`
 		);
 
 		await new Promise((res) => setTimeout(res, delay));
@@ -85,15 +81,15 @@ const reconnectToSql = async () => {
 			pool = sql.connect(sqlConfig);
 
 			log.info(
-                `Connected to ${sqlConfig?.server}, and looking at ${sqlConfig?.database}`
+				`Connected to ${sqlConfig?.server}, and looking at ${sqlConfig?.database}`,
 			);
 			reconnecting = false;
 			connected = true;
 		} catch (error) {
 			log.fatal(
 				`${JSON.stringify(
-                    error
+					error,
-                )}, "There was an error connecting to the pool."`
+				)}, "There was an error connecting to the pool."`,
 			);
 			delay = Math.min(delay * 2, 30000); // exponential backoff up to 30s
 			// throw new Error("There was an error closing the sql connection");
@@ -103,10 +99,10 @@ const reconnectToSql = async () => {
 	if (!connected) {
 		log.fatal(
 			{ notify: true },
-            "Max reconnect attempts reached on the prodSql server. Stopping retries."
+			"Max reconnect attempts reached on the prodSql server. Stopping retries.",
 		);
 		reconnecting = false;
-        // optional: exit process or alert someone here
+		// exit process or alert someone here
 		// process.exit(1);
 	}
 };
@@ -126,11 +122,13 @@ export const closePool = async () => {
 			message: "The sql server connection has been closed",
 		};
 	} catch (error) {
-        log.fatal(
+		connected = false;
-            { notify: true },
+		log.info(
+			//{ notify: true },
+			{ error: error },
 			`${JSON.stringify(
-                error
+				error,
-            )},  "There was an error closing the sql connection"`
+			)},  "There was an error closing the sql connection"`,
 		);
 	}
 };

frontend/src/routes/_old/old/-components/logistics/helperCommands/helperPage.tsx

@@ -10,10 +10,14 @@ export default function HelperPage() {
 				<Bookin />
 			</div>
 
+			<div className="m-1">
+				{url === "localhost" && (
 					<div className="m-1">
 						<RemoveAsNonReusable />
+						<Relocate />
+					</div>
+				)}
 			</div>
-            <div className="m-1">{url === "localhost" && <Relocate />}</div>
 		</div>
 	);
 }

lstV2/server/globalUtils/runProdApi.ts

@@ -1,7 +1,7 @@
 import axios from "axios";
+import { createLog } from "../services/logger/logger.js";
 import { prodEndpointCreation } from "./createUrl.js";
 import { tryCatch } from "./tryCatch.js";
-import { createLog } from "../services/logger/logger.js";
 
 type bodyData = any;
 
@@ -9,11 +9,13 @@ type Data = {
 	endpoint: string;
 	data: bodyData[];
 };
-export const runProdApi = async (data: Data) => {
 /**
-     * Detachs a silo
+ *
+ * @param data
+ * @param timeoutDelay
+ * @returns
  */
-
+export const runProdApi = async (data: Data) => {
 	let url = await prodEndpointCreation(data.endpoint);
 
 	const { data: d, error } = await tryCatch(
@@ -22,7 +24,7 @@ export const runProdApi = async (data: Data) => {
 				"X-API-Key": process.env.TEC_API_KEY || "",
 				"Content-Type": "application/json",
 			},
-        })
+		}),
 	);
 
 	let e = error as any;
@@ -33,11 +35,11 @@ export const runProdApi = async (data: Data) => {
 				"error",
 				"lst",
 				"logistics",
-                `Not autorized: ${JSON.stringify(e.response?.data)}`
+				`Not authorized: ${JSON.stringify(e.response?.data)}`,
 			);
 			const data = {
 				success: false,
-                message: `Not autorized: ${JSON.stringify(e.response?.data)}`,
+				message: `Not authorized: ${JSON.stringify(e.response?.data)}`,
 				data: {
 					status: e.response?.status,
 					statusText: e.response?.statusText,
@@ -51,13 +53,13 @@ export const runProdApi = async (data: Data) => {
 				"lst",
 				"logistics",
 				`There was an error processing the endpoint: ${JSON.stringify(
-                    e.response?.data
+					e.response?.data,
-                )}`
+				)}`,
 			);
 			return {
 				success: false,
 				message: `There was an error processing the endpoint: ${JSON.stringify(
-                    e.response?.data
+					e.response?.data,
 				)}`,
 				data: {
 					status: e.response?.status,

lstV2/server/services/ocp/controller/materials/lotTransfer.ts

@@ -3,6 +3,7 @@ import { eq } from "drizzle-orm";
 import { success } from "zod/v4";
 import { db } from "../../../../../database/dbclient.js";
 import { printerData } from "../../../../../database/schema/printers.js";
+import { delay } from "../../../../globalUtils/delay.js";
 import { runProdApi } from "../../../../globalUtils/runProdApi.js";
 import { tryCatch } from "../../../../globalUtils/tryCatch.js";
 import { createLog } from "../../../logger/logger.js";
@@ -158,7 +159,7 @@ export const lotMaterialTransfer = async (data: NewLotData) => {
 		};
 	}
 
-	let timeoutTrans: number = data.type === "lot" ? 30 : 10;
+	let timeoutTrans: number = data.type === "lot" ? 5 : 5;
 	// get the barcode, and layoutID from the running number
 	const { data: label, error: labelError } = (await tryCatch(
 		query(
@@ -278,13 +279,10 @@ export const lotMaterialTransfer = async (data: NewLotData) => {
 	};
 
 	//console.log(matReturnData);
-	const { data: matReturn, error: matReturError } = (await tryCatch(
+
-		runProdApi({
+	// set a delay for when we try to return the label
-			endpoint:
+
-				"/public/v1.0/IssueMaterial/ReturnPartiallyConsumedManualMaterial",
+	const matReturn = await returnMaterial(matReturnData);
-			data: [matReturnData],
-		}),
-	)) as any;
 
 	if (!matReturn.success) {
 		createLog(
@@ -305,12 +303,12 @@ export const lotMaterialTransfer = async (data: NewLotData) => {
 		barcode: label?.data[0].Barcode,
 	};
 
-	const delay =
+	const delayTimer =
 		data.type === "lot"
 			? timeoutTrans * 1000
 			: target.getTime() - now.getTime();
 
-	const transfer = await transferMaterial(delay, data, consumeLot, newQty);
+	const transfer = await transferMaterial(delayTimer, data, consumeLot, newQty);
 
 	if (!transfer.success) {
 		return {
@@ -340,6 +338,22 @@ export const lotMaterialTransfer = async (data: NewLotData) => {
 	}
 };
 
+const returnMaterial = async (matReturnData: any) => {
+	console.log("Getting ready to Returning Materials");
+	await delay(5 * 1000);
+	console.log("doing the return");
+	const { data: matReturn, error: matReturError } = (await tryCatch(
+		runProdApi({
+			endpoint:
+				"/public/v1.0/IssueMaterial/ReturnPartiallyConsumedManualMaterial",
+			data: [matReturnData],
+		}),
+	)) as any;
+
+	if (matReturError) return matReturError;
+	return matReturn;
+};
+
 const transferMaterial = async (
 	delay: number,
 	data: any,
@@ -347,12 +361,13 @@ const transferMaterial = async (
 	newQty: any,
 ) => {
 	//console.log(data);
+	console.log("Transferring the material");
 	if (pendingJobs.has(data.runningNumber)) {
 		createLog(
 			"error",
 			"materials",
 			"ocp",
-			`${data.runningNumber} is pending to be transfered already`,
+			`${data.runningNumber} is pending to be transferred already`,
 		);
 		return {
 			success: false,

lstV2/server/services/quality/controller/qualityCycle.ts

@@ -26,7 +26,7 @@ export const qualityCycle = async () => {
 				db
 					.select()
 					.from(qualityRequest)
-					.where(inArray(qualityRequest.palletStatus, [1, 4, 5, 6])),
+					.where(inArray(qualityRequest.palletStatus, [1, 4, 5, 6, 7])),
 			);
 
 			if (error) {
@@ -64,6 +64,9 @@ export const qualityCycle = async () => {
 					let prodData: any =
 						queryData?.data.length === 0 ? [] : queryData.data;
 
+					// if there isnt a pallet just continue
+					if (queryData?.data.length === 0) continue;
+
 					if (
 						lstQData[i]?.locationAtRequest != prodData[0]?.locationAtRequest
 					) {
@@ -71,7 +74,7 @@ export const qualityCycle = async () => {
 						const qDataPost = {
 							warehouseMovedTo: prodData[0]?.warehouseAtRequest,
 							locationMovedTo: prodData[0]?.locationAtRequest,
-							// how ling did it take the warehouse to originally move the pallet
+							// how long did it take the warehouse to originally move the pallet
 							durationToMove: warehouse.includes(lstQData[i].palletStatus)
 								? differenceInMinutes(
 										new Date(Date.now()),