linting

.eslintrc.json

@@ -12,6 +12,7 @@
   "plugins": ["@typescript-eslint", "unicorn"],
   "extends": [
     "eslint:recommended",
+    "standard-with-typescript",
     "plugin:import/recommended",
     "plugin:import/typescript",
     "plugin:node/recommended",
@@ -21,6 +22,10 @@
   ],
   "rules": {
     "@typescript-eslint/no-extra-semi": "off",
+    "@typescript-eslint/no-non-null-assertion": "off",
+    "@typescript-eslint/restrict-plus-operands": "warn",
+    "@typescript-eslint/space-before-function-paren": "off",
+    "@typescript-eslint/strict-boolean-expressions": "warn",
     "node/no-missing-import": "off",
     "node/no-unpublished-import": "off",
     "unicorn/consistent-function-scoping": "warn",

.prettierrc.json

@@ -2,5 +2,6 @@
   "trailingComma": "none",
   "tabWidth": 2,
   "semi": false,
-  "singleQuote": true
+  "singleQuote": true,
+  "bracketSpacing": true
 }

app.js

@@ -30,13 +30,13 @@ import { getSafeRedirectURL } from './helpers/functions.authentication.js';
 import debug from 'debug';
 const debugApp = debug('lot-occupancy-system:app');
 databaseInitializer.initializeDatabase();
-const __dirname = '.';
+const _dirname = '.';
 export const app = express();
 app.disable('X-Powered-By');
 if (!configFunctions.getProperty('reverseProxy.disableEtag')) {
     app.set('etag', false);
 }
-app.set('views', path.join(__dirname, 'views'));
+app.set('views', path.join(_dirname, 'views'));
 app.set('view engine', 'ejs');
 if (!configFunctions.getProperty('reverseProxy.disableCompression')) {
     app.use(compression());
@@ -87,17 +87,20 @@ app.use(session({
     }
 }));
 app.use((request, response, next) => {
-    if (request.cookies[sessionCookieName] && !request.session.user) {
+    if (Object.hasOwn(request.cookies, sessionCookieName) &&
+        !Object.hasOwn(request.session, 'user')) {
         response.clearCookie(sessionCookieName);
     }
     next();
 });
 const sessionChecker = (request, response, next) => {
-    if (request.session.user && request.cookies[sessionCookieName]) {
+    if (Object.hasOwn(request.session, 'user') &&
-        return next();
+        Object.hasOwn(request.cookies, sessionCookieName)) {
+        next();
+        return;
     }
     const redirectUrl = getSafeRedirectURL(request.originalUrl);
-    return response.redirect(`${urlPrefix}/login?redirect=${encodeURIComponent(redirectUrl)}`);
+    response.redirect(`${urlPrefix}/login?redirect=${encodeURIComponent(redirectUrl)}`);
 };
 app.use((request, response, next) => {
     response.locals.buildNumber = version;
@@ -128,7 +131,8 @@ app.all(urlPrefix + '/keepAlive', (_request, response) => {
 });
 app.use(urlPrefix + '/login', routerLogin);
 app.get(urlPrefix + '/logout', (request, response) => {
-    if (request.session.user && request.cookies[sessionCookieName]) {
+    if (Object.hasOwn(request.session, 'user') &&
+        Object.hasOwn(request.cookies, sessionCookieName)) {
         request.session.destroy(() => {
             response.clearCookie(sessionCookieName);
             response.redirect(urlPrefix + '/');

app.ts

@@ -48,7 +48,7 @@ databaseInitializer.initializeDatabase()
  * INITIALIZE APP
  */
 
-const __dirname = '.'
+const _dirname = '.'
 
 export const app = express()
 
@@ -59,7 +59,7 @@ if (!configFunctions.getProperty('reverseProxy.disableEtag')) {
 }
 
 // View engine setup
-app.set('views', path.join(__dirname, 'views'))
+app.set('views', path.join(_dirname, 'views'))
 app.set('view engine', 'ejs')
 
 if (!configFunctions.getProperty('reverseProxy.disableCompression')) {
@@ -124,17 +124,27 @@ app.use(
   express.static(path.join('node_modules', '@cityssm', 'bulma-webapp-js'))
 )
 
-app.use(urlPrefix + '/lib/fa', express.static(path.join('node_modules', '@fortawesome', 'fontawesome-free')))
+app.use(
+  urlPrefix + '/lib/fa',
+  express.static(path.join('node_modules', '@fortawesome', 'fontawesome-free'))
+)
 
-app.use(urlPrefix + '/lib/leaflet', express.static(path.join('node_modules', 'leaflet', 'dist')))
+app.use(
+  urlPrefix + '/lib/leaflet',
+  express.static(path.join('node_modules', 'leaflet', 'dist'))
+)
 
-app.use(urlPrefix + '/lib/randomcolor', express.static(path.join('node_modules', 'randomcolor')))
+app.use(
+  urlPrefix + '/lib/randomcolor',
+  express.static(path.join('node_modules', 'randomcolor'))
+)
 
 /*
  * SESSION MANAGEMENT
  */
 
-const sessionCookieName: string = configFunctions.getProperty('session.cookieName')
+const sessionCookieName: string =
+  configFunctions.getProperty('session.cookieName')
 
 const FileStoreSession = FileStore(session)
 
@@ -160,7 +170,10 @@ app.use(
 
 // Clear cookie if no corresponding session
 app.use((request, response, next) => {
-  if (request.cookies[sessionCookieName] && !request.session.user) {
+  if (
+    Object.hasOwn(request.cookies, sessionCookieName) &&
+    !Object.hasOwn(request.session, 'user')
+  ) {
     response.clearCookie(sessionCookieName)
   }
 
@@ -168,14 +181,24 @@ app.use((request, response, next) => {
 })
 
 // Redirect logged in users
-const sessionChecker = (request: express.Request, response: express.Response, next: express.NextFunction) => {
+const sessionChecker = (
-  if (request.session.user && request.cookies[sessionCookieName]) {
+  request: express.Request,
-    return next()
+  response: express.Response,
+  next: express.NextFunction
+): void => {
+  if (
+    Object.hasOwn(request.session, 'user') &&
+    Object.hasOwn(request.cookies, sessionCookieName)
+  ) {
+    next()
+    return
   }
 
   const redirectUrl = getSafeRedirectURL(request.originalUrl)
 
-  return response.redirect(`${urlPrefix}/login?redirect=${encodeURIComponent(redirectUrl)}`)
+  response.redirect(
+    `${urlPrefix}/login?redirect=${encodeURIComponent(redirectUrl)}`
+  )
 }
 
 /*
@@ -196,7 +219,9 @@ app.use((request, response, next) => {
   response.locals.stringFunctions = stringFns
   response.locals.htmlFunctions = htmlFns
 
-  response.locals.urlPrefix = configFunctions.getProperty('reverseProxy.urlPrefix')
+  response.locals.urlPrefix = configFunctions.getProperty(
+    'reverseProxy.urlPrefix'
+  )
 
   next()
 })
@@ -216,7 +241,12 @@ app.use(urlPrefix + '/lotOccupancies', sessionChecker, routerLotOccupancies)
 app.use(urlPrefix + '/workOrders', sessionChecker, routerWorkOrders)
 
 app.use(urlPrefix + '/reports', sessionChecker, routerReports)
-app.use(urlPrefix + '/admin', sessionChecker, permissionHandlers.adminGetHandler, routerAdmin)
+app.use(
+  urlPrefix + '/admin',
+  sessionChecker,
+  permissionHandlers.adminGetHandler,
+  routerAdmin
+)
 
 app.all(urlPrefix + '/keepAlive', (_request, response) => {
   response.json(true)
@@ -225,7 +255,10 @@ app.all(urlPrefix + '/keepAlive', (_request, response) => {
 app.use(urlPrefix + '/login', routerLogin)
 
 app.get(urlPrefix + '/logout', (request, response) => {
-  if (request.session.user && request.cookies[sessionCookieName]) {
+  if (
+    Object.hasOwn(request.session, 'user') &&
+    Object.hasOwn(request.cookies, sessionCookieName)
+  ) {
     request.session.destroy(() => {
       response.clearCookie(sessionCookieName)
       response.redirect(urlPrefix + '/')

bin/www.js

@@ -1,21 +1,21 @@
-import { app } from "../app.js";
+import { app } from '../app.js';
-import http from "node:http";
+import http from 'node:http';
-import * as configFunctions from "../helpers/functions.config.js";
+import * as configFunctions from '../helpers/functions.config.js';
-import exitHook from "exit-hook";
+import exitHook from 'exit-hook';
-import ntfyPublish from "@cityssm/ntfy-publish";
+import ntfyPublish from '@cityssm/ntfy-publish';
-import Debug from "debug";
+import Debug from 'debug';
-const debug = Debug("lot-occupancy-system:www");
+const debug = Debug('lot-occupancy-system:www');
 function onError(error) {
-    if (error.syscall !== "listen") {
+    if (error.syscall !== 'listen') {
         throw error;
     }
     switch (error.code) {
-        case "EACCES": {
+        case 'EACCES': {
-            debug("Requires elevated privileges");
+            debug('Requires elevated privileges');
             process.exit(1);
         }
-        case "EADDRINUSE": {
+        case 'EADDRINUSE': {
-            debug("Port is already in use.");
+            debug('Port is already in use.');
             process.exit(1);
         }
         default: {
@@ -26,21 +26,21 @@ function onError(error) {
 function onListening(server) {
     const addr = server.address();
     if (addr) {
-        const bind = typeof addr === "string" ? "pipe " + addr : "port " + addr.port.toString();
+        const bind = typeof addr === 'string' ? 'pipe ' + addr : 'port ' + addr.port.toString();
-        debug("Listening on " + bind);
+        debug('Listening on ' + bind);
     }
 }
-const ntfyStartupConfig = configFunctions.getProperty("application.ntfyStartup");
+const ntfyStartupConfig = configFunctions.getProperty('application.ntfyStartup');
-const httpPort = configFunctions.getProperty("application.httpPort");
+const httpPort = configFunctions.getProperty('application.httpPort');
 const httpServer = http.createServer(app);
 httpServer.listen(httpPort);
-httpServer.on("error", onError);
+httpServer.on('error', onError);
-httpServer.on("listening", () => {
+httpServer.on('listening', () => {
     onListening(httpServer);
 });
-debug("HTTP listening on " + httpPort.toString());
+debug('HTTP listening on ' + httpPort.toString());
 exitHook(() => {
-    debug("Closing HTTP");
+    debug('Closing HTTP');
     httpServer.close();
 });
 if (ntfyStartupConfig) {
@@ -48,15 +48,15 @@ if (ntfyStartupConfig) {
     const server = ntfyStartupConfig.server;
     const ntfyStartupMessage = {
         topic,
-        title: configFunctions.getProperty("application.applicationName"),
+        title: configFunctions.getProperty('application.applicationName'),
-        message: "Application Started",
+        message: 'Application Started',
-        tags: ["arrow_up"]
+        tags: ['arrow_up']
     };
     const ntfyShutdownMessage = {
         topic,
-        title: configFunctions.getProperty("application.applicationName"),
+        title: configFunctions.getProperty('application.applicationName'),
-        message: "Application Shut Down",
+        message: 'Application Shut Down',
-        tags: ["arrow_down"]
+        tags: ['arrow_down']
     };
     if (server) {
         ntfyStartupMessage.server = server;
@@ -64,7 +64,7 @@ if (ntfyStartupConfig) {
     }
     await ntfyPublish(ntfyStartupMessage);
     exitHook(() => {
-        debug("Sending ntfy notification");
+        debug('Sending ntfy notification');
-        ntfyPublish(ntfyShutdownMessage);
+        void ntfyPublish(ntfyShutdownMessage);
     });
 }

bin/www.ts

@@ -1,58 +1,59 @@
 /* eslint-disable no-process-exit, unicorn/no-process-exit */
 
-import { app } from "../app.js";
+import { app } from '../app.js'
 
-import http from "node:http";
+import http from 'node:http'
 
-import * as configFunctions from "../helpers/functions.config.js";
+import * as configFunctions from '../helpers/functions.config.js'
 
-import exitHook from "exit-hook";
+import exitHook from 'exit-hook'
 
-import ntfyPublish from "@cityssm/ntfy-publish";
+import ntfyPublish from '@cityssm/ntfy-publish'
-import type * as ntfyTypes from "@cityssm/ntfy-publish/types";
+import type * as ntfyTypes from '@cityssm/ntfy-publish/types'
 
-import Debug from "debug";
+import Debug from 'debug'
-const debug = Debug("lot-occupancy-system:www");
+const debug = Debug('lot-occupancy-system:www')
 
 interface ServerError extends Error {
-    syscall: string;
+  syscall: string
-    code: string;
+  code: string
 }
 
-function onError(error: ServerError) {
+function onError(error: ServerError): void {
-    if (error.syscall !== "listen") {
+  if (error.syscall !== 'listen') {
-        throw error;
+    throw error
   }
 
   // handle specific listen errors with friendly messages
   switch (error.code) {
     // eslint-disable-next-line no-fallthrough
-        case "EACCES": {
+    case 'EACCES': {
-            debug("Requires elevated privileges");
+      debug('Requires elevated privileges')
-            process.exit(1);
+      process.exit(1)
       // break;
     }
 
     // eslint-disable-next-line no-fallthrough
-        case "EADDRINUSE": {
+    case 'EADDRINUSE': {
-            debug("Port is already in use.");
+      debug('Port is already in use.')
-            process.exit(1);
+      process.exit(1)
       // break;
     }
 
     // eslint-disable-next-line no-fallthrough
     default: {
-            throw error;
+      throw error
     }
   }
 }
 
-function onListening(server: http.Server) {
+function onListening(server: http.Server): void {
-    const addr = server.address();
+  const addr = server.address()
 
   if (addr) {
-        const bind = typeof addr === "string" ? "pipe " + addr : "port " + addr.port.toString();
+    const bind =
-        debug("Listening on " + bind);
+      typeof addr === 'string' ? 'pipe ' + addr : 'port ' + addr.port.toString()
+    debug('Listening on ' + bind)
   }
 }
 
@@ -60,53 +61,53 @@ function onListening(server: http.Server) {
  * Initialize HTTP
  */
 
-const ntfyStartupConfig = configFunctions.getProperty("application.ntfyStartup");
+const ntfyStartupConfig = configFunctions.getProperty('application.ntfyStartup')
 
-const httpPort = configFunctions.getProperty("application.httpPort");
+const httpPort = configFunctions.getProperty('application.httpPort')
 
-const httpServer = http.createServer(app);
+const httpServer = http.createServer(app)
 
-httpServer.listen(httpPort);
+httpServer.listen(httpPort)
 
-httpServer.on("error", onError);
+httpServer.on('error', onError)
-httpServer.on("listening", () => {
+httpServer.on('listening', () => {
-    onListening(httpServer);
+  onListening(httpServer)
-});
+})
 
-debug("HTTP listening on " + httpPort.toString());
+debug('HTTP listening on ' + httpPort.toString())
 
 exitHook(() => {
-    debug("Closing HTTP");
+  debug('Closing HTTP')
-    httpServer.close();
+  httpServer.close()
-});
+})
 
 if (ntfyStartupConfig) {
-    const topic = ntfyStartupConfig.topic;
+  const topic = ntfyStartupConfig.topic
-    const server = ntfyStartupConfig.server;
+  const server = ntfyStartupConfig.server
 
   const ntfyStartupMessage: ntfyTypes.NtfyMessageOptions = {
     topic,
-        title: configFunctions.getProperty("application.applicationName"),
+    title: configFunctions.getProperty('application.applicationName'),
-        message: "Application Started",
+    message: 'Application Started',
-        tags: ["arrow_up"]
+    tags: ['arrow_up']
-    };
+  }
 
   const ntfyShutdownMessage: ntfyTypes.NtfyMessageOptions = {
     topic,
-        title: configFunctions.getProperty("application.applicationName"),
+    title: configFunctions.getProperty('application.applicationName'),
-        message: "Application Shut Down",
+    message: 'Application Shut Down',
-        tags: ["arrow_down"]
+    tags: ['arrow_down']
-    };
+  }
 
   if (server) {
-        ntfyStartupMessage.server = server;
+    ntfyStartupMessage.server = server
-        ntfyShutdownMessage.server = server;
+    ntfyShutdownMessage.server = server
   }
 
-    await ntfyPublish(ntfyStartupMessage);
+  await ntfyPublish(ntfyStartupMessage)
 
   exitHook(() => {
-        debug("Sending ntfy notification");
+    debug('Sending ntfy notification')
-        ntfyPublish(ntfyShutdownMessage);
+    void ntfyPublish(ntfyShutdownMessage)
-    });
+  })
 }

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

@@ -1,51 +1,55 @@
-import { testAdmin } from "../../../test/_globals.js";
+import { testAdmin } from '../../../test/_globals.js';
-import { logout, login, ajaxDelayMillis } from "../../support/index.js";
+import { logout, login, ajaxDelayMillis } from '../../support/index.js';
-import * as configFunctions from "../../../helpers/functions.config.js";
+import * as configFunctions from '../../../helpers/functions.config.js';
-describe("Admin - Fee Management", () => {
+describe('Admin - Fee Management', () => {
-    beforeEach("Loads page", () => {
+    beforeEach('Loads page', () => {
         logout();
         login(testAdmin);
-        cy.visit("/admin/fees");
+        cy.visit('/admin/fees');
-        cy.location("pathname").should("equal", "/admin/fees");
+        cy.location('pathname').should('equal', '/admin/fees');
     });
     afterEach(logout);
-    it("Has no detectable accessibility issues", () => {
+    it('Has no detectable accessibility issues', () => {
         cy.injectAxe();
         cy.checkA11y();
     });
-    it("Creates a new fee category", () => {
+    it('Creates a new fee category', () => {
         cy.get("[data-cy='addFeeCategory']").click();
-        cy.get(".modal").should("be.visible");
+        cy.get('.modal').should('be.visible');
         cy.injectAxe();
         cy.checkA11y();
-        cy.fixture("fee.json").then((fee) => {
+        cy.fixture('fee.json').then((fee) => {
             cy.get(".modal input[name='feeCategory']").type(fee.feeCategory);
             cy.get(".modal button[type='submit']").click();
             cy.wait(ajaxDelayMillis);
-            cy.get(".container--feeCategory .panel-heading .title").should("contain.text", fee.feeCategory);
+            cy.get('.container--feeCategory .panel-heading .title').should('contain.text', fee.feeCategory);
         });
     });
-    it("Creates a new fee", () => {
+    it('Creates a new fee', () => {
         cy.get("[data-cy='addFee']").first().click();
-        cy.get(".modal").should("be.visible");
+        cy.get('.modal').should('be.visible');
         cy.injectAxe();
         cy.checkA11y();
-        cy.fixture("fee.json").then((fee) => {
+        cy.fixture('fee.json').then((fee) => {
             cy.get(".modal input[name='feeName']").type(fee.feeName);
             cy.get(".modal textarea[name='feeDescription']").type(fee.feeDescription);
-            cy.get(".modal input[name='feeAmount']").clear().type(fee.feeAmount.toString());
+            cy.get(".modal input[name='feeAmount']")
-            cy.get(".modal input[name='taxAmount']").should("be.disabled");
+                .clear()
+                .type(fee.feeAmount.toString());
+            cy.get(".modal input[name='taxAmount']").should('be.disabled');
             cy.get(".modal input[name='taxPercentage']")
-                .invoke("val")
+                .invoke('val')
-                .should("equal", configFunctions.getProperty("settings.fees.taxPercentageDefault").toString());
+                .should('equal', configFunctions
-            cy.get(".modal input[name='quantityUnit']").should("be.disabled");
+                .getProperty('settings.fees.taxPercentageDefault')
-            cy.get(".modal select[name='includeQuantity']").select("1");
+                .toString());
+            cy.get(".modal input[name='quantityUnit']").should('be.disabled');
+            cy.get(".modal select[name='includeQuantity']").select('1');
             cy.get(".modal input[name='quantityUnit']")
-                .should("not.be.disabled")
+                .should('not.be.disabled')
                 .type(fee.quantityUnit);
             cy.get(".modal button[type='submit']").click();
             cy.wait(ajaxDelayMillis);
-            cy.get(".container--fee a").should("contain.text", fee.feeName);
+            cy.get('.container--fee a').should('contain.text', fee.feeName);
         });
     });
 });

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

@@ -1,88 +1,91 @@
-/* eslint-disable unicorn/filename-case, promise/catch-or-return, promise/always-return */
+/* eslint-disable unicorn/filename-case, promise/catch-or-return, promise/always-return, @typescript-eslint/no-non-null-assertion */
 
-import { testAdmin } from "../../../test/_globals.js";
+import { testAdmin } from '../../../test/_globals.js'
 
-import { logout, login, ajaxDelayMillis } from "../../support/index.js";
+import { logout, login, ajaxDelayMillis } from '../../support/index.js'
 
-import * as configFunctions from "../../../helpers/functions.config.js";
+import * as configFunctions from '../../../helpers/functions.config.js'
 
-import type * as recordTypes from "../../../types/recordTypes";
+import type * as recordTypes from '../../../types/recordTypes'
 
-describe("Admin - Fee Management", () => {
+describe('Admin - Fee Management', () => {
+  beforeEach('Loads page', () => {
+    logout()
+    login(testAdmin)
+    cy.visit('/admin/fees')
+    cy.location('pathname').should('equal', '/admin/fees')
+  })
 
-    beforeEach("Loads page", () => {
+  afterEach(logout)
-        logout();
-        login(testAdmin);
-        cy.visit("/admin/fees");
-        cy.location("pathname").should("equal", "/admin/fees");
-    });
 
-    afterEach(logout);
+  it('Has no detectable accessibility issues', () => {
+    cy.injectAxe()
+    cy.checkA11y()
+  })
 
-    it("Has no detectable accessibility issues", () => {
+  it('Creates a new fee category', () => {
-        cy.injectAxe();
+    cy.get("[data-cy='addFeeCategory']").click()
-        cy.checkA11y();
-    });
 
-    it("Creates a new fee category", () => {
+    cy.get('.modal').should('be.visible')
-        cy.get("[data-cy='addFeeCategory']").click();
 
-        cy.get(".modal").should("be.visible");
+    cy.injectAxe()
+    cy.checkA11y()
 
-        cy.injectAxe();
+    cy.fixture('fee.json').then((fee: recordTypes.Fee) => {
-        cy.checkA11y();
+      cy.get(".modal input[name='feeCategory']").type(fee.feeCategory!)
 
-        cy.fixture("fee.json").then((fee: recordTypes.Fee) => {
+      cy.get(".modal button[type='submit']").click()
-            cy.get(".modal input[name='feeCategory']").type(fee.feeCategory);
 
-            cy.get(".modal button[type='submit']").click();
+      cy.wait(ajaxDelayMillis)
 
-            cy.wait(ajaxDelayMillis);
+      cy.get('.container--feeCategory .panel-heading .title').should(
-
+        'contain.text',
-            cy.get(".container--feeCategory .panel-heading .title").should(
-                "contain.text",
         fee.feeCategory
-            );
+      )
-        });
+    })
-    });
+  })
 
-    it("Creates a new fee", () => {
+  it('Creates a new fee', () => {
-        cy.get("[data-cy='addFee']").first().click();
+    cy.get("[data-cy='addFee']").first().click()
 
-        cy.get(".modal").should("be.visible");
+    cy.get('.modal').should('be.visible')
 
-        cy.injectAxe();
+    cy.injectAxe()
-        cy.checkA11y();
+    cy.checkA11y()
 
-        cy.fixture("fee.json").then((fee: recordTypes.Fee) => {
+    cy.fixture('fee.json').then((fee: recordTypes.Fee) => {
-            cy.get(".modal input[name='feeName']").type(fee.feeName);
+      cy.get(".modal input[name='feeName']").type(fee.feeName!)
 
-            cy.get(".modal textarea[name='feeDescription']").type(fee.feeDescription);
+      cy.get(".modal textarea[name='feeDescription']").type(fee.feeDescription!)
 
-            cy.get(".modal input[name='feeAmount']").clear().type(fee.feeAmount.toString());
+      cy.get(".modal input[name='feeAmount']")
+        .clear()
+        .type(fee.feeAmount!.toString())
 
-            cy.get(".modal input[name='taxAmount']").should("be.disabled");
+      cy.get(".modal input[name='taxAmount']").should('be.disabled')
 
       cy.get(".modal input[name='taxPercentage']")
-                .invoke("val")
+        .invoke('val')
         .should(
-                    "equal",
+          'equal',
-                    configFunctions.getProperty("settings.fees.taxPercentageDefault").toString()
+          configFunctions
-                );
+            .getProperty('settings.fees.taxPercentageDefault')
+            .toString()
+        )
 
-            cy.get(".modal input[name='quantityUnit']").should("be.disabled");
+      cy.get(".modal input[name='quantityUnit']").should('be.disabled')
 
-            cy.get(".modal select[name='includeQuantity']").select("1");
+      cy.get(".modal select[name='includeQuantity']").select('1')
 
       cy.get(".modal input[name='quantityUnit']")
-                .should("not.be.disabled")
+        .should('not.be.disabled')
-                .type(fee.quantityUnit);
+        .type(fee.quantityUnit!)
 
-            cy.get(".modal button[type='submit']").click();
+      cy.get(".modal button[type='submit']").click()
 
-            cy.wait(ajaxDelayMillis);
+      cy.wait(ajaxDelayMillis)
 
-            cy.get(".container--fee a").should("contain.text", fee.feeName);
+      cy.get('.container--fee a').should('contain.text', fee.feeName)
-        });
+    })
-    });
+  })
-});
+})

cypress/e2e/02-update/lotOccupancies.cy.js

@@ -1,7 +1,7 @@
 import { testUpdate } from "../../../test/_globals.js";
 import { logout, login } from "../../support/index.js";
 describe("Update - Lot Occupancies", () => {
-    beforeEach("Loads page", () => {
+    beforeEach(() => {
         logout();
         login(testUpdate);
     });

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

@@ -3,8 +3,7 @@ import { testUpdate } from "../../../test/_globals.js";
 import { logout, login } from "../../support/index.js";
 
 describe("Update - Lot Occupancies", () => {
-
+    beforeEach(() => {
-    beforeEach("Loads page", () => {
         logout();
         login(testUpdate);
     });
@@ -18,7 +17,6 @@ describe("Update - Lot Occupancies", () => {
     });
 
     describe("Update a New Lot Occupancy", () => {
-
         it("Has no detectable accessibility issues", () => {
             cy.visit("/lotOccupancies/new");
             cy.injectAxe();

cypress/e2e/02-update/maps.cy.js

@@ -1,51 +1,61 @@
-import { testUpdate } from "../../../test/_globals.js";
+import { testUpdate } from '../../../test/_globals.js';
-import { logout, login } from "../../support/index.js";
+import { logout, login } from '../../support/index.js';
-import * as configFunctions from "../../../helpers/functions.config.js";
+import * as configFunctions from '../../../helpers/functions.config.js';
-describe("Update - Maps", () => {
+describe('Update - Maps', () => {
-    beforeEach("Loads page", () => {
+    beforeEach('Loads page', () => {
         logout();
         login(testUpdate);
     });
     afterEach(logout);
     it('Has a "Create" link on the Map Search', () => {
-        cy.visit("/maps");
+        cy.visit('/maps');
-        cy.location("pathname").should("equal", "/maps");
+        cy.location('pathname').should('equal', '/maps');
-        cy.get("a[href$='/maps/new']").should("exist");
+        cy.get("a[href$='/maps/new']").should('exist');
     });
-    it("Creates a new map", () => {
+    it('Creates a new map', () => {
-        cy.visit("/maps/new");
+        cy.visit('/maps/new');
-        cy.log("Check the accessibility");
+        cy.log('Check the accessibility');
         cy.injectAxe();
         cy.checkA11y();
-        cy.log("Populate the fields");
+        cy.log('Populate the fields');
-        cy.fixture("map.json").then((mapJSON) => {
+        cy.fixture('map.json').then((mapJSON) => {
             cy.get("input[name='mapName']").clear().type(mapJSON.mapName);
-            cy.get("textarea[name='mapDescription']").clear().type(mapJSON.mapDescription);
+            cy.get("textarea[name='mapDescription']")
+                .clear()
+                .type(mapJSON.mapDescription);
             cy.get("input[name='mapAddress1']").clear().type(mapJSON.mapAddress1);
             cy.get("input[name='mapAddress2']").clear().type(mapJSON.mapAddress2);
             cy.get("input[name='mapPostalCode']").clear().type(mapJSON.mapPostalCode);
-            cy.get("input[name='mapPhoneNumber']").clear().type(mapJSON.mapPhoneNumber);
+            cy.get("input[name='mapPhoneNumber']")
-            cy.get("input[name='mapLatitude']").clear().type(mapJSON.mapLatitude.toString());
+                .clear()
-            cy.get("input[name='mapLongitude']").clear().type(mapJSON.mapLongitude.toString());
+                .type(mapJSON.mapPhoneNumber);
+            cy.get("input[name='mapLatitude']")
+                .clear()
+                .type(mapJSON.mapLatitude.toString());
+            cy.get("input[name='mapLongitude']")
+                .clear()
+                .type(mapJSON.mapLongitude.toString());
         });
-        cy.log("Ensure the default city and province are used");
+        cy.log('Ensure the default city and province are used');
-        cy.get("input[name='mapCity']").should("have.value", configFunctions.getProperty("settings.map.mapCityDefault"));
+        cy.get("input[name='mapCity']").should('have.value', configFunctions.getProperty('settings.map.mapCityDefault'));
-        cy.get("input[name='mapProvince']").should("have.value", configFunctions.getProperty("settings.map.mapProvinceDefault"));
+        cy.get("input[name='mapProvince']").should('have.value', configFunctions.getProperty('settings.map.mapProvinceDefault'));
-        cy.log("Submit the form");
+        cy.log('Submit the form');
-        cy.get("#form--map").submit();
+        cy.get('#form--map').submit();
         cy.wait(1000);
-        cy.location("pathname").should("not.contain", "/new").should("contain", "/edit");
+        cy.location('pathname')
-        cy.fixture("map.json").then((mapJSON) => {
+            .should('not.contain', '/new')
-            cy.get("input[name='mapName']").should("have.value", mapJSON.mapName);
+            .should('contain', '/edit');
-            cy.get("textarea[name='mapDescription']").should("have.value", mapJSON.mapDescription);
+        cy.fixture('map.json').then((mapJSON) => {
-            cy.get("input[name='mapAddress1']").should("have.value", mapJSON.mapAddress1);
+            cy.get("input[name='mapName']").should('have.value', mapJSON.mapName);
-            cy.get("input[name='mapAddress2']").should("have.value", mapJSON.mapAddress2);
+            cy.get("textarea[name='mapDescription']").should('have.value', mapJSON.mapDescription);
-            cy.get("input[name='mapCity']").should("have.value", configFunctions.getProperty("settings.map.mapCityDefault"));
+            cy.get("input[name='mapAddress1']").should('have.value', mapJSON.mapAddress1);
-            cy.get("input[name='mapProvince']").should("have.value", configFunctions.getProperty("settings.map.mapProvinceDefault"));
+            cy.get("input[name='mapAddress2']").should('have.value', mapJSON.mapAddress2);
-            cy.get("input[name='mapPostalCode']").should("have.value", mapJSON.mapPostalCode);
+            cy.get("input[name='mapCity']").should('have.value', configFunctions.getProperty('settings.map.mapCityDefault'));
-            cy.get("input[name='mapPhoneNumber']").should("have.value", mapJSON.mapPhoneNumber);
+            cy.get("input[name='mapProvince']").should('have.value', configFunctions.getProperty('settings.map.mapProvinceDefault'));
-            cy.get("input[name='mapLatitude']").should("have.value", mapJSON.mapLatitude.toString());
+            cy.get("input[name='mapPostalCode']").should('have.value', mapJSON.mapPostalCode);
-            cy.get("input[name='mapLongitude']").should("have.value", mapJSON.mapLongitude.toString());
+            cy.get("input[name='mapPhoneNumber']").should('have.value', mapJSON.mapPhoneNumber);
+            cy.get("input[name='mapLatitude']").should('have.value', mapJSON.mapLatitude.toString());
+            cy.get("input[name='mapLongitude']").should('have.value', mapJSON.mapLongitude.toString());
         });
     });
 });

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

@@ -1,97 +1,124 @@
-import { testUpdate } from "../../../test/_globals.js";
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 
-import { logout, login } from "../../support/index.js";
+import { testUpdate } from '../../../test/_globals.js'
 
-import * as configFunctions from "../../../helpers/functions.config.js";
+import { logout, login } from '../../support/index.js'
 
-import type * as recordTypes from "../../../types/recordTypes";
+import * as configFunctions from '../../../helpers/functions.config.js'
 
-describe("Update - Maps", () => {
+import type * as recordTypes from '../../../types/recordTypes'
-    beforeEach("Loads page", () => {
-        logout();
-        login(testUpdate);
-    });
 
-    afterEach(logout);
+describe('Update - Maps', () => {
+  beforeEach('Loads page', () => {
+    logout()
+    login(testUpdate)
+  })
+
+  afterEach(logout)
 
   it('Has a "Create" link on the Map Search', () => {
-        cy.visit("/maps");
+    cy.visit('/maps')
-        cy.location("pathname").should("equal", "/maps");
+    cy.location('pathname').should('equal', '/maps')
-        cy.get("a[href$='/maps/new']").should("exist");
+    cy.get("a[href$='/maps/new']").should('exist')
-    });
+  })
 
-    it("Creates a new map", () => {
+  it('Creates a new map', () => {
-        cy.visit("/maps/new");
+    cy.visit('/maps/new')
 
-        cy.log("Check the accessibility");
+    cy.log('Check the accessibility')
 
-        cy.injectAxe();
+    cy.injectAxe()
-        cy.checkA11y();
+    cy.checkA11y()
 
-        cy.log("Populate the fields");
+    cy.log('Populate the fields')
 
     // eslint-disable-next-line promise/catch-or-return, promise/always-return
-        cy.fixture("map.json").then((mapJSON: recordTypes.Map) => {
+    cy.fixture('map.json').then((mapJSON: recordTypes.Map) => {
-            cy.get("input[name='mapName']").clear().type(mapJSON.mapName);
+      cy.get("input[name='mapName']").clear().type(mapJSON.mapName!)
-            cy.get("textarea[name='mapDescription']").clear().type(mapJSON.mapDescription);
+      cy.get("textarea[name='mapDescription']")
+        .clear()
+        .type(mapJSON.mapDescription!)
 
-            cy.get("input[name='mapAddress1']").clear().type(mapJSON.mapAddress1);
+      cy.get("input[name='mapAddress1']").clear().type(mapJSON.mapAddress1!)
-            cy.get("input[name='mapAddress2']").clear().type(mapJSON.mapAddress2);
+      cy.get("input[name='mapAddress2']").clear().type(mapJSON.mapAddress2!)
-            cy.get("input[name='mapPostalCode']").clear().type(mapJSON.mapPostalCode);
+      cy.get("input[name='mapPostalCode']").clear().type(mapJSON.mapPostalCode!)
-            cy.get("input[name='mapPhoneNumber']").clear().type(mapJSON.mapPhoneNumber);
+      cy.get("input[name='mapPhoneNumber']")
+        .clear()
+        .type(mapJSON.mapPhoneNumber!)
 
-            cy.get("input[name='mapLatitude']").clear().type(mapJSON.mapLatitude.toString());
+      cy.get("input[name='mapLatitude']")
-            cy.get("input[name='mapLongitude']").clear().type(mapJSON.mapLongitude.toString());
+        .clear()
-        });
+        .type(mapJSON.mapLatitude!.toString())
+      cy.get("input[name='mapLongitude']")
+        .clear()
+        .type(mapJSON.mapLongitude!.toString())
+    })
 
-        cy.log("Ensure the default city and province are used");
+    cy.log('Ensure the default city and province are used')
 
     cy.get("input[name='mapCity']").should(
-            "have.value",
+      'have.value',
-            configFunctions.getProperty("settings.map.mapCityDefault")
+      configFunctions.getProperty('settings.map.mapCityDefault')
-        );
+    )
 
     cy.get("input[name='mapProvince']").should(
-            "have.value",
+      'have.value',
-            configFunctions.getProperty("settings.map.mapProvinceDefault")
+      configFunctions.getProperty('settings.map.mapProvinceDefault')
-        );
+    )
 
-        cy.log("Submit the form");
+    cy.log('Submit the form')
 
-        cy.get("#form--map").submit();
+    cy.get('#form--map').submit()
 
-        cy.wait(1000);
+    cy.wait(1000)
 
-        cy.location("pathname").should("not.contain", "/new").should("contain", "/edit");
+    cy.location('pathname')
+      .should('not.contain', '/new')
+      .should('contain', '/edit')
 
     // eslint-disable-next-line promise/catch-or-return, promise/always-return
-        cy.fixture("map.json").then((mapJSON: recordTypes.Map) => {
+    cy.fixture('map.json').then((mapJSON: recordTypes.Map) => {
-            cy.get("input[name='mapName']").should("have.value", mapJSON.mapName);
+      cy.get("input[name='mapName']").should('have.value', mapJSON.mapName)
-            cy.get("textarea[name='mapDescription']").should("have.value", mapJSON.mapDescription);
+      cy.get("textarea[name='mapDescription']").should(
+        'have.value',
+        mapJSON.mapDescription
+      )
 
-            cy.get("input[name='mapAddress1']").should("have.value", mapJSON.mapAddress1);
+      cy.get("input[name='mapAddress1']").should(
-            cy.get("input[name='mapAddress2']").should("have.value", mapJSON.mapAddress2);
+        'have.value',
+        mapJSON.mapAddress1
+      )
+      cy.get("input[name='mapAddress2']").should(
+        'have.value',
+        mapJSON.mapAddress2
+      )
 
       cy.get("input[name='mapCity']").should(
-                "have.value",
+        'have.value',
-                configFunctions.getProperty("settings.map.mapCityDefault")
+        configFunctions.getProperty('settings.map.mapCityDefault')
-            );
+      )
       cy.get("input[name='mapProvince']").should(
-                "have.value",
+        'have.value',
-                configFunctions.getProperty("settings.map.mapProvinceDefault")
+        configFunctions.getProperty('settings.map.mapProvinceDefault')
-            );
+      )
 
-            cy.get("input[name='mapPostalCode']").should("have.value", mapJSON.mapPostalCode);
+      cy.get("input[name='mapPostalCode']").should(
-            cy.get("input[name='mapPhoneNumber']").should("have.value", mapJSON.mapPhoneNumber);
+        'have.value',
+        mapJSON.mapPostalCode
+      )
+      cy.get("input[name='mapPhoneNumber']").should(
+        'have.value',
+        mapJSON.mapPhoneNumber
+      )
 
       cy.get("input[name='mapLatitude']").should(
-                "have.value",
+        'have.value',
-                mapJSON.mapLatitude.toString()
+        mapJSON.mapLatitude!.toString()
-            );
+      )
       cy.get("input[name='mapLongitude']").should(
-                "have.value",
+        'have.value',
-                mapJSON.mapLongitude.toString()
+        mapJSON.mapLongitude!.toString()
-            );
+      )
-        });
+    })
-    });
+  })
-});
+})

data/config.cemetery.ssm.js

@@ -4,16 +4,22 @@ config.aliases.occupancyStartDate = "Purchase Date";
 config.aliases.externalReceiptNumber = "GP Receipt Number";
 config.settings.lot.lotNamePattern =
     /^[\dA-Z]{2}-(B[\dA-Z]+-)?(R[\dA-Z]+-)?(L[\dA-Z]+-)?G[\dA-Z]+(, Interment \d+)?$/;
-config.settings.lot.lotNameHelpText =
+config.settings.lot.lotNameHelpText = `Two digit cemetery-Block-Range-Lot-Grave, Interment number\n
-    "Two digit cemetery-Block-Range-Lot-Grave, Interment number\n" +
+    ex. XX-BA-R41-L15-G3A, Interment 1`;
-        "ex. XX-BA-R41-L15-G3A, Interment 1";
-config.settings.lot.lotNameSortNameFunction = (lotName) => {
 const numericPadding = "00000";
+config.settings.lot.lotNameSortNameFunction = (lotName) => {
+    try {
         const lotNameSplit = lotName.toUpperCase().split("-");
         const cleanLotNamePieces = [];
-    for (const lotNamePiece of lotNameSplit) {
+        for (let lotNamePiece of lotNameSplit) {
+            if (cleanLotNamePieces.length === 0) {
+                cleanLotNamePieces.push(lotNamePiece);
+                continue;
+            }
             let numericPiece = numericPadding;
             let letterPiece = "";
+            const firstLetter = lotNamePiece.charAt(0);
+            lotNamePiece = lotNamePiece.slice(1);
             for (const letter of lotNamePiece) {
                 if (letterPiece === "" && "0123456789".includes(letter)) {
                     numericPiece += letter;
@@ -22,15 +28,16 @@ config.settings.lot.lotNameSortNameFunction = (lotName) => {
                     letterPiece += letter;
                 }
             }
-        cleanLotNamePieces.push(numericPiece.slice(-1 * numericPadding.length) + letterPiece);
+            cleanLotNamePieces.push(firstLetter + numericPiece.slice(-1 * numericPadding.length) + letterPiece);
         }
         return cleanLotNamePieces.join("-");
+    }
+    catch {
+        return lotName;
+    }
 };
 config.settings.lotOccupancy.occupantCityDefault = "Sault Ste. Marie";
-config.settings.lotOccupancy.prints = [
+config.settings.lotOccupancy.prints = ["pdf/ssm.cemetery.burialPermit", "pdf/ssm.cemetery.contract"];
-    "pdf/ssm.cemetery.burialPermit",
-    "pdf/ssm.cemetery.contract"
-];
 config.settings.map.mapCityDefault = "Sault Ste. Marie";
 config.settings.workOrders.workOrderNumberLength = 6;
 config.settings.workOrders.workOrderMilestoneDateRecentBeforeDays = 7;

data/config.cemetery.ssm.ts

@@ -8,21 +8,29 @@ config.aliases.externalReceiptNumber = "GP Receipt Number";
 config.settings.lot.lotNamePattern =
     /^[\dA-Z]{2}-(B[\dA-Z]+-)?(R[\dA-Z]+-)?(L[\dA-Z]+-)?G[\dA-Z]+(, Interment \d+)?$/;
 
-config.settings.lot.lotNameHelpText =
+config.settings.lot.lotNameHelpText = `Two digit cemetery-Block-Range-Lot-Grave, Interment number\n
-    "Two digit cemetery-Block-Range-Lot-Grave, Interment number\n" +
+    ex. XX-BA-R41-L15-G3A, Interment 1`;
-    "ex. XX-BA-R41-L15-G3A, Interment 1";
 
-config.settings.lot.lotNameSortNameFunction = (lotName) => {
 const numericPadding = "00000";
 
+config.settings.lot.lotNameSortNameFunction = (lotName) => {
+    try {
         const lotNameSplit = lotName.toUpperCase().split("-");
 
         const cleanLotNamePieces: string[] = [];
 
-    for (const lotNamePiece of lotNameSplit) {
+        for (let lotNamePiece of lotNameSplit) {
+            if (cleanLotNamePieces.length === 0) {
+                cleanLotNamePieces.push(lotNamePiece);
+                continue;
+            }
+
             let numericPiece = numericPadding;
             let letterPiece = "";
 
+            const firstLetter = lotNamePiece.charAt(0);
+            lotNamePiece = lotNamePiece.slice(1);
+
             for (const letter of lotNamePiece) {
                 if (letterPiece === "" && "0123456789".includes(letter)) {
                     numericPiece += letter;
@@ -31,17 +39,19 @@ config.settings.lot.lotNameSortNameFunction = (lotName) => {
                 }
             }
 
-        cleanLotNamePieces.push(numericPiece.slice(-1 * numericPadding.length) + letterPiece);
+            cleanLotNamePieces.push(
+                firstLetter + numericPiece.slice(-1 * numericPadding.length) + letterPiece
+            );
         }
 
         return cleanLotNamePieces.join("-");
+    } catch {
+        return lotName;
+    }
 };
 
 config.settings.lotOccupancy.occupantCityDefault = "Sault Ste. Marie";
-config.settings.lotOccupancy.prints = [
+config.settings.lotOccupancy.prints = ["pdf/ssm.cemetery.burialPermit", "pdf/ssm.cemetery.contract"];
-    "pdf/ssm.cemetery.burialPermit",
-    "pdf/ssm.cemetery.contract"
-];
 
 config.settings.map.mapCityDefault = "Sault Ste. Marie";
 

handlers/admin-post/doAddFee.d.ts

@@ -1,3 +1,3 @@
-import type { RequestHandler } from "express";
+import type { RequestHandler } from 'express';
 export declare const handler: RequestHandler;
 export default handler;

handlers/admin-post/doAddFee.js

@@ -1,6 +1,6 @@
-import { addFee } from "../../helpers/lotOccupancyDB/addFee.js";
+import { addFee } from '../../helpers/lotOccupancyDB/addFee.js';
-import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js";
+import { getFeeCategories } from '../../helpers/lotOccupancyDB/getFeeCategories.js';
-export const handler = async (request, response) => {
+export const handler = (request, response) => {
     const feeId = addFee(request.body, request.session);
     const feeCategories = getFeeCategories({}, {
         includeFees: true

handlers/admin-post/doAddFee.ts

@@ -1,24 +1,24 @@
-import type { RequestHandler } from "express";
+import type { RequestHandler } from 'express'
 
-import { addFee } from "../../helpers/lotOccupancyDB/addFee.js";
+import { addFee } from '../../helpers/lotOccupancyDB/addFee.js'
 
-import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js";
+import { getFeeCategories } from '../../helpers/lotOccupancyDB/getFeeCategories.js'
 
-export const handler: RequestHandler = async (request, response) => {
+export const handler: RequestHandler = (request, response) => {
-    const feeId = addFee(request.body, request.session);
+  const feeId = addFee(request.body, request.session)
 
   const feeCategories = getFeeCategories(
     {},
     {
       includeFees: true
     }
-    );
+  )
 
   response.json({
     success: true,
     feeId,
     feeCategories
-    });
+  })
-};
+}
 
-export default handler;
+export default handler

handlers/admin-post/doUpdateWorkOrderType.d.ts

@@ -1,3 +1,3 @@
-import type { RequestHandler } from "express";
+import type { RequestHandler } from 'express';
 export declare const handler: RequestHandler;
 export default handler;

handlers/admin-post/doUpdateWorkOrderType.js

@@ -1,7 +1,7 @@
-import { updateRecord } from "../../helpers/lotOccupancyDB/updateRecord.js";
+import { updateRecord } from '../../helpers/lotOccupancyDB/updateRecord.js';
-import { getWorkOrderTypes } from "../../helpers/functions.cache.js";
+import { getWorkOrderTypes } from '../../helpers/functions.cache.js';
-export const handler = async (request, response) => {
+export const handler = (request, response) => {
-    const success = updateRecord("WorkOrderTypes", request.body.workOrderTypeId, request.body.workOrderType, request.session);
+    const success = updateRecord('WorkOrderTypes', request.body.workOrderTypeId, request.body.workOrderType, request.session);
     const workOrderTypes = getWorkOrderTypes();
     response.json({
         success,

handlers/admin-post/doUpdateWorkOrderType.ts

@@ -1,22 +1,22 @@
-import type { RequestHandler } from "express";
+import type { RequestHandler } from 'express'
 
-import { updateRecord } from "../../helpers/lotOccupancyDB/updateRecord.js";
+import { updateRecord } from '../../helpers/lotOccupancyDB/updateRecord.js'
-import { getWorkOrderTypes } from "../../helpers/functions.cache.js";
+import { getWorkOrderTypes } from '../../helpers/functions.cache.js'
 
-export const handler: RequestHandler = async (request, response) => {
+export const handler: RequestHandler = (request, response) => {
   const success = updateRecord(
-        "WorkOrderTypes",
+    'WorkOrderTypes',
     request.body.workOrderTypeId,
     request.body.workOrderType,
     request.session
-    );
+  )
 
-    const workOrderTypes = getWorkOrderTypes();
+  const workOrderTypes = getWorkOrderTypes()
 
   response.json({
     success,
     workOrderTypes
-    });
+  })
-};
+}
 
-export default handler;
+export default handler

handlers/api-get/milestoneICS.d.ts

@@ -1,3 +1,3 @@
-import type { RequestHandler } from "express";
+import type { RequestHandler } from 'express';
 export declare const handler: RequestHandler;
 export default handler;

handlers/api-get/milestoneICS.js

@@ -1,26 +1,26 @@
-import ical, { ICalEventStatus } from "ical-generator";
+import ical, { ICalEventStatus } from 'ical-generator';
-import { getWorkOrderMilestones } from "../../helpers/lotOccupancyDB/getWorkOrderMilestones.js";
+import { getWorkOrderMilestones } from '../../helpers/lotOccupancyDB/getWorkOrderMilestones.js';
-import * as configFunctions from "../../helpers/functions.config.js";
+import * as configFunctions from '../../helpers/functions.config.js';
-import { getPrintConfig } from "../../helpers/functions.print.js";
+import { getPrintConfig } from '../../helpers/functions.print.js';
-const calendarCompany = "cityssm.github.io";
+const calendarCompany = 'cityssm.github.io';
-const calendarProduct = configFunctions.getProperty("application.applicationName");
+const calendarProduct = configFunctions.getProperty('application.applicationName');
 const timeStringSplitRegex = /[ :-]/;
 function escapeHTML(stringToEscape) {
-    return stringToEscape.replace(/[^\d A-Za-z]/g, (c) => "&#" + c.codePointAt(0) + ";");
+    return stringToEscape.replace(/[^\d A-Za-z]/g, (c) => `&#${c.codePointAt(0)};`);
 }
 function getUrlRoot(request) {
-    return ("http://" +
+    return ('http://' +
         request.hostname +
-        (configFunctions.getProperty("application.httpPort") === 80
+        (configFunctions.getProperty('application.httpPort') === 80
-            ? ""
+            ? ''
-            : ":" + configFunctions.getProperty("application.httpPort")) +
+            : `:${configFunctions.getProperty('application.httpPort')}`) +
-        configFunctions.getProperty("reverseProxy.urlPrefix"));
+        configFunctions.getProperty('reverseProxy.urlPrefix'));
 }
 function getWorkOrderUrl(request, milestone) {
-    return getUrlRoot(request) + "/workOrders/" + milestone.workOrderId;
+    return `${getUrlRoot(request)}/workOrders/${milestone.workOrderId}`;
 }
 function buildEventSummary(milestone) {
-    let summary = (milestone.workOrderMilestoneCompletionDate ? "✔ " : "") +
+    let summary = (milestone.workOrderMilestoneCompletionDate ? '✔ ' : '') +
         (milestone.workOrderMilestoneTypeId
             ? milestone.workOrderMilestoneType
             : milestone.workOrderMilestoneDescription).trim();
@@ -29,121 +29,126 @@ function buildEventSummary(milestone) {
         for (const occupant of lotOccupancy.lotOccupancyOccupants) {
             occupantCount += 1;
             if (occupantCount === 1) {
-                if (summary !== "") {
+                if (summary !== '') {
-                    summary += ": ";
+                    summary += ': ';
                 }
                 summary += occupant.occupantName;
             }
         }
     }
     if (occupantCount > 1) {
-        summary += " plus " + (occupantCount - 1);
+        summary += ' plus ' + (occupantCount - 1);
     }
     return summary;
 }
 function buildEventDescriptionHTML_occupancies(request, milestone) {
-    let descriptionHTML = "";
+    let descriptionHTML = '';
     if (milestone.workOrderLotOccupancies.length > 0) {
         const urlRoot = getUrlRoot(request);
         descriptionHTML = `<h2>
-            Related ${escapeHTML(configFunctions.getProperty("aliases.occupancies"))}
+      Related ${escapeHTML(configFunctions.getProperty('aliases.occupancies'))}
       </h2>
       <table border="1">
       <thead><tr>
-            <th>${escapeHTML(configFunctions.getProperty("aliases.occupancy"))} Type</th>
+      <th>${escapeHTML(configFunctions.getProperty('aliases.occupancy'))} Type</th>
-            <th>${escapeHTML(configFunctions.getProperty("aliases.lot"))}</th>
+      <th>${escapeHTML(configFunctions.getProperty('aliases.lot'))}</th>
       <th>Start Date</th>
       <th>End Date</th>
-            <th>${escapeHTML(configFunctions.getProperty("aliases.occupants"))}</th>
+      <th>${escapeHTML(configFunctions.getProperty('aliases.occupants'))}</th>
       </tr></thead>
       <tbody>`;
         for (const occupancy of milestone.workOrderLotOccupancies) {
-            descriptionHTML +=
+            descriptionHTML += `<tr>
-                `<tr>
           <td>
             <a href="${urlRoot}/lotOccupancies/${occupancy.lotOccupancyId}">
               ${escapeHTML(occupancy.occupancyType)}
             </a>
           </td>
           <td>
-                    ${occupancy.lotName ? escapeHTML(occupancy.lotName) : "(Not Set)"}
+            ${occupancy.lotName ? escapeHTML(occupancy.lotName) : '(Not Set)'}
           </td>
           <td>
             ${occupancy.occupancyStartDateString}
-                </td>` +
+          </td>
-                    "<td>" +
+          <td>
-                    (occupancy.occupancyEndDate ? occupancy.occupancyEndDateString : "(No End Date)") +
+            ${occupancy.occupancyEndDate
-                    "</td>" +
+                ? occupancy.occupancyEndDateString
-                    "<td>";
+                : '(No End Date)'}
+          </td>
+          <td>`;
             for (const occupant of occupancy.lotOccupancyOccupants) {
                 descriptionHTML +=
                     escapeHTML(occupant.lotOccupantType) +
-                        ": " +
+                        ': ' +
                         escapeHTML(occupant.occupantName) +
-                        "<br />";
+                        '<br />';
             }
-            descriptionHTML += "</td></tr>";
+            descriptionHTML += '</td></tr>';
         }
-        descriptionHTML += "</tbody></table>";
+        descriptionHTML += '</tbody></table>';
     }
     return descriptionHTML;
 }
 function buildEventDescriptionHTML_lots(request, milestone) {
-    let descriptionHTML = "";
+    let descriptionHTML = '';
     if (milestone.workOrderLots.length > 0) {
         const urlRoot = getUrlRoot(request);
         descriptionHTML +=
-            "<h2>Related " +
+            '<h2>Related ' +
-                escapeHTML(configFunctions.getProperty("aliases.lots")) +
+                escapeHTML(configFunctions.getProperty('aliases.lots')) +
-                "</h2>" +
+                '</h2>' +
                 '<table border="1"><thead><tr>' +
                 `<th>
-                ${escapeHTML(configFunctions.getProperty("aliases.lot"))} Type
+                ${escapeHTML(configFunctions.getProperty('aliases.lot'))} Type
             </th>
             <th>
-                ${escapeHTML(configFunctions.getProperty("aliases.map"))}
+                ${escapeHTML(configFunctions.getProperty('aliases.map'))}
             </th>
             <th>
-                ${escapeHTML(configFunctions.getProperty("aliases.lot"))} Type
+                ${escapeHTML(configFunctions.getProperty('aliases.lot'))} Type
             </th>` +
-                "<th>Status</th>" +
+                '<th>Status</th>' +
-                "</tr></thead>" +
+                '</tr></thead>' +
-                "<tbody>";
+                '<tbody>';
         for (const lot of milestone.workOrderLots) {
             descriptionHTML +=
-                "<tr>" +
+                '<tr>' +
-                    ("<td>" +
+                    ('<td>' +
                         '<a href="' +
                         urlRoot +
-                        "/lots/" +
+                        '/lots/' +
                         lot.lotId +
                         '">' +
-                        escapeHTML(lot.lotName) +
+                        escapeHTML(lot.lotName ?? '') +
-                        "</a></td>") +
+                        '</a></td>') +
-                    `<td>${escapeHTML(lot.mapName)}</td>` +
+                    `<td>${escapeHTML(lot.mapName ?? '')}</td>` +
-                    `<td>${escapeHTML(lot.lotType)}</td>` +
+                    `<td>${escapeHTML(lot.lotType ?? '')}</td>` +
-                    `<td>${escapeHTML(lot.lotStatus)}</td>` +
+                    `<td>${escapeHTML(lot.lotStatus ?? '')}</td>` +
-                    "</tr>";
+                    '</tr>';
         }
-        descriptionHTML += "</tbody></table>";
+        descriptionHTML += '</tbody></table>';
     }
     return descriptionHTML;
 }
 function buildEventDescriptionHTML_prints(request, milestone) {
-    let descriptionHTML = "";
+    let descriptionHTML = '';
-    const prints = configFunctions.getProperty("settings.workOrders.prints");
+    const prints = configFunctions.getProperty('settings.workOrders.prints');
     if (prints.length > 0) {
         const urlRoot = getUrlRoot(request);
-        descriptionHTML += "<h2>Prints</h2>";
+        descriptionHTML += '<h2>Prints</h2>';
         for (const printName of prints) {
             const printConfig = getPrintConfig(printName);
             if (printConfig) {
                 descriptionHTML +=
-                    "<p>" +
+                    '<p>' +
                         escapeHTML(printConfig.title) +
-                        "<br />" +
+                        '<br />' +
-                        (urlRoot + "/print/" + printName + "/?workOrderId=" + milestone.workOrderId) +
+                        (urlRoot +
-                        "</p>";
+                            '/print/' +
+                            printName +
+                            '/?workOrderId=' +
+                            milestone.workOrderId) +
+                        '</p>';
             }
         }
     }
@@ -152,9 +157,9 @@ function buildEventDescriptionHTML_prints(request, milestone) {
 function buildEventDescriptionHTML(request, milestone) {
     const workOrderUrl = getWorkOrderUrl(request, milestone);
     let descriptionHTML = `<h1>Milestone Description</h1>
-        <p>${escapeHTML(milestone.workOrderMilestoneDescription)}</p>
+        <p>${escapeHTML(milestone.workOrderMilestoneDescription ?? '')}</p>
-        <h2>Work Order #${milestone.workOrderNumber}</h2>
+        <h2>Work Order #${milestone.workOrderNumber ?? ''}</h2>
-        <p>${escapeHTML(milestone.workOrderDescription)}</p>
+        <p>${escapeHTML(milestone.workOrderDescription ?? '')}</p>
         <p>${workOrderUrl}</p>`;
     descriptionHTML += buildEventDescriptionHTML_occupancies(request, milestone);
     descriptionHTML += buildEventDescriptionHTML_lots(request, milestone);
@@ -167,7 +172,7 @@ function buildEventCategoryList(milestone) {
         categories.push(milestone.workOrderMilestoneType, milestone.workOrderType);
     }
     if (milestone.workOrderMilestoneCompletionDate) {
-        categories.push("Completed");
+        categories.push('Completed');
     }
     return categories;
 }
@@ -175,10 +180,10 @@ function buildEventLocation(milestone) {
     const lotNames = [];
     if (milestone.workOrderLots.length > 0) {
         for (const lot of milestone.workOrderLots) {
-            lotNames.push(lot.mapName + ": " + lot.lotName);
+            lotNames.push(`${lot.mapName ?? ''}: ${lot.lotName ?? ''}`);
         }
     }
-    return lotNames.join(", ");
+    return lotNames.join(', ');
 }
 export const handler = (request, response) => {
     const urlRoot = getUrlRoot(request);
@@ -190,19 +195,19 @@ export const handler = (request, response) => {
         workOrderMilestoneFilters.workOrderId = request.query.workOrderId;
     }
     else {
-        workOrderMilestoneFilters.workOrderMilestoneDateFilter = "recent";
+        workOrderMilestoneFilters.workOrderMilestoneDateFilter = 'recent';
     }
     const workOrderMilestones = getWorkOrderMilestones(workOrderMilestoneFilters, {
         includeWorkOrders: true,
-        orderBy: "date"
+        orderBy: 'date'
     });
     const calendar = ical({
-        name: "Work Order Milestone Calendar",
+        name: 'Work Order Milestone Calendar',
-        url: urlRoot + "/workOrders"
+        url: urlRoot + '/workOrders'
     });
     if (request.query.workOrderId && workOrderMilestones.length > 0) {
         calendar.name(`Work Order #${workOrderMilestones[0].workOrderNumber}`);
-        calendar.url(urlRoot + "/workOrders/" + workOrderMilestones[0].workOrderId);
+        calendar.url(urlRoot + '/workOrders/' + workOrderMilestones[0].workOrderId);
     }
     calendar.prodId({
         company: calendarCompany,
@@ -210,7 +215,7 @@ export const handler = (request, response) => {
     });
     for (const milestone of workOrderMilestones) {
         const milestoneTimePieces = (milestone.workOrderMilestoneDateString +
-            " " +
+            ' ' +
             milestone.workOrderMilestoneTimeString).split(timeStringSplitRegex);
         const milestoneDate = new Date(Number.parseInt(milestoneTimePieces[0], 10), Number.parseInt(milestoneTimePieces[1], 10) - 1, Number.parseInt(milestoneTimePieces[2], 10), Number.parseInt(milestoneTimePieces[3], 10), Number.parseInt(milestoneTimePieces[4], 10));
         const milestoneEndDate = new Date(milestoneDate.getTime());
@@ -253,13 +258,13 @@ export const handler = (request, response) => {
                     if (organizerSet) {
                         calendarEvent.createAttendee({
                             name: occupant.occupantName,
-                            email: configFunctions.getProperty("settings.workOrders.calendarEmailAddress")
+                            email: configFunctions.getProperty('settings.workOrders.calendarEmailAddress')
                         });
                     }
                     else {
                         calendarEvent.organizer({
                             name: occupant.occupantName,
-                            email: configFunctions.getProperty("settings.workOrders.calendarEmailAddress")
+                            email: configFunctions.getProperty('settings.workOrders.calendarEmailAddress')
                         });
                         organizerSet = true;
                     }
@@ -269,7 +274,7 @@ export const handler = (request, response) => {
         else {
             calendarEvent.organizer({
                 name: milestone.recordCreate_userName,
-                email: configFunctions.getProperty("settings.workOrders.calendarEmailAddress")
+                email: configFunctions.getProperty('settings.workOrders.calendarEmailAddress')
             });
         }
     }

handlers/api-get/milestoneICS.ts

@@ -1,258 +1,277 @@
 /* eslint-disable unicorn/filename-case */
 
-import ical, { ICalEventData, ICalEventStatus } from "ical-generator";
+import ical, { ICalEventData, ICalEventStatus } from 'ical-generator'
 
 import {
   getWorkOrderMilestones,
   WorkOrderMilestoneFilters
-} from "../../helpers/lotOccupancyDB/getWorkOrderMilestones.js";
+} from '../../helpers/lotOccupancyDB/getWorkOrderMilestones.js'
 
-import type { RequestHandler, Request } from "express";
+import type { RequestHandler, Request } from 'express'
 
-import * as configFunctions from "../../helpers/functions.config.js";
+import * as configFunctions from '../../helpers/functions.config.js'
-import { getPrintConfig } from "../../helpers/functions.print.js";
+import { getPrintConfig } from '../../helpers/functions.print.js'
 
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes'
 
-const calendarCompany = "cityssm.github.io";
+const calendarCompany = 'cityssm.github.io'
-const calendarProduct = configFunctions.getProperty("application.applicationName");
+const calendarProduct = configFunctions.getProperty(
+  'application.applicationName'
+)
 
-const timeStringSplitRegex = /[ :-]/;
+const timeStringSplitRegex = /[ :-]/
 
-function escapeHTML(stringToEscape: string) {
+function escapeHTML(stringToEscape: string): string {
-    return stringToEscape.replace(/[^\d A-Za-z]/g, (c) => "&#" + c.codePointAt(0) + ";");
+  return stringToEscape.replace(
+    /[^\d A-Za-z]/g,
+    (c) => `&#${c.codePointAt(0)!};`
+  )
 }
 
 function getUrlRoot(request: Request): string {
   return (
-        "http://" +
+    'http://' +
     request.hostname +
-        (configFunctions.getProperty("application.httpPort") === 80
+    (configFunctions.getProperty('application.httpPort') === 80
-            ? ""
+      ? ''
-            : ":" + configFunctions.getProperty("application.httpPort")) +
+      : `:${configFunctions.getProperty('application.httpPort')}`) +
-        configFunctions.getProperty("reverseProxy.urlPrefix")
+    configFunctions.getProperty('reverseProxy.urlPrefix')
-    );
+  )
 }
 
-function getWorkOrderUrl(request: Request, milestone: recordTypes.WorkOrderMilestone) {
+function getWorkOrderUrl(
-    return getUrlRoot(request) + "/workOrders/" + milestone.workOrderId;
+  request: Request,
+  milestone: recordTypes.WorkOrderMilestone
+): string {
+  return `${getUrlRoot(request)}/workOrders/${milestone.workOrderId!}`
 }
 
 function buildEventSummary(milestone: recordTypes.WorkOrderMilestone): string {
   let summary =
-        (milestone.workOrderMilestoneCompletionDate ? "✔ " : "") +
+    (milestone.workOrderMilestoneCompletionDate ? '✔ ' : '') +
     (milestone.workOrderMilestoneTypeId
       ? milestone.workOrderMilestoneType
       : milestone.workOrderMilestoneDescription
-        ).trim();
+    ).trim()
 
-    let occupantCount = 0;
+  let occupantCount = 0
 
-    for (const lotOccupancy of milestone.workOrderLotOccupancies) {
+  for (const lotOccupancy of milestone.workOrderLotOccupancies!) {
-        for (const occupant of lotOccupancy.lotOccupancyOccupants) {
+    for (const occupant of lotOccupancy.lotOccupancyOccupants!) {
-            occupantCount += 1;
+      occupantCount += 1
 
       if (occupantCount === 1) {
-                if (summary !== "") {
+        if (summary !== '') {
-                    summary += ": ";
+          summary += ': '
         }
 
-                summary += occupant.occupantName;
+        summary += occupant.occupantName
       }
     }
   }
 
   if (occupantCount > 1) {
-        summary += " plus " + (occupantCount - 1);
+    summary += ' plus ' + (occupantCount - 1)
   }
 
-    return summary;
+  return summary
 }
 
 function buildEventDescriptionHTML_occupancies(
   request: Request,
   milestone: recordTypes.WorkOrderMilestone
 ): string {
-    let descriptionHTML = "";
+  let descriptionHTML = ''
 
-    if (milestone.workOrderLotOccupancies.length > 0) {
+  if (milestone.workOrderLotOccupancies!.length > 0) {
-        const urlRoot = getUrlRoot(request);
+    const urlRoot = getUrlRoot(request)
 
     descriptionHTML = `<h2>
-            Related ${escapeHTML(configFunctions.getProperty("aliases.occupancies"))}
+      Related ${escapeHTML(configFunctions.getProperty('aliases.occupancies'))}
       </h2>
       <table border="1">
       <thead><tr>
-            <th>${escapeHTML(configFunctions.getProperty("aliases.occupancy"))} Type</th>
+      <th>${escapeHTML(
-            <th>${escapeHTML(configFunctions.getProperty("aliases.lot"))}</th>
+        configFunctions.getProperty('aliases.occupancy')
+      )} Type</th>
+      <th>${escapeHTML(configFunctions.getProperty('aliases.lot'))}</th>
       <th>Start Date</th>
       <th>End Date</th>
-            <th>${escapeHTML(configFunctions.getProperty("aliases.occupants"))}</th>
+      <th>${escapeHTML(configFunctions.getProperty('aliases.occupants'))}</th>
       </tr></thead>
-            <tbody>`;
+      <tbody>`
 
-        for (const occupancy of milestone.workOrderLotOccupancies) {
+    for (const occupancy of milestone.workOrderLotOccupancies!) {
-            descriptionHTML +=
+      descriptionHTML += `<tr>
-                `<tr>
           <td>
-                    <a href="${urlRoot}/lotOccupancies/${occupancy.lotOccupancyId}">
+            <a href="${urlRoot}/lotOccupancies/${occupancy.lotOccupancyId!}">
-                    ${escapeHTML(occupancy.occupancyType)}
+              ${escapeHTML(occupancy.occupancyType!)}
             </a>
           </td>
           <td>
-                    ${occupancy.lotName ? escapeHTML(occupancy.lotName) : "(Not Set)"}
+            ${occupancy.lotName ? escapeHTML(occupancy.lotName) : '(Not Set)'}
           </td>
           <td>
-                    ${occupancy.occupancyStartDateString}
+            ${occupancy.occupancyStartDateString!}
-                </td>` +
+          </td>
-                "<td>" +
+          <td>
-                (occupancy.occupancyEndDate ? occupancy.occupancyEndDateString : "(No End Date)") +
+            ${
-                "</td>" +
+              occupancy.occupancyEndDate
-                "<td>";
+                ? occupancy.occupancyEndDateString
+                : '(No End Date)'
+            }
+          </td>
+          <td>`
 
-            for (const occupant of occupancy.lotOccupancyOccupants) {
+      for (const occupant of occupancy.lotOccupancyOccupants!) {
         descriptionHTML +=
-                    escapeHTML(occupant.lotOccupantType) +
+          escapeHTML(occupant.lotOccupantType!) +
-                    ": " +
+          ': ' +
-                    escapeHTML(occupant.occupantName) +
+          escapeHTML(occupant.occupantName!) +
-                    "<br />";
+          '<br />'
       }
 
-            descriptionHTML += "</td></tr>";
+      descriptionHTML += '</td></tr>'
     }
 
-        descriptionHTML += "</tbody></table>";
+    descriptionHTML += '</tbody></table>'
   }
 
-    return descriptionHTML;
+  return descriptionHTML
 }
 
 function buildEventDescriptionHTML_lots(
   request: Request,
   milestone: recordTypes.WorkOrderMilestone
 ): string {
-    let descriptionHTML = "";
+  let descriptionHTML = ''
 
   if (milestone.workOrderLots.length > 0) {
-        const urlRoot = getUrlRoot(request);
+    const urlRoot = getUrlRoot(request)
 
     descriptionHTML +=
-            "<h2>Related " +
+      '<h2>Related ' +
-            escapeHTML(configFunctions.getProperty("aliases.lots")) +
+      escapeHTML(configFunctions.getProperty('aliases.lots')) +
-            "</h2>" +
+      '</h2>' +
       '<table border="1"><thead><tr>' +
       `<th>
-                ${escapeHTML(configFunctions.getProperty("aliases.lot"))} Type
+                ${escapeHTML(configFunctions.getProperty('aliases.lot'))} Type
             </th>
             <th>
-                ${escapeHTML(configFunctions.getProperty("aliases.map"))}
+                ${escapeHTML(configFunctions.getProperty('aliases.map'))}
             </th>
             <th>
-                ${escapeHTML(configFunctions.getProperty("aliases.lot"))} Type
+                ${escapeHTML(configFunctions.getProperty('aliases.lot'))} Type
             </th>` +
-            "<th>Status</th>" +
+      '<th>Status</th>' +
-            "</tr></thead>" +
+      '</tr></thead>' +
-            "<tbody>";
+      '<tbody>'
 
-        for (const lot of milestone.workOrderLots) {
+    for (const lot of milestone.workOrderLots!) {
       descriptionHTML +=
-                "<tr>" +
+        '<tr>' +
-                ("<td>" +
+        ('<td>' +
           '<a href="' +
           urlRoot +
-                    "/lots/" +
+          '/lots/' +
           lot.lotId +
           '">' +
-                    escapeHTML(lot.lotName) +
+          escapeHTML(lot.lotName ?? '') +
-                    "</a></td>") +
+          '</a></td>') +
-                `<td>${escapeHTML(lot.mapName)}</td>` +
+        `<td>${escapeHTML(lot.mapName ?? '')}</td>` +
-                `<td>${escapeHTML(lot.lotType)}</td>` +
+        `<td>${escapeHTML(lot.lotType ?? '')}</td>` +
-                `<td>${escapeHTML(lot.lotStatus)}</td>` +
+        `<td>${escapeHTML(lot.lotStatus ?? '')}</td>` +
-                "</tr>";
+        '</tr>'
     }
 
-        descriptionHTML += "</tbody></table>";
+    descriptionHTML += '</tbody></table>'
   }
 
-    return descriptionHTML;
+  return descriptionHTML
 }
 
 function buildEventDescriptionHTML_prints(
   request: Request,
   milestone: recordTypes.WorkOrderMilestone
 ): string {
-    let descriptionHTML = "";
+  let descriptionHTML = ''
 
-    const prints = configFunctions.getProperty("settings.workOrders.prints");
+  const prints = configFunctions.getProperty('settings.workOrders.prints')
 
   if (prints.length > 0) {
-        const urlRoot = getUrlRoot(request);
+    const urlRoot = getUrlRoot(request)
 
-        descriptionHTML += "<h2>Prints</h2>";
+    descriptionHTML += '<h2>Prints</h2>'
 
     for (const printName of prints) {
-            const printConfig = getPrintConfig(printName);
+      const printConfig = getPrintConfig(printName)
 
       if (printConfig) {
         descriptionHTML +=
-                    "<p>" +
+          '<p>' +
           escapeHTML(printConfig.title) +
-                    "<br />" +
+          '<br />' +
-                    (urlRoot + "/print/" + printName + "/?workOrderId=" + milestone.workOrderId) +
+          (urlRoot +
-                    "</p>";
+            '/print/' +
+            printName +
+            '/?workOrderId=' +
+            milestone.workOrderId) +
+          '</p>'
       }
     }
   }
 
-    return descriptionHTML;
+  return descriptionHTML
 }
 
 function buildEventDescriptionHTML(
   request: Request,
   milestone: recordTypes.WorkOrderMilestone
 ): string {
-    const workOrderUrl = getWorkOrderUrl(request, milestone);
+  const workOrderUrl = getWorkOrderUrl(request, milestone)
 
   let descriptionHTML = `<h1>Milestone Description</h1>
-        <p>${escapeHTML(milestone.workOrderMilestoneDescription)}</p>
+        <p>${escapeHTML(milestone.workOrderMilestoneDescription ?? '')}</p>
-        <h2>Work Order #${milestone.workOrderNumber}</h2>
+        <h2>Work Order #${milestone.workOrderNumber ?? ''}</h2>
-        <p>${escapeHTML(milestone.workOrderDescription)}</p>
+        <p>${escapeHTML(milestone.workOrderDescription ?? '')}</p>
-        <p>${workOrderUrl}</p>`;
+        <p>${workOrderUrl}</p>`
 
-    descriptionHTML += buildEventDescriptionHTML_occupancies(request, milestone);
+  descriptionHTML += buildEventDescriptionHTML_occupancies(request, milestone)
-    descriptionHTML += buildEventDescriptionHTML_lots(request, milestone);
+  descriptionHTML += buildEventDescriptionHTML_lots(request, milestone)
-    descriptionHTML += buildEventDescriptionHTML_prints(request, milestone);
+  descriptionHTML += buildEventDescriptionHTML_prints(request, milestone)
 
-    return descriptionHTML;
+  return descriptionHTML
 }
 
-function buildEventCategoryList(milestone: recordTypes.WorkOrderMilestone): string[] {
+function buildEventCategoryList(
-    const categories: string[] = [];
+  milestone: recordTypes.WorkOrderMilestone
+): string[] {
+  const categories: string[] = []
 
   if (milestone.workOrderMilestoneTypeId) {
-        categories.push(milestone.workOrderMilestoneType, milestone.workOrderType);
+    categories.push(milestone.workOrderMilestoneType, milestone.workOrderType)
   }
 
   if (milestone.workOrderMilestoneCompletionDate) {
-        categories.push("Completed");
+    categories.push('Completed')
   }
 
-    return categories;
+  return categories
 }
 
 function buildEventLocation(milestone: recordTypes.WorkOrderMilestone): string {
-    const lotNames = [];
+  const lotNames: string[] = []
 
-    if (milestone.workOrderLots.length > 0) {
+  if (milestone.workOrderLots!.length > 0) {
-        for (const lot of milestone.workOrderLots) {
+    for (const lot of milestone.workOrderLots!) {
-            lotNames.push(lot.mapName + ": " + lot.lotName);
+      lotNames.push(`${lot.mapName ?? ''}: ${lot.lotName ?? ''}`)
     }
   }
-    return lotNames.join(", ");
+  return lotNames.join(', ')
 }
 
 export const handler: RequestHandler = (request, response) => {
-    const urlRoot = getUrlRoot(request);
+  const urlRoot = getUrlRoot(request)
 
   /*
    * Get work order milestones
@@ -261,37 +280,40 @@ export const handler: RequestHandler = (request, response) => {
   const workOrderMilestoneFilters: WorkOrderMilestoneFilters = {
     workOrderTypeIds: request.query.workOrderTypeIds as string,
     workOrderMilestoneTypeIds: request.query.workOrderMilestoneTypeIds as string
-    };
-
-    if (request.query.workOrderId) {
-        workOrderMilestoneFilters.workOrderId = request.query.workOrderId as string;
-    } else {
-        workOrderMilestoneFilters.workOrderMilestoneDateFilter = "recent";
   }
 
-    const workOrderMilestones = getWorkOrderMilestones(workOrderMilestoneFilters, {
+  if (request.query.workOrderId) {
+    workOrderMilestoneFilters.workOrderId = request.query.workOrderId as string
+  } else {
+    workOrderMilestoneFilters.workOrderMilestoneDateFilter = 'recent'
+  }
+
+  const workOrderMilestones = getWorkOrderMilestones(
+    workOrderMilestoneFilters,
+    {
       includeWorkOrders: true,
-        orderBy: "date"
+      orderBy: 'date'
-    });
+    }
+  )
 
   /*
    * Create calendar object
    */
 
   const calendar = ical({
-        name: "Work Order Milestone Calendar",
+    name: 'Work Order Milestone Calendar',
-        url: urlRoot + "/workOrders"
+    url: urlRoot + '/workOrders'
-    });
+  })
 
   if (request.query.workOrderId && workOrderMilestones.length > 0) {
-        calendar.name(`Work Order #${workOrderMilestones[0].workOrderNumber}`);
+    calendar.name(`Work Order #${workOrderMilestones[0].workOrderNumber}`)
-        calendar.url(urlRoot + "/workOrders/" + workOrderMilestones[0].workOrderId);
+    calendar.url(urlRoot + '/workOrders/' + workOrderMilestones[0].workOrderId)
   }
 
   calendar.prodId({
     company: calendarCompany,
     product: calendarProduct
-    });
+  })
 
   /*
    * Loop through milestones
@@ -300,9 +322,9 @@ export const handler: RequestHandler = (request, response) => {
   for (const milestone of workOrderMilestones) {
     const milestoneTimePieces = (
       milestone.workOrderMilestoneDateString +
-            " " +
+      ' ' +
       milestone.workOrderMilestoneTimeString
-        ).split(timeStringSplitRegex);
+    ).split(timeStringSplitRegex)
 
     const milestoneDate = new Date(
       Number.parseInt(milestoneTimePieces[0], 10),
@@ -310,18 +332,18 @@ export const handler: RequestHandler = (request, response) => {
       Number.parseInt(milestoneTimePieces[2], 10),
       Number.parseInt(milestoneTimePieces[3], 10),
       Number.parseInt(milestoneTimePieces[4], 10)
-        );
+    )
 
-        const milestoneEndDate = new Date(milestoneDate.getTime());
+    const milestoneEndDate = new Date(milestoneDate.getTime())
-        milestoneEndDate.setHours(milestoneEndDate.getHours() + 1);
+    milestoneEndDate.setHours(milestoneEndDate.getHours() + 1)
 
     // Build summary (title in Outlook)
 
-        const summary = buildEventSummary(milestone);
+    const summary = buildEventSummary(milestone)
 
     // Build URL
 
-        const workOrderUrl = getWorkOrderUrl(request, milestone);
+    const workOrderUrl = getWorkOrderUrl(request, milestone)
 
     // Create event
 
@@ -338,76 +360,78 @@ export const handler: RequestHandler = (request, response) => {
       allDay: !milestone.workOrderMilestoneTime,
       summary,
       url: workOrderUrl
-        };
-
-        if (!eventData.allDay) {
-            eventData.end = milestoneEndDate;
     }
 
-        const calendarEvent = calendar.createEvent(eventData);
+    if (!eventData.allDay) {
+      eventData.end = milestoneEndDate
+    }
+
+    const calendarEvent = calendar.createEvent(eventData)
 
     // Build description
 
-        const descriptionHTML = buildEventDescriptionHTML(request, milestone);
+    const descriptionHTML = buildEventDescriptionHTML(request, milestone)
 
     calendarEvent.description({
       plain: workOrderUrl,
       html: descriptionHTML
-        });
+    })
 
     // Set status
 
     if (milestone.workOrderMilestoneCompletionDate) {
-            calendarEvent.status(ICalEventStatus.CONFIRMED);
+      calendarEvent.status(ICalEventStatus.CONFIRMED)
     }
 
     // Add categories
 
-        const categories = buildEventCategoryList(milestone);
+    const categories = buildEventCategoryList(milestone)
     for (const category of categories) {
       calendarEvent.createCategory({
         name: category
-            });
+      })
     }
 
     // Set location
 
-        const location = buildEventLocation(milestone);
+    const location = buildEventLocation(milestone)
-        calendarEvent.location(location);
+    calendarEvent.location(location)
 
     // Set organizer / attendees
 
     if (milestone.workOrderLotOccupancies.length > 0) {
-            let organizerSet = false;
+      let organizerSet = false
       for (const lotOccupancy of milestone.workOrderLotOccupancies) {
         for (const occupant of lotOccupancy.lotOccupancyOccupants) {
           if (organizerSet) {
             calendarEvent.createAttendee({
               name: occupant.occupantName,
               email: configFunctions.getProperty(
-                                "settings.workOrders.calendarEmailAddress"
+                'settings.workOrders.calendarEmailAddress'
               )
-                        });
+            })
           } else {
             calendarEvent.organizer({
               name: occupant.occupantName,
               email: configFunctions.getProperty(
-                                "settings.workOrders.calendarEmailAddress"
+                'settings.workOrders.calendarEmailAddress'
               )
-                        });
+            })
-                        organizerSet = true;
+            organizerSet = true
           }
         }
       }
     } else {
       calendarEvent.organizer({
         name: milestone.recordCreate_userName,
-                email: configFunctions.getProperty("settings.workOrders.calendarEmailAddress")
+        email: configFunctions.getProperty(
-            });
+          'settings.workOrders.calendarEmailAddress'
+        )
+      })
     }
   }
 
-    calendar.serve(response);
+  calendar.serve(response)
-};
+}
 
-export default handler;
+export default handler

handlers/lotOccupancies-get/edit.d.ts

@@ -1,3 +1,3 @@
-import type { RequestHandler } from "express";
+import type { RequestHandler } from 'express';
 export declare const handler: RequestHandler;
 export default handler;

handlers/lotOccupancies-get/edit.js

@@ -1,12 +1,12 @@
-import { getLotOccupantTypes, getLotStatuses, getLotTypes, getOccupancyTypePrintsById, getOccupancyTypes, getWorkOrderTypes } from "../../helpers/functions.cache.js";
+import { getLotOccupantTypes, getLotStatuses, getLotTypes, getOccupancyTypePrintsById, getOccupancyTypes, getWorkOrderTypes } from '../../helpers/functions.cache.js';
-import * as configFunctions from "../../helpers/functions.config.js";
+import * as configFunctions from '../../helpers/functions.config.js';
-import { getLotOccupancy } from "../../helpers/lotOccupancyDB/getLotOccupancy.js";
+import { getLotOccupancy } from '../../helpers/lotOccupancyDB/getLotOccupancy.js';
-import { getMaps } from "../../helpers/lotOccupancyDB/getMaps.js";
+import { getMaps } from '../../helpers/lotOccupancyDB/getMaps.js';
 export const handler = (request, response) => {
     const lotOccupancy = getLotOccupancy(request.params.lotOccupancyId);
     if (!lotOccupancy) {
-        return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") +
+        response.redirect(`${configFunctions.getProperty('reverseProxy.urlPrefix')}/lotOccupancies/?error=lotOccupancyIdNotFound`);
-            "/lotOccupancies/?error=lotOccupancyIdNotFound");
+        return;
     }
     const occupancyTypePrints = getOccupancyTypePrintsById(lotOccupancy.occupancyTypeId);
     const occupancyTypes = getOccupancyTypes();
@@ -15,8 +15,8 @@ export const handler = (request, response) => {
     const lotStatuses = getLotStatuses();
     const maps = getMaps();
     const workOrderTypes = getWorkOrderTypes();
-    return response.render("lotOccupancy-edit", {
+    response.render('lotOccupancy-edit', {
-        headTitle: `${configFunctions.getProperty("aliases.occupancy")} Update`,
+        headTitle: `${configFunctions.getProperty('aliases.occupancy')} Update`,
         lotOccupancy,
         occupancyTypePrints,
         occupancyTypes,

handlers/lotOccupancies-get/edit.ts

@@ -1,4 +1,4 @@
-import type { RequestHandler } from "express";
+import type { RequestHandler } from 'express'
 
 import {
   getLotOccupantTypes,
@@ -7,34 +7,38 @@ import {
   getOccupancyTypePrintsById,
   getOccupancyTypes,
   getWorkOrderTypes
-} from "../../helpers/functions.cache.js";
+} from '../../helpers/functions.cache.js'
 
-import * as configFunctions from "../../helpers/functions.config.js";
+import * as configFunctions from '../../helpers/functions.config.js'
 
-import { getLotOccupancy } from "../../helpers/lotOccupancyDB/getLotOccupancy.js";
+import { getLotOccupancy } from '../../helpers/lotOccupancyDB/getLotOccupancy.js'
-import { getMaps } from "../../helpers/lotOccupancyDB/getMaps.js";
+import { getMaps } from '../../helpers/lotOccupancyDB/getMaps.js'
 
 export const handler: RequestHandler = (request, response) => {
-    const lotOccupancy = getLotOccupancy(request.params.lotOccupancyId);
+  const lotOccupancy = getLotOccupancy(request.params.lotOccupancyId)
 
   if (!lotOccupancy) {
-        return response.redirect(
+    response.redirect(
-            configFunctions.getProperty("reverseProxy.urlPrefix") +
+      `${configFunctions.getProperty(
-                "/lotOccupancies/?error=lotOccupancyIdNotFound"
+        'reverseProxy.urlPrefix'
-        );
+      )}/lotOccupancies/?error=lotOccupancyIdNotFound`
+    )
+    return
   }
 
-    const occupancyTypePrints = getOccupancyTypePrintsById(lotOccupancy.occupancyTypeId);
+  const occupancyTypePrints = getOccupancyTypePrintsById(
+    lotOccupancy.occupancyTypeId!
+  )
 
-    const occupancyTypes = getOccupancyTypes();
+  const occupancyTypes = getOccupancyTypes()
-    const lotOccupantTypes = getLotOccupantTypes();
+  const lotOccupantTypes = getLotOccupantTypes()
-    const lotTypes = getLotTypes();
+  const lotTypes = getLotTypes()
-    const lotStatuses = getLotStatuses();
+  const lotStatuses = getLotStatuses()
-    const maps = getMaps();
+  const maps = getMaps()
-    const workOrderTypes = getWorkOrderTypes();
+  const workOrderTypes = getWorkOrderTypes()
 
-    return response.render("lotOccupancy-edit", {
+  response.render('lotOccupancy-edit', {
-        headTitle: `${configFunctions.getProperty("aliases.occupancy")} Update`,
+    headTitle: `${configFunctions.getProperty('aliases.occupancy')} Update`,
     lotOccupancy,
     occupancyTypePrints,
 
@@ -46,7 +50,7 @@ export const handler: RequestHandler = (request, response) => {
     workOrderTypes,
 
     isCreate: false
-    });
+  })
-};
+}
 
-export default handler;
+export default handler

handlers/lotOccupancies-get/view.d.ts

@@ -1,3 +1,3 @@
-import type { RequestHandler } from "express";
+import type { RequestHandler } from 'express';
 export declare const handler: RequestHandler;
 export default handler;

handlers/lotOccupancies-get/view.js

@@ -1,15 +1,16 @@
-import { getOccupancyTypePrintsById } from "../../helpers/functions.cache.js";
+import { getOccupancyTypePrintsById } from '../../helpers/functions.cache.js';
-import * as configFunctions from "../../helpers/functions.config.js";
+import * as configFunctions from '../../helpers/functions.config.js';
-import { getLotOccupancy } from "../../helpers/lotOccupancyDB/getLotOccupancy.js";
+import { getLotOccupancy } from '../../helpers/lotOccupancyDB/getLotOccupancy.js';
 export const handler = (request, response) => {
     const lotOccupancy = getLotOccupancy(request.params.lotOccupancyId);
     if (!lotOccupancy) {
-        return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") +
+        response.redirect(configFunctions.getProperty('reverseProxy.urlPrefix') +
-            "/lotOccupancies/?error=lotOccupancyIdNotFound");
+            '/lotOccupancies/?error=lotOccupancyIdNotFound');
+        return;
     }
     const occupancyTypePrints = getOccupancyTypePrintsById(lotOccupancy.occupancyTypeId);
-    return response.render("lotOccupancy-view", {
+    response.render('lotOccupancy-view', {
-        headTitle: `${configFunctions.getProperty("aliases.occupancy")} View`,
+        headTitle: `${configFunctions.getProperty('aliases.occupancy')} View`,
         lotOccupancy,
         occupancyTypePrints
     });

handlers/lotOccupancies-get/view.ts

@@ -1,27 +1,30 @@
-import type { RequestHandler } from "express";
+import type { RequestHandler } from 'express'
-import { getOccupancyTypePrintsById } from "../../helpers/functions.cache.js";
+import { getOccupancyTypePrintsById } from '../../helpers/functions.cache.js'
 
-import * as configFunctions from "../../helpers/functions.config.js";
+import * as configFunctions from '../../helpers/functions.config.js'
 
-import { getLotOccupancy } from "../../helpers/lotOccupancyDB/getLotOccupancy.js";
+import { getLotOccupancy } from '../../helpers/lotOccupancyDB/getLotOccupancy.js'
 
 export const handler: RequestHandler = (request, response) => {
-    const lotOccupancy = getLotOccupancy(request.params.lotOccupancyId);
+  const lotOccupancy = getLotOccupancy(request.params.lotOccupancyId)
 
   if (!lotOccupancy) {
-        return response.redirect(
+    response.redirect(
-            configFunctions.getProperty("reverseProxy.urlPrefix") +
+      configFunctions.getProperty('reverseProxy.urlPrefix') +
-                "/lotOccupancies/?error=lotOccupancyIdNotFound"
+        '/lotOccupancies/?error=lotOccupancyIdNotFound'
-        );
+    )
+    return
   }
 
-    const occupancyTypePrints = getOccupancyTypePrintsById(lotOccupancy.occupancyTypeId);
+  const occupancyTypePrints = getOccupancyTypePrintsById(
+    lotOccupancy.occupancyTypeId!
+  )
 
-    return response.render("lotOccupancy-view", {
+  response.render('lotOccupancy-view', {
-        headTitle: `${configFunctions.getProperty("aliases.occupancy")} View`,
+    headTitle: `${configFunctions.getProperty('aliases.occupancy')} View`,
     lotOccupancy,
     occupancyTypePrints
-    });
+  })
-};
+}
 
-export default handler;
+export default handler

handlers/lotOccupancies-post/doGetFees.d.ts

@@ -1,3 +1,3 @@
-import type { RequestHandler } from "express";
+import type { RequestHandler } from 'express';
 export declare const handler: RequestHandler;
 export default handler;

handlers/lotOccupancies-post/doGetFees.js

@@ -1,5 +1,5 @@
-import { getLotOccupancy } from "../../helpers/lotOccupancyDB/getLotOccupancy.js";
+import { getLotOccupancy } from '../../helpers/lotOccupancyDB/getLotOccupancy.js';
-import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js";
+import { getFeeCategories } from '../../helpers/lotOccupancyDB/getFeeCategories.js';
 export const handler = (request, response) => {
     const lotOccupancyId = request.body.lotOccupancyId;
     const lotOccupancy = getLotOccupancy(lotOccupancyId);

handlers/lotOccupancies-post/doGetFees.ts

@@ -1,13 +1,13 @@
-import type { RequestHandler } from "express";
+import type { RequestHandler } from 'express'
 
-import { getLotOccupancy } from "../../helpers/lotOccupancyDB/getLotOccupancy.js";
+import { getLotOccupancy } from '../../helpers/lotOccupancyDB/getLotOccupancy.js'
 
-import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js";
+import { getFeeCategories } from '../../helpers/lotOccupancyDB/getFeeCategories.js'
 
 export const handler: RequestHandler = (request, response) => {
-    const lotOccupancyId = request.body.lotOccupancyId;
+  const lotOccupancyId = request.body.lotOccupancyId
 
-    const lotOccupancy = getLotOccupancy(lotOccupancyId);
+  const lotOccupancy = getLotOccupancy(lotOccupancyId)!
 
   const feeCategories = getFeeCategories(
     {
@@ -17,11 +17,11 @@ export const handler: RequestHandler = (request, response) => {
     {
       includeFees: true
     }
-    );
+  )
 
   response.json({
     feeCategories
-    });
+  })
-};
+}
 
-export default handler;
+export default handler

handlers/lotOccupancies-post/doGetOccupancyTypeFields.d.ts

@@ -1,3 +1,3 @@
-import type { RequestHandler } from "express";
+import type { RequestHandler } from 'express';
 export declare const handler: RequestHandler;
 export default handler;

handlers/lotOccupancies-post/doGetOccupancyTypeFields.js

@@ -1,8 +1,8 @@
-import { getOccupancyTypeById, getAllOccupancyTypeFields } from "../../helpers/functions.cache.js";
+import { getOccupancyTypeById, getAllOccupancyTypeFields } from '../../helpers/functions.cache.js';
-export const handler = async (request, response) => {
+export const handler = (request, response) => {
     const occupancyTypeFields = getAllOccupancyTypeFields();
     const result = getOccupancyTypeById(Number.parseInt(request.body.occupancyTypeId, 10));
-    occupancyTypeFields.push(...result.occupancyTypeFields);
+    occupancyTypeFields.push(...(result.occupancyTypeFields ?? []));
     response.json({
         occupancyTypeFields
     });

handlers/lotOccupancies-post/doGetOccupancyTypeFields.ts

@@ -1,17 +1,22 @@
-import type { RequestHandler } from "express";
+import type { RequestHandler } from 'express'
 
-import { getOccupancyTypeById, getAllOccupancyTypeFields } from "../../helpers/functions.cache.js";
+import {
+  getOccupancyTypeById,
+  getAllOccupancyTypeFields
+} from '../../helpers/functions.cache.js'
 
-export const handler: RequestHandler = async (request, response) => {
+export const handler: RequestHandler = (request, response) => {
-    const occupancyTypeFields = getAllOccupancyTypeFields();
+  const occupancyTypeFields = getAllOccupancyTypeFields()
 
-    const result = getOccupancyTypeById(Number.parseInt(request.body.occupancyTypeId, 10));
+  const result = getOccupancyTypeById(
+    Number.parseInt(request.body.occupancyTypeId, 10)
+  )!
 
-    occupancyTypeFields.push(...result.occupancyTypeFields);
+  occupancyTypeFields.push(...(result.occupancyTypeFields ?? []))
 
   response.json({
     occupancyTypeFields
-    });
+  })
-};
+}
 
-export default handler;
+export default handler

handlers/lots-post/doGetLotTypeFields.d.ts

@@ -1,3 +1,3 @@
-import type { RequestHandler } from "express";
+import type { RequestHandler } from 'express';
 export declare const handler: RequestHandler;
 export default handler;

handlers/lots-post/doGetLotTypeFields.js

@@ -1,5 +1,5 @@
-import { getLotTypeById } from "../../helpers/functions.cache.js";
+import { getLotTypeById } from '../../helpers/functions.cache.js';
-export const handler = async (request, response) => {
+export const handler = (request, response) => {
     const lotType = getLotTypeById(Number.parseInt(request.body.lotTypeId, 10));
     response.json({
         lotTypeFields: lotType.lotTypeFields

handlers/lots-post/doGetLotTypeFields.ts

@@ -1,13 +1,13 @@
-import type { RequestHandler } from "express";
+import type { RequestHandler } from 'express'
 
-import { getLotTypeById } from "../../helpers/functions.cache.js";
+import { getLotTypeById } from '../../helpers/functions.cache.js'
 
-export const handler: RequestHandler = async (request, response) => {
+export const handler: RequestHandler = (request, response) => {
-    const lotType = getLotTypeById(Number.parseInt(request.body.lotTypeId, 10));
+  const lotType = getLotTypeById(Number.parseInt(request.body.lotTypeId, 10))!
 
   response.json({
     lotTypeFields: lotType.lotTypeFields
-    });
+  })
-};
+}
 
-export default handler;
+export default handler

handlers/reports-get/reportName.d.ts

@@ -1,3 +1,3 @@
-import type { RequestHandler } from "express";
+import type { RequestHandler } from 'express';
 export declare const handler: RequestHandler;
 export default handler;

handlers/reports-get/reportName.js

@@ -1,5 +1,5 @@
-import { getReportData } from "../../helpers/lotOccupancyDB/getReportData.js";
+import { getReportData } from '../../helpers/lotOccupancyDB/getReportData.js';
-import papaparse from "papaparse";
+import papaparse from 'papaparse';
 export const handler = (request, response) => {
     const reportName = request.params.reportName;
     let rows;
@@ -12,12 +12,12 @@ export const handler = (request, response) => {
     if (!rows) {
         return response.status(404).json({
             success: false,
-            message: "Report Not Found"
+            message: 'Report Not Found'
         });
     }
     const csv = papaparse.unparse(rows);
-    response.setHeader("Content-Disposition", "attachment; filename=" + reportName + "-" + Date.now().toString() + ".csv");
+    response.setHeader('Content-Disposition', 'attachment; filename=' + reportName + '-' + Date.now().toString() + '.csv');
-    response.setHeader("Content-Type", "text/csv");
+    response.setHeader('Content-Type', 'text/csv');
     response.send(csv);
 };
 export default handler;

handlers/reports-get/reportName.ts

@@ -1,38 +1,41 @@
-import type { RequestHandler } from "express";
+import type { RequestHandler } from 'express'
 
-import { getReportData, ReportParameters } from "../../helpers/lotOccupancyDB/getReportData.js";
+import {
+  getReportData,
+  ReportParameters
+} from '../../helpers/lotOccupancyDB/getReportData.js'
 
-import papaparse from "papaparse";
+import papaparse from 'papaparse'
 
 export const handler: RequestHandler = (request, response) => {
-    const reportName = request.params.reportName;
+  const reportName = request.params.reportName
 
-    let rows: unknown[];
+  let rows: unknown[] | undefined
 
   switch (reportName) {
     default: {
-            rows = getReportData(reportName, request.query as ReportParameters);
+      rows = getReportData(reportName, request.query as ReportParameters)
-            break;
+      break
     }
   }
 
   if (!rows) {
     return response.status(404).json({
       success: false,
-            message: "Report Not Found"
+      message: 'Report Not Found'
-        });
+    })
   }
 
-    const csv = papaparse.unparse(rows);
+  const csv = papaparse.unparse(rows)
 
   response.setHeader(
-        "Content-Disposition",
+    'Content-Disposition',
-        "attachment; filename=" + reportName + "-" + Date.now().toString() + ".csv"
+    'attachment; filename=' + reportName + '-' + Date.now().toString() + '.csv'
-    );
+  )
 
-    response.setHeader("Content-Type", "text/csv");
+  response.setHeader('Content-Type', 'text/csv')
 
-    response.send(csv);
+  response.send(csv)
-};
+}
 
-export default handler;
+export default handler

handlers/workOrders-get/edit.d.ts

@@ -1,3 +1,3 @@
-import type { RequestHandler } from "express";
+import type { RequestHandler } from 'express';
 export declare const handler: RequestHandler;
 export default handler;

handlers/workOrders-get/edit.js

@@ -1,6 +1,6 @@
-import { getLotStatuses, getWorkOrderMilestoneTypes, getWorkOrderTypes } from "../../helpers/functions.cache.js";
+import { getLotStatuses, getWorkOrderMilestoneTypes, getWorkOrderTypes } from '../../helpers/functions.cache.js';
-import * as configFunctions from "../../helpers/functions.config.js";
+import * as configFunctions from '../../helpers/functions.config.js';
-import { getWorkOrder } from "../../helpers/lotOccupancyDB/getWorkOrder.js";
+import { getWorkOrder } from '../../helpers/lotOccupancyDB/getWorkOrder.js';
 export const handler = (request, response) => {
     const workOrder = getWorkOrder(request.params.workOrderId, {
         includeLotsAndLotOccupancies: true,
@@ -8,20 +8,22 @@ export const handler = (request, response) => {
         includeMilestones: true
     });
     if (!workOrder) {
-        return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") +
+        response.redirect(configFunctions.getProperty('reverseProxy.urlPrefix') +
-            "/workOrders/?error=workOrderIdNotFound");
+            '/workOrders/?error=workOrderIdNotFound');
+        return;
     }
     if (workOrder.workOrderCloseDate) {
-        return response.redirect(configFunctions.getProperty("reverseProxy.urlPrefix") +
+        response.redirect(configFunctions.getProperty('reverseProxy.urlPrefix') +
-            "/workOrders/" +
+            '/workOrders/' +
             workOrder.workOrderId.toString() +
-            "/?error=workOrderIsClosed");
+            '/?error=workOrderIsClosed');
+        return;
     }
     const workOrderTypes = getWorkOrderTypes();
     const workOrderMilestoneTypes = getWorkOrderMilestoneTypes();
     const lotStatuses = getLotStatuses();
-    response.render("workOrder-edit", {
+    response.render('workOrder-edit', {
-        headTitle: "Work Order #" + workOrder.workOrderNumber,
+        headTitle: `Work Order #${workOrder.workOrderNumber}`,
         workOrder,
         isCreate: false,
         workOrderTypes,

handlers/workOrders-get/edit.ts

@@ -1,52 +1,54 @@
-import type { RequestHandler } from "express";
+import type { RequestHandler } from 'express'
 
 import {
   getLotStatuses,
   getWorkOrderMilestoneTypes,
   getWorkOrderTypes
-} from "../../helpers/functions.cache.js";
+} from '../../helpers/functions.cache.js'
 
-import * as configFunctions from "../../helpers/functions.config.js";
+import * as configFunctions from '../../helpers/functions.config.js'
 
-import { getWorkOrder } from "../../helpers/lotOccupancyDB/getWorkOrder.js";
+import { getWorkOrder } from '../../helpers/lotOccupancyDB/getWorkOrder.js'
 
 export const handler: RequestHandler = (request, response) => {
   const workOrder = getWorkOrder(request.params.workOrderId, {
     includeLotsAndLotOccupancies: true,
     includeComments: true,
     includeMilestones: true
-    });
+  })
 
   if (!workOrder) {
-        return response.redirect(
+    response.redirect(
-            configFunctions.getProperty("reverseProxy.urlPrefix") +
+      configFunctions.getProperty('reverseProxy.urlPrefix') +
-                "/workOrders/?error=workOrderIdNotFound"
+        '/workOrders/?error=workOrderIdNotFound'
-        );
+    )
+    return
   }
 
   if (workOrder.workOrderCloseDate) {
-        return response.redirect(
+    response.redirect(
-            configFunctions.getProperty("reverseProxy.urlPrefix") +
+      configFunctions.getProperty('reverseProxy.urlPrefix') +
-                "/workOrders/" +
+        '/workOrders/' +
-                workOrder.workOrderId.toString() +
+        workOrder.workOrderId!.toString() +
-                "/?error=workOrderIsClosed"
+        '/?error=workOrderIsClosed'
-        );
+    )
+    return
   }
 
-    const workOrderTypes = getWorkOrderTypes();
+  const workOrderTypes = getWorkOrderTypes()
 
-    const workOrderMilestoneTypes = getWorkOrderMilestoneTypes();
+  const workOrderMilestoneTypes = getWorkOrderMilestoneTypes()
 
-    const lotStatuses = getLotStatuses();
+  const lotStatuses = getLotStatuses()
 
-    response.render("workOrder-edit", {
+  response.render('workOrder-edit', {
-        headTitle: "Work Order #" + workOrder.workOrderNumber,
+    headTitle: `Work Order #${workOrder.workOrderNumber!}`,
     workOrder,
     isCreate: false,
     workOrderTypes,
     workOrderMilestoneTypes,
     lotStatuses
-    });
+  })
-};
+}
 
-export default handler;
+export default handler

helpers/functions.api.d.ts

@@ -1,5 +1,5 @@
-import * as recordTypes from "../types/recordTypes";
+import * as recordTypes from '../types/recordTypes';
 export declare function regenerateApiKey(userName: string): Promise<void>;
 export declare function getApiKey(userName: string): Promise<string>;
 export declare function getApiKeyFromSession(session: recordTypes.PartialSession): Promise<string>;
-export declare function getUserNameFromApiKey(apiKey: string): Promise<string>;
+export declare function getUserNameFromApiKey(apiKey: string): Promise<string | undefined>;

helpers/functions.api.js

@@ -1,12 +1,12 @@
-import fs from "node:fs/promises";
+import fs from 'node:fs/promises';
-import { v4 as uuidv4 } from "uuid";
+import { v4 as uuidv4 } from 'uuid';
-import Debug from "debug";
+import Debug from 'debug';
-const debug = Debug("lot-occupancy-system:functions.api");
+const debug = Debug('lot-occupancy-system:functions.api');
-const apiKeyPath = "data/apiKeys.json";
+const apiKeyPath = 'data/apiKeys.json';
 let apiKeys;
 async function loadApiKeys() {
     try {
-        const fileData = await fs.readFile(apiKeyPath, "utf8");
+        const fileData = await fs.readFile(apiKeyPath, 'utf8');
         apiKeys = JSON.parse(fileData);
     }
     catch (error) {
@@ -16,14 +16,14 @@ async function loadApiKeys() {
 }
 async function saveApiKeys() {
     try {
-        await fs.writeFile(apiKeyPath, JSON.stringify(apiKeys), "utf8");
+        await fs.writeFile(apiKeyPath, JSON.stringify(apiKeys), 'utf8');
     }
     catch (error) {
         debug(error);
     }
 }
 function generateApiKey(apiKeyPrefix) {
-    return apiKeyPrefix + "-" + uuidv4() + "-" + Date.now();
+    return apiKeyPrefix + '-' + uuidv4() + '-' + Date.now();
 }
 export async function regenerateApiKey(userName) {
     apiKeys[userName] = generateApiKey(userName);

helpers/functions.api.ts

@@ -1,66 +1,70 @@
-import fs from "node:fs/promises";
+import fs from 'node:fs/promises'
-import { v4 as uuidv4 } from "uuid";
+import { v4 as uuidv4 } from 'uuid'
 
-import Debug from "debug";
+import Debug from 'debug'
 
-import * as recordTypes from "../types/recordTypes";
+import * as recordTypes from '../types/recordTypes'
 
-const debug = Debug("lot-occupancy-system:functions.api");
+const debug = Debug('lot-occupancy-system:functions.api')
 
-const apiKeyPath = "data/apiKeys.json";
+const apiKeyPath = 'data/apiKeys.json'
-let apiKeys: { [userName: string]: string };
+let apiKeys: Record<string, string>
 
-async function loadApiKeys() {
+async function loadApiKeys(): Promise<void> {
   try {
-        const fileData = await fs.readFile(apiKeyPath, "utf8");
+    const fileData = await fs.readFile(apiKeyPath, 'utf8')
-        apiKeys = JSON.parse(fileData);
+    apiKeys = JSON.parse(fileData)
   } catch (error) {
-        debug(error);
+    debug(error)
-        apiKeys = {};
+    apiKeys = {}
   }
 }
 
-async function saveApiKeys() {
+async function saveApiKeys(): Promise<void> {
   try {
-        await fs.writeFile(apiKeyPath, JSON.stringify(apiKeys), "utf8");
+    await fs.writeFile(apiKeyPath, JSON.stringify(apiKeys), 'utf8')
   } catch (error) {
-        debug(error);
+    debug(error)
   }
 }
 
-function generateApiKey(apiKeyPrefix: string) {
+function generateApiKey(apiKeyPrefix: string): string {
-    return apiKeyPrefix + "-" + uuidv4() + "-" + Date.now();
+  return apiKeyPrefix + '-' + uuidv4() + '-' + Date.now()
 }
 
-export async function regenerateApiKey(userName: string) {
+export async function regenerateApiKey(userName: string): Promise<void> {
-    apiKeys[userName] = generateApiKey(userName);
+  apiKeys[userName] = generateApiKey(userName)
-    await saveApiKeys();
+  await saveApiKeys()
 }
 
-export async function getApiKey(userName: string) {
+export async function getApiKey(userName: string): Promise<string> {
   if (!apiKeys) {
-        await loadApiKeys();
+    await loadApiKeys()
   }
 
   if (!apiKeys[userName]) {
-        await regenerateApiKey(userName);
+    await regenerateApiKey(userName)
   }
 
-    return apiKeys[userName];
+  return apiKeys[userName]
 }
 
-export async function getApiKeyFromSession(session: recordTypes.PartialSession) {
+export async function getApiKeyFromSession(
-    return await getApiKey(session.user.userName);
+  session: recordTypes.PartialSession
+): Promise<string> {
+  return await getApiKey(session.user!.userName)
 }
 
-export async function getUserNameFromApiKey(apiKey: string) {
+export async function getUserNameFromApiKey(
+  apiKey: string
+): Promise<string | undefined> {
   if (!apiKeys) {
-        await loadApiKeys();
+    await loadApiKeys()
   }
 
   for (const [userName, currentApiKey] of Object.entries(apiKeys)) {
     if (apiKey === currentApiKey) {
-            return userName;
+      return userName
     }
   }
 }

helpers/functions.authentication.js

@@ -13,7 +13,7 @@ async function authenticateViaActiveDirectory(userName, password) {
                 resolve(auth);
             });
         }
-        catch (_a) {
+        catch {
             resolve(false);
         }
     });

helpers/functions.cache.d.ts

@@ -1,21 +1,21 @@
-import type * as recordTypes from "../types/recordTypes";
+import type * as recordTypes from '../types/recordTypes';
 export declare function getLotOccupantTypes(): recordTypes.LotOccupantType[];
-export declare function getLotOccupantTypeById(lotOccupantTypeId: number): recordTypes.LotOccupantType;
+export declare function getLotOccupantTypeById(lotOccupantTypeId: number): recordTypes.LotOccupantType | undefined;
-export declare function getLotOccupantTypeByLotOccupantType(lotOccupantType: string): recordTypes.LotOccupantType;
+export declare function getLotOccupantTypeByLotOccupantType(lotOccupantType: string): recordTypes.LotOccupantType | undefined;
 export declare function getLotStatuses(): recordTypes.LotStatus[];
-export declare function getLotStatusById(lotStatusId: number): recordTypes.LotStatus;
+export declare function getLotStatusById(lotStatusId: number): recordTypes.LotStatus | undefined;
-export declare function getLotStatusByLotStatus(lotStatus: string): recordTypes.LotStatus;
+export declare function getLotStatusByLotStatus(lotStatus: string): recordTypes.LotStatus | undefined;
 export declare function getLotTypes(): recordTypes.LotType[];
-export declare function getLotTypeById(lotTypeId: number): recordTypes.LotType;
+export declare function getLotTypeById(lotTypeId: number): recordTypes.LotType | undefined;
-export declare function getLotTypesByLotType(lotType: string): recordTypes.LotType;
+export declare function getLotTypesByLotType(lotType: string): recordTypes.LotType | undefined;
 export declare function getOccupancyTypes(): recordTypes.OccupancyType[];
 export declare function getAllOccupancyTypeFields(): recordTypes.OccupancyTypeField[];
-export declare function getOccupancyTypeById(occupancyTypeId: number): recordTypes.OccupancyType;
+export declare function getOccupancyTypeById(occupancyTypeId: number): recordTypes.OccupancyType | undefined;
-export declare function getOccupancyTypeByOccupancyType(occupancyTypeString: string): recordTypes.OccupancyType;
+export declare function getOccupancyTypeByOccupancyType(occupancyTypeString: string): recordTypes.OccupancyType | undefined;
 export declare function getOccupancyTypePrintsById(occupancyTypeId: number): string[];
 export declare function getWorkOrderTypes(): recordTypes.WorkOrderType[];
-export declare function getWorkOrderTypeById(workOrderTypeId: number): recordTypes.WorkOrderType;
+export declare function getWorkOrderTypeById(workOrderTypeId: number): recordTypes.WorkOrderType | undefined;
 export declare function getWorkOrderMilestoneTypes(): recordTypes.WorkOrderMilestoneType[];
-export declare function getWorkOrderMilestoneTypeByWorkOrderMilestoneTypeId(workOrderMilestoneTypeId: number): recordTypes.WorkOrderMilestoneType;
+export declare function getWorkOrderMilestoneTypeByWorkOrderMilestoneTypeId(workOrderMilestoneTypeId: number): recordTypes.WorkOrderMilestoneType | undefined;
-export declare function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrderMilestoneTypeString: string): recordTypes.WorkOrderMilestoneType;
+export declare function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrderMilestoneTypeString: string): recordTypes.WorkOrderMilestoneType | undefined;
 export declare function clearCacheByTableName(tableName: string): void;

helpers/functions.cache.js

@@ -1,11 +1,11 @@
-import * as configFunctions from "./functions.config.js";
+import * as configFunctions from './functions.config.js';
-import { getLotOccupantTypes as getLotOccupantTypesFromDatabase } from "./lotOccupancyDB/getLotOccupantTypes.js";
+import { getLotOccupantTypes as getLotOccupantTypesFromDatabase } from './lotOccupancyDB/getLotOccupantTypes.js';
-import { getLotStatuses as getLotStatusesFromDatabase } from "./lotOccupancyDB/getLotStatuses.js";
+import { getLotStatuses as getLotStatusesFromDatabase } from './lotOccupancyDB/getLotStatuses.js';
-import { getLotTypes as getLotTypesFromDatabase } from "./lotOccupancyDB/getLotTypes.js";
+import { getLotTypes as getLotTypesFromDatabase } from './lotOccupancyDB/getLotTypes.js';
-import { getOccupancyTypes as getOccupancyTypesFromDatabase } from "./lotOccupancyDB/getOccupancyTypes.js";
+import { getOccupancyTypes as getOccupancyTypesFromDatabase } from './lotOccupancyDB/getOccupancyTypes.js';
-import { getOccupancyTypeFields as getOccupancyTypeFieldsFromDatabase } from "./lotOccupancyDB/getOccupancyTypeFields.js";
+import { getOccupancyTypeFields as getOccupancyTypeFieldsFromDatabase } from './lotOccupancyDB/getOccupancyTypeFields.js';
-import { getWorkOrderTypes as getWorkOrderTypesFromDatabase } from "./lotOccupancyDB/getWorkOrderTypes.js";
+import { getWorkOrderTypes as getWorkOrderTypesFromDatabase } from './lotOccupancyDB/getWorkOrderTypes.js';
-import { getWorkOrderMilestoneTypes as getWorkOrderMilestoneTypesFromDatabase } from "./lotOccupancyDB/getWorkOrderMilestoneTypes.js";
+import { getWorkOrderMilestoneTypes as getWorkOrderMilestoneTypesFromDatabase } from './lotOccupancyDB/getWorkOrderMilestoneTypes.js';
 let lotOccupantTypes;
 export function getLotOccupantTypes() {
     if (!lotOccupantTypes) {
@@ -23,7 +23,8 @@ export function getLotOccupantTypeByLotOccupantType(lotOccupantType) {
     const cachedLotOccupantTypes = getLotOccupantTypes();
     const lotOccupantTypeLowerCase = lotOccupantType.toLowerCase();
     return cachedLotOccupantTypes.find((currentLotOccupantType) => {
-        return currentLotOccupantType.lotOccupantType.toLowerCase() === lotOccupantTypeLowerCase;
+        return (currentLotOccupantType.lotOccupantType.toLowerCase() ===
+            lotOccupantTypeLowerCase);
     });
 }
 function clearLotOccupantTypesCache() {
@@ -99,16 +100,18 @@ export function getOccupancyTypeByOccupancyType(occupancyTypeString) {
     const cachedOccupancyTypes = getOccupancyTypes();
     const occupancyTypeLowerCase = occupancyTypeString.toLowerCase();
     return cachedOccupancyTypes.find((currentOccupancyType) => {
-        return currentOccupancyType.occupancyType.toLowerCase() === occupancyTypeLowerCase;
+        return (currentOccupancyType.occupancyType.toLowerCase() ===
+            occupancyTypeLowerCase);
     });
 }
 export function getOccupancyTypePrintsById(occupancyTypeId) {
     const occupancyType = getOccupancyTypeById(occupancyTypeId);
-    if (!occupancyType || occupancyType.occupancyTypePrints.length === 0) {
+    if (!occupancyType ||
+        (occupancyType.occupancyTypePrints ?? []).length === 0) {
         return [];
     }
-    if (occupancyType.occupancyTypePrints.includes("*")) {
+    if (occupancyType.occupancyTypePrints.includes('*')) {
-        return configFunctions.getProperty("settings.lotOccupancy.prints");
+        return configFunctions.getProperty('settings.lotOccupancy.prints');
     }
     return occupancyType.occupancyTypePrints;
 }
@@ -142,7 +145,8 @@ export function getWorkOrderMilestoneTypes() {
 export function getWorkOrderMilestoneTypeByWorkOrderMilestoneTypeId(workOrderMilestoneTypeId) {
     const cachedWorkOrderMilestoneTypes = getWorkOrderMilestoneTypes();
     return cachedWorkOrderMilestoneTypes.find((currentWorkOrderMilestoneType) => {
-        return currentWorkOrderMilestoneType.workOrderMilestoneTypeId === workOrderMilestoneTypeId;
+        return (currentWorkOrderMilestoneType.workOrderMilestoneTypeId ===
+            workOrderMilestoneTypeId);
     });
 }
 export function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrderMilestoneTypeString) {
@@ -158,30 +162,30 @@ function clearWorkOrderMilestoneTypesCache() {
 }
 export function clearCacheByTableName(tableName) {
     switch (tableName) {
-        case "LotOccupantTypes": {
+        case 'LotOccupantTypes': {
             clearLotOccupantTypesCache();
             break;
         }
-        case "LotStatuses": {
+        case 'LotStatuses': {
             clearLotStatusesCache();
             break;
         }
-        case "LotTypes":
+        case 'LotTypes':
-        case "LotTypeFields": {
+        case 'LotTypeFields': {
             clearLotTypesCache();
             break;
         }
-        case "OccupancyTypes":
+        case 'OccupancyTypes':
-        case "OccupancyTypeFields":
+        case 'OccupancyTypeFields':
-        case "OccupancyTypePrints": {
+        case 'OccupancyTypePrints': {
             clearOccupancyTypesCache();
             break;
         }
-        case "WorkOrderMilestoneTypes": {
+        case 'WorkOrderMilestoneTypes': {
             clearWorkOrderMilestoneTypesCache();
             break;
         }
-        case "WorkOrderTypes": {
+        case 'WorkOrderTypes': {
             clearWorkOrderTypesCache();
             break;
         }

helpers/functions.cache.ts

@@ -1,285 +1,320 @@
-import * as configFunctions from "./functions.config.js";
+import * as configFunctions from './functions.config.js'
 
-import { getLotOccupantTypes as getLotOccupantTypesFromDatabase } from "./lotOccupancyDB/getLotOccupantTypes.js";
+import { getLotOccupantTypes as getLotOccupantTypesFromDatabase } from './lotOccupancyDB/getLotOccupantTypes.js'
 
-import { getLotStatuses as getLotStatusesFromDatabase } from "./lotOccupancyDB/getLotStatuses.js";
+import { getLotStatuses as getLotStatusesFromDatabase } from './lotOccupancyDB/getLotStatuses.js'
 
-import { getLotTypes as getLotTypesFromDatabase } from "./lotOccupancyDB/getLotTypes.js";
+import { getLotTypes as getLotTypesFromDatabase } from './lotOccupancyDB/getLotTypes.js'
 
-import { getOccupancyTypes as getOccupancyTypesFromDatabase } from "./lotOccupancyDB/getOccupancyTypes.js";
+import { getOccupancyTypes as getOccupancyTypesFromDatabase } from './lotOccupancyDB/getOccupancyTypes.js'
-import { getOccupancyTypeFields as getOccupancyTypeFieldsFromDatabase } from "./lotOccupancyDB/getOccupancyTypeFields.js";
+import { getOccupancyTypeFields as getOccupancyTypeFieldsFromDatabase } from './lotOccupancyDB/getOccupancyTypeFields.js'
 
-import { getWorkOrderTypes as getWorkOrderTypesFromDatabase } from "./lotOccupancyDB/getWorkOrderTypes.js";
+import { getWorkOrderTypes as getWorkOrderTypesFromDatabase } from './lotOccupancyDB/getWorkOrderTypes.js'
 
-import { getWorkOrderMilestoneTypes as getWorkOrderMilestoneTypesFromDatabase } from "./lotOccupancyDB/getWorkOrderMilestoneTypes.js";
+import { getWorkOrderMilestoneTypes as getWorkOrderMilestoneTypesFromDatabase } from './lotOccupancyDB/getWorkOrderMilestoneTypes.js'
 
-import type * as recordTypes from "../types/recordTypes";
+import type * as recordTypes from '../types/recordTypes'
 
 /*
  * Lot Occupant Types
  */
 
-let lotOccupantTypes: recordTypes.LotOccupantType[] | undefined;
+let lotOccupantTypes: recordTypes.LotOccupantType[] | undefined
 
-export function getLotOccupantTypes() {
+export function getLotOccupantTypes(): recordTypes.LotOccupantType[] {
   if (!lotOccupantTypes) {
-        lotOccupantTypes = getLotOccupantTypesFromDatabase();
+    lotOccupantTypes = getLotOccupantTypesFromDatabase()
   }
 
-    return lotOccupantTypes;
+  return lotOccupantTypes
 }
 
-export function getLotOccupantTypeById(lotOccupantTypeId: number) {
+export function getLotOccupantTypeById(
-    const cachedLotOccupantTypes = getLotOccupantTypes();
+  lotOccupantTypeId: number
+): recordTypes.LotOccupantType | undefined {
+  const cachedLotOccupantTypes = getLotOccupantTypes()
 
   return cachedLotOccupantTypes.find((currentLotOccupantType) => {
-        return currentLotOccupantType.lotOccupantTypeId === lotOccupantTypeId;
+    return currentLotOccupantType.lotOccupantTypeId === lotOccupantTypeId
-    });
+  })
 }
 
-export function getLotOccupantTypeByLotOccupantType(lotOccupantType: string) {
+export function getLotOccupantTypeByLotOccupantType(
-    const cachedLotOccupantTypes = getLotOccupantTypes();
+  lotOccupantType: string
+): recordTypes.LotOccupantType | undefined {
+  const cachedLotOccupantTypes = getLotOccupantTypes()
 
-    const lotOccupantTypeLowerCase = lotOccupantType.toLowerCase();
+  const lotOccupantTypeLowerCase = lotOccupantType.toLowerCase()
 
   return cachedLotOccupantTypes.find((currentLotOccupantType) => {
-        return currentLotOccupantType.lotOccupantType.toLowerCase() === lotOccupantTypeLowerCase;
+    return (
-    });
+      currentLotOccupantType.lotOccupantType.toLowerCase() ===
+      lotOccupantTypeLowerCase
+    )
+  })
 }
 
-function clearLotOccupantTypesCache() {
+function clearLotOccupantTypesCache(): void {
-    lotOccupantTypes = undefined;
+  lotOccupantTypes = undefined
 }
 
 /*
  * Lot Statuses
  */
 
-let lotStatuses: recordTypes.LotStatus[] | undefined;
+let lotStatuses: recordTypes.LotStatus[] | undefined
 
-export function getLotStatuses() {
+export function getLotStatuses(): recordTypes.LotStatus[] {
   if (!lotStatuses) {
-        lotStatuses = getLotStatusesFromDatabase();
+    lotStatuses = getLotStatusesFromDatabase()
   }
 
-    return lotStatuses;
+  return lotStatuses
 }
 
-export function getLotStatusById(lotStatusId: number) {
+export function getLotStatusById(
-    const cachedLotStatuses = getLotStatuses();
+  lotStatusId: number
+): recordTypes.LotStatus | undefined {
+  const cachedLotStatuses = getLotStatuses()
 
   return cachedLotStatuses.find((currentLotStatus) => {
-        return currentLotStatus.lotStatusId === lotStatusId;
+    return currentLotStatus.lotStatusId === lotStatusId
-    });
+  })
 }
 
-export function getLotStatusByLotStatus(lotStatus: string) {
+export function getLotStatusByLotStatus(
-    const cachedLotStatuses = getLotStatuses();
+  lotStatus: string
+): recordTypes.LotStatus | undefined {
+  const cachedLotStatuses = getLotStatuses()
 
-    const lotStatusLowerCase = lotStatus.toLowerCase();
+  const lotStatusLowerCase = lotStatus.toLowerCase()
 
   return cachedLotStatuses.find((currentLotStatus) => {
-        return currentLotStatus.lotStatus.toLowerCase() === lotStatusLowerCase;
+    return currentLotStatus.lotStatus.toLowerCase() === lotStatusLowerCase
-    });
+  })
 }
 
-function clearLotStatusesCache() {
+function clearLotStatusesCache(): void {
-    lotStatuses = undefined;
+  lotStatuses = undefined
 }
 
 /*
  * Lot Types
  */
 
-let lotTypes: recordTypes.LotType[] | undefined;
+let lotTypes: recordTypes.LotType[] | undefined
 
-export function getLotTypes() {
+export function getLotTypes(): recordTypes.LotType[] {
   if (!lotTypes) {
-        lotTypes = getLotTypesFromDatabase();
+    lotTypes = getLotTypesFromDatabase()
   }
 
-    return lotTypes;
+  return lotTypes
 }
 
-export function getLotTypeById(lotTypeId: number) {
+export function getLotTypeById(
-    const cachedLotTypes = getLotTypes();
+  lotTypeId: number
+): recordTypes.LotType | undefined {
+  const cachedLotTypes = getLotTypes()
 
   return cachedLotTypes.find((currentLotType) => {
-        return currentLotType.lotTypeId === lotTypeId;
+    return currentLotType.lotTypeId === lotTypeId
-    });
+  })
 }
 
-export function getLotTypesByLotType(lotType: string) {
+export function getLotTypesByLotType(
-    const cachedLotTypes = getLotTypes();
+  lotType: string
+): recordTypes.LotType | undefined {
+  const cachedLotTypes = getLotTypes()
 
-    const lotTypeLowerCase = lotType.toLowerCase();
+  const lotTypeLowerCase = lotType.toLowerCase()
 
   return cachedLotTypes.find((currentLotType) => {
-        return currentLotType.lotType.toLowerCase() === lotTypeLowerCase;
+    return currentLotType.lotType.toLowerCase() === lotTypeLowerCase
-    });
+  })
 }
 
-function clearLotTypesCache() {
+function clearLotTypesCache(): void {
-    lotTypes = undefined;
+  lotTypes = undefined
 }
 
 /*
  * Occupancy Types
  */
 
-let occupancyTypes: recordTypes.OccupancyType[] | undefined;
+let occupancyTypes: recordTypes.OccupancyType[] | undefined
-let allOccupancyTypeFields: recordTypes.OccupancyTypeField[] | undefined;
+let allOccupancyTypeFields: recordTypes.OccupancyTypeField[] | undefined
 
-export function getOccupancyTypes() {
+export function getOccupancyTypes(): recordTypes.OccupancyType[] {
   if (!occupancyTypes) {
-        occupancyTypes = getOccupancyTypesFromDatabase();
+    occupancyTypes = getOccupancyTypesFromDatabase()
   }
 
-    return occupancyTypes;
+  return occupancyTypes
 }
 
-export function getAllOccupancyTypeFields() {
+export function getAllOccupancyTypeFields(): recordTypes.OccupancyTypeField[] {
   if (!allOccupancyTypeFields) {
-        allOccupancyTypeFields = getOccupancyTypeFieldsFromDatabase();
+    allOccupancyTypeFields = getOccupancyTypeFieldsFromDatabase()
   }
-    return allOccupancyTypeFields;
+  return allOccupancyTypeFields
 }
 
-export function getOccupancyTypeById(occupancyTypeId: number) {
+export function getOccupancyTypeById(
-    const cachedOccupancyTypes = getOccupancyTypes();
+  occupancyTypeId: number
+): recordTypes.OccupancyType | undefined {
+  const cachedOccupancyTypes = getOccupancyTypes()
 
   return cachedOccupancyTypes.find((currentOccupancyType) => {
-        return currentOccupancyType.occupancyTypeId === occupancyTypeId;
+    return currentOccupancyType.occupancyTypeId === occupancyTypeId
-    });
+  })
 }
 
-export function getOccupancyTypeByOccupancyType(occupancyTypeString: string) {
+export function getOccupancyTypeByOccupancyType(
-    const cachedOccupancyTypes = getOccupancyTypes();
+  occupancyTypeString: string
+): recordTypes.OccupancyType | undefined {
+  const cachedOccupancyTypes = getOccupancyTypes()
 
-    const occupancyTypeLowerCase = occupancyTypeString.toLowerCase();
+  const occupancyTypeLowerCase = occupancyTypeString.toLowerCase()
 
   return cachedOccupancyTypes.find((currentOccupancyType) => {
-        return currentOccupancyType.occupancyType.toLowerCase() === occupancyTypeLowerCase;
+    return (
-    });
+      currentOccupancyType.occupancyType.toLowerCase() ===
+      occupancyTypeLowerCase
+    )
+  })
 }
 
 export function getOccupancyTypePrintsById(occupancyTypeId: number): string[] {
-    const occupancyType = getOccupancyTypeById(occupancyTypeId);
+  const occupancyType = getOccupancyTypeById(occupancyTypeId)
 
-    if (!occupancyType || occupancyType.occupancyTypePrints.length === 0) {
+  if (
-        return [];
+    !occupancyType ||
+    (occupancyType.occupancyTypePrints ?? []).length === 0
+  ) {
+    return []
   }
 
-    if (occupancyType.occupancyTypePrints.includes("*")) {
+  if (occupancyType.occupancyTypePrints!.includes('*')) {
-        return configFunctions.getProperty("settings.lotOccupancy.prints");
+    return configFunctions.getProperty('settings.lotOccupancy.prints')
   }
 
-    return occupancyType.occupancyTypePrints;
+  return occupancyType.occupancyTypePrints!
 }
 
-function clearOccupancyTypesCache() {
+function clearOccupancyTypesCache(): void {
-    occupancyTypes = undefined;
+  occupancyTypes = undefined
-    allOccupancyTypeFields = undefined;
+  allOccupancyTypeFields = undefined
 }
 
 /*
  * Work Order Types
  */
 
-let workOrderTypes: recordTypes.WorkOrderType[] | undefined;
+let workOrderTypes: recordTypes.WorkOrderType[] | undefined
 
-export function getWorkOrderTypes() {
+export function getWorkOrderTypes(): recordTypes.WorkOrderType[] {
   if (!workOrderTypes) {
-        workOrderTypes = getWorkOrderTypesFromDatabase();
+    workOrderTypes = getWorkOrderTypesFromDatabase()
   }
 
-    return workOrderTypes;
+  return workOrderTypes
 }
 
-export function getWorkOrderTypeById(workOrderTypeId: number) {
+export function getWorkOrderTypeById(
-    const cachedWorkOrderTypes = getWorkOrderTypes();
+  workOrderTypeId: number
+): recordTypes.WorkOrderType | undefined {
+  const cachedWorkOrderTypes = getWorkOrderTypes()
 
   return cachedWorkOrderTypes.find((currentWorkOrderType) => {
-        return currentWorkOrderType.workOrderTypeId === workOrderTypeId;
+    return currentWorkOrderType.workOrderTypeId === workOrderTypeId
-    });
+  })
 }
 
-function clearWorkOrderTypesCache() {
+function clearWorkOrderTypesCache(): void {
-    workOrderTypes = undefined;
+  workOrderTypes = undefined
 }
 
 /*
  * Work Order Milestone Types
  */
 
-let workOrderMilestoneTypes: recordTypes.WorkOrderMilestoneType[] | undefined;
+let workOrderMilestoneTypes: recordTypes.WorkOrderMilestoneType[] | undefined
 
-export function getWorkOrderMilestoneTypes() {
+export function getWorkOrderMilestoneTypes(): recordTypes.WorkOrderMilestoneType[] {
   if (!workOrderMilestoneTypes) {
-        workOrderMilestoneTypes = getWorkOrderMilestoneTypesFromDatabase();
+    workOrderMilestoneTypes = getWorkOrderMilestoneTypesFromDatabase()
   }
 
-    return workOrderMilestoneTypes;
+  return workOrderMilestoneTypes
 }
 
-export function getWorkOrderMilestoneTypeByWorkOrderMilestoneTypeId(workOrderMilestoneTypeId: number) {
+export function getWorkOrderMilestoneTypeByWorkOrderMilestoneTypeId(
-    const cachedWorkOrderMilestoneTypes = getWorkOrderMilestoneTypes();
+  workOrderMilestoneTypeId: number
+): recordTypes.WorkOrderMilestoneType | undefined {
+  const cachedWorkOrderMilestoneTypes = getWorkOrderMilestoneTypes()
 
   return cachedWorkOrderMilestoneTypes.find((currentWorkOrderMilestoneType) => {
-        return currentWorkOrderMilestoneType.workOrderMilestoneTypeId === workOrderMilestoneTypeId;
+    return (
-    });
+      currentWorkOrderMilestoneType.workOrderMilestoneTypeId ===
+      workOrderMilestoneTypeId
+    )
+  })
 }
 
-export function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrderMilestoneTypeString: string) {
+export function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(
-    const cachedWorkOrderMilestoneTypes = getWorkOrderMilestoneTypes();
+  workOrderMilestoneTypeString: string
+): recordTypes.WorkOrderMilestoneType | undefined {
+  const cachedWorkOrderMilestoneTypes = getWorkOrderMilestoneTypes()
 
-    const workOrderMilestoneTypeLowerCase = workOrderMilestoneTypeString.toLowerCase();
+  const workOrderMilestoneTypeLowerCase =
+    workOrderMilestoneTypeString.toLowerCase()
 
   return cachedWorkOrderMilestoneTypes.find((currentWorkOrderMilestoneType) => {
     return (
       currentWorkOrderMilestoneType.workOrderMilestoneType.toLowerCase() ===
       workOrderMilestoneTypeLowerCase
-        );
+    )
-    });
+  })
 }
 
-function clearWorkOrderMilestoneTypesCache() {
+function clearWorkOrderMilestoneTypesCache(): void {
-    workOrderMilestoneTypes = undefined;
+  workOrderMilestoneTypes = undefined
 }
 
-export function clearCacheByTableName(tableName: string) {
+export function clearCacheByTableName(tableName: string): void {
   switch (tableName) {
-        case "LotOccupantTypes": {
+    case 'LotOccupantTypes': {
-            clearLotOccupantTypesCache();
+      clearLotOccupantTypesCache()
-            break;
+      break
     }
 
-        case "LotStatuses": {
+    case 'LotStatuses': {
-            clearLotStatusesCache();
+      clearLotStatusesCache()
-            break;
+      break
     }
 
-        case "LotTypes":
+    case 'LotTypes':
-        case "LotTypeFields": {
+    case 'LotTypeFields': {
-            clearLotTypesCache();
+      clearLotTypesCache()
-            break;
+      break
     }
 
-        case "OccupancyTypes":
+    case 'OccupancyTypes':
-        case "OccupancyTypeFields":
+    case 'OccupancyTypeFields':
-        case "OccupancyTypePrints": {
+    case 'OccupancyTypePrints': {
-            clearOccupancyTypesCache();
+      clearOccupancyTypesCache()
-            break;
+      break
     }
 
-        case "WorkOrderMilestoneTypes": {
+    case 'WorkOrderMilestoneTypes': {
-            clearWorkOrderMilestoneTypesCache();
+      clearWorkOrderMilestoneTypesCache()
-            break;
+      break
     }
 
-        case "WorkOrderTypes": {
+    case 'WorkOrderTypes': {
-            clearWorkOrderTypesCache();
+      clearWorkOrderTypesCache()
-            break;
+      break
     }
   }
 }

helpers/functions.icons.js

@@ -1,11 +1,11 @@
-import faIcons from "font-awesome-v5-icons";
+import faIcons from 'font-awesome-v5-icons';
 let solidIcons = [];
 export async function getSolidIconClasses() {
     if (solidIcons.length === 0) {
-        const allIcons = await faIcons.getListByKeys(["name", "styles"]);
+        const allIcons = await faIcons.getListByKeys(['name', 'styles']);
         const list = [];
         for (const icon of allIcons) {
-            if (icon.styles.includes("solid")) {
+            if ((icon.styles ?? []).includes('solid')) {
                 list.push(icon.name);
             }
         }

helpers/functions.icons.ts

@@ -1,21 +1,21 @@
-import faIcons from "font-awesome-v5-icons";
+import faIcons from 'font-awesome-v5-icons'
 
-let solidIcons: string[] = [];
+let solidIcons: string[] = []
 
-export async function getSolidIconClasses() {
+export async function getSolidIconClasses(): Promise<string[]> {
   if (solidIcons.length === 0) {
-        const allIcons = await faIcons.getListByKeys(["name", "styles"]);
+    const allIcons = await faIcons.getListByKeys(['name', 'styles'])
 
-        const list: string[] = [];
+    const list: string[] = []
 
     for (const icon of allIcons) {
-            if (icon.styles.includes("solid")) {
+      if ((icon.styles ?? []).includes('solid')) {
-                list.push(icon.name);
+        list.push(icon.name!)
       }
     }
 
-        solidIcons = list;
+    solidIcons = list
   }
 
-    return solidIcons;
+  return solidIcons
 }

helpers/functions.sqlFilters.d.ts

@@ -1,15 +1,10 @@
-declare type LotNameSearchType = "startsWith" | "endsWith" | "";
+declare type LotNameSearchType = 'startsWith' | 'endsWith' | '';
-export declare function getLotNameWhereClause(lotName: string, lotNameSearchType: LotNameSearchType, lotsTableAlias?: string): {
+interface WhereClauseReturn {
     sqlWhereClause: string;
-    sqlParameters: any[];
+    sqlParameters: unknown[];
-};
+}
-declare type OccupancyTime = "" | "current" | "past" | "future";
+export declare function getLotNameWhereClause(lotName: string, lotNameSearchType: LotNameSearchType, lotsTableAlias?: string): WhereClauseReturn;
-export declare function getOccupancyTimeWhereClause(occupancyTime: OccupancyTime, lotOccupanciesTableAlias?: string): {
+declare type OccupancyTime = '' | 'current' | 'past' | 'future';
-    sqlWhereClause: string;
+export declare function getOccupancyTimeWhereClause(occupancyTime: OccupancyTime, lotOccupanciesTableAlias?: string): WhereClauseReturn;
-    sqlParameters: any[];
+export declare function getOccupantNameWhereClause(occupantName: string, tableAlias?: string): WhereClauseReturn;
-};
-export declare function getOccupantNameWhereClause(occupantName: string, tableAlias?: string): {
-    sqlWhereClause: string;
-    sqlParameters: any[];
-};
 export {};

helpers/functions.sqlFilters.js

@@ -1,23 +1,24 @@
-import { dateToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js";
+import { dateToInteger } from '@cityssm/expressjs-server-js/dateTimeFns.js';
-export function getLotNameWhereClause(lotName, lotNameSearchType, lotsTableAlias = "l") {
+export function getLotNameWhereClause(lotName, lotNameSearchType, lotsTableAlias = 'l') {
-    let sqlWhereClause = "";
+    let sqlWhereClause = '';
     const sqlParameters = [];
-    if (lotName) {
+    if (lotName !== '') {
         switch (lotNameSearchType) {
-            case "startsWith": {
+            case 'startsWith': {
-                sqlWhereClause += " and " + lotsTableAlias + ".lotName like ? || '%'";
+                sqlWhereClause += ' and ' + lotsTableAlias + ".lotName like ? || '%'";
                 sqlParameters.push(lotName);
                 break;
             }
-            case "endsWith": {
+            case 'endsWith': {
-                sqlWhereClause += " and " + lotsTableAlias + ".lotName like '%' || ?";
+                sqlWhereClause += ' and ' + lotsTableAlias + ".lotName like '%' || ?";
                 sqlParameters.push(lotName);
                 break;
             }
             default: {
-                const lotNamePieces = lotName.toLowerCase().split(" ");
+                const lotNamePieces = lotName.toLowerCase().split(' ');
                 for (const lotNamePiece of lotNamePieces) {
-                    sqlWhereClause += " and instr(lower(" + lotsTableAlias + ".lotName), ?)";
+                    sqlWhereClause +=
+                        ' and instr(lower(' + lotsTableAlias + '.lotName), ?)';
                     sqlParameters.push(lotNamePiece);
                 }
             }
@@ -28,31 +29,33 @@ export function getLotNameWhereClause(lotName, lotNameSearchType, lotsTableAlias
         sqlParameters
     };
 }
-export function getOccupancyTimeWhereClause(occupancyTime, lotOccupanciesTableAlias = "o") {
+export function getOccupancyTimeWhereClause(occupancyTime, lotOccupanciesTableAlias = 'o') {
-    let sqlWhereClause = "";
+    let sqlWhereClause = '';
     const sqlParameters = [];
-    if (occupancyTime) {
+    if (occupancyTime !== '') {
         const currentDateString = dateToInteger(new Date());
         switch (occupancyTime) {
-            case "current": {
+            case 'current': {
                 sqlWhereClause +=
-                    " and " +
+                    ' and ' +
                         lotOccupanciesTableAlias +
-                        ".occupancyStartDate <= ? and (" +
+                        '.occupancyStartDate <= ? and (' +
                         lotOccupanciesTableAlias +
-                        ".occupancyEndDate is null or " +
+                        '.occupancyEndDate is null or ' +
                         lotOccupanciesTableAlias +
-                        ".occupancyEndDate >= ?)";
+                        '.occupancyEndDate >= ?)';
                 sqlParameters.push(currentDateString, currentDateString);
                 break;
             }
-            case "past": {
+            case 'past': {
-                sqlWhereClause += " and " + lotOccupanciesTableAlias + ".occupancyEndDate < ?";
+                sqlWhereClause +=
+                    ' and ' + lotOccupanciesTableAlias + '.occupancyEndDate < ?';
                 sqlParameters.push(currentDateString);
                 break;
             }
-            case "future": {
+            case 'future': {
-                sqlWhereClause += " and " + lotOccupanciesTableAlias + ".occupancyStartDate > ?";
+                sqlWhereClause +=
+                    ' and ' + lotOccupanciesTableAlias + '.occupancyStartDate > ?';
                 sqlParameters.push(currentDateString);
                 break;
             }
@@ -63,13 +66,13 @@ export function getOccupancyTimeWhereClause(occupancyTime, lotOccupanciesTableAl
         sqlParameters
     };
 }
-export function getOccupantNameWhereClause(occupantName, tableAlias = "o") {
+export function getOccupantNameWhereClause(occupantName, tableAlias = 'o') {
-    let sqlWhereClause = "";
+    let sqlWhereClause = '';
     const sqlParameters = [];
-    if (occupantName) {
+    if (occupantName !== '') {
-        const occupantNamePieces = occupantName.toLowerCase().split(" ");
+        const occupantNamePieces = occupantName.toLowerCase().split(' ');
         for (const occupantNamePiece of occupantNamePieces) {
-            sqlWhereClause += " and instr(lower(" + tableAlias + ".occupantName), ?)";
+            sqlWhereClause += ' and instr(lower(' + tableAlias + '.occupantName), ?)';
             sqlParameters.push(occupantNamePiece);
         }
     }

helpers/functions.sqlFilters.ts

@@ -1,32 +1,38 @@
-import { dateToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js";
+import { dateToInteger } from '@cityssm/expressjs-server-js/dateTimeFns.js'
 
-type LotNameSearchType = "startsWith" | "endsWith" | "";
+type LotNameSearchType = 'startsWith' | 'endsWith' | ''
+
+interface WhereClauseReturn {
+  sqlWhereClause: string
+  sqlParameters: unknown[]
+}
 
 export function getLotNameWhereClause(
   lotName: string,
   lotNameSearchType: LotNameSearchType,
-    lotsTableAlias = "l"
+  lotsTableAlias = 'l'
-) {
+): WhereClauseReturn {
-    let sqlWhereClause = "";
+  let sqlWhereClause = ''
-    const sqlParameters = [];
+  const sqlParameters: unknown[] = []
 
-    if (lotName) {
+  if (lotName !== '') {
     switch (lotNameSearchType) {
-            case "startsWith": {
+      case 'startsWith': {
-                sqlWhereClause += " and " + lotsTableAlias + ".lotName like ? || '%'";
+        sqlWhereClause += ' and ' + lotsTableAlias + ".lotName like ? || '%'"
-                sqlParameters.push(lotName);
+        sqlParameters.push(lotName)
-                break;
+        break
       }
-            case "endsWith": {
+      case 'endsWith': {
-                sqlWhereClause += " and " + lotsTableAlias + ".lotName like '%' || ?";
+        sqlWhereClause += ' and ' + lotsTableAlias + ".lotName like '%' || ?"
-                sqlParameters.push(lotName);
+        sqlParameters.push(lotName)
-                break;
+        break
       }
       default: {
-                const lotNamePieces = lotName.toLowerCase().split(" ");
+        const lotNamePieces = lotName.toLowerCase().split(' ')
         for (const lotNamePiece of lotNamePieces) {
-                    sqlWhereClause += " and instr(lower(" + lotsTableAlias + ".lotName), ?)";
+          sqlWhereClause +=
-                    sqlParameters.push(lotNamePiece);
+            ' and instr(lower(' + lotsTableAlias + '.lotName), ?)'
+          sqlParameters.push(lotNamePiece)
         }
       }
     }
@@ -35,45 +41,47 @@ export function getLotNameWhereClause(
   return {
     sqlWhereClause,
     sqlParameters
-    };
+  }
 }
 
-type OccupancyTime = "" | "current" | "past" | "future";
+type OccupancyTime = '' | 'current' | 'past' | 'future'
 
 export function getOccupancyTimeWhereClause(
   occupancyTime: OccupancyTime,
-    lotOccupanciesTableAlias = "o"
+  lotOccupanciesTableAlias = 'o'
-) {
+): WhereClauseReturn {
-    let sqlWhereClause = "";
+  let sqlWhereClause = ''
-    const sqlParameters = [];
+  const sqlParameters: unknown[] = []
 
-    if (occupancyTime) {
+  if (occupancyTime !== '') {
-        const currentDateString = dateToInteger(new Date());
+    const currentDateString = dateToInteger(new Date())
 
     switch (occupancyTime) {
-            case "current": {
+      case 'current': {
         sqlWhereClause +=
-                    " and " +
+          ' and ' +
           lotOccupanciesTableAlias +
-                    ".occupancyStartDate <= ? and (" +
+          '.occupancyStartDate <= ? and (' +
           lotOccupanciesTableAlias +
-                    ".occupancyEndDate is null or " +
+          '.occupancyEndDate is null or ' +
           lotOccupanciesTableAlias +
-                    ".occupancyEndDate >= ?)";
+          '.occupancyEndDate >= ?)'
-                sqlParameters.push(currentDateString, currentDateString);
+        sqlParameters.push(currentDateString, currentDateString)
-                break;
+        break
       }
 
-            case "past": {
+      case 'past': {
-                sqlWhereClause += " and " + lotOccupanciesTableAlias + ".occupancyEndDate < ?";
+        sqlWhereClause +=
-                sqlParameters.push(currentDateString);
+          ' and ' + lotOccupanciesTableAlias + '.occupancyEndDate < ?'
-                break;
+        sqlParameters.push(currentDateString)
+        break
       }
 
-            case "future": {
+      case 'future': {
-                sqlWhereClause += " and " + lotOccupanciesTableAlias + ".occupancyStartDate > ?";
+        sqlWhereClause +=
-                sqlParameters.push(currentDateString);
+          ' and ' + lotOccupanciesTableAlias + '.occupancyStartDate > ?'
-                break;
+        sqlParameters.push(currentDateString)
+        break
       }
     }
   }
@@ -81,23 +89,26 @@ export function getOccupancyTimeWhereClause(
   return {
     sqlWhereClause,
     sqlParameters
-    };
+  }
 }
 
-export function getOccupantNameWhereClause(occupantName: string, tableAlias = "o") {
+export function getOccupantNameWhereClause(
-    let sqlWhereClause = "";
+  occupantName: string,
-    const sqlParameters = [];
+  tableAlias = 'o'
+): WhereClauseReturn {
+  let sqlWhereClause = ''
+  const sqlParameters: unknown[] = []
 
-    if (occupantName) {
+  if (occupantName !== '') {
-        const occupantNamePieces = occupantName.toLowerCase().split(" ");
+    const occupantNamePieces = occupantName.toLowerCase().split(' ')
     for (const occupantNamePiece of occupantNamePieces) {
-            sqlWhereClause += " and instr(lower(" + tableAlias + ".occupantName), ?)";
+      sqlWhereClause += ' and instr(lower(' + tableAlias + '.occupantName), ?)'
-            sqlParameters.push(occupantNamePiece);
+      sqlParameters.push(occupantNamePiece)
     }
   }
 
   return {
     sqlWhereClause,
     sqlParameters
-    };
+  }
 }

helpers/functions.user.js

@@ -1,24 +1,21 @@
 import { getUserNameFromApiKey } from "./functions.api.js";
 import * as configFunctions from "./functions.config.js";
 export function userIsAdmin(request) {
-    var _a;
+    const user = request.session?.user;
-    const user = (_a = request.session) === null || _a === void 0 ? void 0 : _a.user;
     if (!user || !user.userProperties) {
         return false;
     }
     return user.userProperties.isAdmin;
 }
 export function userCanUpdate(request) {
-    var _a;
+    const user = request.session?.user;
-    const user = (_a = request.session) === null || _a === void 0 ? void 0 : _a.user;
     if (!user || !user.userProperties) {
         return false;
     }
     return user.userProperties.canUpdate;
 }
 export async function apiKeyIsValid(request) {
-    var _a;
+    const apiKey = request.params?.apiKey;
-    const apiKey = (_a = request.params) === null || _a === void 0 ? void 0 : _a.apiKey;
     if (!apiKey) {
         return false;
     }

helpers/lotOccupancyDB/addFee.d.ts

@@ -1,4 +1,4 @@
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes';
 interface AddFeeForm {
     feeCategoryId: string;
     feeName: string;
@@ -9,9 +9,9 @@ interface AddFeeForm {
     feeFunction?: string;
     taxAmount?: string;
     taxPercentage?: string;
-    includeQuantity: "" | "1";
+    includeQuantity: '' | '1';
     quantityUnit?: string;
-    isRequired: "" | "1";
+    isRequired: '' | '1';
     orderNumber?: number;
 }
 export declare function addFee(feeForm: AddFeeForm, requestSession: recordTypes.PartialSession): number;

helpers/lotOccupancyDB/addFee.js

@@ -1,5 +1,5 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3';
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
 export function addFee(feeForm, requestSession) {
     const database = sqlite(databasePath);
     const rightNowMillis = Date.now();
@@ -15,7 +15,7 @@ export function addFee(feeForm, requestSession) {
         recordCreate_userName, recordCreate_timeMillis,
         recordUpdate_userName, recordUpdate_timeMillis)
         values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
-        .run(feeForm.feeCategoryId, feeForm.feeName, feeForm.feeDescription, feeForm.occupancyTypeId || undefined, feeForm.lotTypeId || undefined, feeForm.feeAmount || undefined, feeForm.feeFunction || undefined, feeForm.taxAmount || undefined, feeForm.taxPercentage || undefined, feeForm.includeQuantity ? 1 : 0, feeForm.quantityUnit, feeForm.isRequired ? 1 : 0, feeForm.orderNumber || -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
+        .run(feeForm.feeCategoryId, feeForm.feeName, feeForm.feeDescription, feeForm.occupancyTypeId ?? undefined, feeForm.lotTypeId ?? undefined, feeForm.feeAmount ?? undefined, feeForm.feeFunction ?? undefined, feeForm.taxAmount ?? undefined, feeForm.taxPercentage ?? undefined, (feeForm.includeQuantity ?? '') === '' ? 0 : 1, feeForm.quantityUnit, (feeForm.isRequired ?? '') === '' ? 0 : 1, feeForm.orderNumber ?? -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
     database.close();
     return result.lastInsertRowid;
 }

helpers/lotOccupancyDB/addFee.ts

@@ -1,28 +1,33 @@
-import sqlite from "better-sqlite3";
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
 
-import type * as recordTypes from "../../types/recordTypes";
+import sqlite from 'better-sqlite3'
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js'
+
+import type * as recordTypes from '../../types/recordTypes'
 
 interface AddFeeForm {
-    feeCategoryId: string;
+  feeCategoryId: string
-    feeName: string;
+  feeName: string
-    feeDescription: string;
+  feeDescription: string
-    occupancyTypeId?: string;
+  occupancyTypeId?: string
-    lotTypeId?: string;
+  lotTypeId?: string
-    feeAmount?: string;
+  feeAmount?: string
-    feeFunction?: string;
+  feeFunction?: string
-    taxAmount?: string;
+  taxAmount?: string
-    taxPercentage?: string;
+  taxPercentage?: string
-    includeQuantity: "" | "1";
+  includeQuantity: '' | '1'
-    quantityUnit?: string;
+  quantityUnit?: string
-    isRequired: "" | "1";
+  isRequired: '' | '1'
-    orderNumber?: number;
+  orderNumber?: number
 }
 
-export function addFee(feeForm: AddFeeForm, requestSession: recordTypes.PartialSession): number {
+export function addFee(
-    const database = sqlite(databasePath);
+  feeForm: AddFeeForm,
+  requestSession: recordTypes.PartialSession
+): number {
+  const database = sqlite(databasePath)
 
-    const rightNowMillis = Date.now();
+  const rightNowMillis = Date.now()
 
   const result = database
     .prepare(
@@ -42,25 +47,25 @@ export function addFee(feeForm: AddFeeForm, requestSession: recordTypes.PartialS
       feeForm.feeCategoryId,
       feeForm.feeName,
       feeForm.feeDescription,
-            feeForm.occupancyTypeId || undefined,
+      feeForm.occupancyTypeId ?? undefined,
-            feeForm.lotTypeId || undefined,
+      feeForm.lotTypeId ?? undefined,
-            feeForm.feeAmount || undefined,
+      feeForm.feeAmount ?? undefined,
-            feeForm.feeFunction || undefined,
+      feeForm.feeFunction ?? undefined,
-            feeForm.taxAmount || undefined,
+      feeForm.taxAmount ?? undefined,
-            feeForm.taxPercentage || undefined,
+      feeForm.taxPercentage ?? undefined,
-            feeForm.includeQuantity ? 1 : 0,
+      (feeForm.includeQuantity ?? '') === '' ? 0 : 1,
       feeForm.quantityUnit,
-            feeForm.isRequired ? 1 : 0,
+      (feeForm.isRequired ?? '') === '' ? 0 : 1,
-            feeForm.orderNumber || -1,
+      feeForm.orderNumber ?? -1,
-            requestSession.user.userName,
+      requestSession.user!.userName,
       rightNowMillis,
-            requestSession.user.userName,
+      requestSession.user!.userName,
       rightNowMillis
-        );
+    )
 
-    database.close();
+  database.close()
 
-    return result.lastInsertRowid as number;
+  return result.lastInsertRowid as number
 }
 
-export default addFee;
+export default addFee

helpers/lotOccupancyDB/addLot.d.ts

@@ -1,4 +1,4 @@
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes';
 interface AddLotForm {
     lotName: string;
     lotTypeId: string | number;

helpers/lotOccupancyDB/addLot.js

@@ -1,6 +1,6 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3';
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
-import { addOrUpdateLotField } from "./addOrUpdateLotField.js";
+import { addOrUpdateLotField } from './addOrUpdateLotField.js';
 export function addLot(lotForm, requestSession) {
     const database = sqlite(databasePath);
     const rightNowMillis = Date.now();
@@ -12,12 +12,12 @@ export function addLot(lotForm, requestSession) {
                 recordCreate_userName, recordCreate_timeMillis,
                 recordUpdate_userName, recordUpdate_timeMillis) 
                 values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
-        .run(lotForm.lotName, lotForm.lotTypeId, lotForm.lotStatusId === "" ? undefined : lotForm.lotStatusId, lotForm.mapId === "" ? undefined : lotForm.mapId, lotForm.mapKey, lotForm.lotLatitude === "" ? undefined : lotForm.lotLatitude, lotForm.lotLongitude === "" ? undefined : lotForm.lotLongitude, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
+        .run(lotForm.lotName, lotForm.lotTypeId, lotForm.lotStatusId === '' ? undefined : lotForm.lotStatusId, lotForm.mapId === '' ? undefined : lotForm.mapId, lotForm.mapKey, lotForm.lotLatitude === '' ? undefined : lotForm.lotLatitude, lotForm.lotLongitude === '' ? undefined : lotForm.lotLongitude, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
     const lotId = result.lastInsertRowid;
-    const lotTypeFieldIds = (lotForm.lotTypeFieldIds || "").split(",");
+    const lotTypeFieldIds = (lotForm.lotTypeFieldIds ?? '').split(',');
     for (const lotTypeFieldId of lotTypeFieldIds) {
-        const lotFieldValue = lotForm["lotFieldValue_" + lotTypeFieldId];
+        const lotFieldValue = lotForm['lotFieldValue_' + lotTypeFieldId];
-        if (lotFieldValue && lotFieldValue !== "") {
+        if (lotFieldValue && lotFieldValue !== '') {
             addOrUpdateLotField({
                 lotId,
                 lotTypeFieldId,

helpers/lotOccupancyDB/addLot.ts

@@ -1,30 +1,33 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3'
 
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js'
 
-import { addOrUpdateLotField } from "./addOrUpdateLotField.js";
+import { addOrUpdateLotField } from './addOrUpdateLotField.js'
 
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes'
 
 interface AddLotForm {
-    lotName: string;
+  lotName: string
-    lotTypeId: string | number;
+  lotTypeId: string | number
-    lotStatusId: string | number;
+  lotStatusId: string | number
 
-    mapId: string | number;
+  mapId: string | number
-    mapKey: string;
+  mapKey: string
 
-    lotLatitude: string;
+  lotLatitude: string
-    lotLongitude: string;
+  lotLongitude: string
 
-    lotTypeFieldIds?: string;
+  lotTypeFieldIds?: string
-    [lotFieldValue_lotTypeFieldId: string]: unknown;
+  [lotFieldValue_lotTypeFieldId: string]: unknown
 }
 
-export function addLot(lotForm: AddLotForm, requestSession: recordTypes.PartialSession): number {
+export function addLot(
-    const database = sqlite(databasePath);
+  lotForm: AddLotForm,
+  requestSession: recordTypes.PartialSession
+): number {
+  const database = sqlite(databasePath)
 
-    const rightNowMillis = Date.now();
+  const rightNowMillis = Date.now()
 
   const result = database
     .prepare(
@@ -39,25 +42,25 @@ export function addLot(lotForm: AddLotForm, requestSession: recordTypes.PartialS
     .run(
       lotForm.lotName,
       lotForm.lotTypeId,
-            lotForm.lotStatusId === "" ? undefined : lotForm.lotStatusId,
+      lotForm.lotStatusId === '' ? undefined : lotForm.lotStatusId,
-            lotForm.mapId === "" ? undefined : lotForm.mapId,
+      lotForm.mapId === '' ? undefined : lotForm.mapId,
       lotForm.mapKey,
-            lotForm.lotLatitude === "" ? undefined : lotForm.lotLatitude,
+      lotForm.lotLatitude === '' ? undefined : lotForm.lotLatitude,
-            lotForm.lotLongitude === "" ? undefined : lotForm.lotLongitude,
+      lotForm.lotLongitude === '' ? undefined : lotForm.lotLongitude,
-            requestSession.user.userName,
+      requestSession.user!.userName,
       rightNowMillis,
-            requestSession.user.userName,
+      requestSession.user!.userName,
       rightNowMillis
-        );
+    )
 
-    const lotId = result.lastInsertRowid as number;
+  const lotId = result.lastInsertRowid as number
 
-    const lotTypeFieldIds = (lotForm.lotTypeFieldIds || "").split(",");
+  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 && lotFieldValue !== "") {
+    if (lotFieldValue && lotFieldValue !== '') {
       addOrUpdateLotField(
         {
           lotId,
@@ -66,13 +69,13 @@ export function addLot(lotForm: AddLotForm, requestSession: recordTypes.PartialS
         },
         requestSession,
         database
-            );
+      )
     }
   }
 
-    database.close();
+  database.close()
 
-    return lotId;
+  return lotId
 }
 
-export default addLot;
+export default addLot

helpers/lotOccupancyDB/addLotComment.d.ts

@@ -1,4 +1,4 @@
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes';
 interface AddLotCommentForm {
     lotId: string;
     lotComment: string;

helpers/lotOccupancyDB/addLotComment.js

@@ -1,6 +1,6 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3';
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
-import * as dateTimeFunctions from "@cityssm/expressjs-server-js/dateTimeFns.js";
+import * as dateTimeFunctions from '@cityssm/expressjs-server-js/dateTimeFns.js';
 export function addLotComment(lotCommentForm, requestSession) {
     const database = sqlite(databasePath);
     const rightNow = new Date();

helpers/lotOccupancyDB/addLotComment.ts

@@ -1,23 +1,23 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3'
 
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js'
 
-import * as dateTimeFunctions from "@cityssm/expressjs-server-js/dateTimeFns.js";
+import * as dateTimeFunctions from '@cityssm/expressjs-server-js/dateTimeFns.js'
 
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes'
 
 interface AddLotCommentForm {
-    lotId: string;
+  lotId: string
-    lotComment: string;
+  lotComment: string
 }
 
 export function addLotComment(
   lotCommentForm: AddLotCommentForm,
   requestSession: recordTypes.PartialSession
 ): number {
-    const database = sqlite(databasePath);
+  const database = sqlite(databasePath)
 
-    const rightNow = new Date();
+  const rightNow = new Date()
 
   const result = database
     .prepare(
@@ -33,15 +33,15 @@ export function addLotComment(
       dateTimeFunctions.dateToInteger(rightNow),
       dateTimeFunctions.dateToTimeInteger(rightNow),
       lotCommentForm.lotComment,
-            requestSession.user.userName,
+      requestSession.user!.userName,
       rightNow.getTime(),
-            requestSession.user.userName,
+      requestSession.user!.userName,
       rightNow.getTime()
-        );
+    )
 
-    database.close();
+  database.close()
 
-    return result.lastInsertRowid as number;
+  return result.lastInsertRowid as number
 }
 
-export default addLotComment;
+export default addLotComment

helpers/lotOccupancyDB/addLotOccupancy.d.ts

@@ -1,5 +1,5 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3';
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes';
 interface AddLotOccupancyForm {
     occupancyTypeId: string | number;
     lotId: string | number;

helpers/lotOccupancyDB/addLotOccupancy.js

@@ -1,10 +1,10 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3';
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
-import * as dateTimeFunctions from "@cityssm/expressjs-server-js/dateTimeFns.js";
+import * as dateTimeFunctions from '@cityssm/expressjs-server-js/dateTimeFns.js';
-import { addOrUpdateLotOccupancyField } from "./addOrUpdateLotOccupancyField.js";
+import { addOrUpdateLotOccupancyField } from './addOrUpdateLotOccupancyField.js';
-import { addLotOccupancyOccupant } from "./addLotOccupancyOccupant.js";
+import { addLotOccupancyOccupant } from './addLotOccupancyOccupant.js';
 export function addLotOccupancy(lotOccupancyForm, requestSession, connectedDatabase) {
-    const database = connectedDatabase || sqlite(databasePath);
+    const database = connectedDatabase ?? sqlite(databasePath);
     const rightNowMillis = Date.now();
     const occupancyStartDate = dateTimeFunctions.dateStringToInteger(lotOccupancyForm.occupancyStartDateString);
     if (occupancyStartDate <= 0) {
@@ -17,14 +17,14 @@ export function addLotOccupancy(lotOccupancyForm, requestSession, connectedDatab
         recordCreate_userName, recordCreate_timeMillis,
         recordUpdate_userName, recordUpdate_timeMillis)
         values (?, ?, ?, ?, ?, ?, ?, ?)`)
-        .run(lotOccupancyForm.occupancyTypeId, lotOccupancyForm.lotId === "" ? undefined : lotOccupancyForm.lotId, occupancyStartDate, lotOccupancyForm.occupancyEndDateString === ""
+        .run(lotOccupancyForm.occupancyTypeId, lotOccupancyForm.lotId === '' ? undefined : lotOccupancyForm.lotId, occupancyStartDate, lotOccupancyForm.occupancyEndDateString === ''
         ? undefined
         : dateTimeFunctions.dateStringToInteger(lotOccupancyForm.occupancyEndDateString), requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
     const lotOccupancyId = result.lastInsertRowid;
-    const occupancyTypeFieldIds = (lotOccupancyForm.occupancyTypeFieldIds || "").split(",");
+    const occupancyTypeFieldIds = (lotOccupancyForm.occupancyTypeFieldIds ?? '').split(',');
     for (const occupancyTypeFieldId of occupancyTypeFieldIds) {
-        const lotOccupancyFieldValue = lotOccupancyForm["lotOccupancyFieldValue_" + occupancyTypeFieldId];
+        const lotOccupancyFieldValue = lotOccupancyForm['lotOccupancyFieldValue_' + occupancyTypeFieldId];
-        if (lotOccupancyFieldValue && lotOccupancyFieldValue !== "") {
+        if (lotOccupancyFieldValue && lotOccupancyFieldValue !== '') {
             addOrUpdateLotOccupancyField({
                 lotOccupancyId,
                 occupancyTypeFieldId,

helpers/lotOccupancyDB/addLotOccupancy.ts

@@ -1,34 +1,34 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3'
 
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js'
 
-import * as dateTimeFunctions from "@cityssm/expressjs-server-js/dateTimeFns.js";
+import * as dateTimeFunctions from '@cityssm/expressjs-server-js/dateTimeFns.js'
 
-import { addOrUpdateLotOccupancyField } from "./addOrUpdateLotOccupancyField.js";
+import { addOrUpdateLotOccupancyField } from './addOrUpdateLotOccupancyField.js'
-import { addLotOccupancyOccupant } from "./addLotOccupancyOccupant.js";
+import { addLotOccupancyOccupant } from './addLotOccupancyOccupant.js'
 
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes'
 
 interface AddLotOccupancyForm {
-    occupancyTypeId: string | number;
+  occupancyTypeId: string | number
-    lotId: string | number;
+  lotId: string | number
 
-    occupancyStartDateString: string;
+  occupancyStartDateString: string
-    occupancyEndDateString: string;
+  occupancyEndDateString: string
 
-    occupancyTypeFieldIds?: string;
+  occupancyTypeFieldIds?: string
-    [lotOccupancyFieldValue_occupancyTypeFieldId: string]: unknown;
+  [lotOccupancyFieldValue_occupancyTypeFieldId: string]: unknown
 
-    lotOccupantTypeId?: string;
+  lotOccupantTypeId?: string
-    occupantName?: string;
+  occupantName?: string
-    occupantAddress1?: string;
+  occupantAddress1?: string
-    occupantAddress2?: string;
+  occupantAddress2?: string
-    occupantCity?: string;
+  occupantCity?: string
-    occupantProvince?: string;
+  occupantProvince?: string
-    occupantPostalCode?: string;
+  occupantPostalCode?: string
-    occupantPhoneNumber?: string;
+  occupantPhoneNumber?: string
-    occupantEmailAddress?: string;
+  occupantEmailAddress?: string
-    occupantComment?: string;
+  occupantComment?: string
 }
 
 export function addLotOccupancy(
@@ -36,18 +36,19 @@ export function addLotOccupancy(
   requestSession: recordTypes.PartialSession,
   connectedDatabase?: sqlite.Database
 ): number {
-    const database = connectedDatabase || sqlite(databasePath);
+  const database = connectedDatabase ?? sqlite(databasePath)
 
-    const rightNowMillis = Date.now();
+  const rightNowMillis = Date.now()
 
   const occupancyStartDate = dateTimeFunctions.dateStringToInteger(
     lotOccupancyForm.occupancyStartDateString
-    );
+  )
 
   if (occupancyStartDate <= 0) {
-        console.error(lotOccupancyForm);
+    console.error(lotOccupancyForm)
   }
 
+  /* eslint-disable @typescript-eslint/indent */
   const result = database
     .prepare(
       `insert into LotOccupancies (
@@ -59,27 +60,31 @@ export function addLotOccupancy(
     )
     .run(
       lotOccupancyForm.occupancyTypeId,
-            lotOccupancyForm.lotId === "" ? undefined : lotOccupancyForm.lotId,
+      lotOccupancyForm.lotId === '' ? undefined : lotOccupancyForm.lotId,
       occupancyStartDate,
-            lotOccupancyForm.occupancyEndDateString === ""
+      lotOccupancyForm.occupancyEndDateString === ''
         ? undefined
-                : dateTimeFunctions.dateStringToInteger(lotOccupancyForm.occupancyEndDateString),
+        : dateTimeFunctions.dateStringToInteger(
-            requestSession.user.userName,
+            lotOccupancyForm.occupancyEndDateString
+          ),
+      requestSession.user!.userName,
       rightNowMillis,
-            requestSession.user.userName,
+      requestSession.user!.userName,
       rightNowMillis
-        );
+    )
 
-    const lotOccupancyId = result.lastInsertRowid as number;
+  const lotOccupancyId = result.lastInsertRowid as number
 
-    const occupancyTypeFieldIds = (lotOccupancyForm.occupancyTypeFieldIds || "").split(",");
+  const occupancyTypeFieldIds = (
+    lotOccupancyForm.occupancyTypeFieldIds ?? ''
+  ).split(',')
 
   for (const occupancyTypeFieldId of occupancyTypeFieldIds) {
     const lotOccupancyFieldValue = lotOccupancyForm[
-            "lotOccupancyFieldValue_" + occupancyTypeFieldId
+      'lotOccupancyFieldValue_' + occupancyTypeFieldId
-        ] as string;
+    ] as string
 
-        if (lotOccupancyFieldValue && lotOccupancyFieldValue !== "") {
+    if (lotOccupancyFieldValue && lotOccupancyFieldValue !== '') {
       addOrUpdateLotOccupancyField(
         {
           lotOccupancyId,
@@ -88,7 +93,7 @@ export function addLotOccupancy(
         },
         requestSession,
         database
-            );
+      )
     }
   }
 
@@ -97,26 +102,26 @@ export function addLotOccupancy(
       {
         lotOccupancyId,
         lotOccupantTypeId: lotOccupancyForm.lotOccupantTypeId,
-                occupantName: lotOccupancyForm.occupantName,
+        occupantName: lotOccupancyForm.occupantName!,
-                occupantAddress1: lotOccupancyForm.occupantAddress1,
+        occupantAddress1: lotOccupancyForm.occupantAddress1!,
-                occupantAddress2: lotOccupancyForm.occupantAddress2,
+        occupantAddress2: lotOccupancyForm.occupantAddress2!,
-                occupantCity: lotOccupancyForm.occupantCity,
+        occupantCity: lotOccupancyForm.occupantCity!,
-                occupantProvince: lotOccupancyForm.occupantProvince,
+        occupantProvince: lotOccupancyForm.occupantProvince!,
-                occupantPostalCode: lotOccupancyForm.occupantPostalCode,
+        occupantPostalCode: lotOccupancyForm.occupantPostalCode!,
-                occupantPhoneNumber: lotOccupancyForm.occupantPhoneNumber,
+        occupantPhoneNumber: lotOccupancyForm.occupantPhoneNumber!,
-                occupantEmailAddress: lotOccupancyForm.occupantEmailAddress,
+        occupantEmailAddress: lotOccupancyForm.occupantEmailAddress!,
-                occupantComment: lotOccupancyForm.occupantComment
+        occupantComment: lotOccupancyForm.occupantComment!
       },
       requestSession,
       database
-        );
+    )
   }
 
   if (!connectedDatabase) {
-        database.close();
+    database.close()
   }
 
-    return lotOccupancyId;
+  return lotOccupancyId
 }
 
-export default addLotOccupancy;
+export default addLotOccupancy

helpers/lotOccupancyDB/addLotOccupancyComment.d.ts

@@ -1,4 +1,4 @@
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes';
 interface AddLotOccupancyCommentForm {
     lotOccupancyId: string | number;
     lotOccupancyCommentDateString?: string;

helpers/lotOccupancyDB/addLotOccupancyComment.js

@@ -1,13 +1,13 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3';
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
-import { dateStringToInteger, dateToInteger, dateToTimeInteger, timeStringToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js";
+import { dateStringToInteger, dateToInteger, dateToTimeInteger, timeStringToInteger } from '@cityssm/expressjs-server-js/dateTimeFns.js';
 export function addLotOccupancyComment(commentForm, requestSession) {
     const rightNow = new Date();
     let lotOccupancyCommentDate;
     let lotOccupancyCommentTime;
     if (commentForm.lotOccupancyCommentDateString) {
         lotOccupancyCommentDate = dateStringToInteger(commentForm.lotOccupancyCommentDateString);
-        lotOccupancyCommentTime = timeStringToInteger(commentForm.lotOccupancyCommentTimeString);
+        lotOccupancyCommentTime = timeStringToInteger(commentForm.lotOccupancyCommentTimeString ?? '');
     }
     else {
         lotOccupancyCommentDate = dateToInteger(rightNow);

helpers/lotOccupancyDB/addLotOccupancyComment.ts

@@ -1,41 +1,45 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3'
 
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js'
 
 import {
   dateStringToInteger,
   dateToInteger,
   dateToTimeInteger,
   timeStringToInteger
-} from "@cityssm/expressjs-server-js/dateTimeFns.js";
+} from '@cityssm/expressjs-server-js/dateTimeFns.js'
 
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes'
 
 interface AddLotOccupancyCommentForm {
-    lotOccupancyId: string | number;
+  lotOccupancyId: string | number
-    lotOccupancyCommentDateString?: string;
+  lotOccupancyCommentDateString?: string
-    lotOccupancyCommentTimeString?: string;
+  lotOccupancyCommentTimeString?: string
-    lotOccupancyComment: string;
+  lotOccupancyComment: string
 }
 
 export function addLotOccupancyComment(
   commentForm: AddLotOccupancyCommentForm,
   requestSession: recordTypes.PartialSession
 ): number {
-    const rightNow = new Date();
+  const rightNow = new Date()
 
-    let lotOccupancyCommentDate: number;
+  let lotOccupancyCommentDate: number
-    let lotOccupancyCommentTime: number;
+  let lotOccupancyCommentTime: number
 
   if (commentForm.lotOccupancyCommentDateString) {
-        lotOccupancyCommentDate = dateStringToInteger(commentForm.lotOccupancyCommentDateString);
+    lotOccupancyCommentDate = dateStringToInteger(
-        lotOccupancyCommentTime = timeStringToInteger(commentForm.lotOccupancyCommentTimeString);
+      commentForm.lotOccupancyCommentDateString
+    )
+    lotOccupancyCommentTime = timeStringToInteger(
+      commentForm.lotOccupancyCommentTimeString ?? ''
+    )
   } else {
-        lotOccupancyCommentDate = dateToInteger(rightNow);
+    lotOccupancyCommentDate = dateToInteger(rightNow)
-        lotOccupancyCommentTime = dateToTimeInteger(rightNow);
+    lotOccupancyCommentTime = dateToTimeInteger(rightNow)
   }
 
-    const database = sqlite(databasePath);
+  const database = sqlite(databasePath)
 
   const result = database
     .prepare(
@@ -52,15 +56,15 @@ export function addLotOccupancyComment(
       lotOccupancyCommentDate,
       lotOccupancyCommentTime,
       commentForm.lotOccupancyComment,
-            requestSession.user.userName,
+      requestSession.user!.userName,
       rightNow.getTime(),
-            requestSession.user.userName,
+      requestSession.user!.userName,
       rightNow.getTime()
-        );
+    )
 
-    database.close();
+  database.close()
 
-    return result.lastInsertRowid as number;
+  return result.lastInsertRowid as number
 }
 
-export default addLotOccupancyComment;
+export default addLotOccupancyComment

helpers/lotOccupancyDB/addLotOccupancyFee.d.ts

@@ -1,4 +1,4 @@
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes';
 interface AddLotOccupancyFeeForm {
     lotOccupancyId: number | string;
     feeId: number | string;

helpers/lotOccupancyDB/addLotOccupancyFee.js

@@ -1,8 +1,8 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3';
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
-import { calculateFeeAmount, calculateTaxAmount } from "../functions.fee.js";
+import { calculateFeeAmount, calculateTaxAmount } from '../functions.fee.js';
-import { getFee } from "./getFee.js";
+import { getFee } from './getFee.js';
-import { getLotOccupancy } from "./getLotOccupancy.js";
+import { getLotOccupancy } from './getLotOccupancy.js';
 export function addLotOccupancyFee(lotOccupancyFeeForm, requestSession) {
     const database = sqlite(databasePath);
     const rightNowMillis = Date.now();
@@ -10,13 +10,13 @@ export function addLotOccupancyFee(lotOccupancyFeeForm, requestSession) {
     let taxAmount;
     if (lotOccupancyFeeForm.feeAmount) {
         feeAmount =
-            typeof lotOccupancyFeeForm.feeAmount === "string"
+            typeof lotOccupancyFeeForm.feeAmount === 'string'
                 ? Number.parseFloat(lotOccupancyFeeForm.feeAmount)
-                : feeAmount;
+                : 0;
         taxAmount =
-            typeof lotOccupancyFeeForm.taxAmount === "string"
+            typeof lotOccupancyFeeForm.taxAmount === 'string'
                 ? Number.parseFloat(lotOccupancyFeeForm.taxAmount)
-                : taxAmount;
+                : 0;
     }
     else {
         const lotOccupancy = getLotOccupancy(lotOccupancyFeeForm.lotOccupancyId);
@@ -39,7 +39,8 @@ export function addLotOccupancyFee(lotOccupancyFeeForm, requestSession) {
                         and feeId = ?`)
                 .run(lotOccupancyFeeForm.lotOccupancyId, lotOccupancyFeeForm.feeId);
         }
-        else if (record.feeAmount === feeAmount && record.taxAmount === taxAmount) {
+        else if (record.feeAmount === feeAmount &&
+            record.taxAmount === taxAmount) {
             database
                 .prepare(`update LotOccupancyFees
                         set quantity = quantity + ?,
@@ -52,7 +53,7 @@ export function addLotOccupancyFee(lotOccupancyFeeForm, requestSession) {
             return true;
         }
         else {
-            const quantity = typeof lotOccupancyFeeForm.quantity === "string"
+            const quantity = typeof lotOccupancyFeeForm.quantity === 'string'
                 ? Number.parseFloat(lotOccupancyFeeForm.quantity)
                 : lotOccupancyFeeForm.quantity;
             database

helpers/lotOccupancyDB/addLotOccupancyFee.ts

@@ -1,57 +1,57 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3'
 
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js'
 
-import { calculateFeeAmount, calculateTaxAmount } from "../functions.fee.js";
+import { calculateFeeAmount, calculateTaxAmount } from '../functions.fee.js'
 
-import { getFee } from "./getFee.js";
+import { getFee } from './getFee.js'
 
-import { getLotOccupancy } from "./getLotOccupancy.js";
+import { getLotOccupancy } from './getLotOccupancy.js'
 
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes'
 
 interface AddLotOccupancyFeeForm {
-    lotOccupancyId: number | string;
+  lotOccupancyId: number | string
-    feeId: number | string;
+  feeId: number | string
-    quantity: number | string;
+  quantity: number | string
-    feeAmount?: number | string;
+  feeAmount?: number | string
-    taxAmount?: number | string;
+  taxAmount?: number | string
 }
 
 export function addLotOccupancyFee(
   lotOccupancyFeeForm: AddLotOccupancyFeeForm,
   requestSession: recordTypes.PartialSession
 ): boolean {
-    const database = sqlite(databasePath);
+  const database = sqlite(databasePath)
 
-    const rightNowMillis = Date.now();
+  const rightNowMillis = Date.now()
 
   // Calculate fee and tax (if not set)
-    let feeAmount: number;
+  let feeAmount: number
-    let taxAmount: number;
+  let taxAmount: number
 
   if (lotOccupancyFeeForm.feeAmount) {
     feeAmount =
-            typeof lotOccupancyFeeForm.feeAmount === "string"
+      typeof lotOccupancyFeeForm.feeAmount === 'string'
         ? Number.parseFloat(lotOccupancyFeeForm.feeAmount)
-                : feeAmount;
+        : 0
     taxAmount =
-            typeof lotOccupancyFeeForm.taxAmount === "string"
+      typeof lotOccupancyFeeForm.taxAmount === 'string'
         ? Number.parseFloat(lotOccupancyFeeForm.taxAmount)
-                : taxAmount;
+        : 0
   } else {
-        const lotOccupancy = getLotOccupancy(lotOccupancyFeeForm.lotOccupancyId);
+    const lotOccupancy = getLotOccupancy(lotOccupancyFeeForm.lotOccupancyId)!
-        const fee = getFee(lotOccupancyFeeForm.feeId);
+    const fee = getFee(lotOccupancyFeeForm.feeId)
 
-        feeAmount = calculateFeeAmount(fee, lotOccupancy);
+    feeAmount = calculateFeeAmount(fee, lotOccupancy)
-        taxAmount = calculateTaxAmount(fee, feeAmount);
+    taxAmount = calculateTaxAmount(fee, feeAmount)
   }
 
   // Check if record already exists
   const record: {
-        feeAmount?: number;
+    feeAmount?: number
-        taxAmount?: number;
+    taxAmount?: number
-        recordDelete_timeMillis?: number;
+    recordDelete_timeMillis?: number
   } = database
     .prepare(
       `select feeAmount, taxAmount, recordDelete_timeMillis
@@ -59,7 +59,7 @@ export function addLotOccupancyFee(
                 where lotOccupancyId = ?
                 and feeId = ?`
     )
-        .get(lotOccupancyFeeForm.lotOccupancyId, lotOccupancyFeeForm.feeId);
+    .get(lotOccupancyFeeForm.lotOccupancyId, lotOccupancyFeeForm.feeId)
 
   if (record) {
     if (record.recordDelete_timeMillis) {
@@ -70,8 +70,11 @@ export function addLotOccupancyFee(
                         and lotOccupancyId = ?
                         and feeId = ?`
         )
-                .run(lotOccupancyFeeForm.lotOccupancyId, lotOccupancyFeeForm.feeId);
+        .run(lotOccupancyFeeForm.lotOccupancyId, lotOccupancyFeeForm.feeId)
-        } else if (record.feeAmount === feeAmount && record.taxAmount === taxAmount) {
+    } else if (
+      record.feeAmount === feeAmount &&
+      record.taxAmount === taxAmount
+    ) {
       database
         .prepare(
           `update LotOccupancyFees
@@ -83,20 +86,20 @@ export function addLotOccupancyFee(
         )
         .run(
           lotOccupancyFeeForm.quantity,
-                    requestSession.user.userName,
+          requestSession.user!.userName,
           rightNowMillis,
           lotOccupancyFeeForm.lotOccupancyId,
           lotOccupancyFeeForm.feeId
-                );
+        )
 
-            database.close();
+      database.close()
 
-            return true;
+      return true
     } else {
       const quantity =
-                typeof lotOccupancyFeeForm.quantity === "string"
+        typeof lotOccupancyFeeForm.quantity === 'string'
           ? Number.parseFloat(lotOccupancyFeeForm.quantity)
-                    : lotOccupancyFeeForm.quantity;
+          : lotOccupancyFeeForm.quantity
 
       database
         .prepare(
@@ -112,15 +115,15 @@ export function addLotOccupancyFee(
         .run(
           feeAmount * quantity,
           taxAmount * quantity,
-                    requestSession.user.userName,
+          requestSession.user!.userName,
           rightNowMillis,
           lotOccupancyFeeForm.lotOccupancyId,
           lotOccupancyFeeForm.feeId
-                );
+        )
 
-            database.close();
+      database.close()
 
-            return true;
+      return true
     }
   }
 
@@ -140,15 +143,15 @@ export function addLotOccupancyFee(
       lotOccupancyFeeForm.quantity,
       feeAmount,
       taxAmount,
-            requestSession.user.userName,
+      requestSession.user!.userName,
       rightNowMillis,
-            requestSession.user.userName,
+      requestSession.user!.userName,
       rightNowMillis
-        );
+    )
 
-    database.close();
+  database.close()
 
-    return result.changes > 0;
+  return result.changes > 0
 }
 
-export default addLotOccupancyFee;
+export default addLotOccupancyFee

helpers/lotOccupancyDB/addLotOccupancyOccupant.d.ts

@@ -1,5 +1,5 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3';
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes';
 interface AddLotOccupancyOccupantForm {
     lotOccupancyId: string | number;
     lotOccupantTypeId: string | number;

helpers/lotOccupancyDB/addLotOccupancyOccupant.js

@@ -1,7 +1,7 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3';
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
 export function addLotOccupancyOccupant(lotOccupancyOccupantForm, requestSession, connectedDatabase) {
-    const database = connectedDatabase || sqlite(databasePath);
+    const database = connectedDatabase ?? sqlite(databasePath);
     let lotOccupantIndex = 0;
     const maxIndexResult = database
         .prepare(`select lotOccupantIndex
@@ -26,7 +26,7 @@ export function addLotOccupancyOccupant(lotOccupancyOccupantForm, requestSession
                 recordCreate_userName, recordCreate_timeMillis,
                 recordUpdate_userName, recordUpdate_timeMillis)
                 values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
-        .run(lotOccupancyOccupantForm.lotOccupancyId, lotOccupantIndex, lotOccupancyOccupantForm.occupantName, lotOccupancyOccupantForm.occupantAddress1, lotOccupancyOccupantForm.occupantAddress2, lotOccupancyOccupantForm.occupantCity, lotOccupancyOccupantForm.occupantProvince, lotOccupancyOccupantForm.occupantPostalCode, lotOccupancyOccupantForm.occupantPhoneNumber, lotOccupancyOccupantForm.occupantEmailAddress, lotOccupancyOccupantForm.occupantComment || "", lotOccupancyOccupantForm.lotOccupantTypeId, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
+        .run(lotOccupancyOccupantForm.lotOccupancyId, lotOccupantIndex, lotOccupancyOccupantForm.occupantName, lotOccupancyOccupantForm.occupantAddress1, lotOccupancyOccupantForm.occupantAddress2, lotOccupancyOccupantForm.occupantCity, lotOccupancyOccupantForm.occupantProvince, lotOccupancyOccupantForm.occupantPostalCode, lotOccupancyOccupantForm.occupantPhoneNumber, lotOccupancyOccupantForm.occupantEmailAddress, lotOccupancyOccupantForm.occupantComment ?? '', lotOccupancyOccupantForm.lotOccupantTypeId, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
     if (!connectedDatabase) {
         database.close();
     }

helpers/lotOccupancyDB/addLotOccupancyOccupant.ts

@@ -1,21 +1,21 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3'
 
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js'
 
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes'
 
 interface AddLotOccupancyOccupantForm {
-    lotOccupancyId: string | number;
+  lotOccupancyId: string | number
-    lotOccupantTypeId: string | number;
+  lotOccupantTypeId: string | number
-    occupantName: string;
+  occupantName: string
-    occupantAddress1: string;
+  occupantAddress1: string
-    occupantAddress2: string;
+  occupantAddress2: string
-    occupantCity: string;
+  occupantCity: string
-    occupantProvince: string;
+  occupantProvince: string
-    occupantPostalCode: string;
+  occupantPostalCode: string
-    occupantPhoneNumber: string;
+  occupantPhoneNumber: string
-    occupantEmailAddress: string;
+  occupantEmailAddress: string
-    occupantComment?: string;
+  occupantComment?: string
 }
 
 export function addLotOccupancyOccupant(
@@ -23,9 +23,9 @@ export function addLotOccupancyOccupant(
   requestSession: recordTypes.PartialSession,
   connectedDatabase?: sqlite.Database
 ): number {
-    const database = connectedDatabase || sqlite(databasePath);
+  const database = connectedDatabase ?? sqlite(databasePath)
 
-    let lotOccupantIndex = 0;
+  let lotOccupantIndex = 0
 
   const maxIndexResult = database
     .prepare(
@@ -35,13 +35,13 @@ export function addLotOccupancyOccupant(
                 order by lotOccupantIndex desc
                 limit 1`
     )
-        .get(lotOccupancyOccupantForm.lotOccupancyId);
+    .get(lotOccupancyOccupantForm.lotOccupancyId)
 
   if (maxIndexResult) {
-        lotOccupantIndex = maxIndexResult.lotOccupantIndex + 1;
+    lotOccupantIndex = maxIndexResult.lotOccupantIndex + 1
   }
 
-    const rightNowMillis = Date.now();
+  const rightNowMillis = Date.now()
 
   database
     .prepare(
@@ -68,19 +68,19 @@ export function addLotOccupancyOccupant(
       lotOccupancyOccupantForm.occupantPostalCode,
       lotOccupancyOccupantForm.occupantPhoneNumber,
       lotOccupancyOccupantForm.occupantEmailAddress,
-            lotOccupancyOccupantForm.occupantComment || "",
+      lotOccupancyOccupantForm.occupantComment ?? '',
       lotOccupancyOccupantForm.lotOccupantTypeId,
-            requestSession.user.userName,
+      requestSession.user!.userName,
       rightNowMillis,
-            requestSession.user.userName,
+      requestSession.user!.userName,
       rightNowMillis
-        );
+    )
 
   if (!connectedDatabase) {
-        database.close();
+    database.close()
   }
 
-    return lotOccupantIndex;
+  return lotOccupantIndex
 }
 
-export default addLotOccupancyOccupant;
+export default addLotOccupancyOccupant

helpers/lotOccupancyDB/addLotOccupancyTransaction.d.ts

@@ -1,4 +1,4 @@
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes';
 interface AddLotOccupancyTransactionForm {
     lotOccupancyId: string | number;
     transactionDateString?: string;

helpers/lotOccupancyDB/addLotOccupancyTransaction.js

@@ -1,6 +1,6 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3';
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
-import { dateStringToInteger, dateToInteger, dateToTimeInteger, timeStringToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js";
+import { dateStringToInteger, dateToInteger, dateToTimeInteger, timeStringToInteger } from '@cityssm/expressjs-server-js/dateTimeFns.js';
 export function addLotOccupancyTransaction(lotOccupancyTransactionForm, requestSession) {
     const database = sqlite(databasePath);
     let transactionIndex = 0;

helpers/lotOccupancyDB/addLotOccupancyTransaction.ts

@@ -1,34 +1,34 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3'
 
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js'
 
 import {
   dateStringToInteger,
   dateToInteger,
   dateToTimeInteger,
   timeStringToInteger
-} from "@cityssm/expressjs-server-js/dateTimeFns.js";
+} from '@cityssm/expressjs-server-js/dateTimeFns.js'
 
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes'
 
 interface AddLotOccupancyTransactionForm {
-    lotOccupancyId: string | number;
+  lotOccupancyId: string | number
-    transactionDateString?: string;
+  transactionDateString?: string
-    transactionTimeString?: string;
+  transactionTimeString?: string
-    transactionAmount: string | number;
+  transactionAmount: string | number
-    externalReceiptNumber: string;
+  externalReceiptNumber: string
-    transactionNote: string;
+  transactionNote: string
 }
 
 export function addLotOccupancyTransaction(
   lotOccupancyTransactionForm: AddLotOccupancyTransactionForm,
   requestSession: recordTypes.PartialSession
 ): number {
-    const database = sqlite(databasePath);
+  const database = sqlite(databasePath)
 
-    let transactionIndex = 0;
+  let transactionIndex = 0
 
-    const maxIndexResult = database
+  const maxIndexResult: { transactionIndex: number } | undefined = database
     .prepare(
       `select transactionIndex
                 from LotOccupancyTransactions
@@ -36,21 +36,21 @@ export function addLotOccupancyTransaction(
                 order by transactionIndex desc
                 limit 1`
     )
-        .get(lotOccupancyTransactionForm.lotOccupancyId);
+    .get(lotOccupancyTransactionForm.lotOccupancyId)
 
   if (maxIndexResult) {
-        transactionIndex = maxIndexResult.transactionIndex + 1;
+    transactionIndex = maxIndexResult.transactionIndex + 1
   }
 
-    const rightNow = new Date();
+  const rightNow = new Date()
 
   const transactionDate = lotOccupancyTransactionForm.transactionDateString
     ? dateStringToInteger(lotOccupancyTransactionForm.transactionDateString)
-        : dateToInteger(rightNow);
+    : dateToInteger(rightNow)
 
   const transactionTime = lotOccupancyTransactionForm.transactionTimeString
     ? timeStringToInteger(lotOccupancyTransactionForm.transactionTimeString)
-        : dateToTimeInteger(rightNow);
+    : dateToTimeInteger(rightNow)
 
   database
     .prepare(
@@ -70,15 +70,15 @@ export function addLotOccupancyTransaction(
       lotOccupancyTransactionForm.transactionAmount,
       lotOccupancyTransactionForm.externalReceiptNumber,
       lotOccupancyTransactionForm.transactionNote,
-            requestSession.user.userName,
+      requestSession.user!.userName,
       rightNow.getTime(),
-            requestSession.user.userName,
+      requestSession.user!.userName,
       rightNow.getTime()
-        );
+    )
 
-    database.close();
+  database.close()
 
-    return transactionIndex;
+  return transactionIndex
 }
 
-export default addLotOccupancyTransaction;
+export default addLotOccupancyTransaction

helpers/lotOccupancyDB/addLotOccupantType.d.ts

@@ -1,4 +1,4 @@
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes';
 interface AddLotOccupantTypeForm {
     lotOccupantType: string;
     fontAwesomeIconClass?: string;

helpers/lotOccupancyDB/addLotOccupantType.js

@@ -1,6 +1,6 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3';
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
-import { clearCacheByTableName } from "../functions.cache.js";
+import { clearCacheByTableName } from '../functions.cache.js';
 export function addLotOccupantType(lotOccupantTypeForm, requestSession) {
     const database = sqlite(databasePath);
     const rightNowMillis = Date.now();
@@ -10,9 +10,9 @@ export function addLotOccupantType(lotOccupantTypeForm, requestSession) {
                 recordCreate_userName, recordCreate_timeMillis,
                 recordUpdate_userName, recordUpdate_timeMillis)
                 values (?, ?, ?, ?, ?, ?, ?)`)
-        .run(lotOccupantTypeForm.lotOccupantType, lotOccupantTypeForm.fontAwesomeIconClass || "", lotOccupantTypeForm.orderNumber || -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
+        .run(lotOccupantTypeForm.lotOccupantType, lotOccupantTypeForm.fontAwesomeIconClass ?? '', lotOccupantTypeForm.orderNumber ?? -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
     database.close();
-    clearCacheByTableName("LotOccupantTypes");
+    clearCacheByTableName('LotOccupantTypes');
     return result.lastInsertRowid;
 }
 export default addLotOccupantType;

helpers/lotOccupancyDB/addLotOccupantType.ts

@@ -1,23 +1,23 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3'
 
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js'
 
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes'
-import { clearCacheByTableName } from "../functions.cache.js";
+import { clearCacheByTableName } from '../functions.cache.js'
 
 interface AddLotOccupantTypeForm {
-    lotOccupantType: string;
+  lotOccupantType: string
-    fontAwesomeIconClass?: string;
+  fontAwesomeIconClass?: string
-    orderNumber?: number;
+  orderNumber?: number
 }
 
 export function addLotOccupantType(
   lotOccupantTypeForm: AddLotOccupantTypeForm,
   requestSession: recordTypes.PartialSession
 ): number {
-    const database = sqlite(databasePath);
+  const database = sqlite(databasePath)
 
-    const rightNowMillis = Date.now();
+  const rightNowMillis = Date.now()
 
   const result = database
     .prepare(
@@ -29,19 +29,19 @@ export function addLotOccupantType(
     )
     .run(
       lotOccupantTypeForm.lotOccupantType,
-            lotOccupantTypeForm.fontAwesomeIconClass || "",
+      lotOccupantTypeForm.fontAwesomeIconClass ?? '',
-            lotOccupantTypeForm.orderNumber || -1,
+      lotOccupantTypeForm.orderNumber ?? -1,
-            requestSession.user.userName,
+      requestSession.user!.userName,
       rightNowMillis,
-            requestSession.user.userName,
+      requestSession.user!.userName,
       rightNowMillis
-        );
+    )
 
-    database.close();
+  database.close()
 
-    clearCacheByTableName("LotOccupantTypes");
+  clearCacheByTableName('LotOccupantTypes')
 
-    return result.lastInsertRowid as number;
+  return result.lastInsertRowid as number
 }
 
-export default addLotOccupantType;
+export default addLotOccupantType

helpers/lotOccupancyDB/addLotTypeField.d.ts

@@ -1,4 +1,4 @@
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes';
 interface AddLotTypeFieldForm {
     lotTypeId: string | number;
     lotTypeField: string;

helpers/lotOccupancyDB/addLotTypeField.js

@@ -1,6 +1,6 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3';
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
-import { clearCacheByTableName } from "../functions.cache.js";
+import { clearCacheByTableName } from '../functions.cache.js';
 export function addLotTypeField(lotTypeFieldForm, requestSession) {
     const database = sqlite(databasePath);
     const rightNowMillis = Date.now();
@@ -13,9 +13,9 @@ export function addLotTypeField(lotTypeFieldForm, requestSession) {
                 recordCreate_userName, recordCreate_timeMillis,
                 recordUpdate_userName, recordUpdate_timeMillis)
                 values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
-        .run(lotTypeFieldForm.lotTypeId, lotTypeFieldForm.lotTypeField, lotTypeFieldForm.lotTypeFieldValues || "", lotTypeFieldForm.isRequired ? 1 : 0, lotTypeFieldForm.pattern || "", lotTypeFieldForm.minimumLength || 0, lotTypeFieldForm.maximumLength || 100, lotTypeFieldForm.orderNumber || -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
+        .run(lotTypeFieldForm.lotTypeId, lotTypeFieldForm.lotTypeField, lotTypeFieldForm.lotTypeFieldValues ?? '', lotTypeFieldForm.isRequired === '' ? 0 : 1, lotTypeFieldForm.pattern ?? '', lotTypeFieldForm.minimumLength ?? 0, lotTypeFieldForm.maximumLength ?? 100, lotTypeFieldForm.orderNumber ?? -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
     database.close();
-    clearCacheByTableName("LotTypeFields");
+    clearCacheByTableName('LotTypeFields');
     return result.lastInsertRowid;
 }
 export default addLotTypeField;

helpers/lotOccupancyDB/addLotTypeField.ts

@@ -1,29 +1,29 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3'
 
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js'
 
-import { clearCacheByTableName } from "../functions.cache.js";
+import { clearCacheByTableName } from '../functions.cache.js'
 
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes'
 
 interface AddLotTypeFieldForm {
-    lotTypeId: string | number;
+  lotTypeId: string | number
-    lotTypeField: string;
+  lotTypeField: string
-    lotTypeFieldValues?: string;
+  lotTypeFieldValues?: string
-    isRequired?: string;
+  isRequired?: string
-    pattern?: string;
+  pattern?: string
-    minimumLength: string | number;
+  minimumLength: string | number
-    maximumLength: string | number;
+  maximumLength: string | number
-    orderNumber?: number;
+  orderNumber?: number
 }
 
 export function addLotTypeField(
   lotTypeFieldForm: AddLotTypeFieldForm,
   requestSession: recordTypes.PartialSession
 ): number {
-    const database = sqlite(databasePath);
+  const database = sqlite(databasePath)
 
-    const rightNowMillis = Date.now();
+  const rightNowMillis = Date.now()
 
   const result = database
     .prepare(
@@ -39,23 +39,23 @@ export function addLotTypeField(
     .run(
       lotTypeFieldForm.lotTypeId,
       lotTypeFieldForm.lotTypeField,
-            lotTypeFieldForm.lotTypeFieldValues || "",
+      lotTypeFieldForm.lotTypeFieldValues ?? '',
-            lotTypeFieldForm.isRequired ? 1 : 0,
+      lotTypeFieldForm.isRequired === '' ? 0 : 1,
-            lotTypeFieldForm.pattern || "",
+      lotTypeFieldForm.pattern ?? '',
-            lotTypeFieldForm.minimumLength || 0,
+      lotTypeFieldForm.minimumLength ?? 0,
-            lotTypeFieldForm.maximumLength || 100,
+      lotTypeFieldForm.maximumLength ?? 100,
-            lotTypeFieldForm.orderNumber || -1,
+      lotTypeFieldForm.orderNumber ?? -1,
-            requestSession.user.userName,
+      requestSession.user!.userName,
       rightNowMillis,
-            requestSession.user.userName,
+      requestSession.user!.userName,
       rightNowMillis
-        );
+    )
 
-    database.close();
+  database.close()
 
-    clearCacheByTableName("LotTypeFields");
+  clearCacheByTableName('LotTypeFields')
 
-    return result.lastInsertRowid as number;
+  return result.lastInsertRowid as number
 }
 
-export default addLotTypeField;
+export default addLotTypeField

helpers/lotOccupancyDB/addMap.d.ts

@@ -1,4 +1,4 @@
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes';
 interface AddMapForm {
     mapName: string;
     mapDescription: string;

helpers/lotOccupancyDB/addMap.js

@@ -1,5 +1,5 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3';
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
 export function addMap(mapForm, requestSession) {
     const database = sqlite(databasePath);
     const rightNowMillis = Date.now();
@@ -13,7 +13,7 @@ export function addMap(mapForm, requestSession) {
         recordCreate_userName, recordCreate_timeMillis,
         recordUpdate_userName, recordUpdate_timeMillis)
         values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
-        .run(mapForm.mapName, mapForm.mapDescription, mapForm.mapSVG, mapForm.mapLatitude === "" ? undefined : mapForm.mapLatitude, mapForm.mapLongitude === "" ? undefined : mapForm.mapLongitude, mapForm.mapAddress1, mapForm.mapAddress2, mapForm.mapCity, mapForm.mapProvince, mapForm.mapPostalCode, mapForm.mapPhoneNumber, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
+        .run(mapForm.mapName, mapForm.mapDescription, mapForm.mapSVG, mapForm.mapLatitude === '' ? undefined : mapForm.mapLatitude, mapForm.mapLongitude === '' ? undefined : mapForm.mapLongitude, mapForm.mapAddress1, mapForm.mapAddress2, mapForm.mapCity, mapForm.mapProvince, mapForm.mapPostalCode, mapForm.mapPhoneNumber, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
     database.close();
     return result.lastInsertRowid;
 }

helpers/lotOccupancyDB/addMap.ts

@@ -1,27 +1,30 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3'
 
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js'
 
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes'
 
 interface AddMapForm {
-    mapName: string;
+  mapName: string
-    mapDescription: string;
+  mapDescription: string
-    mapSVG: string;
+  mapSVG: string
-    mapLatitude: string;
+  mapLatitude: string
-    mapLongitude: string;
+  mapLongitude: string
-    mapAddress1: string;
+  mapAddress1: string
-    mapAddress2: string;
+  mapAddress2: string
-    mapCity: string;
+  mapCity: string
-    mapProvince: string;
+  mapProvince: string
-    mapPostalCode: string;
+  mapPostalCode: string
-    mapPhoneNumber: string;
+  mapPhoneNumber: string
 }
 
-export function addMap(mapForm: AddMapForm, requestSession: recordTypes.PartialSession): number {
+export function addMap(
-    const database = sqlite(databasePath);
+  mapForm: AddMapForm,
+  requestSession: recordTypes.PartialSession
+): number {
+  const database = sqlite(databasePath)
 
-    const rightNowMillis = Date.now();
+  const rightNowMillis = Date.now()
 
   const result = database
     .prepare(
@@ -39,23 +42,23 @@ export function addMap(mapForm: AddMapForm, requestSession: recordTypes.PartialS
       mapForm.mapName,
       mapForm.mapDescription,
       mapForm.mapSVG,
-            mapForm.mapLatitude === "" ? undefined : mapForm.mapLatitude,
+      mapForm.mapLatitude === '' ? undefined : mapForm.mapLatitude,
-            mapForm.mapLongitude === "" ? undefined : mapForm.mapLongitude,
+      mapForm.mapLongitude === '' ? undefined : mapForm.mapLongitude,
       mapForm.mapAddress1,
       mapForm.mapAddress2,
       mapForm.mapCity,
       mapForm.mapProvince,
       mapForm.mapPostalCode,
       mapForm.mapPhoneNumber,
-            requestSession.user.userName,
+      requestSession.user!.userName,
       rightNowMillis,
-            requestSession.user.userName,
+      requestSession.user!.userName,
       rightNowMillis
-        );
+    )
 
-    database.close();
+  database.close()
 
-    return result.lastInsertRowid as number;
+  return result.lastInsertRowid as number
 }
 
-export default addMap;
+export default addMap

helpers/lotOccupancyDB/getLotOccupancy.d.ts

@@ -1,4 +1,4 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3';
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes';
-export declare function getLotOccupancy(lotOccupancyId: number | string, connectedDatabase?: sqlite.Database): recordTypes.LotOccupancy;
+export declare function getLotOccupancy(lotOccupancyId: number | string, connectedDatabase?: sqlite.Database): recordTypes.LotOccupancy | undefined;
 export default getLotOccupancy;

helpers/lotOccupancyDB/getLotOccupancy.js

@@ -1,18 +1,18 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3';
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
-import { dateIntegerToString } from "@cityssm/expressjs-server-js/dateTimeFns.js";
+import { dateIntegerToString } from '@cityssm/expressjs-server-js/dateTimeFns.js';
-import { getLotOccupancyOccupants } from "./getLotOccupancyOccupants.js";
+import { getLotOccupancyOccupants } from './getLotOccupancyOccupants.js';
-import { getLotOccupancyComments } from "./getLotOccupancyComments.js";
+import { getLotOccupancyComments } from './getLotOccupancyComments.js';
-import { getLotOccupancyFields } from "./getLotOccupancyFields.js";
+import { getLotOccupancyFields } from './getLotOccupancyFields.js';
-import { getLotOccupancyFees } from "./getLotOccupancyFees.js";
+import { getLotOccupancyFees } from './getLotOccupancyFees.js';
-import { getLotOccupancyTransactions } from "./getLotOccupancyTransactions.js";
+import { getLotOccupancyTransactions } from './getLotOccupancyTransactions.js';
-import { getWorkOrders } from "./getWorkOrders.js";
+import { getWorkOrders } from './getWorkOrders.js';
 export function getLotOccupancy(lotOccupancyId, connectedDatabase) {
-    const database = connectedDatabase ||
+    const database = connectedDatabase ??
         sqlite(databasePath, {
             readonly: true
         });
-    database.function("userFn_dateIntegerToString", dateIntegerToString);
+    database.function('userFn_dateIntegerToString', dateIntegerToString);
     const lotOccupancy = database
         .prepare(`select o.lotOccupancyId,
                 o.occupancyTypeId, t.occupancyType,

helpers/lotOccupancyDB/getLotOccupancy.ts

@@ -1,31 +1,31 @@
-import sqlite from "better-sqlite3";
+import sqlite from 'better-sqlite3'
 
-import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
+import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js'
 
-import { dateIntegerToString } from "@cityssm/expressjs-server-js/dateTimeFns.js";
+import { dateIntegerToString } from '@cityssm/expressjs-server-js/dateTimeFns.js'
 
-import { getLotOccupancyOccupants } from "./getLotOccupancyOccupants.js";
+import { getLotOccupancyOccupants } from './getLotOccupancyOccupants.js'
-import { getLotOccupancyComments } from "./getLotOccupancyComments.js";
+import { getLotOccupancyComments } from './getLotOccupancyComments.js'
-import { getLotOccupancyFields } from "./getLotOccupancyFields.js";
+import { getLotOccupancyFields } from './getLotOccupancyFields.js'
-import { getLotOccupancyFees } from "./getLotOccupancyFees.js";
+import { getLotOccupancyFees } from './getLotOccupancyFees.js'
-import { getLotOccupancyTransactions } from "./getLotOccupancyTransactions.js";
+import { getLotOccupancyTransactions } from './getLotOccupancyTransactions.js'
-import { getWorkOrders } from "./getWorkOrders.js";
+import { getWorkOrders } from './getWorkOrders.js'
 
-import type * as recordTypes from "../../types/recordTypes";
+import type * as recordTypes from '../../types/recordTypes'
 
 export function getLotOccupancy(
   lotOccupancyId: number | string,
   connectedDatabase?: sqlite.Database
-): recordTypes.LotOccupancy {
+): recordTypes.LotOccupancy | undefined {
   const database =
-        connectedDatabase ||
+    connectedDatabase ??
     sqlite(databasePath, {
       readonly: true
-        });
+    })
 
-    database.function("userFn_dateIntegerToString", dateIntegerToString);
+  database.function('userFn_dateIntegerToString', dateIntegerToString)
 
-    const lotOccupancy: recordTypes.LotOccupancy = database
+  const lotOccupancy: recordTypes.LotOccupancy | undefined = database
     .prepare(
       `select o.lotOccupancyId,
                 o.occupancyTypeId, t.occupancyType,
@@ -41,17 +41,29 @@ export function getLotOccupancy(
                 where o.recordDelete_timeMillis is null
                 and o.lotOccupancyId = ?`
     )
-        .get(lotOccupancyId);
+    .get(lotOccupancyId)
 
   if (lotOccupancy) {
-        lotOccupancy.lotOccupancyFields = getLotOccupancyFields(lotOccupancyId, database);
+    lotOccupancy.lotOccupancyFields = getLotOccupancyFields(
-        lotOccupancy.lotOccupancyOccupants = getLotOccupancyOccupants(lotOccupancyId, database);
+      lotOccupancyId,
-        lotOccupancy.lotOccupancyComments = getLotOccupancyComments(lotOccupancyId, database);
+      database
-        lotOccupancy.lotOccupancyFees = getLotOccupancyFees(lotOccupancyId, database);
+    )
+    lotOccupancy.lotOccupancyOccupants = getLotOccupancyOccupants(
+      lotOccupancyId,
+      database
+    )
+    lotOccupancy.lotOccupancyComments = getLotOccupancyComments(
+      lotOccupancyId,
+      database
+    )
+    lotOccupancy.lotOccupancyFees = getLotOccupancyFees(
+      lotOccupancyId,
+      database
+    )
     lotOccupancy.lotOccupancyTransactions = getLotOccupancyTransactions(
       lotOccupancyId,
       database
-        );
+    )
 
     lotOccupancy.workOrders = getWorkOrders(
       {
@@ -62,14 +74,14 @@ export function getLotOccupancy(
         offset: 0
       },
       database
-        ).workOrders;
+    ).workOrders
   }
 
   if (!connectedDatabase) {
-        database.close();
+    database.close()
   }
 
-    return lotOccupancy;
+  return lotOccupancy
 }
 
-export default getLotOccupancy;
+export default getLotOccupancy

package-lock.json

@@ -78,6 +78,7 @@
                 "cypress": "^12.3.0",
                 "cypress-axe": "^1.2.0",
                 "eslint": "^8.31.0",
+                "eslint-config-standard-with-typescript": "^26.0.0",
                 "eslint-plugin-import": "^2.26.0",
                 "eslint-plugin-node": "^11.1.0",
                 "eslint-plugin-promise": "^6.1.1",
@@ -2442,6 +2443,16 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/builtins": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
+            "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "semver": "^7.0.0"
+            }
+        },
         "node_modules/bulma": {
             "version": "0.9.4",
             "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.9.4.tgz",
@@ -4020,6 +4031,50 @@
                 "url": "https://opencollective.com/eslint"
             }
         },
+        "node_modules/eslint-config-standard": {
+            "version": "17.0.0",
+            "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz",
+            "integrity": "sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "peerDependencies": {
+                "eslint": "^8.0.1",
+                "eslint-plugin-import": "^2.25.2",
+                "eslint-plugin-n": "^15.0.0",
+                "eslint-plugin-promise": "^6.0.0"
+            }
+        },
+        "node_modules/eslint-config-standard-with-typescript": {
+            "version": "26.0.0",
+            "resolved": "https://registry.npmjs.org/eslint-config-standard-with-typescript/-/eslint-config-standard-with-typescript-26.0.0.tgz",
+            "integrity": "sha512-TluIWunQo76qp4MHyYIaTT+sN2q2v/jTeE3Dj4rXsSbx27GOUEOujhJaAL3v9dHVQelAK13gZ5Jy9IWnWCyFrg==",
+            "dev": true,
+            "dependencies": {
+                "@typescript-eslint/parser": "^5.0.0",
+                "eslint-config-standard": "17.0.0"
+            },
+            "peerDependencies": {
+                "@typescript-eslint/eslint-plugin": "^5.0.0",
+                "eslint": "^8.0.1",
+                "eslint-plugin-import": "^2.25.2",
+                "eslint-plugin-n": "^15.0.0",
+                "eslint-plugin-promise": "^6.0.0",
+                "typescript": "*"
+            }
+        },
         "node_modules/eslint-import-resolver-node": {
             "version": "0.3.6",
             "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
@@ -4158,6 +4213,78 @@
             "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
             "dev": true
         },
+        "node_modules/eslint-plugin-n": {
+            "version": "15.6.1",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.6.1.tgz",
+            "integrity": "sha512-R9xw9OtCRxxaxaszTQmQAlPgM+RdGjaL1akWuY/Fv9fRAi8Wj4CUKc6iYVG8QNRjRuo8/BqVYIpfqberJUEacA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "builtins": "^5.0.1",
+                "eslint-plugin-es": "^4.1.0",
+                "eslint-utils": "^3.0.0",
+                "ignore": "^5.1.1",
+                "is-core-module": "^2.11.0",
+                "minimatch": "^3.1.2",
+                "resolve": "^1.22.1",
+                "semver": "^7.3.8"
+            },
+            "engines": {
+                "node": ">=12.22.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/mysticatea"
+            },
+            "peerDependencies": {
+                "eslint": ">=7.0.0"
+            }
+        },
+        "node_modules/eslint-plugin-n/node_modules/eslint-plugin-es": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
+            "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "eslint-utils": "^2.0.0",
+                "regexpp": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8.10.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/mysticatea"
+            },
+            "peerDependencies": {
+                "eslint": ">=4.19.1"
+            }
+        },
+        "node_modules/eslint-plugin-n/node_modules/eslint-plugin-es/node_modules/eslint-utils": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+            "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "eslint-visitor-keys": "^1.1.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/mysticatea"
+            }
+        },
+        "node_modules/eslint-plugin-n/node_modules/eslint-visitor-keys": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+            "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
         "node_modules/eslint-plugin-node": {
             "version": "11.1.0",
             "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
@@ -7032,9 +7159,9 @@
             }
         },
         "node_modules/is-core-module": {
-            "version": "2.9.0",
+            "version": "2.11.0",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-            "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
+            "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
             "dev": true,
             "dependencies": {
                 "has": "^1.0.3"
@@ -14465,6 +14592,16 @@
             "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
             "dev": true
         },
+        "builtins": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
+            "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "semver": "^7.0.0"
+            }
+        },
         "bulma": {
             "version": "0.9.4",
             "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.9.4.tgz",
@@ -15761,6 +15898,23 @@
                 }
             }
         },
+        "eslint-config-standard": {
+            "version": "17.0.0",
+            "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz",
+            "integrity": "sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==",
+            "dev": true,
+            "requires": {}
+        },
+        "eslint-config-standard-with-typescript": {
+            "version": "26.0.0",
+            "resolved": "https://registry.npmjs.org/eslint-config-standard-with-typescript/-/eslint-config-standard-with-typescript-26.0.0.tgz",
+            "integrity": "sha512-TluIWunQo76qp4MHyYIaTT+sN2q2v/jTeE3Dj4rXsSbx27GOUEOujhJaAL3v9dHVQelAK13gZ5Jy9IWnWCyFrg==",
+            "dev": true,
+            "requires": {
+                "@typescript-eslint/parser": "^5.0.0",
+                "eslint-config-standard": "17.0.0"
+            }
+        },
         "eslint-import-resolver-node": {
             "version": "0.3.6",
             "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz",
@@ -15877,6 +16031,55 @@
                 }
             }
         },
+        "eslint-plugin-n": {
+            "version": "15.6.1",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-15.6.1.tgz",
+            "integrity": "sha512-R9xw9OtCRxxaxaszTQmQAlPgM+RdGjaL1akWuY/Fv9fRAi8Wj4CUKc6iYVG8QNRjRuo8/BqVYIpfqberJUEacA==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "builtins": "^5.0.1",
+                "eslint-plugin-es": "^4.1.0",
+                "eslint-utils": "^3.0.0",
+                "ignore": "^5.1.1",
+                "is-core-module": "^2.11.0",
+                "minimatch": "^3.1.2",
+                "resolve": "^1.22.1",
+                "semver": "^7.3.8"
+            },
+            "dependencies": {
+                "eslint-plugin-es": {
+                    "version": "4.1.0",
+                    "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz",
+                    "integrity": "sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "eslint-utils": "^2.0.0",
+                        "regexpp": "^3.0.0"
+                    },
+                    "dependencies": {
+                        "eslint-utils": {
+                            "version": "2.1.0",
+                            "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+                            "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+                            "dev": true,
+                            "peer": true,
+                            "requires": {
+                                "eslint-visitor-keys": "^1.1.0"
+                            }
+                        }
+                    }
+                },
+                "eslint-visitor-keys": {
+                    "version": "1.3.0",
+                    "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+                    "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+                    "dev": true,
+                    "peer": true
+                }
+            }
+        },
         "eslint-plugin-node": {
             "version": "11.1.0",
             "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
@@ -17998,9 +18201,9 @@
             }
         },
         "is-core-module": {
-            "version": "2.9.0",
+            "version": "2.11.0",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-            "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
+            "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
             "dev": true,
             "requires": {
                 "has": "^1.0.3"

package.json

@@ -102,6 +102,7 @@
     "cypress": "^12.3.0",
     "cypress-axe": "^1.2.0",
     "eslint": "^8.31.0",
+    "eslint-config-standard-with-typescript": "^26.0.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",

temp/so.exportMaps.js

@@ -26,13 +26,13 @@ async function importMaps() {
             });
         }
     }
-    catch (_a) {
+    catch {
     }
     finally {
         try {
             pool.close();
         }
-        catch (_b) {
+        catch {
         }
     }
 }

test/1_serverCypress.js

@@ -16,7 +16,7 @@ describe("lot-occupancy-system", () => {
         try {
             httpServer.close();
         }
-        catch (_a) {
+        catch {
         }
     });
     it("Ensure server starts on port " + portNumber.toString(), () => {

test/_globals.js

@@ -1,15 +1,3 @@
-var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
-var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var g = generator.apply(thisArg, _arguments || []), i, q = [];
-    return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
-    function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
-    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
-    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
-    function fulfill(value) { resume("next", value); }
-    function reject(value) { resume("throw", value); }
-    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
-};
 export const testView = "*testView";
 export const testUpdate = "*testUpdate";
 export const testAdmin = "*testAdmin";
@@ -37,7 +25,7 @@ export const fakeAdminSession = {
     user: undefined
 };
 export const fakeRequest = {
-    [Symbol.asyncIterator]() { return __asyncGenerator(this, arguments, function* _a() { }); },
+    async *[Symbol.asyncIterator]() { },
     _destroy: undefined,
     _read: undefined,
     aborted: undefined,

tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es2017",
+    "target": "es2022",
     "module": "es2022",
     "moduleResolution": "Node",
     "isolatedModules": false,
@@ -11,7 +11,8 @@
     "allowSyntheticDefaultImports": true,
     "resolveJsonModule": true,
     "esModuleInterop": true,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "strictNullChecks": true
   },
   "compileOnSave": true,
   "buildOnSave": true,

types/recordTypes.d.ts

@@ -258,11 +258,11 @@ export interface UserProperties {
     isAdmin: boolean;
     apiKey: string;
 }
-declare module "express-session" {
+declare module 'express-session' {
     interface Session {
-        user: User;
+        user?: User;
     }
 }
 export interface PartialSession {
-    user: User;
+    user?: User;
 }