code cleanup

database/parkingDB-ontario/getParkingTicketsAvailableForMTOLookup.js

@@ -1,16 +1,16 @@
-import * as dateTimeFns from '@cityssm/utils-datetime';
+import { dateIntegerToString, dateToInteger } from '@cityssm/utils-datetime';
 import sqlite from 'better-sqlite3';
 import { parkingDB as databasePath } from '../../data/databasePaths.js';
 export default function getParkingTicketsAvailableForMTOLookup(currentBatchId, issueDaysAgo) {
     const database = sqlite(databasePath, {
         readonly: true
     });
-    database.function('userFn_dateIntegerToString', dateTimeFns.dateIntegerToString);
+    database.function('userFn_dateIntegerToString', dateIntegerToString);
     let issueDateNumber = 1e8;
     if (issueDaysAgo !== -1) {
         const issueDate = new Date();
         issueDate.setDate(issueDate.getDate() - issueDaysAgo);
-        issueDateNumber = dateTimeFns.dateToInteger(issueDate);
+        issueDateNumber = dateToInteger(issueDate);
     }
     const tickets = database
         .prepare(`select t.ticketId, t.ticketNumber,

database/parkingDB-ontario/getParkingTicketsAvailableForMTOLookup.ts

@@ -1,4 +1,4 @@
-import * as dateTimeFns from '@cityssm/utils-datetime'
+import { dateIntegerToString, dateToInteger } from '@cityssm/utils-datetime'
 import sqlite from 'better-sqlite3'
 
 import { parkingDB as databasePath } from '../../data/databasePaths.js'
@@ -12,17 +12,14 @@ export default function getParkingTicketsAvailableForMTOLookup(
     readonly: true
   })
 
-  database.function(
-    'userFn_dateIntegerToString',
-    dateTimeFns.dateIntegerToString
-  )
+  database.function('userFn_dateIntegerToString', dateIntegerToString)
 
   let issueDateNumber = 1e8 // 10000_00_00 (a number bigger than any possible date)
 
   if (issueDaysAgo !== -1) {
     const issueDate = new Date()
     issueDate.setDate(issueDate.getDate() - issueDaysAgo)
-    issueDateNumber = dateTimeFns.dateToInteger(issueDate) as number
+    issueDateNumber = dateToInteger(issueDate) as number
   }
 
   const tickets = database

database/parkingDB/getLicencePlates.d.ts

@@ -6,11 +6,10 @@ export interface GetLicencePlatesQueryOptions {
     limit: number;
     offset: number;
 }
-interface GetLicencePlatesReturn {
+export interface GetLicencePlatesReturn {
     count: number;
     limit: number;
     offset: number;
     licencePlates: LicencePlate[];
 }
-export declare function getLicencePlates(queryOptions: GetLicencePlatesQueryOptions): GetLicencePlatesReturn;
-export default getLicencePlates;
+export default function getLicencePlates(queryOptions: GetLicencePlatesQueryOptions): GetLicencePlatesReturn;

database/parkingDB/getLicencePlates.js

@@ -1,7 +1,7 @@
 import sqlite from 'better-sqlite3';
 import { parkingDB as databasePath } from '../../data/databasePaths.js';
 import { getSplitWhereClauseFilter } from '../parkingDB.js';
-export function getLicencePlates(queryOptions) {
+export default function getLicencePlates(queryOptions) {
     const database = sqlite(databasePath, {
         readonly: true
     });
@@ -61,4 +61,3 @@ export function getLicencePlates(queryOptions) {
         licencePlates: rows
     };
 }
-export default getLicencePlates;

database/parkingDB/getLicencePlates.ts

@@ -12,14 +12,14 @@ export interface GetLicencePlatesQueryOptions {
   offset: number
 }
 
-interface GetLicencePlatesReturn {
+export interface GetLicencePlatesReturn {
   count: number
   limit: number
   offset: number
   licencePlates: LicencePlate[]
 }
 
-export function getLicencePlates(
+export default function getLicencePlates(
   queryOptions: GetLicencePlatesQueryOptions
 ): GetLicencePlatesReturn {
   const database = sqlite(databasePath, {
@@ -108,5 +108,3 @@ export function getLicencePlates(
     licencePlates: rows
   }
 }
-
-export default getLicencePlates

database/parkingDB/getParkingTickets.d.ts

@@ -10,12 +10,11 @@ export interface GetParkingTicketsQueryOptions {
     limit: number;
     offset: number;
 }
-interface GetParkingTicketsReturn {
+export interface GetParkingTicketsReturn {
     count: number;
     limit: number;
     offset: number;
     tickets: ParkingTicket[];
 }
 export default function getParkingTickets(sessionUser: PTSUser, queryOptions: GetParkingTicketsQueryOptions): GetParkingTicketsReturn;
 export declare function getParkingTicketsByLicencePlate(licencePlateCountry: string, licencePlateProvince: string, licencePlateNumber: string, sessionUser: PTSUser): ParkingTicket[];
-export {};

database/parkingDB/getParkingTickets.ts

@@ -103,7 +103,7 @@ function buildWhereClause(
   }
 }
 
-interface GetParkingTicketsReturn {
+export interface GetParkingTicketsReturn {
   count: number
   limit: number
   offset: number

database/parkingDB/getUnreceivedLookupBatches.js

@@ -1,4 +1,4 @@
-import * as dateTimeFns from '@cityssm/utils-datetime';
+import { dateIntegerToString } from '@cityssm/utils-datetime';
 import sqlite from 'better-sqlite3';
 import { parkingDB as databasePath } from '../../data/databasePaths.js';
 export default function getUnreceivedLookupBatches(includeUnlocked) {
@@ -18,9 +18,9 @@ export default function getUnreceivedLookupBatches(includeUnlocked) {
         .all();
     database.close();
     for (const batch of batches) {
-        batch.batchDateString = dateTimeFns.dateIntegerToString(batch.batchDate);
-        batch.lockDateString = dateTimeFns.dateIntegerToString(batch.lockDate);
-        batch.sentDateString = dateTimeFns.dateIntegerToString(batch.sentDate);
+        batch.batchDateString = dateIntegerToString(batch.batchDate);
+        batch.lockDateString = dateIntegerToString(batch.lockDate);
+        batch.sentDateString = dateIntegerToString(batch.sentDate);
     }
     return batches;
 }

database/parkingDB/getUnreceivedLookupBatches.ts

@@ -1,4 +1,4 @@
-import * as dateTimeFns from '@cityssm/utils-datetime'
+import { dateIntegerToString } from '@cityssm/utils-datetime'
 import sqlite from 'better-sqlite3'
 
 import { parkingDB as databasePath } from '../../data/databasePaths.js'
@@ -28,13 +28,9 @@ export default function getUnreceivedLookupBatches(
   database.close()
 
   for (const batch of batches) {
-    batch.batchDateString = dateTimeFns.dateIntegerToString(batch.batchDate)
-    batch.lockDateString = dateTimeFns.dateIntegerToString(
-      batch.lockDate as number
-    )
-    batch.sentDateString = dateTimeFns.dateIntegerToString(
-      batch.sentDate as number
-    )
+    batch.batchDateString = dateIntegerToString(batch.batchDate)
+    batch.lockDateString = dateIntegerToString(batch.lockDate as number)
+    batch.sentDateString = dateIntegerToString(batch.sentDate as number)
   }
 
   return batches

database/parkingDB/lockLookupBatch.js

@@ -1,4 +1,4 @@
-import * as dateTimeFns from '@cityssm/utils-datetime';
+import { dateToInteger, dateToTimeInteger } from '@cityssm/utils-datetime';
 import sqlite from 'better-sqlite3';
 import { parkingDB as databasePath } from '../../data/databasePaths.js';
 export default function lockLookupBatch(batchId, sessionUser) {
@@ -12,7 +12,7 @@ export default function lockLookupBatch(batchId, sessionUser) {
         where batchId = ?
         and recordDelete_timeMillis is null
         and lockDate is null`)
-        .run(dateTimeFns.dateToInteger(rightNow), sessionUser.userName, rightNow.getTime(), batchId);
+        .run(dateToInteger(rightNow), sessionUser.userName, rightNow.getTime(), batchId);
     if (info.changes > 0) {
         database
             .prepare(`insert into ParkingTicketStatusLog (
@@ -44,7 +44,7 @@ export default function lockLookupBatch(batchId, sessionUser) {
             or (t.recordDelete_timeMillis is null and t.resolvedDate is null))
           group by t.ticketId, e.licencePlateCountry, e.licencePlateProvince, e.licencePlateNumber, e.batchId
           having max(case when s.statusKey in ('ownerLookupPending', 'ownerLookupMatch', 'ownerLookupError') and s.recordDelete_timeMillis is null then 1 else 0 end) = 0`)
-            .run(dateTimeFns.dateToInteger(rightNow), dateTimeFns.dateToTimeInteger(rightNow), sessionUser.userName, rightNow.getTime(), sessionUser.userName, rightNow.getTime(), batchId);
+            .run(dateToInteger(rightNow), dateToTimeInteger(rightNow), sessionUser.userName, rightNow.getTime(), sessionUser.userName, rightNow.getTime(), batchId);
     }
     database.close();
     return {

database/parkingDB/lockLookupBatch.ts

@@ -1,4 +1,4 @@
-import * as dateTimeFns from '@cityssm/utils-datetime'
+import { dateToInteger, dateToTimeInteger } from '@cityssm/utils-datetime'
 import sqlite from 'better-sqlite3'
 
 import { parkingDB as databasePath } from '../../data/databasePaths.js'
@@ -24,7 +24,7 @@ export default function lockLookupBatch(
         and lockDate is null`
     )
     .run(
-      dateTimeFns.dateToInteger(rightNow),
+      dateToInteger(rightNow),
       sessionUser.userName,
       rightNow.getTime(),
       batchId
@@ -64,8 +64,8 @@ export default function lockLookupBatch(
           having max(case when s.statusKey in ('ownerLookupPending', 'ownerLookupMatch', 'ownerLookupError') and s.recordDelete_timeMillis is null then 1 else 0 end) = 0`
       )
       .run(
-        dateTimeFns.dateToInteger(rightNow),
-        dateTimeFns.dateToTimeInteger(rightNow),
+        dateToInteger(rightNow),
+        dateToTimeInteger(rightNow),
         sessionUser.userName,
         rightNow.getTime(),
         sessionUser.userName,

handlers/plates-post/doGetLicencePlates.d.ts

@@ -1,3 +1,5 @@
 /// <reference types="cookie-parser" />
 import type { Request, Response } from 'express';
+import { type GetLicencePlatesReturn } from '../../database/parkingDB/getLicencePlates.js';
+export type DoGetLicencePlatesResponse = GetLicencePlatesReturn;
 export default function handler(request: Request, response: Response): void;

handlers/plates-post/doGetLicencePlates.js

@@ -1,4 +1,4 @@
-import * as parkingDB_getLicencePlates from '../../database/parkingDB/getLicencePlates.js';
+import getLicencePlates from '../../database/parkingDB/getLicencePlates.js';
 export default function handler(request, response) {
     const queryOptions = {
         limit: Number.parseInt(request.body.limit, 10),
@@ -12,5 +12,5 @@ export default function handler(request, response) {
         queryOptions.hasUnresolvedTickets =
             request.body.hasUnresolvedTickets === '1';
     }
-    response.json(parkingDB_getLicencePlates.getLicencePlates(queryOptions));
+    response.json(getLicencePlates(queryOptions));
 }

handlers/plates-post/doGetLicencePlates.ts

@@ -1,14 +1,18 @@
 import type { Request, Response } from 'express'
 
-import * as parkingDB_getLicencePlates from '../../database/parkingDB/getLicencePlates.js'
+import getLicencePlates, {
+  type GetLicencePlatesQueryOptions,
+  type GetLicencePlatesReturn
+} from '../../database/parkingDB/getLicencePlates.js'
+
+export type DoGetLicencePlatesResponse = GetLicencePlatesReturn
 
 export default function handler(request: Request, response: Response): void {
-  const queryOptions: parkingDB_getLicencePlates.GetLicencePlatesQueryOptions =
-    {
-      limit: Number.parseInt(request.body.limit as string, 10),
-      offset: Number.parseInt(request.body.offset as string, 10),
-      licencePlateNumber: request.body.licencePlateNumber
-    }
+  const queryOptions: GetLicencePlatesQueryOptions = {
+    limit: Number.parseInt(request.body.limit as string, 10),
+    offset: Number.parseInt(request.body.offset as string, 10),
+    licencePlateNumber: request.body.licencePlateNumber
+  }
 
   if (request.body.hasOwnerRecord !== '') {
     queryOptions.hasOwnerRecord = request.body.hasOwnerRecord === '1'
@@ -19,5 +23,5 @@ export default function handler(request: Request, response: Response): void {
       request.body.hasUnresolvedTickets === '1'
   }
 
-  response.json(parkingDB_getLicencePlates.getLicencePlates(queryOptions))
+  response.json(getLicencePlates(queryOptions))
 }

handlers/tickets-post/doGetTickets.d.ts

@@ -1,3 +1,5 @@
 /// <reference types="cookie-parser" />
 import type { Request, Response } from 'express';
+import { type GetParkingTicketsReturn } from '../../database/parkingDB/getParkingTickets.js';
+export type DoGetTicketsResponse = GetParkingTicketsReturn;
 export default function handler(request: Request, response: Response): void;

handlers/tickets-post/doGetTickets.ts

@@ -1,9 +1,12 @@
 import type { Request, Response } from 'express'
 
 import getParkingTickets, {
-  type GetParkingTicketsQueryOptions
+  type GetParkingTicketsQueryOptions,
+  type GetParkingTicketsReturn
 } from '../../database/parkingDB/getParkingTickets.js'
 
+export type DoGetTicketsResponse = GetParkingTicketsReturn
+
 export default function handler(request: Request, response: Response): void {
   const queryOptions: GetParkingTicketsQueryOptions = {
     limit: Number.parseInt(request.body.limit as string, 10),

public/javascripts/mto-plateExport.js

@@ -49,7 +49,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
             licencePlateCountry: 'CA',
             licencePlateProvince: 'ON',
             licencePlateNumber: batchEntry.licencePlateNumber
-        }, (responseJSON) => {
+        }, (rawResponseJSON) => {
+            const responseJSON = rawResponseJSON;
             if (responseJSON.success) {
                 entryContainerElement.remove();
                 refreshAvailableTickets();
@@ -62,9 +63,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
     function clearBatch(clickEvent) {
         clickEvent.preventDefault();
         function clearFunction() {
-            cityssm.postJSON(pts.urlPrefix + '/plates/doClearLookupBatch', {
+            cityssm.postJSON(`${pts.urlPrefix}/plates/doClearLookupBatch`, {
                 batchId
-            }, (responseJSON) => {
+            }, (rawResponseJSON) => {
+                const responseJSON = rawResponseJSON;
                 if (responseJSON.success) {
                     populateBatchView(responseJSON.batch);
                     refreshAvailableTickets();

public/javascripts/mto-plateExport.ts

@@ -75,7 +75,7 @@ declare const pts: ptsGlobal
           // Set tombstone in available plates list
           availableTicketsList[recordIndex] = undefined
 
-          populateBatchView(responseJSON.batch)
+          populateBatchView(responseJSON.batch as LicencePlateLookupBatch)
         } else {
           buttonElement.removeAttribute('disabled')
         }
@@ -106,7 +106,8 @@ declare const pts: ptsGlobal
         licencePlateProvince: 'ON',
         licencePlateNumber: batchEntry.licencePlateNumber
       },
-      (responseJSON: { success: boolean }) => {
+      (rawResponseJSON) => {
+        const responseJSON = rawResponseJSON as { success: boolean }
         if (responseJSON.success) {
           // Remove element from list
           entryContainerElement.remove()
@@ -124,14 +125,20 @@ declare const pts: ptsGlobal
 
     function clearFunction(): void {
       cityssm.postJSON(
-        pts.urlPrefix + '/plates/doClearLookupBatch',
+        `${pts.urlPrefix}/plates/doClearLookupBatch`,
         {
           batchId
         },
-        (responseJSON: {
-          success: boolean
-          batch?: LicencePlateLookupBatch
-        }) => {
+        (rawResponseJSON) => {
+          const responseJSON = rawResponseJSON as
+            | {
+                success: true
+                batch: LicencePlateLookupBatch
+              }
+            | {
+                success: false
+              }
+
           if (responseJSON.success) {
             populateBatchView(responseJSON.batch)
             refreshAvailableTickets()

public/javascripts/plate-search.js

@@ -119,7 +119,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
       <i class="fas fa-3x fa-circle-notch fa-spin" aria-hidden="true"></i><br />
       <em>Loading licence plates...</em>
       </p>`;
-        cityssm.postJSON(`${pts.urlPrefix}/plates/doGetLicencePlates`, formElement, processPlateResultsFunction);
+        cityssm.postJSON(`${pts.urlPrefix}/plates/doGetLicencePlates`, formElement, (rawResponseJSON) => {
+            processPlateResultsFunction(rawResponseJSON);
+        });
     }
     function resetOffsetAndGetLicencePlatesFunction() {
         offsetElement.value = '0';