From e262651a038e478c3fda3858bd802f7dc09f8992 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Wed, 19 Apr 2023 09:43:11 -0400 Subject: [PATCH] don't do gp integration on search --- .../lotOccupancies-post/doAddLotOccupancyTransaction.js | 2 +- .../lotOccupancies-post/doAddLotOccupancyTransaction.ts | 3 ++- .../doDeleteLotOccupancyTransaction.js | 2 +- .../doDeleteLotOccupancyTransaction.ts | 3 ++- .../doUpdateLotOccupancyTransaction.js | 2 +- .../doUpdateLotOccupancyTransaction.ts | 3 ++- helpers/lotOccupancyDB/getLotOccupancies.js | 2 +- helpers/lotOccupancyDB/getLotOccupancies.ts | 1 + helpers/lotOccupancyDB/getLotOccupancy.js | 2 +- helpers/lotOccupancyDB/getLotOccupancy.ts | 1 + helpers/lotOccupancyDB/getLotOccupancyTransactions.d.ts | 4 +++- helpers/lotOccupancyDB/getLotOccupancyTransactions.js | 5 +++-- helpers/lotOccupancyDB/getLotOccupancyTransactions.ts | 8 +++++++- 13 files changed, 26 insertions(+), 12 deletions(-) diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.js b/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.js index e87f2d4d..0589001b 100644 --- a/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.js +++ b/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.js @@ -2,7 +2,7 @@ import { addLotOccupancyTransaction } from '../../helpers/lotOccupancyDB/addLotO import { getLotOccupancyTransactions } from '../../helpers/lotOccupancyDB/getLotOccupancyTransactions.js'; export async function handler(request, response) { await addLotOccupancyTransaction(request.body, request.session); - const lotOccupancyTransactions = await getLotOccupancyTransactions(request.body.lotOccupancyId); + const lotOccupancyTransactions = await getLotOccupancyTransactions(request.body.lotOccupancyId, { includeIntegrations: true }); response.json({ success: true, lotOccupancyTransactions diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.ts b/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.ts index 04942ed8..e26888e3 100644 --- a/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.ts +++ b/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.ts @@ -11,7 +11,8 @@ export async function handler( await addLotOccupancyTransaction(request.body, request.session) const lotOccupancyTransactions = await getLotOccupancyTransactions( - request.body.lotOccupancyId + request.body.lotOccupancyId, + { includeIntegrations: true } ) response.json({ diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.js b/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.js index 0e667e5f..2419cc41 100644 --- a/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.js +++ b/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.js @@ -2,7 +2,7 @@ import { deleteLotOccupancyTransaction } from '../../helpers/lotOccupancyDB/dele import { getLotOccupancyTransactions } from '../../helpers/lotOccupancyDB/getLotOccupancyTransactions.js'; export async function handler(request, response) { const success = await deleteLotOccupancyTransaction(request.body.lotOccupancyId, request.body.transactionIndex, request.session); - const lotOccupancyTransactions = await getLotOccupancyTransactions(request.body.lotOccupancyId); + const lotOccupancyTransactions = await getLotOccupancyTransactions(request.body.lotOccupancyId, { includeIntegrations: true }); response.json({ success, lotOccupancyTransactions diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.ts b/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.ts index 65030265..2f4d5c9d 100644 --- a/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.ts +++ b/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.ts @@ -15,7 +15,8 @@ export async function handler( ) const lotOccupancyTransactions = await getLotOccupancyTransactions( - request.body.lotOccupancyId + request.body.lotOccupancyId, + { includeIntegrations: true } ) response.json({ diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.js b/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.js index b8e209df..9f9de2e3 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.js +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.js @@ -2,7 +2,7 @@ import { updateLotOccupancyTransaction } from '../../helpers/lotOccupancyDB/upda import { getLotOccupancyTransactions } from '../../helpers/lotOccupancyDB/getLotOccupancyTransactions.js'; export async function handler(request, response) { await updateLotOccupancyTransaction(request.body, request.session); - const lotOccupancyTransactions = await getLotOccupancyTransactions(request.body.lotOccupancyId); + const lotOccupancyTransactions = await getLotOccupancyTransactions(request.body.lotOccupancyId, { includeIntegrations: true }); response.json({ success: true, lotOccupancyTransactions diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.ts b/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.ts index beb3f506..86091fb2 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.ts +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.ts @@ -11,7 +11,8 @@ export async function handler( await updateLotOccupancyTransaction(request.body, request.session) const lotOccupancyTransactions = await getLotOccupancyTransactions( - request.body.lotOccupancyId + request.body.lotOccupancyId, + { includeIntegrations: true } ) response.json({ diff --git a/helpers/lotOccupancyDB/getLotOccupancies.js b/helpers/lotOccupancyDB/getLotOccupancies.js index 529909fa..12a21eee 100644 --- a/helpers/lotOccupancyDB/getLotOccupancies.js +++ b/helpers/lotOccupancyDB/getLotOccupancies.js @@ -70,7 +70,7 @@ async function addInclusions(lotOccupancy, options, database) { lotOccupancy.lotOccupancyFees = await getLotOccupancyFees(lotOccupancy.lotOccupancyId, database); } if (options.includeTransactions) { - lotOccupancy.lotOccupancyTransactions = await getLotOccupancyTransactions(lotOccupancy.lotOccupancyId, database); + lotOccupancy.lotOccupancyTransactions = await getLotOccupancyTransactions(lotOccupancy.lotOccupancyId, { includeIntegrations: false }, database); } if (options.includeOccupants) { lotOccupancy.lotOccupancyOccupants = await getLotOccupancyOccupants(lotOccupancy.lotOccupancyId, database); diff --git a/helpers/lotOccupancyDB/getLotOccupancies.ts b/helpers/lotOccupancyDB/getLotOccupancies.ts index a108717f..ce1d17b5 100644 --- a/helpers/lotOccupancyDB/getLotOccupancies.ts +++ b/helpers/lotOccupancyDB/getLotOccupancies.ts @@ -150,6 +150,7 @@ async function addInclusions( if (options.includeTransactions) { lotOccupancy.lotOccupancyTransactions = await getLotOccupancyTransactions( lotOccupancy.lotOccupancyId!, + { includeIntegrations: false }, database ) } diff --git a/helpers/lotOccupancyDB/getLotOccupancy.js b/helpers/lotOccupancyDB/getLotOccupancy.js index 69e28213..62c843d4 100644 --- a/helpers/lotOccupancyDB/getLotOccupancy.js +++ b/helpers/lotOccupancyDB/getLotOccupancy.js @@ -29,7 +29,7 @@ export async function getLotOccupancy(lotOccupancyId, connectedDatabase) { lotOccupancy.lotOccupancyOccupants = await getLotOccupancyOccupants(lotOccupancyId, database); lotOccupancy.lotOccupancyComments = await getLotOccupancyComments(lotOccupancyId, database); lotOccupancy.lotOccupancyFees = await getLotOccupancyFees(lotOccupancyId, database); - lotOccupancy.lotOccupancyTransactions = await getLotOccupancyTransactions(lotOccupancyId, database); + lotOccupancy.lotOccupancyTransactions = await getLotOccupancyTransactions(lotOccupancyId, { includeIntegrations: true }, database); const workOrdersResults = await getWorkOrders({ lotOccupancyId }, { diff --git a/helpers/lotOccupancyDB/getLotOccupancy.ts b/helpers/lotOccupancyDB/getLotOccupancy.ts index 8ff7a579..1187fec6 100644 --- a/helpers/lotOccupancyDB/getLotOccupancy.ts +++ b/helpers/lotOccupancyDB/getLotOccupancy.ts @@ -57,6 +57,7 @@ export async function getLotOccupancy( ) lotOccupancy.lotOccupancyTransactions = await getLotOccupancyTransactions( lotOccupancyId, + { includeIntegrations: true }, database ) diff --git a/helpers/lotOccupancyDB/getLotOccupancyTransactions.d.ts b/helpers/lotOccupancyDB/getLotOccupancyTransactions.d.ts index b1a4f43a..6eae95f8 100644 --- a/helpers/lotOccupancyDB/getLotOccupancyTransactions.d.ts +++ b/helpers/lotOccupancyDB/getLotOccupancyTransactions.d.ts @@ -1,4 +1,6 @@ import type { PoolConnection } from 'better-sqlite-pool'; import type * as recordTypes from '../../types/recordTypes'; -export declare function getLotOccupancyTransactions(lotOccupancyId: number | string, connectedDatabase?: PoolConnection): Promise; +export declare function getLotOccupancyTransactions(lotOccupancyId: number | string, options: { + includeIntegrations: boolean; +}, connectedDatabase?: PoolConnection): Promise; export default getLotOccupancyTransactions; diff --git a/helpers/lotOccupancyDB/getLotOccupancyTransactions.js b/helpers/lotOccupancyDB/getLotOccupancyTransactions.js index 555ece15..c6e14662 100644 --- a/helpers/lotOccupancyDB/getLotOccupancyTransactions.js +++ b/helpers/lotOccupancyDB/getLotOccupancyTransactions.js @@ -2,7 +2,7 @@ import { acquireConnection } from './pool.js'; import { dateIntegerToString, timeIntegerToString } from '@cityssm/utils-datetime'; import * as configFunctions from '../functions.config.js'; import * as gpFunctions from '../functions.dynamicsGP.js'; -export async function getLotOccupancyTransactions(lotOccupancyId, connectedDatabase) { +export async function getLotOccupancyTransactions(lotOccupancyId, options, connectedDatabase) { const database = connectedDatabase ?? (await acquireConnection()); database.function('userFn_dateIntegerToString', dateIntegerToString); database.function('userFn_timeIntegerToString', timeIntegerToString); @@ -19,7 +19,8 @@ export async function getLotOccupancyTransactions(lotOccupancyId, connectedDatab if (connectedDatabase === undefined) { database.release(); } - if (configFunctions.getProperty('settings.dynamicsGP.integrationIsEnabled')) { + if ((options?.includeIntegrations ?? false) && + configFunctions.getProperty('settings.dynamicsGP.integrationIsEnabled')) { for (const transaction of lotOccupancyTransactions) { if ((transaction.externalReceiptNumber ?? '') !== '') { const gpDocument = await gpFunctions.getDynamicsGPDocument(transaction.externalReceiptNumber); diff --git a/helpers/lotOccupancyDB/getLotOccupancyTransactions.ts b/helpers/lotOccupancyDB/getLotOccupancyTransactions.ts index eb14e554..bee3759d 100644 --- a/helpers/lotOccupancyDB/getLotOccupancyTransactions.ts +++ b/helpers/lotOccupancyDB/getLotOccupancyTransactions.ts @@ -13,6 +13,9 @@ import type * as recordTypes from '../../types/recordTypes' export async function getLotOccupancyTransactions( lotOccupancyId: number | string, + options: { + includeIntegrations: boolean + }, connectedDatabase?: PoolConnection ): Promise { const database = connectedDatabase ?? (await acquireConnection()) @@ -37,7 +40,10 @@ export async function getLotOccupancyTransactions( database.release() } - if (configFunctions.getProperty('settings.dynamicsGP.integrationIsEnabled')) { + if ( + (options?.includeIntegrations ?? false) && + configFunctions.getProperty('settings.dynamicsGP.integrationIsEnabled') + ) { for (const transaction of lotOccupancyTransactions) { if ((transaction.externalReceiptNumber ?? '') !== '') { const gpDocument = await gpFunctions.getDynamicsGPDocument(