fix undefined transaction time

alter table BurialSiteTypes
add bodyCapacityMax smallint

alter table BurialSiteTypes
add crematedCapacityMax smallint

alter table BurialSites
add bodyCapacity smallint

alter table BurialSites
add crematedCapacity smallint

.github/workflows/coverage.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [ 18, 20, 22, 23 ]
+        node: [ 20, 22, 23 ]
     env:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
@@ -25,11 +25,12 @@ jobs:
 
       - name: Install Application
         run: |
+          npm uninstall puppeteer
           npm ci
           npm install -g mocha c8 cypress@14
 
       - name: Copy Test Config
-        run: cp ./data/config.testing.js ./data/config.js
+        run: cp ./data/testing.config.js ./data/config.js
         
       - name: Test Application Startup
         run: npm run test:startup

README.md

@@ -5,25 +5,28 @@
 [![sunrise-cms](https://img.shields.io/endpoint?url=https://cloud.cypress.io/badge/simple/26a4bi&style=flat&logo=cypress)](https://cloud.cypress.io/projects/26a4bi/runs)
 [![Coverage Testing](https://github.com/cityssm/sunrise-cms/actions/workflows/coverage.yml/badge.svg)](https://github.com/cityssm/sunrise-cms/actions/workflows/coverage.yml)
 
-![Sunrise CMS](./docs/socialPreview.png)
+![Sunrise CMS](./docs/images/socialPreview.png)
 
 🚧 **In development** 🚧
 
 **A web-based application to assist cemetery managers with managing their cemetery records.**
 
-![Burial Site View](./docs/burialSite-view.png)
+![Burial Site View](./docs/images/burialSite-view.png)
 
 This is a major refactoring of the now archived
 [Lot Occupancy System](https://github.com/cityssm/lot-occupancy-system),
 originally built with multiple focuses in mind. This fork completely reworks the project
 to focus exculsively on cemetery management.
 
+[**User Documentation (In the Works)**](./docs/README.md)
+
 ## Why Sunrise CMS?
 
 ### ✔️ Cemetery Maps are NOT Required
 
 Many cemetery applications rely on maps to drill down into burial sites.
-In Sunrise CMS, maps are completely optional, greatly reducing the effort needed to get started.
+In Sunrise CMS, maps are completely optional, greatly reducing the effort needed to get started,
+and reducing the maintenance work when new blocks of burial sites are introduced.
 
 ### ✔️ The System Requirements are Very Low
 
@@ -31,14 +34,14 @@ Sunrise CMS does not need an expensive server to run.
 No separate database server is required either.
 The whole application could run on a current, modest workstation.
 
-### ✔️ Track Unlimited Cemeteries and Burial Sites
+### ✔️ Track Unlimited Cemeteries, Unlimited Burial Sites, Unlimited Contracts...
 
 There are no limits to the number of records that can be tracked in Sunrise CMS.
 
-### ✔️ Includes a Built-In Work Order System
+### ✔️ Includes a Simple Built-In Work Order System
 
 In addition to tracking data related to cemetery plots,
-Sunrise CMS can also track work order activities, like grave maintenance.
+Sunrise CMS can also track work order activities, like interments and grave maintenance.
 
 ### ✔️ Sunrise CMS is Free and Open Source
 
@@ -46,6 +49,7 @@ There's no cost to use it.
 
 ## About this Project
 
+- 📘 [Documentation](./docs/README.md)
 - 🤗 [Code of Conduct](CODE_OF_CONDUCT.md)
 - 🥰 [Contributing Guidelines](CONTRIBUTING.md)
 - 🛡️ [Security Policy](SECURITY.md)
@@ -54,3 +58,13 @@ There's no cost to use it.
 Although the system is quite niche, it's being released in an open source environment in hopes to pool developer resources from other municipalities looking to move away from older, legacy systems.
 
 It is being shared to start the dialog among other municipalities and present an option to those who may be looking to refresh their own cemetery systems.
+
+## More City Management Applications from the City of Sault Ste. Marie
+
+[**General Licence Manager**](https://cityssm.github.io/general-licence-manager/)<br />
+An application built to manage the general licences issued by municipalities.
+
+[**Attendance Tracking**](https://cityssm.github.io/attendance-tracking/)<br />
+Track employee absences, call outs, and more.
+
+💡 Discover even more on [the City of Sault Ste. Marie's GitHub page](https://cityssm.github.io/).

_config.yml

@@ -1,2 +1,2 @@
 theme: jekyll-theme-cayman
-title: Sunrise Cemetery Management System
+title: Sunrise Cemetery Management System (CMS)

app.js

@@ -10,11 +10,12 @@ import rateLimit from 'express-rate-limit';
 import session from 'express-session';
 import createError from 'http-errors';
 import FileStore from 'session-file-store';
+import dataLists from './data/dataLists.js';
 import { DEBUG_NAMESPACE } from './debug.config.js';
 import * as permissionHandlers from './handlers/permissions.js';
+import { getSafeRedirectURL } from './helpers/authentication.helpers.js';
 import * as configFunctions from './helpers/config.helpers.js';
 import { useTestDatabases } from './helpers/database.helpers.js';
-import { getSafeRedirectURL } from './helpers/functions.authentication.js';
 import * as printFunctions from './helpers/functions.print.js';
 import routerAdmin from './routes/admin.js';
 import routerApi from './routes/api.js';
@@ -28,7 +29,7 @@ import routerPrint from './routes/print.js';
 import routerReports from './routes/reports.js';
 import routerWorkOrders from './routes/workOrders.js';
 import { version } from './version.js';
-const debug = Debug(`${DEBUG_NAMESPACE}:app:${process.pid}`);
+const debug = Debug(`${DEBUG_NAMESPACE}:app:${process.pid.toString().padEnd(5)}`);
 /*
  * INITIALIZE APP
  */
@@ -79,7 +80,7 @@ app.use(session({
     },
     secret: configFunctions.getConfigProperty('session.secret'),
     store: new FileStoreSession({
-        logFn: Debug(`${DEBUG_NAMESPACE}:session:${process.pid}`),
+        logFn: Debug(`${DEBUG_NAMESPACE}:session:${process.pid.toString().padEnd(5)}`),
         path: './data/sessions',
         retries: 20
     }),
@@ -141,6 +142,7 @@ app.use((request, response, next) => {
     response.locals.configFunctions = configFunctions;
     response.locals.printFunctions = printFunctions;
     response.locals.dateTimeFunctions = dateTimeFunctions;
+    response.locals.dataLists = dataLists;
     response.locals.urlPrefix = configFunctions.getConfigProperty('reverseProxy.urlPrefix');
     next();
 });

app.ts

@@ -12,11 +12,12 @@ import session from 'express-session'
 import createError from 'http-errors'
 import FileStore from 'session-file-store'
 
+import dataLists from './data/dataLists.js'
 import { DEBUG_NAMESPACE } from './debug.config.js'
 import * as permissionHandlers from './handlers/permissions.js'
+import { getSafeRedirectURL } from './helpers/authentication.helpers.js'
 import * as configFunctions from './helpers/config.helpers.js'
 import { useTestDatabases } from './helpers/database.helpers.js'
-import { getSafeRedirectURL } from './helpers/functions.authentication.js'
 import * as printFunctions from './helpers/functions.print.js'
 import routerAdmin from './routes/admin.js'
 import routerApi from './routes/api.js'
@@ -31,7 +32,7 @@ import routerReports from './routes/reports.js'
 import routerWorkOrders from './routes/workOrders.js'
 import { version } from './version.js'
 
-const debug = Debug(`${DEBUG_NAMESPACE}:app:${process.pid}`)
+const debug = Debug(`${DEBUG_NAMESPACE}:app:${process.pid.toString().padEnd(5)}`)
 
 /*
  * INITIALIZE APP
@@ -107,7 +108,7 @@ app.use(
     },
     secret: configFunctions.getConfigProperty('session.secret'),
     store: new FileStoreSession({
-      logFn: Debug(`${DEBUG_NAMESPACE}:session:${process.pid}`),
+      logFn: Debug(`${DEBUG_NAMESPACE}:session:${process.pid.toString().padEnd(5)}`),
       path: './data/sessions',
       retries: 20
     }),
@@ -244,6 +245,8 @@ app.use((request, response, next) => {
   response.locals.printFunctions = printFunctions
   response.locals.dateTimeFunctions = dateTimeFunctions
 
+  response.locals.dataLists = dataLists
+
   response.locals.urlPrefix = configFunctions.getConfigProperty(
     'reverseProxy.urlPrefix'
   )

bin/www.js

@@ -9,15 +9,17 @@ import exitHook from 'exit-hook';
 import { initializeDatabase } from '../database/initializeDatabase.js';
 import { DEBUG_NAMESPACE } from '../debug.config.js';
 import { getConfigProperty } from '../helpers/config.helpers.js';
+import version from '../version.js';
 const debug = Debug(`${DEBUG_NAMESPACE}:www:${process.pid}`);
 // INITIALIZE THE DATABASE
-await initializeDatabase();
+initializeDatabase();
 const directoryName = path.dirname(fileURLToPath(import.meta.url));
-const processCount = Math.min(getConfigProperty('application.maximumProcesses'), os.cpus().length);
+const processCount = Math.min(getConfigProperty('application.maximumProcesses'), os.cpus().length * 2);
 const applicationName = getConfigProperty('application.applicationName');
 process.title = `${applicationName} (Primary)`;
 debug(`Primary pid:   ${process.pid}`);
 debug(`Primary title: ${process.title}`);
+debug(`Version:       ${version}`);
 debug(`Launching ${processCount} processes`);
 const clusterSettings = {
     exec: `${directoryName}/wwwProcess.js`

bin/www.ts

@@ -11,18 +11,19 @@ import exitHook from 'exit-hook'
 import { initializeDatabase } from '../database/initializeDatabase.js'
 import { DEBUG_NAMESPACE } from '../debug.config.js'
 import { getConfigProperty } from '../helpers/config.helpers.js'
-import type { WorkerMessage } from '../types/applicationTypes.js'
+import type { WorkerMessage } from '../types/application.types.js'
+import version from '../version.js'
 
 const debug = Debug(`${DEBUG_NAMESPACE}:www:${process.pid}`)
 
 // INITIALIZE THE DATABASE
-await initializeDatabase()
+initializeDatabase()
 
 const directoryName = path.dirname(fileURLToPath(import.meta.url))
 
 const processCount = Math.min(
   getConfigProperty('application.maximumProcesses'),
-  os.cpus().length
+  os.cpus().length * 2
 )
 
 const applicationName = getConfigProperty('application.applicationName')
@@ -31,6 +32,7 @@ process.title = `${applicationName} (Primary)`
 
 debug(`Primary pid:   ${process.pid}`)
 debug(`Primary title: ${process.title}`)
+debug(`Version:       ${version}`)
 debug(`Launching ${processCount} processes`)
 
 const clusterSettings = {

bin/wwwProcess.js

@@ -7,10 +7,10 @@ import { app } from '../app.js';
 import { initializeDatabase } from '../database/initializeDatabase.js';
 import { DEBUG_NAMESPACE } from '../debug.config.js';
 import { getConfigProperty } from '../helpers/config.helpers.js';
-const debug = Debug(`${DEBUG_NAMESPACE}:wwwProcess:${process.pid}`);
+const debug = Debug(`${DEBUG_NAMESPACE}:wwwProcess:${process.pid.toString().padEnd(5)}`);
 if (process.send === undefined) {
     // INITIALIZE THE DATABASE
-    await initializeDatabase();
+    initializeDatabase();
 }
 function onError(error) {
     if (error.syscall !== 'listen') {

bin/wwwProcess.ts

@@ -11,11 +11,11 @@ import { initializeDatabase } from '../database/initializeDatabase.js'
 import { DEBUG_NAMESPACE } from '../debug.config.js'
 import { getConfigProperty } from '../helpers/config.helpers.js'
 
-const debug = Debug(`${DEBUG_NAMESPACE}:wwwProcess:${process.pid}`)
+const debug = Debug(`${DEBUG_NAMESPACE}:wwwProcess:${process.pid.toString().padEnd(5)}`)
 
 if (process.send === undefined) {
   // INITIALIZE THE DATABASE
-  await initializeDatabase()
+  initializeDatabase()
 }
 
 interface ServerError extends Error {

cypress/e2e/01-admin/feeManagement.cy.ts

@@ -1,6 +1,6 @@
 import { getConfigProperty } from '../../../helpers/config.helpers.js'
 import { testAdmin } from '../../../test/_globals.js'
-import type { Fee } from '../../../types/recordTypes.js'
+import type { Fee } from '../../../types/record.types.js'
 import { ajaxDelayMillis, login, logout } from '../../support/index.js'
 
 describe('Admin - Fee Management', () => {

cypress/e2e/02-update/cemeteries.cy.ts

@@ -1,6 +1,6 @@
 import { getConfigProperty } from '../../../helpers/config.helpers.js'
 import { testUpdate } from '../../../test/_globals.js'
-import type { Cemetery } from '../../../types/recordTypes.js'
+import type { Cemetery } from '../../../types/record.types.js'
 import { login, logout } from '../../support/index.js'
 
 describe('Update - Cemeteries', () => {

data/base.config.d.ts

@@ -1,3 +1,3 @@
-import type { Config } from '../types/configTypes.js';
+import type { Config } from '../types/config.types.js';
 export declare const config: Config;
 export default config;

data/base.config.js

@@ -6,6 +6,7 @@ export const config = {
     settings: {
         adminCleanup: {},
         burialSites: {},
+        burialSiteTypes: {},
         cemeteries: {},
         contracts: {},
         dynamicsGP: {

data/base.config.ts

@@ -1,4 +1,4 @@
-import type { Config } from '../types/configTypes.js'
+import type { Config } from '../types/config.types.js'
 
 export const config: Config = {
   aliases: {},
@@ -8,6 +8,7 @@ export const config: Config = {
   settings: {
     adminCleanup: {},
     burialSites: {},
+    burialSiteTypes: {},
     cemeteries: {},
     contracts: {},
     dynamicsGP: {

data/config.baseOntario.d.ts

@@ -1,2 +0,0 @@
-export declare const config: import("../types/configTypes.js").Config;
-export default config;

data/configDefaults.d.ts

@@ -1,5 +1,5 @@
 import type { config as MSSQLConfig } from 'mssql';
-import type { ConfigActiveDirectory, ConfigBurialSiteNameSegments, ConfigNtfyStartup, DynamicsGPLookup } from '../types/configTypes.js';
+import type { ConfigActiveDirectory, ConfigBurialSiteNameSegments, ConfigNtfyStartup, DynamicsGPLookup } from '../types/config.types.js';
 export declare const configDefaultValues: {
     activeDirectory: ConfigActiveDirectory;
     'application.applicationName': string;
@@ -19,6 +19,7 @@ export declare const configDefaultValues: {
     'session.secret': string;
     'users.canLogin': string[];
     'users.canUpdate': string[];
+    'users.canUpdateWorkOrders': string[];
     'users.isAdmin': string[];
     'users.testing': string[];
     'aliases.externalReceiptNumber': string;
@@ -32,14 +33,14 @@ export declare const configDefaultValues: {
     'settings.longitudeMax': number;
     'settings.longitudeMin': number;
     'settings.cemeteries.refreshImageChanges': boolean;
+    'settings.burialSiteTypes.bodyCapacityMaxDefault': number;
+    'settings.burialSiteTypes.crematedCapacityMaxDefault': number;
     'settings.burialSites.burialSiteNameSegments': ConfigBurialSiteNameSegments;
     'settings.burialSites.burialSiteNameSegments.includeCemeteryKey': boolean;
     'settings.burialSites.refreshImageChanges': boolean;
     'settings.contracts.burialSiteIdIsRequired': boolean;
     'settings.contracts.contractEndDateIsRequired': boolean;
-    'settings.contracts.deathAgePeriods': string[];
     'settings.contracts.prints': string[];
-    'settings.contracts.purchaserRelationships': string[];
     'settings.fees.taxPercentageDefault': number;
     'settings.workOrders.workOrderNumberLength': number;
     'settings.workOrders.calendarEmailAddress': string;
@@ -56,3 +57,4 @@ export declare const configDefaultValues: {
     'settings.dynamicsGP.itemNumbers': string[];
     'settings.dynamicsGP.trialBalanceCodes': string[];
 };
+export default configDefaultValues;

data/configDefaults.js

@@ -18,6 +18,7 @@ export const configDefaultValues = {
     'session.secret': 'cityssm/sunrise',
     'users.canLogin': ['administrator'],
     'users.canUpdate': [],
+    'users.canUpdateWorkOrders': [],
     'users.isAdmin': ['administrator'],
     'users.testing': [],
     'aliases.externalReceiptNumber': 'External Receipt Number',
@@ -31,6 +32,10 @@ export const configDefaultValues = {
     'settings.longitudeMax': 180,
     'settings.longitudeMin': -180,
     'settings.cemeteries.refreshImageChanges': false,
+    // eslint-disable-next-line no-secrets/no-secrets
+    'settings.burialSiteTypes.bodyCapacityMaxDefault': 2,
+    // eslint-disable-next-line no-secrets/no-secrets
+    'settings.burialSiteTypes.crematedCapacityMaxDefault': 6,
     'settings.burialSites.burialSiteNameSegments': {
         includeCemeteryKey: false,
         separator: '-',
@@ -48,21 +53,7 @@ export const configDefaultValues = {
     'settings.burialSites.refreshImageChanges': false,
     'settings.contracts.burialSiteIdIsRequired': true,
     'settings.contracts.contractEndDateIsRequired': false,
-    'settings.contracts.deathAgePeriods': [
-        'Years',
-        'Months',
-        'Days',
-        'Stillborn'
-    ],
     'settings.contracts.prints': ['screen/contract'],
-    'settings.contracts.purchaserRelationships': [
-        'Spouse',
-        'Child',
-        'Parent',
-        'Sibling',
-        'Friend',
-        'Self'
-    ],
     'settings.fees.taxPercentageDefault': 0,
     'settings.workOrders.workOrderNumberLength': 6,
     'settings.workOrders.calendarEmailAddress': 'no-reply@127.0.0.1',
@@ -80,3 +71,4 @@ export const configDefaultValues = {
     'settings.dynamicsGP.itemNumbers': [],
     'settings.dynamicsGP.trialBalanceCodes': []
 };
+export default configDefaultValues;

data/configDefaults.ts

@@ -1,13 +1,12 @@
-import type { config as MSSQLConfig } from 'mssql'
-
 import { hoursToMillis } from '@cityssm/to-millis'
+import type { config as MSSQLConfig } from 'mssql'
 
 import type {
   ConfigActiveDirectory,
   ConfigBurialSiteNameSegments,
   ConfigNtfyStartup,
   DynamicsGPLookup
-} from '../types/configTypes.js'
+} from '../types/config.types.js'
 
 export const configDefaultValues = {
   activeDirectory: undefined as unknown as ConfigActiveDirectory,
@@ -32,6 +31,7 @@ export const configDefaultValues = {
 
   'users.canLogin': ['administrator'],
   'users.canUpdate': [] as string[],
+  'users.canUpdateWorkOrders': [] as string[],
   'users.isAdmin': ['administrator'],
   'users.testing': [] as string[],
 
@@ -51,6 +51,12 @@ export const configDefaultValues = {
 
   'settings.cemeteries.refreshImageChanges': false,
 
+  // eslint-disable-next-line no-secrets/no-secrets
+  'settings.burialSiteTypes.bodyCapacityMaxDefault': 2,
+  
+  // eslint-disable-next-line no-secrets/no-secrets
+  'settings.burialSiteTypes.crematedCapacityMaxDefault': 6,
+
   'settings.burialSites.burialSiteNameSegments': {
     includeCemeteryKey: false,
     separator: '-',
@@ -72,21 +78,8 @@ export const configDefaultValues = {
 
   'settings.contracts.burialSiteIdIsRequired': true,
   'settings.contracts.contractEndDateIsRequired': false,
-  'settings.contracts.deathAgePeriods': [
+
-    'Years',
-    'Months',
-    'Days',
-    'Stillborn'
-  ],
   'settings.contracts.prints': ['screen/contract'],
-  'settings.contracts.purchaserRelationships': [
-    'Spouse',
-    'Child',
-    'Parent',
-    'Sibling',
-    'Friend',
-    'Self'
-  ],
 
   'settings.fees.taxPercentageDefault': 0,
 
@@ -114,3 +107,5 @@ export const configDefaultValues = {
   'settings.dynamicsGP.itemNumbers': [] as string[],
   'settings.dynamicsGP.trialBalanceCodes': [] as string[]
 }
+
+export default configDefaultValues

data/dataLists.d.ts

@@ -0,0 +1,9 @@
+export declare const deathAgePeriods: readonly ["Years", "Months", "Days", "Stillborn"];
+export declare const purchaserRelationships: readonly ["Spouse", "Husband", "Wife", "Child", "Parent", "Sibling", "Friend", "Self"];
+export declare const directionsOfArrival: readonly ["N", "NE", "E", "SE", "S", "SW", "W", "NW"];
+declare const _default: {
+    deathAgePeriods: readonly ["Years", "Months", "Days", "Stillborn"];
+    directionsOfArrival: readonly ["N", "NE", "E", "SE", "S", "SW", "W", "NW"];
+    purchaserRelationships: readonly ["Spouse", "Husband", "Wife", "Child", "Parent", "Sibling", "Friend", "Self"];
+};
+export default _default;

data/dataLists.js

@@ -0,0 +1,26 @@
+export const deathAgePeriods = ['Years', 'Months', 'Days', 'Stillborn'];
+export const purchaserRelationships = [
+    'Spouse',
+    'Husband',
+    'Wife',
+    'Child',
+    'Parent',
+    'Sibling',
+    'Friend',
+    'Self'
+];
+export const directionsOfArrival = [
+    'N',
+    'NE',
+    'E',
+    'SE',
+    'S',
+    'SW',
+    'W',
+    'NW'
+];
+export default {
+    deathAgePeriods,
+    directionsOfArrival,
+    purchaserRelationships
+};

data/dataLists.ts

@@ -0,0 +1,29 @@
+export const deathAgePeriods = ['Years', 'Months', 'Days', 'Stillborn'] as const
+
+export const purchaserRelationships = [
+  'Spouse',
+  'Husband',
+  'Wife',
+  'Child',
+  'Parent',
+  'Sibling',
+  'Friend',
+  'Self'
+] as const
+
+export const directionsOfArrival = [
+  'N',
+  'NE',
+  'E',
+  'SE',
+  'S',
+  'SW',
+  'W',
+  'NW'
+] as const
+
+export default {
+  deathAgePeriods,
+  directionsOfArrival,
+  purchaserRelationships
+}

data/ontario.config.d.ts

@@ -0,0 +1,2 @@
+export declare const config: import("../types/config.types.js").Config;
+export default config;

data/ontario.config.js

@@ -1,4 +1,4 @@
-import { config as baseConfig } from './config.base.js';
+import { config as baseConfig } from './base.config.js';
 export const config = Object.assign({}, baseConfig);
 config.settings.provinceDefault = 'ON';
 config.settings.latitudeMax = 56.85;

data/ontario.config.ts

@@ -1,4 +1,4 @@
-import { config as baseConfig } from './config.base.js'
+import { config as baseConfig } from './base.config.js'
 
 export const config = Object.assign({}, baseConfig)
 

data/ssm.ontario.config.d.ts

@@ -1,3 +1,3 @@
-import type { Config } from '../types/configTypes.js';
+import type { Config } from '../types/config.types.js';
 export declare const config: Config;
 export default config;

data/ssm.ontario.config.js

@@ -1,4 +1,4 @@
-import { config as cemeteryConfig } from './config.baseOntario.js';
+import { config as cemeteryConfig } from './ontario.config.js';
 export const config = { ...cemeteryConfig };
 config.aliases.externalReceiptNumber = 'GP Receipt Number';
 config.settings.publicInternalPath =

data/ssm.ontario.config.ts

@@ -1,6 +1,6 @@
-import type { Config } from '../types/configTypes.js'
+import type { Config } from '../types/config.types.js'
 
-import { config as cemeteryConfig } from './config.baseOntario.js'
+import { config as cemeteryConfig } from './ontario.config.js'
 
 export const config: Config = { ...cemeteryConfig }
 

data/testing.config.d.ts

@@ -1,3 +1,3 @@
-import type { Config } from '../types/configTypes.js';
+import type { Config } from '../types/config.types.js';
 export declare const config: Config;
 export default config;

data/testing.config.js

@@ -1,10 +1,11 @@
-import { config as cemeteryConfig } from './config.baseSsm.js';
+import { config as cemeteryConfig } from './ssm.ontario.config.js';
 export const config = { ...cemeteryConfig };
 config.application.useTestDatabases = true;
 config.session.doKeepAlive = true;
 config.users = {
     canLogin: ['*testView', '*testUpdate', '*testAdmin'],
     canUpdate: ['*testUpdate'],
+    canUpdateWorkOrders: ['*testUpdate'],
     isAdmin: ['*testAdmin'],
     testing: ['*testView', '*testUpdate', '*testAdmin']
 };

data/testing.config.ts

@@ -1,6 +1,6 @@
-import type { Config } from '../types/configTypes.js'
+import type { Config } from '../types/config.types.js'
 
-import { config as cemeteryConfig } from './config.baseSsm.js'
+import { config as cemeteryConfig } from './ssm.ontario.config.js'
 
 export const config: Config = { ...cemeteryConfig }
 
@@ -11,6 +11,7 @@ config.session.doKeepAlive = true
 config.users = {
   canLogin: ['*testView', '*testUpdate', '*testAdmin'],
   canUpdate: ['*testUpdate'],
+  canUpdateWorkOrders: ['*testUpdate'],
   isAdmin: ['*testAdmin'],
   testing: ['*testView', '*testUpdate', '*testAdmin']
 }

database/addBurialSite.d.ts

@@ -6,11 +6,13 @@ export interface AddBurialSiteForm {
     burialSiteNameSegment5?: string;
     burialSiteStatusId: number | string;
     burialSiteTypeId: number | string;
-    burialSiteImage: string;
+    bodyCapacity?: number | string;
+    crematedCapacity?: number | string;
+    burialSiteImage?: string;
     cemeteryId: number | string;
-    cemeterySvgId: string;
+    cemeterySvgId?: string;
-    burialSiteLatitude: string;
+    burialSiteLatitude?: string;
-    burialSiteLongitude: string;
+    burialSiteLongitude?: string;
     burialSiteTypeFieldIds?: string;
     [fieldValue_burialSiteTypeFieldId: string]: unknown;
 }
@@ -21,4 +23,7 @@ export interface AddBurialSiteForm {
  * @returns The new burial site's id.
  * @throws If an active burial site with the same name already exists.
  */
-export default function addBurialSite(burialSiteForm: AddBurialSiteForm, user: User): Promise<number>;
+export default function addBurialSite(burialSiteForm: AddBurialSiteForm, user: User): {
+    burialSiteId: number;
+    burialSiteName: string;
+};

database/addBurialSite.js

@@ -1,7 +1,8 @@
+import sqlite from 'better-sqlite3';
 import { buildBurialSiteName } from '../helpers/burialSites.helpers.js';
+import { sunriseDB } from '../helpers/database.helpers.js';
 import addOrUpdateBurialSiteField from './addOrUpdateBurialSiteField.js';
 import getCemetery from './getCemetery.js';
-import { acquireConnection } from './pool.js';
 /**
  * Creates a new burial site.
  * @param burialSiteForm - The new burial site's information
@@ -9,12 +10,13 @@ import { acquireConnection } from './pool.js';
  * @returns The new burial site's id.
  * @throws If an active burial site with the same name already exists.
  */
-export default async function addBurialSite(burialSiteForm, user) {
+// eslint-disable-next-line complexity
-    const database = await acquireConnection();
+export default function addBurialSite(burialSiteForm, user) {
+    const database = sqlite(sunriseDB);
     const rightNowMillis = Date.now();
     const cemetery = burialSiteForm.cemeteryId === ''
         ? undefined
-        : await getCemetery(burialSiteForm.cemeteryId, database);
+        : getCemetery(burialSiteForm.cemeteryId, database);
     const burialSiteName = buildBurialSiteName(cemetery?.cemeteryKey, burialSiteForm);
     // Ensure no active burial sites share the same name
     const existingBurialSite = database
@@ -25,7 +27,7 @@ export default async function addBurialSite(burialSiteForm, user) {
         .pluck()
         .get(burialSiteName);
     if (existingBurialSite !== undefined) {
-        database.release();
+        database.close();
         throw new Error('An active burial site with that name already exists.');
     }
     const result = database
@@ -37,17 +39,22 @@ export default async function addBurialSite(burialSiteForm, user) {
         burialSiteNameSegment5,
         burialSiteName,
         burialSiteTypeId, burialSiteStatusId,
+        bodyCapacity, crematedCapacity,
         cemeteryId, cemeterySvgId, burialSiteImage,
         burialSiteLatitude, burialSiteLongitude,
 
         recordCreate_userName, recordCreate_timeMillis,
         recordUpdate_userName, recordUpdate_timeMillis) 
-        values (?, ?, ?,
+        values (?, ?, ?, ?, ?,
           ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
           ?, ?, ?, ?)`)
         .run(burialSiteForm.burialSiteNameSegment1 ?? '', burialSiteForm.burialSiteNameSegment2 ?? '', burialSiteForm.burialSiteNameSegment3 ?? '', burialSiteForm.burialSiteNameSegment4 ?? '', burialSiteForm.burialSiteNameSegment5 ?? '', burialSiteName, burialSiteForm.burialSiteTypeId, burialSiteForm.burialSiteStatusId === ''
         ? undefined
-        : burialSiteForm.burialSiteStatusId, burialSiteForm.cemeteryId === '' ? undefined : burialSiteForm.cemeteryId, burialSiteForm.cemeterySvgId, burialSiteForm.burialSiteImage, burialSiteForm.burialSiteLatitude === ''
+        : burialSiteForm.burialSiteStatusId, burialSiteForm.bodyCapacity === ''
+        ? undefined
+        : burialSiteForm.bodyCapacity, burialSiteForm.crematedCapacity === ''
+        ? undefined
+        : burialSiteForm.crematedCapacity, burialSiteForm.cemeteryId === '' ? undefined : burialSiteForm.cemeteryId, burialSiteForm.cemeterySvgId, burialSiteForm.burialSiteImage ?? '', burialSiteForm.burialSiteLatitude === ''
         ? undefined
         : burialSiteForm.burialSiteLatitude, burialSiteForm.burialSiteLongitude === ''
         ? undefined
@@ -57,13 +64,16 @@ export default async function addBurialSite(burialSiteForm, user) {
     for (const burialSiteTypeFieldId of burialSiteTypeFieldIds) {
         const fieldValue = burialSiteForm[`burialSiteFieldValue_${burialSiteTypeFieldId}`];
         if ((fieldValue ?? '') !== '') {
-            await addOrUpdateBurialSiteField({
+            addOrUpdateBurialSiteField({
                 burialSiteId,
                 burialSiteTypeFieldId,
                 fieldValue: fieldValue ?? ''
             }, user, database);
         }
     }
-    database.release();
+    database.close();
-    return burialSiteId;
+    return {
+        burialSiteId,
+        burialSiteName
+    };
 }

database/addBurialSite.ts

@@ -1,8 +1,10 @@
+import sqlite from 'better-sqlite3'
+
 import { buildBurialSiteName } from '../helpers/burialSites.helpers.js'
+import { sunriseDB } from '../helpers/database.helpers.js'
 
 import addOrUpdateBurialSiteField from './addOrUpdateBurialSiteField.js'
 import getCemetery from './getCemetery.js'
-import { acquireConnection } from './pool.js'
 
 export interface AddBurialSiteForm {
   burialSiteNameSegment1?: string
@@ -14,12 +16,15 @@ export interface AddBurialSiteForm {
   burialSiteStatusId: number | string
   burialSiteTypeId: number | string
 
-  burialSiteImage: string
+  bodyCapacity?: number | string
-  cemeteryId: number | string
+  crematedCapacity?: number | string
-  cemeterySvgId: string
 
-  burialSiteLatitude: string
+  burialSiteImage?: string
-  burialSiteLongitude: string
+  cemeteryId: number | string
+  cemeterySvgId?: string
+
+  burialSiteLatitude?: string
+  burialSiteLongitude?: string
 
   burialSiteTypeFieldIds?: string
 
@@ -33,18 +38,19 @@ export interface AddBurialSiteForm {
  * @returns The new burial site's id.
  * @throws If an active burial site with the same name already exists.
  */
-export default async function addBurialSite(
+// eslint-disable-next-line complexity
+export default function addBurialSite(
   burialSiteForm: AddBurialSiteForm,
   user: User
-): Promise<number> {
+): { burialSiteId: number; burialSiteName: string } {
-  const database = await acquireConnection()
+  const database = sqlite(sunriseDB)
 
   const rightNowMillis = Date.now()
 
   const cemetery =
     burialSiteForm.cemeteryId === ''
       ? undefined
-      : await getCemetery(burialSiteForm.cemeteryId, database)
+      : getCemetery(burialSiteForm.cemeteryId, database)
 
   const burialSiteName = buildBurialSiteName(
     cemetery?.cemeteryKey,
@@ -64,7 +70,7 @@ export default async function addBurialSite(
     .get(burialSiteName) as number | undefined
 
   if (existingBurialSite !== undefined) {
-    database.release()
+    database.close()
     throw new Error('An active burial site with that name already exists.')
   }
 
@@ -78,12 +84,13 @@ export default async function addBurialSite(
         burialSiteNameSegment5,
         burialSiteName,
         burialSiteTypeId, burialSiteStatusId,
+        bodyCapacity, crematedCapacity,
         cemeteryId, cemeterySvgId, burialSiteImage,
         burialSiteLatitude, burialSiteLongitude,
 
         recordCreate_userName, recordCreate_timeMillis,
         recordUpdate_userName, recordUpdate_timeMillis) 
-        values (?, ?, ?,
+        values (?, ?, ?, ?, ?,
           ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
           ?, ?, ?, ?)`
     )
@@ -98,9 +105,18 @@ export default async function addBurialSite(
       burialSiteForm.burialSiteStatusId === ''
         ? undefined
         : burialSiteForm.burialSiteStatusId,
+
+      burialSiteForm.bodyCapacity === ''
+        ? undefined
+        : burialSiteForm.bodyCapacity,
+
+      burialSiteForm.crematedCapacity === ''
+        ? undefined
+        : burialSiteForm.crematedCapacity,
+
       burialSiteForm.cemeteryId === '' ? undefined : burialSiteForm.cemeteryId,
       burialSiteForm.cemeterySvgId,
-      burialSiteForm.burialSiteImage,
+      burialSiteForm.burialSiteImage ?? '',
       burialSiteForm.burialSiteLatitude === ''
         ? undefined
         : burialSiteForm.burialSiteLatitude,
@@ -125,7 +141,7 @@ export default async function addBurialSite(
     ] as string | undefined
 
     if ((fieldValue ?? '') !== '') {
-      await addOrUpdateBurialSiteField(
+      addOrUpdateBurialSiteField(
         {
           burialSiteId,
           burialSiteTypeFieldId,
@@ -137,7 +153,10 @@ export default async function addBurialSite(
     }
   }
 
-  database.release()
+  database.close()
 
-  return burialSiteId
+  return {
+    burialSiteId,
+    burialSiteName
+  }
 }

database/addBurialSiteComment.d.ts

@@ -2,4 +2,4 @@ export interface AddBurialSiteCommentForm {
     burialSiteId: string;
     comment: string;
 }
-export default function addBurialSiteComment(commentForm: AddBurialSiteCommentForm, user: User): Promise<number>;
+export default function addBurialSiteComment(commentForm: AddBurialSiteCommentForm, user: User): number;

database/addBurialSiteComment.js

@@ -1,7 +1,8 @@
 import { dateToInteger, dateToTimeInteger } from '@cityssm/utils-datetime';
-import { acquireConnection } from './pool.js';
+import sqlite from 'better-sqlite3';
-export default async function addBurialSiteComment(commentForm, user) {
+import { sunriseDB } from '../helpers/database.helpers.js';
-    const database = await acquireConnection();
+export default function addBurialSiteComment(commentForm, user) {
+    const database = sqlite(sunriseDB);
     const rightNow = new Date();
     const result = database
         .prepare(`insert into BurialSiteComments (
@@ -11,6 +12,6 @@ export default async function addBurialSiteComment(commentForm, user) {
         recordUpdate_userName, recordUpdate_timeMillis) 
         values (?, ?, ?, ?, ?, ?, ?, ?)`)
         .run(commentForm.burialSiteId, dateToInteger(rightNow), dateToTimeInteger(rightNow), commentForm.comment, user.userName, rightNow.getTime(), user.userName, rightNow.getTime());
-    database.release();
+    database.close();
     return result.lastInsertRowid;
 }

database/addBurialSiteComment.ts

@@ -1,17 +1,18 @@
 import { dateToInteger, dateToTimeInteger } from '@cityssm/utils-datetime'
+import sqlite from 'better-sqlite3'
 
-import { acquireConnection } from './pool.js'
+import { sunriseDB } from '../helpers/database.helpers.js'
 
 export interface AddBurialSiteCommentForm {
   burialSiteId: string
   comment: string
 }
 
-export default async function addBurialSiteComment(
+export default function addBurialSiteComment(
   commentForm: AddBurialSiteCommentForm,
   user: User
-): Promise<number> {
+): number {
-  const database = await acquireConnection()
+  const database = sqlite(sunriseDB)
 
   const rightNow = new Date()
 
@@ -35,7 +36,7 @@ export default async function addBurialSiteComment(
       rightNow.getTime()
     )
 
-  database.release()
+  database.close()
 
   return result.lastInsertRowid as number
 }

database/addBurialSiteType.d.ts

@@ -0,0 +1,7 @@
+export interface AddBurialSiteTypeForm {
+    burialSiteType: string;
+    bodyCapacityMax: number | string;
+    crematedCapacityMax: number | string;
+    orderNumber?: number | string;
+}
+export default function addBurialSiteType(addForm: AddBurialSiteTypeForm, user: User): number;

database/addBurialSiteType.js

@@ -0,0 +1,20 @@
+import sqlite from 'better-sqlite3';
+import { sunriseDB } from '../helpers/database.helpers.js';
+import { clearCacheByTableName } from '../helpers/functions.cache.js';
+export default function addBurialSiteType(addForm, user) {
+    const database = sqlite(sunriseDB);
+    const rightNowMillis = Date.now();
+    const result = database
+        .prepare(`insert into BurialSiteTypes (
+        burialSiteType, bodyCapacityMax, crematedCapacityMax,
+        orderNumber,
+        recordCreate_userName, recordCreate_timeMillis,
+        recordUpdate_userName, recordUpdate_timeMillis)
+        values (?, ?, ?, ?, ?, ?, ?, ?)`)
+        .run(addForm.burialSiteType, addForm.bodyCapacityMax === '' ? undefined : addForm.bodyCapacityMax, addForm.crematedCapacityMax === ''
+        ? undefined
+        : addForm.crematedCapacityMax, addForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis);
+    database.close();
+    clearCacheByTableName('BurialSiteTypes');
+    return result.lastInsertRowid;
+}

database/addBurialSiteType.ts

@@ -0,0 +1,50 @@
+import sqlite from 'better-sqlite3'
+
+import { sunriseDB } from '../helpers/database.helpers.js'
+import { clearCacheByTableName } from '../helpers/functions.cache.js'
+
+export interface AddBurialSiteTypeForm {
+  burialSiteType: string
+
+  bodyCapacityMax: number | string
+  crematedCapacityMax: number | string
+
+  orderNumber?: number | string
+}
+
+export default function addBurialSiteType(
+  addForm: AddBurialSiteTypeForm,
+  user: User
+): number {
+  const database = sqlite(sunriseDB)
+
+  const rightNowMillis = Date.now()
+
+  const result = database
+    .prepare(
+      `insert into BurialSiteTypes (
+        burialSiteType, bodyCapacityMax, crematedCapacityMax,
+        orderNumber,
+        recordCreate_userName, recordCreate_timeMillis,
+        recordUpdate_userName, recordUpdate_timeMillis)
+        values (?, ?, ?, ?, ?, ?, ?, ?)`
+    )
+    .run(
+      addForm.burialSiteType,
+      addForm.bodyCapacityMax === '' ? undefined : addForm.bodyCapacityMax,
+      addForm.crematedCapacityMax === ''
+        ? undefined
+        : addForm.crematedCapacityMax,
+      addForm.orderNumber ?? -1,
+      user.userName,
+      rightNowMillis,
+      user.userName,
+      rightNowMillis
+    )
+
+  database.close()
+
+  clearCacheByTableName('BurialSiteTypes')
+
+  return result.lastInsertRowid as number
+}

database/addBurialSiteTypeField.d.ts

@@ -1,12 +1,12 @@
 export interface AddBurialSiteTypeFieldForm {
-    burialSiteTypeId: string | number;
+    burialSiteTypeId: number | string;
     burialSiteTypeField: string;
     fieldType?: string;
     fieldValues?: string;
     isRequired?: string;
+    maxLength?: number | string;
+    minLength?: number | string;
     pattern?: string;
-    minLength?: string | number;
-    maxLength?: string | number;
     orderNumber?: number;
 }
-export default function addBurialSiteTypeField(addForm: AddBurialSiteTypeFieldForm, user: User): Promise<number>;
+export default function addBurialSiteTypeField(addForm: AddBurialSiteTypeFieldForm, user: User): number;

database/addBurialSiteTypeField.js

@@ -1,7 +1,8 @@
+import sqlite from 'better-sqlite3';
+import { sunriseDB } from '../helpers/database.helpers.js';
 import { clearCacheByTableName } from '../helpers/functions.cache.js';
-import { acquireConnection } from './pool.js';
+export default function addBurialSiteTypeField(addForm, user) {
-export default async function addBurialSiteTypeField(addForm, user) {
+    const database = sqlite(sunriseDB);
-    const database = await acquireConnection();
     const rightNowMillis = Date.now();
     const result = database
         .prepare(`insert into BurialSiteTypeFields (
@@ -13,8 +14,10 @@ export default async function addBurialSiteTypeField(addForm, user) {
         recordCreate_userName, recordCreate_timeMillis,
         recordUpdate_userName, recordUpdate_timeMillis)
         values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
-        .run(addForm.burialSiteTypeId, addForm.burialSiteTypeField, addForm.fieldType ?? 'text', addForm.fieldValues ?? '', addForm.isRequired === '' ? 0 : 1, addForm.pattern ?? '', addForm.minLength ?? 0, addForm.maxLength ?? 100, addForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis);
+        .run(addForm.burialSiteTypeId, addForm.burialSiteTypeField, addForm.fieldType ?? 'text', addForm.fieldValues ?? '', addForm.isRequired === '' ? 0 : 1, addForm.pattern ?? '', addForm.minLength ?? 0, 
-    database.release();
+    // eslint-disable-next-line @typescript-eslint/no-magic-numbers
+    addForm.maxLength ?? 100, addForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis);
+    database.close();
     clearCacheByTableName('BurialSiteTypeFields');
     return result.lastInsertRowid;
 }

database/addBurialSiteTypeField.ts

@@ -1,24 +1,29 @@
+import sqlite from 'better-sqlite3'
+
+import { sunriseDB } from '../helpers/database.helpers.js'
 import { clearCacheByTableName } from '../helpers/functions.cache.js'
 
-import { acquireConnection } from './pool.js'
-
 export interface AddBurialSiteTypeFieldForm {
-  burialSiteTypeId: string | number
+  burialSiteTypeId: number | string
+
   burialSiteTypeField: string
+
   fieldType?: string
   fieldValues?: string
+
   isRequired?: string
+  maxLength?: number | string
+  minLength?: number | string
   pattern?: string
-  minLength?: string | number
+
-  maxLength?: string | number
   orderNumber?: number
 }
 
-export default async function addBurialSiteTypeField(
+export default function addBurialSiteTypeField(
   addForm: AddBurialSiteTypeFieldForm,
   user: User
-): Promise<number> {
+): number {
-  const database = await acquireConnection()
+  const database = sqlite(sunriseDB)
 
   const rightNowMillis = Date.now()
 
@@ -42,6 +47,7 @@ export default async function addBurialSiteTypeField(
       addForm.isRequired === '' ? 0 : 1,
       addForm.pattern ?? '',
       addForm.minLength ?? 0,
+      // eslint-disable-next-line @typescript-eslint/no-magic-numbers
       addForm.maxLength ?? 100,
       addForm.orderNumber ?? -1,
       user.userName,
@@ -50,7 +56,7 @@ export default async function addBurialSiteTypeField(
       rightNowMillis
     )
 
-  database.release()
+  database.close()
 
   clearCacheByTableName('BurialSiteTypeFields')
 

database/addCemetery.d.ts

@@ -1,4 +1,5 @@
-export interface AddCemeteryForm {
+import { type UpdateCemeteryDirectionsOfArrivalForm } from './updateCemeteryDirectionsOfArrival.js';
+export type AddCemeteryForm = UpdateCemeteryDirectionsOfArrivalForm & {
     cemeteryDescription: string;
     cemeteryKey: string;
     cemeteryName: string;
@@ -12,5 +13,5 @@ export interface AddCemeteryForm {
     cemeteryPostalCode: string;
     cemeteryProvince: string;
     cemeteryPhoneNumber: string;
-}
+};
-export default function addCemetery(addForm: AddCemeteryForm, user: User): Promise<number>;
+export default function addCemetery(addForm: AddCemeteryForm, user: User): number;

database/addCemetery.js

@@ -1,6 +1,8 @@
-import { acquireConnection } from './pool.js';
+import sqlite from 'better-sqlite3';
-export default async function addCemetery(addForm, user) {
+import { sunriseDB } from '../helpers/database.helpers.js';
-    const database = await acquireConnection();
+import updateCemeteryDirectionsOfArrival from './updateCemeteryDirectionsOfArrival.js';
+export default function addCemetery(addForm, user) {
+    const database = sqlite(sunriseDB);
     const rightNowMillis = Date.now();
     const result = database
         .prepare(`insert into Cemeteries (
@@ -14,6 +16,8 @@ export default async function addCemetery(addForm, user) {
         recordUpdate_userName, recordUpdate_timeMillis)
         values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
         .run(addForm.cemeteryName, addForm.cemeteryKey, addForm.cemeteryDescription, addForm.cemeterySvg, addForm.cemeteryLatitude === '' ? undefined : addForm.cemeteryLatitude, addForm.cemeteryLongitude === '' ? undefined : addForm.cemeteryLongitude, addForm.cemeteryAddress1, addForm.cemeteryAddress2, addForm.cemeteryCity, addForm.cemeteryProvince, addForm.cemeteryPostalCode, addForm.cemeteryPhoneNumber, addForm.parentCemeteryId === '' ? undefined : addForm.parentCemeteryId, user.userName, rightNowMillis, user.userName, rightNowMillis);
-    database.release();
+    const cemeteryId = result.lastInsertRowid;
-    return result.lastInsertRowid;
+    updateCemeteryDirectionsOfArrival(cemeteryId, addForm, database);
+    database.close();
+    return cemeteryId;
 }

database/addCemetery.ts

@@ -1,6 +1,12 @@
-import { acquireConnection } from './pool.js'
+import sqlite from 'better-sqlite3'
 
-export interface AddCemeteryForm {
+import { sunriseDB } from '../helpers/database.helpers.js'
+
+import updateCemeteryDirectionsOfArrival, {
+  type UpdateCemeteryDirectionsOfArrivalForm
+} from './updateCemeteryDirectionsOfArrival.js'
+
+export type AddCemeteryForm = UpdateCemeteryDirectionsOfArrivalForm & {
   cemeteryDescription: string
   cemeteryKey: string
   cemeteryName: string
@@ -19,11 +25,11 @@ export interface AddCemeteryForm {
   cemeteryPhoneNumber: string
 }
 
-export default async function addCemetery(
+export default function addCemetery(
   addForm: AddCemeteryForm,
   user: User
-): Promise<number> {
+): number {
-  const database = await acquireConnection()
+  const database = sqlite(sunriseDB)
 
   const rightNowMillis = Date.now()
 
@@ -60,7 +66,11 @@ export default async function addCemetery(
       rightNowMillis
     )
 
-  database.release()
+  const cemeteryId = result.lastInsertRowid as number
 
-  return result.lastInsertRowid as number
+  updateCemeteryDirectionsOfArrival(cemeteryId, addForm, database)
+
+  database.close()
+
+  return cemeteryId
 }

database/addCommittalType.d.ts

@@ -1,6 +1,6 @@
 export interface AddForm {
     committalType: string;
     committalTypeKey?: string;
-    orderNumber?: number;
+    orderNumber?: number | string;
 }
-export default function addCommittalType(addForm: AddForm, user: User): Promise<number>;
+export default function addCommittalType(addForm: AddForm, user: User): number;

database/addCommittalType.js

@@ -1,7 +1,8 @@
+import sqlite from 'better-sqlite3';
+import { sunriseDB } from '../helpers/database.helpers.js';
 import { clearCacheByTableName } from '../helpers/functions.cache.js';
-import { acquireConnection } from './pool.js';
+export default function addCommittalType(addForm, user) {
-export default async function addCommittalType(addForm, user) {
+    const database = sqlite(sunriseDB);
-    const database = await acquireConnection();
     const rightNowMillis = Date.now();
     const result = database
         .prepare(`insert into CommittalTypes (
@@ -10,7 +11,7 @@ export default async function addCommittalType(addForm, user) {
         recordUpdate_userName, recordUpdate_timeMillis)
         values (?, ?, ?, ?, ?, ?, ?)`)
         .run(addForm.committalType, addForm.committalTypeKey ?? '', addForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis);
-    database.release();
+    database.close();
     clearCacheByTableName('CommittalTypes');
     return result.lastInsertRowid;
 }

database/addCommittalType.ts

@@ -1,18 +1,16 @@
-import { clearCacheByTableName } from '../helpers/functions.cache.js'
+import sqlite from 'better-sqlite3'
 
-import { acquireConnection } from './pool.js'
+import { sunriseDB } from '../helpers/database.helpers.js'
+import { clearCacheByTableName } from '../helpers/functions.cache.js'
 
 export interface AddForm {
   committalType: string
   committalTypeKey?: string
-  orderNumber?: number
+  orderNumber?: number | string
 }
 
-export default async function addCommittalType(
+export default function addCommittalType(addForm: AddForm, user: User): number {
-  addForm: AddForm,
+  const database = sqlite(sunriseDB)
-  user: User
-): Promise<number> {
-  const database = await acquireConnection()
 
   const rightNowMillis = Date.now()
 
@@ -34,7 +32,7 @@ export default async function addCommittalType(
       rightNowMillis
     )
 
-  database.release()
+  database.close()
 
   clearCacheByTableName('CommittalTypes')
 

database/addContract.d.ts

@@ -1,5 +1,5 @@
-import type { PoolConnection } from 'better-sqlite-pool';
 import { type DateString, type TimeString } from '@cityssm/utils-datetime';
+import sqlite from 'better-sqlite3';
 export interface AddContractForm {
     burialSiteId: number | string;
     contractEndDateString: '' | DateString;
@@ -8,6 +8,7 @@ export interface AddContractForm {
     [fieldValue_contractTypeFieldId: `fieldValue_${string}`]: unknown;
     contractTypeFieldIds?: string;
     committalTypeId?: number | string;
+    directionOfArrival?: string;
     funeralDateString?: '' | DateString;
     funeralDirectorName?: string;
     funeralHomeId?: number | string;
@@ -35,4 +36,4 @@ export interface AddContractForm {
     deceasedProvince?: string;
     intermentContainerTypeId?: number | string;
 }
-export default function addContract(addForm: AddContractForm, user: User, connectedDatabase?: PoolConnection): Promise<number>;
+export default function addContract(addForm: AddContractForm, user: User, connectedDatabase?: sqlite.Database): number;

database/addContract.js

@@ -1,9 +1,10 @@
 import { dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime';
+import sqlite from 'better-sqlite3';
+import { sunriseDB } from '../helpers/database.helpers.js';
 import addOrUpdateContractField from './addOrUpdateContractField.js';
-import { acquireConnection } from './pool.js';
 // eslint-disable-next-line complexity
-export default async function addContract(addForm, user, connectedDatabase) {
+export default function addContract(addForm, user, connectedDatabase) {
-    const database = connectedDatabase ?? (await acquireConnection());
+    const database = connectedDatabase ?? sqlite(sunriseDB);
     const rightNowMillis = Date.now();
     const contractStartDate = dateStringToInteger(addForm.contractStartDateString);
     const result = database
@@ -15,17 +16,17 @@ export default async function addContract(addForm, user, connectedDatabase) {
         purchaserPhoneNumber, purchaserEmail, purchaserRelationship,
         funeralHomeId, funeralDirectorName,
         funeralDate, funeralTime,
-        committalTypeId,
+        directionOfArrival, committalTypeId,
         recordCreate_userName, recordCreate_timeMillis,
         recordUpdate_userName, recordUpdate_timeMillis)
-        values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
+        values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
         .run(addForm.contractTypeId, addForm.burialSiteId === '' ? undefined : addForm.burialSiteId, contractStartDate, addForm.contractEndDateString === ''
         ? undefined
         : dateStringToInteger(addForm.contractEndDateString), addForm.purchaserName ?? '', addForm.purchaserAddress1 ?? '', addForm.purchaserAddress2 ?? '', addForm.purchaserCity ?? '', addForm.purchaserProvince ?? '', addForm.purchaserPostalCode ?? '', addForm.purchaserPhoneNumber ?? '', addForm.purchaserEmail ?? '', addForm.purchaserRelationship ?? '', addForm.funeralHomeId === '' ? undefined : addForm.funeralHomeId, addForm.funeralDirectorName ?? '', addForm.funeralDateString === ''
         ? undefined
         : dateStringToInteger(addForm.funeralDateString), addForm.funeralTimeString === ''
         ? undefined
-        : timeStringToInteger(addForm.funeralTimeString), addForm.committalTypeId === '' ? undefined : addForm.committalTypeId, user.userName, rightNowMillis, user.userName, rightNowMillis);
+        : timeStringToInteger(addForm.funeralTimeString), addForm.directionOfArrival ?? '', addForm.committalTypeId === '' ? undefined : addForm.committalTypeId, user.userName, rightNowMillis, user.userName, rightNowMillis);
     const contractId = result.lastInsertRowid;
     /*
      * Add contract fields
@@ -34,7 +35,7 @@ export default async function addContract(addForm, user, connectedDatabase) {
     for (const contractTypeFieldId of contractTypeFieldIds) {
         const fieldValue = addForm[`fieldValue_${contractTypeFieldId}`];
         if ((fieldValue ?? '') !== '') {
-            await addOrUpdateContractField({
+            addOrUpdateContractField({
                 contractId,
                 contractTypeFieldId,
                 fieldValue: fieldValue ?? ''
@@ -66,7 +67,7 @@ export default async function addContract(addForm, user, connectedDatabase) {
             : addForm.intermentContainerTypeId, user.userName, rightNowMillis, user.userName, rightNowMillis);
     }
     if (connectedDatabase === undefined) {
-        database.release();
+        database.close();
     }
     return contractId;
 }

database/addContract.ts

@@ -1,14 +1,14 @@
-import type { PoolConnection } from 'better-sqlite-pool'
-
 import {
   type DateString,
   type TimeString,
   dateStringToInteger,
   timeStringToInteger
 } from '@cityssm/utils-datetime'
+import sqlite from 'better-sqlite3'
+
+import { sunriseDB } from '../helpers/database.helpers.js'
 
 import addOrUpdateContractField from './addOrUpdateContractField.js'
-import { acquireConnection } from './pool.js'
 
 export interface AddContractForm {
   burialSiteId: number | string
@@ -20,6 +20,7 @@ export interface AddContractForm {
   contractTypeFieldIds?: string
 
   committalTypeId?: number | string
+  directionOfArrival?: string
   funeralDateString?: '' | DateString
   funeralDirectorName?: string
   funeralHomeId?: number | string
@@ -51,12 +52,12 @@ export interface AddContractForm {
 }
 
 // eslint-disable-next-line complexity
-export default async function addContract(
+export default function addContract(
   addForm: AddContractForm,
   user: User,
-  connectedDatabase?: PoolConnection
+  connectedDatabase?: sqlite.Database
-): Promise<number> {
+): number {
-  const database = connectedDatabase ?? (await acquireConnection())
+  const database = connectedDatabase ?? sqlite(sunriseDB)
 
   const rightNowMillis = Date.now()
 
@@ -74,10 +75,10 @@ export default async function addContract(
         purchaserPhoneNumber, purchaserEmail, purchaserRelationship,
         funeralHomeId, funeralDirectorName,
         funeralDate, funeralTime,
-        committalTypeId,
+        directionOfArrival, committalTypeId,
         recordCreate_userName, recordCreate_timeMillis,
         recordUpdate_userName, recordUpdate_timeMillis)
-        values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+        values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
     )
     .run(
       addForm.contractTypeId,
@@ -103,6 +104,7 @@ export default async function addContract(
       addForm.funeralTimeString === ''
         ? undefined
         : timeStringToInteger(addForm.funeralTimeString as TimeString),
+      addForm.directionOfArrival ?? '',
       addForm.committalTypeId === '' ? undefined : addForm.committalTypeId,
       user.userName,
       rightNowMillis,
@@ -124,7 +126,7 @@ export default async function addContract(
       | undefined
 
     if ((fieldValue ?? '') !== '') {
-      await addOrUpdateContractField(
+      addOrUpdateContractField(
         {
           contractId,
           contractTypeFieldId,
@@ -186,7 +188,7 @@ export default async function addContract(
   }
 
   if (connectedDatabase === undefined) {
-    database.release()
+    database.close()
   }
 
   return contractId

database/addContractComment.d.ts

@@ -1,8 +1,8 @@
 import { type DateString, type TimeString } from '@cityssm/utils-datetime';
 export interface AddContractCommentForm {
+    contractId: number | string;
     comment: string;
     commentDateString?: DateString;
     commentTimeString?: TimeString;
-    contractId: number | string;
 }
-export default function addContractComment(commentForm: AddContractCommentForm, user: User): Promise<number>;
+export default function addContractComment(commentForm: AddContractCommentForm, user: User): number;

database/addContractComment.js

@@ -1,6 +1,7 @@
 import { dateStringToInteger, dateToInteger, dateToTimeInteger, timeStringToInteger } from '@cityssm/utils-datetime';
-import { acquireConnection } from './pool.js';
+import sqlite from 'better-sqlite3';
-export default async function addContractComment(commentForm, user) {
+import { sunriseDB } from '../helpers/database.helpers.js';
+export default function addContractComment(commentForm, user) {
     const rightNow = new Date();
     let commentDate = 0;
     let commentTime = 0;
@@ -12,7 +13,7 @@ export default async function addContractComment(commentForm, user) {
         commentDate = dateStringToInteger(commentForm.commentDateString);
         commentTime = timeStringToInteger(commentForm.commentTimeString);
     }
-    const database = await acquireConnection();
+    const database = sqlite(sunriseDB);
     const result = database
         .prepare(`insert into ContractComments (
         contractId,
@@ -22,6 +23,6 @@ export default async function addContractComment(commentForm, user) {
         recordUpdate_userName, recordUpdate_timeMillis)
         values (?, ?, ?, ?, ?, ?, ?, ?)`)
         .run(commentForm.contractId, commentDate, commentTime ?? 0, commentForm.comment, user.userName, rightNow.getTime(), user.userName, rightNow.getTime());
-    database.release();
+    database.close();
     return result.lastInsertRowid;
 }

database/addContractComment.ts

@@ -6,20 +6,22 @@ import {
   dateToTimeInteger,
   timeStringToInteger
 } from '@cityssm/utils-datetime'
+import sqlite from 'better-sqlite3'
 
-import { acquireConnection } from './pool.js'
+import { sunriseDB } from '../helpers/database.helpers.js'
 
 export interface AddContractCommentForm {
+  contractId: number | string
+
   comment: string
   commentDateString?: DateString
   commentTimeString?: TimeString
-  contractId: number | string
 }
 
-export default async function addContractComment(
+export default function addContractComment(
   commentForm: AddContractCommentForm,
   user: User
-): Promise<number> {
+): number {
   const rightNow = new Date()
 
   let commentDate = 0
@@ -37,7 +39,7 @@ export default async function addContractComment(
     )
   }
 
-  const database = await acquireConnection()
+  const database = sqlite(sunriseDB)
 
   const result = database
     .prepare(
@@ -60,7 +62,7 @@ export default async function addContractComment(
       rightNow.getTime()
     )
 
-  database.release()
+  database.close()
 
   return result.lastInsertRowid as number
 }

database/addContractFee.d.ts

@@ -1,4 +1,4 @@
-import type { PoolConnection } from 'better-sqlite-pool';
+import sqlite from 'better-sqlite3';
 export interface AddContractFeeForm {
     contractId: number | string;
     feeId: number | string;
@@ -6,4 +6,4 @@ export interface AddContractFeeForm {
     quantity: number | string;
     taxAmount?: number | string;
 }
-export default function addContractFee(addFeeForm: AddContractFeeForm, user: User, connectedDatabase?: PoolConnection): Promise<boolean>;
+export default function addContractFee(addFeeForm: AddContractFeeForm, user: User, connectedDatabase?: sqlite.Database): Promise<boolean>;

database/addContractFee.js

@@ -1,16 +1,17 @@
+import sqlite from 'better-sqlite3';
+import { sunriseDB } from '../helpers/database.helpers.js';
 import { calculateFeeAmount, calculateTaxAmount } from '../helpers/functions.fee.js';
 import getContract from './getContract.js';
 import getFee from './getFee.js';
-import { acquireConnection } from './pool.js';
 export default async function addContractFee(addFeeForm, user, connectedDatabase) {
-    const database = connectedDatabase ?? (await acquireConnection());
+    const database = connectedDatabase ?? sqlite(sunriseDB);
     const rightNowMillis = Date.now();
     // Calculate fee and tax (if not set)
     let feeAmount;
     let taxAmount;
     if ((addFeeForm.feeAmount ?? '') === '') {
         const contract = (await getContract(addFeeForm.contractId));
-        const fee = (await getFee(addFeeForm.feeId));
+        const fee = getFee(addFeeForm.feeId);
         feeAmount = calculateFeeAmount(fee, contract);
         taxAmount = calculateTaxAmount(fee, feeAmount);
     }
@@ -83,7 +84,7 @@ export default async function addContractFee(addFeeForm, user, connectedDatabase
     }
     finally {
         if (connectedDatabase === undefined) {
-            database.release();
+            database.close();
         }
     }
 }

database/addContractFee.ts

@@ -1,14 +1,14 @@
-import type { PoolConnection } from 'better-sqlite-pool'
+import sqlite from 'better-sqlite3'
 
+import { sunriseDB } from '../helpers/database.helpers.js'
 import {
   calculateFeeAmount,
   calculateTaxAmount
 } from '../helpers/functions.fee.js'
-import type { Contract, Fee } from '../types/recordTypes.js'
+import type { Contract, Fee } from '../types/record.types.js'
 
 import getContract from './getContract.js'
 import getFee from './getFee.js'
-import { acquireConnection } from './pool.js'
 
 export interface AddContractFeeForm {
   contractId: number | string
@@ -22,9 +22,9 @@ export interface AddContractFeeForm {
 export default async function addContractFee(
   addFeeForm: AddContractFeeForm,
   user: User,
-  connectedDatabase?: PoolConnection
+  connectedDatabase?: sqlite.Database
 ): Promise<boolean> {
-  const database = connectedDatabase ?? (await acquireConnection())
+  const database = connectedDatabase ?? sqlite(sunriseDB)
 
   const rightNowMillis = Date.now()
 
@@ -33,11 +33,9 @@ export default async function addContractFee(
   let taxAmount: number
 
   if ((addFeeForm.feeAmount ?? '') === '') {
-    const contract = (await getContract(
+    const contract = (await getContract(addFeeForm.contractId)) as Contract
-      addFeeForm.contractId
-    )) as Contract
 
-    const fee = (await getFee(addFeeForm.feeId)) as Fee
+    const fee = getFee(addFeeForm.feeId) as Fee
 
     feeAmount = calculateFeeAmount(fee, contract)
     taxAmount = calculateTaxAmount(fee, feeAmount)
@@ -65,6 +63,7 @@ export default async function addContractFee(
       | {
           feeAmount: number | null
           taxAmount: number | null
+
           recordDelete_timeMillis: number | null
         }
       | undefined
@@ -156,7 +155,7 @@ export default async function addContractFee(
     return result.changes > 0
   } finally {
     if (connectedDatabase === undefined) {
-      database.release()
+      database.close()
     }
   }
 }

database/addContractFeeCategory.js

@@ -1,9 +1,10 @@
+import sqlite from 'better-sqlite3';
+import { sunriseDB } from '../helpers/database.helpers.js';
 import addContractFee from './addContractFee.js';
 import { getFeeCategory } from './getFeeCategories.js';
-import { acquireConnection } from './pool.js';
 export default async function addContractFeeCategory(addFeeCategoryForm, user) {
-    const database = await acquireConnection();
+    const database = sqlite(sunriseDB);
-    const feeCategory = await getFeeCategory(addFeeCategoryForm.feeCategoryId, database);
+    const feeCategory = getFeeCategory(addFeeCategoryForm.feeCategoryId, database);
     let addedFeeCount = 0;
     for (const fee of feeCategory?.fees ?? []) {
         const success = await addContractFee({
@@ -15,6 +16,6 @@ export default async function addContractFeeCategory(addFeeCategoryForm, user) {
             addedFeeCount += 1;
         }
     }
-    database.release();
+    database.close();
     return addedFeeCount;
 }

database/addContractFeeCategory.ts

@@ -1,6 +1,9 @@
+import sqlite from 'better-sqlite3'
+
+import { sunriseDB } from '../helpers/database.helpers.js'
+
 import addContractFee from './addContractFee.js'
 import { getFeeCategory } from './getFeeCategories.js'
-import { acquireConnection } from './pool.js'
 
 export interface AddContractCategoryForm {
   contractId: number | string
@@ -11,12 +14,9 @@ export default async function addContractFeeCategory(
   addFeeCategoryForm: AddContractCategoryForm,
   user: User
 ): Promise<number> {
-  const database = await acquireConnection()
+  const database = sqlite(sunriseDB)
 
-  const feeCategory = await getFeeCategory(
+  const feeCategory = getFeeCategory(addFeeCategoryForm.feeCategoryId, database)
-    addFeeCategoryForm.feeCategoryId,
-    database
-  )
 
   let addedFeeCount = 0
 
@@ -36,7 +36,7 @@ export default async function addContractFeeCategory(
     }
   }
 
-  database.release()
+  database.close()
 
   return addedFeeCount
 }

database/addContractInterment.d.ts

@@ -1,19 +1,19 @@
 import { type DateString } from '@cityssm/utils-datetime';
-import type { PoolConnection } from 'better-sqlite-pool';
+import sqlite from 'better-sqlite3';
 export interface AddForm {
-    contractId: string | number;
+    contractId: number | string;
     deceasedName: string;
     deceasedAddress1: string;
     deceasedAddress2: string;
     deceasedCity: string;
-    deceasedProvince: string;
     deceasedPostalCode: string;
-    birthDateString: DateString | '';
+    deceasedProvince: string;
+    birthDateString: '' | DateString;
     birthPlace: string;
-    deathDateString: DateString | '';
+    deathDateString: '' | DateString;
     deathPlace: string;
-    deathAge: string | number;
+    deathAge: number | string;
     deathAgePeriod: string;
-    intermentContainerTypeId: string | number;
+    intermentContainerTypeId: number | string;
 }
-export default function addContractInterment(contractForm: AddForm, user: User, connectedDatabase?: PoolConnection): Promise<number>;
+export default function addContractInterment(contractForm: AddForm, user: User, connectedDatabase?: sqlite.Database): number;

database/addContractInterment.js

@@ -1,11 +1,12 @@
 import { dateStringToInteger } from '@cityssm/utils-datetime';
-import { acquireConnection } from './pool.js';
+import sqlite from 'better-sqlite3';
-export default async function addContractInterment(contractForm, user, connectedDatabase) {
+import { sunriseDB } from '../helpers/database.helpers.js';
-    const database = connectedDatabase ?? (await acquireConnection());
+export default function addContractInterment(contractForm, user, connectedDatabase) {
+    const database = connectedDatabase ?? sqlite(sunriseDB);
     const maxIntermentNumber = (database
         .prepare(`select max(intermentNumber) as maxIntermentNumber
-      from ContractInterments
+        from ContractInterments
-      where contractId = ?`)
+        where contractId = ?`)
         .pluck()
         .get(contractForm.contractId) ?? 0);
     const newIntermentNumber = maxIntermentNumber + 1;
@@ -26,7 +27,7 @@ export default async function addContractInterment(contractForm, user, connected
         ? undefined
         : contractForm.intermentContainerTypeId, user.userName, rightNowMillis, user.userName, rightNowMillis);
     if (connectedDatabase === undefined) {
-        database.release();
+        database.close();
     }
     return newIntermentNumber;
 }

database/addContractInterment.ts

@@ -1,37 +1,42 @@
 import { type DateString, dateStringToInteger } from '@cityssm/utils-datetime'
-import type { PoolConnection } from 'better-sqlite-pool'
+import sqlite from 'better-sqlite3'
 
-import { acquireConnection } from './pool.js'
+import { sunriseDB } from '../helpers/database.helpers.js'
 
 export interface AddForm {
-  contractId: string | number
+  contractId: number | string
+
   deceasedName: string
+
   deceasedAddress1: string
   deceasedAddress2: string
   deceasedCity: string
-  deceasedProvince: string
   deceasedPostalCode: string
-  birthDateString: DateString | ''
+  deceasedProvince: string
+
+  birthDateString: '' | DateString
   birthPlace: string
-  deathDateString: DateString | ''
+  deathDateString: '' | DateString
   deathPlace: string
-  deathAge: string | number
+
+  deathAge: number | string
   deathAgePeriod: string
-  intermentContainerTypeId: string | number
+
+  intermentContainerTypeId: number | string
 }
 
-export default async function addContractInterment(
+export default function addContractInterment(
   contractForm: AddForm,
   user: User,
-  connectedDatabase?: PoolConnection
+  connectedDatabase?: sqlite.Database
-): Promise<number> {
+): number {
-  const database = connectedDatabase ?? (await acquireConnection())
+  const database = connectedDatabase ?? sqlite(sunriseDB)
 
   const maxIntermentNumber = (database
     .prepare(
       `select max(intermentNumber) as maxIntermentNumber
-      from ContractInterments
+        from ContractInterments
-      where contractId = ?`
+        where contractId = ?`
     )
     .pluck()
     .get(contractForm.contractId) ?? 0) as number
@@ -76,7 +81,7 @@ export default async function addContractInterment(
     )
 
   if (connectedDatabase === undefined) {
-    database.release()
+    database.close()
   }
 
   return newIntermentNumber

database/addContractTransaction.d.ts

@@ -1,9 +1,10 @@
+import { type DateString, type TimeString } from '@cityssm/utils-datetime';
 export interface AddTransactionForm {
-    contractId: string | number;
+    contractId: number | string;
-    transactionDateString?: string;
+    transactionDateString?: '' | DateString;
-    transactionTimeString?: string;
+    transactionTimeString?: '' | TimeString;
-    transactionAmount: string | number;
     externalReceiptNumber: string;
+    transactionAmount: number | string;
     transactionNote: string;
 }
-export default function addContractTransaction(contractTransactionForm: AddTransactionForm, user: User): Promise<number>;
+export default function addContractTransaction(contractTransactionForm: AddTransactionForm, user: User): number;

database/addContractTransaction.js

@@ -1,7 +1,8 @@
 import { dateStringToInteger, dateToInteger, dateToTimeInteger, timeStringToInteger } from '@cityssm/utils-datetime';
-import { acquireConnection } from './pool.js';
+import sqlite from 'better-sqlite3';
-export default async function addContractTransaction(contractTransactionForm, user) {
+import { sunriseDB } from '../helpers/database.helpers.js';
-    const database = await acquireConnection();
+export default function addContractTransaction(contractTransactionForm, user) {
+    const database = sqlite(sunriseDB);
     let transactionIndex = 0;
     const maxIndexResult = database
         .prepare(`select transactionIndex
@@ -14,12 +15,12 @@ export default async function addContractTransaction(contractTransactionForm, us
         transactionIndex = maxIndexResult.transactionIndex + 1;
     }
     const rightNow = new Date();
-    const transactionDate = contractTransactionForm.transactionDateString
+    const transactionDate = (contractTransactionForm.transactionDateString ?? '') === ''
-        ? dateStringToInteger(contractTransactionForm.transactionDateString)
+        ? dateToInteger(rightNow)
-        : dateToInteger(rightNow);
+        : dateStringToInteger(contractTransactionForm.transactionDateString);
-    const transactionTime = contractTransactionForm.transactionTimeString
+    const transactionTime = (contractTransactionForm.transactionTimeString ?? '') === ''
-        ? timeStringToInteger(contractTransactionForm.transactionTimeString)
+        ? dateToTimeInteger(rightNow)
-        : dateToTimeInteger(rightNow);
+        : timeStringToInteger(contractTransactionForm.transactionTimeString);
     database
         .prepare(`insert into ContractTransactions (
         contractId, transactionIndex,
@@ -29,6 +30,6 @@ export default async function addContractTransaction(contractTransactionForm, us
         recordUpdate_userName, recordUpdate_timeMillis)
         values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
         .run(contractTransactionForm.contractId, transactionIndex, transactionDate, transactionTime, contractTransactionForm.transactionAmount, contractTransactionForm.externalReceiptNumber, contractTransactionForm.transactionNote, user.userName, rightNow.getTime(), user.userName, rightNow.getTime());
-    database.release();
+    database.close();
     return transactionIndex;
 }

database/addContractTransaction.ts

@@ -1,26 +1,31 @@
 import {
+  type DateString,
+  type TimeString,
   dateStringToInteger,
   dateToInteger,
   dateToTimeInteger,
   timeStringToInteger
 } from '@cityssm/utils-datetime'
+import sqlite from 'better-sqlite3'
 
-import { acquireConnection } from './pool.js'
+import { sunriseDB } from '../helpers/database.helpers.js'
 
 export interface AddTransactionForm {
-  contractId: string | number
+  contractId: number | string
-  transactionDateString?: string
+
-  transactionTimeString?: string
+  transactionDateString?: '' | DateString
-  transactionAmount: string | number
+  transactionTimeString?: '' | TimeString
+
   externalReceiptNumber: string
+  transactionAmount: number | string
   transactionNote: string
 }
 
-export default async function addContractTransaction(
+export default function addContractTransaction(
   contractTransactionForm: AddTransactionForm,
   user: User
-): Promise<number> {
+): number {
-  const database = await acquireConnection()
+  const database = sqlite(sunriseDB)
 
   let transactionIndex = 0
 
@@ -42,13 +47,19 @@ export default async function addContractTransaction(
 
   const rightNow = new Date()
 
-  const transactionDate = contractTransactionForm.transactionDateString
+  const transactionDate =
-    ? dateStringToInteger(contractTransactionForm.transactionDateString)
+    (contractTransactionForm.transactionDateString ?? '') === ''
-    : dateToInteger(rightNow)
+      ? dateToInteger(rightNow)
+      : dateStringToInteger(
+          contractTransactionForm.transactionDateString as DateString
+        )
 
-  const transactionTime = contractTransactionForm.transactionTimeString
+  const transactionTime =
-    ? timeStringToInteger(contractTransactionForm.transactionTimeString)
+    (contractTransactionForm.transactionTimeString ?? '') === ''
-    : dateToTimeInteger(rightNow)
+      ? dateToTimeInteger(rightNow)
+      : timeStringToInteger(
+          contractTransactionForm.transactionTimeString as TimeString
+        )
 
   database
     .prepare(
@@ -74,7 +85,7 @@ export default async function addContractTransaction(
       rightNow.getTime()
     )
 
-  database.release()
+  database.close()
 
   return transactionIndex
 }

database/addContractType.d.ts

@@ -3,4 +3,4 @@ export interface AddForm {
     isPreneed?: string;
     orderNumber?: number;
 }
-export default function addContractType(addForm: AddForm, user: User): Promise<number>;
+export default function addContractType(addForm: AddForm, user: User): number;

database/addContractType.js

@@ -1,7 +1,8 @@
+import sqlite from 'better-sqlite3';
+import { sunriseDB } from '../helpers/database.helpers.js';
 import { clearCacheByTableName } from '../helpers/functions.cache.js';
-import { acquireConnection } from './pool.js';
+export default function addContractType(addForm, user) {
-export default async function addContractType(addForm, user) {
+    const database = sqlite(sunriseDB);
-    const database = await acquireConnection();
     const rightNowMillis = Date.now();
     const result = database
         .prepare(`insert into ContractTypes (
@@ -10,7 +11,7 @@ export default async function addContractType(addForm, user) {
         recordUpdate_userName, recordUpdate_timeMillis)
         values (?, ?, ?, ?, ?, ?, ?)`)
         .run(addForm.contractType, addForm.isPreneed === undefined ? 0 : 1, addForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis);
-    database.release();
+    database.close();
     clearCacheByTableName('ContractTypes');
     return result.lastInsertRowid;
 }

database/addContractType.ts

@@ -1,6 +1,7 @@
-import { clearCacheByTableName } from '../helpers/functions.cache.js'
+import sqlite from 'better-sqlite3'
 
-import { acquireConnection } from './pool.js'
+import { sunriseDB } from '../helpers/database.helpers.js'
+import { clearCacheByTableName } from '../helpers/functions.cache.js'
 
 export interface AddForm {
   contractType: string
@@ -8,11 +9,8 @@ export interface AddForm {
   orderNumber?: number
 }
 
-export default async function addContractType(
+export default function addContractType(addForm: AddForm, user: User): number {
-  addForm: AddForm,
+  const database = sqlite(sunriseDB)
-  user: User
-): Promise<number> {
-  const database = await acquireConnection()
 
   const rightNowMillis = Date.now()
 
@@ -34,7 +32,7 @@ export default async function addContractType(
       rightNowMillis
     )
 
-  database.release()
+  database.close()
 
   clearCacheByTableName('ContractTypes')
 

database/addContractTypeField.d.ts

@@ -1,12 +1,12 @@
 export interface AddContractTypeFieldForm {
-    contractTypeId?: string | number;
+    contractTypeId?: number | string;
     contractTypeField: string;
-    fieldValues?: string;
     fieldType?: string;
+    fieldValues?: string;
     isRequired?: string;
+    maxLength?: number | string;
+    minLength?: number | string;
     pattern?: string;
-    minLength?: string | number;
-    maxLength?: string | number;
     orderNumber?: number;
 }
-export default function addContractTypeField(addForm: AddContractTypeFieldForm, user: User): Promise<number>;
+export default function addContractTypeField(addForm: AddContractTypeFieldForm, user: User): number;

database/addContractTypeField.js

@@ -1,7 +1,8 @@
+import sqlite from 'better-sqlite3';
+import { sunriseDB } from '../helpers/database.helpers.js';
 import { clearCacheByTableName } from '../helpers/functions.cache.js';
-import { acquireConnection } from './pool.js';
+export default function addContractTypeField(addForm, user) {
-export default async function addContractTypeField(addForm, user) {
+    const database = sqlite(sunriseDB);
-    const database = await acquireConnection();
     const rightNowMillis = Date.now();
     const result = database
         .prepare(`insert into ContractTypeFields (
@@ -12,8 +13,10 @@ export default async function addContractTypeField(addForm, user) {
         recordCreate_userName, recordCreate_timeMillis,
         recordUpdate_userName, recordUpdate_timeMillis)
         values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
-        .run(addForm.contractTypeId ?? undefined, addForm.contractTypeField, addForm.fieldType ?? 'text', addForm.fieldValues ?? '', addForm.isRequired === '' ? 0 : 1, addForm.pattern ?? '', addForm.minLength ?? 0, addForm.maxLength ?? 100, addForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis);
+        .run(addForm.contractTypeId ?? undefined, addForm.contractTypeField, addForm.fieldType ?? 'text', addForm.fieldValues ?? '', addForm.isRequired === '' ? 0 : 1, addForm.pattern ?? '', addForm.minLength ?? 0, 
-    database.release();
+    // eslint-disable-next-line @typescript-eslint/no-magic-numbers
+    addForm.maxLength ?? 100, addForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis);
+    database.close();
     clearCacheByTableName('ContractTypeFields');
     return result.lastInsertRowid;
 }

database/addContractTypeField.ts

@@ -1,24 +1,28 @@
+import sqlite from 'better-sqlite3'
+
+import { sunriseDB } from '../helpers/database.helpers.js'
 import { clearCacheByTableName } from '../helpers/functions.cache.js'
 
-import { acquireConnection } from './pool.js'
-
 export interface AddContractTypeFieldForm {
-  contractTypeId?: string | number
+  contractTypeId?: number | string
+
   contractTypeField: string
-  fieldValues?: string
+
   fieldType?: string
+  fieldValues?: string
   isRequired?: string
+  maxLength?: number | string
+  minLength?: number | string
   pattern?: string
-  minLength?: string | number
+
-  maxLength?: string | number
   orderNumber?: number
 }
 
-export default async function addContractTypeField(
+export default function addContractTypeField(
   addForm: AddContractTypeFieldForm,
   user: User
-): Promise<number> {
+): number {
-  const database = await acquireConnection()
+  const database = sqlite(sunriseDB)
 
   const rightNowMillis = Date.now()
 
@@ -41,6 +45,7 @@ export default async function addContractTypeField(
       addForm.isRequired === '' ? 0 : 1,
       addForm.pattern ?? '',
       addForm.minLength ?? 0,
+      // eslint-disable-next-line @typescript-eslint/no-magic-numbers
       addForm.maxLength ?? 100,
       addForm.orderNumber ?? -1,
       user.userName,
@@ -49,7 +54,7 @@ export default async function addContractTypeField(
       rightNowMillis
     )
 
-  database.release()
+  database.close()
 
   clearCacheByTableName('ContractTypeFields')
 

database/addContractTypePrint.d.ts

@@ -1,6 +1,6 @@
 export interface AddContractTypePrintForm {
-    contractTypeId: string | number;
+    contractTypeId: number | string;
     printEJS: string;
     orderNumber?: number;
 }
-export default function addContractTypePrint(addForm: AddContractTypePrintForm, user: User): Promise<boolean>;
+export default function addContractTypePrint(addForm: AddContractTypePrintForm, user: User): boolean;

database/addContractTypePrint.js

@@ -1,16 +1,17 @@
+import sqlite from 'better-sqlite3';
+import { sunriseDB } from '../helpers/database.helpers.js';
 import { clearCacheByTableName } from '../helpers/functions.cache.js';
-import { acquireConnection } from './pool.js';
+export default function addContractTypePrint(addForm, user) {
-export default async function addContractTypePrint(addForm, user) {
+    const database = sqlite(sunriseDB);
-    const database = await acquireConnection();
     const rightNowMillis = Date.now();
     let result = database
         .prepare(`update ContractTypePrints
         set recordUpdate_userName = ?,
-        recordUpdate_timeMillis = ?,
+          recordUpdate_timeMillis = ?,
-        recordDelete_userName = null,
+          recordDelete_userName = null,
-        recordDelete_timeMillis = null
+          recordDelete_timeMillis = null
         where contractTypeId = ?
-        and printEJS = ?`)
+          and printEJS = ?`)
         .run(user.userName, rightNowMillis, addForm.contractTypeId, addForm.printEJS);
     if (result.changes === 0) {
         result = database
@@ -21,7 +22,7 @@ export default async function addContractTypePrint(addForm, user) {
           values (?, ?, ?, ?, ?, ?, ?)`)
             .run(addForm.contractTypeId, addForm.printEJS, addForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis);
     }
-    database.release();
+    database.close();
     clearCacheByTableName('ContractTypePrints');
     return result.changes > 0;
 }

database/addContractTypePrint.ts

@@ -1,18 +1,20 @@
+import sqlite from 'better-sqlite3'
+
+import { sunriseDB } from '../helpers/database.helpers.js'
 import { clearCacheByTableName } from '../helpers/functions.cache.js'
 
-import { acquireConnection } from './pool.js'
-
 export interface AddContractTypePrintForm {
-  contractTypeId: string | number
+  contractTypeId: number | string
   printEJS: string
+
   orderNumber?: number
 }
 
-export default async function addContractTypePrint(
+export default function addContractTypePrint(
   addForm: AddContractTypePrintForm,
   user: User
-): Promise<boolean> {
+): boolean {
-  const database = await acquireConnection()
+  const database = sqlite(sunriseDB)
 
   const rightNowMillis = Date.now()
 
@@ -20,11 +22,11 @@ export default async function addContractTypePrint(
     .prepare(
       `update ContractTypePrints
         set recordUpdate_userName = ?,
-        recordUpdate_timeMillis = ?,
+          recordUpdate_timeMillis = ?,
-        recordDelete_userName = null,
+          recordDelete_userName = null,
-        recordDelete_timeMillis = null
+          recordDelete_timeMillis = null
         where contractTypeId = ?
-        and printEJS = ?`
+          and printEJS = ?`
     )
     .run(
       user.userName,
@@ -53,7 +55,7 @@ export default async function addContractTypePrint(
       )
   }
 
-  database.release()
+  database.close()
 
   clearCacheByTableName('ContractTypePrints')
 

database/addFee.d.ts

@@ -1,10 +1,10 @@
 export interface AddFeeForm {
-    feeCategoryId: string | number;
+    feeCategoryId: number | string;
     feeName: string;
     feeDescription: string;
     feeAccount: string;
-    contractTypeId: string | number;
+    contractTypeId: number | string;
-    burialSiteTypeId: string | number;
+    burialSiteTypeId: number | string;
     feeAmount?: string;
     feeFunction?: string;
     taxAmount?: string;
@@ -14,4 +14,4 @@ export interface AddFeeForm {
     isRequired?: '' | '1';
     orderNumber?: number;
 }
-export default function addFee(feeForm: AddFeeForm, user: User): Promise<number>;
+export default function addFee(feeForm: AddFeeForm, user: User): number;

database/addFee.js

@@ -1,6 +1,7 @@
-import { acquireConnection } from './pool.js';
+import sqlite from 'better-sqlite3';
-export default async function addFee(feeForm, user) {
+import { sunriseDB } from '../helpers/database.helpers.js';
-    const database = await acquireConnection();
+export default function addFee(feeForm, user) {
+    const database = sqlite(sunriseDB);
     const rightNowMillis = Date.now();
     const result = database
         .prepare(`insert into Fees (
@@ -15,6 +16,6 @@ export default async function addFee(feeForm, user) {
         recordUpdate_userName, recordUpdate_timeMillis)
         values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
         .run(feeForm.feeCategoryId, feeForm.feeName, feeForm.feeDescription, feeForm.feeAccount, feeForm.contractTypeId === '' ? undefined : feeForm.contractTypeId, feeForm.burialSiteTypeId === '' ? undefined : feeForm.burialSiteTypeId, feeForm.feeAmount === '' ? undefined : feeForm.feeAmount, feeForm.feeFunction ?? undefined, feeForm.taxAmount === '' ? undefined : feeForm.taxAmount, feeForm.taxPercentage === '' ? undefined : feeForm.taxPercentage, (feeForm.includeQuantity ?? '') === '' ? 0 : 1, feeForm.quantityUnit, (feeForm.isRequired ?? '') === '' ? 0 : 1, feeForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis);
-    database.release();
+    database.close();
     return result.lastInsertRowid;
 }

database/addFee.ts

@@ -1,12 +1,14 @@
-import { acquireConnection } from './pool.js'
+import sqlite from 'better-sqlite3'
+
+import { sunriseDB } from '../helpers/database.helpers.js'
 
 export interface AddFeeForm {
-  feeCategoryId: string | number
+  feeCategoryId: number | string
   feeName: string
   feeDescription: string
   feeAccount: string
-  contractTypeId: string | number
+  contractTypeId: number | string
-  burialSiteTypeId: string | number
+  burialSiteTypeId: number | string
   feeAmount?: string
   feeFunction?: string
   taxAmount?: string
@@ -17,11 +19,8 @@ export interface AddFeeForm {
   orderNumber?: number
 }
 
-export default async function addFee(
+export default function addFee(feeForm: AddFeeForm, user: User): number {
-  feeForm: AddFeeForm,
+  const database = sqlite(sunriseDB)
-  user: User
-): Promise<number> {
-  const database = await acquireConnection()
 
   const rightNowMillis = Date.now()
 
@@ -60,7 +59,7 @@ export default async function addFee(
       rightNowMillis
     )
 
-  database.release()
+  database.close()
 
   return result.lastInsertRowid as number
 }

database/addFeeCategory.d.ts

@@ -3,4 +3,4 @@ export interface AddFeeCategoryForm {
     isGroupedFee?: '1';
     orderNumber?: number;
 }
-export default function addFeeCategory(feeCategoryForm: AddFeeCategoryForm, user: User): Promise<number>;
+export default function addFeeCategory(feeCategoryForm: AddFeeCategoryForm, user: User): number;

database/addFeeCategory.js

@@ -1,6 +1,7 @@
-import { acquireConnection } from './pool.js';
+import sqlite from 'better-sqlite3';
-export default async function addFeeCategory(feeCategoryForm, user) {
+import { sunriseDB } from '../helpers/database.helpers.js';
-    const database = await acquireConnection();
+export default function addFeeCategory(feeCategoryForm, user) {
+    const database = sqlite(sunriseDB);
     const rightNowMillis = Date.now();
     const result = database
         .prepare(`insert into FeeCategories (
@@ -10,6 +11,6 @@ export default async function addFeeCategory(feeCategoryForm, user) {
         recordUpdate_userName, recordUpdate_timeMillis)
         values (?, ?, ?, ?, ?, ?, ?)`)
         .run(feeCategoryForm.feeCategory, (feeCategoryForm.isGroupedFee ?? '') === '1' ? 1 : 0, feeCategoryForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis);
-    database.release();
+    database.close();
     return result.lastInsertRowid;
 }

database/addFeeCategory.ts

@@ -1,4 +1,6 @@
-import { acquireConnection } from './pool.js'
+import sqlite from 'better-sqlite3'
+
+import { sunriseDB } from '../helpers/database.helpers.js'
 
 export interface AddFeeCategoryForm {
   feeCategory: string
@@ -6,11 +8,11 @@ export interface AddFeeCategoryForm {
   orderNumber?: number
 }
 
-export default async function addFeeCategory(
+export default function addFeeCategory(
   feeCategoryForm: AddFeeCategoryForm,
   user: User
-): Promise<number> {
+): number {
-  const database = await acquireConnection()
+  const database = sqlite(sunriseDB)
 
   const rightNowMillis = Date.now()
 
@@ -33,7 +35,7 @@ export default async function addFeeCategory(
       rightNowMillis
     )
 
-  database.release()
+  database.close()
 
   return result.lastInsertRowid as number
 }

database/addFuneralHome.d.ts

@@ -1,11 +1,11 @@
 export interface AddForm {
-    funeralHomeName: string;
     funeralHomeKey: string;
+    funeralHomeName: string;
     funeralHomeAddress1: string;
     funeralHomeAddress2: string;
     funeralHomeCity: string;
-    funeralHomeProvince: string;
     funeralHomePostalCode: string;
+    funeralHomeProvince: string;
     funeralHomePhoneNumber: string;
 }
-export default function addFuneralHome(addForm: AddForm, user: User): Promise<number>;
+export default function addFuneralHome(addForm: AddForm, user: User): number;

database/addFuneralHome.js

@@ -1,6 +1,7 @@
-import { acquireConnection } from './pool.js';
+import sqlite from 'better-sqlite3';
-export default async function addFuneralHome(addForm, user) {
+import { sunriseDB } from '../helpers/database.helpers.js';
-    const database = await acquireConnection();
+export default function addFuneralHome(addForm, user) {
+    const database = sqlite(sunriseDB);
     const rightNowMillis = Date.now();
     const result = database
         .prepare(`insert into FuneralHomes (
@@ -10,6 +11,6 @@ export default async function addFuneralHome(addForm, user) {
         recordUpdate_userName, recordUpdate_timeMillis)
         values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
         .run(addForm.funeralHomeName, addForm.funeralHomeKey, addForm.funeralHomeAddress1, addForm.funeralHomeAddress2, addForm.funeralHomeCity, addForm.funeralHomeProvince, addForm.funeralHomePostalCode, addForm.funeralHomePhoneNumber, user.userName, rightNowMillis, user.userName, rightNowMillis);
-    database.release();
+    database.close();
     return result.lastInsertRowid;
 }

database/addFuneralHome.ts

@@ -1,21 +1,22 @@
-import { acquireConnection } from './pool.js'
+import sqlite from 'better-sqlite3'
+
+import { sunriseDB } from '../helpers/database.helpers.js'
 
 export interface AddForm {
-  funeralHomeName: string
   funeralHomeKey: string
+  funeralHomeName: string
+
   funeralHomeAddress1: string
   funeralHomeAddress2: string
   funeralHomeCity: string
-  funeralHomeProvince: string
   funeralHomePostalCode: string
+  funeralHomeProvince: string
+
   funeralHomePhoneNumber: string
 }
 
-export default async function addFuneralHome(
+export default function addFuneralHome(addForm: AddForm, user: User): number {
-  addForm: AddForm,
+  const database = sqlite(sunriseDB)
-  user: User
-): Promise<number> {
-  const database = await acquireConnection()
 
   const rightNowMillis = Date.now()
 
@@ -43,7 +44,7 @@ export default async function addFuneralHome(
       rightNowMillis
     )
 
-  database.release()
+  database.close()
 
   return result.lastInsertRowid as number
 }

database/addIntermentContainerType.d.ts

@@ -1,7 +1,7 @@
-export interface AddForm {
+export interface AddIntermentContainerTypeForm {
     intermentContainerType: string;
     intermentContainerTypeKey?: string;
-    isCremationType?: string;
+    isCremationType?: '0' | '1';
-    orderNumber?: number;
+    orderNumber?: number | string;
 }
-export default function addIntermentContainerType(addForm: AddForm, user: User): Promise<number>;
+export default function addIntermentContainerType(addForm: AddIntermentContainerTypeForm, user: User): number;

database/addIntermentContainerType.js

@@ -1,7 +1,8 @@
+import sqlite from 'better-sqlite3';
+import { sunriseDB } from '../helpers/database.helpers.js';
 import { clearCacheByTableName } from '../helpers/functions.cache.js';
-import { acquireConnection } from './pool.js';
+export default function addIntermentContainerType(addForm, user) {
-export default async function addIntermentContainerType(addForm, user) {
+    const database = sqlite(sunriseDB);
-    const database = await acquireConnection();
     const rightNowMillis = Date.now();
     const result = database
         .prepare(`insert into IntermentContainerTypes (
@@ -9,8 +10,8 @@ export default async function addIntermentContainerType(addForm, user) {
         recordCreate_userName, recordCreate_timeMillis,
         recordUpdate_userName, recordUpdate_timeMillis)
         values (?, ?, ?, ?, ?, ?, ?, ?)`)
-        .run(addForm.intermentContainerType, addForm.intermentContainerTypeKey ?? '', addForm.isCremationType === undefined ? 0 : 1, addForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis);
+        .run(addForm.intermentContainerType, addForm.intermentContainerTypeKey ?? '', addForm.isCremationType ?? '0', addForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis);
-    database.release();
+    database.close();
     clearCacheByTableName('IntermentContainerTypes');
     return result.lastInsertRowid;
 }

database/addIntermentContainerType.ts

@@ -1,19 +1,20 @@
+import sqlite from 'better-sqlite3'
+
+import { sunriseDB } from '../helpers/database.helpers.js'
 import { clearCacheByTableName } from '../helpers/functions.cache.js'
 
-import { acquireConnection } from './pool.js'
+export interface AddIntermentContainerTypeForm {
-
-export interface AddForm {
   intermentContainerType: string
   intermentContainerTypeKey?: string
-  isCremationType?: string
+  isCremationType?: '0' | '1'
-  orderNumber?: number
+  orderNumber?: number | string
 }
 
-export default async function addIntermentContainerType(
+export default function addIntermentContainerType(
-  addForm: AddForm,
+  addForm: AddIntermentContainerTypeForm,
   user: User
-): Promise<number> {
+): number {
-  const database = await acquireConnection()
+  const database = sqlite(sunriseDB)
 
   const rightNowMillis = Date.now()
 
@@ -28,7 +29,7 @@ export default async function addIntermentContainerType(
     .run(
       addForm.intermentContainerType,
       addForm.intermentContainerTypeKey ?? '',
-      addForm.isCremationType === undefined ? 0 : 1,
+      addForm.isCremationType ?? '0',
       addForm.orderNumber ?? -1,
       user.userName,
       rightNowMillis,
@@ -36,7 +37,7 @@ export default async function addIntermentContainerType(
       rightNowMillis
     )
 
-  database.release()
+  database.close()
 
   clearCacheByTableName('IntermentContainerTypes')
 

database/addOrUpdateBurialSiteField.d.ts

@@ -1,7 +1,7 @@
-import type { PoolConnection } from 'better-sqlite-pool';
+import sqlite from 'better-sqlite3';
 export interface BurialSiteFieldForm {
-    burialSiteId: string | number;
+    burialSiteId: number | string;
-    burialSiteTypeFieldId: string | number;
+    burialSiteTypeFieldId: number | string;
     fieldValue: string;
 }
-export default function addOrUpdateBurialSiteField(fieldForm: BurialSiteFieldForm, user: User, connectedDatabase?: PoolConnection): Promise<boolean>;
+export default function addOrUpdateBurialSiteField(fieldForm: BurialSiteFieldForm, user: User, connectedDatabase?: sqlite.Database): boolean;

database/addOrUpdateBurialSiteField.js

@@ -1,16 +1,17 @@
-import { acquireConnection } from './pool.js';
+import sqlite from 'better-sqlite3';
-export default async function addOrUpdateBurialSiteField(fieldForm, user, connectedDatabase) {
+import { sunriseDB } from '../helpers/database.helpers.js';
-    const database = connectedDatabase ?? (await acquireConnection());
+export default function addOrUpdateBurialSiteField(fieldForm, user, connectedDatabase) {
+    const database = connectedDatabase ?? sqlite(sunriseDB);
     const rightNowMillis = Date.now();
     let result = database
         .prepare(`update BurialSiteFields
         set fieldValue = ?,
-        recordUpdate_userName = ?,
+          recordUpdate_userName = ?,
-        recordUpdate_timeMillis = ?,
+          recordUpdate_timeMillis = ?,
-        recordDelete_userName = null,
+          recordDelete_userName = null,
-        recordDelete_timeMillis = null
+          recordDelete_timeMillis = null
         where burialSiteId = ?
-        and burialSiteTypeFieldId = ?`)
+          and burialSiteTypeFieldId = ?`)
         .run(fieldForm.fieldValue, user.userName, rightNowMillis, fieldForm.burialSiteId, fieldForm.burialSiteTypeFieldId);
     if (result.changes === 0) {
         result = database
@@ -22,7 +23,7 @@ export default async function addOrUpdateBurialSiteField(fieldForm, user, connec
             .run(fieldForm.burialSiteId, fieldForm.burialSiteTypeFieldId, fieldForm.fieldValue, user.userName, rightNowMillis, user.userName, rightNowMillis);
     }
     if (connectedDatabase === undefined) {
-        database.release();
+        database.close();
     }
     return result.changes > 0;
 }

database/addOrUpdateBurialSiteField.ts

@@ -1,19 +1,19 @@
-import type { PoolConnection } from 'better-sqlite-pool'
+import sqlite from 'better-sqlite3'
 
-import { acquireConnection } from './pool.js'
+import { sunriseDB } from '../helpers/database.helpers.js'
 
 export interface BurialSiteFieldForm {
-  burialSiteId: string | number
+  burialSiteId: number | string
-  burialSiteTypeFieldId: string | number
+  burialSiteTypeFieldId: number | string
   fieldValue: string
 }
 
-export default async function addOrUpdateBurialSiteField(
+export default function addOrUpdateBurialSiteField(
   fieldForm: BurialSiteFieldForm,
   user: User,
-  connectedDatabase?: PoolConnection
+  connectedDatabase?: sqlite.Database
-): Promise<boolean> {
+): boolean {
-  const database = connectedDatabase ?? (await acquireConnection())
+  const database = connectedDatabase ?? sqlite(sunriseDB)
 
   const rightNowMillis = Date.now()
 
@@ -21,12 +21,12 @@ export default async function addOrUpdateBurialSiteField(
     .prepare(
       `update BurialSiteFields
         set fieldValue = ?,
-        recordUpdate_userName = ?,
+          recordUpdate_userName = ?,
-        recordUpdate_timeMillis = ?,
+          recordUpdate_timeMillis = ?,
-        recordDelete_userName = null,
+          recordDelete_userName = null,
-        recordDelete_timeMillis = null
+          recordDelete_timeMillis = null
         where burialSiteId = ?
-        and burialSiteTypeFieldId = ?`
+          and burialSiteTypeFieldId = ?`
     )
     .run(
       fieldForm.fieldValue,
@@ -57,7 +57,7 @@ export default async function addOrUpdateBurialSiteField(
   }
 
   if (connectedDatabase === undefined) {
-    database.release()
+    database.close()
   }
 
   return result.changes > 0

database/addOrUpdateContractField.d.ts

@@ -1,7 +1,7 @@
-import type { PoolConnection } from 'better-sqlite-pool';
+import sqlite from 'better-sqlite3';
 export interface ContractFieldForm {
-    contractId: string | number;
+    contractId: number | string;
-    contractTypeFieldId: string | number;
+    contractTypeFieldId: number | string;
     fieldValue: string;
 }
-export default function addOrUpdateContractField(fieldForm: ContractFieldForm, user: User, connectedDatabase?: PoolConnection): Promise<boolean>;
+export default function addOrUpdateContractField(fieldForm: ContractFieldForm, user: User, connectedDatabase?: sqlite.Database): boolean;

database/addOrUpdateContractField.js

@@ -1,16 +1,17 @@
-import { acquireConnection } from './pool.js';
+import sqlite from 'better-sqlite3';
-export default async function addOrUpdateContractField(fieldForm, user, connectedDatabase) {
+import { sunriseDB } from '../helpers/database.helpers.js';
-    const database = connectedDatabase ?? (await acquireConnection());
+export default function addOrUpdateContractField(fieldForm, user, connectedDatabase) {
+    const database = connectedDatabase ?? sqlite(sunriseDB);
     const rightNowMillis = Date.now();
     let result = database
         .prepare(`update ContractFields
         set fieldValue = ?,
-        recordUpdate_userName = ?,
+          recordUpdate_userName = ?,
-        recordUpdate_timeMillis = ?,
+          recordUpdate_timeMillis = ?,
-        recordDelete_userName = null,
+          recordDelete_userName = null,
-        recordDelete_timeMillis = null
+          recordDelete_timeMillis = null
         where contractId = ?
-        and contractTypeFieldId = ?`)
+          and contractTypeFieldId = ?`)
         .run(fieldForm.fieldValue, user.userName, rightNowMillis, fieldForm.contractId, fieldForm.contractTypeFieldId);
     if (result.changes === 0) {
         result = database
@@ -22,7 +23,7 @@ export default async function addOrUpdateContractField(fieldForm, user, connecte
             .run(fieldForm.contractId, fieldForm.contractTypeFieldId, fieldForm.fieldValue, user.userName, rightNowMillis, user.userName, rightNowMillis);
     }
     if (connectedDatabase === undefined) {
-        database.release();
+        database.close();
     }
     return result.changes > 0;
 }

database/addOrUpdateContractField.ts

@@ -1,19 +1,19 @@
-import type { PoolConnection } from 'better-sqlite-pool'
+import sqlite from 'better-sqlite3'
 
-import { acquireConnection } from './pool.js'
+import { sunriseDB } from '../helpers/database.helpers.js'
 
 export interface ContractFieldForm {
-  contractId: string | number
+  contractId: number | string
-  contractTypeFieldId: string | number
+  contractTypeFieldId: number | string
   fieldValue: string
 }
 
-export default async function addOrUpdateContractField(
+export default function addOrUpdateContractField(
   fieldForm: ContractFieldForm,
   user: User,
-  connectedDatabase?: PoolConnection
+  connectedDatabase?: sqlite.Database
-): Promise<boolean> {
+): boolean {
-  const database = connectedDatabase ?? (await acquireConnection())
+  const database = connectedDatabase ?? sqlite(sunriseDB)
 
   const rightNowMillis = Date.now()
 
@@ -21,12 +21,12 @@ export default async function addOrUpdateContractField(
     .prepare(
       `update ContractFields
         set fieldValue = ?,
-        recordUpdate_userName = ?,
+          recordUpdate_userName = ?,
-        recordUpdate_timeMillis = ?,
+          recordUpdate_timeMillis = ?,
-        recordDelete_userName = null,
+          recordDelete_userName = null,
-        recordDelete_timeMillis = null
+          recordDelete_timeMillis = null
         where contractId = ?
-        and contractTypeFieldId = ?`
+          and contractTypeFieldId = ?`
     )
     .run(
       fieldForm.fieldValue,
@@ -57,7 +57,7 @@ export default async function addOrUpdateContractField(
   }
 
   if (connectedDatabase === undefined) {
-    database.release()
+    database.close()
   }
 
   return result.changes > 0

database/addRecord.d.ts

@@ -1,3 +1,3 @@
-type RecordTable = 'BurialSiteStatuses' | 'BurialSiteTypes' | 'WorkOrderMilestoneTypes' | 'WorkOrderTypes';
+type RecordTable = 'BurialSiteStatuses' | 'WorkOrderMilestoneTypes' | 'WorkOrderTypes';
-export default function addRecord(recordTable: RecordTable, recordName: string, orderNumber: number | string, user: User): Promise<number>;
+export default function addRecord(recordTable: RecordTable, recordName: string, orderNumber: number | string, user: User): number;
 export {};

database/addRecord.js

@@ -1,13 +1,13 @@
+import sqlite from 'better-sqlite3';
+import { sunriseDB } from '../helpers/database.helpers.js';
 import { clearCacheByTableName } from '../helpers/functions.cache.js';
-import { acquireConnection } from './pool.js';
 const recordNameColumns = new Map([
     ['BurialSiteStatuses', 'burialSiteStatus'],
-    ['BurialSiteTypes', 'burialSiteType'],
     ['WorkOrderMilestoneTypes', 'workOrderMilestoneType'],
     ['WorkOrderTypes', 'workOrderType']
 ]);
-export default async function addRecord(recordTable, recordName, orderNumber, user) {
+export default function addRecord(recordTable, recordName, orderNumber, user) {
-    const database = await acquireConnection();
+    const database = sqlite(sunriseDB);
     const rightNowMillis = Date.now();
     const result = database
         .prepare(`insert into ${recordTable} (
@@ -17,7 +17,7 @@ export default async function addRecord(recordTable, recordName, orderNumber, us
         recordUpdate_userName, recordUpdate_timeMillis)
         values (?, ?, ?, ?, ?, ?)`)
         .run(recordName, orderNumber === '' ? -1 : orderNumber, user.userName, rightNowMillis, user.userName, rightNowMillis);
-    database.release();
+    database.close();
     clearCacheByTableName(recordTable);
     return result.lastInsertRowid;
 }

database/addRecord.ts

@@ -1,27 +1,26 @@
-import { clearCacheByTableName } from '../helpers/functions.cache.js'
+import sqlite from 'better-sqlite3'
 
-import { acquireConnection } from './pool.js'
+import { sunriseDB } from '../helpers/database.helpers.js'
+import { clearCacheByTableName } from '../helpers/functions.cache.js'
 
 type RecordTable =
   | 'BurialSiteStatuses'
-  | 'BurialSiteTypes'
   | 'WorkOrderMilestoneTypes'
   | 'WorkOrderTypes'
 
 const recordNameColumns = new Map<RecordTable, string>([
   ['BurialSiteStatuses', 'burialSiteStatus'],
-  ['BurialSiteTypes', 'burialSiteType'],
   ['WorkOrderMilestoneTypes', 'workOrderMilestoneType'],
   ['WorkOrderTypes', 'workOrderType']
 ])
 
-export default async function addRecord(
+export default function addRecord(
   recordTable: RecordTable,
   recordName: string,
   orderNumber: number | string,
   user: User
-): Promise<number> {
+): number {
-  const database = await acquireConnection()
+  const database = sqlite(sunriseDB)
 
   const rightNowMillis = Date.now()
 
@@ -43,7 +42,7 @@ export default async function addRecord(
       rightNowMillis
     )
 
-  database.release()
+  database.close()
 
   clearCacheByTableName(recordTable)
 

database/addWorkOrder.d.ts

@@ -1,9 +1,9 @@
 export interface AddWorkOrderForm {
-    workOrderTypeId: number | string;
-    workOrderNumber?: string;
     workOrderDescription: string;
-    workOrderOpenDateString?: string;
+    workOrderNumber?: string;
+    workOrderTypeId: number | string;
     workOrderCloseDateString?: string;
+    workOrderOpenDateString?: string;
     contractId?: string;
 }
-export default function addWorkOrder(workOrderForm: AddWorkOrderForm, user: User): Promise<number>;
+export default function addWorkOrder(workOrderForm: AddWorkOrderForm, user: User): number;

database/addWorkOrder.js

@@ -1,13 +1,14 @@
 import { dateStringToInteger, dateToInteger } from '@cityssm/utils-datetime';
+import sqlite from 'better-sqlite3';
+import { sunriseDB } from '../helpers/database.helpers.js';
 import addWorkOrderContract from './addWorkOrderContract.js';
 import getNextWorkOrderNumber from './getNextWorkOrderNumber.js';
-import { acquireConnection } from './pool.js';
+export default function addWorkOrder(workOrderForm, user) {
-export default async function addWorkOrder(workOrderForm, user) {
+    const database = sqlite(sunriseDB);
-    const database = await acquireConnection();
     const rightNow = new Date();
     let workOrderNumber = workOrderForm.workOrderNumber;
     if ((workOrderNumber ?? '') === '') {
-        workOrderNumber = await getNextWorkOrderNumber(database);
+        workOrderNumber = getNextWorkOrderNumber(database);
     }
     const result = database
         .prepare(`insert into WorkOrders (
@@ -23,11 +24,11 @@ export default async function addWorkOrder(workOrderForm, user) {
         : dateStringToInteger(workOrderForm.workOrderCloseDateString), user.userName, rightNow.getTime(), user.userName, rightNow.getTime());
     const workOrderId = result.lastInsertRowid;
     if ((workOrderForm.contractId ?? '') !== '') {
-        await addWorkOrderContract({
+        addWorkOrderContract({
+            contractId: workOrderForm.contractId,
             workOrderId,
-            contractId: workOrderForm.contractId
         }, user, database);
     }
-    database.release();
+    database.close();
     return workOrderId;
 }

database/addWorkOrder.ts

@@ -3,32 +3,37 @@ import {
   dateStringToInteger,
   dateToInteger
 } from '@cityssm/utils-datetime'
+import sqlite from 'better-sqlite3'
+
+import { sunriseDB } from '../helpers/database.helpers.js'
 
 import addWorkOrderContract from './addWorkOrderContract.js'
 import getNextWorkOrderNumber from './getNextWorkOrderNumber.js'
-import { acquireConnection } from './pool.js'
 
 export interface AddWorkOrderForm {
-  workOrderTypeId: number | string
-  workOrderNumber?: string
   workOrderDescription: string
-  workOrderOpenDateString?: string
+  workOrderNumber?: string
+
+  workOrderTypeId: number | string
+
   workOrderCloseDateString?: string
+  workOrderOpenDateString?: string
+  
   contractId?: string
 }
 
-export default async function addWorkOrder(
+export default function addWorkOrder(
   workOrderForm: AddWorkOrderForm,
   user: User
-): Promise<number> {
+): number {
-  const database = await acquireConnection()
+  const database = sqlite(sunriseDB)
 
   const rightNow = new Date()
 
   let workOrderNumber = workOrderForm.workOrderNumber
 
   if ((workOrderNumber ?? '') === '') {
-    workOrderNumber = await getNextWorkOrderNumber(database)
+    workOrderNumber = getNextWorkOrderNumber(database)
   }
 
   const result = database
@@ -63,17 +68,17 @@ export default async function addWorkOrder(
   const workOrderId = result.lastInsertRowid as number
 
   if ((workOrderForm.contractId ?? '') !== '') {
-    await addWorkOrderContract(
+    addWorkOrderContract(
       {
+        contractId: workOrderForm.contractId as string,
         workOrderId,
-        contractId: workOrderForm.contractId as string
       },
       user,
       database
     )
   }
 
-  database.release()
+  database.close()
 
   return workOrderId
 }

database/addWorkOrderBurialSite.d.ts

@@ -1,5 +1,5 @@
 export interface AddForm {
-    workOrderId: number | string;
     burialSiteId: number | string;
+    workOrderId: number | string;
 }
-export default function addWorkOrderBurialSite(workOrderLotForm: AddForm, user: User): Promise<boolean>;
+export default function addWorkOrderBurialSite(workOrderLotForm: AddForm, user: User): boolean;

database/addWorkOrderBurialSite.js

@@ -1,6 +1,7 @@
-import { acquireConnection } from './pool.js';
+import sqlite from 'better-sqlite3';
-export default async function addWorkOrderBurialSite(workOrderLotForm, user) {
+import { sunriseDB } from '../helpers/database.helpers.js';
-    const database = await acquireConnection();
+export default function addWorkOrderBurialSite(workOrderLotForm, user) {
+    const database = sqlite(sunriseDB);
     const rightNowMillis = Date.now();
     const row = database
         .prepare(`select recordDelete_timeMillis
@@ -32,6 +33,6 @@ export default async function addWorkOrderBurialSite(workOrderLotForm, user) {
                 .run(user.userName, rightNowMillis, user.userName, rightNowMillis, workOrderLotForm.workOrderId, workOrderLotForm.burialSiteId);
         }
     }
-    database.release();
+    database.close();
     return true;
 }