From 3af27e073908e4a33ca3add0894baab59887d0ff Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Fri, 6 Jan 2023 12:26:53 -0500 Subject: [PATCH] remove duplicate add and clear cache --- handlers/admin-post/doAddFeeCategory.js | 4 +- handlers/admin-post/doAddFeeCategory.ts | 9 ++- handlers/admin-post/doAddLotStatus.js | 4 +- handlers/admin-post/doAddLotStatus.ts | 10 +++- handlers/admin-post/doAddLotType.js | 4 +- handlers/admin-post/doAddLotType.ts | 10 +++- handlers/admin-post/doAddOccupancyType.js | 4 +- handlers/admin-post/doAddOccupancyType.ts | 10 +++- .../admin-post/doAddWorkOrderMilestoneType.js | 4 +- .../admin-post/doAddWorkOrderMilestoneType.ts | 10 +++- handlers/admin-post/doAddWorkOrderType.js | 4 +- handlers/admin-post/doAddWorkOrderType.ts | 10 +++- helpers/functions.cache.d.ts | 7 +-- helpers/functions.cache.js | 43 ++++++++++++-- helpers/functions.cache.ts | 57 +++++++++++++++---- helpers/lotOccupancyDB/addFeeCategory.d.ts | 7 --- helpers/lotOccupancyDB/addFeeCategory.js | 6 -- helpers/lotOccupancyDB/addFeeCategory.ts | 24 -------- helpers/lotOccupancyDB/addLotOccupantType.js | 4 +- helpers/lotOccupancyDB/addLotOccupantType.ts | 4 +- helpers/lotOccupancyDB/addLotStatus.d.ts | 7 --- helpers/lotOccupancyDB/addLotStatus.js | 8 --- helpers/lotOccupancyDB/addLotStatus.ts | 27 --------- helpers/lotOccupancyDB/addLotType.d.ts | 7 --- helpers/lotOccupancyDB/addLotType.js | 8 --- helpers/lotOccupancyDB/addLotType.ts | 24 -------- helpers/lotOccupancyDB/addLotTypeField.js | 4 +- helpers/lotOccupancyDB/addLotTypeField.ts | 5 +- helpers/lotOccupancyDB/addOccupancyType.d.ts | 7 --- helpers/lotOccupancyDB/addOccupancyType.js | 8 --- helpers/lotOccupancyDB/addOccupancyType.ts | 27 --------- .../lotOccupancyDB/addOccupancyTypeField.js | 4 +- .../lotOccupancyDB/addOccupancyTypeField.ts | 4 +- .../lotOccupancyDB/addOccupancyTypePrint.js | 4 +- .../lotOccupancyDB/addOccupancyTypePrint.ts | 4 +- helpers/lotOccupancyDB/addRecord.js | 2 + helpers/lotOccupancyDB/addRecord.ts | 3 + .../addWorkOrderMilestoneType.d.ts | 7 --- .../addWorkOrderMilestoneType.js | 8 --- .../addWorkOrderMilestoneType.ts | 27 --------- helpers/lotOccupancyDB/addWorkOrderType.d.ts | 7 --- helpers/lotOccupancyDB/addWorkOrderType.js | 8 --- helpers/lotOccupancyDB/addWorkOrderType.ts | 27 --------- .../deleteOccupancyTypePrint.js | 4 +- .../deleteOccupancyTypePrint.ts | 4 +- helpers/lotOccupancyDB/deleteRecord.js | 15 +---- helpers/lotOccupancyDB/deleteRecord.ts | 16 +----- .../lotOccupancyDB/moveLotOccupantTypeDown.js | 3 - .../lotOccupancyDB/moveLotOccupantTypeDown.ts | 3 - .../lotOccupancyDB/moveLotOccupantTypeUp.js | 3 - .../lotOccupancyDB/moveLotOccupantTypeUp.ts | 3 - helpers/lotOccupancyDB/moveLotStatusDown.js | 3 - helpers/lotOccupancyDB/moveLotStatusDown.ts | 3 - helpers/lotOccupancyDB/moveLotStatusUp.js | 3 - helpers/lotOccupancyDB/moveLotStatusUp.ts | 3 - helpers/lotOccupancyDB/moveLotTypeDown.js | 3 - helpers/lotOccupancyDB/moveLotTypeDown.ts | 3 - .../lotOccupancyDB/moveLotTypeFieldDown.js | 6 +- .../lotOccupancyDB/moveLotTypeFieldDown.ts | 6 +- helpers/lotOccupancyDB/moveLotTypeFieldUp.js | 6 +- helpers/lotOccupancyDB/moveLotTypeFieldUp.ts | 6 +- helpers/lotOccupancyDB/moveLotTypeUp.js | 3 - helpers/lotOccupancyDB/moveLotTypeUp.ts | 3 - .../lotOccupancyDB/moveOccupancyTypeDown.js | 3 - .../lotOccupancyDB/moveOccupancyTypeDown.ts | 3 - .../moveOccupancyTypeFieldDown.js | 6 +- .../moveOccupancyTypeFieldDown.ts | 6 +- .../moveOccupancyTypeFieldUp.js | 6 +- .../moveOccupancyTypeFieldUp.ts | 6 +- .../moveOccupancyTypePrintDown.js | 6 +- .../moveOccupancyTypePrintDown.ts | 6 +- .../moveOccupancyTypePrintUp.js | 6 +- .../moveOccupancyTypePrintUp.ts | 6 +- helpers/lotOccupancyDB/moveOccupancyTypeUp.js | 3 - helpers/lotOccupancyDB/moveOccupancyTypeUp.ts | 3 - helpers/lotOccupancyDB/moveRecord.js | 5 ++ helpers/lotOccupancyDB/moveRecord.ts | 9 +++ .../moveWorkOrderMilestoneTypeDown.js | 3 - .../moveWorkOrderMilestoneTypeDown.ts | 3 - .../moveWorkOrderMilestoneTypeUp.js | 3 - .../moveWorkOrderMilestoneTypeUp.ts | 3 - .../lotOccupancyDB/moveWorkOrderTypeDown.js | 3 - .../lotOccupancyDB/moveWorkOrderTypeDown.ts | 3 - helpers/lotOccupancyDB/moveWorkOrderTypeUp.js | 3 - helpers/lotOccupancyDB/moveWorkOrderTypeUp.ts | 3 - .../lotOccupancyDB/updateLotOccupantType.js | 4 +- .../lotOccupancyDB/updateLotOccupantType.ts | 4 +- helpers/lotOccupancyDB/updateLotTypeField.js | 4 +- helpers/lotOccupancyDB/updateLotTypeField.ts | 4 +- .../updateOccupancyTypeField.js | 4 +- .../updateOccupancyTypeField.ts | 4 +- helpers/lotOccupancyDB/updateRecord.d.ts | 1 - helpers/lotOccupancyDB/updateRecord.js | 12 +--- helpers/lotOccupancyDB/updateRecord.ts | 13 +---- 94 files changed, 233 insertions(+), 486 deletions(-) delete mode 100644 helpers/lotOccupancyDB/addFeeCategory.d.ts delete mode 100644 helpers/lotOccupancyDB/addFeeCategory.js delete mode 100644 helpers/lotOccupancyDB/addFeeCategory.ts delete mode 100644 helpers/lotOccupancyDB/addLotStatus.d.ts delete mode 100644 helpers/lotOccupancyDB/addLotStatus.js delete mode 100644 helpers/lotOccupancyDB/addLotStatus.ts delete mode 100644 helpers/lotOccupancyDB/addLotType.d.ts delete mode 100644 helpers/lotOccupancyDB/addLotType.js delete mode 100644 helpers/lotOccupancyDB/addLotType.ts delete mode 100644 helpers/lotOccupancyDB/addOccupancyType.d.ts delete mode 100644 helpers/lotOccupancyDB/addOccupancyType.js delete mode 100644 helpers/lotOccupancyDB/addOccupancyType.ts delete mode 100644 helpers/lotOccupancyDB/addWorkOrderMilestoneType.d.ts delete mode 100644 helpers/lotOccupancyDB/addWorkOrderMilestoneType.js delete mode 100644 helpers/lotOccupancyDB/addWorkOrderMilestoneType.ts delete mode 100644 helpers/lotOccupancyDB/addWorkOrderType.d.ts delete mode 100644 helpers/lotOccupancyDB/addWorkOrderType.js delete mode 100644 helpers/lotOccupancyDB/addWorkOrderType.ts diff --git a/handlers/admin-post/doAddFeeCategory.js b/handlers/admin-post/doAddFeeCategory.js index 71c74d27..dabd63e4 100644 --- a/handlers/admin-post/doAddFeeCategory.js +++ b/handlers/admin-post/doAddFeeCategory.js @@ -1,7 +1,7 @@ -import { addFeeCategory } from "../../helpers/lotOccupancyDB/addFeeCategory.js"; +import { addRecord } from "../../helpers/lotOccupancyDB/addRecord.js"; import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js"; export const handler = async (request, response) => { - const feeCategoryId = addFeeCategory(request.body, request.session); + const feeCategoryId = addRecord("FeeCategories", request.body.feeCategory, request.body.orderNumber || -1, request.session); const feeCategories = getFeeCategories({}, { includeFees: true }); diff --git a/handlers/admin-post/doAddFeeCategory.ts b/handlers/admin-post/doAddFeeCategory.ts index bb80eafd..ef9c748a 100644 --- a/handlers/admin-post/doAddFeeCategory.ts +++ b/handlers/admin-post/doAddFeeCategory.ts @@ -1,11 +1,16 @@ import type { RequestHandler } from "express"; -import { addFeeCategory } from "../../helpers/lotOccupancyDB/addFeeCategory.js"; +import { addRecord } from "../../helpers/lotOccupancyDB/addRecord.js"; import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js"; export const handler: RequestHandler = async (request, response) => { - const feeCategoryId = addFeeCategory(request.body, request.session); + const feeCategoryId = addRecord( + "FeeCategories", + request.body.feeCategory, + request.body.orderNumber || -1, + request.session + ); const feeCategories = getFeeCategories( {}, diff --git a/handlers/admin-post/doAddLotStatus.js b/handlers/admin-post/doAddLotStatus.js index d508d38f..c573c802 100644 --- a/handlers/admin-post/doAddLotStatus.js +++ b/handlers/admin-post/doAddLotStatus.js @@ -1,7 +1,7 @@ -import { addLotStatus } from "../../helpers/lotOccupancyDB/addLotStatus.js"; +import { addRecord } from "../../helpers/lotOccupancyDB/addRecord.js"; import { getLotStatuses } from "../../helpers/functions.cache.js"; export const handler = async (request, response) => { - const lotStatusId = addLotStatus(request.body, request.session); + const lotStatusId = addRecord("LotStatuses", request.body.lotStatus, request.body.orderNumber || -1, request.session); const lotStatuses = getLotStatuses(); response.json({ success: true, diff --git a/handlers/admin-post/doAddLotStatus.ts b/handlers/admin-post/doAddLotStatus.ts index e163b9cc..94e11645 100644 --- a/handlers/admin-post/doAddLotStatus.ts +++ b/handlers/admin-post/doAddLotStatus.ts @@ -1,11 +1,15 @@ import type { RequestHandler } from "express"; -import { addLotStatus } from "../../helpers/lotOccupancyDB/addLotStatus.js"; - +import { addRecord } from "../../helpers/lotOccupancyDB/addRecord.js"; import { getLotStatuses } from "../../helpers/functions.cache.js"; export const handler: RequestHandler = async (request, response) => { - const lotStatusId = addLotStatus(request.body, request.session); + const lotStatusId = addRecord( + "LotStatuses", + request.body.lotStatus, + request.body.orderNumber || -1, + request.session + ); const lotStatuses = getLotStatuses(); diff --git a/handlers/admin-post/doAddLotType.js b/handlers/admin-post/doAddLotType.js index 2831a4ea..ee9d343b 100644 --- a/handlers/admin-post/doAddLotType.js +++ b/handlers/admin-post/doAddLotType.js @@ -1,7 +1,7 @@ -import { addLotType } from "../../helpers/lotOccupancyDB/addLotType.js"; +import { addRecord } from "../../helpers/lotOccupancyDB/addRecord.js"; import { getLotTypes } from "../../helpers/functions.cache.js"; export const handler = async (request, response) => { - const lotTypeId = addLotType(request.body, request.session); + const lotTypeId = addRecord("LotTypes", request.body.lotType, request.body.orderNumber || -1, request.session); const lotTypes = getLotTypes(); response.json({ success: true, diff --git a/handlers/admin-post/doAddLotType.ts b/handlers/admin-post/doAddLotType.ts index 63db8f25..0787dae4 100644 --- a/handlers/admin-post/doAddLotType.ts +++ b/handlers/admin-post/doAddLotType.ts @@ -1,11 +1,15 @@ import type { RequestHandler } from "express"; -import { addLotType } from "../../helpers/lotOccupancyDB/addLotType.js"; - +import { addRecord } from "../../helpers/lotOccupancyDB/addRecord.js"; import { getLotTypes } from "../../helpers/functions.cache.js"; export const handler: RequestHandler = async (request, response) => { - const lotTypeId = addLotType(request.body, request.session); + const lotTypeId = addRecord( + "LotTypes", + request.body.lotType, + request.body.orderNumber || -1, + request.session + ); const lotTypes = getLotTypes(); diff --git a/handlers/admin-post/doAddOccupancyType.js b/handlers/admin-post/doAddOccupancyType.js index 70ba7845..f9e5e3ff 100644 --- a/handlers/admin-post/doAddOccupancyType.js +++ b/handlers/admin-post/doAddOccupancyType.js @@ -1,7 +1,7 @@ -import { addOccupancyType } from "../../helpers/lotOccupancyDB/addOccupancyType.js"; +import { addRecord } from "../../helpers/lotOccupancyDB/addRecord.js"; import { getAllOccupancyTypeFields, getOccupancyTypes } from "../../helpers/functions.cache.js"; export const handler = async (request, response) => { - const occupancyTypeId = addOccupancyType(request.body, request.session); + const occupancyTypeId = addRecord("OccupancyTypes", request.body.occupancyType, request.body.orderNumber || -1, request.session); const occupancyTypes = getOccupancyTypes(); const allOccupancyTypeFields = getAllOccupancyTypeFields(); response.json({ diff --git a/handlers/admin-post/doAddOccupancyType.ts b/handlers/admin-post/doAddOccupancyType.ts index 1551b430..acdb7660 100644 --- a/handlers/admin-post/doAddOccupancyType.ts +++ b/handlers/admin-post/doAddOccupancyType.ts @@ -1,11 +1,15 @@ import type { RequestHandler } from "express"; -import { addOccupancyType } from "../../helpers/lotOccupancyDB/addOccupancyType.js"; - +import { addRecord } from "../../helpers/lotOccupancyDB/addRecord.js"; import { getAllOccupancyTypeFields, getOccupancyTypes } from "../../helpers/functions.cache.js"; export const handler: RequestHandler = async (request, response) => { - const occupancyTypeId = addOccupancyType(request.body, request.session); + const occupancyTypeId = addRecord( + "OccupancyTypes", + request.body.occupancyType, + request.body.orderNumber || -1, + request.session + ); const occupancyTypes = getOccupancyTypes(); const allOccupancyTypeFields = getAllOccupancyTypeFields(); diff --git a/handlers/admin-post/doAddWorkOrderMilestoneType.js b/handlers/admin-post/doAddWorkOrderMilestoneType.js index 3fea74d1..32e7beb0 100644 --- a/handlers/admin-post/doAddWorkOrderMilestoneType.js +++ b/handlers/admin-post/doAddWorkOrderMilestoneType.js @@ -1,7 +1,7 @@ -import { addWorkOrderMilestoneType } from "../../helpers/lotOccupancyDB/addWorkOrderMilestoneType.js"; import { getWorkOrderMilestoneTypes } from "../../helpers/functions.cache.js"; +import { addRecord } from "../../helpers/lotOccupancyDB/addRecord.js"; export const handler = async (request, response) => { - const workOrderMilestoneTypeId = addWorkOrderMilestoneType(request.body, request.session); + const workOrderMilestoneTypeId = addRecord("WorkOrderMilestoneTypes", request.body.workOrderMilestoneType, request.body.orderNumber || -1, request.session); const workOrderMilestoneTypes = getWorkOrderMilestoneTypes(); response.json({ success: true, diff --git a/handlers/admin-post/doAddWorkOrderMilestoneType.ts b/handlers/admin-post/doAddWorkOrderMilestoneType.ts index 3f06bf1f..775aaa8a 100644 --- a/handlers/admin-post/doAddWorkOrderMilestoneType.ts +++ b/handlers/admin-post/doAddWorkOrderMilestoneType.ts @@ -1,11 +1,15 @@ import type { RequestHandler } from "express"; -import { addWorkOrderMilestoneType } from "../../helpers/lotOccupancyDB/addWorkOrderMilestoneType.js"; - import { getWorkOrderMilestoneTypes } from "../../helpers/functions.cache.js"; +import { addRecord } from "../../helpers/lotOccupancyDB/addRecord.js"; export const handler: RequestHandler = async (request, response) => { - const workOrderMilestoneTypeId = addWorkOrderMilestoneType(request.body, request.session); + const workOrderMilestoneTypeId = addRecord( + "WorkOrderMilestoneTypes", + request.body.workOrderMilestoneType, + request.body.orderNumber || -1, + request.session + ); const workOrderMilestoneTypes = getWorkOrderMilestoneTypes(); diff --git a/handlers/admin-post/doAddWorkOrderType.js b/handlers/admin-post/doAddWorkOrderType.js index 2ccfd8d8..865addb1 100644 --- a/handlers/admin-post/doAddWorkOrderType.js +++ b/handlers/admin-post/doAddWorkOrderType.js @@ -1,7 +1,7 @@ -import { addWorkOrderType } from "../../helpers/lotOccupancyDB/addWorkOrderType.js"; +import { addRecord } from "../../helpers/lotOccupancyDB/addRecord.js"; import { getWorkOrderTypes } from "../../helpers/functions.cache.js"; export const handler = async (request, response) => { - const workOrderTypeId = addWorkOrderType(request.body, request.session); + const workOrderTypeId = addRecord("WorkOrderTypes", request.body.workOrderType, request.body.orderNumber || -1, request.session); const workOrderTypes = getWorkOrderTypes(); response.json({ success: true, diff --git a/handlers/admin-post/doAddWorkOrderType.ts b/handlers/admin-post/doAddWorkOrderType.ts index 42df698a..fa10e98e 100644 --- a/handlers/admin-post/doAddWorkOrderType.ts +++ b/handlers/admin-post/doAddWorkOrderType.ts @@ -1,11 +1,15 @@ import type { RequestHandler } from "express"; -import { addWorkOrderType } from "../../helpers/lotOccupancyDB/addWorkOrderType.js"; - +import { addRecord } from "../../helpers/lotOccupancyDB/addRecord.js"; import { getWorkOrderTypes } from "../../helpers/functions.cache.js"; export const handler: RequestHandler = async (request, response) => { - const workOrderTypeId = addWorkOrderType(request.body, request.session); + const workOrderTypeId = addRecord( + "WorkOrderTypes", + request.body.workOrderType, + request.body.orderNumber || -1, + request.session + ); const workOrderTypes = getWorkOrderTypes(); diff --git a/helpers/functions.cache.d.ts b/helpers/functions.cache.d.ts index 78eda851..78320b98 100644 --- a/helpers/functions.cache.d.ts +++ b/helpers/functions.cache.d.ts @@ -2,25 +2,20 @@ import type * as recordTypes from "../types/recordTypes"; export declare function getLotOccupantTypes(): recordTypes.LotOccupantType[]; export declare function getLotOccupantTypeById(lotOccupantTypeId: number): recordTypes.LotOccupantType; export declare function getLotOccupantTypeByLotOccupantType(lotOccupantType: string): recordTypes.LotOccupantType; -export declare function clearLotOccupantTypesCache(): void; export declare function getLotStatuses(): recordTypes.LotStatus[]; export declare function getLotStatusById(lotStatusId: number): recordTypes.LotStatus; export declare function getLotStatusByLotStatus(lotStatus: string): recordTypes.LotStatus; -export declare function clearLotStatusesCache(): void; export declare function getLotTypes(): recordTypes.LotType[]; export declare function getLotTypeById(lotTypeId: number): recordTypes.LotType; export declare function getLotTypesByLotType(lotType: string): recordTypes.LotType; -export declare function clearLotTypesCache(): void; export declare function getOccupancyTypes(): recordTypes.OccupancyType[]; export declare function getAllOccupancyTypeFields(): recordTypes.OccupancyTypeField[]; export declare function getOccupancyTypeById(occupancyTypeId: number): recordTypes.OccupancyType; export declare function getOccupancyTypeByOccupancyType(occupancyTypeString: string): recordTypes.OccupancyType; export declare function getOccupancyTypePrintsById(occupancyTypeId: number): string[]; -export declare function clearOccupancyTypesCache(): void; export declare function getWorkOrderTypes(): recordTypes.WorkOrderType[]; export declare function getWorkOrderTypeById(workOrderTypeId: number): recordTypes.WorkOrderType; -export declare function clearWorkOrderTypesCache(): void; export declare function getWorkOrderMilestoneTypes(): recordTypes.WorkOrderMilestoneType[]; export declare function getWorkOrderMilestoneTypeByWorkOrderMilestoneTypeId(workOrderMilestoneTypeId: number): recordTypes.WorkOrderMilestoneType; export declare function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrderMilestoneTypeString: string): recordTypes.WorkOrderMilestoneType; -export declare function clearWorkOrderMilestoneTypesCache(): void; +export declare function clearCacheByTableName(tableName: string): void; diff --git a/helpers/functions.cache.js b/helpers/functions.cache.js index 95965e37..4d8dea6a 100644 --- a/helpers/functions.cache.js +++ b/helpers/functions.cache.js @@ -26,7 +26,7 @@ export function getLotOccupantTypeByLotOccupantType(lotOccupantType) { return currentLotOccupantType.lotOccupantType.toLowerCase() === lotOccupantTypeLowerCase; }); } -export function clearLotOccupantTypesCache() { +function clearLotOccupantTypesCache() { lotOccupantTypes = undefined; } let lotStatuses; @@ -49,7 +49,7 @@ export function getLotStatusByLotStatus(lotStatus) { return currentLotStatus.lotStatus.toLowerCase() === lotStatusLowerCase; }); } -export function clearLotStatusesCache() { +function clearLotStatusesCache() { lotStatuses = undefined; } let lotTypes; @@ -72,7 +72,7 @@ export function getLotTypesByLotType(lotType) { return currentLotType.lotType.toLowerCase() === lotTypeLowerCase; }); } -export function clearLotTypesCache() { +function clearLotTypesCache() { lotTypes = undefined; } let occupancyTypes; @@ -112,7 +112,7 @@ export function getOccupancyTypePrintsById(occupancyTypeId) { } return occupancyType.occupancyTypePrints; } -export function clearOccupancyTypesCache() { +function clearOccupancyTypesCache() { occupancyTypes = undefined; allOccupancyTypeFields = undefined; } @@ -129,7 +129,7 @@ export function getWorkOrderTypeById(workOrderTypeId) { return currentWorkOrderType.workOrderTypeId === workOrderTypeId; }); } -export function clearWorkOrderTypesCache() { +function clearWorkOrderTypesCache() { workOrderTypes = undefined; } let workOrderMilestoneTypes; @@ -153,6 +153,37 @@ export function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrderMiles workOrderMilestoneTypeLowerCase); }); } -export function clearWorkOrderMilestoneTypesCache() { +function clearWorkOrderMilestoneTypesCache() { workOrderMilestoneTypes = undefined; } +export function clearCacheByTableName(tableName) { + switch (tableName) { + case "LotOccupantTypes": { + clearLotOccupantTypesCache(); + break; + } + case "LotStatuses": { + clearLotStatusesCache(); + break; + } + case "LotTypes": + case "LotTypeFields": { + clearLotTypesCache(); + break; + } + case "OccupancyTypes": + case "OccupancyTypeFields": + case "OccupancyTypePrints": { + clearOccupancyTypesCache(); + break; + } + case "WorkOrderMilestoneTypes": { + clearWorkOrderMilestoneTypesCache(); + break; + } + case "WorkOrderTypes": { + clearWorkOrderTypesCache(); + break; + } + } +} diff --git a/helpers/functions.cache.ts b/helpers/functions.cache.ts index 49987b34..a4960a24 100644 --- a/helpers/functions.cache.ts +++ b/helpers/functions.cache.ts @@ -47,7 +47,7 @@ export function getLotOccupantTypeByLotOccupantType(lotOccupantType: string) { }); } -export function clearLotOccupantTypesCache() { +function clearLotOccupantTypesCache() { lotOccupantTypes = undefined; } @@ -83,7 +83,7 @@ export function getLotStatusByLotStatus(lotStatus: string) { }); } -export function clearLotStatusesCache() { +function clearLotStatusesCache() { lotStatuses = undefined; } @@ -119,7 +119,7 @@ export function getLotTypesByLotType(lotType: string) { }); } -export function clearLotTypesCache() { +function clearLotTypesCache() { lotTypes = undefined; } @@ -177,7 +177,7 @@ export function getOccupancyTypePrintsById(occupancyTypeId: number): string[] { return occupancyType.occupancyTypePrints; } -export function clearOccupancyTypesCache() { +function clearOccupancyTypesCache() { occupancyTypes = undefined; allOccupancyTypeFields = undefined; } @@ -204,7 +204,7 @@ export function getWorkOrderTypeById(workOrderTypeId: number) { }); } -export function clearWorkOrderTypesCache() { +function clearWorkOrderTypesCache() { workOrderTypes = undefined; } @@ -222,9 +222,7 @@ export function getWorkOrderMilestoneTypes() { return workOrderMilestoneTypes; } -export function getWorkOrderMilestoneTypeByWorkOrderMilestoneTypeId( - workOrderMilestoneTypeId: number -) { +export function getWorkOrderMilestoneTypeByWorkOrderMilestoneTypeId(workOrderMilestoneTypeId: number) { const cachedWorkOrderMilestoneTypes = getWorkOrderMilestoneTypes(); return cachedWorkOrderMilestoneTypes.find((currentWorkOrderMilestoneType) => { @@ -232,9 +230,7 @@ export function getWorkOrderMilestoneTypeByWorkOrderMilestoneTypeId( }); } -export function getWorkOrderMilestoneTypeByWorkOrderMilestoneType( - workOrderMilestoneTypeString: string -) { +export function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrderMilestoneTypeString: string) { const cachedWorkOrderMilestoneTypes = getWorkOrderMilestoneTypes(); const workOrderMilestoneTypeLowerCase = workOrderMilestoneTypeString.toLowerCase(); @@ -247,6 +243,43 @@ export function getWorkOrderMilestoneTypeByWorkOrderMilestoneType( }); } -export function clearWorkOrderMilestoneTypesCache() { +function clearWorkOrderMilestoneTypesCache() { workOrderMilestoneTypes = undefined; } + +export function clearCacheByTableName(tableName: string) { + switch (tableName) { + case "LotOccupantTypes": { + clearLotOccupantTypesCache(); + break; + } + + case "LotStatuses": { + clearLotStatusesCache(); + break; + } + + case "LotTypes": + case "LotTypeFields": { + clearLotTypesCache(); + break; + } + + case "OccupancyTypes": + case "OccupancyTypeFields": + case "OccupancyTypePrints": { + clearOccupancyTypesCache(); + break; + } + + case "WorkOrderMilestoneTypes": { + clearWorkOrderMilestoneTypesCache(); + break; + } + + case "WorkOrderTypes": { + clearWorkOrderTypesCache(); + break; + } + } +} diff --git a/helpers/lotOccupancyDB/addFeeCategory.d.ts b/helpers/lotOccupancyDB/addFeeCategory.d.ts deleted file mode 100644 index 4f9391ce..00000000 --- a/helpers/lotOccupancyDB/addFeeCategory.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import type * as recordTypes from "../../types/recordTypes"; -interface AddFeeCategoryForm { - feeCategory: string; - orderNumber?: number; -} -export declare function addFeeCategory(feeCategoryForm: AddFeeCategoryForm, requestSession: recordTypes.PartialSession): number; -export default addFeeCategory; diff --git a/helpers/lotOccupancyDB/addFeeCategory.js b/helpers/lotOccupancyDB/addFeeCategory.js deleted file mode 100644 index 1a479967..00000000 --- a/helpers/lotOccupancyDB/addFeeCategory.js +++ /dev/null @@ -1,6 +0,0 @@ -import { addRecord } from "./addRecord.js"; -export function addFeeCategory(feeCategoryForm, requestSession) { - const feeCategoryId = addRecord("FeeCategories", feeCategoryForm.feeCategory, feeCategoryForm.orderNumber || -1, requestSession); - return feeCategoryId; -} -export default addFeeCategory; diff --git a/helpers/lotOccupancyDB/addFeeCategory.ts b/helpers/lotOccupancyDB/addFeeCategory.ts deleted file mode 100644 index 6f6386f0..00000000 --- a/helpers/lotOccupancyDB/addFeeCategory.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { addRecord } from "./addRecord.js"; - -import type * as recordTypes from "../../types/recordTypes"; - -interface AddFeeCategoryForm { - feeCategory: string; - orderNumber?: number; -} - -export function addFeeCategory( - feeCategoryForm: AddFeeCategoryForm, - requestSession: recordTypes.PartialSession -): number { - const feeCategoryId = addRecord( - "FeeCategories", - feeCategoryForm.feeCategory, - feeCategoryForm.orderNumber || -1, - requestSession - ); - - return feeCategoryId; -} - -export default addFeeCategory; diff --git a/helpers/lotOccupancyDB/addLotOccupantType.js b/helpers/lotOccupancyDB/addLotOccupantType.js index e68620b7..ce5c00a7 100644 --- a/helpers/lotOccupancyDB/addLotOccupantType.js +++ b/helpers/lotOccupancyDB/addLotOccupantType.js @@ -1,6 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearLotOccupantTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; export function addLotOccupantType(lotOccupantTypeForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); @@ -12,7 +12,7 @@ export function addLotOccupantType(lotOccupantTypeForm, requestSession) { values (?, ?, ?, ?, ?, ?, ?)`) .run(lotOccupantTypeForm.lotOccupantType, lotOccupantTypeForm.fontAwesomeIconClass || "", lotOccupantTypeForm.orderNumber || -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); database.close(); - clearLotOccupantTypesCache(); + clearCacheByTableName("LotOccupantTypes"); return result.lastInsertRowid; } export default addLotOccupantType; diff --git a/helpers/lotOccupancyDB/addLotOccupantType.ts b/helpers/lotOccupancyDB/addLotOccupantType.ts index 58441fd2..0d4e7369 100644 --- a/helpers/lotOccupancyDB/addLotOccupantType.ts +++ b/helpers/lotOccupancyDB/addLotOccupantType.ts @@ -3,7 +3,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -import { clearLotOccupantTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; interface AddLotOccupantTypeForm { lotOccupantType: string; @@ -39,7 +39,7 @@ export function addLotOccupantType( database.close(); - clearLotOccupantTypesCache(); + clearCacheByTableName("LotOccupantTypes"); return result.lastInsertRowid as number; } diff --git a/helpers/lotOccupancyDB/addLotStatus.d.ts b/helpers/lotOccupancyDB/addLotStatus.d.ts deleted file mode 100644 index 434c6e68..00000000 --- a/helpers/lotOccupancyDB/addLotStatus.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import type * as recordTypes from "../../types/recordTypes"; -interface AddLotStatusForm { - lotStatus: string; - orderNumber?: number; -} -export declare function addLotStatus(lotStatusForm: AddLotStatusForm, requestSession: recordTypes.PartialSession): number; -export default addLotStatus; diff --git a/helpers/lotOccupancyDB/addLotStatus.js b/helpers/lotOccupancyDB/addLotStatus.js deleted file mode 100644 index 693d3d55..00000000 --- a/helpers/lotOccupancyDB/addLotStatus.js +++ /dev/null @@ -1,8 +0,0 @@ -import { clearLotStatusesCache } from "../functions.cache.js"; -import { addRecord } from "./addRecord.js"; -export function addLotStatus(lotStatusForm, requestSession) { - const lotStatusId = addRecord("LotStatuses", lotStatusForm.lotStatus, lotStatusForm.orderNumber || -1, requestSession); - clearLotStatusesCache(); - return lotStatusId; -} -export default addLotStatus; diff --git a/helpers/lotOccupancyDB/addLotStatus.ts b/helpers/lotOccupancyDB/addLotStatus.ts deleted file mode 100644 index 594e03f9..00000000 --- a/helpers/lotOccupancyDB/addLotStatus.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { clearLotStatusesCache } from "../functions.cache.js"; -import { addRecord } from "./addRecord.js"; - -import type * as recordTypes from "../../types/recordTypes"; - -interface AddLotStatusForm { - lotStatus: string; - orderNumber?: number; -} - -export function addLotStatus( - lotStatusForm: AddLotStatusForm, - requestSession: recordTypes.PartialSession -): number { - const lotStatusId = addRecord( - "LotStatuses", - lotStatusForm.lotStatus, - lotStatusForm.orderNumber || -1, - requestSession - ); - - clearLotStatusesCache(); - - return lotStatusId; -} - -export default addLotStatus; diff --git a/helpers/lotOccupancyDB/addLotType.d.ts b/helpers/lotOccupancyDB/addLotType.d.ts deleted file mode 100644 index 30cfba2e..00000000 --- a/helpers/lotOccupancyDB/addLotType.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import type * as recordTypes from "../../types/recordTypes"; -interface AddLotTypeForm { - lotType: string; - orderNumber?: number; -} -export declare function addLotType(lotTypeForm: AddLotTypeForm, requestSession: recordTypes.PartialSession): number; -export default addLotType; diff --git a/helpers/lotOccupancyDB/addLotType.js b/helpers/lotOccupancyDB/addLotType.js deleted file mode 100644 index eed4c410..00000000 --- a/helpers/lotOccupancyDB/addLotType.js +++ /dev/null @@ -1,8 +0,0 @@ -import { clearLotTypesCache } from "../functions.cache.js"; -import { addRecord } from "./addRecord.js"; -export function addLotType(lotTypeForm, requestSession) { - const lotTypeId = addRecord("LotTypes", lotTypeForm.lotType, lotTypeForm.orderNumber || -1, requestSession); - clearLotTypesCache(); - return lotTypeId; -} -export default addLotType; diff --git a/helpers/lotOccupancyDB/addLotType.ts b/helpers/lotOccupancyDB/addLotType.ts deleted file mode 100644 index 2d36a8c2..00000000 --- a/helpers/lotOccupancyDB/addLotType.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { clearLotTypesCache } from "../functions.cache.js"; -import { addRecord } from "./addRecord.js"; - -import type * as recordTypes from "../../types/recordTypes"; - -interface AddLotTypeForm { - lotType: string; - orderNumber?: number; -} - -export function addLotType(lotTypeForm: AddLotTypeForm, requestSession: recordTypes.PartialSession): number { - const lotTypeId = addRecord( - "LotTypes", - lotTypeForm.lotType, - lotTypeForm.orderNumber || -1, - requestSession - ); - - clearLotTypesCache(); - - return lotTypeId; -} - -export default addLotType; diff --git a/helpers/lotOccupancyDB/addLotTypeField.js b/helpers/lotOccupancyDB/addLotTypeField.js index ae6bd5bf..c1e7bba2 100644 --- a/helpers/lotOccupancyDB/addLotTypeField.js +++ b/helpers/lotOccupancyDB/addLotTypeField.js @@ -1,6 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearLotTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; export function addLotTypeField(lotTypeFieldForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); @@ -15,7 +15,7 @@ export function addLotTypeField(lotTypeFieldForm, requestSession) { values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) .run(lotTypeFieldForm.lotTypeId, lotTypeFieldForm.lotTypeField, lotTypeFieldForm.lotTypeFieldValues || "", lotTypeFieldForm.isRequired ? 1 : 0, lotTypeFieldForm.pattern || "", lotTypeFieldForm.minimumLength || 0, lotTypeFieldForm.maximumLength || 100, lotTypeFieldForm.orderNumber || -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); database.close(); - clearLotTypesCache(); + clearCacheByTableName("LotTypeFields"); return result.lastInsertRowid; } export default addLotTypeField; diff --git a/helpers/lotOccupancyDB/addLotTypeField.ts b/helpers/lotOccupancyDB/addLotTypeField.ts index b7c01035..d025a8b5 100644 --- a/helpers/lotOccupancyDB/addLotTypeField.ts +++ b/helpers/lotOccupancyDB/addLotTypeField.ts @@ -2,8 +2,9 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; +import { clearCacheByTableName } from "../functions.cache.js"; + import type * as recordTypes from "../../types/recordTypes"; -import { clearLotTypesCache } from "../functions.cache.js"; interface AddLotTypeFieldForm { lotTypeId: string | number; @@ -52,7 +53,7 @@ export function addLotTypeField( database.close(); - clearLotTypesCache(); + clearCacheByTableName("LotTypeFields"); return result.lastInsertRowid as number; } diff --git a/helpers/lotOccupancyDB/addOccupancyType.d.ts b/helpers/lotOccupancyDB/addOccupancyType.d.ts deleted file mode 100644 index 38e4789f..00000000 --- a/helpers/lotOccupancyDB/addOccupancyType.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import type * as recordTypes from "../../types/recordTypes"; -interface AddOccupancyTypeForm { - occupancyType: string; - orderNumber?: number; -} -export declare function addOccupancyType(occupancyTypeForm: AddOccupancyTypeForm, requestSession: recordTypes.PartialSession): number; -export default addOccupancyType; diff --git a/helpers/lotOccupancyDB/addOccupancyType.js b/helpers/lotOccupancyDB/addOccupancyType.js deleted file mode 100644 index 5a987cbf..00000000 --- a/helpers/lotOccupancyDB/addOccupancyType.js +++ /dev/null @@ -1,8 +0,0 @@ -import { clearOccupancyTypesCache } from "../functions.cache.js"; -import { addRecord } from "./addRecord.js"; -export function addOccupancyType(occupancyTypeForm, requestSession) { - const occupancyTypeId = addRecord("OccupancyTypes", occupancyTypeForm.occupancyType, occupancyTypeForm.orderNumber || -1, requestSession); - clearOccupancyTypesCache(); - return occupancyTypeId; -} -export default addOccupancyType; diff --git a/helpers/lotOccupancyDB/addOccupancyType.ts b/helpers/lotOccupancyDB/addOccupancyType.ts deleted file mode 100644 index 0b093cb3..00000000 --- a/helpers/lotOccupancyDB/addOccupancyType.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { clearOccupancyTypesCache } from "../functions.cache.js"; -import { addRecord } from "./addRecord.js"; - -import type * as recordTypes from "../../types/recordTypes"; - -interface AddOccupancyTypeForm { - occupancyType: string; - orderNumber?: number; -} - -export function addOccupancyType( - occupancyTypeForm: AddOccupancyTypeForm, - requestSession: recordTypes.PartialSession -): number { - const occupancyTypeId = addRecord( - "OccupancyTypes", - occupancyTypeForm.occupancyType, - occupancyTypeForm.orderNumber || -1, - requestSession - ); - - clearOccupancyTypesCache(); - - return occupancyTypeId; -} - -export default addOccupancyType; diff --git a/helpers/lotOccupancyDB/addOccupancyTypeField.js b/helpers/lotOccupancyDB/addOccupancyTypeField.js index 9d1e5c4b..13d716eb 100644 --- a/helpers/lotOccupancyDB/addOccupancyTypeField.js +++ b/helpers/lotOccupancyDB/addOccupancyTypeField.js @@ -1,6 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearOccupancyTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; export function addOccupancyTypeField(occupancyTypeFieldForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); @@ -15,7 +15,7 @@ export function addOccupancyTypeField(occupancyTypeFieldForm, requestSession) { values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) .run(occupancyTypeFieldForm.occupancyTypeId || undefined, occupancyTypeFieldForm.occupancyTypeField, occupancyTypeFieldForm.occupancyTypeFieldValues || "", occupancyTypeFieldForm.isRequired ? 1 : 0, occupancyTypeFieldForm.pattern || "", occupancyTypeFieldForm.minimumLength || 0, occupancyTypeFieldForm.maximumLength || 100, occupancyTypeFieldForm.orderNumber || -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypeFields"); return result.lastInsertRowid; } export default addOccupancyTypeField; diff --git a/helpers/lotOccupancyDB/addOccupancyTypeField.ts b/helpers/lotOccupancyDB/addOccupancyTypeField.ts index 0db70572..7be647e3 100644 --- a/helpers/lotOccupancyDB/addOccupancyTypeField.ts +++ b/helpers/lotOccupancyDB/addOccupancyTypeField.ts @@ -3,7 +3,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -import { clearOccupancyTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; interface AddOccupancyTypeFieldForm { occupancyTypeId?: string | number; @@ -52,7 +52,7 @@ export function addOccupancyTypeField( database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypeFields"); return result.lastInsertRowid as number; } diff --git a/helpers/lotOccupancyDB/addOccupancyTypePrint.js b/helpers/lotOccupancyDB/addOccupancyTypePrint.js index a10078e4..64d184ea 100644 --- a/helpers/lotOccupancyDB/addOccupancyTypePrint.js +++ b/helpers/lotOccupancyDB/addOccupancyTypePrint.js @@ -1,6 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearOccupancyTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; export function addOccupancyTypePrint(occupancyTypePrintForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); @@ -23,7 +23,7 @@ export function addOccupancyTypePrint(occupancyTypePrintForm, requestSession) { .run(occupancyTypePrintForm.occupancyTypeId, occupancyTypePrintForm.printEJS, occupancyTypePrintForm.orderNumber || -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); } database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypePrints"); return result.changes > 0; } export default addOccupancyTypePrint; diff --git a/helpers/lotOccupancyDB/addOccupancyTypePrint.ts b/helpers/lotOccupancyDB/addOccupancyTypePrint.ts index 8f94ca32..706477c9 100644 --- a/helpers/lotOccupancyDB/addOccupancyTypePrint.ts +++ b/helpers/lotOccupancyDB/addOccupancyTypePrint.ts @@ -2,7 +2,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearOccupancyTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; import type * as recordTypes from "../../types/recordTypes"; @@ -59,7 +59,7 @@ export function addOccupancyTypePrint( database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypePrints"); return result.changes > 0; } diff --git a/helpers/lotOccupancyDB/addRecord.js b/helpers/lotOccupancyDB/addRecord.js index 607bc9ba..5e4d4cf7 100644 --- a/helpers/lotOccupancyDB/addRecord.js +++ b/helpers/lotOccupancyDB/addRecord.js @@ -1,5 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; +import { clearCacheByTableName } from "../functions.cache.js"; const recordNameColumns = new Map(); recordNameColumns.set("FeeCategories", "feeCategory"); recordNameColumns.set("LotStatuses", "lotStatus"); @@ -18,5 +19,6 @@ export function addRecord(recordTable, recordName, orderNumber, requestSession) values (?, ?, ?, ?, ?, ?)`) .run(recordName, orderNumber, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); database.close(); + clearCacheByTableName(recordTable); return result.lastInsertRowid; } diff --git a/helpers/lotOccupancyDB/addRecord.ts b/helpers/lotOccupancyDB/addRecord.ts index 9fb45365..7f2ce466 100644 --- a/helpers/lotOccupancyDB/addRecord.ts +++ b/helpers/lotOccupancyDB/addRecord.ts @@ -3,6 +3,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; +import { clearCacheByTableName } from "../functions.cache.js"; type RecordTable = | "FeeCategories" @@ -49,5 +50,7 @@ export function addRecord( database.close(); + clearCacheByTableName(recordTable); + return result.lastInsertRowid as number; } diff --git a/helpers/lotOccupancyDB/addWorkOrderMilestoneType.d.ts b/helpers/lotOccupancyDB/addWorkOrderMilestoneType.d.ts deleted file mode 100644 index 5a919171..00000000 --- a/helpers/lotOccupancyDB/addWorkOrderMilestoneType.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import type * as recordTypes from "../../types/recordTypes"; -interface AddWorkOrderMilestoneTypeForm { - workOrderMilestoneType: string; - orderNumber?: number; -} -export declare function addWorkOrderMilestoneType(workOrderMilestoneTypeForm: AddWorkOrderMilestoneTypeForm, requestSession: recordTypes.PartialSession): number; -export default addWorkOrderMilestoneType; diff --git a/helpers/lotOccupancyDB/addWorkOrderMilestoneType.js b/helpers/lotOccupancyDB/addWorkOrderMilestoneType.js deleted file mode 100644 index 48c30af1..00000000 --- a/helpers/lotOccupancyDB/addWorkOrderMilestoneType.js +++ /dev/null @@ -1,8 +0,0 @@ -import { clearWorkOrderMilestoneTypesCache } from "../functions.cache.js"; -import { addRecord } from "./addRecord.js"; -export function addWorkOrderMilestoneType(workOrderMilestoneTypeForm, requestSession) { - const workOrderMilestoneId = addRecord("WorkOrderMilestoneTypes", workOrderMilestoneTypeForm.workOrderMilestoneType, workOrderMilestoneTypeForm.orderNumber || -1, requestSession); - clearWorkOrderMilestoneTypesCache(); - return workOrderMilestoneId; -} -export default addWorkOrderMilestoneType; diff --git a/helpers/lotOccupancyDB/addWorkOrderMilestoneType.ts b/helpers/lotOccupancyDB/addWorkOrderMilestoneType.ts deleted file mode 100644 index fef423a5..00000000 --- a/helpers/lotOccupancyDB/addWorkOrderMilestoneType.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { clearWorkOrderMilestoneTypesCache } from "../functions.cache.js"; -import { addRecord } from "./addRecord.js"; - -import type * as recordTypes from "../../types/recordTypes"; - -interface AddWorkOrderMilestoneTypeForm { - workOrderMilestoneType: string; - orderNumber?: number; -} - -export function addWorkOrderMilestoneType( - workOrderMilestoneTypeForm: AddWorkOrderMilestoneTypeForm, - requestSession: recordTypes.PartialSession -): number { - const workOrderMilestoneId = addRecord( - "WorkOrderMilestoneTypes", - workOrderMilestoneTypeForm.workOrderMilestoneType, - workOrderMilestoneTypeForm.orderNumber || -1, - requestSession - ); - - clearWorkOrderMilestoneTypesCache(); - - return workOrderMilestoneId; -} - -export default addWorkOrderMilestoneType; diff --git a/helpers/lotOccupancyDB/addWorkOrderType.d.ts b/helpers/lotOccupancyDB/addWorkOrderType.d.ts deleted file mode 100644 index 2aa59fa5..00000000 --- a/helpers/lotOccupancyDB/addWorkOrderType.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import type * as recordTypes from "../../types/recordTypes"; -interface AddWorkOrderTypeForm { - workOrderType: string; - orderNumber?: number; -} -export declare function addWorkOrderType(workOrderTypeForm: AddWorkOrderTypeForm, requestSession: recordTypes.PartialSession): number; -export default addWorkOrderType; diff --git a/helpers/lotOccupancyDB/addWorkOrderType.js b/helpers/lotOccupancyDB/addWorkOrderType.js deleted file mode 100644 index 03c19913..00000000 --- a/helpers/lotOccupancyDB/addWorkOrderType.js +++ /dev/null @@ -1,8 +0,0 @@ -import { clearWorkOrderTypesCache } from "../functions.cache.js"; -import { addRecord } from "./addRecord.js"; -export function addWorkOrderType(workOrderTypeForm, requestSession) { - const workOrderTypeId = addRecord("WorkOrderTypes", workOrderTypeForm.workOrderType, workOrderTypeForm.orderNumber || -1, requestSession); - clearWorkOrderTypesCache(); - return workOrderTypeId; -} -export default addWorkOrderType; diff --git a/helpers/lotOccupancyDB/addWorkOrderType.ts b/helpers/lotOccupancyDB/addWorkOrderType.ts deleted file mode 100644 index ae8a2a46..00000000 --- a/helpers/lotOccupancyDB/addWorkOrderType.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { clearWorkOrderTypesCache } from "../functions.cache.js"; -import { addRecord } from "./addRecord.js"; - -import type * as recordTypes from "../../types/recordTypes"; - -interface AddWorkOrderTypeForm { - workOrderType: string; - orderNumber?: number; -} - -export function addWorkOrderType( - workOrderTypeForm: AddWorkOrderTypeForm, - requestSession: recordTypes.PartialSession -): number { - const workOrderTypeId = addRecord( - "WorkOrderTypes", - workOrderTypeForm.workOrderType, - workOrderTypeForm.orderNumber || -1, - requestSession - ); - - clearWorkOrderTypesCache(); - - return workOrderTypeId; -} - -export default addWorkOrderType; diff --git a/helpers/lotOccupancyDB/deleteOccupancyTypePrint.js b/helpers/lotOccupancyDB/deleteOccupancyTypePrint.js index 02761f2b..98ce5011 100644 --- a/helpers/lotOccupancyDB/deleteOccupancyTypePrint.js +++ b/helpers/lotOccupancyDB/deleteOccupancyTypePrint.js @@ -1,6 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearOccupancyTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; export function deleteOccupancyTypePrint(occupancyTypeId, printEJS, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); @@ -12,7 +12,7 @@ export function deleteOccupancyTypePrint(occupancyTypeId, printEJS, requestSessi and printEJS = ?`) .run(requestSession.user.userName, rightNowMillis, occupancyTypeId, printEJS); database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypePrints"); return result.changes > 0; } export default deleteOccupancyTypePrint; diff --git a/helpers/lotOccupancyDB/deleteOccupancyTypePrint.ts b/helpers/lotOccupancyDB/deleteOccupancyTypePrint.ts index 0528b2e4..16edff4d 100644 --- a/helpers/lotOccupancyDB/deleteOccupancyTypePrint.ts +++ b/helpers/lotOccupancyDB/deleteOccupancyTypePrint.ts @@ -2,7 +2,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearOccupancyTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; import type * as recordTypes from "../../types/recordTypes"; @@ -27,7 +27,7 @@ export function deleteOccupancyTypePrint( database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypePrints"); return result.changes > 0; } diff --git a/helpers/lotOccupancyDB/deleteRecord.js b/helpers/lotOccupancyDB/deleteRecord.js index 08faed36..f917381b 100644 --- a/helpers/lotOccupancyDB/deleteRecord.js +++ b/helpers/lotOccupancyDB/deleteRecord.js @@ -1,6 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import * as cacheFunctions from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; const recordIdColumns = new Map(); recordIdColumns.set("FeeCategories", "feeCategoryId"); recordIdColumns.set("Fees", "feeId"); @@ -33,15 +33,6 @@ relatedTables.set("WorkOrders", [ "WorkOrderLotOccupancies", "WorkOrderComments" ]); -const clearCacheFunctions = new Map(); -clearCacheFunctions.set("LotOccupantTypes", cacheFunctions.clearLotOccupantTypesCache); -clearCacheFunctions.set("LotStatuses", cacheFunctions.clearLotStatusesCache); -clearCacheFunctions.set("LotTypes", cacheFunctions.clearLotTypesCache); -clearCacheFunctions.set("LotTypeFields", cacheFunctions.clearLotTypesCache); -clearCacheFunctions.set("OccupancyTypes", cacheFunctions.clearOccupancyTypesCache); -clearCacheFunctions.set("OccupancyTypeFields", cacheFunctions.clearOccupancyTypesCache); -clearCacheFunctions.set("WorkOrderMilestoneTypes", cacheFunctions.clearWorkOrderMilestoneTypesCache); -clearCacheFunctions.set("WorkOrderTypes", cacheFunctions.clearWorkOrderTypesCache); export function deleteRecord(recordTable, recordId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); @@ -62,8 +53,6 @@ export function deleteRecord(recordTable, recordId, requestSession) { .run(requestSession.user.userName, rightNowMillis, recordId); } database.close(); - if (clearCacheFunctions.has(recordTable)) { - clearCacheFunctions.get(recordTable)(); - } + clearCacheByTableName(recordTable); return result.changes > 0; } diff --git a/helpers/lotOccupancyDB/deleteRecord.ts b/helpers/lotOccupancyDB/deleteRecord.ts index 3838f873..8b0313bd 100644 --- a/helpers/lotOccupancyDB/deleteRecord.ts +++ b/helpers/lotOccupancyDB/deleteRecord.ts @@ -2,7 +2,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import * as cacheFunctions from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; import type * as recordTypes from "../../types/recordTypes"; @@ -60,16 +60,6 @@ relatedTables.set("WorkOrders", [ "WorkOrderComments" ]); -const clearCacheFunctions: Map void> = new Map(); -clearCacheFunctions.set("LotOccupantTypes", cacheFunctions.clearLotOccupantTypesCache); -clearCacheFunctions.set("LotStatuses", cacheFunctions.clearLotStatusesCache); -clearCacheFunctions.set("LotTypes", cacheFunctions.clearLotTypesCache); -clearCacheFunctions.set("LotTypeFields", cacheFunctions.clearLotTypesCache); -clearCacheFunctions.set("OccupancyTypes", cacheFunctions.clearOccupancyTypesCache); -clearCacheFunctions.set("OccupancyTypeFields", cacheFunctions.clearOccupancyTypesCache); -clearCacheFunctions.set("WorkOrderMilestoneTypes", cacheFunctions.clearWorkOrderMilestoneTypesCache); -clearCacheFunctions.set("WorkOrderTypes", cacheFunctions.clearWorkOrderTypesCache); - export function deleteRecord( recordTable: RecordTable, recordId: number | string, @@ -103,9 +93,7 @@ export function deleteRecord( database.close(); - if (clearCacheFunctions.has(recordTable)) { - clearCacheFunctions.get(recordTable)(); - } + clearCacheByTableName(recordTable); return result.changes > 0; } diff --git a/helpers/lotOccupancyDB/moveLotOccupantTypeDown.js b/helpers/lotOccupancyDB/moveLotOccupantTypeDown.js index ca692c1d..297e18c7 100644 --- a/helpers/lotOccupancyDB/moveLotOccupantTypeDown.js +++ b/helpers/lotOccupancyDB/moveLotOccupantTypeDown.js @@ -1,13 +1,10 @@ -import { clearLotOccupantTypesCache } from "../functions.cache.js"; import { moveRecordDown, moveRecordDownToBottom } from "./moveRecord.js"; export function moveLotOccupantTypeDown(lotOccupantTypeId) { const success = moveRecordDown("LotOccupantTypes", lotOccupantTypeId); - clearLotOccupantTypesCache(); return success; } export function moveLotOccupantTypeDownToBottom(lotOccupantTypeId) { const success = moveRecordDownToBottom("LotOccupantTypes", lotOccupantTypeId); - clearLotOccupantTypesCache(); return success; } export default moveLotOccupantTypeDown; diff --git a/helpers/lotOccupancyDB/moveLotOccupantTypeDown.ts b/helpers/lotOccupancyDB/moveLotOccupantTypeDown.ts index a5069643..3554b940 100644 --- a/helpers/lotOccupancyDB/moveLotOccupantTypeDown.ts +++ b/helpers/lotOccupancyDB/moveLotOccupantTypeDown.ts @@ -1,15 +1,12 @@ -import { clearLotOccupantTypesCache } from "../functions.cache.js"; import { moveRecordDown, moveRecordDownToBottom } from "./moveRecord.js"; export function moveLotOccupantTypeDown(lotOccupantTypeId: number | string): boolean { const success = moveRecordDown("LotOccupantTypes", lotOccupantTypeId); - clearLotOccupantTypesCache(); return success; } export function moveLotOccupantTypeDownToBottom(lotOccupantTypeId: number | string): boolean { const success = moveRecordDownToBottom("LotOccupantTypes", lotOccupantTypeId); - clearLotOccupantTypesCache(); return success; } diff --git a/helpers/lotOccupancyDB/moveLotOccupantTypeUp.js b/helpers/lotOccupancyDB/moveLotOccupantTypeUp.js index afa33154..0521c411 100644 --- a/helpers/lotOccupancyDB/moveLotOccupantTypeUp.js +++ b/helpers/lotOccupancyDB/moveLotOccupantTypeUp.js @@ -1,13 +1,10 @@ -import { clearLotOccupantTypesCache } from "../functions.cache.js"; import { moveRecordUp, moveRecordUpToTop } from "./moveRecord.js"; export function moveLotOccupantTypeUp(lotOccupantTypeId) { const success = moveRecordUp("LotOccupantTypes", lotOccupantTypeId); - clearLotOccupantTypesCache(); return success; } export function moveLotOccupantTypeUpToTop(lotOccupantTypeId) { const success = moveRecordUpToTop("LotOccupantTypes", lotOccupantTypeId); - clearLotOccupantTypesCache(); return success; } export default moveLotOccupantTypeUp; diff --git a/helpers/lotOccupancyDB/moveLotOccupantTypeUp.ts b/helpers/lotOccupancyDB/moveLotOccupantTypeUp.ts index 3f977aec..169c2a58 100644 --- a/helpers/lotOccupancyDB/moveLotOccupantTypeUp.ts +++ b/helpers/lotOccupancyDB/moveLotOccupantTypeUp.ts @@ -1,15 +1,12 @@ -import { clearLotOccupantTypesCache } from "../functions.cache.js"; import { moveRecordUp, moveRecordUpToTop } from "./moveRecord.js"; export function moveLotOccupantTypeUp(lotOccupantTypeId: number | string): boolean { const success = moveRecordUp("LotOccupantTypes", lotOccupantTypeId); - clearLotOccupantTypesCache(); return success; } export function moveLotOccupantTypeUpToTop(lotOccupantTypeId: number | string): boolean { const success = moveRecordUpToTop("LotOccupantTypes", lotOccupantTypeId); - clearLotOccupantTypesCache(); return success; } diff --git a/helpers/lotOccupancyDB/moveLotStatusDown.js b/helpers/lotOccupancyDB/moveLotStatusDown.js index 96a516c8..b4ba4947 100644 --- a/helpers/lotOccupancyDB/moveLotStatusDown.js +++ b/helpers/lotOccupancyDB/moveLotStatusDown.js @@ -1,13 +1,10 @@ -import { clearLotStatusesCache } from "../functions.cache.js"; import { moveRecordDown, moveRecordDownToBottom } from "./moveRecord.js"; export function moveLotStatusDown(lotStatusId) { const success = moveRecordDown("LotStatuses", lotStatusId); - clearLotStatusesCache(); return success; } export function moveLotStatusDownToBottom(lotStatusId) { const success = moveRecordDownToBottom("LotStatuses", lotStatusId); - clearLotStatusesCache(); return success; } export default moveLotStatusDown; diff --git a/helpers/lotOccupancyDB/moveLotStatusDown.ts b/helpers/lotOccupancyDB/moveLotStatusDown.ts index ad27aa86..4bcc3d93 100644 --- a/helpers/lotOccupancyDB/moveLotStatusDown.ts +++ b/helpers/lotOccupancyDB/moveLotStatusDown.ts @@ -1,15 +1,12 @@ -import { clearLotStatusesCache } from "../functions.cache.js"; import { moveRecordDown, moveRecordDownToBottom } from "./moveRecord.js"; export function moveLotStatusDown(lotStatusId: number | string): boolean { const success = moveRecordDown("LotStatuses", lotStatusId); - clearLotStatusesCache(); return success; } export function moveLotStatusDownToBottom(lotStatusId: number | string): boolean { const success = moveRecordDownToBottom("LotStatuses", lotStatusId); - clearLotStatusesCache(); return success; } diff --git a/helpers/lotOccupancyDB/moveLotStatusUp.js b/helpers/lotOccupancyDB/moveLotStatusUp.js index 53beb4a5..316e1920 100644 --- a/helpers/lotOccupancyDB/moveLotStatusUp.js +++ b/helpers/lotOccupancyDB/moveLotStatusUp.js @@ -1,13 +1,10 @@ -import { clearLotStatusesCache } from "../functions.cache.js"; import { moveRecordUp, moveRecordUpToTop } from "./moveRecord.js"; export function moveLotStatusUp(lotStatusId) { const success = moveRecordUp("LotStatuses", lotStatusId); - clearLotStatusesCache(); return success; } export function moveLotStatusUpToTop(lotStatusId) { const success = moveRecordUpToTop("LotStatuses", lotStatusId); - clearLotStatusesCache(); return success; } export default moveLotStatusUp; diff --git a/helpers/lotOccupancyDB/moveLotStatusUp.ts b/helpers/lotOccupancyDB/moveLotStatusUp.ts index eb820dca..e158e984 100644 --- a/helpers/lotOccupancyDB/moveLotStatusUp.ts +++ b/helpers/lotOccupancyDB/moveLotStatusUp.ts @@ -1,15 +1,12 @@ -import { clearLotStatusesCache } from "../functions.cache.js"; import { moveRecordUp, moveRecordUpToTop } from "./moveRecord.js"; export function moveLotStatusUp(lotStatusId: number | string): boolean { const success = moveRecordUp("LotStatuses", lotStatusId); - clearLotStatusesCache(); return success; } export function moveLotStatusUpToTop(lotStatusId: number | string): boolean { const success = moveRecordUpToTop("LotStatuses", lotStatusId); - clearLotStatusesCache(); return success; } diff --git a/helpers/lotOccupancyDB/moveLotTypeDown.js b/helpers/lotOccupancyDB/moveLotTypeDown.js index bd134786..80cc79d6 100644 --- a/helpers/lotOccupancyDB/moveLotTypeDown.js +++ b/helpers/lotOccupancyDB/moveLotTypeDown.js @@ -1,13 +1,10 @@ -import { clearLotTypesCache } from "../functions.cache.js"; import { moveRecordDown, moveRecordDownToBottom } from "./moveRecord.js"; export function moveLotTypeDown(lotTypeId) { const success = moveRecordDown("LotTypes", lotTypeId); - clearLotTypesCache(); return success; } export function moveLotTypeDownToBottom(lotTypeId) { const success = moveRecordDownToBottom("LotTypes", lotTypeId); - clearLotTypesCache(); return success; } export default moveLotTypeDown; diff --git a/helpers/lotOccupancyDB/moveLotTypeDown.ts b/helpers/lotOccupancyDB/moveLotTypeDown.ts index 8e453221..3a54120d 100644 --- a/helpers/lotOccupancyDB/moveLotTypeDown.ts +++ b/helpers/lotOccupancyDB/moveLotTypeDown.ts @@ -1,15 +1,12 @@ -import { clearLotTypesCache } from "../functions.cache.js"; import { moveRecordDown, moveRecordDownToBottom } from "./moveRecord.js"; export function moveLotTypeDown(lotTypeId: number | string): boolean { const success = moveRecordDown("LotTypes", lotTypeId); - clearLotTypesCache(); return success; } export function moveLotTypeDownToBottom(lotTypeId: number | string): boolean { const success = moveRecordDownToBottom("LotTypes", lotTypeId); - clearLotTypesCache(); return success; } diff --git a/helpers/lotOccupancyDB/moveLotTypeFieldDown.js b/helpers/lotOccupancyDB/moveLotTypeFieldDown.js index 976619a8..e51214d1 100644 --- a/helpers/lotOccupancyDB/moveLotTypeFieldDown.js +++ b/helpers/lotOccupancyDB/moveLotTypeFieldDown.js @@ -1,6 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearLotTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; export function moveLotTypeFieldDown(lotTypeFieldId) { const database = sqlite(databasePath); const currentField = database @@ -16,7 +16,7 @@ export function moveLotTypeFieldDown(lotTypeFieldId) { .prepare("update LotTypeFields set orderNumber = ? + 1 where lotTypeFieldId = ?") .run(currentField.orderNumber, lotTypeFieldId); database.close(); - clearLotTypesCache(); + clearCacheByTableName("LotTypeFields"); return result.changes > 0; } export function moveLotTypeFieldDownToBottom(lotTypeFieldId) { @@ -43,7 +43,7 @@ export function moveLotTypeFieldDownToBottom(lotTypeFieldId) { .run(currentField.lotTypeId, currentField.orderNumber); } database.close(); - clearLotTypesCache(); + clearCacheByTableName("LotTypeFields"); return true; } export default moveLotTypeFieldDown; diff --git a/helpers/lotOccupancyDB/moveLotTypeFieldDown.ts b/helpers/lotOccupancyDB/moveLotTypeFieldDown.ts index 1a852546..3cbbce77 100644 --- a/helpers/lotOccupancyDB/moveLotTypeFieldDown.ts +++ b/helpers/lotOccupancyDB/moveLotTypeFieldDown.ts @@ -2,7 +2,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearLotTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; export function moveLotTypeFieldDown(lotTypeFieldId: number | string): boolean { const database = sqlite(databasePath); @@ -26,7 +26,7 @@ export function moveLotTypeFieldDown(lotTypeFieldId: number | string): boolean { database.close(); - clearLotTypesCache(); + clearCacheByTableName("LotTypeFields"); return result.changes > 0; } @@ -65,7 +65,7 @@ export function moveLotTypeFieldDownToBottom(lotTypeFieldId: number | string): b database.close(); - clearLotTypesCache(); + clearCacheByTableName("LotTypeFields"); return true; } diff --git a/helpers/lotOccupancyDB/moveLotTypeFieldUp.js b/helpers/lotOccupancyDB/moveLotTypeFieldUp.js index b04720e7..2a4d8fea 100644 --- a/helpers/lotOccupancyDB/moveLotTypeFieldUp.js +++ b/helpers/lotOccupancyDB/moveLotTypeFieldUp.js @@ -1,6 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearLotTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; export function moveLotTypeFieldUp(lotTypeFieldId) { const database = sqlite(databasePath); const currentField = database @@ -21,7 +21,7 @@ export function moveLotTypeFieldUp(lotTypeFieldId) { .prepare("update LotTypeFields set orderNumber = ? - 1 where lotTypeFieldId = ?") .run(currentField.orderNumber, lotTypeFieldId); database.close(); - clearLotTypesCache(); + clearCacheByTableName("LotTypeFields"); return result.changes > 0; } export function moveLotTypeFieldUpToTop(lotTypeFieldId) { @@ -42,7 +42,7 @@ export function moveLotTypeFieldUpToTop(lotTypeFieldId) { .run(currentField.lotTypeId, currentField.orderNumber); } database.close(); - clearLotTypesCache(); + clearCacheByTableName("LotTypeFields"); return true; } export default moveLotTypeFieldUp; diff --git a/helpers/lotOccupancyDB/moveLotTypeFieldUp.ts b/helpers/lotOccupancyDB/moveLotTypeFieldUp.ts index 39a353d1..a37f256b 100644 --- a/helpers/lotOccupancyDB/moveLotTypeFieldUp.ts +++ b/helpers/lotOccupancyDB/moveLotTypeFieldUp.ts @@ -2,7 +2,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearLotTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; export function moveLotTypeFieldUp(lotTypeFieldId: number | string): boolean { const database = sqlite(databasePath); @@ -32,7 +32,7 @@ export function moveLotTypeFieldUp(lotTypeFieldId: number | string): boolean { database.close(); - clearLotTypesCache(); + clearCacheByTableName("LotTypeFields"); return result.changes > 0; } @@ -62,7 +62,7 @@ export function moveLotTypeFieldUpToTop(lotTypeFieldId: number | string): boolea database.close(); - clearLotTypesCache(); + clearCacheByTableName("LotTypeFields"); return true; } diff --git a/helpers/lotOccupancyDB/moveLotTypeUp.js b/helpers/lotOccupancyDB/moveLotTypeUp.js index 466b5bb5..5e86bc85 100644 --- a/helpers/lotOccupancyDB/moveLotTypeUp.js +++ b/helpers/lotOccupancyDB/moveLotTypeUp.js @@ -1,13 +1,10 @@ -import { clearLotTypesCache } from "../functions.cache.js"; import { moveRecordUp, moveRecordUpToTop } from "./moveRecord.js"; export function moveLotTypeUp(lotTypeId) { const success = moveRecordUp("LotTypes", lotTypeId); - clearLotTypesCache(); return success; } export function moveLotTypeUpToTop(lotTypeId) { const success = moveRecordUpToTop("LotTypes", lotTypeId); - clearLotTypesCache(); return success; } export default moveLotTypeUp; diff --git a/helpers/lotOccupancyDB/moveLotTypeUp.ts b/helpers/lotOccupancyDB/moveLotTypeUp.ts index d5edf278..0461d3b8 100644 --- a/helpers/lotOccupancyDB/moveLotTypeUp.ts +++ b/helpers/lotOccupancyDB/moveLotTypeUp.ts @@ -1,15 +1,12 @@ -import { clearLotTypesCache } from "../functions.cache.js"; import { moveRecordUp, moveRecordUpToTop } from "./moveRecord.js"; export function moveLotTypeUp(lotTypeId: number | string): boolean { const success = moveRecordUp("LotTypes", lotTypeId); - clearLotTypesCache(); return success; } export function moveLotTypeUpToTop(lotTypeId: number | string): boolean { const success = moveRecordUpToTop("LotTypes", lotTypeId); - clearLotTypesCache(); return success; } diff --git a/helpers/lotOccupancyDB/moveOccupancyTypeDown.js b/helpers/lotOccupancyDB/moveOccupancyTypeDown.js index c53fb1d0..cc7446e2 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypeDown.js +++ b/helpers/lotOccupancyDB/moveOccupancyTypeDown.js @@ -1,13 +1,10 @@ -import { clearOccupancyTypesCache } from "../functions.cache.js"; import { moveRecordDown, moveRecordDownToBottom } from "./moveRecord.js"; export function moveOccupancyTypeDown(occupancyTypeId) { const success = moveRecordDown("OccupancyTypes", occupancyTypeId); - clearOccupancyTypesCache(); return success; } export function moveOccupancyTypeDownToBottom(occupancyTypeId) { const success = moveRecordDownToBottom("OccupancyTypes", occupancyTypeId); - clearOccupancyTypesCache(); return success; } export default moveOccupancyTypeDown; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypeDown.ts b/helpers/lotOccupancyDB/moveOccupancyTypeDown.ts index 5060ae40..6c1c0913 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypeDown.ts +++ b/helpers/lotOccupancyDB/moveOccupancyTypeDown.ts @@ -1,15 +1,12 @@ -import { clearOccupancyTypesCache } from "../functions.cache.js"; import { moveRecordDown, moveRecordDownToBottom } from "./moveRecord.js"; export function moveOccupancyTypeDown(occupancyTypeId: number | string): boolean { const success = moveRecordDown("OccupancyTypes", occupancyTypeId); - clearOccupancyTypesCache(); return success; } export function moveOccupancyTypeDownToBottom(occupancyTypeId: number | string): boolean { const success = moveRecordDownToBottom("OccupancyTypes", occupancyTypeId); - clearOccupancyTypesCache(); return success; } diff --git a/helpers/lotOccupancyDB/moveOccupancyTypeFieldDown.js b/helpers/lotOccupancyDB/moveOccupancyTypeFieldDown.js index 91da9a1b..af1ebd70 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypeFieldDown.js +++ b/helpers/lotOccupancyDB/moveOccupancyTypeFieldDown.js @@ -1,6 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearOccupancyTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; export function moveOccupancyTypeFieldDown(occupancyTypeFieldId) { const database = sqlite(databasePath); const currentField = database @@ -19,7 +19,7 @@ export function moveOccupancyTypeFieldDown(occupancyTypeFieldId) { .prepare(`update OccupancyTypeFields set orderNumber = ? + 1 where occupancyTypeFieldId = ?`) .run(currentField.orderNumber, occupancyTypeFieldId); database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypeFields"); return result.changes > 0; } export function moveOccupancyTypeFieldDownToBottom(occupancyTypeFieldId) { @@ -57,7 +57,7 @@ export function moveOccupancyTypeFieldDownToBottom(occupancyTypeFieldId) { .run(occupancyTypeParameters); } database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypeFields"); return true; } export default moveOccupancyTypeFieldDown; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypeFieldDown.ts b/helpers/lotOccupancyDB/moveOccupancyTypeFieldDown.ts index b4fd716d..74465680 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypeFieldDown.ts +++ b/helpers/lotOccupancyDB/moveOccupancyTypeFieldDown.ts @@ -2,7 +2,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearOccupancyTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; export function moveOccupancyTypeFieldDown(occupancyTypeFieldId: number | string): boolean { const database = sqlite(databasePath); @@ -33,7 +33,7 @@ export function moveOccupancyTypeFieldDown(occupancyTypeFieldId: number | string database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypeFields"); return result.changes > 0; } @@ -90,7 +90,7 @@ export function moveOccupancyTypeFieldDownToBottom(occupancyTypeFieldId: number database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypeFields"); return true; } diff --git a/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.js b/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.js index 52642e39..f1d47c74 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.js +++ b/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.js @@ -1,6 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearOccupancyTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; export function moveOccupancyTypeFieldUp(occupancyTypeFieldId) { const database = sqlite(databasePath); const currentField = database @@ -23,7 +23,7 @@ export function moveOccupancyTypeFieldUp(occupancyTypeFieldId) { .prepare(`update OccupancyTypeFields set orderNumber = ? - 1 where occupancyTypeFieldId = ?`) .run(currentField.orderNumber, occupancyTypeFieldId); database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypeFields"); return result.changes > 0; } export function moveOccupancyTypeFieldUpToTop(occupancyTypeFieldId) { @@ -51,7 +51,7 @@ export function moveOccupancyTypeFieldUpToTop(occupancyTypeFieldId) { .run(occupancyTypeParameters); } database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypeFields"); return true; } export default moveOccupancyTypeFieldUp; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.ts b/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.ts index 54b0f691..c93a3132 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.ts +++ b/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.ts @@ -2,7 +2,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearOccupancyTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; export function moveOccupancyTypeFieldUp(occupancyTypeFieldId: number | string): boolean { const database = sqlite(databasePath); @@ -38,7 +38,7 @@ export function moveOccupancyTypeFieldUp(occupancyTypeFieldId: number | string): database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypeFields"); return result.changes > 0; } @@ -82,7 +82,7 @@ export function moveOccupancyTypeFieldUpToTop(occupancyTypeFieldId: number | str database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypeFields"); return true; } diff --git a/helpers/lotOccupancyDB/moveOccupancyTypePrintDown.js b/helpers/lotOccupancyDB/moveOccupancyTypePrintDown.js index 5e689957..af3a6b03 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypePrintDown.js +++ b/helpers/lotOccupancyDB/moveOccupancyTypePrintDown.js @@ -1,6 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearOccupancyTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; export function moveOccupancyTypePrintDown(occupancyTypeId, printEJS) { const database = sqlite(databasePath); const currentOrderNumber = database @@ -17,7 +17,7 @@ export function moveOccupancyTypePrintDown(occupancyTypeId, printEJS) { .prepare(`update OccupancyTypePrints set orderNumber = ? + 1 where occupancyTypeId = ? and printEJS = ?`) .run(currentOrderNumber, occupancyTypeId, printEJS); database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypePrints"); return result.changes > 0; } export function moveOccupancyTypePrintDownToBottom(occupancyTypeId, printEJS) { @@ -47,7 +47,7 @@ export function moveOccupancyTypePrintDownToBottom(occupancyTypeId, printEJS) { .run(occupancyTypeId, currentOrderNumber); } database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypePrints"); return true; } export default moveOccupancyTypePrintDown; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypePrintDown.ts b/helpers/lotOccupancyDB/moveOccupancyTypePrintDown.ts index 0f2ecb2c..62245623 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypePrintDown.ts +++ b/helpers/lotOccupancyDB/moveOccupancyTypePrintDown.ts @@ -2,7 +2,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearOccupancyTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; export function moveOccupancyTypePrintDown( occupancyTypeId: number | string, @@ -34,7 +34,7 @@ export function moveOccupancyTypePrintDown( database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypePrints"); return result.changes > 0; } @@ -83,7 +83,7 @@ export function moveOccupancyTypePrintDownToBottom( database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypePrints"); return true; } diff --git a/helpers/lotOccupancyDB/moveOccupancyTypePrintUp.js b/helpers/lotOccupancyDB/moveOccupancyTypePrintUp.js index b91714ce..81d5f4e5 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypePrintUp.js +++ b/helpers/lotOccupancyDB/moveOccupancyTypePrintUp.js @@ -1,6 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearOccupancyTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; export function moveOccupancyTypePrintUp(occupancyTypeId, printEJS) { const database = sqlite(databasePath); const currentOrderNumber = database @@ -21,7 +21,7 @@ export function moveOccupancyTypePrintUp(occupancyTypeId, printEJS) { .prepare(`update OccupancyTypePrints set orderNumber = ? - 1 where occupancyTypeId = ? and printEJS = ?`) .run(currentOrderNumber, occupancyTypeId, printEJS); database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypePrints"); return result.changes > 0; } export function moveOccupancyTypePrintUpToTop(occupancyTypeId, printEJS) { @@ -45,7 +45,7 @@ export function moveOccupancyTypePrintUpToTop(occupancyTypeId, printEJS) { .run(occupancyTypeId, currentOrderNumber); } database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypePrints"); return true; } export default moveOccupancyTypePrintUp; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypePrintUp.ts b/helpers/lotOccupancyDB/moveOccupancyTypePrintUp.ts index 26fb64d2..4c20b561 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypePrintUp.ts +++ b/helpers/lotOccupancyDB/moveOccupancyTypePrintUp.ts @@ -2,7 +2,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearOccupancyTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; export function moveOccupancyTypePrintUp( occupancyTypeId: number | string, @@ -39,7 +39,7 @@ export function moveOccupancyTypePrintUp( database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypePrints"); return result.changes > 0; } @@ -79,7 +79,7 @@ export function moveOccupancyTypePrintUpToTop( database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypePrints"); return true; } diff --git a/helpers/lotOccupancyDB/moveOccupancyTypeUp.js b/helpers/lotOccupancyDB/moveOccupancyTypeUp.js index 5dc4cf6d..faed00bd 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypeUp.js +++ b/helpers/lotOccupancyDB/moveOccupancyTypeUp.js @@ -1,13 +1,10 @@ -import { clearOccupancyTypesCache } from "../functions.cache.js"; import { moveRecordUp, moveRecordUpToTop } from "./moveRecord.js"; export function moveOccupancyTypeUp(occupancyTypeId) { const success = moveRecordUp("OccupancyTypes", occupancyTypeId); - clearOccupancyTypesCache(); return success; } export function moveOccupancyTypeUpToTop(occupancyTypeId) { const success = moveRecordUpToTop("OccupancyTypes", occupancyTypeId); - clearOccupancyTypesCache(); return success; } export default moveOccupancyTypeUp; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypeUp.ts b/helpers/lotOccupancyDB/moveOccupancyTypeUp.ts index c73ba222..94096378 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypeUp.ts +++ b/helpers/lotOccupancyDB/moveOccupancyTypeUp.ts @@ -1,15 +1,12 @@ -import { clearOccupancyTypesCache } from "../functions.cache.js"; import { moveRecordUp, moveRecordUpToTop } from "./moveRecord.js"; export function moveOccupancyTypeUp(occupancyTypeId: number | string): boolean { const success = moveRecordUp("OccupancyTypes", occupancyTypeId); - clearOccupancyTypesCache(); return success; } export function moveOccupancyTypeUpToTop(occupancyTypeId: number | string): boolean { const success = moveRecordUpToTop("OccupancyTypes", occupancyTypeId); - clearOccupancyTypesCache(); return success; } diff --git a/helpers/lotOccupancyDB/moveRecord.js b/helpers/lotOccupancyDB/moveRecord.js index ab068571..fff8b664 100644 --- a/helpers/lotOccupancyDB/moveRecord.js +++ b/helpers/lotOccupancyDB/moveRecord.js @@ -1,5 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; +import { clearCacheByTableName } from "../functions.cache.js"; const recordIdColumns = new Map(); recordIdColumns.set("FeeCategories", "feeCategoryId"); recordIdColumns.set("LotOccupantTypes", "lotOccupantTypeId"); @@ -31,6 +32,7 @@ export function moveRecordDown(recordTable, recordId) { where ${recordIdColumns.get(recordTable)} = ?`) .run(currentOrderNumber, recordId); database.close(); + clearCacheByTableName(recordTable); return result.changes > 0; } export function moveRecordDownToBottom(recordTable, recordId) { @@ -53,6 +55,7 @@ export function moveRecordDownToBottom(recordTable, recordId) { .run(currentOrderNumber); } database.close(); + clearCacheByTableName(recordTable); return true; } export function moveRecordUp(recordTable, recordId) { @@ -74,6 +77,7 @@ export function moveRecordUp(recordTable, recordId) { where ${recordIdColumns.get(recordTable)} = ?`) .run(currentOrderNumber, recordId); database.close(); + clearCacheByTableName(recordTable); return result.changes > 0; } export function moveRecordUpToTop(recordTable, recordId) { @@ -91,5 +95,6 @@ export function moveRecordUpToTop(recordTable, recordId) { .run(currentOrderNumber); } database.close(); + clearCacheByTableName(recordTable); return true; } diff --git a/helpers/lotOccupancyDB/moveRecord.ts b/helpers/lotOccupancyDB/moveRecord.ts index 273c992c..69cec9dd 100644 --- a/helpers/lotOccupancyDB/moveRecord.ts +++ b/helpers/lotOccupancyDB/moveRecord.ts @@ -1,6 +1,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; +import { clearCacheByTableName } from "../functions.cache.js"; type RecordTable = | "FeeCategories" @@ -60,6 +61,8 @@ export function moveRecordDown(recordTable: RecordTable, recordId: number | stri database.close(); + clearCacheByTableName(recordTable); + return result.changes > 0; } @@ -95,6 +98,8 @@ export function moveRecordDownToBottom(recordTable: RecordTable, recordId: numbe database.close(); + clearCacheByTableName(recordTable); + return true; } @@ -127,6 +132,8 @@ export function moveRecordUp(recordTable: RecordTable, recordId: number | string database.close(); + clearCacheByTableName(recordTable); + return result.changes > 0; } @@ -154,5 +161,7 @@ export function moveRecordUpToTop(recordTable: RecordTable, recordId: number | s database.close(); + clearCacheByTableName(recordTable); + return true; } diff --git a/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.js b/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.js index d409c990..bdc22ac3 100644 --- a/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.js +++ b/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.js @@ -1,13 +1,10 @@ -import { clearWorkOrderMilestoneTypesCache } from "../functions.cache.js"; import { moveRecordDown, moveRecordDownToBottom } from "./moveRecord.js"; export function moveWorkOrderMilestoneTypeDown(workOrderMilestoneTypeId) { const success = moveRecordDown("WorkOrderMilestoneTypes", workOrderMilestoneTypeId); - clearWorkOrderMilestoneTypesCache(); return success; } export function moveWorkOrderMilestoneTypeDownToBottom(workOrderMilestoneTypeId) { const success = moveRecordDownToBottom("WorkOrderMilestoneTypes", workOrderMilestoneTypeId); - clearWorkOrderMilestoneTypesCache(); return success; } export default moveWorkOrderMilestoneTypeDown; diff --git a/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.ts b/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.ts index ba156dba..8e7e88e9 100644 --- a/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.ts +++ b/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.ts @@ -1,15 +1,12 @@ -import { clearWorkOrderMilestoneTypesCache } from "../functions.cache.js"; import { moveRecordDown, moveRecordDownToBottom } from "./moveRecord.js"; export function moveWorkOrderMilestoneTypeDown(workOrderMilestoneTypeId: number | string): boolean { const success = moveRecordDown("WorkOrderMilestoneTypes", workOrderMilestoneTypeId); - clearWorkOrderMilestoneTypesCache(); return success; } export function moveWorkOrderMilestoneTypeDownToBottom(workOrderMilestoneTypeId: number | string): boolean { const success = moveRecordDownToBottom("WorkOrderMilestoneTypes", workOrderMilestoneTypeId); - clearWorkOrderMilestoneTypesCache(); return success; } diff --git a/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.js b/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.js index 1f69d2ea..ac9902ba 100644 --- a/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.js +++ b/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.js @@ -1,13 +1,10 @@ -import { clearWorkOrderMilestoneTypesCache } from "../functions.cache.js"; import { moveRecordUp, moveRecordUpToTop } from "./moveRecord.js"; export function moveWorkOrderMilestoneTypeUp(workOrderMilestoneTypeId) { const success = moveRecordUp("WorkOrderMilestoneTypes", workOrderMilestoneTypeId); - clearWorkOrderMilestoneTypesCache(); return success; } export function moveWorkOrderMilestoneTypeUpToTop(workOrderMilestoneTypeId) { const success = moveRecordUpToTop("WorkOrderMilestoneTypes", workOrderMilestoneTypeId); - clearWorkOrderMilestoneTypesCache(); return success; } export default moveWorkOrderMilestoneTypeUp; diff --git a/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.ts b/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.ts index 10114150..28ef340f 100644 --- a/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.ts +++ b/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.ts @@ -1,15 +1,12 @@ -import { clearWorkOrderMilestoneTypesCache } from "../functions.cache.js"; import { moveRecordUp, moveRecordUpToTop } from "./moveRecord.js"; export function moveWorkOrderMilestoneTypeUp(workOrderMilestoneTypeId: number | string): boolean { const success = moveRecordUp("WorkOrderMilestoneTypes", workOrderMilestoneTypeId); - clearWorkOrderMilestoneTypesCache(); return success; } export function moveWorkOrderMilestoneTypeUpToTop(workOrderMilestoneTypeId: number | string): boolean { const success = moveRecordUpToTop("WorkOrderMilestoneTypes", workOrderMilestoneTypeId); - clearWorkOrderMilestoneTypesCache(); return success; } diff --git a/helpers/lotOccupancyDB/moveWorkOrderTypeDown.js b/helpers/lotOccupancyDB/moveWorkOrderTypeDown.js index f08a1dbf..21ef11f4 100644 --- a/helpers/lotOccupancyDB/moveWorkOrderTypeDown.js +++ b/helpers/lotOccupancyDB/moveWorkOrderTypeDown.js @@ -1,13 +1,10 @@ -import { clearWorkOrderTypesCache } from "../functions.cache.js"; import { moveRecordDown, moveRecordDownToBottom } from "./moveRecord.js"; export function moveWorkOrderTypeDown(workOrderTypeId) { const success = moveRecordDown("WorkOrderTypes", workOrderTypeId); - clearWorkOrderTypesCache(); return success; } export function moveWorkOrderTypeDownToBottom(workOrderTypeId) { const success = moveRecordDownToBottom("WorkOrderTypes", workOrderTypeId); - clearWorkOrderTypesCache(); return success; } export default moveWorkOrderTypeDown; diff --git a/helpers/lotOccupancyDB/moveWorkOrderTypeDown.ts b/helpers/lotOccupancyDB/moveWorkOrderTypeDown.ts index 58546013..62323589 100644 --- a/helpers/lotOccupancyDB/moveWorkOrderTypeDown.ts +++ b/helpers/lotOccupancyDB/moveWorkOrderTypeDown.ts @@ -1,15 +1,12 @@ -import { clearWorkOrderTypesCache } from "../functions.cache.js"; import { moveRecordDown, moveRecordDownToBottom } from "./moveRecord.js"; export function moveWorkOrderTypeDown(workOrderTypeId: number | string): boolean { const success = moveRecordDown("WorkOrderTypes", workOrderTypeId); - clearWorkOrderTypesCache(); return success; } export function moveWorkOrderTypeDownToBottom(workOrderTypeId: number | string): boolean { const success = moveRecordDownToBottom("WorkOrderTypes", workOrderTypeId); - clearWorkOrderTypesCache(); return success; } diff --git a/helpers/lotOccupancyDB/moveWorkOrderTypeUp.js b/helpers/lotOccupancyDB/moveWorkOrderTypeUp.js index d49cc2db..467e4aa7 100644 --- a/helpers/lotOccupancyDB/moveWorkOrderTypeUp.js +++ b/helpers/lotOccupancyDB/moveWorkOrderTypeUp.js @@ -1,13 +1,10 @@ -import { clearWorkOrderTypesCache } from "../functions.cache.js"; import { moveRecordUp, moveRecordUpToTop } from "./moveRecord.js"; export function moveWorkOrderTypeUp(workOrderTypeId) { const success = moveRecordUp("WorkOrderTypes", workOrderTypeId); - clearWorkOrderTypesCache(); return success; } export function moveWorkOrderTypeUpToTop(workOrderTypeId) { const success = moveRecordUpToTop("WorkOrderTypes", workOrderTypeId); - clearWorkOrderTypesCache(); return success; } export default moveWorkOrderTypeUp; diff --git a/helpers/lotOccupancyDB/moveWorkOrderTypeUp.ts b/helpers/lotOccupancyDB/moveWorkOrderTypeUp.ts index 2806794e..cd489e1c 100644 --- a/helpers/lotOccupancyDB/moveWorkOrderTypeUp.ts +++ b/helpers/lotOccupancyDB/moveWorkOrderTypeUp.ts @@ -1,15 +1,12 @@ -import { clearWorkOrderTypesCache } from "../functions.cache.js"; import { moveRecordUp, moveRecordUpToTop } from "./moveRecord.js"; export function moveWorkOrderTypeUp(workOrderTypeId: number | string): boolean { const success = moveRecordUp("WorkOrderTypes", workOrderTypeId); - clearWorkOrderTypesCache(); return success; } export function moveWorkOrderTypeUpToTop(workOrderTypeId: number | string): boolean { const success = moveRecordUpToTop("WorkOrderTypes", workOrderTypeId); - clearWorkOrderTypesCache(); return success; } diff --git a/helpers/lotOccupancyDB/updateLotOccupantType.js b/helpers/lotOccupancyDB/updateLotOccupantType.js index 7891e885..c8422b92 100644 --- a/helpers/lotOccupancyDB/updateLotOccupantType.js +++ b/helpers/lotOccupancyDB/updateLotOccupantType.js @@ -1,6 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearLotOccupantTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; export function updateLotOccupantType(lotOccupantTypeForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); @@ -14,7 +14,7 @@ export function updateLotOccupantType(lotOccupantTypeForm, requestSession) { and recordDelete_timeMillis is null`) .run(lotOccupantTypeForm.lotOccupantType, lotOccupantTypeForm.fontAwesomeIconClass || "", requestSession.user.userName, rightNowMillis, lotOccupantTypeForm.lotOccupantTypeId); database.close(); - clearLotOccupantTypesCache(); + clearCacheByTableName("LotOccupantTypes"); return result.changes > 0; } export default updateLotOccupantType; diff --git a/helpers/lotOccupancyDB/updateLotOccupantType.ts b/helpers/lotOccupancyDB/updateLotOccupantType.ts index 6a6c64c0..d0175fd6 100644 --- a/helpers/lotOccupancyDB/updateLotOccupantType.ts +++ b/helpers/lotOccupancyDB/updateLotOccupantType.ts @@ -2,7 +2,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearLotOccupantTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; import type * as recordTypes from "../../types/recordTypes"; @@ -40,7 +40,7 @@ export function updateLotOccupantType( database.close(); - clearLotOccupantTypesCache(); + clearCacheByTableName("LotOccupantTypes"); return result.changes > 0; } diff --git a/helpers/lotOccupancyDB/updateLotTypeField.js b/helpers/lotOccupancyDB/updateLotTypeField.js index 73e9bd4e..2a30f74e 100644 --- a/helpers/lotOccupancyDB/updateLotTypeField.js +++ b/helpers/lotOccupancyDB/updateLotTypeField.js @@ -1,6 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearLotTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; export function updateLotTypeField(lotTypeFieldForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); @@ -18,7 +18,7 @@ export function updateLotTypeField(lotTypeFieldForm, requestSession) { and recordDelete_timeMillis is null`) .run(lotTypeFieldForm.lotTypeField, Number.parseInt(lotTypeFieldForm.isRequired, 10), lotTypeFieldForm.minimumLength || 0, lotTypeFieldForm.maximumLength || 100, lotTypeFieldForm.pattern || "", lotTypeFieldForm.lotTypeFieldValues, requestSession.user.userName, rightNowMillis, lotTypeFieldForm.lotTypeFieldId); database.close(); - clearLotTypesCache(); + clearCacheByTableName("LotTypeFields"); return result.changes > 0; } export default updateLotTypeField; diff --git a/helpers/lotOccupancyDB/updateLotTypeField.ts b/helpers/lotOccupancyDB/updateLotTypeField.ts index 95ca0054..8bd8d154 100644 --- a/helpers/lotOccupancyDB/updateLotTypeField.ts +++ b/helpers/lotOccupancyDB/updateLotTypeField.ts @@ -2,7 +2,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearLotTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; import type * as recordTypes from "../../types/recordTypes"; @@ -52,7 +52,7 @@ export function updateLotTypeField( database.close(); - clearLotTypesCache(); + clearCacheByTableName("LotTypeFields"); return result.changes > 0; } diff --git a/helpers/lotOccupancyDB/updateOccupancyTypeField.js b/helpers/lotOccupancyDB/updateOccupancyTypeField.js index 30c0100e..7b5d8b17 100644 --- a/helpers/lotOccupancyDB/updateOccupancyTypeField.js +++ b/helpers/lotOccupancyDB/updateOccupancyTypeField.js @@ -1,6 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearOccupancyTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; export function updateOccupancyTypeField(occupancyTypeFieldForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); @@ -18,7 +18,7 @@ export function updateOccupancyTypeField(occupancyTypeFieldForm, requestSession) and recordDelete_timeMillis is null`) .run(occupancyTypeFieldForm.occupancyTypeField, Number.parseInt(occupancyTypeFieldForm.isRequired, 10), occupancyTypeFieldForm.minimumLength || 0, occupancyTypeFieldForm.maximumLength || 100, occupancyTypeFieldForm.pattern || "", occupancyTypeFieldForm.occupancyTypeFieldValues, requestSession.user.userName, rightNowMillis, occupancyTypeFieldForm.occupancyTypeFieldId); database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypeFields"); return result.changes > 0; } export default updateOccupancyTypeField; diff --git a/helpers/lotOccupancyDB/updateOccupancyTypeField.ts b/helpers/lotOccupancyDB/updateOccupancyTypeField.ts index 3633f7fd..38de0524 100644 --- a/helpers/lotOccupancyDB/updateOccupancyTypeField.ts +++ b/helpers/lotOccupancyDB/updateOccupancyTypeField.ts @@ -2,7 +2,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { clearOccupancyTypesCache } from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; import type * as recordTypes from "../../types/recordTypes"; @@ -52,7 +52,7 @@ export function updateOccupancyTypeField( database.close(); - clearOccupancyTypesCache(); + clearCacheByTableName("OccupancyTypeFields"); return result.changes > 0; } diff --git a/helpers/lotOccupancyDB/updateRecord.d.ts b/helpers/lotOccupancyDB/updateRecord.d.ts index ce4e4225..17cfbb22 100644 --- a/helpers/lotOccupancyDB/updateRecord.d.ts +++ b/helpers/lotOccupancyDB/updateRecord.d.ts @@ -1,5 +1,4 @@ import type * as recordTypes from "../../types/recordTypes"; declare type RecordTable = "FeeCategories" | "LotStatuses" | "LotTypes" | "OccupancyTypes" | "WorkOrderMilestoneTypes" | "WorkOrderTypes"; -export declare const clearCacheFunctions: Map void>; export declare function updateRecord(recordTable: RecordTable, recordId: number | string, recordName: string, requestSession: recordTypes.PartialSession): boolean; export {}; diff --git a/helpers/lotOccupancyDB/updateRecord.js b/helpers/lotOccupancyDB/updateRecord.js index 5dc30563..19b70866 100644 --- a/helpers/lotOccupancyDB/updateRecord.js +++ b/helpers/lotOccupancyDB/updateRecord.js @@ -1,6 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import * as cacheFunctions from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; const recordNameIdColumns = new Map(); recordNameIdColumns.set("FeeCategories", ["feeCategory", "feeCategoryId"]); recordNameIdColumns.set("LotStatuses", ["lotStatus", "lotStatusId"]); @@ -8,12 +8,6 @@ recordNameIdColumns.set("LotTypes", ["lotType", "lotTypeId"]); recordNameIdColumns.set("OccupancyTypes", ["occupancyType", "occupancyTypeId"]); recordNameIdColumns.set("WorkOrderMilestoneTypes", ["workOrderMilestoneType", "workOrderMilestoneTypeId"]); recordNameIdColumns.set("WorkOrderTypes", ["workOrderType", "workOrderTypeId"]); -export const clearCacheFunctions = new Map(); -clearCacheFunctions.set("LotStatuses", cacheFunctions.clearLotStatusesCache); -clearCacheFunctions.set("LotTypes", cacheFunctions.clearLotTypesCache); -clearCacheFunctions.set("OccupancyTypes", cacheFunctions.clearOccupancyTypesCache); -clearCacheFunctions.set("WorkOrderMilestoneTypes", cacheFunctions.clearWorkOrderMilestoneTypesCache); -clearCacheFunctions.set("WorkOrderTypes", cacheFunctions.clearWorkOrderTypesCache); export function updateRecord(recordTable, recordId, recordName, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); @@ -26,8 +20,6 @@ export function updateRecord(recordTable, recordId, recordName, requestSession) and ${recordNameIdColumns.get(recordTable)[1]} = ?`) .run(recordName, requestSession.user.userName, rightNowMillis, recordId); database.close(); - if (clearCacheFunctions.has(recordTable)) { - clearCacheFunctions.get(recordTable)(); - } + clearCacheByTableName(recordTable); return result.changes > 0; } diff --git a/helpers/lotOccupancyDB/updateRecord.ts b/helpers/lotOccupancyDB/updateRecord.ts index 2c190a97..41c6385c 100644 --- a/helpers/lotOccupancyDB/updateRecord.ts +++ b/helpers/lotOccupancyDB/updateRecord.ts @@ -2,7 +2,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import * as cacheFunctions from "../functions.cache.js"; +import { clearCacheByTableName } from "../functions.cache.js"; import type * as recordTypes from "../../types/recordTypes"; @@ -22,13 +22,6 @@ recordNameIdColumns.set("OccupancyTypes", ["occupancyType", "occupancyTypeId"]); recordNameIdColumns.set("WorkOrderMilestoneTypes", ["workOrderMilestoneType", "workOrderMilestoneTypeId"]); recordNameIdColumns.set("WorkOrderTypes", ["workOrderType", "workOrderTypeId"]); -export const clearCacheFunctions: Map void> = new Map(); -clearCacheFunctions.set("LotStatuses", cacheFunctions.clearLotStatusesCache); -clearCacheFunctions.set("LotTypes", cacheFunctions.clearLotTypesCache); -clearCacheFunctions.set("OccupancyTypes", cacheFunctions.clearOccupancyTypesCache); -clearCacheFunctions.set("WorkOrderMilestoneTypes", cacheFunctions.clearWorkOrderMilestoneTypesCache); -clearCacheFunctions.set("WorkOrderTypes", cacheFunctions.clearWorkOrderTypesCache); - export function updateRecord( recordTable: RecordTable, recordId: number | string, @@ -52,9 +45,7 @@ export function updateRecord( database.close(); - if (clearCacheFunctions.has(recordTable)) { - clearCacheFunctions.get(recordTable)(); - } + clearCacheByTableName(recordTable); return result.changes > 0; }