test(materials per day): work on getting this running better

lstV2/server/services/notifications/controller/materialsPerDay/materialPerDay.ts

@@ -9,11 +9,14 @@ import {
 import { db } from "../../../../../database/dbclient.js";
 import { invHistoricalData } from "../../../../../database/schema/historicalINV.js";
 import { tryCatch } from "../../../../globalUtils/tryCatch.js";
+import { createLog } from "../../../logger/logger.js";
 import { query } from "../../../sqlServer/prodSqlServer.js";
 import {
 	materialPerDay,
 	materialPurchasesPerDay,
 } from "../../../sqlServer/querys/dataMart/materialPerDay.js";
+import { singleArticle } from "../../../sqlServer/querys/misc/singleArticle.js";
+import { sendEmail } from "../sendMail.js";
 import { materialPurchases } from "./materialPurchases.js";
 import { buildInventoryTimeline } from "./materialWithInv.js";
 
@@ -99,43 +102,77 @@ export default async function materialPerDayCheck() {
 
 	// purchases
 
-	const { data: p, error: pe } = (await tryCatch(
+	const pOrders = (await materialPurchases({ startDate, endDate })) as any;
-		query(
-			materialPurchasesPerDay
-				.replace("[startDate]", startDate)
-				.replace("[endDate]", endDate),
-			"material check",
-		),
-	)) as any;
-
-	if (error) {
-		return {
-			success: false,
-			message: "Error getting the material data",
-			error,
-		};
-	}
-
-	if (!data.success) {
-		return {
-			success: false,
-			message: data.message,
-			data: [],
-		};
-	}
 
+	//console.log(pOrders);
 	const openingInventory: Record<string, number> = {};
 	const inventoryRows = await getInv();
 	for (const row of inventoryRows) {
 		openingInventory[row.article] = Number(row.total_QTY) || 0;
 	}
 
+	const materialsDemand = buildInventoryTimeline(
+		sumByMaterialAndWeek(data.data) as any,
+		openingInventory,
+		pOrders,
+	);
+
+	const { data: av, error: eav } = await tryCatch(
+		query(singleArticle.replace("[av]", "107"), "single article"),
+	);
+
+	const formattedMaterials = materialsDemand
+		.filter((n) => n.MaterialHumanReadableId === `${av?.data[0].article}`)
+		.map((i) => ({
+			...i,
+			OpeningInventory: i.OpeningInventory?.toLocaleString("en-US", {
+				minimumFractionDigits: 2,
+				maximumFractionDigits: 2,
+			}),
+			Purchases: i.Purchases?.toLocaleString("en-US", {
+				minimumFractionDigits: 2,
+				maximumFractionDigits: 2,
+			}),
+			Consumption: i.Consumption?.toLocaleString("en-US", {
+				minimumFractionDigits: 2,
+				maximumFractionDigits: 2,
+			}),
+			ClosingInventory: i.ClosingInventory?.toLocaleString("en-US", {
+				minimumFractionDigits: 2,
+				maximumFractionDigits: 2,
+			}),
+		}));
+
+	// send the email stuff
+	const emailSetup = {
+		email: "blake.matthes@alpla.com",
+		subject: `Material Week.`,
+		template: "materialPerDay",
+		context: {
+			items: formattedMaterials,
+			article: av?.data[0].combined,
+		},
+	};
+
+	const { data: sentEmail, error: sendEmailError } = await tryCatch(
+		sendEmail(emailSetup),
+	);
+	if (sendEmailError) {
+		createLog(
+			"error",
+			"blocking",
+			"notify",
+			"Failed to send email, will try again on next interval",
+		);
+		return {
+			success: false,
+			message: "Failed to send email, will try again on next interval",
+		};
+	}
+
 	return {
 		success: true,
 		message: "material data",
-		data: buildInventoryTimeline(
+		data: formattedMaterials,
-			sumByMaterialAndWeek(data.data) as any,
-			openingInventory,
-		),
 	};
 }

lstV2/server/services/notifications/controller/materialsPerDay/materialPurchases.ts

@@ -1,4 +1,7 @@
 import { formatISO, parseISO, startOfWeek } from "date-fns";
+import { tryCatch } from "../../../../globalUtils/tryCatch.js";
+import { query } from "../../../sqlServer/prodSqlServer.js";
+import { materialPurchasesPerDay } from "../../../sqlServer/querys/dataMart/materialPerDay.js";
 
 function toDate(val: any) {
 	if (val instanceof Date) return val;
@@ -6,20 +9,52 @@ function toDate(val: any) {
 	return new Date(val);
 }
 
-export const materialPurchases = async (data: any) => {
+export const materialPurchases = async ({
+	startDate,
+	endDate,
+}: {
+	startDate: string;
+	endDate: string;
+}) => {
 	/** @type {Record<string, Record<string, number>>} */
 	const grouped: any = {};
 
-	for (const r of data) {
+	const { data: p, error } = (await tryCatch(
+		query(
+			materialPurchasesPerDay
+				.replace("[startDate]", startDate)
+				.replace("[endDate]", endDate),
+			"material check",
+		),
+	)) as any;
+
+	if (error) {
+		return {
+			success: false,
+			message: "Error getting the material data",
+			error,
+		};
+	}
+
+	if (!p.success) {
+		return {
+			success: false,
+			message: p.message,
+			data: [],
+		};
+	}
+
+	for (const r of p.data) {
+		const pOrder = String(r.purhcaseOrder);
 		const mat = String(r.MaterialHumanReadableId);
-		const d = toDate(r.CalDate);
+		const d = toDate(r.deliveryDate);
 		const week = formatISO(startOfWeek(d, { weekStartsOn: 1 }), {
 			representation: "date",
 		});
 
 		grouped[mat] ??= {};
 		grouped[mat][week] ??= 0;
-		grouped[mat][week] += Number(r.DailyMaterialDemand) || 0;
+		grouped[mat][week] += Number(r.qty) || 0;
 	}
 
 	const result = [];
@@ -29,7 +64,7 @@ export const materialPurchases = async (data: any) => {
 			result.push({
 				MaterialHumanReadableId: mat,
 				WeekStart: week,
-				WeeklyDemand: Number(total).toFixed(2),
+				WeeklyPurchase: Number(total).toFixed(2),
 			});
 		}
 	}

lstV2/server/services/notifications/controller/materialsPerDay/materialWithInv.ts

@@ -5,25 +5,51 @@ export const buildInventoryTimeline = (
 		WeeklyDemand: number;
 	}>,
 	opening: Record<string, number>,
+	weeklyPurchases?: Array<{
+		MaterialHumanReadableId: string;
+		WeekStart: string;
+		WeeklyPurchase: number;
+	}>,
 ) => {
 	// group weekly demand by material
-	const grouped: Record<
+	const groupedDemand: Record<
 		string,
 		Array<{ WeekStart: string; Demand: number }>
 	> = {};
-
 	for (const d of weeklyDemand) {
 		const mat = d.MaterialHumanReadableId;
-		grouped[mat] ??= [];
+		groupedDemand[mat] ??= [];
-		grouped[mat].push({
+		groupedDemand[mat].push({
 			WeekStart: d.WeekStart,
 			Demand: Number(d.WeeklyDemand),
 		});
 	}
 
-	// sort weeks chronologically per material
+	// group weekly purchases by material
-	for (const mat of Object.keys(grouped)) {
+	const groupedPurchases: Record<
-		grouped[mat].sort(
+		string,
+		Array<{ WeekStart: string; Purchase: number }>
+	> = {};
+	if (weeklyPurchases) {
+		for (const p of weeklyPurchases) {
+			const mat = p.MaterialHumanReadableId;
+			groupedPurchases[mat] ??= [];
+			groupedPurchases[mat].push({
+				WeekStart: p.WeekStart,
+				Purchase: Number(p.WeeklyPurchase),
+			});
+		}
+	}
+
+	// sort both chronologically
+	for (const mat of Object.keys(groupedDemand)) {
+		groupedDemand[mat].sort(
+			(a, b) =>
+				new Date(a.WeekStart).getTime() - new Date(b.WeekStart).getTime(),
+		);
+	}
+	for (const mat of Object.keys(groupedPurchases)) {
+		groupedPurchases[mat].sort(
 			(a, b) =>
 				new Date(a.WeekStart).getTime() - new Date(b.WeekStart).getTime(),
 		);
@@ -33,25 +59,30 @@ export const buildInventoryTimeline = (
 		MaterialHumanReadableId: string;
 		WeekStart: string;
 		OpeningInventory: number;
+		Purchases: number;
 		Consumption: number;
 		ClosingInventory: number;
 	}> = [];
 
-	for (const [mat, weeks] of Object.entries(grouped)) {
+	for (const [mat, weeks] of Object.entries(groupedDemand)) {
-		// get starting inventory from the ERP result
 		let inv = opening[mat] ?? 0;
+		const purchasesForMaterial = groupedPurchases[mat] ?? [];
 
-		for (const w of weeks) {
+		for (const week of weeks) {
-			const week = w.WeekStart;
+			const demand = Number(week.Demand);
-			const demand = Number(w.Demand);
+			const purchase =
+				purchasesForMaterial.find((p) => p.WeekStart === week.WeekStart)
+					?.Purchase ?? 0;
 
 			const openingInv = inv;
-			const closingInv = openingInv - demand;
+			const adjustedInv = openingInv + purchase;
+			const closingInv = adjustedInv - demand;
 
 			result.push({
 				MaterialHumanReadableId: mat,
-				WeekStart: week,
+				WeekStart: week.WeekStart,
 				OpeningInventory: Number(openingInv.toFixed(2)),
+				Purchases: Number(purchase.toFixed(2)),
 				Consumption: Number(demand.toFixed(2)),
 				ClosingInventory: Number(closingInv.toFixed(2)),
 			});

lstV2/server/services/notifications/controller/sendMail.ts

@@ -1,17 +1,18 @@
-import { tryCatch } from "../../../globalUtils/tryCatch.js";
+import Handlebars from "handlebars";
-import { db } from "../../../../database/dbclient.js";
-import { settings } from "../../../../database/schema/settings.js";
-import nodemailer from "nodemailer";
 import type { Transporter } from "nodemailer";
-import type SMTPTransport from "nodemailer/lib/smtp-transport/index.js";
+import nodemailer from "nodemailer";
 import type Mail from "nodemailer/lib/mailer/index.js";
 import type { Address } from "nodemailer/lib/mailer/index.js";
+import type SMTPTransport from "nodemailer/lib/smtp-transport/index.js";
+import hbs from "nodemailer-express-handlebars";
 import path from "path";
 import { fileURLToPath } from "url";
-import hbs from "nodemailer-express-handlebars";
 import { promisify } from "util";
-import { createLog } from "../../logger/logger.js";
+import { db } from "../../../../database/dbclient.js";
+import { settings } from "../../../../database/schema/settings.js";
+import { tryCatch } from "../../../globalUtils/tryCatch.js";
 import { installed } from "../../../index.js";
+import { createLog } from "../../logger/logger.js";
 
 interface HandlebarsMailOptions extends Mail.Options {
 	template: string;
@@ -33,7 +34,7 @@ export const sendEmail = async (data: any): Promise<any> => {
 	let transporter: Transporter;
 	let fromEmail: string | Address;
 	const { data: settingData, error: settingError } = await tryCatch(
-        db.select().from(settings)
+		db.select().from(settings),
 	);
 
 	if (settingError) {
@@ -47,12 +48,14 @@ export const sendEmail = async (data: any): Promise<any> => {
 	const server = settingData.filter((n) => n.name === "server");
 
 	if (
-        server[0].value === "localhost" &&
+		server[0].value === "localhostx" &&
 		process.env.EMAIL_USER &&
 		process.env.EMAIL_PASSWORD
 	) {
 		transporter = nodemailer.createTransport({
 			service: "gmail",
+			host: "smtp.gmail.com",
+			port: 465,
 			auth: {
 				user: process.env.EMAIL_USER,
 				pass: process.env.EMAIL_PASSWORD,
@@ -97,7 +100,7 @@ export const sendEmail = async (data: any): Promise<any> => {
 	// creating the handlbar options
 	const viewPath = path.resolve(
 		path.dirname(fileURLToPath(import.meta.url)),
-        "../utils/views/"
+		"../utils/views/",
 	);
 
 	const handlebarOptions = {
@@ -133,7 +136,7 @@ export const sendEmail = async (data: any): Promise<any> => {
 			"info",
 			"notification",
 			"system",
-            `Email was sent to: ${data.email}`
+			`Email was sent to: ${data.email}`,
 		);
 		return { success: true, message: "Email sent.", data: info };
 	} catch (err) {
@@ -142,7 +145,7 @@ export const sendEmail = async (data: any): Promise<any> => {
 			"error",
 			"notification",
 			"system",
-            `Error sending Email: ${JSON.stringify(err)}`
+			`Error sending Email: ${JSON.stringify(err)}`,
 		);
 		return { success: false, message: "Error sending email.", error: err };
 	}

lstV2/server/services/notifications/routes/manualTiggerMaterials.ts

@@ -0,0 +1,28 @@
+// an external way to creating logs
+import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
+import { apiHit } from "../../../globalUtils/apiHits.js";
+import { responses } from "../../../globalUtils/routeDefs/responses.js";
+import materialPerDayCheck from "../controller/materialsPerDay/materialPerDay.js";
+import runTiImport from "../controller/notifications/tiIntergration.js";
+
+const app = new OpenAPIHono({ strict: false });
+
+app.openapi(
+	createRoute({
+		tags: ["notify"],
+		summary: "Manually trigger TI intergrations.",
+		method: "get",
+		path: "/materialPerDayCheck",
+		//middleware: authMiddleware,
+		responses: responses(),
+	}),
+	async (c) => {
+		apiHit(c, { endpoint: "/materialPerDayCheck" });
+		const tiImport = await materialPerDayCheck();
+		return c.json({
+			success: tiImport?.success,
+			message: tiImport?.message,
+		});
+	},
+);
+export default app;

lstV2/server/services/notifications/routes/manualTiggerTi.ts

@@ -1,9 +1,8 @@
 // an external way to creating logs
 import { createRoute, OpenAPIHono, z } from "@hono/zod-openapi";
-import { responses } from "../../../globalUtils/routeDefs/responses.js";
-
-import runTiImport from "../controller/notifications/tiIntergration.js";
 import { apiHit } from "../../../globalUtils/apiHits.js";
+import { responses } from "../../../globalUtils/routeDefs/responses.js";
+import runTiImport from "../controller/notifications/tiIntergration.js";
 
 const app = new OpenAPIHono({ strict: false });
 
@@ -23,6 +22,6 @@ app.openapi(
 			success: tiImport?.success,
 			message: tiImport?.message,
 		});
-    }
+	},
 );
 export default app;

lstV2/server/services/notifications/utils/views/materialPerDay.hbs

@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    {{!-- <link rel="stylesheet" href="styles/styles.css" /> --}}
+    {{> styles}}
+</head>
+<body>
+        <p>All,</p> 
+        <p>Below is the weekly material demand for Article: {{article}}.</p>        
+        <table > 
+        <thead> 
+            <tr> 
+            <th>AV</th> 
+            <th>Week</th> 
+            <th>Opening Inventory</th> 
+            <th>Purchases</th> 
+            <th>Consumption</th> 
+            <th>Closing Inventory</th> 
+            </tr> 
+        </thead> 
+
+        <tbody>
+            {{#each items}}
+                    <tr>
+                        <td>{{MaterialHumanReadableId}}</td>
+                        <td>{{WeekStart}}</td>
+                        <td>{{OpeningInventory}}</td>
+                        <td>{{Purchases}}</td>
+                        <td>{{Consumption}}</td>
+                        <td>{{ClosingInventory}}</td>
+                    </tr>
+                {{/each}}
+        </tbody>
+        </table>
+
+        <div>
+           <p>Thank you,</p>
+        <p>LST Team</p> 
+        </div>
+
+</body>
+</html>

lstV2/server/services/sqlServer/querys/dataMart/materialPerDay.ts

@@ -3,7 +3,7 @@
  * startdate and end date should be passed over
  */
 export const materialPerDay = `
-use [test3_AlplaPROD2.0_Read]
+use [test1_AlplaPROD2.0_Read]
 
 DECLARE @ShiftStartHour INT = 6
 declare @startDate nvarchar(max) = '[startDate]'
@@ -121,7 +121,7 @@ declare @endDate nvarchar(max) = '[endDate]'
 SELECT 
       [IdBestellung] as purhcaseOrder
      
-      ,[IdArtikelVarianten]
+      ,[IdArtikelVarianten] as MaterialHumanReadableId
       ,convert(date, [BestellDatum], 120) as orderDate
       ,convert(date, [Lieferdatum], 120) as deliveryDate
       ,[BestellMenge] as qty

lstV2/server/services/sqlServer/querys/misc/singleArticle.ts

@@ -0,0 +1,10 @@
+export const singleArticle = `
+use AlplaPROD_test1
+
+select 
+idartikelvarianten as article,
+CONCAT(idartikelvarianten , ' - '  , Alias) as combined
+
+from V_Artikel (nolock)
+where idartikelvarianten = '[av]'
+`;