From 8145dc800dced31860a926c80eca72cb39433b29 Mon Sep 17 00:00:00 2001 From: Blake Matthes Date: Sun, 10 Aug 2025 18:14:38 -0500 Subject: [PATCH] refactor(siloadjustment): refactored to get the settings from the state vs direct from db --- .../siloAdjustments/createSiloAdjustment.ts | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/server/services/logistics/controller/siloAdjustments/createSiloAdjustment.ts b/server/services/logistics/controller/siloAdjustments/createSiloAdjustment.ts index 68cf1c0..764935d 100644 --- a/server/services/logistics/controller/siloAdjustments/createSiloAdjustment.ts +++ b/server/services/logistics/controller/siloAdjustments/createSiloAdjustment.ts @@ -9,6 +9,10 @@ import { sendEmail } from "../../../notifications/controller/sendMail.js"; import { settings } from "../../../../../database/schema/settings.js"; import { generateOneTimeKey } from "../../../../globalUtils/singleUseKey.js"; import { eq } from "drizzle-orm"; +import { + getSettings, + serverSettings, +} from "../../../server/controller/settings/getSettings.js"; export const createSiloAdjustment = async ( data: any | null, @@ -18,18 +22,21 @@ export const createSiloAdjustment = async ( * Creates a silo adjustment based off warehouse, location, and qty. * qty will come from the hmi, prolink, or silo patrol */ - const { data: set, error: setError } = await tryCatch( - db.select().from(settings) - ); + // const { data: set, error: setError } = await tryCatch( + // db.select().from(settings) + // ); - if (setError) { - return { - success: false, - message: `There was an error getting setting data to post to the server.`, - data: setError, - }; - } + // const { data: set, error: setError } = await tryCatch(getSettings()); + // if (setError) { + // return { + // success: false, + // message: `There was an error getting setting data to post to the server.`, + // data: setError, + // }; + // } + + const set = serverSettings.length === 0 ? [] : serverSettings; // getting stock data first so we have it prior to the adjustment const { data: s, error: stockError } = await tryCatch( query(siloQuery, "Silo data Query")