refactor(datamart): psi work

lstV2/server/services/dataMart/controller/psiForecastData.ts

@@ -0,0 +1,42 @@
+import { tryCatch } from "../../../globalUtils/tryCatch.js";
+import { createLog } from "../../logger/logger.js";
+import { query } from "../../sqlServer/prodSqlServer.js";
+import { forecastData } from "../../sqlServer/querys/psiReport/forecast.js";
+
+// type ArticleData = {
+//     id: string
+// }
+export const getGetPSIForecastData = async (customer: string) => {
+	let articles: any = [];
+	let queryData = forecastData;
+	console.log(customer);
+	if (customer) {
+		queryData = forecastData.replace("[customer]", customer);
+	}
+
+	const { data, error } = (await tryCatch(
+		query(queryData, "PSI forecast info"),
+	)) as any;
+
+	if (error) {
+		createLog(
+			"error",
+			"datamart",
+			"datamart",
+			`There was an error getting the forecast info: ${JSON.stringify(error)}`,
+		);
+		return {
+			success: false,
+			messsage: `There was an error getting the forecast info`,
+			data: error,
+		};
+	}
+
+	articles = data.data;
+
+	return {
+		success: true,
+		message: "PSI forecast Data",
+		data: articles,
+	};
+};

lstV2/server/services/dataMart/controller/psiGetInventory.ts

@@ -1,4 +1,4 @@
-import { and, between, inArray, sql } from "drizzle-orm";
+import { and, between, inArray, notInArray, sql } from "drizzle-orm";
 import { db } from "../../../../database/dbclient.js";
 import { invHistoricalData } from "../../../../database/schema/historicalINV.js";
 import { tryCatch } from "../../../globalUtils/tryCatch.js";
@@ -8,56 +8,79 @@ import { createLog } from "../../logger/logger.js";
 //     id: string
 // }
 export const psiGetInventory = async (
-    avs: string,
-    startDate: string,
-    endDate: string
+	avs: string,
+	startDate: string,
+	endDate: string,
+	whseToInclude: string,
+	exludeLanes: string
 ) => {
-    let articles: any = [];
+	let articles: any = [];
 
-    if (!avs) {
-        return {
-            success: false,
-            message: `Missing av's please send at least one over`,
-            data: [],
-        };
-    }
+	if (!avs) {
+		return {
+			success: false,
+			message: `Missing av's please send at least one over`,
+			data: [],
+		};
+	}
 
-    const ids = avs.split(",").map((id) => id.trim());
+	const ids = avs.split(",").map((id) => id.trim());
+	const whse = whseToInclude
+		? whseToInclude
+				.split(",")
+				.map((w) => w.trim())
+				.filter(Boolean)
+		: [];
 
-    const { data, error } = (await tryCatch(
-        db
-            .select()
-            .from(invHistoricalData)
-            .where(
-                and(
-                    inArray(invHistoricalData.article, ids),
-                    between(invHistoricalData.histDate, startDate, endDate)
-                )
-            )
-        //.limit(100)
-    )) as any;
+		const locations = exludeLanes
+  ? exludeLanes.split(",").map((l) => l.trim()).filter(Boolean)
+  : [];
 
-    if (error) {
-        createLog(
-            "error",
-            "datamart",
-            "datamart",
-            `There was an error getting the planning info: ${JSON.stringify(
-                error
-            )}`
-        );
-        return {
-            success: false,
-            messsage: `There was an error getting the planning info`,
-            data: error,
-        };
-    }
+	const conditions = [
+		inArray(invHistoricalData.article, ids),
+		between(invHistoricalData.histDate, startDate, endDate),
+	];
 
-    articles = data;
-    console.log(articles.length);
-    return {
-        success: true,
-        message: "PSI planning Data",
-        data: articles,
-    };
+	// only add the warehouse condition if there are any whse values
+	if (whse.length > 0) {
+		console.log("adding whse to include in");
+	conditions.push(inArray(invHistoricalData.whseId, whse));
+	}
+
+	// locations we dont want in the system
+	if (locations.length > 0) {
+		console.log("adding excluded lanes in ",locations);
+
+  conditions.push(notInArray(invHistoricalData.location, locations));
+}
+
+	const query = db
+		.select()
+		.from(invHistoricalData)
+		.where(and(...conditions));
+
+	// optional tryCatch or await as you had
+	const { data, error } = (await tryCatch(query)) as any;
+
+	if (error) {
+		createLog(
+			"error",
+			"datamart",
+			"datamart",
+			`There was an error getting the planning info: ${JSON.stringify(error)}`,
+		);
+		return {
+			success: false,
+			messsage: `There was an error getting the planning info`,
+			data: error,
+		};
+	}
+
+	articles = data;
+	console.log(articles.length);
+	return {
+		success: true,
+		message: "PSI planning Data",
+		data: articles,
+	};
 };

lstV2/server/services/dataMart/dataMartService.ts

@@ -13,6 +13,7 @@ import getInhouseDeliveryByDate from "./route/getInHouseDeliveryDateByRange.js";
 import currentInv from "./route/getInventory.js";
 import getOpenOrders from "./route/getOpenOrders.js";
 import psiArticleData from "./route/getPsiArticleData.js";
+import psiForecastData from "./route/getPsiForecast.js";
 import psiInventory from "./route/getPsiinventory.js";
 import psiPlanningData from "./route/getPsiPlanningData.js";
 import psiProductionData from "./route/getPsiProductionData.js";
@@ -37,6 +38,7 @@ const routes = [
 	psiPlanningData,
 	psiProductionData,
 	psiInventory,
+	psiForecastData,
 ] as const;
 
 const appRoutes = routes.forEach((route) => {

lstV2/server/services/dataMart/route/getPsiForecast.ts

@@ -0,0 +1,65 @@
+import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
+import { apiHit } from "../../../globalUtils/apiHits.js";
+import { responses } from "../../../globalUtils/routeDefs/responses.js";
+import { tryCatch } from "../../../globalUtils/tryCatch.js";
+import { getGetPSIForecastData } from "../controller/psiForecastData.js";
+
+const app = new OpenAPIHono({ strict: false });
+const Body = z.object({
+	includeRunnningNumbers: z.string().openapi({ example: "x" }),
+});
+app.openapi(
+	createRoute({
+		tags: ["dataMart"],
+		summary: "Returns the psiforecastdata.",
+		method: "get",
+		path: "/psiforecastdata",
+		request: {
+			body: {
+				content: {
+					"application/json": { schema: Body },
+				},
+			},
+		},
+		responses: responses(),
+	}),
+	async (c) => {
+		const customer: any = c.req.queries();
+
+		// make sure we have a vaid user being accessed thats really logged in
+		apiHit(c, { endpoint: "/psiforecastdata" });
+		//console.log(articles["avs"][0]);
+
+		let customeArticle = null;
+		if (customer) {
+			customeArticle = customer["customer"][0];
+		}
+		const { data, error } = await tryCatch(
+			getGetPSIForecastData(customeArticle),
+		);
+
+		if (error) {
+			console.log(error);
+			return c.json(
+				{
+					success: false,
+					message: "There was an error getting the articles.",
+					data: error,
+				},
+				400,
+			);
+		}
+
+		//console.log(data);
+
+		return c.json(
+			{
+				success: data.success,
+				message: data.message,
+				data: data.data,
+			},
+			data.success ? 200 : 400,
+		);
+	},
+);
+export default app;

lstV2/server/services/dataMart/route/getPsiinventory.ts

@@ -1,64 +1,66 @@
 import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
+import { apiHit } from "../../../globalUtils/apiHits.js";
 import { responses } from "../../../globalUtils/routeDefs/responses.js";
 import { tryCatch } from "../../../globalUtils/tryCatch.js";
-import { apiHit } from "../../../globalUtils/apiHits.js";
 import { psiGetInventory } from "../controller/psiGetInventory.js";
 
 const app = new OpenAPIHono({ strict: false });
 const Body = z.object({
-    includeRunnningNumbers: z.string().openapi({ example: "x" }),
+	includeRunnningNumbers: z.string().openapi({ example: "x" }),
 });
 app.openapi(
-    createRoute({
-        tags: ["dataMart"],
-        summary: "Returns the getPsiinventory.",
-        method: "get",
-        path: "/getpsiinventory",
-        request: {
-            body: {
-                content: {
-                    "application/json": { schema: Body },
-                },
-            },
-        },
-        responses: responses(),
-    }),
-    async (c) => {
-        const q: any = c.req.queries();
+	createRoute({
+		tags: ["dataMart"],
+		summary: "Returns the getPsiinventory.",
+		method: "get",
+		path: "/getpsiinventory",
+		request: {
+			body: {
+				content: {
+					"application/json": { schema: Body },
+				},
+			},
+		},
+		responses: responses(),
+	}),
+	async (c) => {
+		const q: any = c.req.queries();
 
-        // make sure we have a vaid user being accessed thats really logged in
-        apiHit(c, { endpoint: "/getpsiinventory" });
-        //console.log(articles["avs"][0]);
-        const { data, error } = await tryCatch(
-            psiGetInventory(
-                q["avs"] ? q["avs"][0] : null,
-                q["startDate"] ? q["startDate"][0] : null,
-                q["endDate"] ? q["endDate"][0] : null
-            )
-        );
+		// make sure we have a vaid user being accessed thats really logged in
+		apiHit(c, { endpoint: "/getpsiinventory" });
+		//console.log(articles["avs"][0]);
+		const { data, error } = await tryCatch(
+			psiGetInventory(
+				q["avs"] ? q["avs"][0] : null,
+				q["startDate"] ? q["startDate"][0] : null,
+				q["endDate"] ? q["endDate"][0] : null,
+				q["whseToInclude"] ? q["whseToInclude"][0] : null,
+				q["exludeLanes"] ? q["exludeLanes"][0] : null,
+			),
+		);
 
-        if (error) {
-            console.log(error);
-            return c.json(
-                {
-                    success: false,
-                    message: "There was an error getting the production.",
-                    data: error,
-                },
-                400
-            );
-        }
+		if (error) {
+			console.log(error);
+			return c.json(
+				{
+					success: false,
+					message: "There was an error getting the production.",
+					data: error,
+				},
+				400,
+			);
+		}
 
-        //console.log(data);
+		//console.log(data);
 
-        return c.json(
-            {
-                success: data.success,
-                message: data.message,
-                data: data.data,
-            },
-            data.success ? 200 : 400
-        );
-    }
+		return c.json(
+			{
+				success: data.success,
+				message: data.message,
+				data: data.data,
+			},
+			data.success ? 200 : 400,
+		);
+	},
 );
 export default app;