fix undefined transaction time

linting
include "cms" in title
2025-05-02 08:52:35 -04:00 · 2025-05-01 14:53:07 -04:00 · 2025-05-01 12:45:59 -04:00 · 2025-05-01 12:36:08 -04:00 · 2025-05-01 12:32:36 -04:00 · 2025-05-01 12:19:48 -04:00
1033 changed files with 16055 additions and 9556 deletions
--- a/.github/workflows/coverage.yml
+++ b/.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
--- a/README.md
+++ b/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/).
--- a/_config.yml
+++ b/_config.yml
@ -1,2 +1,2 @@
 theme: jekyll-theme-cayman
-title: Sunrise Cemetery Management System
+title: Sunrise Cemetery Management System (CMS)
--- a/app.js
+++ b/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();
 });
--- a/app.ts
+++ b/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'
  )
--- a/bin/www.js
+++ b/bin/www.js
@ -9,19 +9,23 @@ 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);
-process.title = `${getConfigProperty('application.applicationName')} (Primary)`;
+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`
 };
 cluster.setupPrimary(clusterSettings);
+let doShutdown = false;
 const activeWorkers = new Map();
 for (let index = 0; index < processCount; index += 1) {
    const worker = cluster.fork();
@ -40,24 +44,27 @@ cluster.on('message', (worker, message) => {
 cluster.on('exit', (worker) => {
    debug(`Worker ${(worker.process.pid ?? 0).toString()} has been killed`);
    activeWorkers.delete(worker.process.pid ?? 0);
-    debug('Starting another worker');
-    cluster.fork();
+    if (!doShutdown) {
+        debug('Starting another worker');
+        const newWorker = cluster.fork();
+        activeWorkers.set(newWorker.process.pid ?? 0, newWorker);
+    }
 });
 const ntfyStartupConfig = getConfigProperty('application.ntfyStartup');
 if (ntfyStartupConfig !== undefined) {
    const topic = ntfyStartupConfig.topic;
    const server = ntfyStartupConfig.server;
    const ntfyStartupMessage = {
-        topic,
-        title: getConfigProperty('application.applicationName'),
        message: 'Application Started',
-        tags: ['arrow_up']
+        tags: ['arrow_up'],
+        title: applicationName,
+        topic
    };
    const ntfyShutdownMessage = {
-        topic,
-        title: getConfigProperty('application.applicationName'),
        message: 'Application Shut Down',
-        tags: ['arrow_down']
+        tags: ['arrow_down'],
+        title: applicationName,
+        topic
    };
    if (server !== undefined) {
        ntfyStartupMessage.server = server;
@ -74,7 +81,16 @@ if (process.env.STARTUP_TEST === 'true') {
    debug(`Killing processes in ${killSeconds} seconds...`);
    setTimeout(() => {
        debug('Killing processes');
+        doShutdown = true;
        // eslint-disable-next-line unicorn/no-process-exit
        process.exit(0);
    }, secondsToMillis(killSeconds));
 }
+exitHook(() => {
+    doShutdown = true;
+    debug('Shutting down...');
+    for (const worker of activeWorkers.values()) {
+        debug(`Killing worker ${worker.process.pid}`);
+        worker.kill();
+    }
+});
--- a/bin/www.ts
+++ b/bin/www.ts
@ -11,24 +11,28 @@ 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
 )

-process.title = `${getConfigProperty('application.applicationName')} (Primary)`
+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 = {
@ -37,6 +41,7 @@ const clusterSettings = {

 cluster.setupPrimary(clusterSettings)

+let doShutdown = false
 const activeWorkers = new Map<number, Worker>()

 for (let index = 0; index < processCount; index += 1) {
@ -60,8 +65,12 @@ cluster.on('exit', (worker) => {
  debug(`Worker ${(worker.process.pid ?? 0).toString()} has been killed`)
  activeWorkers.delete(worker.process.pid ?? 0)

-  debug('Starting another worker')
-  cluster.fork()
+  if (!doShutdown) {
+    debug('Starting another worker')
+    const newWorker = cluster.fork()
+
+    activeWorkers.set(newWorker.process.pid ?? 0, newWorker)
+  }
 })

 const ntfyStartupConfig = getConfigProperty('application.ntfyStartup')
@ -71,17 +80,17 @@ if (ntfyStartupConfig !== undefined) {
  const server = ntfyStartupConfig.server

  const ntfyStartupMessage: NtfyMessageOptions = {
-    topic,
-    title: getConfigProperty('application.applicationName'),
    message: 'Application Started',
-    tags: ['arrow_up']
+    tags: ['arrow_up'],
+    title: applicationName,
+    topic
  }

  const ntfyShutdownMessage: NtfyMessageOptions = {
-    topic,
-    title: getConfigProperty('application.applicationName'),
    message: 'Application Shut Down',
-    tags: ['arrow_down']
+    tags: ['arrow_down'],
+    title: applicationName,
+    topic
  }

  if (server !== undefined) {
@ -105,7 +114,19 @@ if (process.env.STARTUP_TEST === 'true') {
  setTimeout(() => {
    debug('Killing processes')

+    doShutdown = true
+
    // eslint-disable-next-line unicorn/no-process-exit
    process.exit(0)
  }, secondsToMillis(killSeconds))
 }
+
+exitHook(() => {
+  doShutdown = true
+  debug('Shutting down...')
+
+  for (const worker of activeWorkers.values()) {
+    debug(`Killing worker ${worker.process.pid}`)
+    worker.kill()
+  }
+})
--- a/bin/wwwProcess.js
+++ b/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') {
--- a/bin/wwwProcess.ts
+++ b/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 {
--- a/cypress/e2e/01-admin/feeManagement.cy.ts
+++ b/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', () => {
--- a/cypress/e2e/02-update/cemeteries.cy.ts
+++ b/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', () => {
--- a/data/base.config.d.ts
+++ b/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;
--- a/data/base.config.js
+++ b/data/base.config.js
@ -6,6 +6,8 @@ export const config = {
    settings: {
        adminCleanup: {},
        burialSites: {},
+        burialSiteTypes: {},
+        cemeteries: {},
        contracts: {},
        dynamicsGP: {
            integrationIsEnabled: false
--- a/data/base.config.ts
+++ b/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,8 @@ export const config: Config = {
  settings: {
    adminCleanup: {},
    burialSites: {},
+    burialSiteTypes: {},
+    cemeteries: {},
    contracts: {},
    dynamicsGP: {
      integrationIsEnabled: false
--- a/data/config.baseOntario.d.ts
+++ b/data/config.baseOntario.d.ts
@ -1,2 +0,0 @@
-export declare const config: import("../types/configTypes.js").Config;
-export default config;
--- a/data/config.defaultValues.d.ts
+++ b/data/config.defaultValues.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;
@ -31,13 +32,15 @@ export declare const configDefaultValues: {
    'settings.latitudeMin': number;
    '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;
@ -54,3 +57,4 @@ export declare const configDefaultValues: {
    'settings.dynamicsGP.itemNumbers': string[];
    'settings.dynamicsGP.trialBalanceCodes': string[];
 };
+export default configDefaultValues;
--- a/data/config.defaultValues.js
+++ b/data/config.defaultValues.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',
@ -30,6 +31,11 @@ export const configDefaultValues = {
    'settings.latitudeMin': -90,
    '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: '-',
@ -44,23 +50,10 @@ export const configDefaultValues = {
        }
    },
    'settings.burialSites.burialSiteNameSegments.includeCemeteryKey': false,
+    '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',
@ -78,3 +71,4 @@ export const configDefaultValues = {
    'settings.dynamicsGP.itemNumbers': [],
    'settings.dynamicsGP.trialBalanceCodes': []
 };
+export default configDefaultValues;
--- a/data/config.defaultValues.ts
+++ b/data/config.defaultValues.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[],

@ -49,6 +49,14 @@ 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: '-',
@ -66,23 +74,12 @@ export const configDefaultValues = {

  'settings.burialSites.burialSiteNameSegments.includeCemeteryKey': false,

+  '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,

@ -110,3 +107,5 @@ export const configDefaultValues = {
  'settings.dynamicsGP.itemNumbers': [] as string[],
  'settings.dynamicsGP.trialBalanceCodes': [] as string[]
 }
+
+export default configDefaultValues
--- a/data/dataLists.d.ts
+++ b/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;
--- a/data/dataLists.js
+++ b/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
+};
--- a/data/dataLists.ts
+++ b/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
+}
--- a/data/ontario.config.d.ts
+++ b/data/ontario.config.d.ts
@ -0,0 +1,2 @@
+export declare const config: import("../types/config.types.js").Config;
+export default config;
--- a/data/config.baseOntario.js
+++ b/data/config.baseOntario.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;
--- a/data/config.baseOntario.ts
+++ b/data/config.baseOntario.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)

--- a/data/ssm.ontario.config.d.ts
+++ b/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;
--- a/data/ssm.ontario.config.js
+++ b/data/ssm.ontario.config.js
@ -1,8 +1,8 @@
-import path from 'node:path';
-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 = path.join('..', 'sunrise-cms-saultstemarie', 'public-internal');
+config.settings.publicInternalPath =
+    '../sunrise-cms-saultstemarie/public-internal';
 config.settings.burialSites.burialSiteNameSegments = {
    includeCemeteryKey: true,
    separator: '-',
--- a/data/ssm.ontario.config.ts
+++ b/data/ssm.ontario.config.ts
@ -1,19 +1,18 @@
-import path from 'node:path'
+import type { Config } from '../types/config.types.js'

-import type { Config } from '../types/configTypes.js'
-
-import { config as cemeteryConfig } from './config.baseOntario.js'
+import { config as cemeteryConfig } from './ontario.config.js'

 export const config: Config = { ...cemeteryConfig }

 config.aliases.externalReceiptNumber = 'GP Receipt Number'

-config.settings.publicInternalPath = path.join('..', 'sunrise-cms-saultstemarie', 'public-internal')
+config.settings.publicInternalPath =
+  '../sunrise-cms-saultstemarie/public-internal'

 config.settings.burialSites.burialSiteNameSegments = {
  includeCemeteryKey: true,
  separator: '-',
-  
+
  segments: {
    1: {
      isAvailable: true,
--- a/data/testing.config.d.ts
+++ b/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;
--- a/data/testing.config.js
+++ b/data/testing.config.js
@ -1,12 +1,14 @@
-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 = {
-    testing: ['*testView', '*testUpdate', '*testAdmin'],
    canLogin: ['*testView', '*testUpdate', '*testAdmin'],
    canUpdate: ['*testUpdate'],
-    isAdmin: ['*testAdmin']
+    canUpdateWorkOrders: ['*testUpdate'],
+    isAdmin: ['*testAdmin'],
+    testing: ['*testView', '*testUpdate', '*testAdmin']
 };
+config.settings.publicInternalPath = 'public-internal';
 config.settings.dynamicsGP.integrationIsEnabled = false;
 export default config;
--- a/data/testing.config.ts
+++ b/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 }

@ -9,12 +9,15 @@ config.application.useTestDatabases = true
 config.session.doKeepAlive = true

 config.users = {
-  testing: ['*testView', '*testUpdate', '*testAdmin'],
  canLogin: ['*testView', '*testUpdate', '*testAdmin'],
  canUpdate: ['*testUpdate'],
-  isAdmin: ['*testAdmin']
+  canUpdateWorkOrders: ['*testUpdate'],
+  isAdmin: ['*testAdmin'],
+  testing: ['*testView', '*testUpdate', '*testAdmin']
 }

+config.settings.publicInternalPath = 'public-internal'
+
 config.settings.dynamicsGP!.integrationIsEnabled = false

 export default config
--- a/database/addBurialSite.d.ts
+++ b/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;
-    burialSiteLatitude: string;
-    burialSiteLongitude: string;
+    cemeterySvgId?: string;
+    burialSiteLatitude?: 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;
+};
--- a/database/addBurialSite.js
+++ b/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) {
-    const database = await acquireConnection();
+// eslint-disable-next-line complexity
+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();
-    return burialSiteId;
+    database.close();
+    return {
+        burialSiteId,
+        burialSiteName
+    };
 }
--- a/database/addBurialSite.ts
+++ b/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,15 +16,18 @@ export interface AddBurialSiteForm {
  burialSiteStatusId: number | string
  burialSiteTypeId: number | string

-  burialSiteImage: string
-  cemeteryId: number | string
-  cemeterySvgId: string
+  bodyCapacity?: number | string
+  crematedCapacity?: number | string

-  burialSiteLatitude: string
-  burialSiteLongitude: string
+  burialSiteImage?: string
+  cemeteryId: number | string
+  cemeterySvgId?: string
+
+  burialSiteLatitude?: string
+  burialSiteLongitude?: string

  burialSiteTypeFieldIds?: string
-  
+
  [fieldValue_burialSiteTypeFieldId: string]: unknown
 }

@ -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> {
-  const database = await acquireConnection()
+): { burialSiteId: number; burialSiteName: string } {
+  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
+  }
 }
--- a/database/addBurialSiteComment.d.ts
+++ b/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;
--- a/database/addBurialSiteComment.js
+++ b/database/addBurialSiteComment.js
@ -1,7 +1,8 @@
 import { dateToInteger, dateToTimeInteger } from '@cityssm/utils-datetime';
-import { acquireConnection } from './pool.js';
-export default async function addBurialSiteComment(commentForm, user) {
-    const database = await acquireConnection();
+import sqlite from 'better-sqlite3';
+import { sunriseDB } from '../helpers/database.helpers.js';
+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;
 }
--- a/database/addBurialSiteComment.ts
+++ b/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> {
-  const database = await acquireConnection()
+): number {
+  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
 }
--- a/database/addBurialSiteType.d.ts
+++ b/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;
--- a/database/addBurialSiteType.js
+++ b/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;
+}
--- a/database/addBurialSiteType.ts
+++ b/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
+}
--- a/database/addBurialSiteTypeField.d.ts
+++ b/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;
--- a/database/addBurialSiteTypeField.js
+++ b/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 async function addBurialSiteTypeField(addForm, user) {
-    const database = await acquireConnection();
+export default function addBurialSiteTypeField(addForm, user) {
+    const database = sqlite(sunriseDB);
    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);
-    database.release();
+        .run(addForm.burialSiteTypeId, addForm.burialSiteTypeField, addForm.fieldType ?? 'text', addForm.fieldValues ?? '', 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, rightNowMillis, user.userName, rightNowMillis);
+    database.close();
    clearCacheByTableName('BurialSiteTypeFields');
    return result.lastInsertRowid;
 }
--- a/database/addBurialSiteTypeField.ts
+++ b/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> {
-  const database = await acquireConnection()
+): number {
+  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')

--- a/database/addCemetery.d.ts
+++ b/database/addCemetery.d.ts
@ -1,7 +1,9 @@
-export interface AddCemeteryForm {
+import { type UpdateCemeteryDirectionsOfArrivalForm } from './updateCemeteryDirectionsOfArrival.js';
+export type AddCemeteryForm = UpdateCemeteryDirectionsOfArrivalForm & {
    cemeteryDescription: string;
    cemeteryKey: string;
    cemeteryName: string;
+    parentCemeteryId: string;
    cemeteryLatitude: string;
    cemeteryLongitude: string;
    cemeterySvg: string;
@ -11,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;
--- a/database/addCemetery.js
+++ b/database/addCemetery.js
@ -1,6 +1,8 @@
-import { acquireConnection } from './pool.js';
-export default async function addCemetery(addForm, user) {
-    const database = await acquireConnection();
+import sqlite from 'better-sqlite3';
+import { sunriseDB } from '../helpers/database.helpers.js';
+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 (
@ -9,10 +11,13 @@ export default async function addCemetery(addForm, user) {
        cemeteryAddress1, cemeteryAddress2,
        cemeteryCity, cemeteryProvince, cemeteryPostalCode,
        cemeteryPhoneNumber,
+        parentCemeteryId,
        recordCreate_userName, recordCreate_timeMillis,
        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, user.userName, rightNowMillis, user.userName, rightNowMillis);
-    database.release();
-    return result.lastInsertRowid;
+        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);
+    const cemeteryId = result.lastInsertRowid;
+    updateCemeteryDirectionsOfArrival(cemeteryId, addForm, database);
+    database.close();
+    return cemeteryId;
 }
--- a/database/addCemetery.ts
+++ b/database/addCemetery.ts
@ -1,9 +1,16 @@
-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
+  parentCemeteryId: string

  cemeteryLatitude: string
  cemeteryLongitude: string
@ -14,15 +21,15 @@ export interface AddCemeteryForm {
  cemeteryCity: string
  cemeteryPostalCode: string
  cemeteryProvince: string
-  
+
  cemeteryPhoneNumber: string
 }

-export default async function addCemetery(
+export default function addCemetery(
  addForm: AddCemeteryForm,
  user: User
-): Promise<number> {
-  const database = await acquireConnection()
+): number {
+  const database = sqlite(sunriseDB)

  const rightNowMillis = Date.now()

@ -34,9 +41,10 @@ export default async function addCemetery(
        cemeteryAddress1, cemeteryAddress2,
        cemeteryCity, cemeteryProvince, cemeteryPostalCode,
        cemeteryPhoneNumber,
+        parentCemeteryId,
        recordCreate_userName, recordCreate_timeMillis,
        recordUpdate_userName, recordUpdate_timeMillis)
-        values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+        values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
    )
    .run(
      addForm.cemeteryName,
@ -51,13 +59,18 @@ export default async function addCemetery(
      addForm.cemeteryProvince,
      addForm.cemeteryPostalCode,
      addForm.cemeteryPhoneNumber,
+      addForm.parentCemeteryId === '' ? undefined : addForm.parentCemeteryId,
      user.userName,
      rightNowMillis,
      user.userName,
      rightNowMillis
    )

-  database.release()
+  const cemeteryId = result.lastInsertRowid as number

-  return result.lastInsertRowid as number
+  updateCemeteryDirectionsOfArrival(cemeteryId, addForm, database)
+
+  database.close()
+
+  return cemeteryId
 }
--- a/database/addCommittalType.d.ts
+++ b/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;
--- a/database/addCommittalType.js
+++ b/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 async function addCommittalType(addForm, user) {
-    const database = await acquireConnection();
+export default function addCommittalType(addForm, user) {
+    const database = sqlite(sunriseDB);
    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;
 }
--- a/database/addCommittalType.ts
+++ b/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(
-  addForm: AddForm,
-  user: User
-): Promise<number> {
-  const database = await acquireConnection()
+export default function addCommittalType(addForm: AddForm, user: User): number {
+  const database = sqlite(sunriseDB)

  const rightNowMillis = Date.now()

@ -34,7 +32,7 @@ export default async function addCommittalType(
      rightNowMillis
    )

-  database.release()
+  database.close()

  clearCacheByTableName('CommittalTypes')

--- a/database/addContract.d.ts
+++ b/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;
--- a/database/addContract.js
+++ b/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) {
-    const database = connectedDatabase ?? (await acquireConnection());
+export default function addContract(addForm, user, connectedDatabase) {
+    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;
 }
--- a/database/addContract.ts
+++ b/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
-): Promise<number> {
-  const database = connectedDatabase ?? (await acquireConnection())
+  connectedDatabase?: sqlite.Database
+): number {
+  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
--- a/database/addContractComment.d.ts
+++ b/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;
--- a/database/addContractComment.js
+++ b/database/addContractComment.js
@ -1,6 +1,7 @@
 import { dateStringToInteger, dateToInteger, dateToTimeInteger, timeStringToInteger } from '@cityssm/utils-datetime';
-import { acquireConnection } from './pool.js';
-export default async function addContractComment(commentForm, user) {
+import sqlite from 'better-sqlite3';
+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;
 }
--- a/database/addContractComment.ts
+++ b/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
 }
--- a/database/addContractFee.d.ts
+++ b/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>;
--- a/database/addContractFee.js
+++ b/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();
        }
    }
 }
--- a/database/addContractFee.ts
+++ b/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(
-      addFeeForm.contractId
-    )) as Contract
+    const contract = (await getContract(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()
    }
  }
 }
--- a/database/addContractFeeCategory.js
+++ b/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 feeCategory = await getFeeCategory(addFeeCategoryForm.feeCategoryId, database);
+    const database = sqlite(sunriseDB);
+    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;
 }
--- a/database/addContractFeeCategory.ts
+++ b/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(
-    addFeeCategoryForm.feeCategoryId,
-    database
-  )
+  const feeCategory = getFeeCategory(addFeeCategoryForm.feeCategoryId, database)

  let addedFeeCount = 0

@ -36,7 +36,7 @@ export default async function addContractFeeCategory(
    }
  }

-  database.release()
+  database.close()

  return addedFeeCount
 }
--- a/database/addContractInterment.d.ts
+++ b/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;
--- a/database/addContractInterment.js
+++ b/database/addContractInterment.js
@ -1,11 +1,12 @@
 import { dateStringToInteger } from '@cityssm/utils-datetime';
-import { acquireConnection } from './pool.js';
-export default async function addContractInterment(contractForm, user, connectedDatabase) {
-    const database = connectedDatabase ?? (await acquireConnection());
+import sqlite from 'better-sqlite3';
+import { sunriseDB } from '../helpers/database.helpers.js';
+export default function addContractInterment(contractForm, user, connectedDatabase) {
+    const database = connectedDatabase ?? sqlite(sunriseDB);
    const maxIntermentNumber = (database
        .prepare(`select max(intermentNumber) as maxIntermentNumber
-      from ContractInterments
-      where contractId = ?`)
+        from ContractInterments
+        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;
 }
--- a/database/addContractInterment.ts
+++ b/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
-): Promise<number> {
-  const database = connectedDatabase ?? (await acquireConnection())
+  connectedDatabase?: sqlite.Database
+): number {
+  const database = connectedDatabase ?? sqlite(sunriseDB)

  const maxIntermentNumber = (database
    .prepare(
      `select max(intermentNumber) as maxIntermentNumber
-      from ContractInterments
-      where contractId = ?`
+        from ContractInterments
+        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
--- a/database/addContractTransaction.d.ts
+++ b/database/addContractTransaction.d.ts
@ -1,9 +1,10 @@
+import { type DateString, type TimeString } from '@cityssm/utils-datetime';
 export interface AddTransactionForm {
-    contractId: string | number;
-    transactionDateString?: string;
-    transactionTimeString?: string;
-    transactionAmount: string | number;
+    contractId: number | string;
+    transactionDateString?: '' | DateString;
+    transactionTimeString?: '' | TimeString;
    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;
--- a/database/addContractTransaction.js
+++ b/database/addContractTransaction.js
@ -1,7 +1,8 @@
 import { dateStringToInteger, dateToInteger, dateToTimeInteger, timeStringToInteger } from '@cityssm/utils-datetime';
-import { acquireConnection } from './pool.js';
-export default async function addContractTransaction(contractTransactionForm, user) {
-    const database = await acquireConnection();
+import sqlite from 'better-sqlite3';
+import { sunriseDB } from '../helpers/database.helpers.js';
+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
-        ? dateStringToInteger(contractTransactionForm.transactionDateString)
-        : dateToInteger(rightNow);
-    const transactionTime = contractTransactionForm.transactionTimeString
-        ? timeStringToInteger(contractTransactionForm.transactionTimeString)
-        : dateToTimeInteger(rightNow);
+    const transactionDate = (contractTransactionForm.transactionDateString ?? '') === ''
+        ? dateToInteger(rightNow)
+        : dateStringToInteger(contractTransactionForm.transactionDateString);
+    const transactionTime = (contractTransactionForm.transactionTimeString ?? '') === ''
+        ? 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;
 }
--- a/database/addContractTransaction.ts
+++ b/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
-  transactionDateString?: string
-  transactionTimeString?: string
-  transactionAmount: string | number
+  contractId: number | string
+
+  transactionDateString?: '' | DateString
+  transactionTimeString?: '' | TimeString
+
  externalReceiptNumber: string
+  transactionAmount: number | string
  transactionNote: string
 }

-export default async function addContractTransaction(
+export default function addContractTransaction(
  contractTransactionForm: AddTransactionForm,
  user: User
-): Promise<number> {
-  const database = await acquireConnection()
+): number {
+  const database = sqlite(sunriseDB)

  let transactionIndex = 0

@ -42,13 +47,19 @@ export default async function addContractTransaction(

  const rightNow = new Date()

-  const transactionDate = contractTransactionForm.transactionDateString
-    ? dateStringToInteger(contractTransactionForm.transactionDateString)
-    : dateToInteger(rightNow)
+  const transactionDate =
+    (contractTransactionForm.transactionDateString ?? '') === ''
+      ? dateToInteger(rightNow)
+      : dateStringToInteger(
+          contractTransactionForm.transactionDateString as DateString
+        )

-  const transactionTime = contractTransactionForm.transactionTimeString
-    ? timeStringToInteger(contractTransactionForm.transactionTimeString)
-    : dateToTimeInteger(rightNow)
+  const transactionTime =
+    (contractTransactionForm.transactionTimeString ?? '') === ''
+      ? 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
 }
--- a/database/addContractType.d.ts
+++ b/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;
--- a/database/addContractType.js
+++ b/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 async function addContractType(addForm, user) {
-    const database = await acquireConnection();
+export default function addContractType(addForm, user) {
+    const database = sqlite(sunriseDB);
    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;
 }
--- a/database/addContractType.ts
+++ b/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(
-  addForm: AddForm,
-  user: User
-): Promise<number> {
-  const database = await acquireConnection()
+export default function addContractType(addForm: AddForm, user: User): number {
+  const database = sqlite(sunriseDB)

  const rightNowMillis = Date.now()

@ -34,7 +32,7 @@ export default async function addContractType(
      rightNowMillis
    )

-  database.release()
+  database.close()

  clearCacheByTableName('ContractTypes')

--- a/database/addContractTypeField.d.ts
+++ b/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;
--- a/database/addContractTypeField.js
+++ b/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 async function addContractTypeField(addForm, user) {
-    const database = await acquireConnection();
+export default function addContractTypeField(addForm, user) {
+    const database = sqlite(sunriseDB);
    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);
-    database.release();
+        .run(addForm.contractTypeId ?? undefined, addForm.contractTypeField, addForm.fieldType ?? 'text', addForm.fieldValues ?? '', 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, rightNowMillis, user.userName, rightNowMillis);
+    database.close();
    clearCacheByTableName('ContractTypeFields');
    return result.lastInsertRowid;
 }
--- a/database/addContractTypeField.ts
+++ b/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> {
-  const database = await acquireConnection()
+): number {
+  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')

--- a/database/addContractTypePrint.d.ts
+++ b/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;
--- a/database/addContractTypePrint.js
+++ b/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 async function addContractTypePrint(addForm, user) {
-    const database = await acquireConnection();
+export default function addContractTypePrint(addForm, user) {
+    const database = sqlite(sunriseDB);
    const rightNowMillis = Date.now();
    let result = database
        .prepare(`update ContractTypePrints
        set recordUpdate_userName = ?,
-        recordUpdate_timeMillis = ?,
-        recordDelete_userName = null,
-        recordDelete_timeMillis = null
+          recordUpdate_timeMillis = ?,
+          recordDelete_userName = 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;
 }
--- a/database/addContractTypePrint.ts
+++ b/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> {
-  const database = await acquireConnection()
+): boolean {
+  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 = ?,
-        recordDelete_userName = null,
-        recordDelete_timeMillis = null
+          recordUpdate_timeMillis = ?,
+          recordDelete_userName = 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')

--- a/database/addFee.d.ts
+++ b/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;
-    burialSiteTypeId: string | number;
+    contractTypeId: number | string;
+    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;
--- a/database/addFee.js
+++ b/database/addFee.js
@ -1,6 +1,7 @@
-import { acquireConnection } from './pool.js';
-export default async function addFee(feeForm, user) {
-    const database = await acquireConnection();
+import sqlite from 'better-sqlite3';
+import { sunriseDB } from '../helpers/database.helpers.js';
+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;
 }
--- a/database/addFee.ts
+++ b/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
-  burialSiteTypeId: string | number
+  contractTypeId: number | string
+  burialSiteTypeId: number | string
  feeAmount?: string
  feeFunction?: string
  taxAmount?: string
@ -17,11 +19,8 @@ export interface AddFeeForm {
  orderNumber?: number
 }

-export default async function addFee(
-  feeForm: AddFeeForm,
-  user: User
-): Promise<number> {
-  const database = await acquireConnection()
+export default function addFee(feeForm: AddFeeForm, user: User): number {
+  const database = sqlite(sunriseDB)

  const rightNowMillis = Date.now()

@ -60,7 +59,7 @@ export default async function addFee(
      rightNowMillis
    )

-  database.release()
+  database.close()

  return result.lastInsertRowid as number
 }
--- a/database/addFeeCategory.d.ts
+++ b/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;
--- a/database/addFeeCategory.js
+++ b/database/addFeeCategory.js
@ -1,6 +1,7 @@
-import { acquireConnection } from './pool.js';
-export default async function addFeeCategory(feeCategoryForm, user) {
-    const database = await acquireConnection();
+import sqlite from 'better-sqlite3';
+import { sunriseDB } from '../helpers/database.helpers.js';
+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;
 }
--- a/database/addFeeCategory.ts
+++ b/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> {
-  const database = await acquireConnection()
+): number {
+  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
 }
--- a/database/addFuneralHome.d.ts
+++ b/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;
--- a/database/addFuneralHome.js
+++ b/database/addFuneralHome.js
@ -1,6 +1,7 @@
-import { acquireConnection } from './pool.js';
-export default async function addFuneralHome(addForm, user) {
-    const database = await acquireConnection();
+import sqlite from 'better-sqlite3';
+import { sunriseDB } from '../helpers/database.helpers.js';
+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;
 }
--- a/database/addFuneralHome.ts
+++ b/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(
-  addForm: AddForm,
-  user: User
-): Promise<number> {
-  const database = await acquireConnection()
+export default function addFuneralHome(addForm: AddForm, user: User): number {
+  const database = sqlite(sunriseDB)

  const rightNowMillis = Date.now()

@ -43,7 +44,7 @@ export default async function addFuneralHome(
      rightNowMillis
    )

-  database.release()
+  database.close()

  return result.lastInsertRowid as number
 }
--- a/database/addIntermentContainerType.d.ts
+++ b/database/addIntermentContainerType.d.ts
@ -1,7 +1,7 @@
-export interface AddForm {
+export interface AddIntermentContainerTypeForm {
    intermentContainerType: string;
    intermentContainerTypeKey?: string;
-    isCremationType?: string;
-    orderNumber?: number;
+    isCremationType?: '0' | '1';
+    orderNumber?: number | string;
 }
-export default function addIntermentContainerType(addForm: AddForm, user: User): Promise<number>;
+export default function addIntermentContainerType(addForm: AddIntermentContainerTypeForm, user: User): number;
--- a/database/addIntermentContainerType.js
+++ b/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 async function addIntermentContainerType(addForm, user) {
-    const database = await acquireConnection();
+export default function addIntermentContainerType(addForm, user) {
+    const database = sqlite(sunriseDB);
    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);
-    database.release();
+        .run(addForm.intermentContainerType, addForm.intermentContainerTypeKey ?? '', addForm.isCremationType ?? '0', addForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis);
+    database.close();
    clearCacheByTableName('IntermentContainerTypes');
    return result.lastInsertRowid;
 }
--- a/database/addIntermentContainerType.ts
+++ b/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 AddForm {
+export interface AddIntermentContainerTypeForm {
  intermentContainerType: string
  intermentContainerTypeKey?: string
-  isCremationType?: string
-  orderNumber?: number
+  isCremationType?: '0' | '1'
+  orderNumber?: number | string
 }

-export default async function addIntermentContainerType(
-  addForm: AddForm,
+export default function addIntermentContainerType(
+  addForm: AddIntermentContainerTypeForm,
  user: User
-): Promise<number> {
-  const database = await acquireConnection()
+): number {
+  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')

--- a/database/addOrUpdateBurialSiteField.d.ts
+++ b/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;
-    burialSiteTypeFieldId: string | number;
+    burialSiteId: number | string;
+    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;
--- a/database/addOrUpdateBurialSiteField.js
+++ b/database/addOrUpdateBurialSiteField.js
@ -1,16 +1,17 @@
-import { acquireConnection } from './pool.js';
-export default async function addOrUpdateBurialSiteField(fieldForm, user, connectedDatabase) {
-    const database = connectedDatabase ?? (await acquireConnection());
+import sqlite from 'better-sqlite3';
+import { sunriseDB } from '../helpers/database.helpers.js';
+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_timeMillis = ?,
-        recordDelete_userName = null,
-        recordDelete_timeMillis = null
+          recordUpdate_userName = ?,
+          recordUpdate_timeMillis = ?,
+          recordDelete_userName = 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;
 }
--- a/database/addOrUpdateBurialSiteField.ts
+++ b/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
-  burialSiteTypeFieldId: string | number
+  burialSiteId: number | string
+  burialSiteTypeFieldId: number | string
  fieldValue: string
 }

-export default async function addOrUpdateBurialSiteField(
+export default function addOrUpdateBurialSiteField(
  fieldForm: BurialSiteFieldForm,
  user: User,
-  connectedDatabase?: PoolConnection
-): Promise<boolean> {
-  const database = connectedDatabase ?? (await acquireConnection())
+  connectedDatabase?: sqlite.Database
+): boolean {
+  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_timeMillis = ?,
-        recordDelete_userName = null,
-        recordDelete_timeMillis = null
+          recordUpdate_userName = ?,
+          recordUpdate_timeMillis = ?,
+          recordDelete_userName = 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
--- a/database/addOrUpdateContractField.d.ts
+++ b/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;
-    contractTypeFieldId: string | number;
+    contractId: number | string;
+    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;
--- a/database/addOrUpdateContractField.js
+++ b/database/addOrUpdateContractField.js
@ -1,16 +1,17 @@
-import { acquireConnection } from './pool.js';
-export default async function addOrUpdateContractField(fieldForm, user, connectedDatabase) {
-    const database = connectedDatabase ?? (await acquireConnection());
+import sqlite from 'better-sqlite3';
+import { sunriseDB } from '../helpers/database.helpers.js';
+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_timeMillis = ?,
-        recordDelete_userName = null,
-        recordDelete_timeMillis = null
+          recordUpdate_userName = ?,
+          recordUpdate_timeMillis = ?,
+          recordDelete_userName = 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;
 }
--- a/database/addOrUpdateContractField.ts
+++ b/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
-  contractTypeFieldId: string | number
+  contractId: number | string
+  contractTypeFieldId: number | string
  fieldValue: string
 }

-export default async function addOrUpdateContractField(
+export default function addOrUpdateContractField(
  fieldForm: ContractFieldForm,
  user: User,
-  connectedDatabase?: PoolConnection
-): Promise<boolean> {
-  const database = connectedDatabase ?? (await acquireConnection())
+  connectedDatabase?: sqlite.Database
+): boolean {
+  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_timeMillis = ?,
-        recordDelete_userName = null,
-        recordDelete_timeMillis = null
+          recordUpdate_userName = ?,
+          recordUpdate_timeMillis = ?,
+          recordDelete_userName = 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
--- a/database/addRecord.d.ts
+++ b/database/addRecord.d.ts
@ -1,3 +1,3 @@
-type RecordTable = 'BurialSiteStatuses' | 'BurialSiteTypes' | 'WorkOrderMilestoneTypes' | 'WorkOrderTypes';
-export default function addRecord(recordTable: RecordTable, recordName: string, orderNumber: number | string, user: User): Promise<number>;
+type RecordTable = 'BurialSiteStatuses' | 'WorkOrderMilestoneTypes' | 'WorkOrderTypes';
+export default function addRecord(recordTable: RecordTable, recordName: string, orderNumber: number | string, user: User): number;
 export {};
--- a/database/addRecord.js
+++ b/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) {
-    const database = await acquireConnection();
+export default function addRecord(recordTable, recordName, orderNumber, user) {
+    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;
 }
--- a/database/addRecord.ts
+++ b/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> {
-  const database = await acquireConnection()
+): number {
+  const database = sqlite(sunriseDB)

  const rightNowMillis = Date.now()

@ -43,7 +42,7 @@ export default async function addRecord(
      rightNowMillis
    )

-  database.release()
+  database.close()

  clearCacheByTableName(recordTable)

--- a/database/addWorkOrder.d.ts
+++ b/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;
--- a/database/addWorkOrder.js
+++ b/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 async function addWorkOrder(workOrderForm, user) {
-    const database = await acquireConnection();
+export default function addWorkOrder(workOrderForm, user) {
+    const database = sqlite(sunriseDB);
    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;
 }
--- a/database/addWorkOrder.ts
+++ b/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> {
-  const database = await acquireConnection()
+): number {
+  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
 }
--- a/database/addWorkOrderBurialSite.d.ts
+++ b/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;
--- a/database/addWorkOrderBurialSite.js
+++ b/database/addWorkOrderBurialSite.js
@ -1,6 +1,7 @@
-import { acquireConnection } from './pool.js';
-export default async function addWorkOrderBurialSite(workOrderLotForm, user) {
-    const database = await acquireConnection();
+import sqlite from 'better-sqlite3';
+import { sunriseDB } from '../helpers/database.helpers.js';
+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;
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dan Gowans	118fc1959b	fix undefined transaction time	2025-05-02 08:52:35 -04:00
Dan Gowans	9830bede34	linting	2025-05-01 14:53:07 -04:00
Dan Gowans	302a9a4c48	include "cms" in title	2025-05-01 12:45:59 -04:00
Dan Gowans	fe9188d1fb	version bump	2025-05-01 12:36:08 -04:00
Dan Gowans	4664366e12	linting	2025-05-01 12:32:36 -04:00
Dan Gowans	afcdca959b	use built in database backup function	2025-05-01 12:19:48 -04:00
Dan Gowans	434e15ba1d	highlight today's funerals	2025-05-01 11:34:47 -04:00
Dan Gowans	39dc10369f	show funeral home upcoming contracts	2025-05-01 11:20:33 -04:00
Dan Gowans	7371be711a	restore deleted burial sites	2025-05-01 10:38:13 -04:00
Dan Gowans	9048235ef2	more deleted item loading	2025-05-01 09:26:40 -04:00
Dan Gowans	59b0fb7e5f	ensure deleted items are loaded for import	2025-05-01 09:16:02 -04:00
Dan Gowans	57b6dbf35e	use common "cremation" cemetery list	2025-05-01 08:55:34 -04:00
Dan Gowans	c460d073e7	linting	2025-04-30 15:14:56 -04:00
Dan Gowans	a7ce5a99cb	add default city to interment modals	2025-04-30 15:11:12 -04:00
Dan Gowans	db05999c72	track burial site capacities alter table BurialSiteTypes add bodyCapacityMax smallint alter table BurialSiteTypes add crematedCapacityMax smallint alter table BurialSites add bodyCapacity smallint alter table BurialSites add crematedCapacity smallint	2025-04-30 14:40:47 -04:00
Dan Gowans	9c47b48abc	linting	2025-04-30 10:42:16 -04:00
Dan Gowans	2ed7902320	rename "switch to edit mode" buttons	2025-04-30 10:19:16 -04:00
Dan Gowans	7887230c86	linting	2025-04-30 10:00:59 -04:00
Dan Gowans	18edc57f70	update linter	2025-04-30 10:00:27 -04:00
Dan Gowans	656f1b052e	linting	2025-04-30 08:45:39 -04:00
Dan Gowans	3c1d023ccd	linting	2025-04-29 15:22:01 -04:00
Dan Gowans	2c506711fb	add id to pdf file name	2025-04-29 14:57:07 -04:00
Dan Gowans	0dcdfaaa8a	fix small screen alignment	2025-04-29 13:44:33 -04:00
Dan Gowans	ba0c9f3287	version bump	2025-04-29 13:23:22 -04:00
Dan Gowans	ab61a3e340	fix initializing database	2025-04-29 13:17:31 -04:00
Dan Gowans	111663a274	interment container type maint closes #8	2025-04-29 13:14:43 -04:00
Dan Gowans	1c7bc96392	committal type table maint #8	2025-04-29 11:54:17 -04:00
Dan Gowans	b26e8b17b2	restructure config table management preparing for #8 - switch tabs for collapsed panels - split the javascript into a file per table	2025-04-29 11:01:50 -04:00
Dan Gowans	c9b10f3696	fix toggle panel-block	2025-04-29 10:03:30 -04:00
Dan Gowans	34c00b856b	fix viewing work orders	2025-04-29 09:25:57 -04:00
Dan Gowans	0474631bf5	fix create cemeteries	2025-04-29 09:25:46 -04:00
Dan Gowans	927334d954	allow testUpdate user to update work orders	2025-04-28 15:46:54 -04:00
Dan Gowans	50551582c1	identify 'HO' funeral home	2025-04-28 15:40:39 -04:00
Dan Gowans	19a7c81766	linting	2025-04-28 15:30:48 -04:00
Dan Gowans	f96d975aa0	avoid order number updates when deleted records are loaded	2025-04-28 15:10:19 -04:00
Dan Gowans	3c4c85df19	import cleanup	2025-04-28 14:50:34 -04:00
Dan Gowans	0d2f6f78ce	missed include deleted	2025-04-28 14:16:08 -04:00
Dan Gowans	007b47a1f0	linting	2025-04-28 14:08:46 -04:00
Dan Gowans	62efb70542	include deleted list items for import purposes	2025-04-28 14:05:45 -04:00
Dan Gowans	f440a35df7	linting	2025-04-28 14:05:18 -04:00
Dan Gowans	78cae2f964	disable map scroll wheel zoom	2025-04-28 13:11:39 -04:00
Dan Gowans	afa0286a2a	show funeral details on work order view	2025-04-28 13:08:31 -04:00
Dan Gowans	556a6a71b6	add "direction of arrival" database update: create table if not exists CemeteryDirectionsOfArrival ( cemeteryId integer not null, directionOfArrival varchar(2) not null, directionOfArrivalDescription varchar(100) not null, primary key (cemeteryId, directionOfArrival), foreign key (cemeteryId) references Cemeteries (cemeteryId)) without rowid alter table Contracts add directionOfArrival varchar(2)	2025-04-28 11:59:09 -04:00
Dan Gowans	96a41862bf	heading icons on contract view	2025-04-25 15:36:45 -04:00
Dan Gowans	f35946d0a5	readd missing is-nowrap class	2025-04-25 15:28:19 -04:00
Dan Gowans	d4670603b7	clean up awaits	2025-04-25 15:23:38 -04:00
Dan Gowans	09b3de1086	required indicators	2025-04-25 14:27:35 -04:00
Dan Gowans	c7640f6dfd	death age calculator closes #9	2025-04-25 14:18:24 -04:00
Dan Gowans	14bd8e0ea4	internal data lists move deathAgePeriods and purchaserRelationships out of config	2025-04-25 13:41:31 -04:00
Dan Gowans	b356d771ab	rename config files	2025-04-25 13:27:24 -04:00
Dan Gowans	b359aaf564	type issue	2025-04-25 13:26:39 -04:00
Dan Gowans	c330dff849	adjustable results limit	2025-04-25 13:03:05 -04:00
Dan Gowans	a4522ec4d0	updated selling points	2025-04-25 12:38:28 -04:00
Dan Gowans	3babad95c4	version bump	2025-04-25 11:53:42 -04:00
Dan Gowans	5767b14f76	try removing legacy puppeteer in testing	2025-04-25 11:50:46 -04:00
Dan Gowans	eada41aaaa	linting	2025-04-25 11:42:02 -04:00
Dan Gowans	e09d1ddb5d	debug logging alignment	2025-04-25 11:19:19 -04:00
Dan Gowans	f6eb3bf550	create burial site from contract closes #7	2025-04-25 10:52:55 -04:00
Dan Gowans	dc9a9b2bcc	show "no cemetery" when none selected	2025-04-25 10:12:50 -04:00
Dan Gowans	e7f79cbc4f	fix burial site images	2025-04-25 10:03:38 -04:00
Dan Gowans	9bfed5aa4d	date field restrictions	2025-04-24 14:48:13 -04:00
Dan Gowans	9a153bb238	linting	2025-04-24 14:15:25 -04:00
Dan Gowans	41761dcc8c	remove node 18 testing	2025-04-24 13:49:32 -04:00
Dan Gowans	36e2b0f9cc	linting	2025-04-24 13:48:19 -04:00
Dan Gowans	d4087caa74	switch work order create button permission	2025-04-24 13:07:52 -04:00
Dan Gowans	9c9b94199b	highlight overpayment	2025-04-24 13:00:43 -04:00
Dan Gowans	96eb7f36dc	gp connection error catch	2025-04-24 12:55:40 -04:00
Dan Gowans	4f6fc87e05	remove better-sqlite-pool	2025-04-24 11:59:27 -04:00
Dan Gowans	38c1288856	separate `canUpdateWorkOrders` permission	2025-04-24 09:36:44 -04:00
Dan Gowans	a167ef4a16	rename types files	2025-04-24 09:24:25 -04:00
Dan Gowans	3da2aad21b	fix add grouped fee	2025-04-24 09:15:20 -04:00
Dan Gowans	dcbaad753b	linting	2025-04-23 14:13:45 -04:00
Dan Gowans	d46a94db07	link funeral home name	2025-04-23 14:13:36 -04:00
Dan Gowans	bb3100c0b0	version bump	2025-04-23 13:03:14 -04:00
Dan Gowans	3f28571dc2	fix contract status filter	2025-04-23 12:55:55 -04:00
Dan Gowans	8f201e05b3	linting	2025-04-23 12:06:29 -04:00
Dan Gowans	d5915db9bd	contract finalized indicator	2025-04-23 11:58:28 -04:00
Dan Gowans	8e22ee1026	contract paging	2025-04-23 10:31:04 -04:00
Dan Gowans	9e6da86d80	linting import	2025-04-23 10:30:44 -04:00
Dan Gowans	31837d4370	dev dependencies	2025-04-23 10:30:27 -04:00
Dan Gowans	880a6fd23a	add import latitude and longitude	2025-04-22 15:38:55 -04:00
Dan Gowans	125f1e0949	version bump	2025-04-22 15:22:51 -04:00
Dan Gowans	d4280a3796	import updates	2025-04-22 15:21:21 -04:00
Dan Gowans	b3e5d8e5ad	fix missing labels	2025-04-22 15:21:10 -04:00
Dan Gowans	df3f7725d3	linting and development	2025-04-22 13:51:02 -04:00
Dan Gowans	b8c9fd723d	darken domain label trying to fix cypress accessibility issue	2025-04-22 11:39:27 -04:00
Dan Gowans	3b98ac6f15	menu titles	2025-04-22 10:57:28 -04:00
Dan Gowans	6d964eb93a	link together sections	2025-04-22 10:44:14 -04:00
Dan Gowans	688e55857d	cypress update	2025-04-22 10:43:48 -04:00
Dan Gowans	59ab59bb1f	enforce light theme	2025-04-17 14:20:12 -04:00
Dan Gowans	f7ae72d40a	linting and polish	2025-04-16 15:43:35 -04:00
Dan Gowans	43d70d8967	restrict parent cemeteries when the cemetery has child cemeteries	2025-04-16 15:33:15 -04:00
Dan Gowans	cd47832247	show child cemeteries	2025-04-16 15:14:33 -04:00
Dan Gowans	966a2fc869	polish	2025-04-16 14:20:26 -04:00
Dan Gowans	0b767d6b88	documentation	2025-04-16 14:06:56 -04:00
Dan Gowans	5e2b90f2a2	version bump	2025-04-16 13:01:28 -04:00
Dan Gowans	fb5c960bc7	linting	2025-04-16 12:51:12 -04:00
Dan Gowans	4a17f0ecfa	fix broken cemetery create	2025-04-16 12:50:51 -04:00
Dan Gowans	86cc71d235	ssm cemetery details	2025-04-16 11:21:02 -04:00
Dan Gowans	a4e4a11a59	polish	2025-04-16 11:20:44 -04:00
Dan Gowans	20702c598a	increase max process cutoff	2025-04-15 14:48:42 -04:00
Dan Gowans	6cb36c4548	linting	2025-04-15 14:48:26 -04:00
Dan Gowans	2176158847	fix url	2025-04-15 13:57:07 -04:00
Dan Gowans	ebc74816c2	polish	2025-04-15 13:56:50 -04:00
Dan Gowans	9f661f478f	fix urls	2025-04-15 13:56:39 -04:00
Dan Gowans	f652f27c5e	documentation	2025-04-15 13:36:18 -04:00
Dan Gowans	3312f70967	framing up documentation	2025-04-15 13:20:26 -04:00
Dan Gowans	ab6ee7a9e2	linting	2025-04-15 13:20:06 -04:00
Dan Gowans	cc79209eb9	update contract icon	2025-04-15 11:52:03 -04:00
Dan Gowans	9a69c2e6dd	version bump	2025-04-15 11:15:36 -04:00
Dan Gowans	1e59a368a4	test not watching changes	2025-04-15 11:13:02 -04:00
Dan Gowans	d41117a44a	development - combine functions.database and database.helpers - monitor image folders for changes - warning message for config table update - properly track replacement workers - show cemetery maps on burial sites - show parent cemetery maps on child cemetery sites - linting and polish	2025-04-15 11:05:41 -04:00
Dan Gowans	190d17cabd	consistent admin heading sizes	2025-04-14 09:44:47 -04:00
Dan Gowans	9501f30b23	add missing config table reports	2025-04-14 09:14:48 -04:00
Dan Gowans	8efea8d739	add menard funeral home	2025-04-11 14:50:10 -04:00
Dan Gowans	9bc85e6a8b	parent cemeteries, linting	2025-04-11 14:50:00 -04:00
Dan Gowans	ed87174c19	dev dependencies	2025-04-09 13:13:38 -04:00
Dan Gowans	04a4e6473b	speed improvement 3.5min to 0.1sec	2025-04-09 13:13:26 -04:00
Dan Gowans	a5a1c9f793	linting	2025-04-03 15:30:06 -04:00
Dan Gowans	7f32d0a14a	linting	2025-04-03 15:08:35 -04:00
Dan Gowans	70c796bb41	use default public-internal for testing	2025-04-03 14:21:47 -04:00