linting

app.ts

@@ -229,7 +229,7 @@ app.use(`${urlPrefix}/dashboard`, sessionChecker, routerDashboard)
 
 app.use(
   `${urlPrefix}/api/:apiKey`,
-  permissionHandlers.apiGetHandler as RequestHandler,
+  permissionHandlers.apiGetHandler,
   routerApi
 )
 

database/moveFee.d.ts

@@ -1,5 +1,5 @@
 export declare function moveFeeDown(feeId: number | string): Promise<boolean>;
 export declare function moveFeeDownToBottom(feeId: number | string): Promise<boolean>;
-export declare function moveFeeUp(feeId: number): Promise<boolean>;
+export declare function moveFeeUp(feeId: number | string): Promise<boolean>;
 export declare function moveFeeUpToTop(feeId: number | string): Promise<boolean>;
 export default moveFeeUp;

database/moveFee.ts

@@ -67,7 +67,7 @@ export async function moveFeeDownToBottom(
   return true
 }
 
-export async function moveFeeUp(feeId: number): Promise<boolean> {
+export async function moveFeeUp(feeId: number | string): Promise<boolean> {
   const database = await acquireConnection()
 
   const currentFee = (await getFee(feeId, database)) as Fee

database/moveOccupancyTypeField.d.ts

@@ -1,4 +1,4 @@
-export declare function moveOccupancyTypeFieldDown(occupancyTypeFieldId: number): Promise<boolean>;
-export declare function moveOccupancyTypeFieldDownToBottom(occupancyTypeFieldId: number): Promise<boolean>;
-export declare function moveOccupancyTypeFieldUp(occupancyTypeFieldId: number): Promise<boolean>;
-export declare function moveOccupancyTypeFieldUpToTop(occupancyTypeFieldId: number): Promise<boolean>;
+export declare function moveOccupancyTypeFieldDown(occupancyTypeFieldId: number | string): Promise<boolean>;
+export declare function moveOccupancyTypeFieldDownToBottom(occupancyTypeFieldId: number | string): Promise<boolean>;
+export declare function moveOccupancyTypeFieldUp(occupancyTypeFieldId: number | string): Promise<boolean>;
+export declare function moveOccupancyTypeFieldUpToTop(occupancyTypeFieldId: number | string): Promise<boolean>;

database/moveOccupancyTypeField.ts

@@ -6,7 +6,7 @@ import { acquireConnection } from './pool.js'
 import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'
 
 function getCurrentField(
-  occupancyTypeFieldId: number,
+  occupancyTypeFieldId: number | string,
   connectedDatabase: PoolConnection
 ): { occupancyTypeId?: number; orderNumber: number } {
   return connectedDatabase
@@ -22,7 +22,7 @@ function getCurrentField(
 }
 
 export async function moveOccupancyTypeFieldDown(
-  occupancyTypeFieldId: number
+  occupancyTypeFieldId: number | string
 ): Promise<boolean> {
   const database = await acquireConnection()
 
@@ -57,7 +57,7 @@ export async function moveOccupancyTypeFieldDown(
 }
 
 export async function moveOccupancyTypeFieldDownToBottom(
-  occupancyTypeFieldId: number
+  occupancyTypeFieldId: number | string
 ): Promise<boolean> {
   const database = await acquireConnection()
 
@@ -116,7 +116,7 @@ export async function moveOccupancyTypeFieldDownToBottom(
 }
 
 export async function moveOccupancyTypeFieldUp(
-  occupancyTypeFieldId: number
+  occupancyTypeFieldId: number | string
 ): Promise<boolean> {
   const database = await acquireConnection()
 
@@ -156,7 +156,7 @@ export async function moveOccupancyTypeFieldUp(
 }
 
 export async function moveOccupancyTypeFieldUpToTop(
-  occupancyTypeFieldId: number
+  occupancyTypeFieldId: number | string
 ): Promise<boolean> {
   const database = await acquireConnection()
 

database/moveRecord.d.ts

@@ -1,6 +1,6 @@
 type RecordTable = 'FeeCategories' | 'LotOccupantTypes' | 'LotStatuses' | 'LotTypes' | 'OccupancyTypes' | 'WorkOrderMilestoneTypes' | 'WorkOrderTypes';
-export declare function moveRecordDown(recordTable: RecordTable, recordId: number): Promise<boolean>;
-export declare function moveRecordDownToBottom(recordTable: RecordTable, recordId: number): Promise<boolean>;
-export declare function moveRecordUp(recordTable: RecordTable, recordId: number): Promise<boolean>;
-export declare function moveRecordUpToTop(recordTable: RecordTable, recordId: number): Promise<boolean>;
+export declare function moveRecordDown(recordTable: RecordTable, recordId: number | string): Promise<boolean>;
+export declare function moveRecordDownToBottom(recordTable: RecordTable, recordId: number | string): Promise<boolean>;
+export declare function moveRecordUp(recordTable: RecordTable, recordId: number | string): Promise<boolean>;
+export declare function moveRecordUpToTop(recordTable: RecordTable, recordId: number | string): Promise<boolean>;
 export {};

database/moveRecord.ts

@@ -33,7 +33,7 @@ function getCurrentOrderNumber(
       .prepare(
         `select orderNumber
           from ${recordTable}
-          where ${recordIdColumns.get(recordTable)!} = ?`
+          where ${recordIdColumns.get(recordTable)} = ?`
       )
       .get(recordId) as { orderNumber: number }
   ).orderNumber
@@ -43,7 +43,7 @@ function getCurrentOrderNumber(
 
 export async function moveRecordDown(
   recordTable: RecordTable,
-  recordId: number
+  recordId: number | string
 ): Promise<boolean> {
   const database = await acquireConnection()
 
@@ -78,7 +78,7 @@ export async function moveRecordDown(
 
 export async function moveRecordDownToBottom(
   recordTable: RecordTable,
-  recordId: number
+  recordId: number | string
 ): Promise<boolean> {
   const database = await acquireConnection()
 
@@ -120,7 +120,7 @@ export async function moveRecordDownToBottom(
 
 export async function moveRecordUp(
   recordTable: RecordTable,
-  recordId: number
+  recordId: number | string
 ): Promise<boolean> {
   const database = await acquireConnection()
 
@@ -160,7 +160,7 @@ export async function moveRecordUp(
 
 export async function moveRecordUpToTop(
   recordTable: RecordTable,
-  recordId: number
+  recordId: number | string
 ): Promise<boolean> {
   const database = await acquireConnection()
 

eslint.config.js

@@ -11,7 +11,7 @@ export const config = tseslint.config(...configWebApp, {
             'warn',
             {
                 cspell: {
-                    words: [...cspellWords, 'ical', 'ntfy']
+                    words: [...cspellWords, 'ical', 'preneed', 'ntfy']
                 }
             }
         ]

eslint.config.ts

@@ -12,7 +12,7 @@ export const config = tseslint.config(...configWebApp, {
       'warn',
       {
         cspell: {
-          words: [...cspellWords, 'ical', 'ntfy']
+          words: [...cspellWords, 'ical', 'preneed', 'ntfy']
         }
       }
     ]

gulpfile.js

@@ -1,5 +1,3 @@
-// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair
-/* eslint-disable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return, n/no-unpublished-import */
 import gulp from 'gulp';
 import gulpSass from 'gulp-sass';
 import * as dartSass from 'sass';

gulpfile.ts

@@ -1,6 +1,3 @@
-// eslint-disable-next-line @eslint-community/eslint-comments/disable-enable-pair
-/* eslint-disable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return, n/no-unpublished-import */
-
 import gulp from 'gulp'
 import gulpSass from 'gulp-sass'
 import * as dartSass from 'sass'

handlers/admin-post/doDeleteWorkOrderType.d.ts

@@ -1,2 +1,4 @@
 import type { Request, Response } from 'express';
-export default function handler(request: Request, response: Response): Promise<void>;
+export default function handler(request: Request<unknown, unknown, {
+    workOrderTypeId: string;
+}>, response: Response): Promise<void>;

handlers/admin-post/doDeleteWorkOrderType.ts

@@ -4,12 +4,12 @@ import { deleteRecord } from '../../database/deleteRecord.js'
 import { getWorkOrderTypes } from '../../helpers/functions.cache.js'
 
 export default async function handler(
-  request: Request,
+  request: Request<unknown, unknown, { workOrderTypeId: string }>,
   response: Response
 ): Promise<void> {
   const success = await deleteRecord(
     'WorkOrderTypes',
-    request.body.workOrderTypeId as string,
+    request.body.workOrderTypeId,
     request.session.user as User
   )
 
@@ -20,4 +20,3 @@ export default async function handler(
     workOrderTypes
   })
 }
-

handlers/admin-post/doMoveFeeCategoryDown.d.ts

@@ -1,2 +1,5 @@
 import type { Request, Response } from 'express';
-export default function handler(request: Request, response: Response): Promise<void>;
+export default function handler(request: Request<unknown, unknown, {
+    feeCategoryId: string;
+    moveToEnd: '0' | '1';
+}>, response: Response): Promise<void>;

handlers/admin-post/doMoveFeeCategoryDown.ts

@@ -7,7 +7,11 @@ import {
 } from '../../database/moveRecord.js'
 
 export default async function handler(
-  request: Request,
+  request: Request<
+    unknown,
+    unknown,
+    { feeCategoryId: string; moveToEnd: '0' | '1' }
+  >,
   response: Response
 ): Promise<void> {
   const success =

handlers/admin-post/doMoveFeeCategoryUp.d.ts

@@ -1,2 +1,5 @@
 import type { Request, Response } from 'express';
-export default function handler(request: Request, response: Response): Promise<void>;
+export default function handler(request: Request<unknown, unknown, {
+    feeCategoryId: string;
+    moveToEnd: '0' | '1';
+}>, response: Response): Promise<void>;

handlers/admin-post/doMoveFeeCategoryUp.ts

@@ -4,7 +4,7 @@ import getFeeCategories from '../../database/getFeeCategories.js'
 import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js'
 
 export default async function handler(
-  request: Request,
+  request: Request<unknown, unknown, { feeCategoryId: string; moveToEnd: '0' | '1' }>,
   response: Response
 ): Promise<void> {
   const success =

handlers/admin-post/doMoveFeeDown.d.ts

@@ -1,2 +1,5 @@
 import type { Request, Response } from 'express';
-export default function handler(request: Request, response: Response): Promise<void>;
+export default function handler(request: Request<unknown, unknown, {
+    feeId: string;
+    moveToEnd: '0' | '1';
+}>, response: Response): Promise<void>;

handlers/admin-post/doMoveFeeDown.ts

@@ -4,7 +4,7 @@ import getFeeCategories from '../../database/getFeeCategories.js'
 import { moveFeeDown, moveFeeDownToBottom } from '../../database/moveFee.js'
 
 export default async function handler(
-  request: Request,
+  request: Request<unknown, unknown, { feeId: string; moveToEnd: '0' | '1' }>,
   response: Response
 ): Promise<void> {
   const success =

handlers/admin-post/doMoveFeeUp.d.ts

@@ -1,2 +1,5 @@
 import type { Request, Response } from 'express';
-export default function handler(request: Request, response: Response): Promise<void>;
+export default function handler(request: Request<unknown, unknown, {
+    feeId: string;
+    moveToEnd: '0' | '1';
+}>, response: Response): Promise<void>;

handlers/admin-post/doMoveFeeUp.ts

@@ -4,7 +4,7 @@ import getFeeCategories from '../../database/getFeeCategories.js'
 import { moveFeeUp, moveFeeUpToTop } from '../../database/moveFee.js'
 
 export default async function handler(
-  request: Request,
+  request: Request<unknown, unknown, { feeId: string; moveToEnd: '0' | '1' }>,
   response: Response
 ): Promise<void> {
   const success =

handlers/admin-post/doMoveLotOccupantTypeDown.d.ts

@@ -1,2 +1,5 @@
 import type { Request, Response } from 'express';
-export default function handler(request: Request, response: Response): Promise<void>;
+export default function handler(request: Request<unknown, unknown, {
+    lotOccupantTypeId: string;
+    moveToEnd: '0' | '1';
+}>, response: Response): Promise<void>;

handlers/admin-post/doMoveLotOccupantTypeDown.ts

@@ -7,7 +7,11 @@ import {
 import { getLotOccupantTypes } from '../../helpers/functions.cache.js'
 
 export default async function handler(
-  request: Request,
+  request: Request<
+    unknown,
+    unknown,
+    { lotOccupantTypeId: string; moveToEnd: '0' | '1' }
+  >,
   response: Response
 ): Promise<void> {
   const success =
@@ -25,4 +29,3 @@ export default async function handler(
     lotOccupantTypes
   })
 }
-

handlers/admin-post/doMoveLotOccupantTypeUp.d.ts

@@ -1,2 +1,5 @@
 import type { Request, Response } from 'express';
-export default function handler(request: Request, response: Response): Promise<void>;
+export default function handler(request: Request<unknown, unknown, {
+    lotOccupantTypeId: string;
+    moveToEnd: '0' | '1';
+}>, response: Response): Promise<void>;

handlers/admin-post/doMoveLotOccupantTypeUp.ts

@@ -1,18 +1,22 @@
 import type { Request, Response } from 'express'
 
-import {
-  moveRecordUp,
-  moveRecordUpToTop
-} from '../../database/moveRecord.js'
+import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js'
 import { getLotOccupantTypes } from '../../helpers/functions.cache.js'
 
 export default async function handler(
-  request: Request,
+  request: Request<
+    unknown,
+    unknown,
+    { lotOccupantTypeId: string; moveToEnd: '0' | '1' }
+  >,
   response: Response
 ): Promise<void> {
   const success =
     request.body.moveToEnd === '1'
-      ? await moveRecordUpToTop('LotOccupantTypes', request.body.lotOccupantTypeId)
+      ? await moveRecordUpToTop(
+          'LotOccupantTypes',
+          request.body.lotOccupantTypeId
+        )
       : await moveRecordUp('LotOccupantTypes', request.body.lotOccupantTypeId)
 
   const lotOccupantTypes = await getLotOccupantTypes()
@@ -22,4 +26,3 @@ export default async function handler(
     lotOccupantTypes
   })
 }
-

handlers/admin-post/doMoveLotStatusDown.d.ts

@@ -1,2 +1,5 @@
 import type { Request, Response } from 'express';
-export default function handler(request: Request, response: Response): Promise<void>;
+export default function handler(request: Request<unknown, unknown, {
+    lotStatusId: string;
+    moveToEnd: '0' | '1';
+}>, response: Response): Promise<void>;

handlers/admin-post/doMoveLotStatusDown.ts

@@ -7,7 +7,11 @@ import {
 import { getLotStatuses } from '../../helpers/functions.cache.js'
 
 export default async function handler(
-  request: Request,
+  request: Request<
+    unknown,
+    unknown,
+    { lotStatusId: string; moveToEnd: '0' | '1' }
+  >,
   response: Response
 ): Promise<void> {
   const success =
@@ -22,4 +26,3 @@ export default async function handler(
     lotStatuses
   })
 }
-

handlers/admin-post/doMoveLotStatusUp.d.ts

@@ -1,2 +1,5 @@
 import type { Request, Response } from 'express';
-export default function handler(request: Request, response: Response): Promise<void>;
+export default function handler(request: Request<unknown, unknown, {
+    lotStatusId: string;
+    moveToEnd: '0' | '1';
+}>, response: Response): Promise<void>;

handlers/admin-post/doMoveLotStatusUp.ts

@@ -1,13 +1,14 @@
 import type { Request, Response } from 'express'
 
-import {
-  moveRecordUp,
-  moveRecordUpToTop
-} from '../../database/moveRecord.js'
+import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js'
 import { getLotStatuses } from '../../helpers/functions.cache.js'
 
 export default async function handler(
-  request: Request,
+  request: Request<
+    unknown,
+    unknown,
+    { lotStatusId: string; moveToEnd: '0' | '1' }
+  >,
   response: Response
 ): Promise<void> {
   const success =
@@ -22,4 +23,3 @@ export default async function handler(
     lotStatuses
   })
 }
-

handlers/admin-post/doMoveLotTypeDown.d.ts

@@ -1,2 +1,5 @@
 import type { Request, Response } from 'express';
-export default function handler(request: Request, response: Response): Promise<void>;
+export default function handler(request: Request<unknown, unknown, {
+    lotTypeId: string;
+    moveToEnd: '0' | '1';
+}>, response: Response): Promise<void>;