feat(opendock): scheduing updates

ref #23

backend/db/db.controller.ts

@@ -1,6 +1,6 @@
 import { drizzle } from "drizzle-orm/postgres-js";
 import postgres from "postgres";
-
+import * as opendockAVCheck from "./schema/opendock_articleSetup.js";
 import * as scanUserSchema from "./schema/scanUsers.js";
 import * as settingsSchema from "./schema/settings.schema.js";
 
@@ -22,5 +22,6 @@ export const db = drizzle(queryClient, {
 	schema: {
 		...scanUserSchema,
 		...settingsSchema,
+		...opendockAVCheck,
 	},
 });

backend/db/schema/opendock_apt.schema.ts

@@ -14,14 +14,13 @@ export const opendockApt = pgTable(
 	"opendock_apt",
 	{
 		id: uuid("id").defaultRandom().primaryKey(),
-		release: integer("release").notNull().unique(),
+		release: integer("release").notNull().unique("opendock_apt_release_unique"),
 		openDockAptId: text("open_dock_apt_id").notNull(),
 		appointment: jsonb("appointment").notNull().default([]),
 		upd_date: timestamp("upd_date").notNull().defaultNow(),
 		createdAt: timestamp("created_at").notNull().defaultNow(),
 	},
 	(table) => ({
-		releaseIdx: index("opendock_apt_release_idx").on(table.release),
 		openDockAptIdIdx: index("opendock_apt_opendock_id_idx").on(
 			table.openDockAptId,
 		),

backend/db/schema/opendock_articleSetup.ts

@@ -0,0 +1,46 @@
+import {
+	integer,
+	pgEnum,
+	pgTable,
+	text,
+	timestamp,
+	unique,
+	uuid,
+} from "drizzle-orm/pg-core";
+import { createInsertSchema, createSelectSchema } from "drizzle-zod";
+import type { z } from "zod";
+
+export const loadTypeEnum = pgEnum("load_type", ["drop", "live"]);
+
+export const opendockArticleSetup = pgTable(
+	"opendock_article_setup",
+	{
+		id: uuid("id").defaultRandom().primaryKey(),
+		av: integer("av").notNull(),
+		description: text("description").notNull(),
+		customer: text("customer").notNull(), // customer should be a concat of the ID - Desc
+		customerDescription: text("customer_description").notNull(),
+		loadType: loadTypeEnum("load_type").notNull().default("drop"),
+		dock: text("dock").notNull(),
+		upd_date: timestamp("upd_date").notNull().defaultNow(),
+		upd_user: text("upd_user").notNull().default("lst-system"),
+		createdAt: timestamp("created_at").notNull().defaultNow(),
+		add_user: text("add_user").notNull().default("lst-system"),
+	},
+	(table) => ({
+		uniqueAvCustomer: unique("uq_opendock_article_setup_av_customer").on(
+			table.av,
+			table.customer,
+		),
+	}),
+);
+
+export const opendockArticleSetupSchema =
+	createSelectSchema(opendockArticleSetup);
+export const newOpendockArticleSetupSchema =
+	createInsertSchema(opendockArticleSetup);
+
+export type OpendockArticleSetup = z.infer<typeof opendockArticleSetupSchema>;
+export type NewOpendockArticleSetup = z.infer<
+	typeof newOpendockArticleSetupSchema
+>;

backend/db/schema/settings.schema.ts

@@ -38,7 +38,7 @@ export const settings = pgTable(
 	},
 	(table) => [
 		// uniqueIndex('emailUniqueIndex').on(sql`lower(${table.email})`),
-		uniqueIndex("name").on(table.name),
+		uniqueIndex("settings_name_unique").on(table.name),
 	],
 );
 

backend/opendock/openDockRreleaseMonitor.utils.ts

@@ -3,7 +3,7 @@ import { addHours } from "date-fns";
 import { formatInTimeZone } from "date-fns-tz";
 import { eq, sql } from "drizzle-orm";
 import { db } from "../db/db.controller.js";
-import { opendockApt } from "../db/schema/opendock.schema.js";
+import { opendockApt } from "../db/schema/opendock_apt.schema.js";
 import { settings } from "../db/schema/settings.schema.js";
 import { createLogger } from "../logger/logger.controller.js";
 import { prodQuery } from "../prodSql/prodSqlQuery.controller.js";
@@ -27,6 +27,9 @@ type Releases = {
 	Quantity: number;
 	LineItemArticleWeight: number;
 	CustomerReleaseNumber: string;
+	DeliveryAddressDescription: string;
+	DeliveryAddressHumanReadableId: string;
+	AdditionalInformation1: string;
 };
 const timeZone = process.env.TIMEZONE as string;
 const TWENTY_FOUR_HOURS = 24 * 60 * 60 * 1000;
@@ -74,9 +77,27 @@ const postRelease = async (release: Releases) => {
 		await getToken();
 	}
 
+	// load validation checks
 	const defaultDock = await db.query.settings.findFirst({
 		where: (u, { eq }) => eq(u.name, "defaultLoadType"),
-	}); // .where(eq(settings.name, "defaultLoadType"))
+	});
+
+	// check if the release has the data in it
+	const releaseLoadtypeCheck = (release.AdditionalInformation1 ?? "")
+		.toLowerCase()
+		.split(",")
+		.map((x) => x.trim())
+		.includes("drop");
+
+	const opendDockArticleCheck = await db.query.opendockArticleSetup.findFirst({
+		where: (table, { and, eq }) =>
+			and(
+				eq(table.av, release.LineItemArticleWeight),
+				eq(table.customer, release.DeliveryAddressHumanReadableId),
+			),
+	});
+
+	// TODO: add in docks from lst db here to make it more universal for the team
 	/**
 	 * ReleaseState
 	 * 0 = open
@@ -120,6 +141,19 @@ const postRelease = async (release: Releases) => {
 		},
 		units: null,
 		customFields: [
+			{
+				name: "strCustomer",
+				type: "str",
+				label: "Customer",
+				value: `${release.DeliveryAddressDescription}`,
+				description: "Who is the customer ",
+				placeholder: "",
+				dropDownValues: [],
+				minLengthOrValue: 1,
+				hiddenFromCarrier: false,
+				requiredForCarrier: false,
+				requiredForWarehouse: false,
+			},
 			{
 				name: "strArticle",
 				type: "str",
@@ -195,6 +229,72 @@ const postRelease = async (release: Releases) => {
 
 	if (existing) {
 		const id = existing.openDockAptId;
+
+		if (
+			(releaseLoadtypeCheck ||
+				opendDockArticleCheck?.loadType === "drop" ||
+				defaultDock?.value === "drop") &&
+			(release.DeliveryState === 0 || release.DeliveryState === 1)
+		) {
+			const setArrival = { ...newDockApt, status: "Arrived" };
+
+			// set to arrived
+			try {
+				const response = await axios.patch(
+					`${process.env.OPENDOCK_URL}/appointment/${id}`,
+					setArrival,
+					{
+						headers: {
+							"content-type": "application/json; charset=utf-8",
+							Authorization: `Bearer ${odToken.odToken}`,
+						},
+					},
+				);
+
+				if (response.status === 400) {
+					log.error({}, response.data.data.message);
+					return;
+				}
+
+				// update the release in the db leaving as insert just incase something weird happened
+				try {
+					await db
+						.insert(opendockApt)
+						.values({
+							release: release.ReleaseNumber,
+							openDockAptId: response.data.data.id,
+							appointment: response.data.data,
+						})
+						.onConflictDoUpdate({
+							target: opendockApt.release,
+							set: {
+								openDockAptId: response.data.data.id,
+								appointment: response.data.data,
+								upd_date: sql`NOW()`,
+							},
+						})
+						.returning();
+
+					log.info({}, `${release.ReleaseNumber} was updated`);
+				} catch (e) {
+					log.error(
+						{ stack: e },
+						`Error updating the release: ${release.ReleaseNumber}`,
+					);
+				}
+				// biome-ignore lint/suspicious/noExplicitAny: to many possibilities
+			} catch (e: any) {
+				//console.info(newDockApt);
+				log.error(
+					{ stack: e.response.data },
+					`An error has occurred during patching of the release: ${release.ReleaseNumber}`,
+				);
+
+				return;
+			}
+
+			// set to inprogress
+			await delay(1500);
 			try {
 				const response = await axios.patch(
 					`${process.env.OPENDOCK_URL}/appointment/${id}`,
@@ -246,16 +346,13 @@ const postRelease = async (release: Releases) => {
 					`An error has occurred during patching of the release: ${release.ReleaseNumber}`,
 				);
 
-			if (
+				return;
-				defaultDock?.value === "drop" &&
+			}
-				e.response.data.message.incudes(
+		} else {
-					"Cannot change status from Scheduled to InProgress",
+			try {
-				)
-			) {
-				const dropTrailer = { ...newDockApt, status: "Arrived" };
 				const response = await axios.patch(
 					`${process.env.OPENDOCK_URL}/appointment/${id}`,
-					dropTrailer,
+					newDockApt,
 					{
 						headers: {
 							"content-type": "application/json; charset=utf-8",
@@ -268,28 +365,44 @@ const postRelease = async (release: Releases) => {
 					log.error({}, response.data.data.message);
 					return;
 				}
-				await delay(1500);
-				const dropTrailerProgress = { ...newDockApt, status: "InProgress" };
 
-				const res = await axios.patch(
+				// update the release in the db leaving as insert just incase something weird happened
-					`${process.env.OPENDOCK_URL}/appointment/${id}`,
+				try {
-					dropTrailerProgress,
+					await db
-					{
+						.insert(opendockApt)
-						headers: {
+						.values({
-							"content-type": "application/json; charset=utf-8",
+							release: release.ReleaseNumber,
-							Authorization: `Bearer ${odToken.odToken}`,
+							openDockAptId: response.data.data.id,
-						},
+							appointment: response.data.data,
+						})
+						.onConflictDoUpdate({
+							target: opendockApt.release,
+							set: {
+								openDockAptId: response.data.data.id,
+								appointment: response.data.data,
+								upd_date: sql`NOW()`,
 							},
+						})
+						.returning();
+
+					log.info({}, `${release.ReleaseNumber} was updated`);
+				} catch (e) {
+					log.error(
+						{ stack: e },
+						`Error updating the release: ${release.ReleaseNumber}`,
+					);
+				}
+				// biome-ignore lint/suspicious/noExplicitAny: to many possibilities
+			} catch (e: any) {
+				//console.info(newDockApt);
+				log.error(
+					{ stack: e.response.data },
+					`An error has occurred during patching of the release: ${release.ReleaseNumber}`,
 				);
 
-				if (res.status === 400) {
-					log.error({}, response.data.data.message);
 				return;
 			}
 		}
-
-			return;
-		}
 	} else {
 		try {
 			const response = await axios.post(

backend/opendock/opendock.articleCheck.route.ts

@@ -0,0 +1,198 @@
+import { desc, eq, sql } from "drizzle-orm";
+import { Router } from "express";
+import z from "zod";
+import { db } from "../db/db.controller.js";
+import {
+	type NewOpendockArticleSetup,
+	opendockArticleSetup,
+} from "../db/schema/opendock_articleSetup.js";
+import { prodQuery } from "../prodSql/prodSqlQuery.controller.js";
+import {
+	type SqlQuery,
+	sqlQuerySelector,
+} from "../prodSql/prodSqlQuerySelector.utils.js";
+import { apiReturn } from "../utils/returnHelper.utils.js";
+import { tryCatch } from "../utils/trycatch.utils.js";
+
+const r = Router();
+
+const newArticleLink = z.object({
+	av: z.number().int(),
+	description: z.string(),
+	customer: z.string().min(1).max(32),
+	customerDescription: z.string().min(2).max(100),
+	loadType: z
+		.enum(["drop", "live"])
+		.optional()
+		.describe("What roles are available to use."),
+	dock: z
+		//.record(z.string(), z.unknown())
+		.string()
+		.optional()
+		.describe(
+			"This allows us to add extra fields to the data to parse against",
+		),
+});
+
+r.post("/", async (req, res) => {
+	try {
+		const validated = newArticleLink.parse(req.body) as NewOpendockArticleSetup;
+
+		const newLink = await db
+			.insert(opendockArticleSetup)
+			.values({
+				av: validated.av,
+				description: validated.description,
+				customer: validated.customer,
+				customerDescription: validated.customerDescription,
+				loadType: validated.loadType,
+				dock: validated.dock,
+				add_user: req.user?.username ?? "lst_user",
+			})
+			.returning();
+
+		return apiReturn(res, {
+			success: true,
+			level: "info",
+			module: "opendock",
+			subModule: "articleCheck",
+			message: `${validated.av} was just added `,
+			data: newLink as any,
+			status: 200,
+		});
+	} catch (err) {
+		if (err instanceof z.ZodError) {
+			const flattened = z.flattenError(err);
+			// return res.status(400).json({
+			// 	error: "Validation failed",
+			// 	details: flattened,
+			// });
+
+			return apiReturn(res, {
+				success: false,
+				level: "error", //connect.success ? "info" : "error",
+				module: "opendock",
+				subModule: "articleCheck",
+				message: "Validation failed",
+				data: [flattened.fieldErrors],
+				status: 400, //connect.success ? 200 : 400,
+			});
+		}
+
+		return apiReturn(res, {
+			success: false,
+			level: "error", //connect.success ? "info" : "error",
+			module: "opendock",
+			subModule: "articleCheck",
+			message: "Internal Server Error adding article link",
+			data: [err],
+			status: 400, //connect.success ? 200 : 400,
+		});
+	}
+});
+
+r.patch("/:id", async (req, res) => {
+	const { id } = req.params;
+	const updates: Record<string, unknown | null> = {};
+
+	if (req.body?.loadType !== undefined) {
+		updates.loadType = req.body.loadType;
+	}
+
+	if (req.body?.dock !== undefined) {
+		updates.dock = req.body.dock;
+	}
+
+	updates.upd_user = req.user?.username || "lst_user";
+	updates.upd_date = sql`NOW()`;
+
+	const updatedSetting = await db
+		.update(opendockArticleSetup)
+		.set(updates)
+		.where(eq(opendockArticleSetup.id, id))
+		.returning();
+
+	return apiReturn(res, {
+		success: true,
+		level: "info",
+		module: "opendock",
+		subModule: "articleCheck",
+		message: `${updatedSetting[0]?.av} was just updated. `,
+		data: updatedSetting,
+		status: 200,
+	});
+});
+
+r.delete("/:id", async (req, res) => {
+	const { id } = req.params;
+
+	const removeLink = await db
+		.delete(opendockArticleSetup)
+		.where(eq(opendockArticleSetup.id, id))
+		.returning();
+	return apiReturn(res, {
+		success: false,
+		level: "info", //connect.success ? "info" : "error",
+		module: "opendock",
+		subModule: "articleCheck",
+		message: "Article link was deleted",
+		data: removeLink,
+		status: 200, //connect.success ? 200 : 400,
+	});
+});
+
+r.get("/", async (_, res) => {
+	const { data } = await tryCatch(
+		db
+			.select()
+			.from(opendockArticleSetup)
+			.orderBy(desc(opendockArticleSetup.customer))
+			.limit(1500),
+	);
+
+	return apiReturn(res, {
+		success: true,
+		level: "info",
+		module: "opendock",
+		subModule: "articleCheck",
+		message: `All links`,
+		data: data ?? [],
+		status: 200,
+	});
+});
+
+r.get("/customers/:av", async (req, res) => {
+	const { av } = req.params;
+
+	const avSQLQuery = sqlQuerySelector(`opendock.addressLink`) as SqlQuery;
+
+	if (!avSQLQuery.success) {
+		return apiReturn(res, {
+			success: true,
+			level: "error",
+			module: "opendock",
+			subModule: "articleCheck",
+			message: avSQLQuery.message,
+			data: [],
+			status: 200,
+		});
+	}
+	const { data } = await tryCatch(
+		prodQuery(
+			avSQLQuery.query.replace("[articleCheck]", av),
+			"openDock addressLink",
+		),
+	);
+
+	return apiReturn(res, {
+		success: true,
+		level: "info",
+		module: "opendock",
+		subModule: "articleCheck",
+		message: `All customers linked to av: ${av}`,
+		data: data as any,
+		status: 200,
+	});
+});
+
+export default r;

backend/opendock/opendock.routes.ts

@@ -1,6 +1,7 @@
 import type { Express } from "express";
 import { requireAuth } from "../middleware/auth.middleware.js";
 import { featureCheck } from "../middleware/featureActive.middleware.js";
+import articleCheck from "./opendock.articleCheck.route.js";
 
 import getApt from "./opendockGetRelease.route.js";
 
@@ -13,4 +14,11 @@ export const setupOpendockRoutes = (baseUrl: string, app: Express) => {
 		requireAuth,
 		getApt,
 	);
+
+	app.use(
+		`${baseUrl}/api/opendock/articleCheck`,
+		featureCheck("opendock_sync"),
+		requireAuth,
+		articleCheck,
+	);
 };

backend/opendock/opendockGetRelease.route.ts

@@ -1,7 +1,7 @@
 import { desc, gte, sql } from "drizzle-orm";
 import { Router } from "express";
 import { db } from "../db/db.controller.js";
-import { opendockApt } from "../db/schema/opendock.schema.js";
+import { opendockApt } from "../db/schema/opendock_apt.schema.js";
 import { apiReturn } from "../utils/returnHelper.utils.js";
 import { tryCatch } from "../utils/trycatch.utils.js";
 

backend/prodSql/queries/opendock.addressLink.sql

@@ -0,0 +1,34 @@
+/*
+This will return all address with a sales price.
+*/
+WITH ranked AS (
+    SELECT
+        av.id,
+        av.humanReadableId as av,
+        av.Alias as description,
+       -- CONCAT(ad.HumanReadableId, ' - ',ad.Name) as customer ,
+       ad.HumanReadableId as customer,
+       ad.Name as customerDescription,
+        ROW_NUMBER() OVER (
+            PARTITION BY AddressId, sp.articleId
+            ORDER BY ValidAfter DESC
+        ) AS rn
+    FROM [test1_AlplaPROD2.0_Read].[masterData].[SalesPrice] as sp (nolock) 
+
+    /* av */
+    left join
+    [test1_AlplaPROD2.0_Read].[masterData].[Article] as av (nolock) on 
+    av.id = sp.articleId
+
+    /* address */
+    left join
+    [test1_AlplaPROD2.0_Read].[masterData].[Address] as ad (nolock) on 
+    ad.id = AddressId
+
+)
+SELECT *
+FROM ranked
+WHERE rn = 1
+and ranked.av = '[articleCheck]'
+
+order by customerDescription

backend/prodSql/queries/releaseChecks.sql

@@ -21,7 +21,7 @@ SELECT
       ,[MainMaterialId]
       ,[MainMaterialHumanReadableId]
       ,[MainMaterialDescription]
-      ,[AdditionalInformation1]
+      ,[AdditionalInformation1] -- we will use this to reference as the first check
       ,[AdditionalInformation2]
       ,[D365SupplierLot]
       ,[TradeUnits]
@@ -49,7 +49,7 @@ SELECT
       ,[PaymentTermsDescription]
       ,[Remark] 
       ,[DeliveryAddressId]
-      ,[DeliveryAddressHumanReadableId]
+      ,[DeliveryAddressHumanReadableId] --use this to validate with the new drop or live check
       ,[DeliveryAddressDescription]
       ,[DeliveryStreetName]
       ,[DeliveryAddressZip]

backend/utils/cors.utils.ts

@@ -17,6 +17,7 @@ export const allowedOrigins = [
 	`http://${process.env.PROD_SERVER}:3100`, // temp
 	`http://usmcd1olp082:3000`,
 	`${process.env.EXTERNAL_URL}`, // internal docker
+	"chrome-extension://mddoackclclnbkmofficmmepfnadolfa",
 ];
 export const lstCors = () => {
 	return cors({

migrations/0053_petite_thunderbird.sql

@@ -0,0 +1,3 @@
+DROP INDEX "opendock_apt_release_idx";--> statement-breakpoint
+DROP INDEX "name";--> statement-breakpoint
+CREATE UNIQUE INDEX "settings_name_unique" ON "settings" USING btree ("name");

migrations/0054_talented_nocturne.sql

@@ -0,0 +1,14 @@
+CREATE TYPE "public"."load_type" AS ENUM('drop', 'live');--> statement-breakpoint
+CREATE TABLE "opendock_article_setup" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"av" integer NOT NULL,
+	"description" text NOT NULL,
+	"customer" text NOT NULL,
+	"load_type" "load_type" DEFAULT 'drop' NOT NULL,
+	"dock" text NOT NULL,
+	"upd_date" timestamp DEFAULT now() NOT NULL,
+	"upd_user" text DEFAULT 'lst-system' NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"add_user" text DEFAULT 'lst-system' NOT NULL,
+	CONSTRAINT "opendock_article_setup_av_unique" UNIQUE("av")
+);

migrations/0055_nosy_amphibian.sql

@@ -0,0 +1 @@
+ALTER TABLE "opendock_article_setup" ADD COLUMN "customer_description" text NOT NULL;

migrations/meta/_journal.json

@@ -372,6 +372,27 @@
       "when": 1778533475205,
       "tag": "0052_numerous_wasp",
       "breakpoints": true
+    },
+    {
+      "idx": 53,
+      "version": "7",
+      "when": 1779381841381,
+      "tag": "0053_petite_thunderbird",
+      "breakpoints": true
+    },
+    {
+      "idx": 54,
+      "version": "7",
+      "when": 1779381875298,
+      "tag": "0054_talented_nocturne",
+      "breakpoints": true
+    },
+    {
+      "idx": 55,
+      "version": "7",
+      "when": 1779399354404,
+      "tag": "0055_nosy_amphibian",
+      "breakpoints": true
     }
   ]
 }