From 9048235ef295a4df7c38263520a98511335c91aa Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Thu, 1 May 2025 09:26:40 -0400 Subject: [PATCH] more deleted item loading --- database/getBurialSiteStatuses.d.ts | 2 +- database/getBurialSiteStatuses.js | 19 +++++++------ database/getBurialSiteStatuses.ts | 35 ++++++++++++++---------- database/getContractTypes.d.ts | 2 +- database/getContractTypes.js | 8 ++++-- database/getContractTypes.ts | 13 +++++++-- database/getWorkOrderMilestoneTypes.d.ts | 2 +- database/getWorkOrderMilestoneTypes.js | 19 +++++++------ database/getWorkOrderMilestoneTypes.ts | 34 +++++++++++++---------- helpers/functions.cache.d.ts | 12 ++++---- helpers/functions.cache.js | 25 +++++++++-------- helpers/functions.cache.ts | 33 ++++++++++++++-------- temp/legacyImportFromCsv/data.ids.js | 22 +++++++-------- temp/legacyImportFromCsv/data.ids.ts | 34 +++++++++++++++-------- 14 files changed, 155 insertions(+), 105 deletions(-) diff --git a/database/getBurialSiteStatuses.d.ts b/database/getBurialSiteStatuses.d.ts index 1b56d6a9..f0355167 100644 --- a/database/getBurialSiteStatuses.d.ts +++ b/database/getBurialSiteStatuses.d.ts @@ -1,2 +1,2 @@ import type { BurialSiteStatus } from '../types/record.types.js'; -export default function getBurialSiteStatuses(): BurialSiteStatus[]; +export default function getBurialSiteStatuses(includeDeleted?: boolean): BurialSiteStatus[]; diff --git a/database/getBurialSiteStatuses.js b/database/getBurialSiteStatuses.js index 8ab93807..eebeab5a 100644 --- a/database/getBurialSiteStatuses.js +++ b/database/getBurialSiteStatuses.js @@ -1,21 +1,24 @@ import sqlite from 'better-sqlite3'; import { sunriseDB } from '../helpers/database.helpers.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export default function getBurialSiteStatuses() { +export default function getBurialSiteStatuses(includeDeleted = false) { const database = sqlite(sunriseDB); + const updateOrderNumbers = !includeDeleted; const statuses = database .prepare(`select burialSiteStatusId, burialSiteStatus, orderNumber from BurialSiteStatuses - where recordDelete_timeMillis is null + ${includeDeleted ? '' : ' where recordDelete_timeMillis is null '} order by orderNumber, burialSiteStatus`) .all(); - let expectedOrderNumber = 0; - for (const status of statuses) { - if (status.orderNumber !== expectedOrderNumber) { - updateRecordOrderNumber('BurialSiteStatuses', status.burialSiteStatusId, expectedOrderNumber, database); - status.orderNumber = expectedOrderNumber; + if (updateOrderNumbers) { + let expectedOrderNumber = 0; + for (const status of statuses) { + if (status.orderNumber !== expectedOrderNumber) { + updateRecordOrderNumber('BurialSiteStatuses', status.burialSiteStatusId, expectedOrderNumber, database); + status.orderNumber = expectedOrderNumber; + } + expectedOrderNumber += 1; } - expectedOrderNumber += 1; } database.close(); return statuses; diff --git a/database/getBurialSiteStatuses.ts b/database/getBurialSiteStatuses.ts index bff8c015..892a4bd6 100644 --- a/database/getBurialSiteStatuses.ts +++ b/database/getBurialSiteStatuses.ts @@ -5,32 +5,39 @@ import type { BurialSiteStatus } from '../types/record.types.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export default function getBurialSiteStatuses(): BurialSiteStatus[] { +export default function getBurialSiteStatuses( + includeDeleted = false +): BurialSiteStatus[] { const database = sqlite(sunriseDB) + const updateOrderNumbers = !includeDeleted + const statuses = database .prepare( `select burialSiteStatusId, burialSiteStatus, orderNumber from BurialSiteStatuses - where recordDelete_timeMillis is null + ${includeDeleted ? '' : ' where recordDelete_timeMillis is null '} order by orderNumber, burialSiteStatus` ) .all() as BurialSiteStatus[] - let expectedOrderNumber = 0 + if (updateOrderNumbers) { + let expectedOrderNumber = 0 - for (const status of statuses) { - if (status.orderNumber !== expectedOrderNumber) { - updateRecordOrderNumber( - 'BurialSiteStatuses', - status.burialSiteStatusId, - expectedOrderNumber, - database - ) - status.orderNumber = expectedOrderNumber + for (const status of statuses) { + if (status.orderNumber !== expectedOrderNumber) { + updateRecordOrderNumber( + 'BurialSiteStatuses', + status.burialSiteStatusId, + expectedOrderNumber, + database + ) + + status.orderNumber = expectedOrderNumber + } + + expectedOrderNumber += 1 } - - expectedOrderNumber += 1 } database.close() diff --git a/database/getContractTypes.d.ts b/database/getContractTypes.d.ts index cc2af793..a4277281 100644 --- a/database/getContractTypes.d.ts +++ b/database/getContractTypes.d.ts @@ -1,2 +1,2 @@ import type { ContractType } from '../types/record.types.js'; -export default function getContractTypes(): ContractType[]; +export default function getContractTypes(includeDeleted?: boolean): ContractType[]; diff --git a/database/getContractTypes.js b/database/getContractTypes.js index 80a5f83a..474c76f0 100644 --- a/database/getContractTypes.js +++ b/database/getContractTypes.js @@ -3,18 +3,20 @@ import { sunriseDB } from '../helpers/database.helpers.js'; import getContractTypeFields from './getContractTypeFields.js'; import getContractTypePrints from './getContractTypePrints.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export default function getContractTypes() { +export default function getContractTypes(includeDeleted = false) { const database = sqlite(sunriseDB); + const updateOrderNumbers = !includeDeleted; const contractTypes = database .prepare(`select contractTypeId, contractType, isPreneed, orderNumber from ContractTypes - where recordDelete_timeMillis is null + ${includeDeleted ? '' : ' where recordDelete_timeMillis is null '} order by orderNumber, contractType, contractTypeId`) .all(); let expectedOrderNumber = -1; for (const contractType of contractTypes) { expectedOrderNumber += 1; - if (contractType.orderNumber !== expectedOrderNumber) { + if (updateOrderNumbers && + contractType.orderNumber !== expectedOrderNumber) { updateRecordOrderNumber('ContractTypes', contractType.contractTypeId, expectedOrderNumber, database); contractType.orderNumber = expectedOrderNumber; } diff --git a/database/getContractTypes.ts b/database/getContractTypes.ts index ae370bb9..6f3b6c15 100644 --- a/database/getContractTypes.ts +++ b/database/getContractTypes.ts @@ -7,14 +7,18 @@ import getContractTypeFields from './getContractTypeFields.js' import getContractTypePrints from './getContractTypePrints.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export default function getContractTypes(): ContractType[] { +export default function getContractTypes( + includeDeleted = false +): ContractType[] { const database = sqlite(sunriseDB) + const updateOrderNumbers = !includeDeleted + const contractTypes = database .prepare( `select contractTypeId, contractType, isPreneed, orderNumber from ContractTypes - where recordDelete_timeMillis is null + ${includeDeleted ? '' : ' where recordDelete_timeMillis is null '} order by orderNumber, contractType, contractTypeId` ) .all() as ContractType[] @@ -24,7 +28,10 @@ export default function getContractTypes(): ContractType[] { for (const contractType of contractTypes) { expectedOrderNumber += 1 - if (contractType.orderNumber !== expectedOrderNumber) { + if ( + updateOrderNumbers && + contractType.orderNumber !== expectedOrderNumber + ) { updateRecordOrderNumber( 'ContractTypes', contractType.contractTypeId, diff --git a/database/getWorkOrderMilestoneTypes.d.ts b/database/getWorkOrderMilestoneTypes.d.ts index b2c4c1f1..65dc63a9 100644 --- a/database/getWorkOrderMilestoneTypes.d.ts +++ b/database/getWorkOrderMilestoneTypes.d.ts @@ -1,2 +1,2 @@ import type { WorkOrderMilestoneType } from '../types/record.types.js'; -export default function getWorkOrderMilestoneTypes(): WorkOrderMilestoneType[]; +export default function getWorkOrderMilestoneTypes(includeDeleted?: boolean): WorkOrderMilestoneType[]; diff --git a/database/getWorkOrderMilestoneTypes.js b/database/getWorkOrderMilestoneTypes.js index a9473802..37c42a05 100644 --- a/database/getWorkOrderMilestoneTypes.js +++ b/database/getWorkOrderMilestoneTypes.js @@ -1,21 +1,24 @@ import sqlite from 'better-sqlite3'; import { sunriseDB } from '../helpers/database.helpers.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export default function getWorkOrderMilestoneTypes() { +export default function getWorkOrderMilestoneTypes(includeDeleted = false) { const database = sqlite(sunriseDB); + const updateOrderNumbers = !includeDeleted; const workOrderMilestoneTypes = database .prepare(`select workOrderMilestoneTypeId, workOrderMilestoneType, orderNumber from WorkOrderMilestoneTypes - where recordDelete_timeMillis is null + ${includeDeleted ? '' : ' where recordDelete_timeMillis is null '} order by orderNumber, workOrderMilestoneType`) .all(); - let expectedOrderNumber = 0; - for (const workOrderMilestoneType of workOrderMilestoneTypes) { - if (workOrderMilestoneType.orderNumber !== expectedOrderNumber) { - updateRecordOrderNumber('WorkOrderMilestoneTypes', workOrderMilestoneType.workOrderMilestoneTypeId, expectedOrderNumber, database); - workOrderMilestoneType.orderNumber = expectedOrderNumber; + if (updateOrderNumbers) { + let expectedOrderNumber = 0; + for (const workOrderMilestoneType of workOrderMilestoneTypes) { + if (workOrderMilestoneType.orderNumber !== expectedOrderNumber) { + updateRecordOrderNumber('WorkOrderMilestoneTypes', workOrderMilestoneType.workOrderMilestoneTypeId, expectedOrderNumber, database); + workOrderMilestoneType.orderNumber = expectedOrderNumber; + } + expectedOrderNumber += 1; } - expectedOrderNumber += 1; } database.close(); return workOrderMilestoneTypes; diff --git a/database/getWorkOrderMilestoneTypes.ts b/database/getWorkOrderMilestoneTypes.ts index f559e781..04888ed9 100644 --- a/database/getWorkOrderMilestoneTypes.ts +++ b/database/getWorkOrderMilestoneTypes.ts @@ -5,33 +5,39 @@ import type { WorkOrderMilestoneType } from '../types/record.types.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export default function getWorkOrderMilestoneTypes(): WorkOrderMilestoneType[] { +export default function getWorkOrderMilestoneTypes( + includeDeleted = false +): WorkOrderMilestoneType[] { const database = sqlite(sunriseDB) + const updateOrderNumbers = !includeDeleted + const workOrderMilestoneTypes = database .prepare( `select workOrderMilestoneTypeId, workOrderMilestoneType, orderNumber from WorkOrderMilestoneTypes - where recordDelete_timeMillis is null + ${includeDeleted ? '' : ' where recordDelete_timeMillis is null '} order by orderNumber, workOrderMilestoneType` ) .all() as WorkOrderMilestoneType[] - let expectedOrderNumber = 0 + if (updateOrderNumbers) { + let expectedOrderNumber = 0 - for (const workOrderMilestoneType of workOrderMilestoneTypes) { - if (workOrderMilestoneType.orderNumber !== expectedOrderNumber) { - updateRecordOrderNumber( - 'WorkOrderMilestoneTypes', - workOrderMilestoneType.workOrderMilestoneTypeId, - expectedOrderNumber, - database - ) + for (const workOrderMilestoneType of workOrderMilestoneTypes) { + if (workOrderMilestoneType.orderNumber !== expectedOrderNumber) { + updateRecordOrderNumber( + 'WorkOrderMilestoneTypes', + workOrderMilestoneType.workOrderMilestoneTypeId, + expectedOrderNumber, + database + ) - workOrderMilestoneType.orderNumber = expectedOrderNumber + workOrderMilestoneType.orderNumber = expectedOrderNumber + } + + expectedOrderNumber += 1 } - - expectedOrderNumber += 1 } database.close() diff --git a/helpers/functions.cache.d.ts b/helpers/functions.cache.d.ts index c2f43776..11413a62 100644 --- a/helpers/functions.cache.d.ts +++ b/helpers/functions.cache.d.ts @@ -1,15 +1,15 @@ import type { BurialSiteStatus, BurialSiteType, CommittalType, ContractType, ContractTypeField, IntermentContainerType, WorkOrderMilestoneType, WorkOrderType } from '../types/record.types.js'; -export declare function getBurialSiteStatusByBurialSiteStatus(burialSiteStatus: string): BurialSiteStatus | undefined; +export declare function getBurialSiteStatusByBurialSiteStatus(burialSiteStatus: string, includeDeleted?: boolean): BurialSiteStatus | undefined; export declare function getBurialSiteStatusById(burialSiteStatusId: number): BurialSiteStatus | undefined; -export declare function getBurialSiteStatuses(): BurialSiteStatus[]; +export declare function getBurialSiteStatuses(includeDeleted?: boolean): BurialSiteStatus[]; export declare function getBurialSiteTypeById(burialSiteTypeId: number): BurialSiteType | undefined; export declare function getBurialSiteTypes(includeDeleted?: boolean): BurialSiteType[]; export declare function getBurialSiteTypesByBurialSiteType(burialSiteType: string, includeDeleted?: boolean): BurialSiteType | undefined; export declare function getAllContractTypeFields(): ContractTypeField[]; -export declare function getContractTypeByContractType(contractTypeString: string): ContractType | undefined; +export declare function getContractTypeByContractType(contractTypeString: string, includeDeleted?: boolean): ContractType | undefined; export declare function getContractTypeById(contractTypeId: number): ContractType | undefined; export declare function getContractTypePrintsById(contractTypeId: number): string[]; -export declare function getContractTypes(): ContractType[]; +export declare function getContractTypes(includeDeleted?: boolean): ContractType[]; export declare function getIntermentContainerTypeById(intermentContainerTypeId: number): IntermentContainerType | undefined; export declare function getIntermentContainerTypes(): IntermentContainerType[]; export declare function getCommittalTypeById(committalTypeId: number): CommittalType | undefined; @@ -17,8 +17,8 @@ export declare function getCommittalTypes(): CommittalType[]; export declare function getWorkOrderTypeById(workOrderTypeId: number): WorkOrderType | undefined; export declare function getWorkOrderTypes(): WorkOrderType[]; export declare function getWorkOrderMilestoneTypeById(workOrderMilestoneTypeId: number): WorkOrderMilestoneType | undefined; -export declare function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrderMilestoneTypeString: string): WorkOrderMilestoneType | undefined; -export declare function getWorkOrderMilestoneTypes(): WorkOrderMilestoneType[]; +export declare function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrderMilestoneTypeString: string, includeDeleted?: boolean): WorkOrderMilestoneType | undefined; +export declare function getWorkOrderMilestoneTypes(includeDeleted?: boolean): WorkOrderMilestoneType[]; export declare function preloadCaches(): void; export declare const cacheTableNames: readonly ["BurialSiteStatuses", "BurialSiteTypeFields", "BurialSiteTypes", "CommittalTypes", "ContractTypeFields", "ContractTypePrints", "ContractTypes", "FeeCategories", "Fees", "IntermentContainerTypes", "WorkOrderMilestoneTypes", "WorkOrderTypes"]; export type CacheTableNames = (typeof cacheTableNames)[number]; diff --git a/helpers/functions.cache.js b/helpers/functions.cache.js index e1748372..3c82e169 100644 --- a/helpers/functions.cache.js +++ b/helpers/functions.cache.js @@ -15,8 +15,8 @@ const debug = Debug(`${DEBUG_NAMESPACE}:functions.cache:${process.pid.toString() * Burial Site Statuses */ let burialSiteStatuses; -export function getBurialSiteStatusByBurialSiteStatus(burialSiteStatus) { - const cachedStatuses = getBurialSiteStatuses(); +export function getBurialSiteStatusByBurialSiteStatus(burialSiteStatus, includeDeleted = false) { + const cachedStatuses = getBurialSiteStatuses(includeDeleted); const statusLowerCase = burialSiteStatus.toLowerCase(); return cachedStatuses.find((currentStatus) => currentStatus.burialSiteStatus.toLowerCase() === statusLowerCase); } @@ -24,8 +24,8 @@ export function getBurialSiteStatusById(burialSiteStatusId) { const cachedStatuses = getBurialSiteStatuses(); return cachedStatuses.find((currentStatus) => currentStatus.burialSiteStatusId === burialSiteStatusId); } -export function getBurialSiteStatuses() { - burialSiteStatuses ??= getBurialSiteStatusesFromDatabase(); +export function getBurialSiteStatuses(includeDeleted = false) { + burialSiteStatuses ??= getBurialSiteStatusesFromDatabase(includeDeleted); return burialSiteStatuses; } function clearBurialSiteStatusesCache() { @@ -60,8 +60,8 @@ export function getAllContractTypeFields() { allContractTypeFields ??= getContractTypeFieldsFromDatabase(); return allContractTypeFields; } -export function getContractTypeByContractType(contractTypeString) { - const cachedTypes = getContractTypes(); +export function getContractTypeByContractType(contractTypeString, includeDeleted = false) { + const cachedTypes = getContractTypes(includeDeleted); const typeLowerCase = contractTypeString.toLowerCase(); return cachedTypes.find((currentType) => currentType.contractType.toLowerCase() === typeLowerCase); } @@ -80,8 +80,8 @@ export function getContractTypePrintsById(contractTypeId) { } return contractType.contractTypePrints ?? []; } -export function getContractTypes() { - contractTypes ??= getContractTypesFromDatabase(); +export function getContractTypes(includeDeleted = false) { + contractTypes ??= getContractTypesFromDatabase(includeDeleted); return contractTypes; } function clearContractTypesCache() { @@ -142,14 +142,15 @@ export function getWorkOrderMilestoneTypeById(workOrderMilestoneTypeId) { return cachedWorkOrderMilestoneTypes.find((currentWorkOrderMilestoneType) => currentWorkOrderMilestoneType.workOrderMilestoneTypeId === workOrderMilestoneTypeId); } -export function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrderMilestoneTypeString) { - const cachedWorkOrderMilestoneTypes = getWorkOrderMilestoneTypes(); +export function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrderMilestoneTypeString, includeDeleted = false) { + const cachedWorkOrderMilestoneTypes = getWorkOrderMilestoneTypes(includeDeleted); const workOrderMilestoneTypeLowerCase = workOrderMilestoneTypeString.toLowerCase(); return cachedWorkOrderMilestoneTypes.find((currentWorkOrderMilestoneType) => currentWorkOrderMilestoneType.workOrderMilestoneType.toLowerCase() === workOrderMilestoneTypeLowerCase); } -export function getWorkOrderMilestoneTypes() { - workOrderMilestoneTypes ??= getWorkOrderMilestoneTypesFromDatabase(); +export function getWorkOrderMilestoneTypes(includeDeleted = false) { + workOrderMilestoneTypes ??= + getWorkOrderMilestoneTypesFromDatabase(includeDeleted); return workOrderMilestoneTypes; } function clearWorkOrderMilestoneTypesCache() { diff --git a/helpers/functions.cache.ts b/helpers/functions.cache.ts index 1e9458e2..ffe2161b 100644 --- a/helpers/functions.cache.ts +++ b/helpers/functions.cache.ts @@ -39,9 +39,10 @@ const debug = Debug( let burialSiteStatuses: BurialSiteStatus[] | undefined export function getBurialSiteStatusByBurialSiteStatus( - burialSiteStatus: string + burialSiteStatus: string, + includeDeleted = false ): BurialSiteStatus | undefined { - const cachedStatuses = getBurialSiteStatuses() + const cachedStatuses = getBurialSiteStatuses(includeDeleted) const statusLowerCase = burialSiteStatus.toLowerCase() @@ -61,8 +62,10 @@ export function getBurialSiteStatusById( ) } -export function getBurialSiteStatuses(): BurialSiteStatus[] { - burialSiteStatuses ??= getBurialSiteStatusesFromDatabase() +export function getBurialSiteStatuses( + includeDeleted = false +): BurialSiteStatus[] { + burialSiteStatuses ??= getBurialSiteStatusesFromDatabase(includeDeleted) return burialSiteStatuses } @@ -121,9 +124,10 @@ export function getAllContractTypeFields(): ContractTypeField[] { } export function getContractTypeByContractType( - contractTypeString: string + contractTypeString: string, + includeDeleted = false ): ContractType | undefined { - const cachedTypes = getContractTypes() + const cachedTypes = getContractTypes(includeDeleted) const typeLowerCase = contractTypeString.toLowerCase() @@ -159,8 +163,8 @@ export function getContractTypePrintsById(contractTypeId: number): string[] { return contractType.contractTypePrints ?? [] } -export function getContractTypes(): ContractType[] { - contractTypes ??= getContractTypesFromDatabase() +export function getContractTypes(includeDeleted = false): ContractType[] { + contractTypes ??= getContractTypesFromDatabase(includeDeleted) return contractTypes } @@ -266,9 +270,11 @@ export function getWorkOrderMilestoneTypeById( } export function getWorkOrderMilestoneTypeByWorkOrderMilestoneType( - workOrderMilestoneTypeString: string + workOrderMilestoneTypeString: string, + includeDeleted = false ): WorkOrderMilestoneType | undefined { - const cachedWorkOrderMilestoneTypes = getWorkOrderMilestoneTypes() + const cachedWorkOrderMilestoneTypes = + getWorkOrderMilestoneTypes(includeDeleted) const workOrderMilestoneTypeLowerCase = workOrderMilestoneTypeString.toLowerCase() @@ -280,8 +286,11 @@ export function getWorkOrderMilestoneTypeByWorkOrderMilestoneType( ) } -export function getWorkOrderMilestoneTypes(): WorkOrderMilestoneType[] { - workOrderMilestoneTypes ??= getWorkOrderMilestoneTypesFromDatabase() +export function getWorkOrderMilestoneTypes( + includeDeleted = false +): WorkOrderMilestoneType[] { + workOrderMilestoneTypes ??= + getWorkOrderMilestoneTypesFromDatabase(includeDeleted) return workOrderMilestoneTypes } diff --git a/temp/legacyImportFromCsv/data.ids.js b/temp/legacyImportFromCsv/data.ids.js index c6f29cc3..09407e6a 100644 --- a/temp/legacyImportFromCsv/data.ids.js +++ b/temp/legacyImportFromCsv/data.ids.js @@ -2,26 +2,26 @@ import * as cacheFunctions from '../../helpers/functions.cache.js'; /* * Burial Site Status IDs */ -export const availableBurialSiteStatusId = cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Available') +export const availableBurialSiteStatusId = cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Available', true) ?.burialSiteStatusId; -export const reservedBurialSiteStatusId = cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Reserved') +export const reservedBurialSiteStatusId = cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Reserved', true) ?.burialSiteStatusId; -export const takenBurialSiteStatusId = cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Taken') +export const takenBurialSiteStatusId = cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Taken', true) ?.burialSiteStatusId; /* * Contract Type IDs */ -export const preneedContractType = cacheFunctions.getContractTypeByContractType('Preneed'); -export const deceasedContractType = cacheFunctions.getContractTypeByContractType('Interment'); -export const cremationContractType = cacheFunctions.getContractTypeByContractType('Cremation'); +export const preneedContractType = cacheFunctions.getContractTypeByContractType('Preneed', true); +export const deceasedContractType = cacheFunctions.getContractTypeByContractType('Interment', true); +export const cremationContractType = cacheFunctions.getContractTypeByContractType('Cremation', true); /* * Work Order Milestone Type IDs */ -export const acknowledgedWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType('Acknowledged')?.workOrderMilestoneTypeId; -export const deathWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType('Death')?.workOrderMilestoneTypeId; -export const funeralWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType('Funeral')?.workOrderMilestoneTypeId; -export const cremationWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType('Cremation')?.workOrderMilestoneTypeId; -export const intermentWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType('Interment')?.workOrderMilestoneTypeId; +export const acknowledgedWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType('Acknowledged', true)?.workOrderMilestoneTypeId; +export const deathWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType('Death', true)?.workOrderMilestoneTypeId; +export const funeralWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType('Funeral', true)?.workOrderMilestoneTypeId; +export const cremationWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType('Cremation', true)?.workOrderMilestoneTypeId; +export const intermentWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType('Interment', true)?.workOrderMilestoneTypeId; /* * Work Order Type IDs */ diff --git a/temp/legacyImportFromCsv/data.ids.ts b/temp/legacyImportFromCsv/data.ids.ts index 49bb1efb..05160022 100644 --- a/temp/legacyImportFromCsv/data.ids.ts +++ b/temp/legacyImportFromCsv/data.ids.ts @@ -6,15 +6,15 @@ import type { ContractType } from '../../types/record.types.js' */ export const availableBurialSiteStatusId = - cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Available') + cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Available', true) ?.burialSiteStatusId as number export const reservedBurialSiteStatusId = - cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Reserved') + cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Reserved', true) ?.burialSiteStatusId as number export const takenBurialSiteStatusId = - cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Taken') + cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Taken', true) ?.burialSiteStatusId as number /* @@ -22,14 +22,21 @@ export const takenBurialSiteStatusId = */ export const preneedContractType = cacheFunctions.getContractTypeByContractType( - 'Preneed' + 'Preneed', + true ) as ContractType export const deceasedContractType = - cacheFunctions.getContractTypeByContractType('Interment') as ContractType + cacheFunctions.getContractTypeByContractType( + 'Interment', + true + ) as ContractType export const cremationContractType = - cacheFunctions.getContractTypeByContractType('Cremation') as ContractType + cacheFunctions.getContractTypeByContractType( + 'Cremation', + true + ) as ContractType /* * Work Order Milestone Type IDs @@ -37,27 +44,32 @@ export const cremationContractType = export const acknowledgedWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType( - 'Acknowledged' + 'Acknowledged', + true )?.workOrderMilestoneTypeId export const deathWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType( - 'Death' + 'Death', + true )?.workOrderMilestoneTypeId export const funeralWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType( - 'Funeral' + 'Funeral', + true )?.workOrderMilestoneTypeId export const cremationWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType( - 'Cremation' + 'Cremation', + true )?.workOrderMilestoneTypeId export const intermentWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType( - 'Interment' + 'Interment', + true )?.workOrderMilestoneTypeId /*