From 45cddb22646be67f60afcde3772fada3cb8361a2 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Fri, 6 Jan 2023 12:51:21 -0500 Subject: [PATCH] improve consistency in order checking once consistent, may be able to clean up --- helpers/lotOccupancyDB/getFeeCategories.js | 10 +++++----- helpers/lotOccupancyDB/getFeeCategories.ts | 12 ++++++------ helpers/lotOccupancyDB/getFees.js | 10 +++++----- helpers/lotOccupancyDB/getFees.ts | 12 ++++++------ helpers/lotOccupancyDB/getLotOccupantTypes.ts | 3 ++- helpers/lotOccupancyDB/getLotStatuses.ts | 3 ++- helpers/lotOccupancyDB/getLotTypeFields.js | 10 +++++----- helpers/lotOccupancyDB/getLotTypeFields.ts | 12 ++++++------ helpers/lotOccupancyDB/getOccupancyTypeFields.js | 10 +++++----- helpers/lotOccupancyDB/getOccupancyTypeFields.ts | 12 ++++++------ helpers/lotOccupancyDB/getWorkOrderTypes.ts | 3 ++- 11 files changed, 50 insertions(+), 47 deletions(-) diff --git a/helpers/lotOccupancyDB/getFeeCategories.js b/helpers/lotOccupancyDB/getFeeCategories.js index 1ded9851..89901524 100644 --- a/helpers/lotOccupancyDB/getFeeCategories.js +++ b/helpers/lotOccupancyDB/getFeeCategories.js @@ -32,13 +32,13 @@ export function getFeeCategories(filters, options) { " order by orderNumber, feeCategory") .all(sqlParameters); if (options.includeFees) { - let expectedFeeCategoryOrderNumber = -1; + let expectedOrderNumber = 0; for (const feeCategory of feeCategories) { - expectedFeeCategoryOrderNumber += 1; - if (updateOrderNumbers && feeCategory.orderNumber !== expectedFeeCategoryOrderNumber) { - updateRecordOrderNumber("FeeCategories", feeCategory.feeCategoryId, expectedFeeCategoryOrderNumber, database); - feeCategory.orderNumber = expectedFeeCategoryOrderNumber; + if (updateOrderNumbers && feeCategory.orderNumber !== expectedOrderNumber) { + updateRecordOrderNumber("FeeCategories", feeCategory.feeCategoryId, expectedOrderNumber, database); + feeCategory.orderNumber = expectedOrderNumber; } + expectedOrderNumber += 1; feeCategory.fees = getFees(feeCategory.feeCategoryId, filters, database); } } diff --git a/helpers/lotOccupancyDB/getFeeCategories.ts b/helpers/lotOccupancyDB/getFeeCategories.ts index 89ec7188..c02e70b0 100644 --- a/helpers/lotOccupancyDB/getFeeCategories.ts +++ b/helpers/lotOccupancyDB/getFeeCategories.ts @@ -60,22 +60,22 @@ export function getFeeCategories( .all(sqlParameters); if (options.includeFees) { - let expectedFeeCategoryOrderNumber = -1; + let expectedOrderNumber = 0; for (const feeCategory of feeCategories) { - expectedFeeCategoryOrderNumber += 1; - - if (updateOrderNumbers && feeCategory.orderNumber !== expectedFeeCategoryOrderNumber) { + if (updateOrderNumbers && feeCategory.orderNumber !== expectedOrderNumber) { updateRecordOrderNumber( "FeeCategories", feeCategory.feeCategoryId, - expectedFeeCategoryOrderNumber, + expectedOrderNumber, database ); - feeCategory.orderNumber = expectedFeeCategoryOrderNumber; + feeCategory.orderNumber = expectedOrderNumber; } + expectedOrderNumber += 1; + feeCategory.fees = getFees(feeCategory.feeCategoryId, filters, database); } } diff --git a/helpers/lotOccupancyDB/getFees.js b/helpers/lotOccupancyDB/getFees.js index 91f3fc05..4267f142 100644 --- a/helpers/lotOccupancyDB/getFees.js +++ b/helpers/lotOccupancyDB/getFees.js @@ -32,13 +32,13 @@ export function getFees(feeCategoryId, additionalFilters, connectedDatabase) { " order by f.orderNumber, f.feeName") .all(sqlParameters); if (updateOrderNumbers) { - let expectedFeeOrderNumber = -1; + let expectedOrderNumber = 0; for (const fee of fees) { - expectedFeeOrderNumber += 1; - if (fee.orderNumber !== expectedFeeOrderNumber) { - updateRecordOrderNumber("Fees", fee.feeId, expectedFeeOrderNumber, database); - fee.orderNumber = expectedFeeOrderNumber; + if (fee.orderNumber !== expectedOrderNumber) { + updateRecordOrderNumber("Fees", fee.feeId, expectedOrderNumber, database); + fee.orderNumber = expectedOrderNumber; } + expectedOrderNumber += 1; } } if (!connectedDatabase) { diff --git a/helpers/lotOccupancyDB/getFees.ts b/helpers/lotOccupancyDB/getFees.ts index 80327be3..2e3d1f8e 100644 --- a/helpers/lotOccupancyDB/getFees.ts +++ b/helpers/lotOccupancyDB/getFees.ts @@ -58,15 +58,15 @@ export function getFees( .all(sqlParameters); if (updateOrderNumbers) { - let expectedFeeOrderNumber = -1; + let expectedOrderNumber = 0; for (const fee of fees) { - expectedFeeOrderNumber += 1; - - if (fee.orderNumber !== expectedFeeOrderNumber) { - updateRecordOrderNumber("Fees", fee.feeId, expectedFeeOrderNumber, database); - fee.orderNumber = expectedFeeOrderNumber; + if (fee.orderNumber !== expectedOrderNumber) { + updateRecordOrderNumber("Fees", fee.feeId, expectedOrderNumber, database); + fee.orderNumber = expectedOrderNumber; } + + expectedOrderNumber += 1; } } diff --git a/helpers/lotOccupancyDB/getLotOccupantTypes.ts b/helpers/lotOccupancyDB/getLotOccupantTypes.ts index 350e6c80..ebefa9f5 100644 --- a/helpers/lotOccupancyDB/getLotOccupantTypes.ts +++ b/helpers/lotOccupancyDB/getLotOccupantTypes.ts @@ -2,9 +2,10 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import type * as recordTypes from "../../types/recordTypes"; import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js"; +import type * as recordTypes from "../../types/recordTypes"; + export function getLotOccupantTypes(): recordTypes.LotOccupantType[] { const database = sqlite(databasePath); diff --git a/helpers/lotOccupancyDB/getLotStatuses.ts b/helpers/lotOccupancyDB/getLotStatuses.ts index 9c1b03ef..8241ad7e 100644 --- a/helpers/lotOccupancyDB/getLotStatuses.ts +++ b/helpers/lotOccupancyDB/getLotStatuses.ts @@ -2,9 +2,10 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import type * as recordTypes from "../../types/recordTypes"; import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js"; +import type * as recordTypes from "../../types/recordTypes"; + export function getLotStatuses(): recordTypes.LotStatus[] { const database = sqlite(databasePath); diff --git a/helpers/lotOccupancyDB/getLotTypeFields.js b/helpers/lotOccupancyDB/getLotTypeFields.js index d431adc6..7eef7a44 100644 --- a/helpers/lotOccupancyDB/getLotTypeFields.js +++ b/helpers/lotOccupancyDB/getLotTypeFields.js @@ -12,13 +12,13 @@ export function getLotTypeFields(lotTypeId, connectedDatabase) { and lotTypeId = ? order by orderNumber, lotTypeField`) .all(lotTypeId); - let expectedFieldOrderNumber = -1; + let expectedOrderNumber = 0; for (const lotTypeField of lotTypeFields) { - expectedFieldOrderNumber += 1; - if (lotTypeField.orderNumber !== expectedFieldOrderNumber) { - updateRecordOrderNumber("LotTypeFields", lotTypeField.lotTypeFieldId, expectedFieldOrderNumber, database); - lotTypeField.orderNumber = expectedFieldOrderNumber; + if (lotTypeField.orderNumber !== expectedOrderNumber) { + updateRecordOrderNumber("LotTypeFields", lotTypeField.lotTypeFieldId, expectedOrderNumber, database); + lotTypeField.orderNumber = expectedOrderNumber; } + expectedOrderNumber += 1; } if (!connectedDatabase) { database.close(); diff --git a/helpers/lotOccupancyDB/getLotTypeFields.ts b/helpers/lotOccupancyDB/getLotTypeFields.ts index b8ae6e3a..7243651f 100644 --- a/helpers/lotOccupancyDB/getLotTypeFields.ts +++ b/helpers/lotOccupancyDB/getLotTypeFields.ts @@ -23,21 +23,21 @@ export function getLotTypeFields( ) .all(lotTypeId); - let expectedFieldOrderNumber = -1; + let expectedOrderNumber = 0; for (const lotTypeField of lotTypeFields) { - expectedFieldOrderNumber += 1; - - if (lotTypeField.orderNumber !== expectedFieldOrderNumber) { + if (lotTypeField.orderNumber !== expectedOrderNumber) { updateRecordOrderNumber( "LotTypeFields", lotTypeField.lotTypeFieldId, - expectedFieldOrderNumber, + expectedOrderNumber, database ); - lotTypeField.orderNumber = expectedFieldOrderNumber; + lotTypeField.orderNumber = expectedOrderNumber; } + + expectedOrderNumber += 1; } if (!connectedDatabase) { diff --git a/helpers/lotOccupancyDB/getOccupancyTypeFields.js b/helpers/lotOccupancyDB/getOccupancyTypeFields.js index c5b5205d..19007dcf 100644 --- a/helpers/lotOccupancyDB/getOccupancyTypeFields.js +++ b/helpers/lotOccupancyDB/getOccupancyTypeFields.js @@ -17,13 +17,13 @@ export function getOccupancyTypeFields(occupancyTypeId, connectedDatabase) { (occupancyTypeId ? " and occupancyTypeId = ?" : " and occupancyTypeId is null") + " order by orderNumber, occupancyTypeField") .all(sqlParameters); - let expectedFieldOrderNumber = -1; + let expectedOrderNumber = 0; for (const occupancyTypeField of occupancyTypeFields) { - expectedFieldOrderNumber += 1; - if (occupancyTypeField.orderNumber !== expectedFieldOrderNumber) { - updateRecordOrderNumber("OccupancyTypeFields", occupancyTypeField.occupancyTypeFieldId, expectedFieldOrderNumber, database); - occupancyTypeField.orderNumber = expectedFieldOrderNumber; + if (occupancyTypeField.orderNumber !== expectedOrderNumber) { + updateRecordOrderNumber("OccupancyTypeFields", occupancyTypeField.occupancyTypeFieldId, expectedOrderNumber, database); + occupancyTypeField.orderNumber = expectedOrderNumber; } + expectedOrderNumber += 1; } if (!connectedDatabase) { database.close(); diff --git a/helpers/lotOccupancyDB/getOccupancyTypeFields.ts b/helpers/lotOccupancyDB/getOccupancyTypeFields.ts index 39df325b..6fa49065 100644 --- a/helpers/lotOccupancyDB/getOccupancyTypeFields.ts +++ b/helpers/lotOccupancyDB/getOccupancyTypeFields.ts @@ -30,21 +30,21 @@ export function getOccupancyTypeFields( ) .all(sqlParameters); - let expectedFieldOrderNumber = -1; + let expectedOrderNumber = 0; for (const occupancyTypeField of occupancyTypeFields) { - expectedFieldOrderNumber += 1; - - if (occupancyTypeField.orderNumber !== expectedFieldOrderNumber) { + if (occupancyTypeField.orderNumber !== expectedOrderNumber) { updateRecordOrderNumber( "OccupancyTypeFields", occupancyTypeField.occupancyTypeFieldId, - expectedFieldOrderNumber, + expectedOrderNumber, database ); - occupancyTypeField.orderNumber = expectedFieldOrderNumber; + occupancyTypeField.orderNumber = expectedOrderNumber; } + + expectedOrderNumber += 1; } if (!connectedDatabase) { diff --git a/helpers/lotOccupancyDB/getWorkOrderTypes.ts b/helpers/lotOccupancyDB/getWorkOrderTypes.ts index 6609e110..ae0ae3f7 100644 --- a/helpers/lotOccupancyDB/getWorkOrderTypes.ts +++ b/helpers/lotOccupancyDB/getWorkOrderTypes.ts @@ -2,9 +2,10 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import type * as recordTypes from "../../types/recordTypes"; import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js"; +import type * as recordTypes from "../../types/recordTypes"; + export function getWorkOrderTypes(): recordTypes.WorkOrderType[] { const database = sqlite(databasePath);