diff --git a/database/addFee.d.ts b/database/addFee.d.ts
index 7ed72e42..8d48739a 100644
--- a/database/addFee.d.ts
+++ b/database/addFee.d.ts
@@ -1,4 +1,4 @@
-interface AddFeeForm {
+export interface AddFeeForm {
     feeCategoryId: string;
     feeName: string;
     feeDescription: string;
@@ -14,5 +14,4 @@ interface AddFeeForm {
     isRequired: '' | '1';
     orderNumber?: number;
 }
-export declare function addFee(feeForm: AddFeeForm, user: User): Promise<number>;
-export default addFee;
+export default function addFee(feeForm: AddFeeForm, user: User): Promise<number>;
diff --git a/database/addFee.js b/database/addFee.js
index dac99be9..c20ba0b8 100644
--- a/database/addFee.js
+++ b/database/addFee.js
@@ -1,5 +1,5 @@
 import { acquireConnection } from './pool.js';
-export async function addFee(feeForm, user) {
+export default async function addFee(feeForm, user) {
     const database = await acquireConnection();
     const rightNowMillis = Date.now();
     const result = database
@@ -18,4 +18,3 @@ export async function addFee(feeForm, user) {
     database.release();
     return result.lastInsertRowid;
 }
-export default addFee;
diff --git a/database/addFee.ts b/database/addFee.ts
index 03140058..5c26065b 100644
--- a/database/addFee.ts
+++ b/database/addFee.ts
@@ -1,6 +1,6 @@
 import { acquireConnection } from './pool.js'
 
-interface AddFeeForm {
+export interface AddFeeForm {
   feeCategoryId: string
   feeName: string
   feeDescription: string
@@ -17,7 +17,10 @@ interface AddFeeForm {
   orderNumber?: number
 }
 
-export async function addFee(feeForm: AddFeeForm, user: User): Promise<number> {
+export default async function addFee(
+  feeForm: AddFeeForm,
+  user: User
+): Promise<number> {
   const database = await acquireConnection()
 
   const rightNowMillis = Date.now()
@@ -61,5 +64,3 @@ export async function addFee(feeForm: AddFeeForm, user: User): Promise<number> {
 
   return result.lastInsertRowid as number
 }
-
-export default addFee
diff --git a/database/addLot.d.ts b/database/addLot.d.ts
index a1a228f9..3594fb49 100644
--- a/database/addLot.d.ts
+++ b/database/addLot.d.ts
@@ -1,4 +1,4 @@
-interface AddLotForm {
+export interface AddLotForm {
     lotName: string;
     lotTypeId: string | number;
     lotStatusId: string | number;
@@ -9,5 +9,4 @@ interface AddLotForm {
     lotTypeFieldIds?: string;
     [lotFieldValue_lotTypeFieldId: string]: unknown;
 }
-export declare function addLot(lotForm: AddLotForm, user: User): Promise<number>;
-export default addLot;
+export default function addLot(lotForm: AddLotForm, user: User): Promise<number>;
diff --git a/database/addLot.js b/database/addLot.js
index 345edced..365a9d47 100644
--- a/database/addLot.js
+++ b/database/addLot.js
@@ -1,6 +1,6 @@
-import { addOrUpdateLotField } from './addOrUpdateLotField.js';
+import addOrUpdateLotField from './addOrUpdateLotField.js';
 import { acquireConnection } from './pool.js';
-export async function addLot(lotForm, user) {
+export default async function addLot(lotForm, user) {
     const database = await acquireConnection();
     const rightNowMillis = Date.now();
     const result = database
@@ -15,7 +15,7 @@ export async function addLot(lotForm, user) {
     const lotId = result.lastInsertRowid;
     const lotTypeFieldIds = (lotForm.lotTypeFieldIds ?? '').split(',');
     for (const lotTypeFieldId of lotTypeFieldIds) {
-        const lotFieldValue = lotForm['lotFieldValue_' + lotTypeFieldId];
+        const lotFieldValue = lotForm[`lotFieldValue_${lotTypeFieldId}`];
         if ((lotFieldValue ?? '') !== '') {
             await addOrUpdateLotField({
                 lotId,
@@ -27,4 +27,3 @@ export async function addLot(lotForm, user) {
     database.release();
     return lotId;
 }
-export default addLot;
diff --git a/database/addLot.ts b/database/addLot.ts
index a54209c0..b99b8858 100644
--- a/database/addLot.ts
+++ b/database/addLot.ts
@@ -1,7 +1,7 @@
-import { addOrUpdateLotField } from './addOrUpdateLotField.js'
+import addOrUpdateLotField from './addOrUpdateLotField.js'
 import { acquireConnection } from './pool.js'
 
-interface AddLotForm {
+export interface AddLotForm {
   lotName: string
   lotTypeId: string | number
   lotStatusId: string | number
@@ -16,7 +16,10 @@ interface AddLotForm {
   [lotFieldValue_lotTypeFieldId: string]: unknown
 }
 
-export async function addLot(lotForm: AddLotForm, user: User): Promise<number> {
+export default async function addLot(
+  lotForm: AddLotForm,
+  user: User
+): Promise<number> {
   const database = await acquireConnection()
 
   const rightNowMillis = Date.now()
@@ -50,7 +53,7 @@ export async function addLot(lotForm: AddLotForm, user: User): Promise<number> {
   const lotTypeFieldIds = (lotForm.lotTypeFieldIds ?? '').split(',')
 
   for (const lotTypeFieldId of lotTypeFieldIds) {
-    const lotFieldValue = lotForm['lotFieldValue_' + lotTypeFieldId] as string
+    const lotFieldValue = lotForm[`lotFieldValue_${lotTypeFieldId}`] as string
 
     if ((lotFieldValue ?? '') !== '') {
       await addOrUpdateLotField(
@@ -69,5 +72,3 @@ export async function addLot(lotForm: AddLotForm, user: User): Promise<number> {
 
   return lotId
 }
-
-export default addLot
diff --git a/database/addLotComment.d.ts b/database/addLotComment.d.ts
index e8ec2319..933a7bfe 100644
--- a/database/addLotComment.d.ts
+++ b/database/addLotComment.d.ts
@@ -1,6 +1,5 @@
-interface AddLotCommentForm {
+export interface AddLotCommentForm {
     lotId: string;
     lotComment: string;
 }
-export declare function addLotComment(lotCommentForm: AddLotCommentForm, user: User): Promise<number>;
-export default addLotComment;
+export default function addLotComment(lotCommentForm: AddLotCommentForm, user: User): Promise<number>;
diff --git a/database/addLotComment.js b/database/addLotComment.js
index caa5bb09..be6f086a 100644
--- a/database/addLotComment.js
+++ b/database/addLotComment.js
@@ -1,6 +1,6 @@
 import * as dateTimeFunctions from '@cityssm/utils-datetime';
 import { acquireConnection } from './pool.js';
-export async function addLotComment(lotCommentForm, user) {
+export default async function addLotComment(lotCommentForm, user) {
     const database = await acquireConnection();
     const rightNow = new Date();
     const result = database
@@ -14,4 +14,3 @@ export async function addLotComment(lotCommentForm, user) {
     database.release();
     return result.lastInsertRowid;
 }
-export default addLotComment;
diff --git a/database/addLotComment.ts b/database/addLotComment.ts
index 0623020a..d6f74e5f 100644
--- a/database/addLotComment.ts
+++ b/database/addLotComment.ts
@@ -2,12 +2,12 @@ import * as dateTimeFunctions from '@cityssm/utils-datetime'
 
 import { acquireConnection } from './pool.js'
 
-interface AddLotCommentForm {
+export interface AddLotCommentForm {
   lotId: string
   lotComment: string
 }
 
-export async function addLotComment(
+export default async function addLotComment(
   lotCommentForm: AddLotCommentForm,
   user: User
 ): Promise<number> {
@@ -39,5 +39,3 @@ export async function addLotComment(
 
   return result.lastInsertRowid as number
 }
-
-export default addLotComment
diff --git a/database/addLotOccupancy.d.ts b/database/addLotOccupancy.d.ts
index 0669ee80..55a6160f 100644
--- a/database/addLotOccupancy.d.ts
+++ b/database/addLotOccupancy.d.ts
@@ -1,5 +1,5 @@
 import type { PoolConnection } from 'better-sqlite-pool';
-interface AddLotOccupancyForm {
+export interface AddLotOccupancyForm {
     occupancyTypeId: string | number;
     lotId: string | number;
     occupancyStartDateString: string;
@@ -18,5 +18,4 @@ interface AddLotOccupancyForm {
     occupantEmailAddress?: string;
     occupantComment?: string;
 }
-export declare function addLotOccupancy(lotOccupancyForm: AddLotOccupancyForm, user: User, connectedDatabase?: PoolConnection): Promise<number>;
-export default addLotOccupancy;
+export default function addLotOccupancy(lotOccupancyForm: AddLotOccupancyForm, user: User, connectedDatabase?: PoolConnection): Promise<number>;
diff --git a/database/addLotOccupancy.js b/database/addLotOccupancy.js
index 8936531a..e496f152 100644
--- a/database/addLotOccupancy.js
+++ b/database/addLotOccupancy.js
@@ -1,8 +1,8 @@
 import * as dateTimeFunctions from '@cityssm/utils-datetime';
-import { addLotOccupancyOccupant } from './addLotOccupancyOccupant.js';
-import { addOrUpdateLotOccupancyField } from './addOrUpdateLotOccupancyField.js';
+import addLotOccupancyOccupant from './addLotOccupancyOccupant.js';
+import addOrUpdateLotOccupancyField from './addOrUpdateLotOccupancyField.js';
 import { acquireConnection } from './pool.js';
-export async function addLotOccupancy(lotOccupancyForm, user, connectedDatabase) {
+export default async function addLotOccupancy(lotOccupancyForm, user, connectedDatabase) {
     const database = connectedDatabase ?? (await acquireConnection());
     const rightNowMillis = Date.now();
     const occupancyStartDate = dateTimeFunctions.dateStringToInteger(lotOccupancyForm.occupancyStartDateString);
@@ -22,7 +22,7 @@ export async function addLotOccupancy(lotOccupancyForm, user, connectedDatabase)
     const lotOccupancyId = result.lastInsertRowid;
     const occupancyTypeFieldIds = (lotOccupancyForm.occupancyTypeFieldIds ?? '').split(',');
     for (const occupancyTypeFieldId of occupancyTypeFieldIds) {
-        const lotOccupancyFieldValue = lotOccupancyForm['lotOccupancyFieldValue_' + occupancyTypeFieldId];
+        const lotOccupancyFieldValue = lotOccupancyForm[`lotOccupancyFieldValue_${occupancyTypeFieldId}`];
         if ((lotOccupancyFieldValue ?? '') !== '') {
             await addOrUpdateLotOccupancyField({
                 lotOccupancyId,
@@ -52,4 +52,3 @@ export async function addLotOccupancy(lotOccupancyForm, user, connectedDatabase)
     }
     return lotOccupancyId;
 }
-export default addLotOccupancy;
diff --git a/database/addLotOccupancy.ts b/database/addLotOccupancy.ts
index ce0ffe69..76e88594 100644
--- a/database/addLotOccupancy.ts
+++ b/database/addLotOccupancy.ts
@@ -1,14 +1,11 @@
-// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair
-/* eslint-disable @typescript-eslint/indent */
-
 import * as dateTimeFunctions from '@cityssm/utils-datetime'
 import type { PoolConnection } from 'better-sqlite-pool'
 
-import { addLotOccupancyOccupant } from './addLotOccupancyOccupant.js'
-import { addOrUpdateLotOccupancyField } from './addOrUpdateLotOccupancyField.js'
+import addLotOccupancyOccupant from './addLotOccupancyOccupant.js'
+import addOrUpdateLotOccupancyField from './addOrUpdateLotOccupancyField.js'
 import { acquireConnection } from './pool.js'
 
-interface AddLotOccupancyForm {
+export interface AddLotOccupancyForm {
   occupancyTypeId: string | number
   lotId: string | number
 
@@ -31,7 +28,7 @@ interface AddLotOccupancyForm {
   occupantComment?: string
 }
 
-export async function addLotOccupancy(
+export default async function addLotOccupancy(
   lotOccupancyForm: AddLotOccupancyForm,
   user: User,
   connectedDatabase?: PoolConnection
@@ -80,7 +77,7 @@ export async function addLotOccupancy(
 
   for (const occupancyTypeFieldId of occupancyTypeFieldIds) {
     const lotOccupancyFieldValue = lotOccupancyForm[
-      'lotOccupancyFieldValue_' + occupancyTypeFieldId
+      `lotOccupancyFieldValue_${occupancyTypeFieldId}`
     ] as string
 
     if ((lotOccupancyFieldValue ?? '') !== '') {
@@ -123,5 +120,3 @@ export async function addLotOccupancy(
 
   return lotOccupancyId
 }
-
-export default addLotOccupancy
diff --git a/database/addLotOccupancyComment.d.ts b/database/addLotOccupancyComment.d.ts
index c9bd05a8..07bbd7b2 100644
--- a/database/addLotOccupancyComment.d.ts
+++ b/database/addLotOccupancyComment.d.ts
@@ -1,8 +1,7 @@
-interface AddLotOccupancyCommentForm {
+export interface AddLotOccupancyCommentForm {
     lotOccupancyId: string | number;
     lotOccupancyCommentDateString?: string;
     lotOccupancyCommentTimeString?: string;
     lotOccupancyComment: string;
 }
-export declare function addLotOccupancyComment(commentForm: AddLotOccupancyCommentForm, user: User): Promise<number>;
-export default addLotOccupancyComment;
+export default function addLotOccupancyComment(commentForm: AddLotOccupancyCommentForm, user: User): Promise<number>;
diff --git a/database/addLotOccupancyComment.js b/database/addLotOccupancyComment.js
index 67039e94..7e46d9ce 100644
--- a/database/addLotOccupancyComment.js
+++ b/database/addLotOccupancyComment.js
@@ -1,6 +1,6 @@
 import { dateStringToInteger, dateToInteger, dateToTimeInteger, timeStringToInteger } from '@cityssm/utils-datetime';
 import { acquireConnection } from './pool.js';
-export async function addLotOccupancyComment(commentForm, user) {
+export default async function addLotOccupancyComment(commentForm, user) {
     const rightNow = new Date();
     let lotOccupancyCommentDate;
     let lotOccupancyCommentTime;
@@ -25,4 +25,3 @@ export async function addLotOccupancyComment(commentForm, user) {
     database.release();
     return result.lastInsertRowid;
 }
-export default addLotOccupancyComment;
diff --git a/database/addLotOccupancyComment.ts b/database/addLotOccupancyComment.ts
index 05b9d8a7..d5d43ad5 100644
--- a/database/addLotOccupancyComment.ts
+++ b/database/addLotOccupancyComment.ts
@@ -7,14 +7,14 @@ import {
 
 import { acquireConnection } from './pool.js'
 
-interface AddLotOccupancyCommentForm {
+export interface AddLotOccupancyCommentForm {
   lotOccupancyId: string | number
   lotOccupancyCommentDateString?: string
   lotOccupancyCommentTimeString?: string
   lotOccupancyComment: string
 }
 
-export async function addLotOccupancyComment(
+export default async function addLotOccupancyComment(
   commentForm: AddLotOccupancyCommentForm,
   user: User
 ): Promise<number> {
@@ -62,5 +62,3 @@ export async function addLotOccupancyComment(
 
   return result.lastInsertRowid as number
 }
-
-export default addLotOccupancyComment
diff --git a/database/addLotOccupancyFee.d.ts b/database/addLotOccupancyFee.d.ts
index a64c9e0d..fb4c5a44 100644
--- a/database/addLotOccupancyFee.d.ts
+++ b/database/addLotOccupancyFee.d.ts
@@ -1,9 +1,8 @@
-interface AddLotOccupancyFeeForm {
+export interface AddLotOccupancyFeeForm {
     lotOccupancyId: number | string;
     feeId: number | string;
     quantity: number | string;
     feeAmount?: number | string;
     taxAmount?: number | string;
 }
-export declare function addLotOccupancyFee(lotOccupancyFeeForm: AddLotOccupancyFeeForm, user: User): Promise<boolean>;
-export default addLotOccupancyFee;
+export default function addLotOccupancyFee(lotOccupancyFeeForm: AddLotOccupancyFeeForm, user: User): Promise<boolean>;
diff --git a/database/addLotOccupancyFee.js b/database/addLotOccupancyFee.js
index 940ae635..dd9dd80e 100644
--- a/database/addLotOccupancyFee.js
+++ b/database/addLotOccupancyFee.js
@@ -2,7 +2,7 @@ import { calculateFeeAmount, calculateTaxAmount } from '../helpers/functions.fee
 import { getFee } from './getFee.js';
 import { getLotOccupancy } from './getLotOccupancy.js';
 import { acquireConnection } from './pool.js';
-export async function addLotOccupancyFee(lotOccupancyFeeForm, user) {
+export default async function addLotOccupancyFee(lotOccupancyFeeForm, user) {
     const database = await acquireConnection();
     const rightNowMillis = Date.now();
     let feeAmount;
@@ -80,4 +80,3 @@ export async function addLotOccupancyFee(lotOccupancyFeeForm, user) {
     database.release();
     return result.changes > 0;
 }
-export default addLotOccupancyFee;
diff --git a/database/addLotOccupancyFee.ts b/database/addLotOccupancyFee.ts
index e0f04b52..ccb3e9c6 100644
--- a/database/addLotOccupancyFee.ts
+++ b/database/addLotOccupancyFee.ts
@@ -8,7 +8,7 @@ import { getFee } from './getFee.js'
 import { getLotOccupancy } from './getLotOccupancy.js'
 import { acquireConnection } from './pool.js'
 
-interface AddLotOccupancyFeeForm {
+export interface AddLotOccupancyFeeForm {
   lotOccupancyId: number | string
   feeId: number | string
   quantity: number | string
@@ -16,7 +16,7 @@ interface AddLotOccupancyFeeForm {
   taxAmount?: number | string
 }
 
-export async function addLotOccupancyFee(
+export default async function addLotOccupancyFee(
   lotOccupancyFeeForm: AddLotOccupancyFeeForm,
   user: User
 ): Promise<boolean> {
@@ -154,5 +154,3 @@ export async function addLotOccupancyFee(
 
   return result.changes > 0
 }
-
-export default addLotOccupancyFee
diff --git a/database/addLotOccupancyOccupant.d.ts b/database/addLotOccupancyOccupant.d.ts
index 3bcce10e..199b2ae8 100644
--- a/database/addLotOccupancyOccupant.d.ts
+++ b/database/addLotOccupancyOccupant.d.ts
@@ -1,5 +1,5 @@
 import type { PoolConnection } from 'better-sqlite-pool';
-interface AddLotOccupancyOccupantForm {
+export interface AddLotOccupancyOccupantForm {
     lotOccupancyId: string | number;
     lotOccupantTypeId: string | number;
     occupantName: string;
@@ -13,5 +13,4 @@ interface AddLotOccupancyOccupantForm {
     occupantEmailAddress: string;
     occupantComment?: string;
 }
-export declare function addLotOccupancyOccupant(lotOccupancyOccupantForm: AddLotOccupancyOccupantForm, user: User, connectedDatabase?: PoolConnection): Promise<number>;
-export default addLotOccupancyOccupant;
+export default function addLotOccupancyOccupant(lotOccupancyOccupantForm: AddLotOccupancyOccupantForm, user: User, connectedDatabase?: PoolConnection): Promise<number>;
diff --git a/database/addLotOccupancyOccupant.js b/database/addLotOccupancyOccupant.js
index abcdd458..e60cfe6b 100644
--- a/database/addLotOccupancyOccupant.js
+++ b/database/addLotOccupancyOccupant.js
@@ -1,5 +1,5 @@
 import { acquireConnection } from './pool.js';
-export async function addLotOccupancyOccupant(lotOccupancyOccupantForm, user, connectedDatabase) {
+export default async function addLotOccupancyOccupant(lotOccupancyOccupantForm, user, connectedDatabase) {
     const database = connectedDatabase ?? (await acquireConnection());
     let lotOccupantIndex = 0;
     const maxIndexResult = database
@@ -31,4 +31,3 @@ export async function addLotOccupancyOccupant(lotOccupancyOccupantForm, user, co
     }
     return lotOccupantIndex;
 }
-export default addLotOccupancyOccupant;
diff --git a/database/addLotOccupancyOccupant.ts b/database/addLotOccupancyOccupant.ts
index 4b9ac29c..53fc749b 100644
--- a/database/addLotOccupancyOccupant.ts
+++ b/database/addLotOccupancyOccupant.ts
@@ -2,7 +2,7 @@ import type { PoolConnection } from 'better-sqlite-pool'
 
 import { acquireConnection } from './pool.js'
 
-interface AddLotOccupancyOccupantForm {
+export interface AddLotOccupancyOccupantForm {
   lotOccupancyId: string | number
   lotOccupantTypeId: string | number
   occupantName: string
@@ -17,7 +17,7 @@ interface AddLotOccupancyOccupantForm {
   occupantComment?: string
 }
 
-export async function addLotOccupancyOccupant(
+export default async function addLotOccupancyOccupant(
   lotOccupancyOccupantForm: AddLotOccupancyOccupantForm,
   user: User,
   connectedDatabase?: PoolConnection
@@ -84,5 +84,3 @@ export async function addLotOccupancyOccupant(
 
   return lotOccupantIndex
 }
-
-export default addLotOccupancyOccupant
diff --git a/database/addLotOccupancyTransaction.d.ts b/database/addLotOccupancyTransaction.d.ts
index 80228eda..f990abb5 100644
--- a/database/addLotOccupancyTransaction.d.ts
+++ b/database/addLotOccupancyTransaction.d.ts
@@ -1,4 +1,4 @@
-interface AddLotOccupancyTransactionForm {
+export interface AddLotOccupancyTransactionForm {
     lotOccupancyId: string | number;
     transactionDateString?: string;
     transactionTimeString?: string;
@@ -6,5 +6,4 @@ interface AddLotOccupancyTransactionForm {
     externalReceiptNumber: string;
     transactionNote: string;
 }
-export declare function addLotOccupancyTransaction(lotOccupancyTransactionForm: AddLotOccupancyTransactionForm, user: User): Promise<number>;
-export default addLotOccupancyTransaction;
+export default function addLotOccupancyTransaction(lotOccupancyTransactionForm: AddLotOccupancyTransactionForm, user: User): Promise<number>;
diff --git a/database/addLotOccupancyTransaction.js b/database/addLotOccupancyTransaction.js
index 2200d2d6..0bed2c53 100644
--- a/database/addLotOccupancyTransaction.js
+++ b/database/addLotOccupancyTransaction.js
@@ -1,6 +1,6 @@
 import { dateStringToInteger, dateToInteger, dateToTimeInteger, timeStringToInteger } from '@cityssm/utils-datetime';
 import { acquireConnection } from './pool.js';
-export async function addLotOccupancyTransaction(lotOccupancyTransactionForm, user) {
+export default async function addLotOccupancyTransaction(lotOccupancyTransactionForm, user) {
     const database = await acquireConnection();
     let transactionIndex = 0;
     const maxIndexResult = database
@@ -32,4 +32,3 @@ export async function addLotOccupancyTransaction(lotOccupancyTransactionForm, us
     database.release();
     return transactionIndex;
 }
-export default addLotOccupancyTransaction;
diff --git a/database/addLotOccupancyTransaction.ts b/database/addLotOccupancyTransaction.ts
index b5bb8716..99b2a02a 100644
--- a/database/addLotOccupancyTransaction.ts
+++ b/database/addLotOccupancyTransaction.ts
@@ -7,7 +7,7 @@ import {
 
 import { acquireConnection } from './pool.js'
 
-interface AddLotOccupancyTransactionForm {
+export interface AddLotOccupancyTransactionForm {
   lotOccupancyId: string | number
   transactionDateString?: string
   transactionTimeString?: string
@@ -16,7 +16,7 @@ interface AddLotOccupancyTransactionForm {
   transactionNote: string
 }
 
-export async function addLotOccupancyTransaction(
+export default async function addLotOccupancyTransaction(
   lotOccupancyTransactionForm: AddLotOccupancyTransactionForm,
   user: User
 ): Promise<number> {
@@ -78,5 +78,3 @@ export async function addLotOccupancyTransaction(
 
   return transactionIndex
 }
-
-export default addLotOccupancyTransaction
diff --git a/database/addLotOccupantType.d.ts b/database/addLotOccupantType.d.ts
index 3909247d..3ab9a367 100644
--- a/database/addLotOccupantType.d.ts
+++ b/database/addLotOccupantType.d.ts
@@ -1,8 +1,7 @@
-interface AddLotOccupantTypeForm {
+export interface AddLotOccupantTypeForm {
     lotOccupantType: string;
     fontAwesomeIconClass?: string;
     occupantCommentTitle?: string;
     orderNumber?: number;
 }
-export declare function addLotOccupantType(lotOccupantTypeForm: AddLotOccupantTypeForm, user: User): Promise<number>;
-export default addLotOccupantType;
+export default function addLotOccupantType(lotOccupantTypeForm: AddLotOccupantTypeForm, user: User): Promise<number>;
diff --git a/database/addLotOccupantType.js b/database/addLotOccupantType.js
index a8034b1f..8f3d68b6 100644
--- a/database/addLotOccupantType.js
+++ b/database/addLotOccupantType.js
@@ -1,6 +1,6 @@
 import { clearCacheByTableName } from '../helpers/functions.cache.js';
 import { acquireConnection } from './pool.js';
-export async function addLotOccupantType(lotOccupantTypeForm, user) {
+export default async function addLotOccupantType(lotOccupantTypeForm, user) {
     const database = await acquireConnection();
     const rightNowMillis = Date.now();
     const result = database
@@ -14,4 +14,3 @@ export async function addLotOccupantType(lotOccupantTypeForm, user) {
     clearCacheByTableName('LotOccupantTypes');
     return result.lastInsertRowid;
 }
-export default addLotOccupantType;
diff --git a/database/addLotOccupantType.ts b/database/addLotOccupantType.ts
index 25d6b4fe..1e0b6ed5 100644
--- a/database/addLotOccupantType.ts
+++ b/database/addLotOccupantType.ts
@@ -2,14 +2,14 @@ import { clearCacheByTableName } from '../helpers/functions.cache.js'
 
 import { acquireConnection } from './pool.js'
 
-interface AddLotOccupantTypeForm {
+export interface AddLotOccupantTypeForm {
   lotOccupantType: string
   fontAwesomeIconClass?: string
   occupantCommentTitle?: string
   orderNumber?: number
 }
 
-export async function addLotOccupantType(
+export default async function addLotOccupantType(
   lotOccupantTypeForm: AddLotOccupantTypeForm,
   user: User
 ): Promise<number> {
@@ -42,5 +42,3 @@ export async function addLotOccupantType(
 
   return result.lastInsertRowid as number
 }
-
-export default addLotOccupantType
diff --git a/database/addLotTypeField.d.ts b/database/addLotTypeField.d.ts
index 2a0b2821..25cd44a0 100644
--- a/database/addLotTypeField.d.ts
+++ b/database/addLotTypeField.d.ts
@@ -1,4 +1,4 @@
-interface AddLotTypeFieldForm {
+export interface AddLotTypeFieldForm {
     lotTypeId: string | number;
     lotTypeField: string;
     lotTypeFieldValues?: string;
@@ -8,5 +8,4 @@ interface AddLotTypeFieldForm {
     maximumLength: string | number;
     orderNumber?: number;
 }
-export declare function addLotTypeField(lotTypeFieldForm: AddLotTypeFieldForm, user: User): Promise<number>;
-export default addLotTypeField;
+export default function addLotTypeField(lotTypeFieldForm: AddLotTypeFieldForm, user: User): Promise<number>;
diff --git a/database/addLotTypeField.js b/database/addLotTypeField.js
index 8c822082..170de4c5 100644
--- a/database/addLotTypeField.js
+++ b/database/addLotTypeField.js
@@ -1,6 +1,6 @@
 import { clearCacheByTableName } from '../helpers/functions.cache.js';
 import { acquireConnection } from './pool.js';
-export async function addLotTypeField(lotTypeFieldForm, user) {
+export default async function addLotTypeField(lotTypeFieldForm, user) {
     const database = await acquireConnection();
     const rightNowMillis = Date.now();
     const result = database
@@ -17,4 +17,3 @@ export async function addLotTypeField(lotTypeFieldForm, user) {
     clearCacheByTableName('LotTypeFields');
     return result.lastInsertRowid;
 }
-export default addLotTypeField;
diff --git a/database/addLotTypeField.ts b/database/addLotTypeField.ts
index 54766c13..47d8480d 100644
--- a/database/addLotTypeField.ts
+++ b/database/addLotTypeField.ts
@@ -2,7 +2,7 @@ import { clearCacheByTableName } from '../helpers/functions.cache.js'
 
 import { acquireConnection } from './pool.js'
 
-interface AddLotTypeFieldForm {
+export interface AddLotTypeFieldForm {
   lotTypeId: string | number
   lotTypeField: string
   lotTypeFieldValues?: string
@@ -13,7 +13,7 @@ interface AddLotTypeFieldForm {
   orderNumber?: number
 }
 
-export async function addLotTypeField(
+export default async function addLotTypeField(
   lotTypeFieldForm: AddLotTypeFieldForm,
   user: User
 ): Promise<number> {
@@ -53,5 +53,3 @@ export async function addLotTypeField(
 
   return result.lastInsertRowid as number
 }
-
-export default addLotTypeField
diff --git a/database/addMap.d.ts b/database/addMap.d.ts
index d2b9bfe1..6f6e2509 100644
--- a/database/addMap.d.ts
+++ b/database/addMap.d.ts
@@ -1,4 +1,4 @@
-interface AddMapForm {
+export interface AddMapForm {
     mapName: string;
     mapDescription: string;
     mapSVG: string;
@@ -11,5 +11,4 @@ interface AddMapForm {
     mapPostalCode: string;
     mapPhoneNumber: string;
 }
-export declare function addMap(mapForm: AddMapForm, user: User): Promise<number>;
-export default addMap;
+export default function addMap(mapForm: AddMapForm, user: User): Promise<number>;
diff --git a/database/addMap.js b/database/addMap.js
index 0dc890df..9e13a904 100644
--- a/database/addMap.js
+++ b/database/addMap.js
@@ -1,5 +1,5 @@
 import { acquireConnection } from './pool.js';
-export async function addMap(mapForm, user) {
+export default async function addMap(mapForm, user) {
     const database = await acquireConnection();
     const rightNowMillis = Date.now();
     const result = database
@@ -16,4 +16,3 @@ export async function addMap(mapForm, user) {
     database.release();
     return result.lastInsertRowid;
 }
-export default addMap;
diff --git a/database/addMap.ts b/database/addMap.ts
index 3cc57340..e5c8f0f1 100644
--- a/database/addMap.ts
+++ b/database/addMap.ts
@@ -1,6 +1,6 @@
 import { acquireConnection } from './pool.js'
 
-interface AddMapForm {
+export interface AddMapForm {
   mapName: string
   mapDescription: string
   mapSVG: string
@@ -14,7 +14,10 @@ interface AddMapForm {
   mapPhoneNumber: string
 }
 
-export async function addMap(mapForm: AddMapForm, user: User): Promise<number> {
+export default async function addMap(
+  mapForm: AddMapForm,
+  user: User
+): Promise<number> {
   const database = await acquireConnection()
 
   const rightNowMillis = Date.now()
@@ -53,5 +56,3 @@ export async function addMap(mapForm: AddMapForm, user: User): Promise<number> {
 
   return result.lastInsertRowid as number
 }
-
-export default addMap
diff --git a/database/addOccupancyTypeField.d.ts b/database/addOccupancyTypeField.d.ts
index 6bd23e1e..69970279 100644
--- a/database/addOccupancyTypeField.d.ts
+++ b/database/addOccupancyTypeField.d.ts
@@ -1,4 +1,4 @@
-interface AddOccupancyTypeFieldForm {
+export interface AddOccupancyTypeFieldForm {
     occupancyTypeId?: string | number;
     occupancyTypeField: string;
     occupancyTypeFieldValues?: string;
@@ -8,5 +8,4 @@ interface AddOccupancyTypeFieldForm {
     maximumLength: string | number;
     orderNumber?: number;
 }
-export declare function addOccupancyTypeField(occupancyTypeFieldForm: AddOccupancyTypeFieldForm, user: User): Promise<number>;
-export default addOccupancyTypeField;
+export default function addOccupancyTypeField(occupancyTypeFieldForm: AddOccupancyTypeFieldForm, user: User): Promise<number>;
diff --git a/database/addOccupancyTypeField.js b/database/addOccupancyTypeField.js
index 51d9571d..826a3ab7 100644
--- a/database/addOccupancyTypeField.js
+++ b/database/addOccupancyTypeField.js
@@ -1,6 +1,6 @@
 import { clearCacheByTableName } from '../helpers/functions.cache.js';
 import { acquireConnection } from './pool.js';
-export async function addOccupancyTypeField(occupancyTypeFieldForm, user) {
+export default async function addOccupancyTypeField(occupancyTypeFieldForm, user) {
     const database = await acquireConnection();
     const rightNowMillis = Date.now();
     const result = database
@@ -17,4 +17,3 @@ export async function addOccupancyTypeField(occupancyTypeFieldForm, user) {
     clearCacheByTableName('OccupancyTypeFields');
     return result.lastInsertRowid;
 }
-export default addOccupancyTypeField;
diff --git a/database/addOccupancyTypeField.ts b/database/addOccupancyTypeField.ts
index d1580eb1..85003a85 100644
--- a/database/addOccupancyTypeField.ts
+++ b/database/addOccupancyTypeField.ts
@@ -2,7 +2,7 @@ import { clearCacheByTableName } from '../helpers/functions.cache.js'
 
 import { acquireConnection } from './pool.js'
 
-interface AddOccupancyTypeFieldForm {
+export interface AddOccupancyTypeFieldForm {
   occupancyTypeId?: string | number
   occupancyTypeField: string
   occupancyTypeFieldValues?: string
@@ -13,7 +13,7 @@ interface AddOccupancyTypeFieldForm {
   orderNumber?: number
 }
 
-export async function addOccupancyTypeField(
+export default async function addOccupancyTypeField(
   occupancyTypeFieldForm: AddOccupancyTypeFieldForm,
   user: User
 ): Promise<number> {
@@ -53,5 +53,3 @@ export async function addOccupancyTypeField(
 
   return result.lastInsertRowid as number
 }
-
-export default addOccupancyTypeField
diff --git a/database/addOccupancyTypePrint.d.ts b/database/addOccupancyTypePrint.d.ts
index 80728f9c..283e86aa 100644
--- a/database/addOccupancyTypePrint.d.ts
+++ b/database/addOccupancyTypePrint.d.ts
@@ -1,7 +1,6 @@
-interface OccupancyTypePrintForm {
+export interface AddOccupancyTypePrintForm {
     occupancyTypeId: string | number;
     printEJS: string;
     orderNumber?: number;
 }
-export declare function addOccupancyTypePrint(occupancyTypePrintForm: OccupancyTypePrintForm, user: User): Promise<boolean>;
-export default addOccupancyTypePrint;
+export default function addOccupancyTypePrint(occupancyTypePrintForm: AddOccupancyTypePrintForm, user: User): Promise<boolean>;
diff --git a/database/addOccupancyTypePrint.js b/database/addOccupancyTypePrint.js
index fb23d4be..21acd5cf 100644
--- a/database/addOccupancyTypePrint.js
+++ b/database/addOccupancyTypePrint.js
@@ -1,6 +1,6 @@
 import { clearCacheByTableName } from '../helpers/functions.cache.js';
 import { acquireConnection } from './pool.js';
-export async function addOccupancyTypePrint(occupancyTypePrintForm, user) {
+export default async function addOccupancyTypePrint(occupancyTypePrintForm, user) {
     const database = await acquireConnection();
     const rightNowMillis = Date.now();
     let result = database
@@ -25,4 +25,3 @@ export async function addOccupancyTypePrint(occupancyTypePrintForm, user) {
     clearCacheByTableName('OccupancyTypePrints');
     return result.changes > 0;
 }
-export default addOccupancyTypePrint;
diff --git a/database/addOccupancyTypePrint.ts b/database/addOccupancyTypePrint.ts
index e88a6855..72a72ef1 100644
--- a/database/addOccupancyTypePrint.ts
+++ b/database/addOccupancyTypePrint.ts
@@ -2,14 +2,14 @@ import { clearCacheByTableName } from '../helpers/functions.cache.js'
 
 import { acquireConnection } from './pool.js'
 
-interface OccupancyTypePrintForm {
+export interface AddOccupancyTypePrintForm {
   occupancyTypeId: string | number
   printEJS: string
   orderNumber?: number
 }
 
-export async function addOccupancyTypePrint(
-  occupancyTypePrintForm: OccupancyTypePrintForm,
+export default async function addOccupancyTypePrint(
+  occupancyTypePrintForm: AddOccupancyTypePrintForm,
   user: User
 ): Promise<boolean> {
   const database = await acquireConnection()
@@ -59,5 +59,3 @@ export async function addOccupancyTypePrint(
 
   return result.changes > 0
 }
-
-export default addOccupancyTypePrint
diff --git a/database/addOrUpdateLotField.d.ts b/database/addOrUpdateLotField.d.ts
index f209eaf5..08bbcce8 100644
--- a/database/addOrUpdateLotField.d.ts
+++ b/database/addOrUpdateLotField.d.ts
@@ -1,8 +1,7 @@
 import type { PoolConnection } from 'better-sqlite-pool';
-interface LotFieldForm {
+export interface LotFieldForm {
     lotId: string | number;
     lotTypeFieldId: string | number;
     lotFieldValue: string;
 }
-export declare function addOrUpdateLotField(lotFieldForm: LotFieldForm, user: User, connectedDatabase?: PoolConnection): Promise<boolean>;
-export default addOrUpdateLotField;
+export default function addOrUpdateLotField(lotFieldForm: LotFieldForm, user: User, connectedDatabase?: PoolConnection): Promise<boolean>;
diff --git a/database/addOrUpdateLotField.js b/database/addOrUpdateLotField.js
index af4421c3..81466e88 100644
--- a/database/addOrUpdateLotField.js
+++ b/database/addOrUpdateLotField.js
@@ -1,5 +1,5 @@
 import { acquireConnection } from './pool.js';
-export async function addOrUpdateLotField(lotFieldForm, user, connectedDatabase) {
+export default async function addOrUpdateLotField(lotFieldForm, user, connectedDatabase) {
     const database = connectedDatabase ?? (await acquireConnection());
     const rightNowMillis = Date.now();
     let result = database
@@ -26,4 +26,3 @@ export async function addOrUpdateLotField(lotFieldForm, user, connectedDatabase)
     }
     return result.changes > 0;
 }
-export default addOrUpdateLotField;
diff --git a/database/addOrUpdateLotField.ts b/database/addOrUpdateLotField.ts
index 3ff77bfc..fa55122d 100644
--- a/database/addOrUpdateLotField.ts
+++ b/database/addOrUpdateLotField.ts
@@ -2,13 +2,13 @@ import type { PoolConnection } from 'better-sqlite-pool'
 
 import { acquireConnection } from './pool.js'
 
-interface LotFieldForm {
+export interface LotFieldForm {
   lotId: string | number
   lotTypeFieldId: string | number
   lotFieldValue: string
 }
 
-export async function addOrUpdateLotField(
+export default async function addOrUpdateLotField(
   lotFieldForm: LotFieldForm,
   user: User,
   connectedDatabase?: PoolConnection
@@ -62,5 +62,3 @@ export async function addOrUpdateLotField(
 
   return result.changes > 0
 }
-
-export default addOrUpdateLotField
diff --git a/database/addOrUpdateLotOccupancyField.d.ts b/database/addOrUpdateLotOccupancyField.d.ts
index 0a01be7c..624ec917 100644
--- a/database/addOrUpdateLotOccupancyField.d.ts
+++ b/database/addOrUpdateLotOccupancyField.d.ts
@@ -1,8 +1,7 @@
 import type { PoolConnection } from 'better-sqlite-pool';
-interface LotOccupancyFieldForm {
+export interface LotOccupancyFieldForm {
     lotOccupancyId: string | number;
     occupancyTypeFieldId: string | number;
     lotOccupancyFieldValue: string;
 }
-export declare function addOrUpdateLotOccupancyField(lotOccupancyFieldForm: LotOccupancyFieldForm, user: User, connectedDatabase?: PoolConnection): Promise<boolean>;
-export default addOrUpdateLotOccupancyField;
+export default function addOrUpdateLotOccupancyField(lotOccupancyFieldForm: LotOccupancyFieldForm, user: User, connectedDatabase?: PoolConnection): Promise<boolean>;
diff --git a/database/addOrUpdateLotOccupancyField.js b/database/addOrUpdateLotOccupancyField.js
index 9fa29533..09511cdb 100644
--- a/database/addOrUpdateLotOccupancyField.js
+++ b/database/addOrUpdateLotOccupancyField.js
@@ -1,5 +1,5 @@
 import { acquireConnection } from './pool.js';
-export async function addOrUpdateLotOccupancyField(lotOccupancyFieldForm, user, connectedDatabase) {
+export default async function addOrUpdateLotOccupancyField(lotOccupancyFieldForm, user, connectedDatabase) {
     const database = connectedDatabase ?? (await acquireConnection());
     const rightNowMillis = Date.now();
     let result = database
@@ -26,4 +26,3 @@ export async function addOrUpdateLotOccupancyField(lotOccupancyFieldForm, user,
     }
     return result.changes > 0;
 }
-export default addOrUpdateLotOccupancyField;
diff --git a/database/addOrUpdateLotOccupancyField.ts b/database/addOrUpdateLotOccupancyField.ts
index dd0578fe..7e70d4d8 100644
--- a/database/addOrUpdateLotOccupancyField.ts
+++ b/database/addOrUpdateLotOccupancyField.ts
@@ -2,13 +2,13 @@ import type { PoolConnection } from 'better-sqlite-pool'
 
 import { acquireConnection } from './pool.js'
 
-interface LotOccupancyFieldForm {
+export interface LotOccupancyFieldForm {
   lotOccupancyId: string | number
   occupancyTypeFieldId: string | number
   lotOccupancyFieldValue: string
 }
 
-export async function addOrUpdateLotOccupancyField(
+export default async function addOrUpdateLotOccupancyField(
   lotOccupancyFieldForm: LotOccupancyFieldForm,
   user: User,
   connectedDatabase?: PoolConnection
@@ -62,5 +62,3 @@ export async function addOrUpdateLotOccupancyField(
 
   return result.changes > 0
 }
-
-export default addOrUpdateLotOccupancyField
diff --git a/database/addWorkOrder.d.ts b/database/addWorkOrder.d.ts
index 6d6a5fdb..ce7d4171 100644
--- a/database/addWorkOrder.d.ts
+++ b/database/addWorkOrder.d.ts
@@ -1,4 +1,4 @@
-interface AddWorkOrderForm {
+export interface AddWorkOrderForm {
     workOrderTypeId: number | string;
     workOrderNumber?: string;
     workOrderDescription: string;
@@ -6,5 +6,4 @@ interface AddWorkOrderForm {
     workOrderCloseDateString?: string;
     lotOccupancyId?: string;
 }
-export declare function addWorkOrder(workOrderForm: AddWorkOrderForm, user: User): Promise<number>;
-export default addWorkOrder;
+export default function addWorkOrder(workOrderForm: AddWorkOrderForm, user: User): Promise<number>;
diff --git a/database/addWorkOrder.js b/database/addWorkOrder.js
index 92c74f91..7d4d5ade 100644
--- a/database/addWorkOrder.js
+++ b/database/addWorkOrder.js
@@ -1,8 +1,8 @@
 import { dateStringToInteger, dateToInteger } from '@cityssm/utils-datetime';
-import { addWorkOrderLotOccupancy } from './addWorkOrderLotOccupancy.js';
+import addWorkOrderLotOccupancy from './addWorkOrderLotOccupancy.js';
 import { getNextWorkOrderNumber } from './getNextWorkOrderNumber.js';
 import { acquireConnection } from './pool.js';
-export async function addWorkOrder(workOrderForm, user) {
+export default async function addWorkOrder(workOrderForm, user) {
     const database = await acquireConnection();
     const rightNow = new Date();
     let workOrderNumber = workOrderForm.workOrderNumber;
@@ -31,4 +31,3 @@ export async function addWorkOrder(workOrderForm, user) {
     database.release();
     return workOrderId;
 }
-export default addWorkOrder;
diff --git a/database/addWorkOrder.ts b/database/addWorkOrder.ts
index 0f6eb4b7..7bbea640 100644
--- a/database/addWorkOrder.ts
+++ b/database/addWorkOrder.ts
@@ -1,13 +1,10 @@
-import {
-  dateStringToInteger,
-  dateToInteger
-} from '@cityssm/utils-datetime'
+import { dateStringToInteger, dateToInteger } from '@cityssm/utils-datetime'
 
-import { addWorkOrderLotOccupancy } from './addWorkOrderLotOccupancy.js'
+import addWorkOrderLotOccupancy from './addWorkOrderLotOccupancy.js'
 import { getNextWorkOrderNumber } from './getNextWorkOrderNumber.js'
 import { acquireConnection } from './pool.js'
 
-interface AddWorkOrderForm {
+export interface AddWorkOrderForm {
   workOrderTypeId: number | string
   workOrderNumber?: string
   workOrderDescription: string
@@ -16,7 +13,7 @@ interface AddWorkOrderForm {
   lotOccupancyId?: string
 }
 
-export async function addWorkOrder(
+export default async function addWorkOrder(
   workOrderForm: AddWorkOrderForm,
   user: User
 ): Promise<number> {
@@ -72,5 +69,3 @@ export async function addWorkOrder(
 
   return workOrderId
 }
-
-export default addWorkOrder
diff --git a/database/addWorkOrderComment.d.ts b/database/addWorkOrderComment.d.ts
index 3af877c8..f9b4c357 100644
--- a/database/addWorkOrderComment.d.ts
+++ b/database/addWorkOrderComment.d.ts
@@ -1,6 +1,5 @@
-interface AddWorkOrderCommentForm {
+export interface AddWorkOrderCommentForm {
     workOrderId: string;
     workOrderComment: string;
 }
-export declare function addWorkOrderComment(workOrderCommentForm: AddWorkOrderCommentForm, user: User): Promise<number>;
-export default addWorkOrderComment;
+export default function addWorkOrderComment(workOrderCommentForm: AddWorkOrderCommentForm, user: User): Promise<number>;
diff --git a/database/addWorkOrderComment.js b/database/addWorkOrderComment.js
index 3a849c81..d980a008 100644
--- a/database/addWorkOrderComment.js
+++ b/database/addWorkOrderComment.js
@@ -1,6 +1,6 @@
 import * as dateTimeFunctions from '@cityssm/utils-datetime';
 import { acquireConnection } from './pool.js';
-export async function addWorkOrderComment(workOrderCommentForm, user) {
+export default async function addWorkOrderComment(workOrderCommentForm, user) {
     const database = await acquireConnection();
     const rightNow = new Date();
     const result = database
@@ -15,4 +15,3 @@ export async function addWorkOrderComment(workOrderCommentForm, user) {
     database.release();
     return result.lastInsertRowid;
 }
-export default addWorkOrderComment;
diff --git a/database/addWorkOrderComment.ts b/database/addWorkOrderComment.ts
index bd8e8d3e..923e009a 100644
--- a/database/addWorkOrderComment.ts
+++ b/database/addWorkOrderComment.ts
@@ -2,12 +2,12 @@ import * as dateTimeFunctions from '@cityssm/utils-datetime'
 
 import { acquireConnection } from './pool.js'
 
-interface AddWorkOrderCommentForm {
+export interface AddWorkOrderCommentForm {
   workOrderId: string
   workOrderComment: string
 }
 
-export async function addWorkOrderComment(
+export default async function addWorkOrderComment(
   workOrderCommentForm: AddWorkOrderCommentForm,
   user: User
 ): Promise<number> {
@@ -40,5 +40,3 @@ export async function addWorkOrderComment(
 
   return result.lastInsertRowid as number
 }
-
-export default addWorkOrderComment
diff --git a/database/addWorkOrderLot.d.ts b/database/addWorkOrderLot.d.ts
index 1e30c31f..062d78da 100644
--- a/database/addWorkOrderLot.d.ts
+++ b/database/addWorkOrderLot.d.ts
@@ -1,6 +1,5 @@
-interface AddWorkOrderLotForm {
+export interface AddWorkOrderLotForm {
     workOrderId: number | string;
     lotId: number | string;
 }
-export declare function addWorkOrderLot(workOrderLotForm: AddWorkOrderLotForm, user: User): Promise<boolean>;
-export default addWorkOrderLot;
+export default function addWorkOrderLot(workOrderLotForm: AddWorkOrderLotForm, user: User): Promise<boolean>;
diff --git a/database/addWorkOrderLot.js b/database/addWorkOrderLot.js
index d769d7f1..a54ef12c 100644
--- a/database/addWorkOrderLot.js
+++ b/database/addWorkOrderLot.js
@@ -1,5 +1,5 @@
 import { acquireConnection } from './pool.js';
-export async function addWorkOrderLot(workOrderLotForm, user) {
+export default async function addWorkOrderLot(workOrderLotForm, user) {
     const database = await acquireConnection();
     const rightNowMillis = Date.now();
     const row = database
@@ -35,4 +35,3 @@ export async function addWorkOrderLot(workOrderLotForm, user) {
     database.release();
     return true;
 }
-export default addWorkOrderLot;
diff --git a/database/addWorkOrderLot.ts b/database/addWorkOrderLot.ts
index f3848fc5..74e85bb0 100644
--- a/database/addWorkOrderLot.ts
+++ b/database/addWorkOrderLot.ts
@@ -1,11 +1,11 @@
 import { acquireConnection } from './pool.js'
 
-interface AddWorkOrderLotForm {
+export interface AddWorkOrderLotForm {
   workOrderId: number | string
   lotId: number | string
 }
 
-export async function addWorkOrderLot(
+export default async function addWorkOrderLot(
   workOrderLotForm: AddWorkOrderLotForm,
   user: User
 ): Promise<boolean> {
@@ -70,5 +70,3 @@ export async function addWorkOrderLot(
 
   return true
 }
-
-export default addWorkOrderLot
diff --git a/database/addWorkOrderLotOccupancy.d.ts b/database/addWorkOrderLotOccupancy.d.ts
index 755f3a41..6c97ae94 100644
--- a/database/addWorkOrderLotOccupancy.d.ts
+++ b/database/addWorkOrderLotOccupancy.d.ts
@@ -1,7 +1,6 @@
 import type { PoolConnection } from 'better-sqlite-pool';
-interface AddWorkOrderLotOccupancyForm {
+export interface AddWorkOrderLotOccupancyForm {
     workOrderId: number | string;
     lotOccupancyId: number | string;
 }
-export declare function addWorkOrderLotOccupancy(workOrderLotOccupancyForm: AddWorkOrderLotOccupancyForm, user: User, connectedDatabase?: PoolConnection): Promise<boolean>;
-export default addWorkOrderLotOccupancy;
+export default function addWorkOrderLotOccupancy(workOrderLotOccupancyForm: AddWorkOrderLotOccupancyForm, user: User, connectedDatabase?: PoolConnection): Promise<boolean>;
diff --git a/database/addWorkOrderLotOccupancy.js b/database/addWorkOrderLotOccupancy.js
index aaaaef0f..63b5dd19 100644
--- a/database/addWorkOrderLotOccupancy.js
+++ b/database/addWorkOrderLotOccupancy.js
@@ -1,5 +1,5 @@
 import { acquireConnection } from './pool.js';
-export async function addWorkOrderLotOccupancy(workOrderLotOccupancyForm, user, connectedDatabase) {
+export default async function addWorkOrderLotOccupancy(workOrderLotOccupancyForm, user, connectedDatabase) {
     const database = connectedDatabase ?? (await acquireConnection());
     const rightNowMillis = Date.now();
     const row = database
@@ -37,4 +37,3 @@ export async function addWorkOrderLotOccupancy(workOrderLotOccupancyForm, user,
     }
     return true;
 }
-export default addWorkOrderLotOccupancy;
diff --git a/database/addWorkOrderLotOccupancy.ts b/database/addWorkOrderLotOccupancy.ts
index 3d728ef1..9435174c 100644
--- a/database/addWorkOrderLotOccupancy.ts
+++ b/database/addWorkOrderLotOccupancy.ts
@@ -2,12 +2,12 @@ import type { PoolConnection } from 'better-sqlite-pool'
 
 import { acquireConnection } from './pool.js'
 
-interface AddWorkOrderLotOccupancyForm {
+export interface AddWorkOrderLotOccupancyForm {
   workOrderId: number | string
   lotOccupancyId: number | string
 }
 
-export async function addWorkOrderLotOccupancy(
+export default async function addWorkOrderLotOccupancy(
   workOrderLotOccupancyForm: AddWorkOrderLotOccupancyForm,
   user: User,
   connectedDatabase?: PoolConnection
@@ -76,5 +76,3 @@ export async function addWorkOrderLotOccupancy(
 
   return true
 }
-
-export default addWorkOrderLotOccupancy
diff --git a/database/addWorkOrderMilestone.d.ts b/database/addWorkOrderMilestone.d.ts
index eb115310..a0b62410 100644
--- a/database/addWorkOrderMilestone.d.ts
+++ b/database/addWorkOrderMilestone.d.ts
@@ -1,4 +1,4 @@
-interface AddWorkOrderMilestoneForm {
+export interface AddWorkOrderMilestoneForm {
     workOrderId: string | number;
     workOrderMilestoneTypeId: number | string;
     workOrderMilestoneDateString: string;
@@ -7,5 +7,4 @@ interface AddWorkOrderMilestoneForm {
     workOrderMilestoneCompletionDateString?: string;
     workOrderMilestoneCompletionTimeString?: string;
 }
-export declare function addWorkOrderMilestone(milestoneForm: AddWorkOrderMilestoneForm, user: User): Promise<number>;
-export default addWorkOrderMilestone;
+export default function addWorkOrderMilestone(milestoneForm: AddWorkOrderMilestoneForm, user: User): Promise<number>;
diff --git a/database/addWorkOrderMilestone.js b/database/addWorkOrderMilestone.js
index 2634ba92..c1039657 100644
--- a/database/addWorkOrderMilestone.js
+++ b/database/addWorkOrderMilestone.js
@@ -1,6 +1,6 @@
 import { dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime';
 import { acquireConnection } from './pool.js';
-export async function addWorkOrderMilestone(milestoneForm, user) {
+export default async function addWorkOrderMilestone(milestoneForm, user) {
     const rightNowMillis = Date.now();
     const database = await acquireConnection();
     const result = database
@@ -26,4 +26,3 @@ export async function addWorkOrderMilestone(milestoneForm, user) {
     database.release();
     return result.lastInsertRowid;
 }
-export default addWorkOrderMilestone;
diff --git a/database/addWorkOrderMilestone.ts b/database/addWorkOrderMilestone.ts
index c8abc879..cda926b3 100644
--- a/database/addWorkOrderMilestone.ts
+++ b/database/addWorkOrderMilestone.ts
@@ -1,6 +1,3 @@
-// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair
-/* eslint-disable @typescript-eslint/indent */
-
 import {
   dateStringToInteger,
   timeStringToInteger
@@ -8,7 +5,7 @@ import {
 
 import { acquireConnection } from './pool.js'
 
-interface AddWorkOrderMilestoneForm {
+export interface AddWorkOrderMilestoneForm {
   workOrderId: string | number
   workOrderMilestoneTypeId: number | string
   workOrderMilestoneDateString: string
@@ -18,7 +15,7 @@ interface AddWorkOrderMilestoneForm {
   workOrderMilestoneCompletionTimeString?: string
 }
 
-export async function addWorkOrderMilestone(
+export default async function addWorkOrderMilestone(
   milestoneForm: AddWorkOrderMilestoneForm,
   user: User
 ): Promise<number> {
@@ -69,5 +66,3 @@ export async function addWorkOrderMilestone(
 
   return result.lastInsertRowid as number
 }
-
-export default addWorkOrderMilestone
diff --git a/database/cleanupDatabase.d.ts b/database/cleanupDatabase.d.ts
index 3061bb32..7e92206d 100644
--- a/database/cleanupDatabase.d.ts
+++ b/database/cleanupDatabase.d.ts
@@ -1,5 +1,4 @@
-export declare function cleanupDatabase(user: User): Promise<{
+export default function cleanupDatabase(user: User): Promise<{
     inactivatedRecordCount: number;
     purgedRecordCount: number;
 }>;
-export default cleanupDatabase;
diff --git a/database/cleanupDatabase.js b/database/cleanupDatabase.js
index 0ec744cf..dfe837c3 100644
--- a/database/cleanupDatabase.js
+++ b/database/cleanupDatabase.js
@@ -1,6 +1,6 @@
 import * as configFunctions from '../helpers/functions.config.js';
 import { acquireConnection } from './pool.js';
-export async function cleanupDatabase(user) {
+export default async function cleanupDatabase(user) {
     const database = await acquireConnection();
     const rightNowMillis = Date.now();
     const recordDeleteTimeMillisMin = rightNowMillis -
@@ -234,4 +234,3 @@ export async function cleanupDatabase(user) {
         purgedRecordCount
     };
 }
-export default cleanupDatabase;
diff --git a/database/cleanupDatabase.ts b/database/cleanupDatabase.ts
index 840ba7f5..c47acf5d 100644
--- a/database/cleanupDatabase.ts
+++ b/database/cleanupDatabase.ts
@@ -2,7 +2,7 @@ import * as configFunctions from '../helpers/functions.config.js'
 
 import { acquireConnection } from './pool.js'
 
-export async function cleanupDatabase(
+export default async function cleanupDatabase(
   user: User
 ): Promise<{ inactivatedRecordCount: number; purgedRecordCount: number }> {
   const database = await acquireConnection()
@@ -447,5 +447,3 @@ export async function cleanupDatabase(
     purgedRecordCount
   }
 }
-
-export default cleanupDatabase
diff --git a/database/closeWorkOrder.d.ts b/database/closeWorkOrder.d.ts
index 7395972d..0989d5c1 100644
--- a/database/closeWorkOrder.d.ts
+++ b/database/closeWorkOrder.d.ts
@@ -1,6 +1,5 @@
-interface AddWorkOrderForm {
+export interface CloseWorkOrderForm {
     workOrderId: number | string;
     workOrderCloseDateString?: string;
 }
-export declare function closeWorkOrder(workOrderForm: AddWorkOrderForm, user: User): Promise<boolean>;
-export default closeWorkOrder;
+export default function closeWorkOrder(workOrderForm: CloseWorkOrderForm, user: User): Promise<boolean>;
diff --git a/database/closeWorkOrder.js b/database/closeWorkOrder.js
index b2f4fa54..f1d43ce5 100644
--- a/database/closeWorkOrder.js
+++ b/database/closeWorkOrder.js
@@ -1,6 +1,6 @@
 import { dateStringToInteger, dateToInteger } from '@cityssm/utils-datetime';
 import { acquireConnection } from './pool.js';
-export async function closeWorkOrder(workOrderForm, user) {
+export default async function closeWorkOrder(workOrderForm, user) {
     const database = await acquireConnection();
     const rightNow = new Date();
     const result = database
@@ -15,4 +15,3 @@ export async function closeWorkOrder(workOrderForm, user) {
     database.release();
     return result.changes > 0;
 }
-export default closeWorkOrder;
diff --git a/database/closeWorkOrder.ts b/database/closeWorkOrder.ts
index c83e9179..45384c83 100644
--- a/database/closeWorkOrder.ts
+++ b/database/closeWorkOrder.ts
@@ -2,13 +2,13 @@ import { dateStringToInteger, dateToInteger } from '@cityssm/utils-datetime'
 
 import { acquireConnection } from './pool.js'
 
-interface AddWorkOrderForm {
+export interface CloseWorkOrderForm {
   workOrderId: number | string
   workOrderCloseDateString?: string
 }
 
-export async function closeWorkOrder(
-  workOrderForm: AddWorkOrderForm,
+export default async function closeWorkOrder(
+  workOrderForm: CloseWorkOrderForm,
   user: User
 ): Promise<boolean> {
   const database = await acquireConnection()
@@ -36,5 +36,3 @@ export async function closeWorkOrder(
 
   return result.changes > 0
 }
-
-export default closeWorkOrder
diff --git a/database/completeWorkOrderMilestone.d.ts b/database/completeWorkOrderMilestone.d.ts
index 57cf9fa2..fc283b46 100644
--- a/database/completeWorkOrderMilestone.d.ts
+++ b/database/completeWorkOrderMilestone.d.ts
@@ -1,7 +1,6 @@
-interface CompleteWorkOrderMilestoneForm {
+export interface CompleteWorkOrderMilestoneForm {
     workOrderMilestoneId: string | number;
     workOrderMilestoneCompletionDateString?: string;
     workOrderMilestoneCompletionTimeString?: string;
 }
-export declare function completeWorkOrderMilestone(milestoneForm: CompleteWorkOrderMilestoneForm, user: User): Promise<boolean>;
-export default completeWorkOrderMilestone;
+export default function completeWorkOrderMilestone(milestoneForm: CompleteWorkOrderMilestoneForm, user: User): Promise<boolean>;
diff --git a/database/completeWorkOrderMilestone.js b/database/completeWorkOrderMilestone.js
index 3f05aef5..a4acc57c 100644
--- a/database/completeWorkOrderMilestone.js
+++ b/database/completeWorkOrderMilestone.js
@@ -1,6 +1,6 @@
 import { dateStringToInteger, dateToInteger, dateToTimeInteger, timeStringToInteger } from '@cityssm/utils-datetime';
 import { acquireConnection } from './pool.js';
-export async function completeWorkOrderMilestone(milestoneForm, user) {
+export default async function completeWorkOrderMilestone(milestoneForm, user) {
     const rightNow = new Date();
     const database = await acquireConnection();
     const result = database
@@ -18,4 +18,3 @@ export async function completeWorkOrderMilestone(milestoneForm, user) {
     database.release();
     return result.changes > 0;
 }
-export default completeWorkOrderMilestone;
diff --git a/database/completeWorkOrderMilestone.ts b/database/completeWorkOrderMilestone.ts
index 69e4146c..a4842d09 100644
--- a/database/completeWorkOrderMilestone.ts
+++ b/database/completeWorkOrderMilestone.ts
@@ -1,6 +1,3 @@
-// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair
-/* eslint-disable @typescript-eslint/indent */
-
 import {
   dateStringToInteger,
   dateToInteger,
@@ -10,13 +7,13 @@ import {
 
 import { acquireConnection } from './pool.js'
 
-interface CompleteWorkOrderMilestoneForm {
+export interface CompleteWorkOrderMilestoneForm {
   workOrderMilestoneId: string | number
   workOrderMilestoneCompletionDateString?: string
   workOrderMilestoneCompletionTimeString?: string
 }
 
-export async function completeWorkOrderMilestone(
+export default async function completeWorkOrderMilestone(
   milestoneForm: CompleteWorkOrderMilestoneForm,
   user: User
 ): Promise<boolean> {
@@ -53,5 +50,3 @@ export async function completeWorkOrderMilestone(
 
   return result.changes > 0
 }
-
-export default completeWorkOrderMilestone
diff --git a/database/copyLotOccupancy.d.ts b/database/copyLotOccupancy.d.ts
index 2320c3c2..814c2c40 100644
--- a/database/copyLotOccupancy.d.ts
+++ b/database/copyLotOccupancy.d.ts
@@ -1,2 +1 @@
-export declare function copyLotOccupancy(oldLotOccupancyId: number | string, user: User): Promise<number>;
-export default copyLotOccupancy;
+export default function copyLotOccupancy(oldLotOccupancyId: number | string, user: User): Promise<number>;
diff --git a/database/copyLotOccupancy.js b/database/copyLotOccupancy.js
index ce0b30d9..d817ab41 100644
--- a/database/copyLotOccupancy.js
+++ b/database/copyLotOccupancy.js
@@ -1,9 +1,9 @@
 import { dateToString } from '@cityssm/utils-datetime';
-import { addLotOccupancy } from './addLotOccupancy.js';
-import { addLotOccupancyOccupant } from './addLotOccupancyOccupant.js';
+import addLotOccupancy from './addLotOccupancy.js';
+import addLotOccupancyOccupant from './addLotOccupancyOccupant.js';
 import { getLotOccupancy } from './getLotOccupancy.js';
 import { acquireConnection } from './pool.js';
-export async function copyLotOccupancy(oldLotOccupancyId, user) {
+export default async function copyLotOccupancy(oldLotOccupancyId, user) {
     const database = await acquireConnection();
     const oldLotOccupancy = (await getLotOccupancy(oldLotOccupancyId, database));
     const newLotOccupancyId = await addLotOccupancy({
@@ -40,4 +40,3 @@ export async function copyLotOccupancy(oldLotOccupancyId, user) {
     database.release();
     return newLotOccupancyId;
 }
-export default copyLotOccupancy;
diff --git a/database/copyLotOccupancy.ts b/database/copyLotOccupancy.ts
index cf01c304..e067f6c9 100644
--- a/database/copyLotOccupancy.ts
+++ b/database/copyLotOccupancy.ts
@@ -1,11 +1,11 @@
 import { dateToString } from '@cityssm/utils-datetime'
 
-import { addLotOccupancy } from './addLotOccupancy.js'
-import { addLotOccupancyOccupant } from './addLotOccupancyOccupant.js'
+import addLotOccupancy from './addLotOccupancy.js'
+import addLotOccupancyOccupant from './addLotOccupancyOccupant.js'
 import { getLotOccupancy } from './getLotOccupancy.js'
 import { acquireConnection } from './pool.js'
 
-export async function copyLotOccupancy(
+export default async function copyLotOccupancy(
   oldLotOccupancyId: number | string,
   user: User
 ): Promise<number> {
@@ -78,5 +78,3 @@ export async function copyLotOccupancy(
 
   return newLotOccupancyId
 }
-
-export default copyLotOccupancy
diff --git a/database/getWorkOrderMilestoneTypes.ts b/database/getWorkOrderMilestoneTypes.ts
index f537e853..8d8e5db9 100644
--- a/database/getWorkOrderMilestoneTypes.ts
+++ b/database/getWorkOrderMilestoneTypes.ts
@@ -1,6 +1,3 @@
-// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair
-/* eslint-disable @typescript-eslint/indent */
-
 import type { WorkOrderMilestoneType } from '../types/recordTypes.js'
 
 import { acquireConnection } from './pool.js'
diff --git a/database/getWorkOrderMilestones.ts b/database/getWorkOrderMilestones.ts
index 5ad4e793..5aed8612 100644
--- a/database/getWorkOrderMilestones.ts
+++ b/database/getWorkOrderMilestones.ts
@@ -1,6 +1,3 @@
-// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair
-/* eslint-disable @typescript-eslint/indent */
-
 import {
   dateIntegerToString,
   dateStringToInteger,
diff --git a/database/getWorkOrderTypes.ts b/database/getWorkOrderTypes.ts
index becaca23..6ead7e29 100644
--- a/database/getWorkOrderTypes.ts
+++ b/database/getWorkOrderTypes.ts
@@ -1,6 +1,3 @@
-// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair
-/* eslint-disable @typescript-eslint/indent */
-
 import type { WorkOrderType } from '../types/recordTypes.js'
 
 import { acquireConnection } from './pool.js'
diff --git a/database/getWorkOrders.ts b/database/getWorkOrders.ts
index 163d87c5..deacbe09 100644
--- a/database/getWorkOrders.ts
+++ b/database/getWorkOrders.ts
@@ -1,6 +1,3 @@
-// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair
-/* eslint-disable @typescript-eslint/indent */
-
 import {
   dateIntegerToString,
   dateStringToInteger
diff --git a/database/updateLot.js b/database/updateLot.js
index fb1797ef..4b92d169 100644
--- a/database/updateLot.js
+++ b/database/updateLot.js
@@ -1,4 +1,4 @@
-import { addOrUpdateLotField } from './addOrUpdateLotField.js';
+import addOrUpdateLotField from './addOrUpdateLotField.js';
 import { deleteLotField } from './deleteLotField.js';
 import { acquireConnection } from './pool.js';
 export async function updateLot(lotForm, user) {
diff --git a/database/updateLot.ts b/database/updateLot.ts
index 34de21c6..1aacfb73 100644
--- a/database/updateLot.ts
+++ b/database/updateLot.ts
@@ -1,7 +1,4 @@
-// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair
-/* eslint-disable @typescript-eslint/indent */
-
-import { addOrUpdateLotField } from './addOrUpdateLotField.js'
+import addOrUpdateLotField from './addOrUpdateLotField.js'
 import { deleteLotField } from './deleteLotField.js'
 import { acquireConnection } from './pool.js'
 
diff --git a/database/updateLotOccupancy.js b/database/updateLotOccupancy.js
index 9771dd32..56cb6b69 100644
--- a/database/updateLotOccupancy.js
+++ b/database/updateLotOccupancy.js
@@ -1,5 +1,5 @@
 import { dateStringToInteger } from '@cityssm/utils-datetime';
-import { addOrUpdateLotOccupancyField } from './addOrUpdateLotOccupancyField.js';
+import addOrUpdateLotOccupancyField from './addOrUpdateLotOccupancyField.js';
 import { deleteLotOccupancyField } from './deleteLotOccupancyField.js';
 import { acquireConnection } from './pool.js';
 export async function updateLotOccupancy(lotOccupancyForm, user) {
diff --git a/database/updateLotOccupancy.ts b/database/updateLotOccupancy.ts
index 5a31a752..85459c6c 100644
--- a/database/updateLotOccupancy.ts
+++ b/database/updateLotOccupancy.ts
@@ -1,9 +1,6 @@
-// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair
-/* eslint-disable @typescript-eslint/indent */
-
 import { dateStringToInteger } from '@cityssm/utils-datetime'
 
-import { addOrUpdateLotOccupancyField } from './addOrUpdateLotOccupancyField.js'
+import addOrUpdateLotOccupancyField from './addOrUpdateLotOccupancyField.js'
 import { deleteLotOccupancyField } from './deleteLotOccupancyField.js'
 import { acquireConnection } from './pool.js'
 
diff --git a/handlers/admin-post/doAddFee.js b/handlers/admin-post/doAddFee.js
index 2a9e218b..3d8e0587 100644
--- a/handlers/admin-post/doAddFee.js
+++ b/handlers/admin-post/doAddFee.js
@@ -1,4 +1,4 @@
-import { addFee } from '../../database/addFee.js';
+import addFee from '../../database/addFee.js';
 import { getFeeCategories } from '../../database/getFeeCategories.js';
 export async function handler(request, response) {
     const feeId = await addFee(request.body, request.session.user);
diff --git a/handlers/admin-post/doAddFee.ts b/handlers/admin-post/doAddFee.ts
index 14896d9f..55f04632 100644
--- a/handlers/admin-post/doAddFee.ts
+++ b/handlers/admin-post/doAddFee.ts
@@ -1,13 +1,16 @@
 import type { Request, Response } from 'express'
 
-import { addFee } from '../../database/addFee.js'
+import addFee, { type AddFeeForm } from '../../database/addFee.js'
 import { getFeeCategories } from '../../database/getFeeCategories.js'
 
 export async function handler(
   request: Request,
   response: Response
 ): Promise<void> {
-  const feeId = await addFee(request.body, request.session.user as User)
+  const feeId = await addFee(
+    request.body as AddFeeForm,
+    request.session.user as User
+  )
 
   const feeCategories = await getFeeCategories(
     {},
diff --git a/handlers/admin-post/doAddLotOccupantType.js b/handlers/admin-post/doAddLotOccupantType.js
index 63e3111c..c34bcdbe 100644
--- a/handlers/admin-post/doAddLotOccupantType.js
+++ b/handlers/admin-post/doAddLotOccupantType.js
@@ -1,5 +1,5 @@
+import addLotOccupantType from '../../database/addLotOccupantType.js';
 import { getLotOccupantTypes } from '../../helpers/functions.cache.js';
-import { addLotOccupantType } from '../../database/addLotOccupantType.js';
 export async function handler(request, response) {
     const lotOccupantTypeId = await addLotOccupantType(request.body, request.session.user);
     const lotOccupantTypes = await getLotOccupantTypes();
diff --git a/handlers/admin-post/doAddLotOccupantType.ts b/handlers/admin-post/doAddLotOccupantType.ts
index ea2f4136..50c40f6d 100644
--- a/handlers/admin-post/doAddLotOccupantType.ts
+++ b/handlers/admin-post/doAddLotOccupantType.ts
@@ -1,14 +1,16 @@
 import type { Request, Response } from 'express'
 
+import addLotOccupantType, {
+  type AddLotOccupantTypeForm
+} from '../../database/addLotOccupantType.js'
 import { getLotOccupantTypes } from '../../helpers/functions.cache.js'
-import { addLotOccupantType } from '../../database/addLotOccupantType.js'
 
 export async function handler(
   request: Request,
   response: Response
 ): Promise<void> {
   const lotOccupantTypeId = await addLotOccupantType(
-    request.body,
+    request.body as AddLotOccupantTypeForm,
     request.session.user as User
   )
 
diff --git a/handlers/admin-post/doAddLotStatus.js b/handlers/admin-post/doAddLotStatus.js
index e047fab8..c3b608d9 100644
--- a/handlers/admin-post/doAddLotStatus.js
+++ b/handlers/admin-post/doAddLotStatus.js
@@ -1,5 +1,5 @@
-import { getLotStatuses } from '../../helpers/functions.cache.js';
 import { addRecord } from '../../database/addRecord.js';
+import { getLotStatuses } from '../../helpers/functions.cache.js';
 export async function handler(request, response) {
     const lotStatusId = await addRecord('LotStatuses', request.body.lotStatus, request.body.orderNumber ?? -1, request.session.user);
     const lotStatuses = await getLotStatuses();
diff --git a/handlers/admin-post/doAddLotStatus.ts b/handlers/admin-post/doAddLotStatus.ts
index 04579683..4f689303 100644
--- a/handlers/admin-post/doAddLotStatus.ts
+++ b/handlers/admin-post/doAddLotStatus.ts
@@ -1,7 +1,7 @@
 import type { Request, Response } from 'express'
 
-import { getLotStatuses } from '../../helpers/functions.cache.js'
 import { addRecord } from '../../database/addRecord.js'
+import { getLotStatuses } from '../../helpers/functions.cache.js'
 
 export async function handler(
   request: Request,
diff --git a/handlers/admin-post/doAddLotType.js b/handlers/admin-post/doAddLotType.js
index 77574def..38127eaa 100644
--- a/handlers/admin-post/doAddLotType.js
+++ b/handlers/admin-post/doAddLotType.js
@@ -1,5 +1,5 @@
-import { getLotTypes } from '../../helpers/functions.cache.js';
 import { addRecord } from '../../database/addRecord.js';
+import { getLotTypes } from '../../helpers/functions.cache.js';
 export async function handler(request, response) {
     const lotTypeId = await addRecord('LotTypes', request.body.lotType, request.body.orderNumber ?? -1, request.session.user);
     const lotTypes = await getLotTypes();
diff --git a/handlers/admin-post/doAddLotType.ts b/handlers/admin-post/doAddLotType.ts
index fbf50ae0..21e9e04c 100644
--- a/handlers/admin-post/doAddLotType.ts
+++ b/handlers/admin-post/doAddLotType.ts
@@ -1,7 +1,7 @@
 import type { Request, Response } from 'express'
 
-import { getLotTypes } from '../../helpers/functions.cache.js'
 import { addRecord } from '../../database/addRecord.js'
+import { getLotTypes } from '../../helpers/functions.cache.js'
 
 export async function handler(
   request: Request,
diff --git a/handlers/admin-post/doAddLotTypeField.js b/handlers/admin-post/doAddLotTypeField.js
index 705f43fd..2a2ff35b 100644
--- a/handlers/admin-post/doAddLotTypeField.js
+++ b/handlers/admin-post/doAddLotTypeField.js
@@ -1,5 +1,5 @@
+import addLotTypeField from '../../database/addLotTypeField.js';
 import { getLotTypes } from '../../helpers/functions.cache.js';
-import { addLotTypeField } from '../../database/addLotTypeField.js';
 export async function handler(request, response) {
     const lotTypeFieldId = await addLotTypeField(request.body, request.session.user);
     const lotTypes = await getLotTypes();
diff --git a/handlers/admin-post/doAddLotTypeField.ts b/handlers/admin-post/doAddLotTypeField.ts
index 967b238d..8345124d 100644
--- a/handlers/admin-post/doAddLotTypeField.ts
+++ b/handlers/admin-post/doAddLotTypeField.ts
@@ -1,14 +1,16 @@
 import type { Request, Response } from 'express'
 
+import addLotTypeField, {
+  type AddLotTypeFieldForm
+} from '../../database/addLotTypeField.js'
 import { getLotTypes } from '../../helpers/functions.cache.js'
-import { addLotTypeField } from '../../database/addLotTypeField.js'
 
 export async function handler(
   request: Request,
   response: Response
 ): Promise<void> {
   const lotTypeFieldId = await addLotTypeField(
-    request.body,
+    request.body as AddLotTypeFieldForm,
     request.session.user as User
   )
 
diff --git a/handlers/admin-post/doAddOccupancyType.js b/handlers/admin-post/doAddOccupancyType.js
index 8a047bf9..82c80487 100644
--- a/handlers/admin-post/doAddOccupancyType.js
+++ b/handlers/admin-post/doAddOccupancyType.js
@@ -1,5 +1,5 @@
-import { getAllOccupancyTypeFields, getOccupancyTypes } from '../../helpers/functions.cache.js';
 import { addRecord } from '../../database/addRecord.js';
+import { getAllOccupancyTypeFields, getOccupancyTypes } from '../../helpers/functions.cache.js';
 export async function handler(request, response) {
     const occupancyTypeId = await addRecord('OccupancyTypes', request.body.occupancyType, request.body.orderNumber ?? -1, request.session.user);
     const occupancyTypes = await getOccupancyTypes();
diff --git a/handlers/admin-post/doAddOccupancyType.ts b/handlers/admin-post/doAddOccupancyType.ts
index 6aebe123..dae58c87 100644
--- a/handlers/admin-post/doAddOccupancyType.ts
+++ b/handlers/admin-post/doAddOccupancyType.ts
@@ -1,10 +1,10 @@
 import type { Request, Response } from 'express'
 
+import { addRecord } from '../../database/addRecord.js'
 import {
   getAllOccupancyTypeFields,
   getOccupancyTypes
 } from '../../helpers/functions.cache.js'
-import { addRecord } from '../../database/addRecord.js'
 
 export async function handler(
   request: Request,
diff --git a/handlers/admin-post/doAddOccupancyTypeField.js b/handlers/admin-post/doAddOccupancyTypeField.js
index 9e579943..20477291 100644
--- a/handlers/admin-post/doAddOccupancyTypeField.js
+++ b/handlers/admin-post/doAddOccupancyTypeField.js
@@ -1,5 +1,5 @@
+import addOccupancyTypeField from '../../database/addOccupancyTypeField.js';
 import { getAllOccupancyTypeFields, getOccupancyTypes } from '../../helpers/functions.cache.js';
-import { addOccupancyTypeField } from '../../database/addOccupancyTypeField.js';
 export async function handler(request, response) {
     const occupancyTypeFieldId = await addOccupancyTypeField(request.body, request.session.user);
     const occupancyTypes = await getOccupancyTypes();
diff --git a/handlers/admin-post/doAddOccupancyTypeField.ts b/handlers/admin-post/doAddOccupancyTypeField.ts
index 36e2402a..a12bc312 100644
--- a/handlers/admin-post/doAddOccupancyTypeField.ts
+++ b/handlers/admin-post/doAddOccupancyTypeField.ts
@@ -1,17 +1,19 @@
 import type { Request, Response } from 'express'
 
+import addOccupancyTypeField, {
+  type AddOccupancyTypeFieldForm
+} from '../../database/addOccupancyTypeField.js'
 import {
   getAllOccupancyTypeFields,
   getOccupancyTypes
 } from '../../helpers/functions.cache.js'
-import { addOccupancyTypeField } from '../../database/addOccupancyTypeField.js'
 
 export async function handler(
   request: Request,
   response: Response
 ): Promise<void> {
   const occupancyTypeFieldId = await addOccupancyTypeField(
-    request.body,
+    request.body as AddOccupancyTypeFieldForm,
     request.session.user as User
   )
 
diff --git a/handlers/admin-post/doAddOccupancyTypePrint.js b/handlers/admin-post/doAddOccupancyTypePrint.js
index b371bb75..5db238dc 100644
--- a/handlers/admin-post/doAddOccupancyTypePrint.js
+++ b/handlers/admin-post/doAddOccupancyTypePrint.js
@@ -1,5 +1,5 @@
+import addOccupancyTypePrint from '../../database/addOccupancyTypePrint.js';
 import { getAllOccupancyTypeFields, getOccupancyTypes } from '../../helpers/functions.cache.js';
-import { addOccupancyTypePrint } from '../../database/addOccupancyTypePrint.js';
 export async function handler(request, response) {
     const success = await addOccupancyTypePrint(request.body, request.session.user);
     const occupancyTypes = await getOccupancyTypes();
diff --git a/handlers/admin-post/doAddOccupancyTypePrint.ts b/handlers/admin-post/doAddOccupancyTypePrint.ts
index 008ed9e8..8cebf65f 100644
--- a/handlers/admin-post/doAddOccupancyTypePrint.ts
+++ b/handlers/admin-post/doAddOccupancyTypePrint.ts
@@ -1,17 +1,19 @@
 import type { Request, Response } from 'express'
 
+import addOccupancyTypePrint, {
+  type AddOccupancyTypePrintForm
+} from '../../database/addOccupancyTypePrint.js'
 import {
   getAllOccupancyTypeFields,
   getOccupancyTypes
 } from '../../helpers/functions.cache.js'
-import { addOccupancyTypePrint } from '../../database/addOccupancyTypePrint.js'
 
 export async function handler(
   request: Request,
   response: Response
 ): Promise<void> {
   const success = await addOccupancyTypePrint(
-    request.body,
+    request.body as AddOccupancyTypePrintForm,
     request.session.user as User
   )
 
diff --git a/handlers/admin-post/doAddWorkOrderMilestoneType.js b/handlers/admin-post/doAddWorkOrderMilestoneType.js
index 293e70bb..2deca10e 100644
--- a/handlers/admin-post/doAddWorkOrderMilestoneType.js
+++ b/handlers/admin-post/doAddWorkOrderMilestoneType.js
@@ -1,5 +1,5 @@
-import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js';
 import { addRecord } from '../../database/addRecord.js';
+import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js';
 export async function handler(request, response) {
     const workOrderMilestoneTypeId = await addRecord('WorkOrderMilestoneTypes', request.body.workOrderMilestoneType, request.body.orderNumber ?? -1, request.session.user);
     const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes();
diff --git a/handlers/admin-post/doAddWorkOrderMilestoneType.ts b/handlers/admin-post/doAddWorkOrderMilestoneType.ts
index 263cfc2c..0faeeb22 100644
--- a/handlers/admin-post/doAddWorkOrderMilestoneType.ts
+++ b/handlers/admin-post/doAddWorkOrderMilestoneType.ts
@@ -1,7 +1,7 @@
 import type { Request, Response } from 'express'
 
-import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js'
 import { addRecord } from '../../database/addRecord.js'
+import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js'
 
 export async function handler(
   request: Request,
diff --git a/handlers/admin-post/doAddWorkOrderType.js b/handlers/admin-post/doAddWorkOrderType.js
index 8d2900b3..26809860 100644
--- a/handlers/admin-post/doAddWorkOrderType.js
+++ b/handlers/admin-post/doAddWorkOrderType.js
@@ -1,5 +1,5 @@
-import { getWorkOrderTypes } from '../../helpers/functions.cache.js';
 import { addRecord } from '../../database/addRecord.js';
+import { getWorkOrderTypes } from '../../helpers/functions.cache.js';
 export async function handler(request, response) {
     const workOrderTypeId = await addRecord('WorkOrderTypes', request.body.workOrderType, request.body.orderNumber ?? -1, request.session.user);
     const workOrderTypes = await getWorkOrderTypes();
diff --git a/handlers/admin-post/doAddWorkOrderType.ts b/handlers/admin-post/doAddWorkOrderType.ts
index f440f76f..bce2be83 100644
--- a/handlers/admin-post/doAddWorkOrderType.ts
+++ b/handlers/admin-post/doAddWorkOrderType.ts
@@ -1,7 +1,7 @@
 import type { Request, Response } from 'express'
 
-import { getWorkOrderTypes } from '../../helpers/functions.cache.js'
 import { addRecord } from '../../database/addRecord.js'
+import { getWorkOrderTypes } from '../../helpers/functions.cache.js'
 
 export async function handler(
   request: Request,
diff --git a/handlers/admin-post/doCleanupDatabase.js b/handlers/admin-post/doCleanupDatabase.js
index 6b20366e..72ec5da5 100644
--- a/handlers/admin-post/doCleanupDatabase.js
+++ b/handlers/admin-post/doCleanupDatabase.js
@@ -1,4 +1,4 @@
-import { cleanupDatabase } from '../../database/cleanupDatabase.js';
+import cleanupDatabase from '../../database/cleanupDatabase.js';
 export async function handler(request, response) {
     const recordCounts = await cleanupDatabase(request.session.user);
     response.json({
diff --git a/handlers/admin-post/doCleanupDatabase.ts b/handlers/admin-post/doCleanupDatabase.ts
index 5899b119..84261259 100644
--- a/handlers/admin-post/doCleanupDatabase.ts
+++ b/handlers/admin-post/doCleanupDatabase.ts
@@ -1,6 +1,6 @@
 import type { Request, Response } from 'express'
 
-import { cleanupDatabase } from '../../database/cleanupDatabase.js'
+import cleanupDatabase from '../../database/cleanupDatabase.js'
 
 export async function handler(
   request: Request,
diff --git a/handlers/admin-post/doMoveLotOccupantTypeDown.ts b/handlers/admin-post/doMoveLotOccupantTypeDown.ts
index 7ae8f163..83e42ce9 100644
--- a/handlers/admin-post/doMoveLotOccupantTypeDown.ts
+++ b/handlers/admin-post/doMoveLotOccupantTypeDown.ts
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/indent */
-
 import type { Request, Response } from 'express'
 
 import {
diff --git a/handlers/admin-post/doMoveOccupancyTypePrintDown.ts b/handlers/admin-post/doMoveOccupancyTypePrintDown.ts
index e44c1909..c1f69245 100644
--- a/handlers/admin-post/doMoveOccupancyTypePrintDown.ts
+++ b/handlers/admin-post/doMoveOccupancyTypePrintDown.ts
@@ -1,12 +1,9 @@
-/* eslint-disable @typescript-eslint/indent */
-
 import type { Request, Response } from 'express'
 
 import {
   moveOccupancyTypePrintDown,
   moveOccupancyTypePrintDownToBottom
 } from '../../database/moveOccupancyTypePrintDown.js'
-
 import {
   getAllOccupancyTypeFields,
   getOccupancyTypes
diff --git a/handlers/admin-post/doMoveOccupancyTypePrintUp.ts b/handlers/admin-post/doMoveOccupancyTypePrintUp.ts
index f2b7bf7d..c81b9bc6 100644
--- a/handlers/admin-post/doMoveOccupancyTypePrintUp.ts
+++ b/handlers/admin-post/doMoveOccupancyTypePrintUp.ts
@@ -1,12 +1,9 @@
-/* eslint-disable @typescript-eslint/indent */
-
 import type { Request, Response } from 'express'
 
 import {
   moveOccupancyTypePrintUp,
   moveOccupancyTypePrintUpToTop
 } from '../../database/moveOccupancyTypePrintUp.js'
-
 import {
   getAllOccupancyTypeFields,
   getOccupancyTypes
diff --git a/handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.ts b/handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.ts
index a1c864c1..70fd1db1 100644
--- a/handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.ts
+++ b/handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.ts
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/indent */
-
 import type { Request, Response } from 'express'
 
 import {
diff --git a/handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.ts b/handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.ts
index 6cdea0cb..b32a9372 100644
--- a/handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.ts
+++ b/handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.ts
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/indent */
-
 import type { Request, Response } from 'express'
 
 import {
diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyComment.js b/handlers/lotOccupancies-post/doAddLotOccupancyComment.js
index a7eff080..fe76948a 100644
--- a/handlers/lotOccupancies-post/doAddLotOccupancyComment.js
+++ b/handlers/lotOccupancies-post/doAddLotOccupancyComment.js
@@ -1,4 +1,4 @@
-import { addLotOccupancyComment } from '../../database/addLotOccupancyComment.js';
+import addLotOccupancyComment from '../../database/addLotOccupancyComment.js';
 import { getLotOccupancyComments } from '../../database/getLotOccupancyComments.js';
 export async function handler(request, response) {
     await addLotOccupancyComment(request.body, request.session.user);
diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyComment.ts b/handlers/lotOccupancies-post/doAddLotOccupancyComment.ts
index 85ef4bf2..f22ea0d8 100644
--- a/handlers/lotOccupancies-post/doAddLotOccupancyComment.ts
+++ b/handlers/lotOccupancies-post/doAddLotOccupancyComment.ts
@@ -1,16 +1,21 @@
 import type { Request, Response } from 'express'
 
-import { addLotOccupancyComment } from '../../database/addLotOccupancyComment.js'
+import addLotOccupancyComment, {
+  type AddLotOccupancyCommentForm
+} from '../../database/addLotOccupancyComment.js'
 import { getLotOccupancyComments } from '../../database/getLotOccupancyComments.js'
 
 export async function handler(
   request: Request,
   response: Response
 ): Promise<void> {
-  await addLotOccupancyComment(request.body, request.session.user as User)
+  await addLotOccupancyComment(
+    request.body as AddLotOccupancyCommentForm,
+    request.session.user as User
+  )
 
   const lotOccupancyComments = await getLotOccupancyComments(
-    request.body.lotOccupancyId
+    request.body.lotOccupancyId as string
   )
 
   response.json({
diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyFee.js b/handlers/lotOccupancies-post/doAddLotOccupancyFee.js
index dad42ed6..fc187358 100644
--- a/handlers/lotOccupancies-post/doAddLotOccupancyFee.js
+++ b/handlers/lotOccupancies-post/doAddLotOccupancyFee.js
@@ -1,4 +1,4 @@
-import { addLotOccupancyFee } from '../../database/addLotOccupancyFee.js';
+import addLotOccupancyFee from '../../database/addLotOccupancyFee.js';
 import { getLotOccupancyFees } from '../../database/getLotOccupancyFees.js';
 export async function handler(request, response) {
     await addLotOccupancyFee(request.body, request.session.user);
diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyFee.ts b/handlers/lotOccupancies-post/doAddLotOccupancyFee.ts
index 9a5d7335..544c3cb9 100644
--- a/handlers/lotOccupancies-post/doAddLotOccupancyFee.ts
+++ b/handlers/lotOccupancies-post/doAddLotOccupancyFee.ts
@@ -1,15 +1,22 @@
 import type { Request, Response } from 'express'
 
-import { addLotOccupancyFee } from '../../database/addLotOccupancyFee.js'
+import addLotOccupancyFee, {
+  type AddLotOccupancyFeeForm
+} from '../../database/addLotOccupancyFee.js'
 import { getLotOccupancyFees } from '../../database/getLotOccupancyFees.js'
 
 export async function handler(
   request: Request,
   response: Response
 ): Promise<void> {
-  await addLotOccupancyFee(request.body, request.session.user as User)
+  await addLotOccupancyFee(
+    request.body as AddLotOccupancyFeeForm,
+    request.session.user as User
+  )
 
-  const lotOccupancyFees = await getLotOccupancyFees(request.body.lotOccupancyId)
+  const lotOccupancyFees = await getLotOccupancyFees(
+    request.body.lotOccupancyId
+  )
 
   response.json({
     success: true,
diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyOccupant.js b/handlers/lotOccupancies-post/doAddLotOccupancyOccupant.js
index 9349ce30..5f60adfa 100644
--- a/handlers/lotOccupancies-post/doAddLotOccupancyOccupant.js
+++ b/handlers/lotOccupancies-post/doAddLotOccupancyOccupant.js
@@ -1,4 +1,4 @@
-import { addLotOccupancyOccupant } from '../../database/addLotOccupancyOccupant.js';
+import addLotOccupancyOccupant from '../../database/addLotOccupancyOccupant.js';
 import { getLotOccupancyOccupants } from '../../database/getLotOccupancyOccupants.js';
 export async function handler(request, response) {
     await addLotOccupancyOccupant(request.body, request.session.user);
diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyOccupant.ts b/handlers/lotOccupancies-post/doAddLotOccupancyOccupant.ts
index ed04d148..6661924f 100644
--- a/handlers/lotOccupancies-post/doAddLotOccupancyOccupant.ts
+++ b/handlers/lotOccupancies-post/doAddLotOccupancyOccupant.ts
@@ -1,13 +1,18 @@
 import type { Request, Response } from 'express'
 
-import { addLotOccupancyOccupant } from '../../database/addLotOccupancyOccupant.js'
+import addLotOccupancyOccupant, {
+  type AddLotOccupancyOccupantForm
+} from '../../database/addLotOccupancyOccupant.js'
 import { getLotOccupancyOccupants } from '../../database/getLotOccupancyOccupants.js'
 
 export async function handler(
   request: Request,
   response: Response
 ): Promise<void> {
-  await addLotOccupancyOccupant(request.body, request.session.user as User)
+  await addLotOccupancyOccupant(
+    request.body as AddLotOccupancyOccupantForm,
+    request.session.user as User
+  )
 
   const lotOccupancyOccupants = await getLotOccupancyOccupants(
     request.body.lotOccupancyId
diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.js b/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.js
index 34d799b8..b446abf4 100644
--- a/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.js
+++ b/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.js
@@ -1,4 +1,4 @@
-import { addLotOccupancyTransaction } from '../../database/addLotOccupancyTransaction.js';
+import addLotOccupancyTransaction from '../../database/addLotOccupancyTransaction.js';
 import { getLotOccupancyTransactions } from '../../database/getLotOccupancyTransactions.js';
 export async function handler(request, response) {
     await addLotOccupancyTransaction(request.body, request.session.user);
diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.ts b/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.ts
index 3eb29205..c2237aa7 100644
--- a/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.ts
+++ b/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.ts
@@ -1,13 +1,18 @@
 import type { Request, Response } from 'express'
 
-import { addLotOccupancyTransaction } from '../../database/addLotOccupancyTransaction.js'
+import addLotOccupancyTransaction, {
+  type AddLotOccupancyTransactionForm
+} from '../../database/addLotOccupancyTransaction.js'
 import { getLotOccupancyTransactions } from '../../database/getLotOccupancyTransactions.js'
 
 export async function handler(
   request: Request,
   response: Response
 ): Promise<void> {
-  await addLotOccupancyTransaction(request.body, request.session.user as User)
+  await addLotOccupancyTransaction(
+    request.body as AddLotOccupancyTransactionForm,
+    request.session.user as User
+  )
 
   const lotOccupancyTransactions = await getLotOccupancyTransactions(
     request.body.lotOccupancyId,
diff --git a/handlers/lotOccupancies-post/doCopyLotOccupancy.js b/handlers/lotOccupancies-post/doCopyLotOccupancy.js
index f8db0fcc..bfdd8edf 100644
--- a/handlers/lotOccupancies-post/doCopyLotOccupancy.js
+++ b/handlers/lotOccupancies-post/doCopyLotOccupancy.js
@@ -1,4 +1,4 @@
-import { copyLotOccupancy } from '../../database/copyLotOccupancy.js';
+import copyLotOccupancy from '../../database/copyLotOccupancy.js';
 export async function handler(request, response) {
     const lotOccupancyId = await copyLotOccupancy(request.body.lotOccupancyId, request.session.user);
     response.json({
diff --git a/handlers/lotOccupancies-post/doCopyLotOccupancy.ts b/handlers/lotOccupancies-post/doCopyLotOccupancy.ts
index 83cca149..eb12bf5b 100644
--- a/handlers/lotOccupancies-post/doCopyLotOccupancy.ts
+++ b/handlers/lotOccupancies-post/doCopyLotOccupancy.ts
@@ -1,13 +1,13 @@
 import type { Request, Response } from 'express'
 
-import { copyLotOccupancy } from '../../database/copyLotOccupancy.js'
+import copyLotOccupancy from '../../database/copyLotOccupancy.js'
 
 export async function handler(
   request: Request,
   response: Response
 ): Promise<void> {
   const lotOccupancyId = await copyLotOccupancy(
-    request.body.lotOccupancyId,
+    request.body.lotOccupancyId as string,
     request.session.user as User
   )
 
diff --git a/handlers/lotOccupancies-post/doCreateLotOccupancy.js b/handlers/lotOccupancies-post/doCreateLotOccupancy.js
index a1e823cf..edcd6636 100644
--- a/handlers/lotOccupancies-post/doCreateLotOccupancy.js
+++ b/handlers/lotOccupancies-post/doCreateLotOccupancy.js
@@ -1,4 +1,4 @@
-import { addLotOccupancy } from '../../database/addLotOccupancy.js';
+import addLotOccupancy from '../../database/addLotOccupancy.js';
 export async function handler(request, response) {
     const lotOccupancyId = await addLotOccupancy(request.body, request.session.user);
     response.json({
diff --git a/handlers/lotOccupancies-post/doCreateLotOccupancy.ts b/handlers/lotOccupancies-post/doCreateLotOccupancy.ts
index 5da7164c..99b2eea8 100644
--- a/handlers/lotOccupancies-post/doCreateLotOccupancy.ts
+++ b/handlers/lotOccupancies-post/doCreateLotOccupancy.ts
@@ -1,12 +1,17 @@
 import type { Request, Response } from 'express'
 
-import { addLotOccupancy } from '../../database/addLotOccupancy.js'
+import addLotOccupancy, {
+  type AddLotOccupancyForm
+} from '../../database/addLotOccupancy.js'
 
 export async function handler(
   request: Request,
   response: Response
 ): Promise<void> {
-  const lotOccupancyId = await addLotOccupancy(request.body, request.session.user as User)
+  const lotOccupancyId = await addLotOccupancy(
+    request.body as AddLotOccupancyForm,
+    request.session.user as User
+  )
 
   response.json({
     success: true,
diff --git a/handlers/lots-post/doAddLotComment.js b/handlers/lots-post/doAddLotComment.js
index f49c9d20..6288dde5 100644
--- a/handlers/lots-post/doAddLotComment.js
+++ b/handlers/lots-post/doAddLotComment.js
@@ -1,4 +1,4 @@
-import { addLotComment } from '../../database/addLotComment.js';
+import addLotComment from '../../database/addLotComment.js';
 import { getLotComments } from '../../database/getLotComments.js';
 export async function handler(request, response) {
     await addLotComment(request.body, request.session.user);
diff --git a/handlers/lots-post/doAddLotComment.ts b/handlers/lots-post/doAddLotComment.ts
index 04a18191..58c261f5 100644
--- a/handlers/lots-post/doAddLotComment.ts
+++ b/handlers/lots-post/doAddLotComment.ts
@@ -1,15 +1,20 @@
 import type { Request, Response } from 'express'
 
-import { addLotComment } from '../../database/addLotComment.js'
+import addLotComment, {
+  type AddLotCommentForm
+} from '../../database/addLotComment.js'
 import { getLotComments } from '../../database/getLotComments.js'
 
 export async function handler(
   request: Request,
   response: Response
 ): Promise<void> {
-  await addLotComment(request.body, request.session.user as User)
+  await addLotComment(
+    request.body as AddLotCommentForm,
+    request.session.user as User
+  )
 
-  const lotComments = await getLotComments(request.body.lotId)
+  const lotComments = await getLotComments(request.body.lotId as string)
 
   response.json({
     success: true,
diff --git a/handlers/lots-post/doCreateLot.js b/handlers/lots-post/doCreateLot.js
index cf92e541..3befbbc3 100644
--- a/handlers/lots-post/doCreateLot.js
+++ b/handlers/lots-post/doCreateLot.js
@@ -1,5 +1,5 @@
+import addLot from '../../database/addLot.js';
 import { clearNextPreviousLotIdCache } from '../../helpers/functions.lots.js';
-import { addLot } from '../../database/addLot.js';
 export async function handler(request, response) {
     const lotId = await addLot(request.body, request.session.user);
     response.json({
diff --git a/handlers/lots-post/doCreateLot.ts b/handlers/lots-post/doCreateLot.ts
index 91431b2e..1b86a282 100644
--- a/handlers/lots-post/doCreateLot.ts
+++ b/handlers/lots-post/doCreateLot.ts
@@ -1,13 +1,16 @@
 import type { Request, Response } from 'express'
 
+import addLot, { type AddLotForm } from '../../database/addLot.js'
 import { clearNextPreviousLotIdCache } from '../../helpers/functions.lots.js'
-import { addLot } from '../../database/addLot.js'
 
 export async function handler(
   request: Request,
   response: Response
 ): Promise<void> {
-  const lotId = await addLot(request.body, request.session.user as User)
+  const lotId = await addLot(
+    request.body as AddLotForm,
+    request.session.user as User
+  )
 
   response.json({
     success: true,
diff --git a/handlers/maps-post/doCreateMap.js b/handlers/maps-post/doCreateMap.js
index 6ff0160e..2308bc15 100644
--- a/handlers/maps-post/doCreateMap.js
+++ b/handlers/maps-post/doCreateMap.js
@@ -1,4 +1,4 @@
-import { addMap } from '../../database/addMap.js';
+import addMap from '../../database/addMap.js';
 export async function handler(request, response) {
     const mapId = await addMap(request.body, request.session.user);
     response.json({
diff --git a/handlers/maps-post/doCreateMap.ts b/handlers/maps-post/doCreateMap.ts
index 55e33a36..49fbf565 100644
--- a/handlers/maps-post/doCreateMap.ts
+++ b/handlers/maps-post/doCreateMap.ts
@@ -1,12 +1,15 @@
 import type { Request, Response } from 'express'
 
-import { addMap } from '../../database/addMap.js'
+import addMap, { type AddMapForm } from '../../database/addMap.js'
 
 export async function handler(
   request: Request,
   response: Response
 ): Promise<void> {
-  const mapId = await addMap(request.body, request.session.user as User)
+  const mapId = await addMap(
+    request.body as AddMapForm,
+    request.session.user as User
+  )
 
   response.json({
     success: true,
diff --git a/handlers/workOrders-post/doAddWorkOrderComment.js b/handlers/workOrders-post/doAddWorkOrderComment.js
index aecc97e7..05e6770f 100644
--- a/handlers/workOrders-post/doAddWorkOrderComment.js
+++ b/handlers/workOrders-post/doAddWorkOrderComment.js
@@ -1,4 +1,4 @@
-import { addWorkOrderComment } from '../../database/addWorkOrderComment.js';
+import addWorkOrderComment from '../../database/addWorkOrderComment.js';
 import { getWorkOrderComments } from '../../database/getWorkOrderComments.js';
 export async function handler(request, response) {
     await addWorkOrderComment(request.body, request.session.user);
diff --git a/handlers/workOrders-post/doAddWorkOrderComment.ts b/handlers/workOrders-post/doAddWorkOrderComment.ts
index 16fd804a..26c1774d 100644
--- a/handlers/workOrders-post/doAddWorkOrderComment.ts
+++ b/handlers/workOrders-post/doAddWorkOrderComment.ts
@@ -1,13 +1,18 @@
 import type { Request, Response } from 'express'
 
-import { addWorkOrderComment } from '../../database/addWorkOrderComment.js'
+import addWorkOrderComment, {
+  type AddWorkOrderCommentForm
+} from '../../database/addWorkOrderComment.js'
 import { getWorkOrderComments } from '../../database/getWorkOrderComments.js'
 
 export async function handler(
   request: Request,
   response: Response
 ): Promise<void> {
-  await addWorkOrderComment(request.body, request.session.user as User)
+  await addWorkOrderComment(
+    request.body as AddWorkOrderCommentForm,
+    request.session.user as User
+  )
 
   const workOrderComments = await getWorkOrderComments(request.body.workOrderId)
 
diff --git a/handlers/workOrders-post/doAddWorkOrderLot.js b/handlers/workOrders-post/doAddWorkOrderLot.js
index 8cf38503..8e70f797 100644
--- a/handlers/workOrders-post/doAddWorkOrderLot.js
+++ b/handlers/workOrders-post/doAddWorkOrderLot.js
@@ -1,4 +1,4 @@
-import { addWorkOrderLot } from '../../database/addWorkOrderLot.js';
+import addWorkOrderLot from '../../database/addWorkOrderLot.js';
 import { getLots } from '../../database/getLots.js';
 export async function handler(request, response) {
     const success = await addWorkOrderLot({
diff --git a/handlers/workOrders-post/doAddWorkOrderLot.ts b/handlers/workOrders-post/doAddWorkOrderLot.ts
index 1d3b7743..fb159ba8 100644
--- a/handlers/workOrders-post/doAddWorkOrderLot.ts
+++ b/handlers/workOrders-post/doAddWorkOrderLot.ts
@@ -1,6 +1,6 @@
 import type { Request, Response } from 'express'
 
-import { addWorkOrderLot } from '../../database/addWorkOrderLot.js'
+import addWorkOrderLot from '../../database/addWorkOrderLot.js'
 import { getLots } from '../../database/getLots.js'
 
 export async function handler(
diff --git a/handlers/workOrders-post/doAddWorkOrderLotOccupancy.js b/handlers/workOrders-post/doAddWorkOrderLotOccupancy.js
index 6099d70b..ded7adef 100644
--- a/handlers/workOrders-post/doAddWorkOrderLotOccupancy.js
+++ b/handlers/workOrders-post/doAddWorkOrderLotOccupancy.js
@@ -1,4 +1,4 @@
-import { addWorkOrderLotOccupancy } from '../../database/addWorkOrderLotOccupancy.js';
+import addWorkOrderLotOccupancy from '../../database/addWorkOrderLotOccupancy.js';
 import { getLotOccupancies } from '../../database/getLotOccupancies.js';
 export async function handler(request, response) {
     const success = await addWorkOrderLotOccupancy({
diff --git a/handlers/workOrders-post/doAddWorkOrderLotOccupancy.ts b/handlers/workOrders-post/doAddWorkOrderLotOccupancy.ts
index cb54d09d..2175da2c 100644
--- a/handlers/workOrders-post/doAddWorkOrderLotOccupancy.ts
+++ b/handlers/workOrders-post/doAddWorkOrderLotOccupancy.ts
@@ -1,6 +1,6 @@
 import type { Request, Response } from 'express'
 
-import { addWorkOrderLotOccupancy } from '../../database/addWorkOrderLotOccupancy.js'
+import addWorkOrderLotOccupancy from '../../database/addWorkOrderLotOccupancy.js'
 import { getLotOccupancies } from '../../database/getLotOccupancies.js'
 
 export async function handler(
diff --git a/handlers/workOrders-post/doAddWorkOrderMilestone.js b/handlers/workOrders-post/doAddWorkOrderMilestone.js
index c5e670c3..0d52b79d 100644
--- a/handlers/workOrders-post/doAddWorkOrderMilestone.js
+++ b/handlers/workOrders-post/doAddWorkOrderMilestone.js
@@ -1,4 +1,4 @@
-import { addWorkOrderMilestone } from '../../database/addWorkOrderMilestone.js';
+import addWorkOrderMilestone from '../../database/addWorkOrderMilestone.js';
 import { getWorkOrderMilestones } from '../../database/getWorkOrderMilestones.js';
 export async function handler(request, response) {
     const success = await addWorkOrderMilestone(request.body, request.session.user);
diff --git a/handlers/workOrders-post/doAddWorkOrderMilestone.ts b/handlers/workOrders-post/doAddWorkOrderMilestone.ts
index 20ce3c1c..506bd89e 100644
--- a/handlers/workOrders-post/doAddWorkOrderMilestone.ts
+++ b/handlers/workOrders-post/doAddWorkOrderMilestone.ts
@@ -1,13 +1,18 @@
 import type { Request, Response } from 'express'
 
-import { addWorkOrderMilestone } from '../../database/addWorkOrderMilestone.js'
+import addWorkOrderMilestone, {
+  type AddWorkOrderMilestoneForm
+} from '../../database/addWorkOrderMilestone.js'
 import { getWorkOrderMilestones } from '../../database/getWorkOrderMilestones.js'
 
 export async function handler(
   request: Request,
   response: Response
 ): Promise<void> {
-  const success = await addWorkOrderMilestone(request.body, request.session.user as User)
+  const success = await addWorkOrderMilestone(
+    request.body as AddWorkOrderMilestoneForm,
+    request.session.user as User
+  )
 
   const workOrderMilestones = await getWorkOrderMilestones(
     {
diff --git a/handlers/workOrders-post/doCloseWorkOrder.js b/handlers/workOrders-post/doCloseWorkOrder.js
index 92c3081f..79045dfa 100644
--- a/handlers/workOrders-post/doCloseWorkOrder.js
+++ b/handlers/workOrders-post/doCloseWorkOrder.js
@@ -1,4 +1,4 @@
-import { closeWorkOrder } from '../../database/closeWorkOrder.js';
+import closeWorkOrder from '../../database/closeWorkOrder.js';
 export async function handler(request, response) {
     const success = await closeWorkOrder(request.body, request.session.user);
     response.json({
diff --git a/handlers/workOrders-post/doCloseWorkOrder.ts b/handlers/workOrders-post/doCloseWorkOrder.ts
index fc832f19..dc84618f 100644
--- a/handlers/workOrders-post/doCloseWorkOrder.ts
+++ b/handlers/workOrders-post/doCloseWorkOrder.ts
@@ -1,12 +1,17 @@
 import type { Request, Response } from 'express'
 
-import { closeWorkOrder } from '../../database/closeWorkOrder.js'
+import closeWorkOrder, {
+  type CloseWorkOrderForm
+} from '../../database/closeWorkOrder.js'
 
 export async function handler(
   request: Request,
   response: Response
 ): Promise<void> {
-  const success = await closeWorkOrder(request.body, request.session.user as User)
+  const success = await closeWorkOrder(
+    request.body as CloseWorkOrderForm,
+    request.session.user as User
+  )
 
   response.json({
     success
diff --git a/handlers/workOrders-post/doCompleteWorkOrderMilestone.js b/handlers/workOrders-post/doCompleteWorkOrderMilestone.js
index 0566fc93..feeb981d 100644
--- a/handlers/workOrders-post/doCompleteWorkOrderMilestone.js
+++ b/handlers/workOrders-post/doCompleteWorkOrderMilestone.js
@@ -1,4 +1,4 @@
-import { completeWorkOrderMilestone } from '../../database/completeWorkOrderMilestone.js';
+import completeWorkOrderMilestone from '../../database/completeWorkOrderMilestone.js';
 import { getWorkOrderMilestones } from '../../database/getWorkOrderMilestones.js';
 export async function handler(request, response) {
     const success = await completeWorkOrderMilestone({
diff --git a/handlers/workOrders-post/doCompleteWorkOrderMilestone.ts b/handlers/workOrders-post/doCompleteWorkOrderMilestone.ts
index 49666e7b..b05b560c 100644
--- a/handlers/workOrders-post/doCompleteWorkOrderMilestone.ts
+++ b/handlers/workOrders-post/doCompleteWorkOrderMilestone.ts
@@ -1,6 +1,6 @@
 import type { Request, Response } from 'express'
 
-import { completeWorkOrderMilestone } from '../../database/completeWorkOrderMilestone.js'
+import completeWorkOrderMilestone from '../../database/completeWorkOrderMilestone.js'
 import { getWorkOrderMilestones } from '../../database/getWorkOrderMilestones.js'
 
 export async function handler(
diff --git a/handlers/workOrders-post/doCreateWorkOrder.js b/handlers/workOrders-post/doCreateWorkOrder.js
index 1d6b19cf..8a627642 100644
--- a/handlers/workOrders-post/doCreateWorkOrder.js
+++ b/handlers/workOrders-post/doCreateWorkOrder.js
@@ -1,4 +1,4 @@
-import { addWorkOrder } from '../../database/addWorkOrder.js';
+import addWorkOrder from '../../database/addWorkOrder.js';
 export async function handler(request, response) {
     const workOrderId = await addWorkOrder(request.body, request.session.user);
     response.json({
diff --git a/handlers/workOrders-post/doCreateWorkOrder.ts b/handlers/workOrders-post/doCreateWorkOrder.ts
index 53fa32c7..f5f435ef 100644
--- a/handlers/workOrders-post/doCreateWorkOrder.ts
+++ b/handlers/workOrders-post/doCreateWorkOrder.ts
@@ -1,12 +1,17 @@
 import type { Request, Response } from 'express'
 
-import { addWorkOrder } from '../../database/addWorkOrder.js'
+import addWorkOrder, {
+  type AddWorkOrderForm
+} from '../../database/addWorkOrder.js'
 
 export async function handler(
   request: Request,
   response: Response
 ): Promise<void> {
-  const workOrderId = await addWorkOrder(request.body, request.session.user as User)
+  const workOrderId = await addWorkOrder(
+    request.body as AddWorkOrderForm,
+    request.session.user as User
+  )
 
   response.json({
     success: true,
diff --git a/helpers/functions.cache.js b/helpers/functions.cache.js
index 79570261..98ec3127 100644
--- a/helpers/functions.cache.js
+++ b/helpers/functions.cache.js
@@ -1,6 +1,5 @@
 import cluster from 'node:cluster';
 import Debug from 'debug';
-import * as configFunctions from './functions.config.js';
 import { getLotOccupantTypes as getLotOccupantTypesFromDatabase } from '../database/getLotOccupantTypes.js';
 import { getLotStatuses as getLotStatusesFromDatabase } from '../database/getLotStatuses.js';
 import { getLotTypes as getLotTypesFromDatabase } from '../database/getLotTypes.js';
@@ -8,6 +7,7 @@ import { getOccupancyTypeFields as getOccupancyTypeFieldsFromDatabase } from '..
 import { getOccupancyTypes as getOccupancyTypesFromDatabase } from '../database/getOccupancyTypes.js';
 import { getWorkOrderMilestoneTypes as getWorkOrderMilestoneTypesFromDatabase } from '../database/getWorkOrderMilestoneTypes.js';
 import { getWorkOrderTypes as getWorkOrderTypesFromDatabase } from '../database/getWorkOrderTypes.js';
+import * as configFunctions from './functions.config.js';
 const debug = Debug(`lot-occupancy-system:functions.cache:${process.pid}`);
 let lotOccupantTypes;
 export async function getLotOccupantTypes() {
diff --git a/helpers/functions.cache.ts b/helpers/functions.cache.ts
index 1fac05f9..bae4c6c8 100644
--- a/helpers/functions.cache.ts
+++ b/helpers/functions.cache.ts
@@ -1,15 +1,7 @@
-// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair
-/* eslint-disable @typescript-eslint/indent */
-
 import cluster from 'node:cluster'
 
 import Debug from 'debug'
 
-import type { ClearCacheWorkerMessage } from '../types/applicationTypes.js'
-// eslint-disable-next-line import/namespace
-import type * as recordTypes from '../types/recordTypes.js'
-
-import * as configFunctions from './functions.config.js'
 import { getLotOccupantTypes as getLotOccupantTypesFromDatabase } from '../database/getLotOccupantTypes.js'
 import { getLotStatuses as getLotStatusesFromDatabase } from '../database/getLotStatuses.js'
 import { getLotTypes as getLotTypesFromDatabase } from '../database/getLotTypes.js'
@@ -17,6 +9,10 @@ import { getOccupancyTypeFields as getOccupancyTypeFieldsFromDatabase } from '..
 import { getOccupancyTypes as getOccupancyTypesFromDatabase } from '../database/getOccupancyTypes.js'
 import { getWorkOrderMilestoneTypes as getWorkOrderMilestoneTypesFromDatabase } from '../database/getWorkOrderMilestoneTypes.js'
 import { getWorkOrderTypes as getWorkOrderTypesFromDatabase } from '../database/getWorkOrderTypes.js'
+import type { ClearCacheWorkerMessage } from '../types/applicationTypes.js'
+import type * as recordTypes from '../types/recordTypes.js'
+
+import * as configFunctions from './functions.config.js'
 
 const debug = Debug(`lot-occupancy-system:functions.cache:${process.pid}`)
 
diff --git a/helpers/functions.config.ts b/helpers/functions.config.ts
index f7c9f809..9429378c 100644
--- a/helpers/functions.config.ts
+++ b/helpers/functions.config.ts
@@ -1,7 +1,3 @@
-// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair
-/* eslint-disable @typescript-eslint/indent, n/no-unpublished-import */
-
-// eslint-disable-next-line n/no-extraneous-import
 import type { config as MSSQLConfig } from 'mssql'
 
 import { config } from '../data/config.js'
diff --git a/helpers/functions.lots.js b/helpers/functions.lots.js
index fc43e23d..0935c08c 100644
--- a/helpers/functions.lots.js
+++ b/helpers/functions.lots.js
@@ -1,8 +1,8 @@
 import cluster from 'node:cluster';
-import NodeCache from 'node-cache';
-import getPreviousLotIdFromDatabase from '../database/getPreviousLotId.js';
-import getNextLotIdFromDatabase from '../database/getNextLotId.js';
 import Debug from 'debug';
+import NodeCache from 'node-cache';
+import getNextLotIdFromDatabase from '../database/getNextLotId.js';
+import getPreviousLotIdFromDatabase from '../database/getPreviousLotId.js';
 const debug = Debug(`lot-occupancy-system:functions.lots:${process.pid}`);
 const cacheOptions = {
     stdTTL: 2 * 60,
diff --git a/helpers/functions.lots.ts b/helpers/functions.lots.ts
index c13eb3d9..6987b158 100644
--- a/helpers/functions.lots.ts
+++ b/helpers/functions.lots.ts
@@ -1,18 +1,15 @@
-/* eslint-disable @typescript-eslint/indent */
-
 import cluster from 'node:cluster'
 
+import Debug from 'debug'
 import NodeCache from 'node-cache'
 
-import getPreviousLotIdFromDatabase from '../database/getPreviousLotId.js'
 import getNextLotIdFromDatabase from '../database/getNextLotId.js'
-
+import getPreviousLotIdFromDatabase from '../database/getPreviousLotId.js'
 import type {
   CacheLotIdsWorkerMessage,
   ClearNextPreviousLotIdsCacheWorkerMessage
 } from '../types/applicationTypes.js'
 
-import Debug from 'debug'
 const debug = Debug(`lot-occupancy-system:functions.lots:${process.pid}`)
 
 const cacheOptions: NodeCache.Options = {
diff --git a/helpers/functions.sqlFilters.js b/helpers/functions.sqlFilters.js
index 2b2c381c..3e610cbf 100644
--- a/helpers/functions.sqlFilters.js
+++ b/helpers/functions.sqlFilters.js
@@ -39,26 +39,20 @@ export function getOccupancyTimeWhereClause(occupancyTime, lotOccupanciesTableAl
     const currentDateString = dateToInteger(new Date());
     switch (occupancyTime ?? '') {
         case 'current': {
-            sqlWhereClause +=
-                ' and ' +
-                    lotOccupanciesTableAlias +
-                    '.occupancyStartDate <= ? and (' +
-                    lotOccupanciesTableAlias +
-                    '.occupancyEndDate is null or ' +
-                    lotOccupanciesTableAlias +
-                    '.occupancyEndDate >= ?)';
+            sqlWhereClause += ` and ${lotOccupanciesTableAlias}.occupancyStartDate <= ?
+        and (${lotOccupanciesTableAlias}.occupancyEndDate is null or ${lotOccupanciesTableAlias}.occupancyEndDate >= ?)`;
             sqlParameters.push(currentDateString, currentDateString);
             break;
         }
         case 'past': {
             sqlWhereClause +=
-                ' and ' + lotOccupanciesTableAlias + '.occupancyEndDate < ?';
+                ` and ${lotOccupanciesTableAlias}.occupancyEndDate < ?`;
             sqlParameters.push(currentDateString);
             break;
         }
         case 'future': {
             sqlWhereClause +=
-                ' and ' + lotOccupanciesTableAlias + '.occupancyStartDate > ?';
+                ` and ${lotOccupanciesTableAlias}.occupancyStartDate > ?`;
             sqlParameters.push(currentDateString);
             break;
         }
diff --git a/helpers/functions.sqlFilters.ts b/helpers/functions.sqlFilters.ts
index a8a44247..edce1a64 100644
--- a/helpers/functions.sqlFilters.ts
+++ b/helpers/functions.sqlFilters.ts
@@ -65,28 +65,22 @@ export function getOccupancyTimeWhereClause(
 
   switch (occupancyTime ?? '') {
     case 'current': {
-      sqlWhereClause +=
-        ' and ' +
-        lotOccupanciesTableAlias +
-        '.occupancyStartDate <= ? and (' +
-        lotOccupanciesTableAlias +
-        '.occupancyEndDate is null or ' +
-        lotOccupanciesTableAlias +
-        '.occupancyEndDate >= ?)'
+      sqlWhereClause += ` and ${lotOccupanciesTableAlias}.occupancyStartDate <= ?
+        and (${lotOccupanciesTableAlias}.occupancyEndDate is null or ${lotOccupanciesTableAlias}.occupancyEndDate >= ?)`
       sqlParameters.push(currentDateString, currentDateString)
       break
     }
 
     case 'past': {
       sqlWhereClause +=
-        ' and ' + lotOccupanciesTableAlias + '.occupancyEndDate < ?'
+        ` and ${lotOccupanciesTableAlias}.occupancyEndDate < ?`
       sqlParameters.push(currentDateString)
       break
     }
 
     case 'future': {
       sqlWhereClause +=
-        ' and ' + lotOccupanciesTableAlias + '.occupancyStartDate > ?'
+        ` and ${lotOccupanciesTableAlias}.occupancyStartDate > ?`
       sqlParameters.push(currentDateString)
       break
     }
diff --git a/helpers/initializer.database.cemetery.js b/helpers/initializer.database.cemetery.js
index 505e4f0f..476330cc 100644
--- a/helpers/initializer.database.cemetery.js
+++ b/helpers/initializer.database.cemetery.js
@@ -1,7 +1,7 @@
 import Debug from 'debug';
 import { lotOccupancyDB as databasePath } from '../data/databasePaths.js';
-import { addLotOccupantType } from '../database/addLotOccupantType.js';
-import { addOccupancyTypeField } from '../database/addOccupancyTypeField.js';
+import addLotOccupantType from '../database/addLotOccupantType.js';
+import addOccupancyTypeField from '../database/addOccupancyTypeField.js';
 import { addRecord } from '../database/addRecord.js';
 import { initializeDatabase } from './initializer.database.js';
 const debug = Debug('lot-occupancy-system:initialize');
@@ -59,7 +59,7 @@ export async function initializeCemeteryDatabase() {
         occupancyTypeId: intermentOccupancyTypeId,
         occupancyTypeField: 'Death Date',
         occupancyTypeFieldValues: '',
-        pattern: '\\d{4}([\\/-]\\d{2}){2}',
+        pattern: String.raw `\d{4}([\/-]\d{2}){2}`,
         isRequired: '',
         minimumLength: 10,
         maximumLength: 10,
@@ -73,7 +73,7 @@ export async function initializeCemeteryDatabase() {
         occupancyTypeId: intermentOccupancyTypeId,
         occupancyTypeField: 'Death Age',
         occupancyTypeFieldValues: '',
-        pattern: '\\d+',
+        pattern: String.raw `\d+`,
         isRequired: '',
         minimumLength: 1,
         maximumLength: 3,
@@ -123,7 +123,7 @@ export async function initializeCemeteryDatabase() {
         occupancyTypeId: intermentOccupancyTypeId,
         occupancyTypeField: 'Funeral Date',
         occupancyTypeFieldValues: '',
-        pattern: '\\d{4}([\\/-]\\d{2}){2}',
+        pattern: String.raw `\d{4}([\/-]\d{2}){2}`,
         isRequired: '',
         minimumLength: 10,
         maximumLength: 10,
diff --git a/helpers/initializer.database.cemetery.ts b/helpers/initializer.database.cemetery.ts
index 033a26b5..d19f69af 100644
--- a/helpers/initializer.database.cemetery.ts
+++ b/helpers/initializer.database.cemetery.ts
@@ -1,8 +1,8 @@
 import Debug from 'debug'
 
 import { lotOccupancyDB as databasePath } from '../data/databasePaths.js'
-import { addLotOccupantType } from '../database/addLotOccupantType.js'
-import { addOccupancyTypeField } from '../database/addOccupancyTypeField.js'
+import addLotOccupantType from '../database/addLotOccupantType.js'
+import addOccupancyTypeField from '../database/addOccupancyTypeField.js'
 import { addRecord } from '../database/addRecord.js'
 
 import { initializeDatabase } from './initializer.database.js'
@@ -119,7 +119,7 @@ export async function initializeCemeteryDatabase(): Promise<boolean> {
     occupancyTypeId: intermentOccupancyTypeId,
     occupancyTypeField: 'Death Date',
     occupancyTypeFieldValues: '',
-    pattern: '\\d{4}([\\/-]\\d{2}){2}',
+    pattern: String.raw`\d{4}([\/-]\d{2}){2}`,
     isRequired: '',
     minimumLength: 10,
     maximumLength: 10,
@@ -140,7 +140,7 @@ export async function initializeCemeteryDatabase(): Promise<boolean> {
     occupancyTypeId: intermentOccupancyTypeId,
     occupancyTypeField: 'Death Age',
     occupancyTypeFieldValues: '',
-    pattern: '\\d+',
+    pattern: String.raw`\d+`,
     isRequired: '',
     minimumLength: 1,
     maximumLength: 3,
@@ -218,7 +218,7 @@ export async function initializeCemeteryDatabase(): Promise<boolean> {
     occupancyTypeId: intermentOccupancyTypeId,
     occupancyTypeField: 'Funeral Date',
     occupancyTypeFieldValues: '',
-    pattern: '\\d{4}([\\/-]\\d{2}){2}',
+    pattern: String.raw`\d{4}([\/-]\d{2}){2}`,
     isRequired: '',
     minimumLength: 10,
     maximumLength: 10,
diff --git a/public-typescript/adminDatabase.ts b/public-typescript/adminDatabase.ts
index 767984e3..d3858bdc 100644
--- a/public-typescript/adminDatabase.ts
+++ b/public-typescript/adminDatabase.ts
@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/indent, @typescript-eslint/no-non-null-assertion, unicorn/prefer-module */
+/* @typescript-eslint/no-non-null-assertion, unicorn/prefer-module */
 
 import type * as globalTypes from '../types/globalTypes'
 
diff --git a/public-typescript/adminFees.ts b/public-typescript/adminFees.ts
index 2614f440..1344aa11 100644
--- a/public-typescript/adminFees.ts
+++ b/public-typescript/adminFees.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/indent */
 /* eslint-disable @typescript-eslint/no-non-null-assertion, unicorn/prefer-module */
 
 import type * as globalTypes from '../types/globalTypes'
diff --git a/public-typescript/adminLotTypes.ts b/public-typescript/adminLotTypes.ts
index 78a1c2ae..8f3308e8 100644
--- a/public-typescript/adminLotTypes.ts
+++ b/public-typescript/adminLotTypes.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/indent */
 /* eslint-disable @typescript-eslint/no-non-null-assertion, unicorn/prefer-module */
 
 import type * as globalTypes from '../types/globalTypes'
diff --git a/public-typescript/adminOccupancyTypes.ts b/public-typescript/adminOccupancyTypes.ts
index 8d741926..bf10675d 100644
--- a/public-typescript/adminOccupancyTypes.ts
+++ b/public-typescript/adminOccupancyTypes.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/indent */
 /* eslint-disable @typescript-eslint/no-non-null-assertion, unicorn/prefer-module */
 
 import type * as globalTypes from '../types/globalTypes'
diff --git a/public-typescript/adminTables/adminTablesLotOccupantTypes.ts b/public-typescript/adminTables/adminTablesLotOccupantTypes.ts
index e17d0c1b..37ee7da2 100644
--- a/public-typescript/adminTables/adminTablesLotOccupantTypes.ts
+++ b/public-typescript/adminTables/adminTablesLotOccupantTypes.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/indent */
 /* eslint-disable @typescript-eslint/no-non-null-assertion, unicorn/prefer-module */
 
 import type * as globalTypes from '../../types/globalTypes'
diff --git a/public-typescript/adminTables/adminTablesLotStatuses.ts b/public-typescript/adminTables/adminTablesLotStatuses.ts
index 1d8a32d6..8ab8e416 100644
--- a/public-typescript/adminTables/adminTablesLotStatuses.ts
+++ b/public-typescript/adminTables/adminTablesLotStatuses.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/indent */
 /* eslint-disable @typescript-eslint/no-non-null-assertion, unicorn/prefer-module */
 
 import type * as globalTypes from '../../types/globalTypes'
diff --git a/public-typescript/adminTables/adminTablesWorkOrderMilestoneTypes.ts b/public-typescript/adminTables/adminTablesWorkOrderMilestoneTypes.ts
index 118ab760..e2c3145b 100644
--- a/public-typescript/adminTables/adminTablesWorkOrderMilestoneTypes.ts
+++ b/public-typescript/adminTables/adminTablesWorkOrderMilestoneTypes.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/indent */
 /* eslint-disable @typescript-eslint/no-non-null-assertion, unicorn/prefer-module */
 
 import type * as globalTypes from '../../types/globalTypes'
diff --git a/public-typescript/adminTables/adminTablesWorkOrderTypes.ts b/public-typescript/adminTables/adminTablesWorkOrderTypes.ts
index 93e5ad46..4420b25d 100644
--- a/public-typescript/adminTables/adminTablesWorkOrderTypes.ts
+++ b/public-typescript/adminTables/adminTablesWorkOrderTypes.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/indent */
 /* eslint-disable @typescript-eslint/no-non-null-assertion, unicorn/prefer-module */
 
 import type * as globalTypes from '../../types/globalTypes'
diff --git a/public-typescript/lotOccupancyEdit/lotOccupancyEditFees.ts b/public-typescript/lotOccupancyEdit/lotOccupancyEditFees.ts
index 65dd6533..4f66f66b 100644
--- a/public-typescript/lotOccupancyEdit/lotOccupancyEditFees.ts
+++ b/public-typescript/lotOccupancyEdit/lotOccupancyEditFees.ts
@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/indent, unicorn/prefer-module */
+/* eslint-disable unicorn/prefer-module */
 
 import type * as globalTypes from '../../types/globalTypes'
 import type * as recordTypes from '../../types/recordTypes'
diff --git a/public-typescript/workOrderEdit/workOrderEdit.ts b/public-typescript/workOrderEdit/workOrderEdit.ts
index 47ac5636..7c340ae9 100644
--- a/public-typescript/workOrderEdit/workOrderEdit.ts
+++ b/public-typescript/workOrderEdit/workOrderEdit.ts
@@ -1,4 +1,4 @@
-/* eslint-disable spaced-comment, @typescript-eslint/indent, @typescript-eslint/no-non-null-assertion, unicorn/prefer-module */
+/* eslint-disable spaced-comment, @typescript-eslint/no-non-null-assertion, unicorn/prefer-module */
 
 import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types'
 import type { BulmaJS } from '@cityssm/bulma-js/types'
diff --git a/public-typescript/workOrderEdit/workOrderEditLots.ts b/public-typescript/workOrderEdit/workOrderEditLots.ts
index de9e1023..369fdab2 100644
--- a/public-typescript/workOrderEdit/workOrderEditLots.ts
+++ b/public-typescript/workOrderEdit/workOrderEditLots.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/indent */
 /* eslint-disable @typescript-eslint/no-non-null-assertion, unicorn/prefer-module */
 
 import type { cityssmGlobal } from '@cityssm/bulma-webapp-js/src/types'
diff --git a/temp/legacy.importFromCSV.js b/temp/legacy.importFromCSV.js
index d76bbd0c..eb03de6b 100644
--- a/temp/legacy.importFromCSV.js
+++ b/temp/legacy.importFromCSV.js
@@ -3,19 +3,19 @@ import { dateIntegerToString, dateToString } from '@cityssm/utils-datetime';
 import sqlite from 'better-sqlite3';
 import papa from 'papaparse';
 import { lotOccupancyDB as databasePath } from '../data/databasePaths.js';
-import { addLot } from '../database/addLot.js';
-import { addLotOccupancy } from '../database/addLotOccupancy.js';
-import { addLotOccupancyComment } from '../database/addLotOccupancyComment.js';
-import { addLotOccupancyFee } from '../database/addLotOccupancyFee.js';
-import { addLotOccupancyOccupant } from '../database/addLotOccupancyOccupant.js';
-import { addLotOccupancyTransaction } from '../database/addLotOccupancyTransaction.js';
-import { addMap } from '../database/addMap.js';
-import { addOrUpdateLotOccupancyField } from '../database/addOrUpdateLotOccupancyField.js';
-import { addWorkOrder } from '../database/addWorkOrder.js';
-import { addWorkOrderLot } from '../database/addWorkOrderLot.js';
-import { addWorkOrderLotOccupancy } from '../database/addWorkOrderLotOccupancy.js';
-import { addWorkOrderMilestone } from '../database/addWorkOrderMilestone.js';
-import { closeWorkOrder } from '../database/closeWorkOrder.js';
+import addLot from '../database/addLot.js';
+import addLotOccupancy from '../database/addLotOccupancy.js';
+import addLotOccupancyComment from '../database/addLotOccupancyComment.js';
+import addLotOccupancyFee from '../database/addLotOccupancyFee.js';
+import addLotOccupancyOccupant from '../database/addLotOccupancyOccupant.js';
+import addLotOccupancyTransaction from '../database/addLotOccupancyTransaction.js';
+import addMap from '../database/addMap.js';
+import addOrUpdateLotOccupancyField from '../database/addOrUpdateLotOccupancyField.js';
+import addWorkOrder from '../database/addWorkOrder.js';
+import addWorkOrderLot from '../database/addWorkOrderLot.js';
+import addWorkOrderLotOccupancy from '../database/addWorkOrderLotOccupancy.js';
+import addWorkOrderMilestone from '../database/addWorkOrderMilestone.js';
+import closeWorkOrder from '../database/closeWorkOrder.js';
 import { getLot, getLotByLotName } from '../database/getLot.js';
 import { getLotOccupancies } from '../database/getLotOccupancies.js';
 import { getMap as getMapFromDatabase } from '../database/getMap.js';
diff --git a/temp/legacy.importFromCSV.ts b/temp/legacy.importFromCSV.ts
index e818e2a1..41ad462f 100644
--- a/temp/legacy.importFromCSV.ts
+++ b/temp/legacy.importFromCSV.ts
@@ -5,19 +5,19 @@ import sqlite from 'better-sqlite3'
 import papa from 'papaparse'
 
 import { lotOccupancyDB as databasePath } from '../data/databasePaths.js'
-import { addLot } from '../database/addLot.js'
-import { addLotOccupancy } from '../database/addLotOccupancy.js'
-import { addLotOccupancyComment } from '../database/addLotOccupancyComment.js'
-import { addLotOccupancyFee } from '../database/addLotOccupancyFee.js'
-import { addLotOccupancyOccupant } from '../database/addLotOccupancyOccupant.js'
-import { addLotOccupancyTransaction } from '../database/addLotOccupancyTransaction.js'
-import { addMap } from '../database/addMap.js'
-import { addOrUpdateLotOccupancyField } from '../database/addOrUpdateLotOccupancyField.js'
-import { addWorkOrder } from '../database/addWorkOrder.js'
-import { addWorkOrderLot } from '../database/addWorkOrderLot.js'
-import { addWorkOrderLotOccupancy } from '../database/addWorkOrderLotOccupancy.js'
-import { addWorkOrderMilestone } from '../database/addWorkOrderMilestone.js'
-import { closeWorkOrder } from '../database/closeWorkOrder.js'
+import addLot from '../database/addLot.js'
+import addLotOccupancy from '../database/addLotOccupancy.js'
+import addLotOccupancyComment from '../database/addLotOccupancyComment.js'
+import addLotOccupancyFee from '../database/addLotOccupancyFee.js'
+import addLotOccupancyOccupant from '../database/addLotOccupancyOccupant.js'
+import addLotOccupancyTransaction from '../database/addLotOccupancyTransaction.js'
+import addMap from '../database/addMap.js'
+import addOrUpdateLotOccupancyField from '../database/addOrUpdateLotOccupancyField.js'
+import addWorkOrder from '../database/addWorkOrder.js'
+import addWorkOrderLot from '../database/addWorkOrderLot.js'
+import addWorkOrderLotOccupancy from '../database/addWorkOrderLotOccupancy.js'
+import addWorkOrderMilestone from '../database/addWorkOrderMilestone.js'
+import closeWorkOrder from '../database/closeWorkOrder.js'
 import { getLot, getLotByLotName } from '../database/getLot.js'
 import { getLotOccupancies } from '../database/getLotOccupancies.js'
 import { getMap as getMapFromDatabase } from '../database/getMap.js'