code cleanup

cypress/e2e/01-admin/01-bylaw-maint.cy.js

@@ -33,7 +33,7 @@ describe('Admin - Parking By-Laws', () => {
         cy.get(".modal [name='bylawNumber']")
             .invoke('val')
             .then((bylawNumber) => {
-            const newBylawDescription = 'Updated By-Law - ' + randomString();
+            const newBylawDescription = `Updated By-Law - ${randomString()}`;
             cy.get(".modal [name='bylawDescription']")
                 .clear()
                 .type(newBylawDescription);

cypress/e2e/01-admin/01-bylaw-maint.cy.ts

@@ -49,7 +49,7 @@ describe('Admin - Parking By-Laws', () => {
     cy.get(".modal [name='bylawNumber']")
       .invoke('val')
       .then((bylawNumber: string) => {
-        const newBylawDescription = 'Updated By-Law - ' + randomString()
+        const newBylawDescription = `Updated By-Law - ${randomString()}`
 
         cy.get(".modal [name='bylawDescription']")
           .clear()

cypress/support/index.d.ts

@@ -1,3 +1,3 @@
 import 'cypress-axe';
-export declare const logout: () => void;
-export declare const login: (userName: string) => void;
+export declare function logout(): void;
+export declare function login(userName: string): void;

cypress/support/index.js

@@ -1,13 +1,13 @@
 import 'cypress-axe';
-export const logout = () => {
+export function logout() {
     cy.visit('/logout');
-};
-export const login = (userName) => {
+}
+export function login(userName) {
     cy.visit('/login');
     cy.get('.message').contains('Testing', { matchCase: false });
     cy.get("form [name='userName']").type(userName);
     cy.get("form [name='password']").type(userName);
     cy.get('form').submit();
     cy.location('pathname').should('not.contain', '/login');
     cy.get('.navbar').should('have.length', 1);
-};
+}

cypress/support/index.ts

@@ -1,12 +1,10 @@
-/* eslint-disable node/no-unpublished-import */
-
 import 'cypress-axe'
 
-export const logout = () => {
+export function logout(): void {
   cy.visit('/logout')
 }
 
-export const login = (userName: string) => {
+export function login(userName: string): void {
   cy.visit('/login')
 
   cy.get('.message').contains('Testing', { matchCase: false })

cypress/support/utilities.d.ts

@@ -1 +1 @@
-export declare const randomString: () => string;
+export declare function randomString(): string;

cypress/support/utilities.js

@@ -1,3 +1,3 @@
-export const randomString = () => {
+export function randomString() {
     return Math.ceil(Math.random() * 100000).toString();
-};
+}

cypress/support/utilities.ts

@@ -1,3 +1,3 @@
-export const randomString = (): string => {
+export function randomString(): string {
   return Math.ceil(Math.random() * 100_000).toString()
 }

handlers/permissions.js

@@ -1,39 +1,46 @@
 import * as userFunctions from '../helpers/functions.user.js';
+const dashboardRedirectUrl = '/dashboard';
 export const adminGetHandler = (request, response, next) => {
     if (userFunctions.userIsAdmin(request)) {
-        return next();
+        next();
+        return;
     }
-    return response.redirect('/dashboard');
+    response.redirect(dashboardRedirectUrl);
 };
 export const adminPostHandler = (request, response, next) => {
     if (userFunctions.userIsAdmin(request)) {
-        return next();
+        next();
+        return;
     }
-    return response.json(userFunctions.forbiddenJSON);
+    response.json(userFunctions.forbiddenJSON);
 };
 export const updateGetHandler = (request, response, next) => {
     if (userFunctions.userCanUpdate(request)) {
-        return next();
+        next();
+        return;
     }
-    return response.redirect('/dashboard');
+    response.redirect(dashboardRedirectUrl);
 };
 export const updateOrOperatorGetHandler = (request, response, next) => {
     if (userFunctions.userCanUpdate(request) ||
         userFunctions.userIsOperator(request)) {
-        return next();
+        next();
+        return;
     }
-    return response.redirect('/dashboard');
+    response.redirect(dashboardRedirectUrl);
 };
 export const updatePostHandler = (request, response, next) => {
     if (userFunctions.userCanUpdate(request)) {
-        return next();
+        next();
+        return;
     }
-    return response.json(userFunctions.forbiddenJSON);
+    response.json(userFunctions.forbiddenJSON);
 };
 export const updateOrOperatorPostHandler = (request, response, next) => {
     if (userFunctions.userCanUpdate(request) ||
         userFunctions.userIsOperator(request)) {
-        return next();
+        next();
+        return;
     }
-    return response.json(userFunctions.forbiddenJSON);
+    response.json(userFunctions.forbiddenJSON);
 };

handlers/permissions.ts

@@ -2,28 +2,33 @@ import type { RequestHandler } from 'express'
 
 import * as userFunctions from '../helpers/functions.user.js'
 
+const dashboardRedirectUrl = '/dashboard'
+
 export const adminGetHandler: RequestHandler = (request, response, next) => {
   if (userFunctions.userIsAdmin(request)) {
-    return next()
+    next()
+    return
   }
 
-  return response.redirect('/dashboard')
+  response.redirect(dashboardRedirectUrl)
 }
 
 export const adminPostHandler: RequestHandler = (request, response, next) => {
   if (userFunctions.userIsAdmin(request)) {
-    return next()
+    next()
+    return
   }
 
-  return response.json(userFunctions.forbiddenJSON)
+  response.json(userFunctions.forbiddenJSON)
 }
 
 export const updateGetHandler: RequestHandler = (request, response, next) => {
   if (userFunctions.userCanUpdate(request)) {
-    return next()
+    next()
+    return
   }
 
-  return response.redirect('/dashboard')
+  response.redirect(dashboardRedirectUrl)
 }
 
 export const updateOrOperatorGetHandler: RequestHandler = (
@@ -35,18 +40,20 @@ export const updateOrOperatorGetHandler: RequestHandler = (
     userFunctions.userCanUpdate(request) ||
     userFunctions.userIsOperator(request)
   ) {
-    return next()
+    next()
+    return
   }
 
-  return response.redirect('/dashboard')
+  response.redirect(dashboardRedirectUrl)
 }
 
 export const updatePostHandler: RequestHandler = (request, response, next) => {
   if (userFunctions.userCanUpdate(request)) {
-    return next()
+    next()
+    return
   }
 
-  return response.json(userFunctions.forbiddenJSON)
+  response.json(userFunctions.forbiddenJSON)
 }
 
 export const updateOrOperatorPostHandler: RequestHandler = (
@@ -58,8 +65,9 @@ export const updateOrOperatorPostHandler: RequestHandler = (
     userFunctions.userCanUpdate(request) ||
     userFunctions.userIsOperator(request)
   ) {
-    return next()
+    next()
+    return
   }
 
-  return response.json(userFunctions.forbiddenJSON)
+  response.json(userFunctions.forbiddenJSON)
 }

handlers/reports-all/reportName.js

@@ -1,5 +1,5 @@
-import * as parkingDB_reporting from '../../database/parkingDB-reporting.js';
 import papaparse from 'papaparse';
+import * as parkingDB_reporting from '../../database/parkingDB-reporting.js';
 export const handler = (request, response) => {
     const reportName = request.params.reportName;
     const rows = parkingDB_reporting.getReportData(reportName, request.query);
@@ -8,7 +8,7 @@ export const handler = (request, response) => {
         return;
     }
     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.send(csv);
 };

handlers/reports-all/reportName.ts

@@ -1,13 +1,15 @@
 import type { RequestHandler } from 'express'
+import papaparse from 'papaparse'
 
 import * as parkingDB_reporting from '../../database/parkingDB-reporting.js'
 
-import papaparse from 'papaparse'
-
 export const handler: RequestHandler = (request, response) => {
   const reportName = request.params.reportName
 
-  const rows = parkingDB_reporting.getReportData(reportName, request.query as Record<string, string>)
+  const rows = parkingDB_reporting.getReportData(
+    reportName,
+    request.query as Record<string, string>
+  )
 
   if (!rows) {
     response.redirect('/reports/?error=reportNotAvailable')
@@ -18,7 +20,7 @@ export const handler: RequestHandler = (request, response) => {
 
   response.setHeader(
     'Content-Disposition',
-    'attachment; filename=' + reportName + '-' + Date.now().toString() + '.csv'
+    `attachment; filename=${reportName}-${Date.now().toString()}.csv`
   )
 
   response.setHeader('Content-Type', 'text/csv')

handlers/tickets-ontario-get/convict.js

@@ -1,5 +1,5 @@
-import * as parkingDB_ontario from '../../database/parkingDB-ontario.js';
 import { getConvictionBatch } from '../../database/parkingDB/getConvictionBatch.js';
+import * as parkingDB_ontario from '../../database/parkingDB-ontario.js';
 export const handler = (_request, response) => {
     const tickets = parkingDB_ontario.getParkingTicketsAvailableForMTOConvictionBatch();
     const batch = getConvictionBatch(-1);

handlers/tickets-ontario-get/convict.ts

@@ -1,8 +1,7 @@
 import type { RequestHandler } from 'express'
 
-import * as parkingDB_ontario from '../../database/parkingDB-ontario.js'
-
 import { getConvictionBatch } from '../../database/parkingDB/getConvictionBatch.js'
+import * as parkingDB_ontario from '../../database/parkingDB-ontario.js'
 
 export const handler: RequestHandler = (_request, response) => {
   const tickets =

handlers/tickets-post/doQuickReconcileMatches.js

@@ -1,14 +1,14 @@
 import { createParkingTicketStatus } from '../../database/parkingDB/createParkingTicketStatus.js';
 import { getOwnershipReconciliationRecords } from '../../database/parkingDB/getOwnershipReconciliationRecords.js';
-import * as ownerFunctions from '../../helpers/functions.owner.js';
+import { getFormattedOwnerAddress } from '../../helpers/functions.owner.js';
 export const handler = (request, response) => {
     const records = getOwnershipReconciliationRecords();
     const statusRecords = [];
     for (const record of records) {
         if (!record.isVehicleMakeMatch || !record.isLicencePlateExpiryDateMatch) {
             continue;
         }
-        const ownerAddress = ownerFunctions.getFormattedOwnerAddress(record);
+        const ownerAddress = getFormattedOwnerAddress(record);
         const statusResponse = createParkingTicketStatus({
             recordType: 'status',
             ticketID: record.ticket_ticketID,

handlers/tickets-post/doQuickReconcileMatches.ts

@@ -2,7 +2,7 @@ import type { RequestHandler } from 'express'
 
 import { createParkingTicketStatus } from '../../database/parkingDB/createParkingTicketStatus.js'
 import { getOwnershipReconciliationRecords } from '../../database/parkingDB/getOwnershipReconciliationRecords.js'
-import * as ownerFunctions from '../../helpers/functions.owner.js'
+import { getFormattedOwnerAddress } from '../../helpers/functions.owner.js'
 
 export const handler: RequestHandler = (request, response) => {
   const records = getOwnershipReconciliationRecords()
@@ -14,7 +14,7 @@ export const handler: RequestHandler = (request, response) => {
       continue
     }
 
-    const ownerAddress = ownerFunctions.getFormattedOwnerAddress(record)
+    const ownerAddress = getFormattedOwnerAddress(record)
 
     const statusResponse = createParkingTicketStatus(
       {

helpers/functions.config.d.ts

@@ -12,7 +12,7 @@ export declare function getConfigProperty(propertyName: 'parkingTickets.ticketNu
 export declare function getConfigProperty(propertyName: 'parkingTicketStatuses'): ConfigParkingTicketStatus[];
 export declare function getConfigProperty(propertyName: 'users.testing' | 'users.canLogin' | 'users.canUpdate' | 'users.isAdmin' | 'users.isOperator'): string[];
 export declare const keepAliveMillis: number;
-export declare const getParkingTicketStatus: (statusKey: string) => ConfigParkingTicketStatus | undefined;
+export declare function getParkingTicketStatus(statusKey: string): ConfigParkingTicketStatus | undefined;
 interface LicencePlateLocationProperties {
     licencePlateCountryAlias: string;
     licencePlateProvinceAlias: string;
@@ -22,5 +22,5 @@ interface LicencePlateLocationProperties {
         backgroundColor: string;
     };
 }
-export declare const getLicencePlateLocationProperties: (originalLicencePlateCountry: string, originalLicencePlateProvince: string) => LicencePlateLocationProperties;
+export declare function getLicencePlateLocationProperties(originalLicencePlateCountry: string, originalLicencePlateProvince: string): LicencePlateLocationProperties;
 export {};

helpers/functions.config.js

@@ -57,7 +57,7 @@ export const keepAliveMillis = getConfigProperty('session.doKeepAlive')
     : 0;
 const parkingTicketStatusMap = new Map();
 let parkingTicketStatusMapIsLoaded = false;
-export const getParkingTicketStatus = (statusKey) => {
+export function getParkingTicketStatus(statusKey) {
     if (!parkingTicketStatusMapIsLoaded) {
         const parkingTicketStatusList = getConfigProperty('parkingTicketStatuses');
         for (const parkingTicketStatusObject of parkingTicketStatusList) {
@@ -66,8 +66,8 @@ export const getParkingTicketStatus = (statusKey) => {
         parkingTicketStatusMapIsLoaded = true;
     }
     return parkingTicketStatusMap.get(statusKey);
-};
-export const getLicencePlateLocationProperties = (originalLicencePlateCountry, originalLicencePlateProvince) => {
+}
+export function getLicencePlateLocationProperties(originalLicencePlateCountry, originalLicencePlateProvince) {
     const licencePlateProvinceDefault = {
         provinceShortName: originalLicencePlateProvince,
         color: '#000',
@@ -79,16 +79,18 @@ export const getLicencePlateLocationProperties = (originalLicencePlateCountry, o
     let licencePlateProvinceAlias = originalLicencePlateProvince;
     if (Object.hasOwn(getConfigProperty('licencePlateProvinceAliases'), licencePlateCountryAlias)) {
         licencePlateProvinceAlias =
-            getConfigProperty('licencePlateProvinceAliases')[licencePlateCountryAlias][originalLicencePlateProvince.toUpperCase()] || originalLicencePlateProvince;
+            getConfigProperty('licencePlateProvinceAliases')[licencePlateCountryAlias][originalLicencePlateProvince.toUpperCase()] ||
+                originalLicencePlateProvince;
     }
     let licencePlateProvince = licencePlateProvinceDefault;
     if (Object.hasOwn(getConfigProperty('licencePlateProvinces'), licencePlateCountryAlias)) {
         licencePlateProvince =
-            getConfigProperty('licencePlateProvinces')[licencePlateCountryAlias].provinces[licencePlateProvinceAlias] || licencePlateProvinceDefault;
+            getConfigProperty('licencePlateProvinces')[licencePlateCountryAlias]
+                .provinces[licencePlateProvinceAlias] || licencePlateProvinceDefault;
     }
     return {
         licencePlateCountryAlias,
         licencePlateProvinceAlias,
         licencePlateProvince
     };
-};
+}