more deleted item loading

pull/11/head
Dan Gowans 2025-05-01 09:26:40 -04:00
parent 59b0fb7e5f
commit 9048235ef2
14 changed files with 155 additions and 105 deletions

View File

@ -1,2 +1,2 @@
import type { BurialSiteStatus } from '../types/record.types.js'; import type { BurialSiteStatus } from '../types/record.types.js';
export default function getBurialSiteStatuses(): BurialSiteStatus[]; export default function getBurialSiteStatuses(includeDeleted?: boolean): BurialSiteStatus[];

View File

@ -1,21 +1,24 @@
import sqlite from 'better-sqlite3'; import sqlite from 'better-sqlite3';
import { sunriseDB } from '../helpers/database.helpers.js'; import { sunriseDB } from '../helpers/database.helpers.js';
import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js';
export default function getBurialSiteStatuses() { export default function getBurialSiteStatuses(includeDeleted = false) {
const database = sqlite(sunriseDB); const database = sqlite(sunriseDB);
const updateOrderNumbers = !includeDeleted;
const statuses = database const statuses = database
.prepare(`select burialSiteStatusId, burialSiteStatus, orderNumber .prepare(`select burialSiteStatusId, burialSiteStatus, orderNumber
from BurialSiteStatuses from BurialSiteStatuses
where recordDelete_timeMillis is null ${includeDeleted ? '' : ' where recordDelete_timeMillis is null '}
order by orderNumber, burialSiteStatus`) order by orderNumber, burialSiteStatus`)
.all(); .all();
let expectedOrderNumber = 0; if (updateOrderNumbers) {
for (const status of statuses) { let expectedOrderNumber = 0;
if (status.orderNumber !== expectedOrderNumber) { for (const status of statuses) {
updateRecordOrderNumber('BurialSiteStatuses', status.burialSiteStatusId, expectedOrderNumber, database); if (status.orderNumber !== expectedOrderNumber) {
status.orderNumber = expectedOrderNumber; updateRecordOrderNumber('BurialSiteStatuses', status.burialSiteStatusId, expectedOrderNumber, database);
status.orderNumber = expectedOrderNumber;
}
expectedOrderNumber += 1;
} }
expectedOrderNumber += 1;
} }
database.close(); database.close();
return statuses; return statuses;

View File

@ -5,32 +5,39 @@ import type { BurialSiteStatus } from '../types/record.types.js'
import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'
export default function getBurialSiteStatuses(): BurialSiteStatus[] { export default function getBurialSiteStatuses(
includeDeleted = false
): BurialSiteStatus[] {
const database = sqlite(sunriseDB) const database = sqlite(sunriseDB)
const updateOrderNumbers = !includeDeleted
const statuses = database const statuses = database
.prepare( .prepare(
`select burialSiteStatusId, burialSiteStatus, orderNumber `select burialSiteStatusId, burialSiteStatus, orderNumber
from BurialSiteStatuses from BurialSiteStatuses
where recordDelete_timeMillis is null ${includeDeleted ? '' : ' where recordDelete_timeMillis is null '}
order by orderNumber, burialSiteStatus` order by orderNumber, burialSiteStatus`
) )
.all() as BurialSiteStatus[] .all() as BurialSiteStatus[]
let expectedOrderNumber = 0 if (updateOrderNumbers) {
let expectedOrderNumber = 0
for (const status of statuses) { for (const status of statuses) {
if (status.orderNumber !== expectedOrderNumber) { if (status.orderNumber !== expectedOrderNumber) {
updateRecordOrderNumber( updateRecordOrderNumber(
'BurialSiteStatuses', 'BurialSiteStatuses',
status.burialSiteStatusId, status.burialSiteStatusId,
expectedOrderNumber, expectedOrderNumber,
database database
) )
status.orderNumber = expectedOrderNumber
status.orderNumber = expectedOrderNumber
}
expectedOrderNumber += 1
} }
expectedOrderNumber += 1
} }
database.close() database.close()

View File

@ -1,2 +1,2 @@
import type { ContractType } from '../types/record.types.js'; import type { ContractType } from '../types/record.types.js';
export default function getContractTypes(): ContractType[]; export default function getContractTypes(includeDeleted?: boolean): ContractType[];

View File

@ -3,18 +3,20 @@ import { sunriseDB } from '../helpers/database.helpers.js';
import getContractTypeFields from './getContractTypeFields.js'; import getContractTypeFields from './getContractTypeFields.js';
import getContractTypePrints from './getContractTypePrints.js'; import getContractTypePrints from './getContractTypePrints.js';
import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js';
export default function getContractTypes() { export default function getContractTypes(includeDeleted = false) {
const database = sqlite(sunriseDB); const database = sqlite(sunriseDB);
const updateOrderNumbers = !includeDeleted;
const contractTypes = database const contractTypes = database
.prepare(`select contractTypeId, contractType, isPreneed, orderNumber .prepare(`select contractTypeId, contractType, isPreneed, orderNumber
from ContractTypes from ContractTypes
where recordDelete_timeMillis is null ${includeDeleted ? '' : ' where recordDelete_timeMillis is null '}
order by orderNumber, contractType, contractTypeId`) order by orderNumber, contractType, contractTypeId`)
.all(); .all();
let expectedOrderNumber = -1; let expectedOrderNumber = -1;
for (const contractType of contractTypes) { for (const contractType of contractTypes) {
expectedOrderNumber += 1; expectedOrderNumber += 1;
if (contractType.orderNumber !== expectedOrderNumber) { if (updateOrderNumbers &&
contractType.orderNumber !== expectedOrderNumber) {
updateRecordOrderNumber('ContractTypes', contractType.contractTypeId, expectedOrderNumber, database); updateRecordOrderNumber('ContractTypes', contractType.contractTypeId, expectedOrderNumber, database);
contractType.orderNumber = expectedOrderNumber; contractType.orderNumber = expectedOrderNumber;
} }

View File

@ -7,14 +7,18 @@ import getContractTypeFields from './getContractTypeFields.js'
import getContractTypePrints from './getContractTypePrints.js' import getContractTypePrints from './getContractTypePrints.js'
import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'
export default function getContractTypes(): ContractType[] { export default function getContractTypes(
includeDeleted = false
): ContractType[] {
const database = sqlite(sunriseDB) const database = sqlite(sunriseDB)
const updateOrderNumbers = !includeDeleted
const contractTypes = database const contractTypes = database
.prepare( .prepare(
`select contractTypeId, contractType, isPreneed, orderNumber `select contractTypeId, contractType, isPreneed, orderNumber
from ContractTypes from ContractTypes
where recordDelete_timeMillis is null ${includeDeleted ? '' : ' where recordDelete_timeMillis is null '}
order by orderNumber, contractType, contractTypeId` order by orderNumber, contractType, contractTypeId`
) )
.all() as ContractType[] .all() as ContractType[]
@ -24,7 +28,10 @@ export default function getContractTypes(): ContractType[] {
for (const contractType of contractTypes) { for (const contractType of contractTypes) {
expectedOrderNumber += 1 expectedOrderNumber += 1
if (contractType.orderNumber !== expectedOrderNumber) { if (
updateOrderNumbers &&
contractType.orderNumber !== expectedOrderNumber
) {
updateRecordOrderNumber( updateRecordOrderNumber(
'ContractTypes', 'ContractTypes',
contractType.contractTypeId, contractType.contractTypeId,

View File

@ -1,2 +1,2 @@
import type { WorkOrderMilestoneType } from '../types/record.types.js'; import type { WorkOrderMilestoneType } from '../types/record.types.js';
export default function getWorkOrderMilestoneTypes(): WorkOrderMilestoneType[]; export default function getWorkOrderMilestoneTypes(includeDeleted?: boolean): WorkOrderMilestoneType[];

View File

@ -1,21 +1,24 @@
import sqlite from 'better-sqlite3'; import sqlite from 'better-sqlite3';
import { sunriseDB } from '../helpers/database.helpers.js'; import { sunriseDB } from '../helpers/database.helpers.js';
import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js';
export default function getWorkOrderMilestoneTypes() { export default function getWorkOrderMilestoneTypes(includeDeleted = false) {
const database = sqlite(sunriseDB); const database = sqlite(sunriseDB);
const updateOrderNumbers = !includeDeleted;
const workOrderMilestoneTypes = database const workOrderMilestoneTypes = database
.prepare(`select workOrderMilestoneTypeId, workOrderMilestoneType, orderNumber .prepare(`select workOrderMilestoneTypeId, workOrderMilestoneType, orderNumber
from WorkOrderMilestoneTypes from WorkOrderMilestoneTypes
where recordDelete_timeMillis is null ${includeDeleted ? '' : ' where recordDelete_timeMillis is null '}
order by orderNumber, workOrderMilestoneType`) order by orderNumber, workOrderMilestoneType`)
.all(); .all();
let expectedOrderNumber = 0; if (updateOrderNumbers) {
for (const workOrderMilestoneType of workOrderMilestoneTypes) { let expectedOrderNumber = 0;
if (workOrderMilestoneType.orderNumber !== expectedOrderNumber) { for (const workOrderMilestoneType of workOrderMilestoneTypes) {
updateRecordOrderNumber('WorkOrderMilestoneTypes', workOrderMilestoneType.workOrderMilestoneTypeId, expectedOrderNumber, database); if (workOrderMilestoneType.orderNumber !== expectedOrderNumber) {
workOrderMilestoneType.orderNumber = expectedOrderNumber; updateRecordOrderNumber('WorkOrderMilestoneTypes', workOrderMilestoneType.workOrderMilestoneTypeId, expectedOrderNumber, database);
workOrderMilestoneType.orderNumber = expectedOrderNumber;
}
expectedOrderNumber += 1;
} }
expectedOrderNumber += 1;
} }
database.close(); database.close();
return workOrderMilestoneTypes; return workOrderMilestoneTypes;

View File

@ -5,33 +5,39 @@ import type { WorkOrderMilestoneType } from '../types/record.types.js'
import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'
export default function getWorkOrderMilestoneTypes(): WorkOrderMilestoneType[] { export default function getWorkOrderMilestoneTypes(
includeDeleted = false
): WorkOrderMilestoneType[] {
const database = sqlite(sunriseDB) const database = sqlite(sunriseDB)
const updateOrderNumbers = !includeDeleted
const workOrderMilestoneTypes = database const workOrderMilestoneTypes = database
.prepare( .prepare(
`select workOrderMilestoneTypeId, workOrderMilestoneType, orderNumber `select workOrderMilestoneTypeId, workOrderMilestoneType, orderNumber
from WorkOrderMilestoneTypes from WorkOrderMilestoneTypes
where recordDelete_timeMillis is null ${includeDeleted ? '' : ' where recordDelete_timeMillis is null '}
order by orderNumber, workOrderMilestoneType` order by orderNumber, workOrderMilestoneType`
) )
.all() as WorkOrderMilestoneType[] .all() as WorkOrderMilestoneType[]
let expectedOrderNumber = 0 if (updateOrderNumbers) {
let expectedOrderNumber = 0
for (const workOrderMilestoneType of workOrderMilestoneTypes) { for (const workOrderMilestoneType of workOrderMilestoneTypes) {
if (workOrderMilestoneType.orderNumber !== expectedOrderNumber) { if (workOrderMilestoneType.orderNumber !== expectedOrderNumber) {
updateRecordOrderNumber( updateRecordOrderNumber(
'WorkOrderMilestoneTypes', 'WorkOrderMilestoneTypes',
workOrderMilestoneType.workOrderMilestoneTypeId, workOrderMilestoneType.workOrderMilestoneTypeId,
expectedOrderNumber, expectedOrderNumber,
database database
) )
workOrderMilestoneType.orderNumber = expectedOrderNumber workOrderMilestoneType.orderNumber = expectedOrderNumber
}
expectedOrderNumber += 1
} }
expectedOrderNumber += 1
} }
database.close() database.close()

View File

@ -1,15 +1,15 @@
import type { BurialSiteStatus, BurialSiteType, CommittalType, ContractType, ContractTypeField, IntermentContainerType, WorkOrderMilestoneType, WorkOrderType } from '../types/record.types.js'; 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 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 getBurialSiteTypeById(burialSiteTypeId: number): BurialSiteType | undefined;
export declare function getBurialSiteTypes(includeDeleted?: boolean): BurialSiteType[]; export declare function getBurialSiteTypes(includeDeleted?: boolean): BurialSiteType[];
export declare function getBurialSiteTypesByBurialSiteType(burialSiteType: string, includeDeleted?: boolean): BurialSiteType | undefined; export declare function getBurialSiteTypesByBurialSiteType(burialSiteType: string, includeDeleted?: boolean): BurialSiteType | undefined;
export declare function getAllContractTypeFields(): ContractTypeField[]; 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 getContractTypeById(contractTypeId: number): ContractType | undefined;
export declare function getContractTypePrintsById(contractTypeId: number): string[]; 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 getIntermentContainerTypeById(intermentContainerTypeId: number): IntermentContainerType | undefined;
export declare function getIntermentContainerTypes(): IntermentContainerType[]; export declare function getIntermentContainerTypes(): IntermentContainerType[];
export declare function getCommittalTypeById(committalTypeId: number): CommittalType | undefined; 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 getWorkOrderTypeById(workOrderTypeId: number): WorkOrderType | undefined;
export declare function getWorkOrderTypes(): WorkOrderType[]; export declare function getWorkOrderTypes(): WorkOrderType[];
export declare function getWorkOrderMilestoneTypeById(workOrderMilestoneTypeId: number): WorkOrderMilestoneType | undefined; export declare function getWorkOrderMilestoneTypeById(workOrderMilestoneTypeId: number): WorkOrderMilestoneType | undefined;
export declare function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrderMilestoneTypeString: string): WorkOrderMilestoneType | undefined; export declare function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrderMilestoneTypeString: string, includeDeleted?: boolean): WorkOrderMilestoneType | undefined;
export declare function getWorkOrderMilestoneTypes(): WorkOrderMilestoneType[]; export declare function getWorkOrderMilestoneTypes(includeDeleted?: boolean): WorkOrderMilestoneType[];
export declare function preloadCaches(): void; export declare function preloadCaches(): void;
export declare const cacheTableNames: readonly ["BurialSiteStatuses", "BurialSiteTypeFields", "BurialSiteTypes", "CommittalTypes", "ContractTypeFields", "ContractTypePrints", "ContractTypes", "FeeCategories", "Fees", "IntermentContainerTypes", "WorkOrderMilestoneTypes", "WorkOrderTypes"]; export declare const cacheTableNames: readonly ["BurialSiteStatuses", "BurialSiteTypeFields", "BurialSiteTypes", "CommittalTypes", "ContractTypeFields", "ContractTypePrints", "ContractTypes", "FeeCategories", "Fees", "IntermentContainerTypes", "WorkOrderMilestoneTypes", "WorkOrderTypes"];
export type CacheTableNames = (typeof cacheTableNames)[number]; export type CacheTableNames = (typeof cacheTableNames)[number];

View File

@ -15,8 +15,8 @@ const debug = Debug(`${DEBUG_NAMESPACE}:functions.cache:${process.pid.toString()
* Burial Site Statuses * Burial Site Statuses
*/ */
let burialSiteStatuses; let burialSiteStatuses;
export function getBurialSiteStatusByBurialSiteStatus(burialSiteStatus) { export function getBurialSiteStatusByBurialSiteStatus(burialSiteStatus, includeDeleted = false) {
const cachedStatuses = getBurialSiteStatuses(); const cachedStatuses = getBurialSiteStatuses(includeDeleted);
const statusLowerCase = burialSiteStatus.toLowerCase(); const statusLowerCase = burialSiteStatus.toLowerCase();
return cachedStatuses.find((currentStatus) => currentStatus.burialSiteStatus.toLowerCase() === statusLowerCase); return cachedStatuses.find((currentStatus) => currentStatus.burialSiteStatus.toLowerCase() === statusLowerCase);
} }
@ -24,8 +24,8 @@ export function getBurialSiteStatusById(burialSiteStatusId) {
const cachedStatuses = getBurialSiteStatuses(); const cachedStatuses = getBurialSiteStatuses();
return cachedStatuses.find((currentStatus) => currentStatus.burialSiteStatusId === burialSiteStatusId); return cachedStatuses.find((currentStatus) => currentStatus.burialSiteStatusId === burialSiteStatusId);
} }
export function getBurialSiteStatuses() { export function getBurialSiteStatuses(includeDeleted = false) {
burialSiteStatuses ??= getBurialSiteStatusesFromDatabase(); burialSiteStatuses ??= getBurialSiteStatusesFromDatabase(includeDeleted);
return burialSiteStatuses; return burialSiteStatuses;
} }
function clearBurialSiteStatusesCache() { function clearBurialSiteStatusesCache() {
@ -60,8 +60,8 @@ export function getAllContractTypeFields() {
allContractTypeFields ??= getContractTypeFieldsFromDatabase(); allContractTypeFields ??= getContractTypeFieldsFromDatabase();
return allContractTypeFields; return allContractTypeFields;
} }
export function getContractTypeByContractType(contractTypeString) { export function getContractTypeByContractType(contractTypeString, includeDeleted = false) {
const cachedTypes = getContractTypes(); const cachedTypes = getContractTypes(includeDeleted);
const typeLowerCase = contractTypeString.toLowerCase(); const typeLowerCase = contractTypeString.toLowerCase();
return cachedTypes.find((currentType) => currentType.contractType.toLowerCase() === typeLowerCase); return cachedTypes.find((currentType) => currentType.contractType.toLowerCase() === typeLowerCase);
} }
@ -80,8 +80,8 @@ export function getContractTypePrintsById(contractTypeId) {
} }
return contractType.contractTypePrints ?? []; return contractType.contractTypePrints ?? [];
} }
export function getContractTypes() { export function getContractTypes(includeDeleted = false) {
contractTypes ??= getContractTypesFromDatabase(); contractTypes ??= getContractTypesFromDatabase(includeDeleted);
return contractTypes; return contractTypes;
} }
function clearContractTypesCache() { function clearContractTypesCache() {
@ -142,14 +142,15 @@ export function getWorkOrderMilestoneTypeById(workOrderMilestoneTypeId) {
return cachedWorkOrderMilestoneTypes.find((currentWorkOrderMilestoneType) => currentWorkOrderMilestoneType.workOrderMilestoneTypeId === return cachedWorkOrderMilestoneTypes.find((currentWorkOrderMilestoneType) => currentWorkOrderMilestoneType.workOrderMilestoneTypeId ===
workOrderMilestoneTypeId); workOrderMilestoneTypeId);
} }
export function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrderMilestoneTypeString) { export function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrderMilestoneTypeString, includeDeleted = false) {
const cachedWorkOrderMilestoneTypes = getWorkOrderMilestoneTypes(); const cachedWorkOrderMilestoneTypes = getWorkOrderMilestoneTypes(includeDeleted);
const workOrderMilestoneTypeLowerCase = workOrderMilestoneTypeString.toLowerCase(); const workOrderMilestoneTypeLowerCase = workOrderMilestoneTypeString.toLowerCase();
return cachedWorkOrderMilestoneTypes.find((currentWorkOrderMilestoneType) => currentWorkOrderMilestoneType.workOrderMilestoneType.toLowerCase() === return cachedWorkOrderMilestoneTypes.find((currentWorkOrderMilestoneType) => currentWorkOrderMilestoneType.workOrderMilestoneType.toLowerCase() ===
workOrderMilestoneTypeLowerCase); workOrderMilestoneTypeLowerCase);
} }
export function getWorkOrderMilestoneTypes() { export function getWorkOrderMilestoneTypes(includeDeleted = false) {
workOrderMilestoneTypes ??= getWorkOrderMilestoneTypesFromDatabase(); workOrderMilestoneTypes ??=
getWorkOrderMilestoneTypesFromDatabase(includeDeleted);
return workOrderMilestoneTypes; return workOrderMilestoneTypes;
} }
function clearWorkOrderMilestoneTypesCache() { function clearWorkOrderMilestoneTypesCache() {

View File

@ -39,9 +39,10 @@ const debug = Debug(
let burialSiteStatuses: BurialSiteStatus[] | undefined let burialSiteStatuses: BurialSiteStatus[] | undefined
export function getBurialSiteStatusByBurialSiteStatus( export function getBurialSiteStatusByBurialSiteStatus(
burialSiteStatus: string burialSiteStatus: string,
includeDeleted = false
): BurialSiteStatus | undefined { ): BurialSiteStatus | undefined {
const cachedStatuses = getBurialSiteStatuses() const cachedStatuses = getBurialSiteStatuses(includeDeleted)
const statusLowerCase = burialSiteStatus.toLowerCase() const statusLowerCase = burialSiteStatus.toLowerCase()
@ -61,8 +62,10 @@ export function getBurialSiteStatusById(
) )
} }
export function getBurialSiteStatuses(): BurialSiteStatus[] { export function getBurialSiteStatuses(
burialSiteStatuses ??= getBurialSiteStatusesFromDatabase() includeDeleted = false
): BurialSiteStatus[] {
burialSiteStatuses ??= getBurialSiteStatusesFromDatabase(includeDeleted)
return burialSiteStatuses return burialSiteStatuses
} }
@ -121,9 +124,10 @@ export function getAllContractTypeFields(): ContractTypeField[] {
} }
export function getContractTypeByContractType( export function getContractTypeByContractType(
contractTypeString: string contractTypeString: string,
includeDeleted = false
): ContractType | undefined { ): ContractType | undefined {
const cachedTypes = getContractTypes() const cachedTypes = getContractTypes(includeDeleted)
const typeLowerCase = contractTypeString.toLowerCase() const typeLowerCase = contractTypeString.toLowerCase()
@ -159,8 +163,8 @@ export function getContractTypePrintsById(contractTypeId: number): string[] {
return contractType.contractTypePrints ?? [] return contractType.contractTypePrints ?? []
} }
export function getContractTypes(): ContractType[] { export function getContractTypes(includeDeleted = false): ContractType[] {
contractTypes ??= getContractTypesFromDatabase() contractTypes ??= getContractTypesFromDatabase(includeDeleted)
return contractTypes return contractTypes
} }
@ -266,9 +270,11 @@ export function getWorkOrderMilestoneTypeById(
} }
export function getWorkOrderMilestoneTypeByWorkOrderMilestoneType( export function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(
workOrderMilestoneTypeString: string workOrderMilestoneTypeString: string,
includeDeleted = false
): WorkOrderMilestoneType | undefined { ): WorkOrderMilestoneType | undefined {
const cachedWorkOrderMilestoneTypes = getWorkOrderMilestoneTypes() const cachedWorkOrderMilestoneTypes =
getWorkOrderMilestoneTypes(includeDeleted)
const workOrderMilestoneTypeLowerCase = const workOrderMilestoneTypeLowerCase =
workOrderMilestoneTypeString.toLowerCase() workOrderMilestoneTypeString.toLowerCase()
@ -280,8 +286,11 @@ export function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(
) )
} }
export function getWorkOrderMilestoneTypes(): WorkOrderMilestoneType[] { export function getWorkOrderMilestoneTypes(
workOrderMilestoneTypes ??= getWorkOrderMilestoneTypesFromDatabase() includeDeleted = false
): WorkOrderMilestoneType[] {
workOrderMilestoneTypes ??=
getWorkOrderMilestoneTypesFromDatabase(includeDeleted)
return workOrderMilestoneTypes return workOrderMilestoneTypes
} }

View File

@ -2,26 +2,26 @@ import * as cacheFunctions from '../../helpers/functions.cache.js';
/* /*
* Burial Site Status IDs * Burial Site Status IDs
*/ */
export const availableBurialSiteStatusId = cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Available') export const availableBurialSiteStatusId = cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Available', true)
?.burialSiteStatusId; ?.burialSiteStatusId;
export const reservedBurialSiteStatusId = cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Reserved') export const reservedBurialSiteStatusId = cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Reserved', true)
?.burialSiteStatusId; ?.burialSiteStatusId;
export const takenBurialSiteStatusId = cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Taken') export const takenBurialSiteStatusId = cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Taken', true)
?.burialSiteStatusId; ?.burialSiteStatusId;
/* /*
* Contract Type IDs * Contract Type IDs
*/ */
export const preneedContractType = cacheFunctions.getContractTypeByContractType('Preneed'); export const preneedContractType = cacheFunctions.getContractTypeByContractType('Preneed', true);
export const deceasedContractType = cacheFunctions.getContractTypeByContractType('Interment'); export const deceasedContractType = cacheFunctions.getContractTypeByContractType('Interment', true);
export const cremationContractType = cacheFunctions.getContractTypeByContractType('Cremation'); export const cremationContractType = cacheFunctions.getContractTypeByContractType('Cremation', true);
/* /*
* Work Order Milestone Type IDs * Work Order Milestone Type IDs
*/ */
export const acknowledgedWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType('Acknowledged')?.workOrderMilestoneTypeId; export const acknowledgedWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType('Acknowledged', true)?.workOrderMilestoneTypeId;
export const deathWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType('Death')?.workOrderMilestoneTypeId; export const deathWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType('Death', true)?.workOrderMilestoneTypeId;
export const funeralWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType('Funeral')?.workOrderMilestoneTypeId; export const funeralWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType('Funeral', true)?.workOrderMilestoneTypeId;
export const cremationWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType('Cremation')?.workOrderMilestoneTypeId; export const cremationWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType('Cremation', true)?.workOrderMilestoneTypeId;
export const intermentWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType('Interment')?.workOrderMilestoneTypeId; export const intermentWorkOrderMilestoneTypeId = cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType('Interment', true)?.workOrderMilestoneTypeId;
/* /*
* Work Order Type IDs * Work Order Type IDs
*/ */

View File

@ -6,15 +6,15 @@ import type { ContractType } from '../../types/record.types.js'
*/ */
export const availableBurialSiteStatusId = export const availableBurialSiteStatusId =
cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Available') cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Available', true)
?.burialSiteStatusId as number ?.burialSiteStatusId as number
export const reservedBurialSiteStatusId = export const reservedBurialSiteStatusId =
cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Reserved') cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Reserved', true)
?.burialSiteStatusId as number ?.burialSiteStatusId as number
export const takenBurialSiteStatusId = export const takenBurialSiteStatusId =
cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Taken') cacheFunctions.getBurialSiteStatusByBurialSiteStatus('Taken', true)
?.burialSiteStatusId as number ?.burialSiteStatusId as number
/* /*
@ -22,14 +22,21 @@ export const takenBurialSiteStatusId =
*/ */
export const preneedContractType = cacheFunctions.getContractTypeByContractType( export const preneedContractType = cacheFunctions.getContractTypeByContractType(
'Preneed' 'Preneed',
true
) as ContractType ) as ContractType
export const deceasedContractType = export const deceasedContractType =
cacheFunctions.getContractTypeByContractType('Interment') as ContractType cacheFunctions.getContractTypeByContractType(
'Interment',
true
) as ContractType
export const cremationContractType = export const cremationContractType =
cacheFunctions.getContractTypeByContractType('Cremation') as ContractType cacheFunctions.getContractTypeByContractType(
'Cremation',
true
) as ContractType
/* /*
* Work Order Milestone Type IDs * Work Order Milestone Type IDs
@ -37,27 +44,32 @@ export const cremationContractType =
export const acknowledgedWorkOrderMilestoneTypeId = export const acknowledgedWorkOrderMilestoneTypeId =
cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType( cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType(
'Acknowledged' 'Acknowledged',
true
)?.workOrderMilestoneTypeId )?.workOrderMilestoneTypeId
export const deathWorkOrderMilestoneTypeId = export const deathWorkOrderMilestoneTypeId =
cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType( cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType(
'Death' 'Death',
true
)?.workOrderMilestoneTypeId )?.workOrderMilestoneTypeId
export const funeralWorkOrderMilestoneTypeId = export const funeralWorkOrderMilestoneTypeId =
cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType( cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType(
'Funeral' 'Funeral',
true
)?.workOrderMilestoneTypeId )?.workOrderMilestoneTypeId
export const cremationWorkOrderMilestoneTypeId = export const cremationWorkOrderMilestoneTypeId =
cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType( cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType(
'Cremation' 'Cremation',
true
)?.workOrderMilestoneTypeId )?.workOrderMilestoneTypeId
export const intermentWorkOrderMilestoneTypeId = export const intermentWorkOrderMilestoneTypeId =
cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType( cacheFunctions.getWorkOrderMilestoneTypeByWorkOrderMilestoneType(
'Interment' 'Interment',
true
)?.workOrderMilestoneTypeId )?.workOrderMilestoneTypeId
/* /*