From 0f32e6ffc782972c5eeefa3b8fd06f527f358695 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Thu, 20 Feb 2025 14:37:25 -0800 Subject: [PATCH 1/4] Add additional logging to OS Handler. --- server/opensearch/os-handler.js | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/server/opensearch/os-handler.js b/server/opensearch/os-handler.js index 930933373..3323f5f62 100644 --- a/server/opensearch/os-handler.js +++ b/server/opensearch/os-handler.js @@ -25,6 +25,10 @@ async function OpenSearchUpdateHandler(req, res) { switch (req.body.table.name) { case "jobs": + logger.log("os-handler-jobs", "DEBUG", req.user.email, null, { + jobid: req.body.event.data.new.id, + bodyshopid: req.body.event.data.new.shopid + }); document = pick(req.body.event.data.new, [ "id", "bodyshopid", @@ -49,6 +53,10 @@ async function OpenSearchUpdateHandler(req, res) { document.bodyshopid = req.body.event.data.new.shopid; break; case "vehicles": + logger.log("os-handler-vehicles", "DEBUG", req.user.email, null, { + vehicleid: req.body.event.data.new.id, + bodyshopid: req.body.event.data.new.shopid + }); document = pick(req.body.event.data.new, [ "id", "v_model_yr", @@ -61,6 +69,10 @@ async function OpenSearchUpdateHandler(req, res) { document.bodyshopid = req.body.event.data.new.shopid; break; case "owners": + logger.log("os-handler-owners", "DEBUG", req.user.email, null, { + ownerid: req.body.event.data.new.id, + bodyshopid: req.body.event.data.new.shopid + }); document = pick(req.body.event.data.new, ["id", "ownr_fn", "ownr_ln", "ownr_co_nm", "ownr_ph1", "ownr_ph2"]); document.bodyshopid = req.body.event.data.new.shopid; break; @@ -96,9 +108,15 @@ async function OpenSearchUpdateHandler(req, res) { ...bill.bills_by_pk, bodyshopid: bill.bills_by_pk.job.shopid }; + + logger.log("os-handler-bills", "DEBUG", req.user.email, null, { + billid: req.body.event.data.new.id, + bodyshopid: bill.bills_by_pk.job.shopid + }); break; case "payments": //Query to get the job and RO number + const payment = await client.request( `query ADMIN_GET_PAYMENT_BY_ID($paymentId: uuid!) { payments_by_pk(id: $paymentId) { @@ -139,6 +157,10 @@ async function OpenSearchUpdateHandler(req, res) { ...payment.payments_by_pk, bodyshopid: payment.payments_by_pk.job.shopid }; + logger.log("os-handler-payments", "DEBUG", req.user.email, null, { + paymentid: req.body.event.data.new.id, + bodyshopid: payment.payments_by_pk.job.shopid + }); break; } const payload = { @@ -166,7 +188,9 @@ async function OpenSearchSearchHandler(req, res) { } logger.log("os-search", "DEBUG", req.user.email, null, { - search + search, + index, + bodyshopid }); const BearerToken = req.BearerToken; From 0bf9f932b7d48a93415990181da5dd3fb3eec123 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Thu, 20 Feb 2025 15:44:49 -0800 Subject: [PATCH 2/4] Adjust handler logging. --- server/opensearch/os-handler.js | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/server/opensearch/os-handler.js b/server/opensearch/os-handler.js index 3323f5f62..60ed25c22 100644 --- a/server/opensearch/os-handler.js +++ b/server/opensearch/os-handler.js @@ -25,10 +25,6 @@ async function OpenSearchUpdateHandler(req, res) { switch (req.body.table.name) { case "jobs": - logger.log("os-handler-jobs", "DEBUG", req.user.email, null, { - jobid: req.body.event.data.new.id, - bodyshopid: req.body.event.data.new.shopid - }); document = pick(req.body.event.data.new, [ "id", "bodyshopid", @@ -53,10 +49,6 @@ async function OpenSearchUpdateHandler(req, res) { document.bodyshopid = req.body.event.data.new.shopid; break; case "vehicles": - logger.log("os-handler-vehicles", "DEBUG", req.user.email, null, { - vehicleid: req.body.event.data.new.id, - bodyshopid: req.body.event.data.new.shopid - }); document = pick(req.body.event.data.new, [ "id", "v_model_yr", @@ -69,10 +61,6 @@ async function OpenSearchUpdateHandler(req, res) { document.bodyshopid = req.body.event.data.new.shopid; break; case "owners": - logger.log("os-handler-owners", "DEBUG", req.user.email, null, { - ownerid: req.body.event.data.new.id, - bodyshopid: req.body.event.data.new.shopid - }); document = pick(req.body.event.data.new, ["id", "ownr_fn", "ownr_ln", "ownr_co_nm", "ownr_ph1", "ownr_ph2"]); document.bodyshopid = req.body.event.data.new.shopid; break; @@ -108,11 +96,6 @@ async function OpenSearchUpdateHandler(req, res) { ...bill.bills_by_pk, bodyshopid: bill.bills_by_pk.job.shopid }; - - logger.log("os-handler-bills", "DEBUG", req.user.email, null, { - billid: req.body.event.data.new.id, - bodyshopid: bill.bills_by_pk.job.shopid - }); break; case "payments": //Query to get the job and RO number @@ -157,10 +140,6 @@ async function OpenSearchUpdateHandler(req, res) { ...payment.payments_by_pk, bodyshopid: payment.payments_by_pk.job.shopid }; - logger.log("os-handler-payments", "DEBUG", req.user.email, null, { - paymentid: req.body.event.data.new.id, - bodyshopid: payment.payments_by_pk.job.shopid - }); break; } const payload = { @@ -169,6 +148,13 @@ async function OpenSearchUpdateHandler(req, res) { body: document }; + logger.log("os-handler", "DEBUG", req.user.email, null, { + id: req.body.event.data.new.id, + index: req.body.table.name, + bodyshopid: payload.body.bodyshopid + // body: document + }); + const response = await osClient.index(payload); //console.log(response.body); res.status(200).json(response.body); From f860931eab08dc91246156657335757b8655c271 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Thu, 20 Feb 2025 16:35:47 -0800 Subject: [PATCH 3/4] Remove email from handler. --- server/opensearch/os-handler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/opensearch/os-handler.js b/server/opensearch/os-handler.js index 60ed25c22..988ab1c84 100644 --- a/server/opensearch/os-handler.js +++ b/server/opensearch/os-handler.js @@ -148,7 +148,7 @@ async function OpenSearchUpdateHandler(req, res) { body: document }; - logger.log("os-handler", "DEBUG", req.user.email, null, { + logger.log("os-handler", "DEBUG", null, null, { id: req.body.event.data.new.id, index: req.body.table.name, bodyshopid: payload.body.bodyshopid From 459af4f53725cfaa4c43cfe225d7b33469ac4691 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Thu, 20 Feb 2025 16:39:20 -0800 Subject: [PATCH 4/4] Add catch error handling. --- server/opensearch/os-handler.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/server/opensearch/os-handler.js b/server/opensearch/os-handler.js index 988ab1c84..15eddea83 100644 --- a/server/opensearch/os-handler.js +++ b/server/opensearch/os-handler.js @@ -160,6 +160,13 @@ async function OpenSearchUpdateHandler(req, res) { res.status(200).json(response.body); } } catch (error) { + logger.log("os-handler-error", "ERROR", null, null, { + id: req.body.event.data.new.id, + index: req.body.table.name, + message: error.message, + stack: error.stack + // body: document + }); res.status(400).json(JSON.stringify(error)); } }