steve
/
sunrise-cms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code updates

deepsource-autofix-76c6eb20
Dan Gowans 2023-11-29 13:23:05 -05:00
parent 95bbfeba48
commit 4a529fad3c
10 changed files with 118 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helpers/functions.cache.d.ts vendored
View File

@ -1,4 +1,4 @@
import type * as recordTypes from '../types/recordTypes';
import type * as recordTypes from '../types/recordTypes.js';
export declare function getLotOccupantTypes(): Promise<recordTypes.LotOccupantType[]>;
export declare function getLotOccupantTypeById(lotOccupantTypeId: number): Promise<recordTypes.LotOccupantType | undefined>;
export declare function getLotOccupantTypeByLotOccupantType(lotOccupantType: string): Promise<recordTypes.LotOccupantType | undefined>;

6
helpers/functions.cache.js
View File

@ -1,13 +1,13 @@
import cluster from 'node:cluster';
import Debug from 'debug';
import * as configFunctions from './functions.config.js';
import { getLotOccupantTypes as getLotOccupantTypesFromDatabase } from './lotOccupancyDB/getLotOccupantTypes.js';
import { getLotStatuses as getLotStatusesFromDatabase } from './lotOccupancyDB/getLotStatuses.js';
import { getLotTypes as getLotTypesFromDatabase } from './lotOccupancyDB/getLotTypes.js';
import { getOccupancyTypes as getOccupancyTypesFromDatabase } from './lotOccupancyDB/getOccupancyTypes.js';
import { getOccupancyTypeFields as getOccupancyTypeFieldsFromDatabase } from './lotOccupancyDB/getOccupancyTypeFields.js';
import { getWorkOrderTypes as getWorkOrderTypesFromDatabase } from './lotOccupancyDB/getWorkOrderTypes.js';
import { getOccupancyTypes as getOccupancyTypesFromDatabase } from './lotOccupancyDB/getOccupancyTypes.js';
import { getWorkOrderMilestoneTypes as getWorkOrderMilestoneTypesFromDatabase } from './lotOccupancyDB/getWorkOrderMilestoneTypes.js';
import Debug from 'debug';
import { getWorkOrderTypes as getWorkOrderTypesFromDatabase } from './lotOccupancyDB/getWorkOrderTypes.js';
const debug = Debug(`lot-occupancy-system:functions.cache:${process.pid}`);
let lotOccupantTypes;
export async function getLotOccupantTypes() {

21
helpers/functions.cache.ts
View File

@ -1,26 +1,23 @@
// eslint-disable-next-line eslint-comments/disable-enable-pair
/* eslint-disable @typescript-eslint/indent */
import cluster from 'node:cluster'
import Debug from 'debug'
import type { ClearCacheWorkerMessage } from '../types/applicationTypes.js'
// eslint-disable-next-line import/namespace
import type * as recordTypes from '../types/recordTypes.js'
import * as configFunctions from './functions.config.js'
import { getLotOccupantTypes as getLotOccupantTypesFromDatabase } from './lotOccupancyDB/getLotOccupantTypes.js'
import { getLotStatuses as getLotStatusesFromDatabase } from './lotOccupancyDB/getLotStatuses.js'
import { getLotTypes as getLotTypesFromDatabase } from './lotOccupancyDB/getLotTypes.js'
import { getOccupancyTypes as getOccupancyTypesFromDatabase } from './lotOccupancyDB/getOccupancyTypes.js'
import { getOccupancyTypeFields as getOccupancyTypeFieldsFromDatabase } from './lotOccupancyDB/getOccupancyTypeFields.js'
import { getOccupancyTypes as getOccupancyTypesFromDatabase } from './lotOccupancyDB/getOccupancyTypes.js'
import { getWorkOrderMilestoneTypes as getWorkOrderMilestoneTypesFromDatabase } from './lotOccupancyDB/getWorkOrderMilestoneTypes.js'
import { getWorkOrderTypes as getWorkOrderTypesFromDatabase } from './lotOccupancyDB/getWorkOrderTypes.js'
import { getWorkOrderMilestoneTypes as getWorkOrderMilestoneTypesFromDatabase } from './lotOccupancyDB/getWorkOrderMilestoneTypes.js'
import type * as recordTypes from '../types/recordTypes'
import type { ClearCacheWorkerMessage } from '../types/applicationTypes'
import Debug from 'debug'
const debug = Debug(`lot-occupancy-system:functions.cache:${process.pid}`)
/*

1
helpers/functions.user.d.ts vendored
View File

@ -1,4 +1,3 @@
import type { User } from '../types/recordTypes';
export interface UserRequest {
session?: {
user?: User;

3
helpers/functions.user.js
View File

@ -15,10 +15,9 @@ export async function apiKeyIsValid(request) {
if (userName === undefined) {
return false;
}
const canLogin = configFunctions
return configFunctions
.getProperty('users.canLogin')
.some((currentUserName) => {
return userName === currentUserName.toLowerCase();
});
return canLogin;
}

6
helpers/functions.user.ts
View File

@ -1,8 +1,6 @@
import { getUserNameFromApiKey } from './functions.api.js'
import * as configFunctions from './functions.config.js'
import type { User } from '../types/recordTypes'
export interface UserRequest {
session?: {
user?: User
@ -36,11 +34,9 @@ export async function apiKeyIsValid(request: APIRequest): Promise<boolean> {
return false
}
const canLogin = configFunctions
return configFunctions
.getProperty('users.canLogin')
.some((currentUserName) => {
return userName === currentUserName.toLowerCase()
})
return canLogin
}

92
helpers/initializer.database.cemetery.js
View File

@ -1,19 +1,17 @@
import Debug from 'debug';
import { lotOccupancyDB as databasePath } from '../data/databasePaths.js';
import { initializeDatabase } from './initializer.database.js';
import { addOccupancyTypeField } from './lotOccupancyDB/addOccupancyTypeField.js';
import { addLotOccupantType } from './lotOccupancyDB/addLotOccupantType.js';
import { addOccupancyTypeField } from './lotOccupancyDB/addOccupancyTypeField.js';
import { addRecord } from './lotOccupancyDB/addRecord.js';
import Debug from 'debug';
const debug = Debug('lot-occupancy-system:initialize');
const session = {
user: {
const user = {
userName: 'init.cemetery',
userProperties: {
canUpdate: true,
isAdmin: true,
apiKey: ''
}
}
};
export async function initializeCemeteryDatabase() {
debug('Checking for ' + databasePath + '...');
@ -24,39 +22,39 @@ export async function initializeCemeteryDatabase() {
return false;
}
debug('New database file created. Proceeding with initialization.');
await addRecord('LotTypes', 'Casket Grave', 1, session);
await addRecord('LotTypes', 'Columbarium', 2, session);
await addRecord('LotTypes', 'Mausoleum', 2, session);
await addRecord('LotTypes', 'Niche Wall', 2, session);
await addRecord('LotTypes', 'Urn Garden', 2, session);
await addRecord('LotTypes', 'Crematorium', 2, session);
await addRecord('LotStatuses', 'Available', 1, session);
await addRecord('LotStatuses', 'Reserved', 2, session);
await addRecord('LotStatuses', 'Taken', 3, session);
await addRecord('LotTypes', 'Casket Grave', 1, user);
await addRecord('LotTypes', 'Columbarium', 2, user);
await addRecord('LotTypes', 'Mausoleum', 2, user);
await addRecord('LotTypes', 'Niche Wall', 2, user);
await addRecord('LotTypes', 'Urn Garden', 2, user);
await addRecord('LotTypes', 'Crematorium', 2, user);
await addRecord('LotStatuses', 'Available', 1, user);
await addRecord('LotStatuses', 'Reserved', 2, user);
await addRecord('LotStatuses', 'Taken', 3, user);
await addLotOccupantType({
lotOccupantType: 'Deceased',
fontAwesomeIconClass: 'cross',
orderNumber: 1
}, session);
}, user);
await addLotOccupantType({
lotOccupantType: 'Funeral Director',
fontAwesomeIconClass: 'church',
orderNumber: 2
}, session);
}, user);
await addLotOccupantType({
lotOccupantType: 'Preneed Owner',
fontAwesomeIconClass: 'user',
orderNumber: 3
}, session);
}, user);
await addLotOccupantType({
lotOccupantType: 'Purchaser',
fontAwesomeIconClass: 'hand-holding-usd',
occupantCommentTitle: 'Relationship to Owner/Deceased',
orderNumber: 4
}, session);
await addRecord('OccupancyTypes', 'Preneed', 1, session);
const intermentOccupancyTypeId = await addRecord('OccupancyTypes', 'Interment', 2, session);
const cremationOccupancyTypeId = await addRecord('OccupancyTypes', 'Cremation', 3, session);
}, user);
await addRecord('OccupancyTypes', 'Preneed', 1, user);
const intermentOccupancyTypeId = await addRecord('OccupancyTypes', 'Interment', 2, user);
const cremationOccupancyTypeId = await addRecord('OccupancyTypes', 'Cremation', 3, user);
const deathDateField = {
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: 'Death Date',
@ -67,10 +65,10 @@ export async function initializeCemeteryDatabase() {
maximumLength: 10,
orderNumber: 1
};
await addOccupancyTypeField(deathDateField, session);
await addOccupancyTypeField(deathDateField, user);
await addOccupancyTypeField(Object.assign(deathDateField, {
occupancyTypeId: cremationOccupancyTypeId
}), session);
}), user);
const deathAgeField = {
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: 'Death Age',
@ -81,8 +79,8 @@ export async function initializeCemeteryDatabase() {
maximumLength: 3,
orderNumber: 2
};
await addOccupancyTypeField(deathAgeField, session);
await addOccupancyTypeField(Object.assign(deathAgeField, { occupancyTypeId: cremationOccupancyTypeId }), session);
await addOccupancyTypeField(deathAgeField, user);
await addOccupancyTypeField(Object.assign(deathAgeField, { occupancyTypeId: cremationOccupancyTypeId }), user);
const deathAgePeriod = {
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: 'Death Age Period',
@ -93,10 +91,10 @@ export async function initializeCemeteryDatabase() {
maximumLength: 10,
orderNumber: 3
};
await addOccupancyTypeField(deathAgePeriod, session);
await addOccupancyTypeField(deathAgePeriod, user);
await addOccupancyTypeField(Object.assign(deathAgePeriod, {
occupancyTypeId: cremationOccupancyTypeId
}), session);
}), user);
const deathPlace = {
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: 'Death Place',
@ -107,8 +105,8 @@ export async function initializeCemeteryDatabase() {
maximumLength: 100,
orderNumber: 4
};
await addOccupancyTypeField(deathPlace, session);
await addOccupancyTypeField(Object.assign(deathPlace, { occupancyTypeId: cremationOccupancyTypeId }), session);
await addOccupancyTypeField(deathPlace, user);
await addOccupancyTypeField(Object.assign(deathPlace, { occupancyTypeId: cremationOccupancyTypeId }), user);
const funeralHome = {
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: 'Funeral Home',
@ -119,8 +117,8 @@ export async function initializeCemeteryDatabase() {
maximumLength: 100,
orderNumber: 10
};
await addOccupancyTypeField(funeralHome, session);
await addOccupancyTypeField(Object.assign(funeralHome, { occupancyTypeId: cremationOccupancyTypeId }), session);
await addOccupancyTypeField(funeralHome, user);
await addOccupancyTypeField(Object.assign(funeralHome, { occupancyTypeId: cremationOccupancyTypeId }), user);
const funeralDate = {
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: 'Funeral Date',
@ -131,8 +129,8 @@ export async function initializeCemeteryDatabase() {
maximumLength: 10,
orderNumber: 11
};
await addOccupancyTypeField(funeralDate, session);
await addOccupancyTypeField(Object.assign(funeralDate, { occupancyTypeId: cremationOccupancyTypeId }), session);
await addOccupancyTypeField(funeralDate, user);
await addOccupancyTypeField(Object.assign(funeralDate, { occupancyTypeId: cremationOccupancyTypeId }), user);
const containerType = {
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: 'Container Type',
@ -143,8 +141,8 @@ export async function initializeCemeteryDatabase() {
maximumLength: 100,
orderNumber: 20
};
await addOccupancyTypeField(containerType, session);
await addOccupancyTypeField(Object.assign(containerType, { occupancyTypeId: cremationOccupancyTypeId }), session);
await addOccupancyTypeField(containerType, user);
await addOccupancyTypeField(Object.assign(containerType, { occupancyTypeId: cremationOccupancyTypeId }), user);
const committalType = {
occupancyTypeId: intermentOccupancyTypeId,
occupancyTypeField: 'Committal Type',
@ -155,17 +153,17 @@ export async function initializeCemeteryDatabase() {
maximumLength: 100,
orderNumber: 21
};
await addOccupancyTypeField(committalType, session);
await addOccupancyTypeField(Object.assign(committalType, { occupancyTypeId: cremationOccupancyTypeId }), session);
await addRecord('FeeCategories', 'Interment Rights', 1, session);
await addRecord('FeeCategories', 'Cremation Services', 2, session);
await addRecord('FeeCategories', 'Burial Charges', 3, session);
await addRecord('FeeCategories', 'Disinterment of Human Remains', 4, session);
await addRecord('FeeCategories', 'Additional Services', 5, session);
await addRecord('WorkOrderTypes', 'Cemetry Work Order', 1, session);
await addRecord('WorkOrderMilestoneTypes', 'Funeral', 1, session);
await addRecord('WorkOrderMilestoneTypes', 'Arrival', 2, session);
await addRecord('WorkOrderMilestoneTypes', 'Cremation', 3, session);
await addRecord('WorkOrderMilestoneTypes', 'Interment', 4, session);
await addOccupancyTypeField(committalType, user);
await addOccupancyTypeField(Object.assign(committalType, { occupancyTypeId: cremationOccupancyTypeId }), user);
await addRecord('FeeCategories', 'Interment Rights', 1, user);
await addRecord('FeeCategories', 'Cremation Services', 2, user);
await addRecord('FeeCategories', 'Burial Charges', 3, user);
await addRecord('FeeCategories', 'Disinterment of Human Remains', 4, user);
await addRecord('FeeCategories', 'Additional Services', 5, user);
await addRecord('WorkOrderTypes', 'Cemetery Work Order', 1, user);
await addRecord('WorkOrderMilestoneTypes', 'Funeral', 1, user);
await addRecord('WorkOrderMilestoneTypes', 'Arrival', 2, user);
await addRecord('WorkOrderMilestoneTypes', 'Cremation', 3, user);
await addRecord('WorkOrderMilestoneTypes', 'Interment', 4, user);
return true;
}

98
helpers/initializer.database.cemetery.ts
View File

@ -1,27 +1,21 @@
import Debug from 'debug'
import { lotOccupancyDB as databasePath } from '../data/databasePaths.js'
import { initializeDatabase } from './initializer.database.js'
import { addOccupancyTypeField } from './lotOccupancyDB/addOccupancyTypeField.js'
import { addLotOccupantType } from './lotOccupancyDB/addLotOccupantType.js'
import { addOccupancyTypeField } from './lotOccupancyDB/addOccupancyTypeField.js'
import { addRecord } from './lotOccupancyDB/addRecord.js'
import type { PartialSession } from '../types/recordTypes.js'
import Debug from 'debug'
const debug = Debug('lot-occupancy-system:initialize')
const session: PartialSession = {
user: {
const user: User = {
userName: 'init.cemetery',
userProperties: {
canUpdate: true,
isAdmin: true,
apiKey: ''
}
}
}
export async function initializeCemeteryDatabase(): Promise<boolean> {
@ -46,20 +40,20 @@ export async function initializeCemeteryDatabase(): Promise<boolean> {
* Lot Types
*/
await addRecord('LotTypes', 'Casket Grave', 1, session)
await addRecord('LotTypes', 'Columbarium', 2, session)
await addRecord('LotTypes', 'Mausoleum', 2, session)
await addRecord('LotTypes', 'Niche Wall', 2, session)
await addRecord('LotTypes', 'Urn Garden', 2, session)
await addRecord('LotTypes', 'Crematorium', 2, session)
await addRecord('LotTypes', 'Casket Grave', 1, user)
await addRecord('LotTypes', 'Columbarium', 2, user)
await addRecord('LotTypes', 'Mausoleum', 2, user)
await addRecord('LotTypes', 'Niche Wall', 2, user)
await addRecord('LotTypes', 'Urn Garden', 2, user)
await addRecord('LotTypes', 'Crematorium', 2, user)
/*
* Lot Statuses
*/
await addRecord('LotStatuses', 'Available', 1, session)
await addRecord('LotStatuses', 'Reserved', 2, session)
await addRecord('LotStatuses', 'Taken', 3, session)
await addRecord('LotStatuses', 'Available', 1, user)
await addRecord('LotStatuses', 'Reserved', 2, user)
await addRecord('LotStatuses', 'Taken', 3, user)
/*
* Lot Occupant Types
@ -71,7 +65,7 @@ export async function initializeCemeteryDatabase(): Promise<boolean> {
fontAwesomeIconClass: 'cross',
orderNumber: 1
},
session
user
)
await addLotOccupantType(
@ -80,7 +74,7 @@ export async function initializeCemeteryDatabase(): Promise<boolean> {
fontAwesomeIconClass: 'church',
orderNumber: 2
},
session
user
)
await addLotOccupantType(
@ -89,7 +83,7 @@ export async function initializeCemeteryDatabase(): Promise<boolean> {
fontAwesomeIconClass: 'user',
orderNumber: 3
},
session
user
)
await addLotOccupantType(
@ -99,25 +93,25 @@ export async function initializeCemeteryDatabase(): Promise<boolean> {
occupantCommentTitle: 'Relationship to Owner/Deceased',
orderNumber: 4
},
session
user
)
/*
* Occupancy Types
*/
await addRecord('OccupancyTypes', 'Preneed', 1, session)
await addRecord('OccupancyTypes', 'Preneed', 1, user)
const intermentOccupancyTypeId = await addRecord(
'OccupancyTypes',
'Interment',
2,
session
user
)
const cremationOccupancyTypeId = await addRecord(
'OccupancyTypes',
'Cremation',
3,
session
user
)
// Death Date
@ -132,13 +126,13 @@ export async function initializeCemeteryDatabase(): Promise<boolean> {
orderNumber: 1
}
await addOccupancyTypeField(deathDateField, session)
await addOccupancyTypeField(deathDateField, user)
await addOccupancyTypeField(
Object.assign(deathDateField, {
occupancyTypeId: cremationOccupancyTypeId
}),
session
user
)
// Death Age
@ -153,11 +147,11 @@ export async function initializeCemeteryDatabase(): Promise<boolean> {
orderNumber: 2
}
await addOccupancyTypeField(deathAgeField, session)
await addOccupancyTypeField(deathAgeField, user)
await addOccupancyTypeField(
Object.assign(deathAgeField, { occupancyTypeId: cremationOccupancyTypeId }),
session
user
)
// Death Age Period
@ -172,13 +166,13 @@ export async function initializeCemeteryDatabase(): Promise<boolean> {
orderNumber: 3
}
await addOccupancyTypeField(deathAgePeriod, session)
await addOccupancyTypeField(deathAgePeriod, user)
await addOccupancyTypeField(
Object.assign(deathAgePeriod, {
occupancyTypeId: cremationOccupancyTypeId
}),
session
user
)
// Death Place
@ -193,11 +187,11 @@ export async function initializeCemeteryDatabase(): Promise<boolean> {
orderNumber: 4
}
await addOccupancyTypeField(deathPlace, session)
await addOccupancyTypeField(deathPlace, user)
await addOccupancyTypeField(
Object.assign(deathPlace, { occupancyTypeId: cremationOccupancyTypeId }),
session
user
)
// Funeral Home
@ -212,11 +206,11 @@ export async function initializeCemeteryDatabase(): Promise<boolean> {
orderNumber: 10
}
await addOccupancyTypeField(funeralHome, session)
await addOccupancyTypeField(funeralHome, user)
await addOccupancyTypeField(
Object.assign(funeralHome, { occupancyTypeId: cremationOccupancyTypeId }),
session
user
)
// Funeral Date
@ -231,11 +225,11 @@ export async function initializeCemeteryDatabase(): Promise<boolean> {
orderNumber: 11
}
await addOccupancyTypeField(funeralDate, session)
await addOccupancyTypeField(funeralDate, user)
await addOccupancyTypeField(
Object.assign(funeralDate, { occupancyTypeId: cremationOccupancyTypeId }),
session
user
)
// Container Type
@ -250,11 +244,11 @@ export async function initializeCemeteryDatabase(): Promise<boolean> {
orderNumber: 20
}
await addOccupancyTypeField(containerType, session)
await addOccupancyTypeField(containerType, user)
await addOccupancyTypeField(
Object.assign(containerType, { occupancyTypeId: cremationOccupancyTypeId }),
session
user
)
// Committal Type
@ -269,33 +263,33 @@ export async function initializeCemeteryDatabase(): Promise<boolean> {
orderNumber: 21
}
await addOccupancyTypeField(committalType, session)
await addOccupancyTypeField(committalType, user)
await addOccupancyTypeField(
Object.assign(committalType, { occupancyTypeId: cremationOccupancyTypeId }),
session
user
)
/*
* Fee Categories
*/
await addRecord('FeeCategories', 'Interment Rights', 1, session)
await addRecord('FeeCategories', 'Cremation Services', 2, session)
await addRecord('FeeCategories', 'Burial Charges', 3, session)
await addRecord('FeeCategories', 'Disinterment of Human Remains', 4, session)
await addRecord('FeeCategories', 'Additional Services', 5, session)
await addRecord('FeeCategories', 'Interment Rights', 1, user)
await addRecord('FeeCategories', 'Cremation Services', 2, user)
await addRecord('FeeCategories', 'Burial Charges', 3, user)
await addRecord('FeeCategories', 'Disinterment of Human Remains', 4, user)
await addRecord('FeeCategories', 'Additional Services', 5, user)
/*
* Work Orders
*/
await addRecord('WorkOrderTypes', 'Cemetry Work Order', 1, session)
await addRecord('WorkOrderTypes', 'Cemetery Work Order', 1, user)
await addRecord('WorkOrderMilestoneTypes', 'Funeral', 1, session)
await addRecord('WorkOrderMilestoneTypes', 'Arrival', 2, session)
await addRecord('WorkOrderMilestoneTypes', 'Cremation', 3, session)
await addRecord('WorkOrderMilestoneTypes', 'Interment', 4, session)
await addRecord('WorkOrderMilestoneTypes', 'Funeral', 1, user)
await addRecord('WorkOrderMilestoneTypes', 'Arrival', 2, user)
await addRecord('WorkOrderMilestoneTypes', 'Cremation', 3, user)
await addRecord('WorkOrderMilestoneTypes', 'Interment', 4, user)
return true
}

2
helpers/initializer.database.js
View File

@ -1,6 +1,6 @@
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../data/databasePaths.js';
import debug from 'debug';
import { lotOccupancyDB as databasePath } from '../data/databasePaths.js';
const debugSQL = debug('lot-occupancy-system:databaseInitializer');
const recordColumns = `recordCreate_userName varchar(30) not null,
recordCreate_timeMillis integer not null,

2
helpers/initializer.database.ts
View File

@ -1,8 +1,8 @@
import sqlite from 'better-sqlite3'
import debug from 'debug'
import { lotOccupancyDB as databasePath } from '../data/databasePaths.js'
import debug from 'debug'
const debugSQL = debug('lot-occupancy-system:databaseInitializer')
const recordColumns = `recordCreate_userName varchar(30) not null,