From b63d6225e15a0b82cd068ed6870f4147e13350de Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Mon, 24 Jun 2024 14:00:54 -0400 Subject: [PATCH] refactoring --- database/addLotOccupancyFee.js | 4 +- database/addLotOccupancyFee.ts | 4 +- database/addWorkOrder.js | 2 +- database/addWorkOrder.ts | 16 +++- database/copyLotOccupancy.js | 2 +- database/copyLotOccupancy.ts | 2 +- database/getFee.d.ts | 3 +- database/getFee.js | 3 +- database/getFee.ts | 4 +- database/getFeeCategories.d.ts | 4 +- database/getFeeCategories.js | 27 +++---- database/getFeeCategories.ts | 28 +++---- database/getFees.d.ts | 4 +- database/getFees.js | 3 +- database/getFees.ts | 4 +- database/getLot.d.ts | 3 +- database/getLot.js | 13 ++- database/getLot.ts | 16 ++-- database/getLotComments.d.ts | 3 +- database/getLotComments.js | 5 +- database/getLotComments.ts | 8 +- database/getLotFields.d.ts | 3 +- database/getLotFields.js | 3 +- database/getLotFields.ts | 4 +- database/getLotOccupancies.d.ts | 6 +- database/getLotOccupancies.js | 9 +-- database/getLotOccupancies.ts | 12 ++- database/getLotOccupancy.d.ts | 3 +- database/getLotOccupancy.js | 13 ++- database/getLotOccupancy.ts | 14 ++-- database/getLotOccupancyComments.d.ts | 3 +- database/getLotOccupancyComments.js | 5 +- database/getLotOccupancyComments.ts | 9 +-- database/getLotOccupancyFees.d.ts | 3 +- database/getLotOccupancyFees.js | 3 +- database/getLotOccupancyFees.ts | 4 +- database/getLotOccupancyFields.d.ts | 3 +- database/getLotOccupancyFields.js | 3 +- database/getLotOccupancyFields.ts | 4 +- database/getLotOccupancyOccupants.d.ts | 3 +- database/getLotOccupancyOccupants.js | 3 +- database/getLotOccupancyOccupants.ts | 4 +- database/getLotOccupancyTransactions.d.ts | 3 +- database/getLotOccupancyTransactions.js | 7 +- database/getLotOccupancyTransactions.ts | 8 +- database/getLotOccupantTypes.d.ts | 3 +- database/getLotOccupantTypes.js | 3 +- database/getLotOccupantTypes.ts | 6 +- database/getLotStatusSummary.d.ts | 4 +- database/getLotStatusSummary.js | 3 +- database/getLotStatusSummary.ts | 4 +- database/getLotStatuses.d.ts | 3 +- database/getLotStatuses.js | 3 +- database/getLotStatuses.ts | 4 +- database/getLotTypeFields.d.ts | 3 +- database/getLotTypeFields.js | 3 +- database/getLotTypeFields.ts | 4 +- database/getLotTypeSummary.d.ts | 4 +- database/getLotTypeSummary.js | 3 +- database/getLotTypeSummary.ts | 4 +- database/getLotTypes.d.ts | 3 +- database/getLotTypes.js | 5 +- database/getLotTypes.ts | 6 +- database/getLots.d.ts | 4 +- database/getLots.js | 21 +++-- database/getLots.ts | 22 +++-- database/getMap.d.ts | 3 +- database/getMap.js | 3 +- database/getMap.ts | 4 +- database/getMaps.d.ts | 3 +- database/getMaps.js | 3 +- database/getMaps.ts | 4 +- database/getNextLotId.d.ts | 3 +- database/getNextLotId.js | 3 +- database/getNextLotId.ts | 4 +- database/getNextMapId.d.ts | 3 +- database/getNextMapId.js | 3 +- database/getNextMapId.ts | 4 +- database/getNextWorkOrderNumber.d.ts | 3 +- database/getNextWorkOrderNumber.js | 3 +- database/getNextWorkOrderNumber.ts | 6 +- database/getOccupancyTypeFields.d.ts | 3 +- database/getOccupancyTypeFields.js | 21 +++-- database/getOccupancyTypeFields.ts | 24 +++--- database/getOccupancyTypePrints.d.ts | 3 +- database/getOccupancyTypePrints.js | 3 +- database/getOccupancyTypePrints.ts | 5 +- database/getOccupancyTypes.d.ts | 3 +- database/getOccupancyTypes.js | 7 +- database/getOccupancyTypes.ts | 7 +- database/getPastLotOccupancyOccupants.d.ts | 4 +- database/getPastLotOccupancyOccupants.js | 3 +- database/getPastLotOccupancyOccupants.ts | 4 +- database/getPreviousLotId.d.ts | 3 +- database/getPreviousLotId.js | 3 +- database/getPreviousLotId.ts | 4 +- database/getPreviousMapId.d.ts | 3 +- database/getPreviousMapId.js | 3 +- database/getPreviousMapId.ts | 4 +- database/getReportData.d.ts | 3 +- database/getReportData.js | 3 +- database/getReportData.ts | 5 +- database/getWorkOrder.d.ts | 4 +- database/getWorkOrder.js | 11 ++- database/getWorkOrder.ts | 12 ++- database/getWorkOrderComments.d.ts | 3 +- database/getWorkOrderComments.js | 5 +- database/getWorkOrderComments.ts | 8 +- database/getWorkOrderMilestoneTypes.d.ts | 3 +- database/getWorkOrderMilestoneTypes.js | 3 +- database/getWorkOrderMilestoneTypes.ts | 4 +- database/getWorkOrderMilestones.d.ts | 4 +- database/getWorkOrderMilestones.js | 18 ++--- database/getWorkOrderMilestones.ts | 19 ++--- database/getWorkOrderTypes.d.ts | 3 +- database/getWorkOrderTypes.js | 3 +- database/getWorkOrderTypes.ts | 4 +- database/getWorkOrders.js | 8 +- database/getWorkOrders.ts | 11 +-- database/moveFee.js | 2 +- database/moveFee.ts | 2 +- database/updateWorkOrderComment.d.ts | 2 +- database/updateWorkOrderComment.ts | 2 +- database/updateWorkOrderMilestone.d.ts | 5 +- database/updateWorkOrderMilestone.js | 3 +- database/updateWorkOrderMilestone.ts | 6 +- handlers/admin-get/fees.js | 2 +- handlers/admin-get/fees.ts | 2 +- handlers/admin-get/occupancyTypes.js | 4 +- handlers/admin-get/occupancyTypes.ts | 4 +- handlers/admin-post/doAddFee.js | 2 +- handlers/admin-post/doAddFee.ts | 2 +- handlers/admin-post/doAddFeeCategory.js | 2 +- handlers/admin-post/doAddFeeCategory.ts | 2 +- handlers/admin-post/doDeleteFee.js | 2 +- handlers/admin-post/doDeleteFee.ts | 2 +- handlers/admin-post/doDeleteFeeCategory.js | 2 +- handlers/admin-post/doDeleteFeeCategory.ts | 2 +- handlers/admin-post/doMoveFeeCategoryDown.js | 2 +- handlers/admin-post/doMoveFeeCategoryDown.ts | 9 ++- handlers/admin-post/doMoveFeeCategoryUp.js | 2 +- handlers/admin-post/doMoveFeeCategoryUp.ts | 8 +- handlers/admin-post/doMoveFeeDown.js | 2 +- handlers/admin-post/doMoveFeeDown.ts | 9 +-- handlers/admin-post/doMoveFeeUp.js | 2 +- handlers/admin-post/doMoveFeeUp.ts | 9 +-- handlers/admin-post/doUpdateFee.js | 2 +- handlers/admin-post/doUpdateFee.ts | 3 +- handlers/admin-post/doUpdateFeeCategory.js | 2 +- handlers/admin-post/doUpdateFeeCategory.ts | 3 +- handlers/api-get/milestoneICS.js | 2 +- handlers/api-get/milestoneICS.ts | 5 +- handlers/dashboard-get/dashboard.js | 4 +- handlers/dashboard-get/dashboard.ts | 5 +- handlers/lotOccupancies-get/edit.js | 4 +- handlers/lotOccupancies-get/edit.ts | 4 +- handlers/lotOccupancies-get/new.js | 4 +- handlers/lotOccupancies-get/new.ts | 4 +- handlers/lotOccupancies-get/search.js | 2 +- handlers/lotOccupancies-get/search.ts | 2 +- handlers/lotOccupancies-get/view.js | 2 +- handlers/lotOccupancies-get/view.ts | 2 +- .../doAddLotOccupancyComment.js | 2 +- .../doAddLotOccupancyComment.ts | 3 +- .../doAddLotOccupancyFee.js | 2 +- .../doAddLotOccupancyFee.ts | 3 +- .../doAddLotOccupancyOccupant.js | 2 +- .../doAddLotOccupancyOccupant.ts | 3 +- .../doAddLotOccupancyTransaction.js | 2 +- .../doAddLotOccupancyTransaction.ts | 3 +- .../doDeleteLotOccupancyComment.js | 2 +- .../doDeleteLotOccupancyComment.ts | 3 +- .../doDeleteLotOccupancyFee.js | 2 +- .../doDeleteLotOccupancyFee.ts | 7 +- .../doDeleteLotOccupancyOccupant.js | 2 +- .../doDeleteLotOccupancyOccupant.ts | 3 +- .../doDeleteLotOccupancyTransaction.js | 2 +- .../doDeleteLotOccupancyTransaction.ts | 3 +- handlers/lotOccupancies-post/doGetFees.js | 4 +- handlers/lotOccupancies-post/doGetFees.ts | 6 +- .../doSearchLotOccupancies.js | 2 +- .../doSearchLotOccupancies.ts | 3 +- .../doSearchPastOccupants.js | 2 +- .../doSearchPastOccupants.ts | 3 +- .../doUpdateLotOccupancyComment.js | 2 +- .../doUpdateLotOccupancyComment.ts | 8 +- .../doUpdateLotOccupancyFeeQuantity.js | 2 +- .../doUpdateLotOccupancyFeeQuantity.ts | 3 +- .../doUpdateLotOccupancyOccupant.js | 2 +- .../doUpdateLotOccupancyOccupant.ts | 8 +- .../doUpdateLotOccupancyTransaction.js | 2 +- .../doUpdateLotOccupancyTransaction.ts | 8 +- handlers/lots-get/edit.js | 4 +- handlers/lots-get/edit.ts | 4 +- handlers/lots-get/new.js | 2 +- handlers/lots-get/new.ts | 2 +- handlers/lots-get/search.js | 2 +- handlers/lots-get/search.ts | 2 +- handlers/lots-get/view.js | 2 +- handlers/lots-get/view.ts | 2 +- handlers/lots-post/doAddLotComment.js | 2 +- handlers/lots-post/doAddLotComment.ts | 3 +- handlers/lots-post/doDeleteLotComment.js | 2 +- handlers/lots-post/doDeleteLotComment.ts | 7 +- handlers/lots-post/doSearchLots.js | 2 +- handlers/lots-post/doSearchLots.ts | 2 +- handlers/lots-post/doUpdateLotComment.js | 2 +- handlers/lots-post/doUpdateLotComment.ts | 10 ++- handlers/maps-get/edit.js | 6 +- handlers/maps-get/edit.ts | 6 +- handlers/maps-get/next.js | 2 +- handlers/maps-get/next.ts | 2 +- handlers/maps-get/previous.js | 2 +- handlers/maps-get/previous.ts | 2 +- handlers/maps-get/search.js | 2 +- handlers/maps-get/search.ts | 2 +- handlers/maps-get/view.js | 6 +- handlers/maps-get/view.ts | 6 +- handlers/permissions.d.ts | 2 +- handlers/permissions.js | 4 +- handlers/permissions.ts | 6 +- handlers/print-get/pdf.js | 4 +- handlers/print-get/pdf.ts | 4 +- handlers/reports-get/reportName.js | 2 +- handlers/reports-get/reportName.ts | 9 ++- handlers/reports-get/search.js | 2 +- handlers/reports-get/search.ts | 8 +- handlers/workOrders-get/edit.js | 2 +- handlers/workOrders-get/edit.ts | 2 +- handlers/workOrders-get/view.js | 2 +- handlers/workOrders-get/view.ts | 2 +- .../workOrders-post/doAddWorkOrderComment.js | 2 +- .../workOrders-post/doAddWorkOrderComment.ts | 7 +- handlers/workOrders-post/doAddWorkOrderLot.js | 2 +- handlers/workOrders-post/doAddWorkOrderLot.ts | 9 +-- .../doAddWorkOrderLotOccupancy.js | 2 +- .../doAddWorkOrderLotOccupancy.ts | 9 +-- .../doAddWorkOrderMilestone.js | 2 +- .../doAddWorkOrderMilestone.ts | 5 +- .../doCompleteWorkOrderMilestone.js | 2 +- .../doCompleteWorkOrderMilestone.ts | 7 +- .../doDeleteWorkOrderComment.js | 2 +- .../doDeleteWorkOrderComment.ts | 9 ++- .../workOrders-post/doDeleteWorkOrderLot.js | 2 +- .../workOrders-post/doDeleteWorkOrderLot.ts | 9 +-- .../doDeleteWorkOrderLotOccupancy.js | 2 +- .../doDeleteWorkOrderLotOccupancy.ts | 8 +- .../doDeleteWorkOrderMilestone.js | 2 +- .../doDeleteWorkOrderMilestone.ts | 7 +- .../doGetWorkOrderMilestones.js | 2 +- .../doGetWorkOrderMilestones.ts | 3 +- .../doReopenWorkOrderMilestone.js | 2 +- .../doReopenWorkOrderMilestone.ts | 5 +- handlers/workOrders-post/doUpdateLotStatus.js | 2 +- handlers/workOrders-post/doUpdateLotStatus.ts | 9 +-- .../doUpdateWorkOrderComment.js | 2 +- .../doUpdateWorkOrderComment.ts | 17 ++-- .../doUpdateWorkOrderMilestone.js | 4 +- .../doUpdateWorkOrderMilestone.ts | 14 ++-- helpers/functions.cache.d.ts | 38 ++++----- helpers/functions.cache.js | 14 ++-- helpers/functions.cache.ts | 80 ++++++++++--------- helpers/functions.print.js | 10 +-- helpers/functions.print.ts | 12 +-- temp/legacy.importFromCSV.js | 8 +- temp/legacy.importFromCSV.ts | 9 +-- 266 files changed, 620 insertions(+), 774 deletions(-) diff --git a/database/addLotOccupancyFee.js b/database/addLotOccupancyFee.js index dd9dd80e..0c5d3a66 100644 --- a/database/addLotOccupancyFee.js +++ b/database/addLotOccupancyFee.js @@ -1,6 +1,6 @@ import { calculateFeeAmount, calculateTaxAmount } from '../helpers/functions.fee.js'; -import { getFee } from './getFee.js'; -import { getLotOccupancy } from './getLotOccupancy.js'; +import getFee from './getFee.js'; +import getLotOccupancy from './getLotOccupancy.js'; import { acquireConnection } from './pool.js'; export default async function addLotOccupancyFee(lotOccupancyFeeForm, user) { const database = await acquireConnection(); diff --git a/database/addLotOccupancyFee.ts b/database/addLotOccupancyFee.ts index ccb3e9c6..760b8f4f 100644 --- a/database/addLotOccupancyFee.ts +++ b/database/addLotOccupancyFee.ts @@ -4,8 +4,8 @@ import { } from '../helpers/functions.fee.js' import type { Fee, LotOccupancy } from '../types/recordTypes.js' -import { getFee } from './getFee.js' -import { getLotOccupancy } from './getLotOccupancy.js' +import getFee from './getFee.js' +import getLotOccupancy from './getLotOccupancy.js' import { acquireConnection } from './pool.js' export interface AddLotOccupancyFeeForm { diff --git a/database/addWorkOrder.js b/database/addWorkOrder.js index 7d4d5ade..73d2d5c4 100644 --- a/database/addWorkOrder.js +++ b/database/addWorkOrder.js @@ -1,6 +1,6 @@ import { dateStringToInteger, dateToInteger } from '@cityssm/utils-datetime'; import addWorkOrderLotOccupancy from './addWorkOrderLotOccupancy.js'; -import { getNextWorkOrderNumber } from './getNextWorkOrderNumber.js'; +import getNextWorkOrderNumber from './getNextWorkOrderNumber.js'; import { acquireConnection } from './pool.js'; export default async function addWorkOrder(workOrderForm, user) { const database = await acquireConnection(); diff --git a/database/addWorkOrder.ts b/database/addWorkOrder.ts index 7bbea640..983375e4 100644 --- a/database/addWorkOrder.ts +++ b/database/addWorkOrder.ts @@ -1,7 +1,11 @@ -import { dateStringToInteger, dateToInteger } from '@cityssm/utils-datetime' +import { + type DateString, + dateStringToInteger, + dateToInteger +} from '@cityssm/utils-datetime' import addWorkOrderLotOccupancy from './addWorkOrderLotOccupancy.js' -import { getNextWorkOrderNumber } from './getNextWorkOrderNumber.js' +import getNextWorkOrderNumber from './getNextWorkOrderNumber.js' import { acquireConnection } from './pool.js' export interface AddWorkOrderForm { @@ -42,10 +46,14 @@ export default async function addWorkOrder( workOrderForm.workOrderDescription, (workOrderForm.workOrderOpenDateString ?? '') === '' ? dateToInteger(rightNow) - : dateStringToInteger(workOrderForm.workOrderOpenDateString!), + : dateStringToInteger( + workOrderForm.workOrderOpenDateString as DateString + ), (workOrderForm.workOrderCloseDateString ?? '') === '' ? undefined - : dateStringToInteger(workOrderForm.workOrderCloseDateString!), + : dateStringToInteger( + workOrderForm.workOrderCloseDateString as DateString + ), user.userName, rightNow.getTime(), user.userName, diff --git a/database/copyLotOccupancy.js b/database/copyLotOccupancy.js index d817ab41..2ac61275 100644 --- a/database/copyLotOccupancy.js +++ b/database/copyLotOccupancy.js @@ -1,7 +1,7 @@ import { dateToString } from '@cityssm/utils-datetime'; import addLotOccupancy from './addLotOccupancy.js'; import addLotOccupancyOccupant from './addLotOccupancyOccupant.js'; -import { getLotOccupancy } from './getLotOccupancy.js'; +import getLotOccupancy from './getLotOccupancy.js'; import { acquireConnection } from './pool.js'; export default async function copyLotOccupancy(oldLotOccupancyId, user) { const database = await acquireConnection(); diff --git a/database/copyLotOccupancy.ts b/database/copyLotOccupancy.ts index e067f6c9..02982968 100644 --- a/database/copyLotOccupancy.ts +++ b/database/copyLotOccupancy.ts @@ -2,7 +2,7 @@ import { dateToString } from '@cityssm/utils-datetime' import addLotOccupancy from './addLotOccupancy.js' import addLotOccupancyOccupant from './addLotOccupancyOccupant.js' -import { getLotOccupancy } from './getLotOccupancy.js' +import getLotOccupancy from './getLotOccupancy.js' import { acquireConnection } from './pool.js' export default async function copyLotOccupancy( diff --git a/database/getFee.d.ts b/database/getFee.d.ts index 1f5e3c25..3d632de0 100644 --- a/database/getFee.d.ts +++ b/database/getFee.d.ts @@ -1,4 +1,3 @@ import type { PoolConnection } from 'better-sqlite-pool'; import type { Fee } from '../types/recordTypes.js'; -export declare function getFee(feeId: number | string, connectedDatabase?: PoolConnection): Promise; -export default getFee; +export default function getFee(feeId: number | string, connectedDatabase?: PoolConnection): Promise; diff --git a/database/getFee.js b/database/getFee.js index 0cc360e8..bbde8a5d 100644 --- a/database/getFee.js +++ b/database/getFee.js @@ -1,5 +1,5 @@ import { acquireConnection } from './pool.js'; -export async function getFee(feeId, connectedDatabase) { +export default async function getFee(feeId, connectedDatabase) { const database = connectedDatabase ?? (await acquireConnection()); const fee = database .prepare(`select f.feeId, @@ -23,4 +23,3 @@ export async function getFee(feeId, connectedDatabase) { } return fee; } -export default getFee; diff --git a/database/getFee.ts b/database/getFee.ts index 6f675fa9..596f4c1b 100644 --- a/database/getFee.ts +++ b/database/getFee.ts @@ -4,7 +4,7 @@ import type { Fee } from '../types/recordTypes.js' import { acquireConnection } from './pool.js' -export async function getFee( +export default async function getFee( feeId: number | string, connectedDatabase?: PoolConnection ): Promise { @@ -36,5 +36,3 @@ export async function getFee( return fee } - -export default getFee diff --git a/database/getFeeCategories.d.ts b/database/getFeeCategories.d.ts index 42e3ae16..78f7cd85 100644 --- a/database/getFeeCategories.d.ts +++ b/database/getFeeCategories.d.ts @@ -6,5 +6,5 @@ interface GetFeeCategoriesFilters { interface GetFeeCategoriesOptions { includeFees?: boolean; } -export declare function getFeeCategories(filters: GetFeeCategoriesFilters, options: GetFeeCategoriesOptions): Promise; -export default getFeeCategories; +export default function getFeeCategories(filters: GetFeeCategoriesFilters, options: GetFeeCategoriesOptions): Promise; +export {}; diff --git a/database/getFeeCategories.js b/database/getFeeCategories.js index 713992e3..ce0ab05e 100644 --- a/database/getFeeCategories.js +++ b/database/getFeeCategories.js @@ -1,32 +1,26 @@ -import { getFees } from './getFees.js'; +import getFees from './getFees.js'; import { acquireConnection } from './pool.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export async function getFeeCategories(filters, options) { +export default async function getFeeCategories(filters, options) { const updateOrderNumbers = !(filters.lotTypeId || filters.occupancyTypeId) && options.includeFees; const database = await acquireConnection(); let sqlWhereClause = ' where recordDelete_timeMillis is null'; const sqlParameters = []; if ((filters.occupancyTypeId ?? '') !== '') { - sqlWhereClause += - ' and feeCategoryId in (' + - 'select feeCategoryId from Fees' + - ' where recordDelete_timeMillis is null' + - ' and (occupancyTypeId is null or occupancyTypeId = ?))'; + sqlWhereClause += ` and feeCategoryId in ( + select feeCategoryId from Fees where recordDelete_timeMillis is null and (occupancyTypeId is null or occupancyTypeId = ?))`; sqlParameters.push(filters.occupancyTypeId); } if ((filters.lotTypeId ?? '') !== '') { - sqlWhereClause += - ' and feeCategoryId in (' + - 'select feeCategoryId from Fees' + - ' where recordDelete_timeMillis is null' + - ' and (lotTypeId is null or lotTypeId = ?))'; + sqlWhereClause += ` and feeCategoryId in ( + select feeCategoryId from Fees where recordDelete_timeMillis is null and (lotTypeId is null or lotTypeId = ?))`; sqlParameters.push(filters.lotTypeId); } const feeCategories = database - .prepare('select feeCategoryId, feeCategory, orderNumber' + - ' from FeeCategories' + - sqlWhereClause + - ' order by orderNumber, feeCategory') + .prepare(`select feeCategoryId, feeCategory, orderNumber + from FeeCategories + ${sqlWhereClause} + order by orderNumber, feeCategory`) .all(sqlParameters); if (options.includeFees ?? false) { let expectedOrderNumber = 0; @@ -43,4 +37,3 @@ export async function getFeeCategories(filters, options) { database.release(); return feeCategories; } -export default getFeeCategories; diff --git a/database/getFeeCategories.ts b/database/getFeeCategories.ts index 8c60b4de..ca031a0a 100644 --- a/database/getFeeCategories.ts +++ b/database/getFeeCategories.ts @@ -1,6 +1,6 @@ import type { FeeCategory } from '../types/recordTypes.js' -import { getFees } from './getFees.js' +import getFees from './getFees.js' import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' @@ -13,7 +13,7 @@ interface GetFeeCategoriesOptions { includeFees?: boolean } -export async function getFeeCategories( +export default async function getFeeCategories( filters: GetFeeCategoriesFilters, options: GetFeeCategoriesOptions ): Promise { @@ -27,31 +27,25 @@ export async function getFeeCategories( const sqlParameters: unknown[] = [] if ((filters.occupancyTypeId ?? '') !== '') { - sqlWhereClause += - ' and feeCategoryId in (' + - 'select feeCategoryId from Fees' + - ' where recordDelete_timeMillis is null' + - ' and (occupancyTypeId is null or occupancyTypeId = ?))' + sqlWhereClause += ` and feeCategoryId in ( + select feeCategoryId from Fees where recordDelete_timeMillis is null and (occupancyTypeId is null or occupancyTypeId = ?))` sqlParameters.push(filters.occupancyTypeId) } if ((filters.lotTypeId ?? '') !== '') { - sqlWhereClause += - ' and feeCategoryId in (' + - 'select feeCategoryId from Fees' + - ' where recordDelete_timeMillis is null' + - ' and (lotTypeId is null or lotTypeId = ?))' + sqlWhereClause += ` and feeCategoryId in ( + select feeCategoryId from Fees where recordDelete_timeMillis is null and (lotTypeId is null or lotTypeId = ?))` sqlParameters.push(filters.lotTypeId) } const feeCategories = database .prepare( - 'select feeCategoryId, feeCategory, orderNumber' + - ' from FeeCategories' + - sqlWhereClause + - ' order by orderNumber, feeCategory' + `select feeCategoryId, feeCategory, orderNumber + from FeeCategories + ${sqlWhereClause} + order by orderNumber, feeCategory` ) .all(sqlParameters) as FeeCategory[] @@ -87,5 +81,3 @@ export async function getFeeCategories( return feeCategories } - -export default getFeeCategories diff --git a/database/getFees.d.ts b/database/getFees.d.ts index 9fad94c8..41e3583f 100644 --- a/database/getFees.d.ts +++ b/database/getFees.d.ts @@ -4,5 +4,5 @@ interface GetFeesFilters { occupancyTypeId?: number | string; lotTypeId?: number | string; } -export declare function getFees(feeCategoryId: number, additionalFilters: GetFeesFilters, connectedDatabase?: PoolConnection): Promise; -export default getFees; +export default function getFees(feeCategoryId: number, additionalFilters: GetFeesFilters, connectedDatabase?: PoolConnection): Promise; +export {}; diff --git a/database/getFees.js b/database/getFees.js index 1b3f5823..aeb784a5 100644 --- a/database/getFees.js +++ b/database/getFees.js @@ -1,6 +1,6 @@ import { acquireConnection } from './pool.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export async function getFees(feeCategoryId, additionalFilters, connectedDatabase) { +export default async function getFees(feeCategoryId, additionalFilters, connectedDatabase) { const updateOrderNumbers = !(additionalFilters.lotTypeId || additionalFilters.occupancyTypeId); const database = connectedDatabase ?? (await acquireConnection()); let sqlWhereClause = ' where f.recordDelete_timeMillis is null and f.feeCategoryId = ?'; @@ -52,4 +52,3 @@ export async function getFees(feeCategoryId, additionalFilters, connectedDatabas } return fees; } -export default getFees; diff --git a/database/getFees.ts b/database/getFees.ts index 6b16c492..1f204eed 100644 --- a/database/getFees.ts +++ b/database/getFees.ts @@ -10,7 +10,7 @@ interface GetFeesFilters { lotTypeId?: number | string } -export async function getFees( +export default async function getFees( feeCategoryId: number, additionalFilters: GetFeesFilters, connectedDatabase?: PoolConnection @@ -89,5 +89,3 @@ export async function getFees( return fees } - -export default getFees diff --git a/database/getLot.d.ts b/database/getLot.d.ts index 8170bc3f..5ef6a0fb 100644 --- a/database/getLot.d.ts +++ b/database/getLot.d.ts @@ -1,4 +1,3 @@ import type { Lot } from '../types/recordTypes.js'; export declare function getLotByLotName(lotName: string): Promise; -export declare function getLot(lotId: number | string): Promise; -export default getLot; +export default function getLot(lotId: number | string): Promise; diff --git a/database/getLot.js b/database/getLot.js index 62920b63..868208fb 100644 --- a/database/getLot.js +++ b/database/getLot.js @@ -1,6 +1,6 @@ -import { getLotComments } from './getLotComments.js'; -import { getLotFields } from './getLotFields.js'; -import { getLotOccupancies } from './getLotOccupancies.js'; +import getLotComments from './getLotComments.js'; +import getLotFields from './getLotFields.js'; +import getLotOccupancies from './getLotOccupancies.js'; import { acquireConnection } from './pool.js'; const baseSQL = `select l.lotId, l.lotTypeId, t.lotType, l.lotName, l.lotStatusId, s.lotStatus, l.mapId, m.mapName, m.mapSVG, l.mapKey, @@ -31,9 +31,8 @@ async function _getLot(sql, lotIdOrLotName) { return lot; } export async function getLotByLotName(lotName) { - return await _getLot(baseSQL + ' and l.lotName = ?', lotName); + return await _getLot(`${baseSQL} and l.lotName = ?`, lotName); } -export async function getLot(lotId) { - return await _getLot(baseSQL + ' and l.lotId = ?', lotId); +export default async function getLot(lotId) { + return await _getLot(`${baseSQL} and l.lotId = ?`, lotId); } -export default getLot; diff --git a/database/getLot.ts b/database/getLot.ts index 3b674f87..9ff9c53b 100644 --- a/database/getLot.ts +++ b/database/getLot.ts @@ -1,8 +1,8 @@ import type { Lot } from '../types/recordTypes.js' -import { getLotComments } from './getLotComments.js' -import { getLotFields } from './getLotFields.js' -import { getLotOccupancies } from './getLotOccupancies.js' +import getLotComments from './getLotComments.js' +import getLotFields from './getLotFields.js' +import getLotOccupancies from './getLotOccupancies.js' import { acquireConnection } from './pool.js' const baseSQL = `select l.lotId, l.lotTypeId, t.lotType, l.lotName, l.lotStatusId, s.lotStatus, @@ -52,11 +52,11 @@ async function _getLot( export async function getLotByLotName( lotName: string ): Promise { - return await _getLot(baseSQL + ' and l.lotName = ?', lotName) + return await _getLot(`${baseSQL} and l.lotName = ?`, lotName) } -export async function getLot(lotId: number | string): Promise { - return await _getLot(baseSQL + ' and l.lotId = ?', lotId) +export default async function getLot( + lotId: number | string +): Promise { + return await _getLot(`${baseSQL} and l.lotId = ?`, lotId) } - -export default getLot diff --git a/database/getLotComments.d.ts b/database/getLotComments.d.ts index e6b759a8..e9645dd8 100644 --- a/database/getLotComments.d.ts +++ b/database/getLotComments.d.ts @@ -1,4 +1,3 @@ import type { PoolConnection } from 'better-sqlite-pool'; import type { LotComment } from '../types/recordTypes.js'; -export declare function getLotComments(lotId: number | string, connectedDatabase?: PoolConnection): Promise; -export default getLotComments; +export default function getLotComments(lotId: number | string, connectedDatabase?: PoolConnection): Promise; diff --git a/database/getLotComments.js b/database/getLotComments.js index 8f8eca12..b52f9f28 100644 --- a/database/getLotComments.js +++ b/database/getLotComments.js @@ -1,6 +1,6 @@ -import { dateIntegerToString, timeIntegerToString, timeIntegerToPeriodString } from '@cityssm/utils-datetime'; +import { dateIntegerToString, timeIntegerToPeriodString, timeIntegerToString } from '@cityssm/utils-datetime'; import { acquireConnection } from './pool.js'; -export async function getLotComments(lotId, connectedDatabase) { +export default async function getLotComments(lotId, connectedDatabase) { const database = connectedDatabase ?? (await acquireConnection()); database.function('userFn_dateIntegerToString', dateIntegerToString); database.function('userFn_timeIntegerToString', timeIntegerToString); @@ -23,4 +23,3 @@ export async function getLotComments(lotId, connectedDatabase) { } return lotComments; } -export default getLotComments; diff --git a/database/getLotComments.ts b/database/getLotComments.ts index 3165b984..e3127439 100644 --- a/database/getLotComments.ts +++ b/database/getLotComments.ts @@ -1,7 +1,7 @@ import { dateIntegerToString, - timeIntegerToString, - timeIntegerToPeriodString + timeIntegerToPeriodString, + timeIntegerToString } from '@cityssm/utils-datetime' import type { PoolConnection } from 'better-sqlite-pool' @@ -9,7 +9,7 @@ import type { LotComment } from '../types/recordTypes.js' import { acquireConnection } from './pool.js' -export async function getLotComments( +export default async function getLotComments( lotId: number | string, connectedDatabase?: PoolConnection ): Promise { @@ -44,5 +44,3 @@ export async function getLotComments( return lotComments } - -export default getLotComments diff --git a/database/getLotFields.d.ts b/database/getLotFields.d.ts index 8603a973..78b021fa 100644 --- a/database/getLotFields.d.ts +++ b/database/getLotFields.d.ts @@ -1,4 +1,3 @@ import type { PoolConnection } from 'better-sqlite-pool'; import type { LotField } from '../types/recordTypes.js'; -export declare function getLotFields(lotId: number | string, connectedDatabase?: PoolConnection): Promise; -export default getLotFields; +export default function getLotFields(lotId: number | string, connectedDatabase?: PoolConnection): Promise; diff --git a/database/getLotFields.js b/database/getLotFields.js index be1302cd..3421a8f1 100644 --- a/database/getLotFields.js +++ b/database/getLotFields.js @@ -1,5 +1,5 @@ import { acquireConnection } from './pool.js'; -export async function getLotFields(lotId, connectedDatabase) { +export default async function getLotFields(lotId, connectedDatabase) { const database = connectedDatabase ?? (await acquireConnection()); const lotFields = database .prepare(`select l.lotId, l.lotTypeFieldId, @@ -34,4 +34,3 @@ export async function getLotFields(lotId, connectedDatabase) { } return lotFields; } -export default getLotFields; diff --git a/database/getLotFields.ts b/database/getLotFields.ts index 3479dfe5..fd53e074 100644 --- a/database/getLotFields.ts +++ b/database/getLotFields.ts @@ -4,7 +4,7 @@ import type { LotField } from '../types/recordTypes.js' import { acquireConnection } from './pool.js' -export async function getLotFields( +export default async function getLotFields( lotId: number | string, connectedDatabase?: PoolConnection ): Promise { @@ -47,5 +47,3 @@ export async function getLotFields( return lotFields } - -export default getLotFields diff --git a/database/getLotOccupancies.d.ts b/database/getLotOccupancies.d.ts index a3d4332c..0fa4579b 100644 --- a/database/getLotOccupancies.d.ts +++ b/database/getLotOccupancies.d.ts @@ -1,4 +1,4 @@ -import { DateString } from '@cityssm/utils-datetime'; +import { type DateString } from '@cityssm/utils-datetime'; import type { PoolConnection } from 'better-sqlite-pool'; import type { LotOccupancy } from '../types/recordTypes.js'; interface GetLotOccupanciesFilters { @@ -22,8 +22,8 @@ interface GetLotOccupanciesOptions { includeFees: boolean; includeTransactions: boolean; } -export declare function getLotOccupancies(filters: GetLotOccupanciesFilters, options: GetLotOccupanciesOptions, connectedDatabase?: PoolConnection): Promise<{ +export default function getLotOccupancies(filters: GetLotOccupanciesFilters, options: GetLotOccupanciesOptions, connectedDatabase?: PoolConnection): Promise<{ count: number; lotOccupancies: LotOccupancy[]; }>; -export default getLotOccupancies; +export {}; diff --git a/database/getLotOccupancies.js b/database/getLotOccupancies.js index 80c1cf70..bf2541ca 100644 --- a/database/getLotOccupancies.js +++ b/database/getLotOccupancies.js @@ -2,9 +2,9 @@ import { dateIntegerToString, dateStringToInteger } from '@cityssm/utils-datetim import { getOccupancyTypeById } from '../helpers/functions.cache.js'; import { getConfigProperty } from '../helpers/functions.config.js'; import { getLotNameWhereClause, getOccupancyTimeWhereClause, getOccupantNameWhereClause } from '../helpers/functions.sqlFilters.js'; -import { getLotOccupancyFees } from './getLotOccupancyFees.js'; -import { getLotOccupancyOccupants } from './getLotOccupancyOccupants.js'; -import { getLotOccupancyTransactions } from './getLotOccupancyTransactions.js'; +import getLotOccupancyFees from './getLotOccupancyFees.js'; +import getLotOccupancyOccupants from './getLotOccupancyOccupants.js'; +import getLotOccupancyTransactions from './getLotOccupancyTransactions.js'; import { acquireConnection } from './pool.js'; function buildWhereClause(filters) { let sqlWhereClause = ' where o.recordDelete_timeMillis is null'; @@ -77,7 +77,7 @@ async function addInclusions(lotOccupancy, options, database) { } return lotOccupancy; } -export async function getLotOccupancies(filters, options, connectedDatabase) { +export default async function getLotOccupancies(filters, options, connectedDatabase) { const database = connectedDatabase ?? (await acquireConnection()); database.function('userFn_dateIntegerToString', dateIntegerToString); const { sqlWhereClause, sqlParameters } = buildWhereClause(filters); @@ -130,4 +130,3 @@ export async function getLotOccupancies(filters, options, connectedDatabase) { lotOccupancies }; } -export default getLotOccupancies; diff --git a/database/getLotOccupancies.ts b/database/getLotOccupancies.ts index 7b9ca534..604dc7b8 100644 --- a/database/getLotOccupancies.ts +++ b/database/getLotOccupancies.ts @@ -1,5 +1,5 @@ import { - DateString, + type DateString, dateIntegerToString, dateStringToInteger } from '@cityssm/utils-datetime' @@ -14,9 +14,9 @@ import { } from '../helpers/functions.sqlFilters.js' import type { LotOccupancy } from '../types/recordTypes.js' -import { getLotOccupancyFees } from './getLotOccupancyFees.js' -import { getLotOccupancyOccupants } from './getLotOccupancyOccupants.js' -import { getLotOccupancyTransactions } from './getLotOccupancyTransactions.js' +import getLotOccupancyFees from './getLotOccupancyFees.js' +import getLotOccupancyOccupants from './getLotOccupancyOccupants.js' +import getLotOccupancyTransactions from './getLotOccupancyTransactions.js' import { acquireConnection } from './pool.js' interface GetLotOccupanciesFilters { @@ -162,7 +162,7 @@ async function addInclusions( return lotOccupancy } -export async function getLotOccupancies( +export default async function getLotOccupancies( filters: GetLotOccupanciesFilters, options: GetLotOccupanciesOptions, connectedDatabase?: PoolConnection @@ -242,5 +242,3 @@ export async function getLotOccupancies( lotOccupancies } } - -export default getLotOccupancies diff --git a/database/getLotOccupancy.d.ts b/database/getLotOccupancy.d.ts index d3f99d75..a776e85f 100644 --- a/database/getLotOccupancy.d.ts +++ b/database/getLotOccupancy.d.ts @@ -1,4 +1,3 @@ import type { PoolConnection } from 'better-sqlite-pool'; import type { LotOccupancy } from '../types/recordTypes.js'; -export declare function getLotOccupancy(lotOccupancyId: number | string, connectedDatabase?: PoolConnection): Promise; -export default getLotOccupancy; +export default function getLotOccupancy(lotOccupancyId: number | string, connectedDatabase?: PoolConnection): Promise; diff --git a/database/getLotOccupancy.js b/database/getLotOccupancy.js index bc8d0807..e3f3f475 100644 --- a/database/getLotOccupancy.js +++ b/database/getLotOccupancy.js @@ -1,12 +1,12 @@ import { dateIntegerToString } from '@cityssm/utils-datetime'; -import { getLotOccupancyComments } from './getLotOccupancyComments.js'; -import { getLotOccupancyFees } from './getLotOccupancyFees.js'; -import { getLotOccupancyFields } from './getLotOccupancyFields.js'; -import { getLotOccupancyOccupants } from './getLotOccupancyOccupants.js'; -import { getLotOccupancyTransactions } from './getLotOccupancyTransactions.js'; +import getLotOccupancyComments from './getLotOccupancyComments.js'; +import getLotOccupancyFees from './getLotOccupancyFees.js'; +import getLotOccupancyFields from './getLotOccupancyFields.js'; +import getLotOccupancyOccupants from './getLotOccupancyOccupants.js'; +import getLotOccupancyTransactions from './getLotOccupancyTransactions.js'; import { getWorkOrders } from './getWorkOrders.js'; import { acquireConnection } from './pool.js'; -export async function getLotOccupancy(lotOccupancyId, connectedDatabase) { +export default async function getLotOccupancy(lotOccupancyId, connectedDatabase) { const database = connectedDatabase ?? (await acquireConnection()); database.function('userFn_dateIntegerToString', dateIntegerToString); const lotOccupancy = database @@ -43,4 +43,3 @@ export async function getLotOccupancy(lotOccupancyId, connectedDatabase) { } return lotOccupancy; } -export default getLotOccupancy; diff --git a/database/getLotOccupancy.ts b/database/getLotOccupancy.ts index bd75a1f4..03b30b00 100644 --- a/database/getLotOccupancy.ts +++ b/database/getLotOccupancy.ts @@ -3,15 +3,15 @@ import type { PoolConnection } from 'better-sqlite-pool' import type { LotOccupancy } from '../types/recordTypes.js' -import { getLotOccupancyComments } from './getLotOccupancyComments.js' -import { getLotOccupancyFees } from './getLotOccupancyFees.js' -import { getLotOccupancyFields } from './getLotOccupancyFields.js' -import { getLotOccupancyOccupants } from './getLotOccupancyOccupants.js' -import { getLotOccupancyTransactions } from './getLotOccupancyTransactions.js' +import getLotOccupancyComments from './getLotOccupancyComments.js' +import getLotOccupancyFees from './getLotOccupancyFees.js' +import getLotOccupancyFields from './getLotOccupancyFields.js' +import getLotOccupancyOccupants from './getLotOccupancyOccupants.js' +import getLotOccupancyTransactions from './getLotOccupancyTransactions.js' import { getWorkOrders } from './getWorkOrders.js' import { acquireConnection } from './pool.js' -export async function getLotOccupancy( +export default async function getLotOccupancy( lotOccupancyId: number | string, connectedDatabase?: PoolConnection ): Promise { @@ -80,5 +80,3 @@ export async function getLotOccupancy( return lotOccupancy } - -export default getLotOccupancy diff --git a/database/getLotOccupancyComments.d.ts b/database/getLotOccupancyComments.d.ts index 620c28b5..e273573c 100644 --- a/database/getLotOccupancyComments.d.ts +++ b/database/getLotOccupancyComments.d.ts @@ -1,4 +1,3 @@ import type { PoolConnection } from 'better-sqlite-pool'; import type { LotOccupancyComment } from '../types/recordTypes.js'; -export declare function getLotOccupancyComments(lotOccupancyId: number | string, connectedDatabase?: PoolConnection): Promise; -export default getLotOccupancyComments; +export default function getLotOccupancyComments(lotOccupancyId: number | string, connectedDatabase?: PoolConnection): Promise; diff --git a/database/getLotOccupancyComments.js b/database/getLotOccupancyComments.js index b66ec3fd..b4800efe 100644 --- a/database/getLotOccupancyComments.js +++ b/database/getLotOccupancyComments.js @@ -1,6 +1,6 @@ -import { dateIntegerToString, timeIntegerToString, timeIntegerToPeriodString } from '@cityssm/utils-datetime'; +import { dateIntegerToString, timeIntegerToPeriodString, timeIntegerToString } from '@cityssm/utils-datetime'; import { acquireConnection } from './pool.js'; -export async function getLotOccupancyComments(lotOccupancyId, connectedDatabase) { +export default async function getLotOccupancyComments(lotOccupancyId, connectedDatabase) { const database = connectedDatabase ?? (await acquireConnection()); database.function('userFn_dateIntegerToString', dateIntegerToString); database.function('userFn_timeIntegerToString', timeIntegerToString); @@ -23,4 +23,3 @@ export async function getLotOccupancyComments(lotOccupancyId, connectedDatabase) } return lotComments; } -export default getLotOccupancyComments; diff --git a/database/getLotOccupancyComments.ts b/database/getLotOccupancyComments.ts index e7a630e9..fba0edaa 100644 --- a/database/getLotOccupancyComments.ts +++ b/database/getLotOccupancyComments.ts @@ -1,7 +1,7 @@ import { dateIntegerToString, - timeIntegerToString, - timeIntegerToPeriodString + timeIntegerToPeriodString, + timeIntegerToString } from '@cityssm/utils-datetime' import type { PoolConnection } from 'better-sqlite-pool' @@ -9,7 +9,7 @@ import type { LotOccupancyComment } from '../types/recordTypes.js' import { acquireConnection } from './pool.js' -export async function getLotOccupancyComments( +export default async function getLotOccupancyComments( lotOccupancyId: number | string, connectedDatabase?: PoolConnection ): Promise { @@ -24,6 +24,7 @@ export async function getLotOccupancyComments( const lotComments = database .prepare( + // eslint-disable-next-line no-secrets/no-secrets `select lotOccupancyCommentId, lotOccupancyCommentDate, userFn_dateIntegerToString(lotOccupancyCommentDate) as lotOccupancyCommentDateString, lotOccupancyCommentTime, @@ -44,5 +45,3 @@ export async function getLotOccupancyComments( return lotComments } - -export default getLotOccupancyComments diff --git a/database/getLotOccupancyFees.d.ts b/database/getLotOccupancyFees.d.ts index 8fdda415..90d813b3 100644 --- a/database/getLotOccupancyFees.d.ts +++ b/database/getLotOccupancyFees.d.ts @@ -1,4 +1,3 @@ import type { PoolConnection } from 'better-sqlite-pool'; import type { LotOccupancyFee } from '../types/recordTypes.js'; -export declare function getLotOccupancyFees(lotOccupancyId: number | string, connectedDatabase?: PoolConnection): Promise; -export default getLotOccupancyFees; +export default function getLotOccupancyFees(lotOccupancyId: number | string, connectedDatabase?: PoolConnection): Promise; diff --git a/database/getLotOccupancyFees.js b/database/getLotOccupancyFees.js index 0319f3b4..1aa4051d 100644 --- a/database/getLotOccupancyFees.js +++ b/database/getLotOccupancyFees.js @@ -1,5 +1,5 @@ import { acquireConnection } from './pool.js'; -export async function getLotOccupancyFees(lotOccupancyId, connectedDatabase) { +export default async function getLotOccupancyFees(lotOccupancyId, connectedDatabase) { const database = connectedDatabase ?? (await acquireConnection()); const lotOccupancyFees = database .prepare(`select o.lotOccupancyId, o.feeId, @@ -17,4 +17,3 @@ export async function getLotOccupancyFees(lotOccupancyId, connectedDatabase) { } return lotOccupancyFees; } -export default getLotOccupancyFees; diff --git a/database/getLotOccupancyFees.ts b/database/getLotOccupancyFees.ts index d2b913b9..41832fe7 100644 --- a/database/getLotOccupancyFees.ts +++ b/database/getLotOccupancyFees.ts @@ -4,7 +4,7 @@ import type { LotOccupancyFee } from '../types/recordTypes.js' import { acquireConnection } from './pool.js' -export async function getLotOccupancyFees( +export default async function getLotOccupancyFees( lotOccupancyId: number | string, connectedDatabase?: PoolConnection ): Promise { @@ -30,5 +30,3 @@ export async function getLotOccupancyFees( return lotOccupancyFees } - -export default getLotOccupancyFees diff --git a/database/getLotOccupancyFields.d.ts b/database/getLotOccupancyFields.d.ts index cdd4c876..33efacb2 100644 --- a/database/getLotOccupancyFields.d.ts +++ b/database/getLotOccupancyFields.d.ts @@ -1,4 +1,3 @@ import type { PoolConnection } from 'better-sqlite-pool'; import type { LotOccupancyField } from '../types/recordTypes.js'; -export declare function getLotOccupancyFields(lotOccupancyId: number | string, connectedDatabase?: PoolConnection): Promise; -export default getLotOccupancyFields; +export default function getLotOccupancyFields(lotOccupancyId: number | string, connectedDatabase?: PoolConnection): Promise; diff --git a/database/getLotOccupancyFields.js b/database/getLotOccupancyFields.js index f2868fe5..3d2bd2f1 100644 --- a/database/getLotOccupancyFields.js +++ b/database/getLotOccupancyFields.js @@ -1,5 +1,5 @@ import { acquireConnection } from './pool.js'; -export async function getLotOccupancyFields(lotOccupancyId, connectedDatabase) { +export default async function getLotOccupancyFields(lotOccupancyId, connectedDatabase) { const database = connectedDatabase ?? (await acquireConnection()); const lotOccupancyFields = database .prepare(`select o.lotOccupancyId, o.occupancyTypeFieldId, @@ -31,4 +31,3 @@ export async function getLotOccupancyFields(lotOccupancyId, connectedDatabase) { } return lotOccupancyFields; } -export default getLotOccupancyFields; diff --git a/database/getLotOccupancyFields.ts b/database/getLotOccupancyFields.ts index 37b76bc7..5a16c4ec 100644 --- a/database/getLotOccupancyFields.ts +++ b/database/getLotOccupancyFields.ts @@ -4,7 +4,7 @@ import type { LotOccupancyField } from '../types/recordTypes.js' import { acquireConnection } from './pool.js' -export async function getLotOccupancyFields( +export default async function getLotOccupancyFields( lotOccupancyId: number | string, connectedDatabase?: PoolConnection ): Promise { @@ -49,5 +49,3 @@ export async function getLotOccupancyFields( return lotOccupancyFields } - -export default getLotOccupancyFields diff --git a/database/getLotOccupancyOccupants.d.ts b/database/getLotOccupancyOccupants.d.ts index bc380798..de560baa 100644 --- a/database/getLotOccupancyOccupants.d.ts +++ b/database/getLotOccupancyOccupants.d.ts @@ -1,4 +1,3 @@ import type { PoolConnection } from 'better-sqlite-pool'; import type { LotOccupancyOccupant } from '../types/recordTypes.js'; -export declare function getLotOccupancyOccupants(lotOccupancyId: number | string, connectedDatabase?: PoolConnection): Promise; -export default getLotOccupancyOccupants; +export default function getLotOccupancyOccupants(lotOccupancyId: number | string, connectedDatabase?: PoolConnection): Promise; diff --git a/database/getLotOccupancyOccupants.js b/database/getLotOccupancyOccupants.js index 37291aa8..43526dec 100644 --- a/database/getLotOccupancyOccupants.js +++ b/database/getLotOccupancyOccupants.js @@ -1,5 +1,5 @@ import { acquireConnection } from './pool.js'; -export async function getLotOccupancyOccupants(lotOccupancyId, connectedDatabase) { +export default async function getLotOccupancyOccupants(lotOccupancyId, connectedDatabase) { const database = connectedDatabase ?? (await acquireConnection()); const lotOccupancyOccupants = database .prepare(`select o.lotOccupancyId, o.lotOccupantIndex, @@ -21,4 +21,3 @@ export async function getLotOccupancyOccupants(lotOccupancyId, connectedDatabase } return lotOccupancyOccupants; } -export default getLotOccupancyOccupants; diff --git a/database/getLotOccupancyOccupants.ts b/database/getLotOccupancyOccupants.ts index 237fed12..94c24d52 100644 --- a/database/getLotOccupancyOccupants.ts +++ b/database/getLotOccupancyOccupants.ts @@ -4,7 +4,7 @@ import type { LotOccupancyOccupant } from '../types/recordTypes.js' import { acquireConnection } from './pool.js' -export async function getLotOccupancyOccupants( +export default async function getLotOccupancyOccupants( lotOccupancyId: number | string, connectedDatabase?: PoolConnection ): Promise { @@ -34,5 +34,3 @@ export async function getLotOccupancyOccupants( return lotOccupancyOccupants } - -export default getLotOccupancyOccupants diff --git a/database/getLotOccupancyTransactions.d.ts b/database/getLotOccupancyTransactions.d.ts index 515ff3ea..aede8712 100644 --- a/database/getLotOccupancyTransactions.d.ts +++ b/database/getLotOccupancyTransactions.d.ts @@ -1,6 +1,5 @@ import type { PoolConnection } from 'better-sqlite-pool'; import type { LotOccupancyTransaction } from '../types/recordTypes.js'; -export declare function getLotOccupancyTransactions(lotOccupancyId: number | string, options: { +export default function getLotOccupancyTransactions(lotOccupancyId: number | string, options: { includeIntegrations: boolean; }, connectedDatabase?: PoolConnection): Promise; -export default getLotOccupancyTransactions; diff --git a/database/getLotOccupancyTransactions.js b/database/getLotOccupancyTransactions.js index 8c658173..51907597 100644 --- a/database/getLotOccupancyTransactions.js +++ b/database/getLotOccupancyTransactions.js @@ -1,8 +1,8 @@ import { dateIntegerToString, timeIntegerToString } from '@cityssm/utils-datetime'; import { getConfigProperty } from '../helpers/functions.config.js'; -import * as gpFunctions from '../helpers/functions.dynamicsGP.js'; +import { getDynamicsGPDocument } from '../helpers/functions.dynamicsGP.js'; import { acquireConnection } from './pool.js'; -export async function getLotOccupancyTransactions(lotOccupancyId, options, connectedDatabase) { +export default async function getLotOccupancyTransactions(lotOccupancyId, options, connectedDatabase) { const database = connectedDatabase ?? (await acquireConnection()); database.function('userFn_dateIntegerToString', dateIntegerToString); database.function('userFn_timeIntegerToString', timeIntegerToString); @@ -23,7 +23,7 @@ export async function getLotOccupancyTransactions(lotOccupancyId, options, conne getConfigProperty('settings.dynamicsGP.integrationIsEnabled')) { for (const transaction of lotOccupancyTransactions) { if ((transaction.externalReceiptNumber ?? '') !== '') { - const gpDocument = await gpFunctions.getDynamicsGPDocument(transaction.externalReceiptNumber ?? ''); + const gpDocument = await getDynamicsGPDocument(transaction.externalReceiptNumber ?? ''); if (gpDocument !== undefined) { transaction.dynamicsGPDocument = gpDocument; } @@ -32,4 +32,3 @@ export async function getLotOccupancyTransactions(lotOccupancyId, options, conne } return lotOccupancyTransactions; } -export default getLotOccupancyTransactions; diff --git a/database/getLotOccupancyTransactions.ts b/database/getLotOccupancyTransactions.ts index 8a97c184..00a619bc 100644 --- a/database/getLotOccupancyTransactions.ts +++ b/database/getLotOccupancyTransactions.ts @@ -5,12 +5,12 @@ import { import type { PoolConnection } from 'better-sqlite-pool' import { getConfigProperty } from '../helpers/functions.config.js' -import * as gpFunctions from '../helpers/functions.dynamicsGP.js' +import { getDynamicsGPDocument } from '../helpers/functions.dynamicsGP.js' import type { LotOccupancyTransaction } from '../types/recordTypes.js' import { acquireConnection } from './pool.js' -export async function getLotOccupancyTransactions( +export default async function getLotOccupancyTransactions( lotOccupancyId: number | string, options: { includeIntegrations: boolean @@ -45,7 +45,7 @@ export async function getLotOccupancyTransactions( ) { for (const transaction of lotOccupancyTransactions) { if ((transaction.externalReceiptNumber ?? '') !== '') { - const gpDocument = await gpFunctions.getDynamicsGPDocument( + const gpDocument = await getDynamicsGPDocument( transaction.externalReceiptNumber ?? '' ) @@ -58,5 +58,3 @@ export async function getLotOccupancyTransactions( return lotOccupancyTransactions } - -export default getLotOccupancyTransactions diff --git a/database/getLotOccupantTypes.d.ts b/database/getLotOccupantTypes.d.ts index 7e0814dd..bfa475d7 100644 --- a/database/getLotOccupantTypes.d.ts +++ b/database/getLotOccupantTypes.d.ts @@ -1,3 +1,2 @@ import type { LotOccupantType } from '../types/recordTypes.js'; -export declare function getLotOccupantTypes(): Promise; -export default getLotOccupantTypes; +export default function getLotOccupantTypes(): Promise; diff --git a/database/getLotOccupantTypes.js b/database/getLotOccupantTypes.js index 920cecbe..e270a5e7 100644 --- a/database/getLotOccupantTypes.js +++ b/database/getLotOccupantTypes.js @@ -1,6 +1,6 @@ import { acquireConnection } from './pool.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export async function getLotOccupantTypes() { +export default async function getLotOccupantTypes() { const database = await acquireConnection(); const lotOccupantTypes = database .prepare(`select lotOccupantTypeId, lotOccupantType, fontAwesomeIconClass, occupantCommentTitle, @@ -20,4 +20,3 @@ export async function getLotOccupantTypes() { database.release(); return lotOccupantTypes; } -export default getLotOccupantTypes; diff --git a/database/getLotOccupantTypes.ts b/database/getLotOccupantTypes.ts index 09212ccf..f49ef5a0 100644 --- a/database/getLotOccupantTypes.ts +++ b/database/getLotOccupantTypes.ts @@ -3,7 +3,9 @@ import type { LotOccupantType } from '../types/recordTypes.js' import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export async function getLotOccupantTypes(): Promise { +export default async function getLotOccupantTypes(): Promise< + LotOccupantType[] +> { const database = await acquireConnection() const lotOccupantTypes = database @@ -37,5 +39,3 @@ export async function getLotOccupantTypes(): Promise { return lotOccupantTypes } - -export default getLotOccupantTypes diff --git a/database/getLotStatusSummary.d.ts b/database/getLotStatusSummary.d.ts index 021fd9cd..00b5becc 100644 --- a/database/getLotStatusSummary.d.ts +++ b/database/getLotStatusSummary.d.ts @@ -5,5 +5,5 @@ interface GetFilters { interface LotStatusSummary extends LotStatus { lotCount: number; } -export declare function getLotStatusSummary(filters: GetFilters): Promise; -export default getLotStatusSummary; +export default function getLotStatusSummary(filters: GetFilters): Promise; +export {}; diff --git a/database/getLotStatusSummary.js b/database/getLotStatusSummary.js index 3fc45a65..4fe4ad7f 100644 --- a/database/getLotStatusSummary.js +++ b/database/getLotStatusSummary.js @@ -1,5 +1,5 @@ import { acquireConnection } from './pool.js'; -export async function getLotStatusSummary(filters) { +export default async function getLotStatusSummary(filters) { const database = await acquireConnection(); let sqlWhereClause = ' where l.recordDelete_timeMillis is null'; const sqlParameters = []; @@ -18,4 +18,3 @@ export async function getLotStatusSummary(filters) { database.release(); return lotStatuses; } -export default getLotStatusSummary; diff --git a/database/getLotStatusSummary.ts b/database/getLotStatusSummary.ts index 7ea6a51b..ccbbc26c 100644 --- a/database/getLotStatusSummary.ts +++ b/database/getLotStatusSummary.ts @@ -10,7 +10,7 @@ interface LotStatusSummary extends LotStatus { lotCount: number } -export async function getLotStatusSummary( +export default async function getLotStatusSummary( filters: GetFilters ): Promise { const database = await acquireConnection() @@ -38,5 +38,3 @@ export async function getLotStatusSummary( return lotStatuses } - -export default getLotStatusSummary diff --git a/database/getLotStatuses.d.ts b/database/getLotStatuses.d.ts index cab6da1b..58bafad8 100644 --- a/database/getLotStatuses.d.ts +++ b/database/getLotStatuses.d.ts @@ -1,3 +1,2 @@ import type { LotStatus } from '../types/recordTypes.js'; -export declare function getLotStatuses(): Promise; -export default getLotStatuses; +export default function getLotStatuses(): Promise; diff --git a/database/getLotStatuses.js b/database/getLotStatuses.js index 68dc9bd2..9426c206 100644 --- a/database/getLotStatuses.js +++ b/database/getLotStatuses.js @@ -1,6 +1,6 @@ import { acquireConnection } from './pool.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export async function getLotStatuses() { +export default async function getLotStatuses() { const database = await acquireConnection(); const lotStatuses = database .prepare(`select lotStatusId, lotStatus, orderNumber @@ -19,4 +19,3 @@ export async function getLotStatuses() { database.release(); return lotStatuses; } -export default getLotStatuses; diff --git a/database/getLotStatuses.ts b/database/getLotStatuses.ts index abc1b48b..f81a5e89 100644 --- a/database/getLotStatuses.ts +++ b/database/getLotStatuses.ts @@ -3,7 +3,7 @@ import type { LotStatus } from '../types/recordTypes.js' import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export async function getLotStatuses(): Promise { +export default async function getLotStatuses(): Promise { const database = await acquireConnection() const lotStatuses = database @@ -35,5 +35,3 @@ export async function getLotStatuses(): Promise { return lotStatuses } - -export default getLotStatuses diff --git a/database/getLotTypeFields.d.ts b/database/getLotTypeFields.d.ts index 80927902..aa98b0a0 100644 --- a/database/getLotTypeFields.d.ts +++ b/database/getLotTypeFields.d.ts @@ -1,4 +1,3 @@ import type { PoolConnection } from 'better-sqlite-pool'; import type { LotTypeField } from '../types/recordTypes.js'; -export declare function getLotTypeFields(lotTypeId: number, connectedDatabase?: PoolConnection): Promise; -export default getLotTypeFields; +export default function getLotTypeFields(lotTypeId: number, connectedDatabase?: PoolConnection): Promise; diff --git a/database/getLotTypeFields.js b/database/getLotTypeFields.js index fbcd7fd3..a2d4724d 100644 --- a/database/getLotTypeFields.js +++ b/database/getLotTypeFields.js @@ -1,6 +1,6 @@ import { acquireConnection } from './pool.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export async function getLotTypeFields(lotTypeId, connectedDatabase) { +export default async function getLotTypeFields(lotTypeId, connectedDatabase) { const database = connectedDatabase ?? (await acquireConnection()); const lotTypeFields = database .prepare(`select lotTypeFieldId, @@ -24,4 +24,3 @@ export async function getLotTypeFields(lotTypeId, connectedDatabase) { } return lotTypeFields; } -export default getLotTypeFields; diff --git a/database/getLotTypeFields.ts b/database/getLotTypeFields.ts index 9ae14e41..7878ef00 100644 --- a/database/getLotTypeFields.ts +++ b/database/getLotTypeFields.ts @@ -5,7 +5,7 @@ import type { LotTypeField } from '../types/recordTypes.js' import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export async function getLotTypeFields( +export default async function getLotTypeFields( lotTypeId: number, connectedDatabase?: PoolConnection ): Promise { @@ -46,5 +46,3 @@ export async function getLotTypeFields( return lotTypeFields } - -export default getLotTypeFields diff --git a/database/getLotTypeSummary.d.ts b/database/getLotTypeSummary.d.ts index 8c189b98..aed6af2c 100644 --- a/database/getLotTypeSummary.d.ts +++ b/database/getLotTypeSummary.d.ts @@ -5,5 +5,5 @@ interface GetFilters { interface LotTypeSummary extends LotType { lotCount: number; } -export declare function getLotTypeSummary(filters: GetFilters): Promise; -export default getLotTypeSummary; +export default function getLotTypeSummary(filters: GetFilters): Promise; +export {}; diff --git a/database/getLotTypeSummary.js b/database/getLotTypeSummary.js index ead072e2..14cd7a9a 100644 --- a/database/getLotTypeSummary.js +++ b/database/getLotTypeSummary.js @@ -1,5 +1,5 @@ import { acquireConnection } from './pool.js'; -export async function getLotTypeSummary(filters) { +export default async function getLotTypeSummary(filters) { const database = await acquireConnection(); let sqlWhereClause = ' where l.recordDelete_timeMillis is null'; const sqlParameters = []; @@ -18,4 +18,3 @@ export async function getLotTypeSummary(filters) { database.release(); return lotTypes; } -export default getLotTypeSummary; diff --git a/database/getLotTypeSummary.ts b/database/getLotTypeSummary.ts index f7091647..dfe6ae4e 100644 --- a/database/getLotTypeSummary.ts +++ b/database/getLotTypeSummary.ts @@ -10,7 +10,7 @@ interface LotTypeSummary extends LotType { lotCount: number } -export async function getLotTypeSummary( +export default async function getLotTypeSummary( filters: GetFilters ): Promise { const database = await acquireConnection() @@ -38,5 +38,3 @@ export async function getLotTypeSummary( return lotTypes } - -export default getLotTypeSummary diff --git a/database/getLotTypes.d.ts b/database/getLotTypes.d.ts index 09d21e41..f101e1c9 100644 --- a/database/getLotTypes.d.ts +++ b/database/getLotTypes.d.ts @@ -1,3 +1,2 @@ import type { LotType } from '../types/recordTypes.js'; -export declare function getLotTypes(): Promise; -export default getLotTypes; +export default function getLotTypes(): Promise; diff --git a/database/getLotTypes.js b/database/getLotTypes.js index 8b34f9ab..e7ac3426 100644 --- a/database/getLotTypes.js +++ b/database/getLotTypes.js @@ -1,7 +1,7 @@ -import { getLotTypeFields } from './getLotTypeFields.js'; +import getLotTypeFields from './getLotTypeFields.js'; import { acquireConnection } from './pool.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export async function getLotTypes() { +export default async function getLotTypes() { const database = await acquireConnection(); const lotTypes = database .prepare(`select lotTypeId, lotType, orderNumber @@ -21,4 +21,3 @@ export async function getLotTypes() { database.release(); return lotTypes; } -export default getLotTypes; diff --git a/database/getLotTypes.ts b/database/getLotTypes.ts index 08c82ce6..395bfe31 100644 --- a/database/getLotTypes.ts +++ b/database/getLotTypes.ts @@ -1,10 +1,10 @@ import type { LotType } from '../types/recordTypes.js' -import { getLotTypeFields } from './getLotTypeFields.js' +import getLotTypeFields from './getLotTypeFields.js' import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export async function getLotTypes(): Promise { +export default async function getLotTypes(): Promise { const database = await acquireConnection() const lotTypes = database @@ -39,5 +39,3 @@ export async function getLotTypes(): Promise { return lotTypes } - -export default getLotTypes diff --git a/database/getLots.d.ts b/database/getLots.d.ts index beeeba9d..4911c0b8 100644 --- a/database/getLots.d.ts +++ b/database/getLots.d.ts @@ -14,8 +14,8 @@ interface GetLotsOptions { offset: number; includeLotOccupancyCount?: boolean; } -export declare function getLots(filters: GetLotsFilters, options: GetLotsOptions, connectedDatabase?: PoolConnection): Promise<{ +export default function getLots(filters: GetLotsFilters, options: GetLotsOptions, connectedDatabase?: PoolConnection): Promise<{ count: number; lots: Lot[]; }>; -export default getLots; +export {}; diff --git a/database/getLots.js b/database/getLots.js index cc32766f..2c82df05 100644 --- a/database/getLots.js +++ b/database/getLots.js @@ -39,7 +39,7 @@ function buildWhereClause(filters) { sqlParameters }; } -export async function getLots(filters, options, connectedDatabase) { +export default async function getLots(filters, options, connectedDatabase) { const database = connectedDatabase ?? (await acquireConnection()); const { sqlWhereClause, sqlParameters } = buildWhereClause(filters); const currentDate = dateToInteger(new Date()); @@ -47,15 +47,15 @@ export async function getLots(filters, options, connectedDatabase) { if (options.limit !== -1) { count = database .prepare(`select count(*) as recordCount - from Lots l - left join ( - select lotId, count(lotOccupancyId) as lotOccupancyCount from LotOccupancies - where recordDelete_timeMillis is null - and occupancyStartDate <= ${currentDate.toString()} - and (occupancyEndDate is null or occupancyEndDate >= ${currentDate.toString()}) - group by lotId - ) o on l.lotId = o.lotId - ${sqlWhereClause}`) + from Lots l + left join ( + select lotId, count(lotOccupancyId) as lotOccupancyCount from LotOccupancies + where recordDelete_timeMillis is null + and occupancyStartDate <= ${currentDate.toString()} + and (occupancyEndDate is null or occupancyEndDate >= ${currentDate.toString()}) + group by lotId + ) o on l.lotId = o.lotId + ${sqlWhereClause}`) .get(sqlParameters).recordCount; } let lots = []; @@ -104,4 +104,3 @@ export async function getLots(filters, options, connectedDatabase) { lots }; } -export default getLots; diff --git a/database/getLots.ts b/database/getLots.ts index 6153dac6..b750f614 100644 --- a/database/getLots.ts +++ b/database/getLots.ts @@ -74,7 +74,7 @@ function buildWhereClause(filters: GetLotsFilters): { } } -export async function getLots( +export default async function getLots( filters: GetLotsFilters, options: GetLotsOptions, connectedDatabase?: PoolConnection @@ -92,15 +92,15 @@ export async function getLots( database .prepare( `select count(*) as recordCount - from Lots l - left join ( - select lotId, count(lotOccupancyId) as lotOccupancyCount from LotOccupancies - where recordDelete_timeMillis is null - and occupancyStartDate <= ${currentDate.toString()} - and (occupancyEndDate is null or occupancyEndDate >= ${currentDate.toString()}) - group by lotId - ) o on l.lotId = o.lotId - ${sqlWhereClause}` + from Lots l + left join ( + select lotId, count(lotOccupancyId) as lotOccupancyCount from LotOccupancies + where recordDelete_timeMillis is null + and occupancyStartDate <= ${currentDate.toString()} + and (occupancyEndDate is null or occupancyEndDate >= ${currentDate.toString()}) + group by lotId + ) o on l.lotId = o.lotId + ${sqlWhereClause}` ) .get(sqlParameters) as { recordCount: number } ).recordCount @@ -170,5 +170,3 @@ export async function getLots( lots } } - -export default getLots diff --git a/database/getMap.d.ts b/database/getMap.d.ts index 10028360..3b362972 100644 --- a/database/getMap.d.ts +++ b/database/getMap.d.ts @@ -1,3 +1,2 @@ import type { MapRecord } from '../types/recordTypes.js'; -export declare function getMap(mapId: number | string): Promise; -export default getMap; +export default function getMap(mapId: number | string): Promise; diff --git a/database/getMap.js b/database/getMap.js index 4072727e..3a03ce0a 100644 --- a/database/getMap.js +++ b/database/getMap.js @@ -1,5 +1,5 @@ import { acquireConnection } from './pool.js'; -export async function getMap(mapId) { +export default async function getMap(mapId) { const database = await acquireConnection(); const map = database .prepare(`select m.mapId, m.mapName, m.mapDescription, @@ -25,4 +25,3 @@ export async function getMap(mapId) { database.release(); return map; } -export default getMap; diff --git a/database/getMap.ts b/database/getMap.ts index a13d69b5..92678c50 100644 --- a/database/getMap.ts +++ b/database/getMap.ts @@ -2,7 +2,7 @@ import type { MapRecord } from '../types/recordTypes.js' import { acquireConnection } from './pool.js' -export async function getMap( +export default async function getMap( mapId: number | string ): Promise { const database = await acquireConnection() @@ -35,5 +35,3 @@ export async function getMap( return map } - -export default getMap diff --git a/database/getMaps.d.ts b/database/getMaps.d.ts index 2ee4b0e6..a0a37884 100644 --- a/database/getMaps.d.ts +++ b/database/getMaps.d.ts @@ -1,3 +1,2 @@ import type { MapRecord } from '../types/recordTypes.js'; -export declare function getMaps(): Promise; -export default getMaps; +export default function getMaps(): Promise; diff --git a/database/getMaps.js b/database/getMaps.js index c8bc313e..54fde7fd 100644 --- a/database/getMaps.js +++ b/database/getMaps.js @@ -1,5 +1,5 @@ import { acquireConnection } from './pool.js'; -export async function getMaps() { +export default async function getMaps() { const database = await acquireConnection(); const maps = database .prepare(`select m.mapId, m.mapName, m.mapDescription, @@ -18,4 +18,3 @@ export async function getMaps() { database.release(); return maps; } -export default getMaps; diff --git a/database/getMaps.ts b/database/getMaps.ts index 8722898e..ab169916 100644 --- a/database/getMaps.ts +++ b/database/getMaps.ts @@ -2,7 +2,7 @@ import type { MapRecord } from '../types/recordTypes.js' import { acquireConnection } from './pool.js' -export async function getMaps(): Promise { +export default async function getMaps(): Promise { const database = await acquireConnection() const maps = database @@ -26,5 +26,3 @@ export async function getMaps(): Promise { return maps } - -export default getMaps diff --git a/database/getNextLotId.d.ts b/database/getNextLotId.d.ts index 8e62a3ea..e5f1aca9 100644 --- a/database/getNextLotId.d.ts +++ b/database/getNextLotId.d.ts @@ -1,2 +1 @@ -export declare function getNextLotId(lotId: number | string): Promise; -export default getNextLotId; +export default function getNextLotId(lotId: number | string): Promise; diff --git a/database/getNextLotId.js b/database/getNextLotId.js index 781b8191..4a89c761 100644 --- a/database/getNextLotId.js +++ b/database/getNextLotId.js @@ -1,6 +1,6 @@ import { getConfigProperty } from '../helpers/functions.config.js'; import { acquireConnection } from './pool.js'; -export async function getNextLotId(lotId) { +export default async function getNextLotId(lotId) { const database = await acquireConnection(); database.function('userFn_lotNameSortName', getConfigProperty('settings.lot.lotNameSortNameFunction')); const result = database @@ -17,4 +17,3 @@ export async function getNextLotId(lotId) { } return result.lotId; } -export default getNextLotId; diff --git a/database/getNextLotId.ts b/database/getNextLotId.ts index e16cad64..a1df8ff4 100644 --- a/database/getNextLotId.ts +++ b/database/getNextLotId.ts @@ -2,7 +2,7 @@ import { getConfigProperty } from '../helpers/functions.config.js' import { acquireConnection } from './pool.js' -export async function getNextLotId( +export default async function getNextLotId( lotId: number | string ): Promise { const database = await acquireConnection() @@ -33,5 +33,3 @@ export async function getNextLotId( return result.lotId } - -export default getNextLotId diff --git a/database/getNextMapId.d.ts b/database/getNextMapId.d.ts index d5749e33..9ea3eff7 100644 --- a/database/getNextMapId.d.ts +++ b/database/getNextMapId.d.ts @@ -1,2 +1 @@ -export declare function getNextMapId(mapId: number | string): Promise; -export default getNextMapId; +export default function getNextMapId(mapId: number | string): Promise; diff --git a/database/getNextMapId.js b/database/getNextMapId.js index 3f31c192..a720f01b 100644 --- a/database/getNextMapId.js +++ b/database/getNextMapId.js @@ -1,5 +1,5 @@ import { acquireConnection } from './pool.js'; -export async function getNextMapId(mapId) { +export default async function getNextMapId(mapId) { const database = await acquireConnection(); const result = database .prepare(`select mapId @@ -15,4 +15,3 @@ export async function getNextMapId(mapId) { } return result.mapId; } -export default getNextMapId; diff --git a/database/getNextMapId.ts b/database/getNextMapId.ts index a705d0c8..27ea1886 100644 --- a/database/getNextMapId.ts +++ b/database/getNextMapId.ts @@ -1,6 +1,6 @@ import { acquireConnection } from './pool.js' -export async function getNextMapId( +export default async function getNextMapId( mapId: number | string ): Promise { const database = await acquireConnection() @@ -26,5 +26,3 @@ export async function getNextMapId( return result.mapId } - -export default getNextMapId diff --git a/database/getNextWorkOrderNumber.d.ts b/database/getNextWorkOrderNumber.d.ts index ecd0bf09..2ea61fdd 100644 --- a/database/getNextWorkOrderNumber.d.ts +++ b/database/getNextWorkOrderNumber.d.ts @@ -1,3 +1,2 @@ import type { PoolConnection } from 'better-sqlite-pool'; -export declare function getNextWorkOrderNumber(connectedDatabase?: PoolConnection): Promise; -export default getNextWorkOrderNumber; +export default function getNextWorkOrderNumber(connectedDatabase?: PoolConnection): Promise; diff --git a/database/getNextWorkOrderNumber.js b/database/getNextWorkOrderNumber.js index 01e0b66d..189e10fc 100644 --- a/database/getNextWorkOrderNumber.js +++ b/database/getNextWorkOrderNumber.js @@ -1,6 +1,6 @@ import { getConfigProperty } from '../helpers/functions.config.js'; import { acquireConnection } from './pool.js'; -export async function getNextWorkOrderNumber(connectedDatabase) { +export default async function getNextWorkOrderNumber(connectedDatabase) { const database = connectedDatabase ?? (await acquireConnection()); const paddingLength = getConfigProperty('settings.workOrders.workOrderNumberLength'); const currentYearString = new Date().getFullYear().toString(); @@ -23,4 +23,3 @@ export async function getNextWorkOrderNumber(connectedDatabase) { workOrderNumberIndex += 1; return `${currentYearString}-${workOrderNumberIndex.toString().padStart(paddingLength, '0')}`; } -export default getNextWorkOrderNumber; diff --git a/database/getNextWorkOrderNumber.ts b/database/getNextWorkOrderNumber.ts index 3c0b2b6d..3aa833b7 100644 --- a/database/getNextWorkOrderNumber.ts +++ b/database/getNextWorkOrderNumber.ts @@ -4,7 +4,7 @@ import { getConfigProperty } from '../helpers/functions.config.js' import { acquireConnection } from './pool.js' -export async function getNextWorkOrderNumber( +export default async function getNextWorkOrderNumber( connectedDatabase?: PoolConnection ): Promise { const database = connectedDatabase ?? (await acquireConnection()) @@ -17,6 +17,7 @@ export async function getNextWorkOrderNumber( const regex = new RegExp(`^${currentYearString}-\\d+$`) database.function( + // eslint-disable-next-line no-secrets/no-secrets 'userFn_matchesWorkOrderNumberSyntax', (workOrderNumber: string) => { return regex.test(workOrderNumber) ? 1 : 0 @@ -25,6 +26,7 @@ export async function getNextWorkOrderNumber( const workOrderNumberRecord = database .prepare( + // eslint-disable-next-line no-secrets/no-secrets `select workOrderNumber from WorkOrders where userFn_matchesWorkOrderNumberSyntax(workOrderNumber) = 1 order by cast(substr(workOrderNumber, instr(workOrderNumber, '-') + 1) as integer) desc` @@ -50,5 +52,3 @@ export async function getNextWorkOrderNumber( return `${currentYearString}-${workOrderNumberIndex.toString().padStart(paddingLength, '0')}` } - -export default getNextWorkOrderNumber diff --git a/database/getOccupancyTypeFields.d.ts b/database/getOccupancyTypeFields.d.ts index 917f3250..96d5a924 100644 --- a/database/getOccupancyTypeFields.d.ts +++ b/database/getOccupancyTypeFields.d.ts @@ -1,4 +1,3 @@ import type { PoolConnection } from 'better-sqlite-pool'; import type { OccupancyTypeField } from '../types/recordTypes.js'; -export declare function getOccupancyTypeFields(occupancyTypeId?: number, connectedDatabase?: PoolConnection): Promise; -export default getOccupancyTypeFields; +export default function getOccupancyTypeFields(occupancyTypeId?: number, connectedDatabase?: PoolConnection): Promise; diff --git a/database/getOccupancyTypeFields.js b/database/getOccupancyTypeFields.js index 6ee0005f..904661ac 100644 --- a/database/getOccupancyTypeFields.js +++ b/database/getOccupancyTypeFields.js @@ -1,22 +1,20 @@ import { acquireConnection } from './pool.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export async function getOccupancyTypeFields(occupancyTypeId, connectedDatabase) { +export default async function getOccupancyTypeFields(occupancyTypeId, connectedDatabase) { const database = connectedDatabase ?? (await acquireConnection()); const sqlParameters = []; if ((occupancyTypeId ?? -1) !== -1) { sqlParameters.push(occupancyTypeId); } const occupancyTypeFields = database - .prepare('select occupancyTypeFieldId,' + - ' occupancyTypeField, occupancyTypeFieldValues, isRequired, pattern,' + - ' minimumLength, maximumLength,' + - ' orderNumber' + - ' from OccupancyTypeFields' + - ' where recordDelete_timeMillis is null' + - ((occupancyTypeId ?? -1) === -1 - ? ' and occupancyTypeId is null' - : ' and occupancyTypeId = ?') + - ' order by orderNumber, occupancyTypeField') + .prepare(`select occupancyTypeFieldId, occupancyTypeField, + occupancyTypeFieldValues, isRequired, pattern, minimumLength, maximumLength, orderNumber + from OccupancyTypeFields + where recordDelete_timeMillis is null + ${(occupancyTypeId ?? -1) === -1 + ? ' and occupancyTypeId is null' + : ' and occupancyTypeId = ?'} + order by orderNumber, occupancyTypeField`) .all(sqlParameters); let expectedOrderNumber = 0; for (const occupancyTypeField of occupancyTypeFields) { @@ -31,4 +29,3 @@ export async function getOccupancyTypeFields(occupancyTypeId, connectedDatabase) } return occupancyTypeFields; } -export default getOccupancyTypeFields; diff --git a/database/getOccupancyTypeFields.ts b/database/getOccupancyTypeFields.ts index ecae2252..f93aae54 100644 --- a/database/getOccupancyTypeFields.ts +++ b/database/getOccupancyTypeFields.ts @@ -5,7 +5,7 @@ import type { OccupancyTypeField } from '../types/recordTypes.js' import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export async function getOccupancyTypeFields( +export default async function getOccupancyTypeFields( occupancyTypeId?: number, connectedDatabase?: PoolConnection ): Promise { @@ -19,16 +19,16 @@ export async function getOccupancyTypeFields( const occupancyTypeFields = database .prepare( - 'select occupancyTypeFieldId,' + - ' occupancyTypeField, occupancyTypeFieldValues, isRequired, pattern,' + - ' minimumLength, maximumLength,' + - ' orderNumber' + - ' from OccupancyTypeFields' + - ' where recordDelete_timeMillis is null' + - ((occupancyTypeId ?? -1) === -1 - ? ' and occupancyTypeId is null' - : ' and occupancyTypeId = ?') + - ' order by orderNumber, occupancyTypeField' + `select occupancyTypeFieldId, occupancyTypeField, + occupancyTypeFieldValues, isRequired, pattern, minimumLength, maximumLength, orderNumber + from OccupancyTypeFields + where recordDelete_timeMillis is null + ${ + (occupancyTypeId ?? -1) === -1 + ? ' and occupancyTypeId is null' + : ' and occupancyTypeId = ?' + } + order by orderNumber, occupancyTypeField` ) .all(sqlParameters) as OccupancyTypeField[] @@ -55,5 +55,3 @@ export async function getOccupancyTypeFields( return occupancyTypeFields } - -export default getOccupancyTypeFields diff --git a/database/getOccupancyTypePrints.d.ts b/database/getOccupancyTypePrints.d.ts index b32df2f9..e503d6ff 100644 --- a/database/getOccupancyTypePrints.d.ts +++ b/database/getOccupancyTypePrints.d.ts @@ -1,3 +1,2 @@ import type { PoolConnection } from 'better-sqlite-pool'; -export declare function getOccupancyTypePrints(occupancyTypeId: number, connectedDatabase?: PoolConnection): Promise; -export default getOccupancyTypePrints; +export default function getOccupancyTypePrints(occupancyTypeId: number, connectedDatabase?: PoolConnection): Promise; diff --git a/database/getOccupancyTypePrints.js b/database/getOccupancyTypePrints.js index 053029dd..43ebd1a9 100644 --- a/database/getOccupancyTypePrints.js +++ b/database/getOccupancyTypePrints.js @@ -7,7 +7,7 @@ const userFunction_configContainsPrintEJS = (printEJS) => { } return 0; }; -export async function getOccupancyTypePrints(occupancyTypeId, connectedDatabase) { +export default async function getOccupancyTypePrints(occupancyTypeId, connectedDatabase) { const database = connectedDatabase ?? (await acquireConnection()); database.function('userFn_configContainsPrintEJS', userFunction_configContainsPrintEJS); const results = database @@ -37,4 +37,3 @@ export async function getOccupancyTypePrints(occupancyTypeId, connectedDatabase) } return prints; } -export default getOccupancyTypePrints; diff --git a/database/getOccupancyTypePrints.ts b/database/getOccupancyTypePrints.ts index 1f4908bb..36f4aa27 100644 --- a/database/getOccupancyTypePrints.ts +++ b/database/getOccupancyTypePrints.ts @@ -15,13 +15,14 @@ const userFunction_configContainsPrintEJS = (printEJS: string): number => { return 0 } -export async function getOccupancyTypePrints( +export default async function getOccupancyTypePrints( occupancyTypeId: number, connectedDatabase?: PoolConnection ): Promise { const database = connectedDatabase ?? (await acquireConnection()) database.function( + // eslint-disable-next-line no-secrets/no-secrets 'userFn_configContainsPrintEJS', userFunction_configContainsPrintEJS ) @@ -64,5 +65,3 @@ export async function getOccupancyTypePrints( return prints } - -export default getOccupancyTypePrints diff --git a/database/getOccupancyTypes.d.ts b/database/getOccupancyTypes.d.ts index 6c40b1fe..b1003087 100644 --- a/database/getOccupancyTypes.d.ts +++ b/database/getOccupancyTypes.d.ts @@ -1,3 +1,2 @@ import type { OccupancyType } from '../types/recordTypes.js'; -export declare function getOccupancyTypes(): Promise; -export default getOccupancyTypes; +export default function getOccupancyTypes(): Promise; diff --git a/database/getOccupancyTypes.js b/database/getOccupancyTypes.js index 97511633..0827c68e 100644 --- a/database/getOccupancyTypes.js +++ b/database/getOccupancyTypes.js @@ -1,8 +1,8 @@ -import { getOccupancyTypeFields } from './getOccupancyTypeFields.js'; -import { getOccupancyTypePrints } from './getOccupancyTypePrints.js'; +import getOccupancyTypeFields from './getOccupancyTypeFields.js'; +import getOccupancyTypePrints from './getOccupancyTypePrints.js'; import { acquireConnection } from './pool.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export async function getOccupancyTypes() { +export default async function getOccupancyTypes() { const database = await acquireConnection(); const occupancyTypes = database .prepare(`select occupancyTypeId, occupancyType, orderNumber @@ -23,4 +23,3 @@ export async function getOccupancyTypes() { database.release(); return occupancyTypes; } -export default getOccupancyTypes; diff --git a/database/getOccupancyTypes.ts b/database/getOccupancyTypes.ts index 60493adc..66b7b7b2 100644 --- a/database/getOccupancyTypes.ts +++ b/database/getOccupancyTypes.ts @@ -1,11 +1,11 @@ import type { OccupancyType } from '../types/recordTypes.js' -import { getOccupancyTypeFields } from './getOccupancyTypeFields.js' -import { getOccupancyTypePrints } from './getOccupancyTypePrints.js' +import getOccupancyTypeFields from './getOccupancyTypeFields.js' +import getOccupancyTypePrints from './getOccupancyTypePrints.js' import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export async function getOccupancyTypes(): Promise { +export default async function getOccupancyTypes(): Promise { const database = await acquireConnection() const occupancyTypes = database @@ -49,4 +49,3 @@ export async function getOccupancyTypes(): Promise { return occupancyTypes } -export default getOccupancyTypes diff --git a/database/getPastLotOccupancyOccupants.d.ts b/database/getPastLotOccupancyOccupants.d.ts index bf02f3ca..82851b13 100644 --- a/database/getPastLotOccupancyOccupants.d.ts +++ b/database/getPastLotOccupancyOccupants.d.ts @@ -5,5 +5,5 @@ interface GetPastLotOccupancyOccupantsFilters { interface GetPastLotOccupancyOccupantsOptions { limit: number; } -export declare function getPastLotOccupancyOccupants(filters: GetPastLotOccupancyOccupantsFilters, options: GetPastLotOccupancyOccupantsOptions): Promise; -export default getPastLotOccupancyOccupants; +export default function getPastLotOccupancyOccupants(filters: GetPastLotOccupancyOccupantsFilters, options: GetPastLotOccupancyOccupantsOptions): Promise; +export {}; diff --git a/database/getPastLotOccupancyOccupants.js b/database/getPastLotOccupancyOccupants.js index 7783bb3d..81a66bc2 100644 --- a/database/getPastLotOccupancyOccupants.js +++ b/database/getPastLotOccupancyOccupants.js @@ -1,5 +1,5 @@ import { acquireConnection } from './pool.js'; -export async function getPastLotOccupancyOccupants(filters, options) { +export default async function getPastLotOccupancyOccupants(filters, options) { const database = await acquireConnection(); let sqlWhereClause = ' where o.recordDelete_timeMillis is null and l.recordDelete_timeMillis is null'; const sqlParameters = []; @@ -38,4 +38,3 @@ export async function getPastLotOccupancyOccupants(filters, options) { database.release(); return lotOccupancyOccupants; } -export default getPastLotOccupancyOccupants; diff --git a/database/getPastLotOccupancyOccupants.ts b/database/getPastLotOccupancyOccupants.ts index dee65b6d..09bd690e 100644 --- a/database/getPastLotOccupancyOccupants.ts +++ b/database/getPastLotOccupancyOccupants.ts @@ -10,7 +10,7 @@ interface GetPastLotOccupancyOccupantsOptions { limit: number } -export async function getPastLotOccupancyOccupants( +export default async function getPastLotOccupancyOccupants( filters: GetPastLotOccupancyOccupantsFilters, options: GetPastLotOccupancyOccupantsOptions ): Promise { @@ -69,5 +69,3 @@ export async function getPastLotOccupancyOccupants( return lotOccupancyOccupants } - -export default getPastLotOccupancyOccupants diff --git a/database/getPreviousLotId.d.ts b/database/getPreviousLotId.d.ts index af0b89ac..7625bd7d 100644 --- a/database/getPreviousLotId.d.ts +++ b/database/getPreviousLotId.d.ts @@ -1,2 +1 @@ -export declare function getPreviousLotId(lotId: number | string): Promise; -export default getPreviousLotId; +export default function getPreviousLotId(lotId: number | string): Promise; diff --git a/database/getPreviousLotId.js b/database/getPreviousLotId.js index 05633b0e..25a5243b 100644 --- a/database/getPreviousLotId.js +++ b/database/getPreviousLotId.js @@ -1,6 +1,6 @@ import { getConfigProperty } from '../helpers/functions.config.js'; import { acquireConnection } from './pool.js'; -export async function getPreviousLotId(lotId) { +export default async function getPreviousLotId(lotId) { const database = await acquireConnection(); database.function('userFn_lotNameSortName', getConfigProperty('settings.lot.lotNameSortNameFunction')); const result = database @@ -16,4 +16,3 @@ export async function getPreviousLotId(lotId) { } return result.lotId; } -export default getPreviousLotId; diff --git a/database/getPreviousLotId.ts b/database/getPreviousLotId.ts index 38b94d81..c4cebb74 100644 --- a/database/getPreviousLotId.ts +++ b/database/getPreviousLotId.ts @@ -2,7 +2,7 @@ import { getConfigProperty } from '../helpers/functions.config.js' import { acquireConnection } from './pool.js' -export async function getPreviousLotId( +export default async function getPreviousLotId( lotId: number | string ): Promise { const database = await acquireConnection() @@ -32,5 +32,3 @@ export async function getPreviousLotId( return result.lotId } - -export default getPreviousLotId diff --git a/database/getPreviousMapId.d.ts b/database/getPreviousMapId.d.ts index d8a81668..eb611968 100644 --- a/database/getPreviousMapId.d.ts +++ b/database/getPreviousMapId.d.ts @@ -1,2 +1 @@ -export declare function getPreviousMapId(mapId: number | string): Promise; -export default getPreviousMapId; +export default function getPreviousMapId(mapId: number | string): Promise; diff --git a/database/getPreviousMapId.js b/database/getPreviousMapId.js index 1ff31c1c..c716652e 100644 --- a/database/getPreviousMapId.js +++ b/database/getPreviousMapId.js @@ -1,5 +1,5 @@ import { acquireConnection } from './pool.js'; -export async function getPreviousMapId(mapId) { +export default async function getPreviousMapId(mapId) { const database = await acquireConnection(); const result = database .prepare(`select mapId from Maps @@ -14,4 +14,3 @@ export async function getPreviousMapId(mapId) { } return result.mapId; } -export default getPreviousMapId; diff --git a/database/getPreviousMapId.ts b/database/getPreviousMapId.ts index 19a95769..5225d8ef 100644 --- a/database/getPreviousMapId.ts +++ b/database/getPreviousMapId.ts @@ -1,6 +1,6 @@ import { acquireConnection } from './pool.js' -export async function getPreviousMapId( +export default async function getPreviousMapId( mapId: number | string ): Promise { const database = await acquireConnection() @@ -25,5 +25,3 @@ export async function getPreviousMapId( return result.mapId } - -export default getPreviousMapId diff --git a/database/getReportData.d.ts b/database/getReportData.d.ts index 0329be62..bff83ce3 100644 --- a/database/getReportData.d.ts +++ b/database/getReportData.d.ts @@ -1,3 +1,2 @@ export type ReportParameters = Record; -export declare function getReportData(reportName: string, reportParameters?: ReportParameters): Promise; -export default getReportData; +export default function getReportData(reportName: string, reportParameters?: ReportParameters): Promise; diff --git a/database/getReportData.js b/database/getReportData.js index 40f9f82a..a6d44401 100644 --- a/database/getReportData.js +++ b/database/getReportData.js @@ -35,7 +35,7 @@ const occupantPhoneNumberAlias = `${occupantCamelCase}PhoneNumber`; const occupantEmailAddressAlias = `${occupantCamelCase}EmailAddress`; const occupantCommentTitleAlias = `${occupantCamelCase}CommentTitle`; const occupantCommentAlias = `${occupantCamelCase}Comment`; -export async function getReportData(reportName, reportParameters = {}) { +export default async function getReportData(reportName, reportParameters = {}) { let sql; const sqlParameters = []; switch (reportName) { @@ -287,4 +287,3 @@ export async function getReportData(reportName, reportParameters = {}) { database.release(); return rows; } -export default getReportData; diff --git a/database/getReportData.ts b/database/getReportData.ts index 0943db41..a7175136 100644 --- a/database/getReportData.ts +++ b/database/getReportData.ts @@ -47,13 +47,14 @@ const occupantEmailAddressAlias = `${occupantCamelCase}EmailAddress` const occupantCommentTitleAlias = `${occupantCamelCase}CommentTitle` const occupantCommentAlias = `${occupantCamelCase}Comment` -export async function getReportData( +export default async function getReportData( reportName: string, reportParameters: ReportParameters = {} ): Promise { let sql: string const sqlParameters: unknown[] = [] + // eslint-disable-next-line sonarjs/max-switch-cases switch (reportName) { case 'maps-all': { sql = 'select * from Maps' @@ -364,5 +365,3 @@ export async function getReportData( return rows } - -export default getReportData diff --git a/database/getWorkOrder.d.ts b/database/getWorkOrder.d.ts index cc810bb3..fc428f62 100644 --- a/database/getWorkOrder.d.ts +++ b/database/getWorkOrder.d.ts @@ -6,5 +6,5 @@ interface WorkOrderOptions { includeMilestones: boolean; } export declare function getWorkOrderByWorkOrderNumber(workOrderNumber: string): Promise; -export declare function getWorkOrder(workOrderId: number | string, options: WorkOrderOptions, connectedDatabase?: PoolConnection): Promise; -export default getWorkOrder; +export default function getWorkOrder(workOrderId: number | string, options: WorkOrderOptions, connectedDatabase?: PoolConnection): Promise; +export {}; diff --git a/database/getWorkOrder.js b/database/getWorkOrder.js index 1c9abb0a..87da8d38 100644 --- a/database/getWorkOrder.js +++ b/database/getWorkOrder.js @@ -1,8 +1,8 @@ import { dateIntegerToString } from '@cityssm/utils-datetime'; -import { getLotOccupancies } from './getLotOccupancies.js'; -import { getLots } from './getLots.js'; -import { getWorkOrderComments } from './getWorkOrderComments.js'; -import { getWorkOrderMilestones } from './getWorkOrderMilestones.js'; +import getLotOccupancies from './getLotOccupancies.js'; +import getLots from './getLots.js'; +import getWorkOrderComments from './getWorkOrderComments.js'; +import getWorkOrderMilestones from './getWorkOrderMilestones.js'; import { acquireConnection } from './pool.js'; const baseSQL = `select w.workOrderId, w.workOrderTypeId, t.workOrderType, @@ -63,7 +63,6 @@ export async function getWorkOrderByWorkOrderNumber(workOrderNumber) { includeMilestones: true }); } -export async function getWorkOrder(workOrderId, options, connectedDatabase) { +export default async function getWorkOrder(workOrderId, options, connectedDatabase) { return await _getWorkOrder(baseSQL + ' and w.workOrderId = ?', workOrderId, options, connectedDatabase); } -export default getWorkOrder; diff --git a/database/getWorkOrder.ts b/database/getWorkOrder.ts index 0adca751..377430f1 100644 --- a/database/getWorkOrder.ts +++ b/database/getWorkOrder.ts @@ -3,10 +3,10 @@ import type { PoolConnection } from 'better-sqlite-pool' import type { WorkOrder } from '../types/recordTypes.js' -import { getLotOccupancies } from './getLotOccupancies.js' -import { getLots } from './getLots.js' -import { getWorkOrderComments } from './getWorkOrderComments.js' -import { getWorkOrderMilestones } from './getWorkOrderMilestones.js' +import getLotOccupancies from './getLotOccupancies.js' +import getLots from './getLots.js' +import getWorkOrderComments from './getWorkOrderComments.js' +import getWorkOrderMilestones from './getWorkOrderMilestones.js' import { acquireConnection } from './pool.js' interface WorkOrderOptions { @@ -115,7 +115,7 @@ export async function getWorkOrderByWorkOrderNumber( ) } -export async function getWorkOrder( +export default async function getWorkOrder( workOrderId: number | string, options: WorkOrderOptions, connectedDatabase?: PoolConnection @@ -127,5 +127,3 @@ export async function getWorkOrder( connectedDatabase ) } - -export default getWorkOrder diff --git a/database/getWorkOrderComments.d.ts b/database/getWorkOrderComments.d.ts index 4697df99..852423fa 100644 --- a/database/getWorkOrderComments.d.ts +++ b/database/getWorkOrderComments.d.ts @@ -1,4 +1,3 @@ import type { PoolConnection } from 'better-sqlite-pool'; import type { WorkOrderComment } from '../types/recordTypes.js'; -export declare function getWorkOrderComments(workOrderId: number | string, connectedDatabase?: PoolConnection): Promise; -export default getWorkOrderComments; +export default function getWorkOrderComments(workOrderId: number | string, connectedDatabase?: PoolConnection): Promise; diff --git a/database/getWorkOrderComments.js b/database/getWorkOrderComments.js index 95388afa..87dbcaa5 100644 --- a/database/getWorkOrderComments.js +++ b/database/getWorkOrderComments.js @@ -1,6 +1,6 @@ -import { dateIntegerToString, timeIntegerToString, timeIntegerToPeriodString } from '@cityssm/utils-datetime'; +import { dateIntegerToString, timeIntegerToPeriodString, timeIntegerToString } from '@cityssm/utils-datetime'; import { acquireConnection } from './pool.js'; -export async function getWorkOrderComments(workOrderId, connectedDatabase) { +export default async function getWorkOrderComments(workOrderId, connectedDatabase) { const database = connectedDatabase ?? (await acquireConnection()); database.function('userFn_dateIntegerToString', dateIntegerToString); database.function('userFn_timeIntegerToString', timeIntegerToString); @@ -23,4 +23,3 @@ export async function getWorkOrderComments(workOrderId, connectedDatabase) { } return workOrderComments; } -export default getWorkOrderComments; diff --git a/database/getWorkOrderComments.ts b/database/getWorkOrderComments.ts index 55beeaea..4acb3afe 100644 --- a/database/getWorkOrderComments.ts +++ b/database/getWorkOrderComments.ts @@ -1,7 +1,7 @@ import { dateIntegerToString, - timeIntegerToString, - timeIntegerToPeriodString + timeIntegerToPeriodString, + timeIntegerToString } from '@cityssm/utils-datetime' import type { PoolConnection } from 'better-sqlite-pool' @@ -9,7 +9,7 @@ import type { WorkOrderComment } from '../types/recordTypes.js' import { acquireConnection } from './pool.js' -export async function getWorkOrderComments( +export default async function getWorkOrderComments( workOrderId: number | string, connectedDatabase?: PoolConnection ): Promise { @@ -44,5 +44,3 @@ export async function getWorkOrderComments( return workOrderComments } - -export default getWorkOrderComments diff --git a/database/getWorkOrderMilestoneTypes.d.ts b/database/getWorkOrderMilestoneTypes.d.ts index dd4ad088..6e6aa2e1 100644 --- a/database/getWorkOrderMilestoneTypes.d.ts +++ b/database/getWorkOrderMilestoneTypes.d.ts @@ -1,3 +1,2 @@ import type { WorkOrderMilestoneType } from '../types/recordTypes.js'; -export declare function getWorkOrderMilestoneTypes(): Promise; -export default getWorkOrderMilestoneTypes; +export default function getWorkOrderMilestoneTypes(): Promise; diff --git a/database/getWorkOrderMilestoneTypes.js b/database/getWorkOrderMilestoneTypes.js index c3db49a8..20d714c1 100644 --- a/database/getWorkOrderMilestoneTypes.js +++ b/database/getWorkOrderMilestoneTypes.js @@ -1,6 +1,6 @@ import { acquireConnection } from './pool.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export async function getWorkOrderMilestoneTypes() { +export default async function getWorkOrderMilestoneTypes() { const database = await acquireConnection(); const workOrderMilestoneTypes = database .prepare(`select workOrderMilestoneTypeId, workOrderMilestoneType, orderNumber @@ -19,4 +19,3 @@ export async function getWorkOrderMilestoneTypes() { database.release(); return workOrderMilestoneTypes; } -export default getWorkOrderMilestoneTypes; diff --git a/database/getWorkOrderMilestoneTypes.ts b/database/getWorkOrderMilestoneTypes.ts index 8d8e5db9..6d04b616 100644 --- a/database/getWorkOrderMilestoneTypes.ts +++ b/database/getWorkOrderMilestoneTypes.ts @@ -3,7 +3,7 @@ import type { WorkOrderMilestoneType } from '../types/recordTypes.js' import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export async function getWorkOrderMilestoneTypes(): Promise< +export default async function getWorkOrderMilestoneTypes(): Promise< WorkOrderMilestoneType[] > { const database = await acquireConnection() @@ -38,5 +38,3 @@ export async function getWorkOrderMilestoneTypes(): Promise< return workOrderMilestoneTypes } - -export default getWorkOrderMilestoneTypes diff --git a/database/getWorkOrderMilestones.d.ts b/database/getWorkOrderMilestones.d.ts index 31d295f3..49659686 100644 --- a/database/getWorkOrderMilestones.d.ts +++ b/database/getWorkOrderMilestones.d.ts @@ -11,5 +11,5 @@ interface WorkOrderMilestoneOptions { includeWorkOrders?: boolean; orderBy: 'completion' | 'date'; } -export declare function getWorkOrderMilestones(filters: WorkOrderMilestoneFilters, options: WorkOrderMilestoneOptions, connectedDatabase?: PoolConnection): Promise; -export default getWorkOrderMilestones; +export default function getWorkOrderMilestones(filters: WorkOrderMilestoneFilters, options: WorkOrderMilestoneOptions, connectedDatabase?: PoolConnection): Promise; +export {}; diff --git a/database/getWorkOrderMilestones.js b/database/getWorkOrderMilestones.js index 7b2f9a03..64452530 100644 --- a/database/getWorkOrderMilestones.js +++ b/database/getWorkOrderMilestones.js @@ -1,7 +1,7 @@ import { dateIntegerToString, dateStringToInteger, dateToInteger, timeIntegerToPeriodString, timeIntegerToString } from '@cityssm/utils-datetime'; -import * as configFunctions from '../helpers/functions.config.js'; -import { getLotOccupancies } from './getLotOccupancies.js'; -import { getLots } from './getLots.js'; +import { getConfigProperty } from '../helpers/functions.config.js'; +import getLotOccupancies from './getLotOccupancies.js'; +import getLots from './getLots.js'; import { acquireConnection } from './pool.js'; const commaSeparatedNumbersRegex = /^\d+(?:,\d+)*$/; function buildWhereClause(filters) { @@ -14,11 +14,11 @@ function buildWhereClause(filters) { const date = new Date(); const currentDateNumber = dateToInteger(date); date.setDate(date.getDate() - - configFunctions.getConfigProperty('settings.workOrders.workOrderMilestoneDateRecentBeforeDays')); + getConfigProperty('settings.workOrders.workOrderMilestoneDateRecentBeforeDays')); const recentBeforeDateNumber = dateToInteger(date); date.setDate(date.getDate() + - configFunctions.getConfigProperty('settings.workOrders.workOrderMilestoneDateRecentBeforeDays') + - configFunctions.getConfigProperty('settings.workOrders.workOrderMilestoneDateRecentAfterDays')); + getConfigProperty('settings.workOrders.workOrderMilestoneDateRecentBeforeDays') + + getConfigProperty('settings.workOrders.workOrderMilestoneDateRecentAfterDays')); const recentAfterDateNumber = dateToInteger(date); switch (filters.workOrderMilestoneDateFilter) { case 'upcomingMissed': { @@ -48,8 +48,7 @@ function buildWhereClause(filters) { } if ((filters.workOrderTypeIds ?? '') !== '' && commaSeparatedNumbersRegex.test(filters.workOrderTypeIds)) { - sqlWhereClause += - ` and w.workOrderTypeId in (${filters.workOrderTypeIds})`; + sqlWhereClause += ` and w.workOrderTypeId in (${filters.workOrderTypeIds})`; } if (filters.workOrderMilestoneTypeIds !== undefined && filters.workOrderMilestoneTypeIds !== '' && @@ -61,7 +60,7 @@ function buildWhereClause(filters) { sqlParameters }; } -export async function getWorkOrderMilestones(filters, options, connectedDatabase) { +export default async function getWorkOrderMilestones(filters, options, connectedDatabase) { const database = connectedDatabase ?? (await acquireConnection()); database.function('userFn_dateIntegerToString', dateIntegerToString); database.function('userFn_timeIntegerToString', timeIntegerToString); @@ -141,4 +140,3 @@ export async function getWorkOrderMilestones(filters, options, connectedDatabase } return workOrderMilestones; } -export default getWorkOrderMilestones; diff --git a/database/getWorkOrderMilestones.ts b/database/getWorkOrderMilestones.ts index 80657fe0..c918ac61 100644 --- a/database/getWorkOrderMilestones.ts +++ b/database/getWorkOrderMilestones.ts @@ -8,11 +8,11 @@ import { } from '@cityssm/utils-datetime' import type { PoolConnection } from 'better-sqlite-pool' -import * as configFunctions from '../helpers/functions.config.js' +import { getConfigProperty } from '../helpers/functions.config.js' import type { WorkOrderMilestone } from '../types/recordTypes.js' -import { getLotOccupancies } from './getLotOccupancies.js' -import { getLots } from './getLots.js' +import getLotOccupancies from './getLotOccupancies.js' +import getLots from './getLots.js' import { acquireConnection } from './pool.js' export interface WorkOrderMilestoneFilters { @@ -53,7 +53,7 @@ function buildWhereClause(filters: WorkOrderMilestoneFilters): { date.setDate( date.getDate() - - configFunctions.getConfigProperty( + getConfigProperty( 'settings.workOrders.workOrderMilestoneDateRecentBeforeDays' ) ) @@ -62,10 +62,10 @@ function buildWhereClause(filters: WorkOrderMilestoneFilters): { date.setDate( date.getDate() + - configFunctions.getConfigProperty( + getConfigProperty( 'settings.workOrders.workOrderMilestoneDateRecentBeforeDays' ) + - configFunctions.getConfigProperty( + getConfigProperty( 'settings.workOrders.workOrderMilestoneDateRecentAfterDays' ) ) @@ -109,8 +109,7 @@ function buildWhereClause(filters: WorkOrderMilestoneFilters): { (filters.workOrderTypeIds ?? '') !== '' && commaSeparatedNumbersRegex.test(filters.workOrderTypeIds!) ) { - sqlWhereClause += - ` and w.workOrderTypeId in (${filters.workOrderTypeIds})` + sqlWhereClause += ` and w.workOrderTypeId in (${filters.workOrderTypeIds})` } if ( @@ -127,7 +126,7 @@ function buildWhereClause(filters: WorkOrderMilestoneFilters): { } } -export async function getWorkOrderMilestones( +export default async function getWorkOrderMilestones( filters: WorkOrderMilestoneFilters, options: WorkOrderMilestoneOptions, connectedDatabase?: PoolConnection @@ -241,5 +240,3 @@ export async function getWorkOrderMilestones( return workOrderMilestones } - -export default getWorkOrderMilestones diff --git a/database/getWorkOrderTypes.d.ts b/database/getWorkOrderTypes.d.ts index db095a8d..024e3763 100644 --- a/database/getWorkOrderTypes.d.ts +++ b/database/getWorkOrderTypes.d.ts @@ -1,3 +1,2 @@ import type { WorkOrderType } from '../types/recordTypes.js'; -export declare function getWorkOrderTypes(): Promise; -export default getWorkOrderTypes; +export default function getWorkOrderTypes(): Promise; diff --git a/database/getWorkOrderTypes.js b/database/getWorkOrderTypes.js index 2dda96e7..55e47651 100644 --- a/database/getWorkOrderTypes.js +++ b/database/getWorkOrderTypes.js @@ -1,6 +1,6 @@ import { acquireConnection } from './pool.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export async function getWorkOrderTypes() { +export default async function getWorkOrderTypes() { const database = await acquireConnection(); const workOrderTypes = database .prepare(`select workOrderTypeId, workOrderType, orderNumber @@ -19,4 +19,3 @@ export async function getWorkOrderTypes() { database.release(); return workOrderTypes; } -export default getWorkOrderTypes; diff --git a/database/getWorkOrderTypes.ts b/database/getWorkOrderTypes.ts index 6ead7e29..b81deab5 100644 --- a/database/getWorkOrderTypes.ts +++ b/database/getWorkOrderTypes.ts @@ -3,7 +3,7 @@ import type { WorkOrderType } from '../types/recordTypes.js' import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export async function getWorkOrderTypes(): Promise { +export default async function getWorkOrderTypes(): Promise { const database = await acquireConnection() const workOrderTypes = database @@ -36,5 +36,3 @@ export async function getWorkOrderTypes(): Promise { return workOrderTypes } - -export default getWorkOrderTypes diff --git a/database/getWorkOrders.js b/database/getWorkOrders.js index 4581e70c..01babf20 100644 --- a/database/getWorkOrders.js +++ b/database/getWorkOrders.js @@ -1,9 +1,9 @@ import { dateIntegerToString, dateStringToInteger } from '@cityssm/utils-datetime'; import { getLotNameWhereClause, getOccupantNameWhereClause } from '../helpers/functions.sqlFilters.js'; -import { getLotOccupancies } from './getLotOccupancies.js'; -import { getLots } from './getLots.js'; -import { getWorkOrderComments } from './getWorkOrderComments.js'; -import { getWorkOrderMilestones } from './getWorkOrderMilestones.js'; +import getLotOccupancies from './getLotOccupancies.js'; +import getLots from './getLots.js'; +import getWorkOrderComments from './getWorkOrderComments.js'; +import getWorkOrderMilestones from './getWorkOrderMilestones.js'; import { acquireConnection } from './pool.js'; function buildWhereClause(filters) { let sqlWhereClause = ' where w.recordDelete_timeMillis is null'; diff --git a/database/getWorkOrders.ts b/database/getWorkOrders.ts index deacbe09..e17d7c63 100644 --- a/database/getWorkOrders.ts +++ b/database/getWorkOrders.ts @@ -1,4 +1,5 @@ import { + type DateString, dateIntegerToString, dateStringToInteger } from '@cityssm/utils-datetime' @@ -10,10 +11,10 @@ import { } from '../helpers/functions.sqlFilters.js' import type { WorkOrder } from '../types/recordTypes.js' -import { getLotOccupancies } from './getLotOccupancies.js' -import { getLots } from './getLots.js' -import { getWorkOrderComments } from './getWorkOrderComments.js' -import { getWorkOrderMilestones } from './getWorkOrderMilestones.js' +import getLotOccupancies from './getLotOccupancies.js' +import getLots from './getLots.js' +import getWorkOrderComments from './getWorkOrderComments.js' +import getWorkOrderMilestones from './getWorkOrderMilestones.js' import { acquireConnection } from './pool.js' interface GetWorkOrdersFilters { @@ -55,7 +56,7 @@ function buildWhereClause(filters: GetWorkOrdersFilters): { if ((filters.workOrderOpenDateString ?? '') !== '') { sqlWhereClause += ' and w.workOrderOpenDate = ?' - sqlParameters.push(dateStringToInteger(filters.workOrderOpenDateString!)) + sqlParameters.push(dateStringToInteger(filters.workOrderOpenDateString as DateString)) } const occupantNameFilters = getOccupantNameWhereClause( diff --git a/database/moveFee.js b/database/moveFee.js index 202a35cd..1ffa157b 100644 --- a/database/moveFee.js +++ b/database/moveFee.js @@ -1,4 +1,4 @@ -import { getFee } from './getFee.js'; +import getFee from './getFee.js'; import { acquireConnection } from './pool.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; export async function moveFeeDown(feeId) { diff --git a/database/moveFee.ts b/database/moveFee.ts index 452bb4ca..9b6673e6 100644 --- a/database/moveFee.ts +++ b/database/moveFee.ts @@ -1,6 +1,6 @@ import type { Fee } from '../types/recordTypes.js' -import { getFee } from './getFee.js' +import getFee from './getFee.js' import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' diff --git a/database/updateWorkOrderComment.d.ts b/database/updateWorkOrderComment.d.ts index 37e54013..848b7fc9 100644 --- a/database/updateWorkOrderComment.d.ts +++ b/database/updateWorkOrderComment.d.ts @@ -1,4 +1,4 @@ -interface UpdateWorkOrderCommentForm { +export interface UpdateWorkOrderCommentForm { workOrderCommentId: string | number; workOrderCommentDateString: string; workOrderCommentTimeString: string; diff --git a/database/updateWorkOrderComment.ts b/database/updateWorkOrderComment.ts index 0ad16016..66a854b1 100644 --- a/database/updateWorkOrderComment.ts +++ b/database/updateWorkOrderComment.ts @@ -5,7 +5,7 @@ import { import { acquireConnection } from './pool.js' -interface UpdateWorkOrderCommentForm { +export interface UpdateWorkOrderCommentForm { workOrderCommentId: string | number workOrderCommentDateString: string workOrderCommentTimeString: string diff --git a/database/updateWorkOrderMilestone.d.ts b/database/updateWorkOrderMilestone.d.ts index 4fa27d4b..1d763f43 100644 --- a/database/updateWorkOrderMilestone.d.ts +++ b/database/updateWorkOrderMilestone.d.ts @@ -1,9 +1,8 @@ -interface UpdateWorkOrderMilestoneForm { +export interface UpdateWorkOrderMilestoneForm { workOrderMilestoneId: string | number; workOrderMilestoneTypeId: number | string; workOrderMilestoneDateString: string; workOrderMilestoneTimeString?: string; workOrderMilestoneDescription: string; } -export declare function updateWorkOrderMilestone(milestoneForm: UpdateWorkOrderMilestoneForm, user: User): Promise; -export default updateWorkOrderMilestone; +export default function updateWorkOrderMilestone(milestoneForm: UpdateWorkOrderMilestoneForm, user: User): Promise; diff --git a/database/updateWorkOrderMilestone.js b/database/updateWorkOrderMilestone.js index 10c39a62..b91af295 100644 --- a/database/updateWorkOrderMilestone.js +++ b/database/updateWorkOrderMilestone.js @@ -1,6 +1,6 @@ import { dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime'; import { acquireConnection } from './pool.js'; -export async function updateWorkOrderMilestone(milestoneForm, user) { +export default async function updateWorkOrderMilestone(milestoneForm, user) { const database = await acquireConnection(); const result = database .prepare(`update WorkOrderMilestones @@ -21,4 +21,3 @@ export async function updateWorkOrderMilestone(milestoneForm, user) { database.release(); return result.changes > 0; } -export default updateWorkOrderMilestone; diff --git a/database/updateWorkOrderMilestone.ts b/database/updateWorkOrderMilestone.ts index 4ca82cbe..750d6eea 100644 --- a/database/updateWorkOrderMilestone.ts +++ b/database/updateWorkOrderMilestone.ts @@ -5,7 +5,7 @@ import { import { acquireConnection } from './pool.js' -interface UpdateWorkOrderMilestoneForm { +export interface UpdateWorkOrderMilestoneForm { workOrderMilestoneId: string | number workOrderMilestoneTypeId: number | string workOrderMilestoneDateString: string @@ -13,7 +13,7 @@ interface UpdateWorkOrderMilestoneForm { workOrderMilestoneDescription: string } -export async function updateWorkOrderMilestone( +export default async function updateWorkOrderMilestone( milestoneForm: UpdateWorkOrderMilestoneForm, user: User ): Promise { @@ -51,5 +51,3 @@ export async function updateWorkOrderMilestone( return result.changes > 0 } - -export default updateWorkOrderMilestone diff --git a/handlers/admin-get/fees.js b/handlers/admin-get/fees.js index 05ed6fa5..f2d5ea97 100644 --- a/handlers/admin-get/fees.js +++ b/handlers/admin-get/fees.js @@ -1,4 +1,4 @@ -import { getFeeCategories } from '../../database/getFeeCategories.js'; +import getFeeCategories from '../../database/getFeeCategories.js'; import { getLotTypes, getOccupancyTypes } from '../../helpers/functions.cache.js'; export default async function handler(_request, response) { const feeCategories = await getFeeCategories({}, { diff --git a/handlers/admin-get/fees.ts b/handlers/admin-get/fees.ts index 383f5c8e..e058facd 100644 --- a/handlers/admin-get/fees.ts +++ b/handlers/admin-get/fees.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express' -import { getFeeCategories } from '../../database/getFeeCategories.js' +import getFeeCategories from '../../database/getFeeCategories.js' import { getLotTypes, getOccupancyTypes diff --git a/handlers/admin-get/occupancyTypes.js b/handlers/admin-get/occupancyTypes.js index e9fd082f..7d32b2d1 100644 --- a/handlers/admin-get/occupancyTypes.js +++ b/handlers/admin-get/occupancyTypes.js @@ -1,13 +1,13 @@ import { getAllOccupancyTypeFields, getOccupancyTypes } from '../../helpers/functions.cache.js'; import { getConfigProperty } from '../../helpers/functions.config.js'; -import * as printFunctions from '../../helpers/functions.print.js'; +import { getPrintConfig } from '../../helpers/functions.print.js'; export default async function handler(_request, response) { const occupancyTypes = await getOccupancyTypes(); const allOccupancyTypeFields = await getAllOccupancyTypeFields(); const occupancyTypePrints = getConfigProperty('settings.lotOccupancy.prints'); const occupancyTypePrintTitles = {}; for (const printEJS of occupancyTypePrints) { - const printConfig = printFunctions.getPrintConfig(printEJS); + const printConfig = getPrintConfig(printEJS); if (printConfig !== undefined) { occupancyTypePrintTitles[printEJS] = printConfig.title; } diff --git a/handlers/admin-get/occupancyTypes.ts b/handlers/admin-get/occupancyTypes.ts index 0fafb22b..c24ec75b 100644 --- a/handlers/admin-get/occupancyTypes.ts +++ b/handlers/admin-get/occupancyTypes.ts @@ -5,7 +5,7 @@ import { getOccupancyTypes } from '../../helpers/functions.cache.js' import { getConfigProperty } from '../../helpers/functions.config.js' -import * as printFunctions from '../../helpers/functions.print.js' +import { getPrintConfig } from '../../helpers/functions.print.js' export default async function handler( _request: Request, @@ -19,7 +19,7 @@ export default async function handler( const occupancyTypePrintTitles = {} for (const printEJS of occupancyTypePrints) { - const printConfig = printFunctions.getPrintConfig(printEJS) + const printConfig = getPrintConfig(printEJS) if (printConfig !== undefined) { occupancyTypePrintTitles[printEJS] = printConfig.title diff --git a/handlers/admin-post/doAddFee.js b/handlers/admin-post/doAddFee.js index 8c3b22d3..c2099392 100644 --- a/handlers/admin-post/doAddFee.js +++ b/handlers/admin-post/doAddFee.js @@ -1,5 +1,5 @@ import addFee from '../../database/addFee.js'; -import { getFeeCategories } from '../../database/getFeeCategories.js'; +import getFeeCategories from '../../database/getFeeCategories.js'; export default async function handler(request, response) { const feeId = await addFee(request.body, request.session.user); const feeCategories = await getFeeCategories({}, { diff --git a/handlers/admin-post/doAddFee.ts b/handlers/admin-post/doAddFee.ts index 783f216c..44f1e423 100644 --- a/handlers/admin-post/doAddFee.ts +++ b/handlers/admin-post/doAddFee.ts @@ -1,7 +1,7 @@ import type { Request, Response } from 'express' import addFee, { type AddFeeForm } from '../../database/addFee.js' -import { getFeeCategories } from '../../database/getFeeCategories.js' +import getFeeCategories from '../../database/getFeeCategories.js' export default async function handler( request: Request, diff --git a/handlers/admin-post/doAddFeeCategory.js b/handlers/admin-post/doAddFeeCategory.js index d23d4fba..f0f08b01 100644 --- a/handlers/admin-post/doAddFeeCategory.js +++ b/handlers/admin-post/doAddFeeCategory.js @@ -1,5 +1,5 @@ import { addRecord } from '../../database/addRecord.js'; -import { getFeeCategories } from '../../database/getFeeCategories.js'; +import getFeeCategories from '../../database/getFeeCategories.js'; export default async function handler(request, response) { const feeCategoryId = await addRecord('FeeCategories', request.body.feeCategory, request.body.orderNumber ?? -1, request.session.user); const feeCategories = await getFeeCategories({}, { diff --git a/handlers/admin-post/doAddFeeCategory.ts b/handlers/admin-post/doAddFeeCategory.ts index 9de5a454..d3167bcc 100644 --- a/handlers/admin-post/doAddFeeCategory.ts +++ b/handlers/admin-post/doAddFeeCategory.ts @@ -1,7 +1,7 @@ import type { Request, Response } from 'express' import { addRecord } from '../../database/addRecord.js' -import { getFeeCategories } from '../../database/getFeeCategories.js' +import getFeeCategories from '../../database/getFeeCategories.js' export default async function handler( request: Request, diff --git a/handlers/admin-post/doDeleteFee.js b/handlers/admin-post/doDeleteFee.js index 32e8b985..4d2e695b 100644 --- a/handlers/admin-post/doDeleteFee.js +++ b/handlers/admin-post/doDeleteFee.js @@ -1,5 +1,5 @@ import { deleteRecord } from '../../database/deleteRecord.js'; -import { getFeeCategories } from '../../database/getFeeCategories.js'; +import getFeeCategories from '../../database/getFeeCategories.js'; export default async function handler(request, response) { const success = await deleteRecord('Fees', request.body.feeId, request.session.user); const feeCategories = await getFeeCategories({}, { diff --git a/handlers/admin-post/doDeleteFee.ts b/handlers/admin-post/doDeleteFee.ts index 2dba6b38..146c8076 100644 --- a/handlers/admin-post/doDeleteFee.ts +++ b/handlers/admin-post/doDeleteFee.ts @@ -1,7 +1,7 @@ import type { Request, Response } from 'express' import { deleteRecord } from '../../database/deleteRecord.js' -import { getFeeCategories } from '../../database/getFeeCategories.js' +import getFeeCategories from '../../database/getFeeCategories.js' export default async function handler( request: Request, diff --git a/handlers/admin-post/doDeleteFeeCategory.js b/handlers/admin-post/doDeleteFeeCategory.js index 4e860627..35adda48 100644 --- a/handlers/admin-post/doDeleteFeeCategory.js +++ b/handlers/admin-post/doDeleteFeeCategory.js @@ -1,5 +1,5 @@ import { deleteRecord } from '../../database/deleteRecord.js'; -import { getFeeCategories } from '../../database/getFeeCategories.js'; +import getFeeCategories from '../../database/getFeeCategories.js'; export default async function handler(request, response) { const success = await deleteRecord('FeeCategories', request.body.feeCategoryId, request.session.user); const feeCategories = await getFeeCategories({}, { diff --git a/handlers/admin-post/doDeleteFeeCategory.ts b/handlers/admin-post/doDeleteFeeCategory.ts index 7e341aad..c590d470 100644 --- a/handlers/admin-post/doDeleteFeeCategory.ts +++ b/handlers/admin-post/doDeleteFeeCategory.ts @@ -1,7 +1,7 @@ import type { Request, Response } from 'express' import { deleteRecord } from '../../database/deleteRecord.js' -import { getFeeCategories } from '../../database/getFeeCategories.js' +import getFeeCategories from '../../database/getFeeCategories.js' export default async function handler( request: Request, diff --git a/handlers/admin-post/doMoveFeeCategoryDown.js b/handlers/admin-post/doMoveFeeCategoryDown.js index 2d62c073..0e4e93d8 100644 --- a/handlers/admin-post/doMoveFeeCategoryDown.js +++ b/handlers/admin-post/doMoveFeeCategoryDown.js @@ -1,5 +1,5 @@ +import getFeeCategories from '../../database/getFeeCategories.js'; import { moveRecordDown, moveRecordDownToBottom } from '../../database/moveRecord.js'; -import { getFeeCategories } from '../../database/getFeeCategories.js'; export default async function handler(request, response) { const success = request.body.moveToEnd === '1' ? await moveRecordDownToBottom('FeeCategories', request.body.feeCategoryId) diff --git a/handlers/admin-post/doMoveFeeCategoryDown.ts b/handlers/admin-post/doMoveFeeCategoryDown.ts index 9df3cc8b..ebdcbb09 100644 --- a/handlers/admin-post/doMoveFeeCategoryDown.ts +++ b/handlers/admin-post/doMoveFeeCategoryDown.ts @@ -1,19 +1,21 @@ import type { Request, Response } from 'express' +import getFeeCategories from '../../database/getFeeCategories.js' import { moveRecordDown, moveRecordDownToBottom } from '../../database/moveRecord.js' -import { getFeeCategories } from '../../database/getFeeCategories.js' - export default async function handler( request: Request, response: Response ): Promise { const success = request.body.moveToEnd === '1' - ? await moveRecordDownToBottom('FeeCategories', request.body.feeCategoryId) + ? await moveRecordDownToBottom( + 'FeeCategories', + request.body.feeCategoryId + ) : await moveRecordDown('FeeCategories', request.body.feeCategoryId) const feeCategories = await getFeeCategories( @@ -28,4 +30,3 @@ export default async function handler( feeCategories }) } - diff --git a/handlers/admin-post/doMoveFeeCategoryUp.js b/handlers/admin-post/doMoveFeeCategoryUp.js index 3027d540..22e28cc4 100644 --- a/handlers/admin-post/doMoveFeeCategoryUp.js +++ b/handlers/admin-post/doMoveFeeCategoryUp.js @@ -1,5 +1,5 @@ +import getFeeCategories from '../../database/getFeeCategories.js'; import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js'; -import { getFeeCategories } from '../../database/getFeeCategories.js'; export default async function handler(request, response) { const success = request.body.moveToEnd === '1' ? await moveRecordUpToTop('FeeCategories', request.body.feeCategoryId) diff --git a/handlers/admin-post/doMoveFeeCategoryUp.ts b/handlers/admin-post/doMoveFeeCategoryUp.ts index d5e2120f..9db249b8 100644 --- a/handlers/admin-post/doMoveFeeCategoryUp.ts +++ b/handlers/admin-post/doMoveFeeCategoryUp.ts @@ -1,10 +1,7 @@ import type { Request, Response } from 'express' -import { - moveRecordUp, - moveRecordUpToTop -} from '../../database/moveRecord.js' -import { getFeeCategories } from '../../database/getFeeCategories.js' +import getFeeCategories from '../../database/getFeeCategories.js' +import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js' export default async function handler( request: Request, @@ -27,4 +24,3 @@ export default async function handler( feeCategories }) } - diff --git a/handlers/admin-post/doMoveFeeDown.js b/handlers/admin-post/doMoveFeeDown.js index a15a77cf..d6e9a95f 100644 --- a/handlers/admin-post/doMoveFeeDown.js +++ b/handlers/admin-post/doMoveFeeDown.js @@ -1,5 +1,5 @@ +import getFeeCategories from '../../database/getFeeCategories.js'; import { moveFeeDown, moveFeeDownToBottom } from '../../database/moveFee.js'; -import { getFeeCategories } from '../../database/getFeeCategories.js'; export default async function handler(request, response) { const success = request.body.moveToEnd === '1' ? await moveFeeDownToBottom(request.body.feeId) diff --git a/handlers/admin-post/doMoveFeeDown.ts b/handlers/admin-post/doMoveFeeDown.ts index 8f752d03..a05db9ce 100644 --- a/handlers/admin-post/doMoveFeeDown.ts +++ b/handlers/admin-post/doMoveFeeDown.ts @@ -1,11 +1,7 @@ import type { Request, Response } from 'express' -import { - moveFeeDown, - moveFeeDownToBottom -} from '../../database/moveFee.js' - -import { getFeeCategories } from '../../database/getFeeCategories.js' +import getFeeCategories from '../../database/getFeeCategories.js' +import { moveFeeDown, moveFeeDownToBottom } from '../../database/moveFee.js' export default async function handler( request: Request, @@ -28,4 +24,3 @@ export default async function handler( feeCategories }) } - diff --git a/handlers/admin-post/doMoveFeeUp.js b/handlers/admin-post/doMoveFeeUp.js index 80130f4f..6ef9ef5a 100644 --- a/handlers/admin-post/doMoveFeeUp.js +++ b/handlers/admin-post/doMoveFeeUp.js @@ -1,5 +1,5 @@ +import getFeeCategories from '../../database/getFeeCategories.js'; import { moveFeeUp, moveFeeUpToTop } from '../../database/moveFee.js'; -import { getFeeCategories } from '../../database/getFeeCategories.js'; export default async function handler(request, response) { const success = request.body.moveToEnd === '1' ? await moveFeeUpToTop(request.body.feeId) diff --git a/handlers/admin-post/doMoveFeeUp.ts b/handlers/admin-post/doMoveFeeUp.ts index 709d3ea9..75102160 100644 --- a/handlers/admin-post/doMoveFeeUp.ts +++ b/handlers/admin-post/doMoveFeeUp.ts @@ -1,11 +1,7 @@ import type { Request, Response } from 'express' -import { - moveFeeUp, - moveFeeUpToTop -} from '../../database/moveFee.js' - -import { getFeeCategories } from '../../database/getFeeCategories.js' +import getFeeCategories from '../../database/getFeeCategories.js' +import { moveFeeUp, moveFeeUpToTop } from '../../database/moveFee.js' export default async function handler( request: Request, @@ -28,4 +24,3 @@ export default async function handler( feeCategories }) } - diff --git a/handlers/admin-post/doUpdateFee.js b/handlers/admin-post/doUpdateFee.js index 09af285d..e42ee2e7 100644 --- a/handlers/admin-post/doUpdateFee.js +++ b/handlers/admin-post/doUpdateFee.js @@ -1,4 +1,4 @@ -import { getFeeCategories } from '../../database/getFeeCategories.js'; +import getFeeCategories from '../../database/getFeeCategories.js'; import { updateFee } from '../../database/updateFee.js'; export default async function handler(request, response) { const success = await updateFee(request.body, request.session.user); diff --git a/handlers/admin-post/doUpdateFee.ts b/handlers/admin-post/doUpdateFee.ts index 8b15a6a3..24560bb1 100644 --- a/handlers/admin-post/doUpdateFee.ts +++ b/handlers/admin-post/doUpdateFee.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express' -import { getFeeCategories } from '../../database/getFeeCategories.js' +import getFeeCategories from '../../database/getFeeCategories.js' import { updateFee } from '../../database/updateFee.js' export default async function handler( @@ -21,4 +21,3 @@ export default async function handler( feeCategories }) } - diff --git a/handlers/admin-post/doUpdateFeeCategory.js b/handlers/admin-post/doUpdateFeeCategory.js index 8220e707..5c5cd876 100644 --- a/handlers/admin-post/doUpdateFeeCategory.js +++ b/handlers/admin-post/doUpdateFeeCategory.js @@ -1,4 +1,4 @@ -import { getFeeCategories } from '../../database/getFeeCategories.js'; +import getFeeCategories from '../../database/getFeeCategories.js'; import { updateFeeCategory } from '../../database/updateFeeCategory.js'; export default async function handler(request, response) { const success = await updateFeeCategory(request.body, request.session.user); diff --git a/handlers/admin-post/doUpdateFeeCategory.ts b/handlers/admin-post/doUpdateFeeCategory.ts index f19454d4..1cc1e01a 100644 --- a/handlers/admin-post/doUpdateFeeCategory.ts +++ b/handlers/admin-post/doUpdateFeeCategory.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express' -import { getFeeCategories } from '../../database/getFeeCategories.js' +import getFeeCategories from '../../database/getFeeCategories.js' import { updateFeeCategory } from '../../database/updateFeeCategory.js' export default async function handler( @@ -24,4 +24,3 @@ export default async function handler( feeCategories }) } - diff --git a/handlers/api-get/milestoneICS.js b/handlers/api-get/milestoneICS.js index 0548b9b9..d42fb881 100644 --- a/handlers/api-get/milestoneICS.js +++ b/handlers/api-get/milestoneICS.js @@ -1,5 +1,5 @@ import ical, { ICalEventStatus } from 'ical-generator'; -import { getWorkOrderMilestones } from '../../database/getWorkOrderMilestones.js'; +import getWorkOrderMilestones from '../../database/getWorkOrderMilestones.js'; import { getConfigProperty } from '../../helpers/functions.config.js'; import { getPrintConfig } from '../../helpers/functions.print.js'; const calendarCompany = 'cityssm.github.io'; diff --git a/handlers/api-get/milestoneICS.ts b/handlers/api-get/milestoneICS.ts index baa957e8..475c054b 100644 --- a/handlers/api-get/milestoneICS.ts +++ b/handlers/api-get/milestoneICS.ts @@ -3,9 +3,8 @@ import type { Request, Response } from 'express' import ical, { type ICalEventData, ICalEventStatus } from 'ical-generator' -import { - type WorkOrderMilestoneFilters, - getWorkOrderMilestones +import getWorkOrderMilestones, { + type WorkOrderMilestoneFilters } from '../../database/getWorkOrderMilestones.js' import { getConfigProperty } from '../../helpers/functions.config.js' import { getPrintConfig } from '../../helpers/functions.print.js' diff --git a/handlers/dashboard-get/dashboard.js b/handlers/dashboard-get/dashboard.js index 0e33662f..e793fa8d 100644 --- a/handlers/dashboard-get/dashboard.js +++ b/handlers/dashboard-get/dashboard.js @@ -1,6 +1,6 @@ import { dateToString } from '@cityssm/utils-datetime'; -import { getLotOccupancies } from '../../database/getLotOccupancies.js'; -import { getWorkOrderMilestones } from '../../database/getWorkOrderMilestones.js'; +import getLotOccupancies from '../../database/getLotOccupancies.js'; +import getWorkOrderMilestones from '../../database/getWorkOrderMilestones.js'; import { getWorkOrders } from '../../database/getWorkOrders.js'; export default async function handler(_request, response) { const currentDateString = dateToString(new Date()); diff --git a/handlers/dashboard-get/dashboard.ts b/handlers/dashboard-get/dashboard.ts index c2500ea9..fa90486e 100644 --- a/handlers/dashboard-get/dashboard.ts +++ b/handlers/dashboard-get/dashboard.ts @@ -1,8 +1,8 @@ import { dateToString } from '@cityssm/utils-datetime' import type { Request, Response } from 'express' -import { getLotOccupancies } from '../../database/getLotOccupancies.js' -import { getWorkOrderMilestones } from '../../database/getWorkOrderMilestones.js' +import getLotOccupancies from '../../database/getLotOccupancies.js' +import getWorkOrderMilestones from '../../database/getWorkOrderMilestones.js' import { getWorkOrders } from '../../database/getWorkOrders.js' export default async function handler( @@ -52,4 +52,3 @@ export default async function handler( lotOccupancyCount: lotOccupancyResults.count }) } - diff --git a/handlers/lotOccupancies-get/edit.js b/handlers/lotOccupancies-get/edit.js index f16183b9..aa5ab17e 100644 --- a/handlers/lotOccupancies-get/edit.js +++ b/handlers/lotOccupancies-get/edit.js @@ -1,5 +1,5 @@ -import { getLotOccupancy } from '../../database/getLotOccupancy.js'; -import { getMaps } from '../../database/getMaps.js'; +import getLotOccupancy from '../../database/getLotOccupancy.js'; +import getMaps from '../../database/getMaps.js'; import { getLotOccupantTypes, getLotStatuses, getLotTypes, getOccupancyTypePrintsById, getOccupancyTypes, getWorkOrderTypes } from '../../helpers/functions.cache.js'; import { getConfigProperty } from '../../helpers/functions.config.js'; export default async function handler(request, response) { diff --git a/handlers/lotOccupancies-get/edit.ts b/handlers/lotOccupancies-get/edit.ts index f3e1796f..a0a24ccf 100644 --- a/handlers/lotOccupancies-get/edit.ts +++ b/handlers/lotOccupancies-get/edit.ts @@ -1,7 +1,7 @@ import type { Request, Response } from 'express' -import { getLotOccupancy } from '../../database/getLotOccupancy.js' -import { getMaps } from '../../database/getMaps.js' +import getLotOccupancy from '../../database/getLotOccupancy.js' +import getMaps from '../../database/getMaps.js' import { getLotOccupantTypes, getLotStatuses, diff --git a/handlers/lotOccupancies-get/new.js b/handlers/lotOccupancies-get/new.js index 794e82c8..08f9cd1f 100644 --- a/handlers/lotOccupancies-get/new.js +++ b/handlers/lotOccupancies-get/new.js @@ -1,6 +1,6 @@ import { dateToInteger, dateToString } from '@cityssm/utils-datetime'; -import { getLot } from '../../database/getLot.js'; -import { getMaps } from '../../database/getMaps.js'; +import getLot from '../../database/getLot.js'; +import getMaps from '../../database/getMaps.js'; import { getLotOccupantTypes, getLotStatuses, getLotTypes, getOccupancyTypes } from '../../helpers/functions.cache.js'; import { getConfigProperty } from '../../helpers/functions.config.js'; export default async function handler(request, response) { diff --git a/handlers/lotOccupancies-get/new.ts b/handlers/lotOccupancies-get/new.ts index 40aa7e6f..bdfdc7b8 100644 --- a/handlers/lotOccupancies-get/new.ts +++ b/handlers/lotOccupancies-get/new.ts @@ -1,8 +1,8 @@ import { dateToInteger, dateToString } from '@cityssm/utils-datetime' import type { Request, Response } from 'express' -import { getLot } from '../../database/getLot.js' -import { getMaps } from '../../database/getMaps.js' +import getLot from '../../database/getLot.js' +import getMaps from '../../database/getMaps.js' import { getLotOccupantTypes, getLotStatuses, diff --git a/handlers/lotOccupancies-get/search.js b/handlers/lotOccupancies-get/search.js index a453eb44..00a7f6b4 100644 --- a/handlers/lotOccupancies-get/search.js +++ b/handlers/lotOccupancies-get/search.js @@ -1,4 +1,4 @@ -import { getMaps } from '../../database/getMaps.js'; +import getMaps from '../../database/getMaps.js'; import { getLotTypes, getOccupancyTypes } from '../../helpers/functions.cache.js'; import { getConfigProperty } from '../../helpers/functions.config.js'; export default async function handler(request, response) { diff --git a/handlers/lotOccupancies-get/search.ts b/handlers/lotOccupancies-get/search.ts index f1b7615d..cde30194 100644 --- a/handlers/lotOccupancies-get/search.ts +++ b/handlers/lotOccupancies-get/search.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express' -import { getMaps } from '../../database/getMaps.js' +import getMaps from '../../database/getMaps.js' import { getLotTypes, getOccupancyTypes diff --git a/handlers/lotOccupancies-get/view.js b/handlers/lotOccupancies-get/view.js index 146c4369..252510fb 100644 --- a/handlers/lotOccupancies-get/view.js +++ b/handlers/lotOccupancies-get/view.js @@ -1,4 +1,4 @@ -import { getLotOccupancy } from '../../database/getLotOccupancy.js'; +import getLotOccupancy from '../../database/getLotOccupancy.js'; import { getOccupancyTypePrintsById } from '../../helpers/functions.cache.js'; import { getConfigProperty } from '../../helpers/functions.config.js'; export default async function handler(request, response) { diff --git a/handlers/lotOccupancies-get/view.ts b/handlers/lotOccupancies-get/view.ts index 45622ac9..4686072e 100644 --- a/handlers/lotOccupancies-get/view.ts +++ b/handlers/lotOccupancies-get/view.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express' -import { getLotOccupancy } from '../../database/getLotOccupancy.js' +import getLotOccupancy from '../../database/getLotOccupancy.js' import { getOccupancyTypePrintsById } from '../../helpers/functions.cache.js' import { getConfigProperty } from '../../helpers/functions.config.js' diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyComment.js b/handlers/lotOccupancies-post/doAddLotOccupancyComment.js index 9a0bb924..c6a8d7fb 100644 --- a/handlers/lotOccupancies-post/doAddLotOccupancyComment.js +++ b/handlers/lotOccupancies-post/doAddLotOccupancyComment.js @@ -1,5 +1,5 @@ import addLotOccupancyComment from '../../database/addLotOccupancyComment.js'; -import { getLotOccupancyComments } from '../../database/getLotOccupancyComments.js'; +import getLotOccupancyComments from '../../database/getLotOccupancyComments.js'; export default async function handler(request, response) { await addLotOccupancyComment(request.body, request.session.user); const lotOccupancyComments = await getLotOccupancyComments(request.body.lotOccupancyId); diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyComment.ts b/handlers/lotOccupancies-post/doAddLotOccupancyComment.ts index 16407e17..a5373a86 100644 --- a/handlers/lotOccupancies-post/doAddLotOccupancyComment.ts +++ b/handlers/lotOccupancies-post/doAddLotOccupancyComment.ts @@ -3,7 +3,7 @@ import type { Request, Response } from 'express' import addLotOccupancyComment, { type AddLotOccupancyCommentForm } from '../../database/addLotOccupancyComment.js' -import { getLotOccupancyComments } from '../../database/getLotOccupancyComments.js' +import getLotOccupancyComments from '../../database/getLotOccupancyComments.js' export default async function handler( request: Request, @@ -23,4 +23,3 @@ export default async function handler( lotOccupancyComments }) } - diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyFee.js b/handlers/lotOccupancies-post/doAddLotOccupancyFee.js index 253097d1..bde811b7 100644 --- a/handlers/lotOccupancies-post/doAddLotOccupancyFee.js +++ b/handlers/lotOccupancies-post/doAddLotOccupancyFee.js @@ -1,5 +1,5 @@ import addLotOccupancyFee from '../../database/addLotOccupancyFee.js'; -import { getLotOccupancyFees } from '../../database/getLotOccupancyFees.js'; +import getLotOccupancyFees from '../../database/getLotOccupancyFees.js'; export default async function handler(request, response) { await addLotOccupancyFee(request.body, request.session.user); const lotOccupancyFees = await getLotOccupancyFees(request.body.lotOccupancyId); diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyFee.ts b/handlers/lotOccupancies-post/doAddLotOccupancyFee.ts index 5e702401..0bf3c9d6 100644 --- a/handlers/lotOccupancies-post/doAddLotOccupancyFee.ts +++ b/handlers/lotOccupancies-post/doAddLotOccupancyFee.ts @@ -3,7 +3,7 @@ import type { Request, Response } from 'express' import addLotOccupancyFee, { type AddLotOccupancyFeeForm } from '../../database/addLotOccupancyFee.js' -import { getLotOccupancyFees } from '../../database/getLotOccupancyFees.js' +import getLotOccupancyFees from '../../database/getLotOccupancyFees.js' export default async function handler( request: Request, @@ -23,4 +23,3 @@ export default async function handler( lotOccupancyFees }) } - diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyOccupant.js b/handlers/lotOccupancies-post/doAddLotOccupancyOccupant.js index 0383daa0..5165f900 100644 --- a/handlers/lotOccupancies-post/doAddLotOccupancyOccupant.js +++ b/handlers/lotOccupancies-post/doAddLotOccupancyOccupant.js @@ -1,5 +1,5 @@ import addLotOccupancyOccupant from '../../database/addLotOccupancyOccupant.js'; -import { getLotOccupancyOccupants } from '../../database/getLotOccupancyOccupants.js'; +import getLotOccupancyOccupants from '../../database/getLotOccupancyOccupants.js'; export default async function handler(request, response) { await addLotOccupancyOccupant(request.body, request.session.user); const lotOccupancyOccupants = await getLotOccupancyOccupants(request.body.lotOccupancyId); diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyOccupant.ts b/handlers/lotOccupancies-post/doAddLotOccupancyOccupant.ts index f5938dd8..a3fbc7f6 100644 --- a/handlers/lotOccupancies-post/doAddLotOccupancyOccupant.ts +++ b/handlers/lotOccupancies-post/doAddLotOccupancyOccupant.ts @@ -3,7 +3,7 @@ import type { Request, Response } from 'express' import addLotOccupancyOccupant, { type AddLotOccupancyOccupantForm } from '../../database/addLotOccupancyOccupant.js' -import { getLotOccupancyOccupants } from '../../database/getLotOccupancyOccupants.js' +import getLotOccupancyOccupants from '../../database/getLotOccupancyOccupants.js' export default async function handler( request: Request, @@ -23,4 +23,3 @@ export default async function handler( lotOccupancyOccupants }) } - diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.js b/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.js index 7ab7212c..eaec4874 100644 --- a/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.js +++ b/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.js @@ -1,5 +1,5 @@ import addLotOccupancyTransaction from '../../database/addLotOccupancyTransaction.js'; -import { getLotOccupancyTransactions } from '../../database/getLotOccupancyTransactions.js'; +import getLotOccupancyTransactions from '../../database/getLotOccupancyTransactions.js'; export default async function handler(request, response) { await addLotOccupancyTransaction(request.body, request.session.user); const lotOccupancyTransactions = await getLotOccupancyTransactions(request.body.lotOccupancyId, { includeIntegrations: true }); diff --git a/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.ts b/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.ts index f57dc943..200d1e95 100644 --- a/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.ts +++ b/handlers/lotOccupancies-post/doAddLotOccupancyTransaction.ts @@ -3,7 +3,7 @@ import type { Request, Response } from 'express' import addLotOccupancyTransaction, { type AddLotOccupancyTransactionForm } from '../../database/addLotOccupancyTransaction.js' -import { getLotOccupancyTransactions } from '../../database/getLotOccupancyTransactions.js' +import getLotOccupancyTransactions from '../../database/getLotOccupancyTransactions.js' export default async function handler( request: Request, @@ -24,4 +24,3 @@ export default async function handler( lotOccupancyTransactions }) } - diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancyComment.js b/handlers/lotOccupancies-post/doDeleteLotOccupancyComment.js index c59022d4..4bc6aa0b 100644 --- a/handlers/lotOccupancies-post/doDeleteLotOccupancyComment.js +++ b/handlers/lotOccupancies-post/doDeleteLotOccupancyComment.js @@ -1,5 +1,5 @@ import { deleteRecord } from '../../database/deleteRecord.js'; -import { getLotOccupancyComments } from '../../database/getLotOccupancyComments.js'; +import getLotOccupancyComments from '../../database/getLotOccupancyComments.js'; export default async function handler(request, response) { const success = await deleteRecord('LotOccupancyComments', request.body.lotOccupancyCommentId, request.session.user); const lotOccupancyComments = await getLotOccupancyComments(request.body.lotOccupancyId); diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancyComment.ts b/handlers/lotOccupancies-post/doDeleteLotOccupancyComment.ts index 1f81f089..f659d774 100644 --- a/handlers/lotOccupancies-post/doDeleteLotOccupancyComment.ts +++ b/handlers/lotOccupancies-post/doDeleteLotOccupancyComment.ts @@ -1,7 +1,7 @@ import type { Request, Response } from 'express' import { deleteRecord } from '../../database/deleteRecord.js' -import { getLotOccupancyComments } from '../../database/getLotOccupancyComments.js' +import getLotOccupancyComments from '../../database/getLotOccupancyComments.js' export default async function handler( request: Request, @@ -22,4 +22,3 @@ export default async function handler( lotOccupancyComments }) } - diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancyFee.js b/handlers/lotOccupancies-post/doDeleteLotOccupancyFee.js index 217dd820..a4ffea29 100644 --- a/handlers/lotOccupancies-post/doDeleteLotOccupancyFee.js +++ b/handlers/lotOccupancies-post/doDeleteLotOccupancyFee.js @@ -1,5 +1,5 @@ import deleteLotOccupancyFee from '../../database/deleteLotOccupancyFee.js'; -import { getLotOccupancyFees } from '../../database/getLotOccupancyFees.js'; +import getLotOccupancyFees from '../../database/getLotOccupancyFees.js'; export default async function handler(request, response) { const success = await deleteLotOccupancyFee(request.body.lotOccupancyId, request.body.feeId, request.session.user); const lotOccupancyFees = await getLotOccupancyFees(request.body.lotOccupancyId); diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancyFee.ts b/handlers/lotOccupancies-post/doDeleteLotOccupancyFee.ts index c296040d..2cb5b8bc 100644 --- a/handlers/lotOccupancies-post/doDeleteLotOccupancyFee.ts +++ b/handlers/lotOccupancies-post/doDeleteLotOccupancyFee.ts @@ -1,7 +1,7 @@ import type { Request, Response } from 'express' import deleteLotOccupancyFee from '../../database/deleteLotOccupancyFee.js' -import { getLotOccupancyFees } from '../../database/getLotOccupancyFees.js' +import getLotOccupancyFees from '../../database/getLotOccupancyFees.js' export default async function handler( request: Request, @@ -13,11 +13,12 @@ export default async function handler( request.session.user as User ) - const lotOccupancyFees = await getLotOccupancyFees(request.body.lotOccupancyId) + const lotOccupancyFees = await getLotOccupancyFees( + request.body.lotOccupancyId + ) response.json({ success, lotOccupancyFees }) } - diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.js b/handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.js index 58b5ed24..7650ad4f 100644 --- a/handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.js +++ b/handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.js @@ -1,5 +1,5 @@ import deleteLotOccupancyOccupant from '../../database/deleteLotOccupancyOccupant.js'; -import { getLotOccupancyOccupants } from '../../database/getLotOccupancyOccupants.js'; +import getLotOccupancyOccupants from '../../database/getLotOccupancyOccupants.js'; export default async function handler(request, response) { const success = await deleteLotOccupancyOccupant(request.body.lotOccupancyId, request.body.lotOccupantIndex, request.session.user); const lotOccupancyOccupants = await getLotOccupancyOccupants(request.body.lotOccupancyId); diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.ts b/handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.ts index 72ead6b3..967497f5 100644 --- a/handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.ts +++ b/handlers/lotOccupancies-post/doDeleteLotOccupancyOccupant.ts @@ -1,7 +1,7 @@ import type { Request, Response } from 'express' import deleteLotOccupancyOccupant from '../../database/deleteLotOccupancyOccupant.js' -import { getLotOccupancyOccupants } from '../../database/getLotOccupancyOccupants.js' +import getLotOccupancyOccupants from '../../database/getLotOccupancyOccupants.js' export default async function handler( request: Request, @@ -22,4 +22,3 @@ export default async function handler( lotOccupancyOccupants }) } - diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.js b/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.js index 24fda3e5..2acf9bf4 100644 --- a/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.js +++ b/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.js @@ -1,5 +1,5 @@ import deleteLotOccupancyTransaction from '../../database/deleteLotOccupancyTransaction.js'; -import { getLotOccupancyTransactions } from '../../database/getLotOccupancyTransactions.js'; +import getLotOccupancyTransactions from '../../database/getLotOccupancyTransactions.js'; export default async function handler(request, response) { const success = await deleteLotOccupancyTransaction(request.body.lotOccupancyId, request.body.transactionIndex, request.session.user); const lotOccupancyTransactions = await getLotOccupancyTransactions(request.body.lotOccupancyId, { includeIntegrations: true }); diff --git a/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.ts b/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.ts index 86a3cc5b..11e451ee 100644 --- a/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.ts +++ b/handlers/lotOccupancies-post/doDeleteLotOccupancyTransaction.ts @@ -1,7 +1,7 @@ import type { Request, Response } from 'express' import deleteLotOccupancyTransaction from '../../database/deleteLotOccupancyTransaction.js' -import { getLotOccupancyTransactions } from '../../database/getLotOccupancyTransactions.js' +import getLotOccupancyTransactions from '../../database/getLotOccupancyTransactions.js' export default async function handler( request: Request, @@ -23,4 +23,3 @@ export default async function handler( lotOccupancyTransactions }) } - diff --git a/handlers/lotOccupancies-post/doGetFees.js b/handlers/lotOccupancies-post/doGetFees.js index 75efbfb9..dbcd85d3 100644 --- a/handlers/lotOccupancies-post/doGetFees.js +++ b/handlers/lotOccupancies-post/doGetFees.js @@ -1,5 +1,5 @@ -import { getLotOccupancy } from '../../database/getLotOccupancy.js'; -import { getFeeCategories } from '../../database/getFeeCategories.js'; +import getFeeCategories from '../../database/getFeeCategories.js'; +import getLotOccupancy from '../../database/getLotOccupancy.js'; export default async function handler(request, response) { const lotOccupancyId = request.body.lotOccupancyId; const lotOccupancy = (await getLotOccupancy(lotOccupancyId)); diff --git a/handlers/lotOccupancies-post/doGetFees.ts b/handlers/lotOccupancies-post/doGetFees.ts index 58d35a5e..f6ee03f6 100644 --- a/handlers/lotOccupancies-post/doGetFees.ts +++ b/handlers/lotOccupancies-post/doGetFees.ts @@ -1,8 +1,7 @@ import type { Request, Response } from 'express' -import { getLotOccupancy } from '../../database/getLotOccupancy.js' - -import { getFeeCategories } from '../../database/getFeeCategories.js' +import getFeeCategories from '../../database/getFeeCategories.js' +import getLotOccupancy from '../../database/getLotOccupancy.js' export default async function handler( request: Request, @@ -26,4 +25,3 @@ export default async function handler( feeCategories }) } - diff --git a/handlers/lotOccupancies-post/doSearchLotOccupancies.js b/handlers/lotOccupancies-post/doSearchLotOccupancies.js index a45a6e42..6ddf8460 100644 --- a/handlers/lotOccupancies-post/doSearchLotOccupancies.js +++ b/handlers/lotOccupancies-post/doSearchLotOccupancies.js @@ -1,4 +1,4 @@ -import { getLotOccupancies } from '../../database/getLotOccupancies.js'; +import getLotOccupancies from '../../database/getLotOccupancies.js'; export default async function handler(request, response) { const result = await getLotOccupancies(request.body, { limit: request.body.limit, diff --git a/handlers/lotOccupancies-post/doSearchLotOccupancies.ts b/handlers/lotOccupancies-post/doSearchLotOccupancies.ts index 6cae2333..06f2e44f 100644 --- a/handlers/lotOccupancies-post/doSearchLotOccupancies.ts +++ b/handlers/lotOccupancies-post/doSearchLotOccupancies.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express' -import { getLotOccupancies } from '../../database/getLotOccupancies.js' +import getLotOccupancies from '../../database/getLotOccupancies.js' export default async function handler( request: Request, @@ -20,4 +20,3 @@ export default async function handler( lotOccupancies: result.lotOccupancies }) } - diff --git a/handlers/lotOccupancies-post/doSearchPastOccupants.js b/handlers/lotOccupancies-post/doSearchPastOccupants.js index 58374c15..518985f6 100644 --- a/handlers/lotOccupancies-post/doSearchPastOccupants.js +++ b/handlers/lotOccupancies-post/doSearchPastOccupants.js @@ -1,4 +1,4 @@ -import { getPastLotOccupancyOccupants } from '../../database/getPastLotOccupancyOccupants.js'; +import getPastLotOccupancyOccupants from '../../database/getPastLotOccupancyOccupants.js'; export default async function handler(request, response) { const occupants = await getPastLotOccupancyOccupants(request.body, { limit: Number.parseInt(request.body.limit, 10) diff --git a/handlers/lotOccupancies-post/doSearchPastOccupants.ts b/handlers/lotOccupancies-post/doSearchPastOccupants.ts index 0d2f1a82..5018498f 100644 --- a/handlers/lotOccupancies-post/doSearchPastOccupants.ts +++ b/handlers/lotOccupancies-post/doSearchPastOccupants.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express' -import { getPastLotOccupancyOccupants } from '../../database/getPastLotOccupancyOccupants.js' +import getPastLotOccupancyOccupants from '../../database/getPastLotOccupancyOccupants.js' export default async function handler( request: Request, @@ -14,4 +14,3 @@ export default async function handler( occupants }) } - diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancyComment.js b/handlers/lotOccupancies-post/doUpdateLotOccupancyComment.js index c35e1060..84cfc4c7 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancyComment.js +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancyComment.js @@ -1,4 +1,4 @@ -import { getLotOccupancyComments } from '../../database/getLotOccupancyComments.js'; +import getLotOccupancyComments from '../../database/getLotOccupancyComments.js'; import { updateLotOccupancyComment } from '../../database/updateLotOccupancyComment.js'; export default async function handler(request, response) { const success = await updateLotOccupancyComment(request.body, request.session.user); diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancyComment.ts b/handlers/lotOccupancies-post/doUpdateLotOccupancyComment.ts index 03a7cc97..35e02409 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancyComment.ts +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancyComment.ts @@ -1,13 +1,16 @@ import type { Request, Response } from 'express' -import { getLotOccupancyComments } from '../../database/getLotOccupancyComments.js' +import getLotOccupancyComments from '../../database/getLotOccupancyComments.js' import { updateLotOccupancyComment } from '../../database/updateLotOccupancyComment.js' export default async function handler( request: Request, response: Response ): Promise { - const success = await updateLotOccupancyComment(request.body, request.session.user as User) + const success = await updateLotOccupancyComment( + request.body, + request.session.user as User + ) const lotOccupancyComments = await getLotOccupancyComments( request.body.lotOccupancyId @@ -18,4 +21,3 @@ export default async function handler( lotOccupancyComments }) } - diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.js b/handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.js index dad02d56..8d095763 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.js +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.js @@ -1,4 +1,4 @@ -import { getLotOccupancyFees } from '../../database/getLotOccupancyFees.js'; +import getLotOccupancyFees from '../../database/getLotOccupancyFees.js'; import { updateLotOccupancyFeeQuantity } from '../../database/updateLotOccupancyFeeQuantity.js'; export default async function handler(request, response) { const success = await updateLotOccupancyFeeQuantity(request.body, request.session.user); diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.ts b/handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.ts index 9a577c7d..d838877e 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.ts +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express' -import { getLotOccupancyFees } from '../../database/getLotOccupancyFees.js' +import getLotOccupancyFees from '../../database/getLotOccupancyFees.js' import { updateLotOccupancyFeeQuantity } from '../../database/updateLotOccupancyFeeQuantity.js' export default async function handler( @@ -21,4 +21,3 @@ export default async function handler( lotOccupancyFees }) } - diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.js b/handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.js index c0387c23..34ce3b22 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.js +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.js @@ -1,4 +1,4 @@ -import { getLotOccupancyOccupants } from '../../database/getLotOccupancyOccupants.js'; +import getLotOccupancyOccupants from '../../database/getLotOccupancyOccupants.js'; import { updateLotOccupancyOccupant } from '../../database/updateLotOccupancyOccupant.js'; export default async function handler(request, response) { const success = await updateLotOccupancyOccupant(request.body, request.session.user); diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.ts b/handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.ts index 1e98a70d..8a0d0b76 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.ts +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.ts @@ -1,13 +1,16 @@ import type { Request, Response } from 'express' -import { getLotOccupancyOccupants } from '../../database/getLotOccupancyOccupants.js' +import getLotOccupancyOccupants from '../../database/getLotOccupancyOccupants.js' import { updateLotOccupancyOccupant } from '../../database/updateLotOccupancyOccupant.js' export default async function handler( request: Request, response: Response ): Promise { - const success = await updateLotOccupancyOccupant(request.body, request.session.user as User) + const success = await updateLotOccupancyOccupant( + request.body, + request.session.user as User + ) const lotOccupancyOccupants = await getLotOccupancyOccupants( request.body.lotOccupancyId @@ -18,4 +21,3 @@ export default async function handler( lotOccupancyOccupants }) } - diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.js b/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.js index a8c2eaa9..334cc815 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.js +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.js @@ -1,4 +1,4 @@ -import { getLotOccupancyTransactions } from '../../database/getLotOccupancyTransactions.js'; +import getLotOccupancyTransactions from '../../database/getLotOccupancyTransactions.js'; import { updateLotOccupancyTransaction } from '../../database/updateLotOccupancyTransaction.js'; export default async function handler(request, response) { await updateLotOccupancyTransaction(request.body, request.session.user); diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.ts b/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.ts index 02d99b39..bbd858dd 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.ts +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.ts @@ -1,13 +1,16 @@ import type { Request, Response } from 'express' -import { getLotOccupancyTransactions } from '../../database/getLotOccupancyTransactions.js' +import getLotOccupancyTransactions from '../../database/getLotOccupancyTransactions.js' import { updateLotOccupancyTransaction } from '../../database/updateLotOccupancyTransaction.js' export default async function handler( request: Request, response: Response ): Promise { - await updateLotOccupancyTransaction(request.body, request.session.user as User) + await updateLotOccupancyTransaction( + request.body, + request.session.user as User + ) const lotOccupancyTransactions = await getLotOccupancyTransactions( request.body.lotOccupancyId, @@ -19,4 +22,3 @@ export default async function handler( lotOccupancyTransactions }) } - diff --git a/handlers/lots-get/edit.js b/handlers/lots-get/edit.js index f10779b4..0bf5e957 100644 --- a/handlers/lots-get/edit.js +++ b/handlers/lots-get/edit.js @@ -1,5 +1,5 @@ -import { getLot } from '../../database/getLot.js'; -import { getMaps } from '../../database/getMaps.js'; +import getLot from '../../database/getLot.js'; +import getMaps from '../../database/getMaps.js'; import { getLotStatuses, getLotTypes } from '../../helpers/functions.cache.js'; import { getConfigProperty } from '../../helpers/functions.config.js'; export default async function handler(request, response) { diff --git a/handlers/lots-get/edit.ts b/handlers/lots-get/edit.ts index 5c821595..5dae7389 100644 --- a/handlers/lots-get/edit.ts +++ b/handlers/lots-get/edit.ts @@ -1,7 +1,7 @@ import type { Request, Response } from 'express' -import { getLot } from '../../database/getLot.js' -import { getMaps } from '../../database/getMaps.js' +import getLot from '../../database/getLot.js' +import getMaps from '../../database/getMaps.js' import { getLotStatuses, getLotTypes } from '../../helpers/functions.cache.js' import { getConfigProperty } from '../../helpers/functions.config.js' diff --git a/handlers/lots-get/new.js b/handlers/lots-get/new.js index 42a1bdb2..37ae6159 100644 --- a/handlers/lots-get/new.js +++ b/handlers/lots-get/new.js @@ -1,4 +1,4 @@ -import { getMaps } from '../../database/getMaps.js'; +import getMaps from '../../database/getMaps.js'; import { getLotStatuses, getLotTypes } from '../../helpers/functions.cache.js'; import { getConfigProperty } from '../../helpers/functions.config.js'; export default async function handler(request, response) { diff --git a/handlers/lots-get/new.ts b/handlers/lots-get/new.ts index bfb7e2e1..c3f50a14 100644 --- a/handlers/lots-get/new.ts +++ b/handlers/lots-get/new.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express' -import { getMaps } from '../../database/getMaps.js' +import getMaps from '../../database/getMaps.js' import { getLotStatuses, getLotTypes } from '../../helpers/functions.cache.js' import { getConfigProperty } from '../../helpers/functions.config.js' import type { Lot } from '../../types/recordTypes.js' diff --git a/handlers/lots-get/search.js b/handlers/lots-get/search.js index 520be19e..570ddfb7 100644 --- a/handlers/lots-get/search.js +++ b/handlers/lots-get/search.js @@ -1,4 +1,4 @@ -import { getMaps } from '../../database/getMaps.js'; +import getMaps from '../../database/getMaps.js'; import { getLotStatuses, getLotTypes } from '../../helpers/functions.cache.js'; import { getConfigProperty } from '../../helpers/functions.config.js'; export default async function handler(request, response) { diff --git a/handlers/lots-get/search.ts b/handlers/lots-get/search.ts index a5a76fb6..0695f7b0 100644 --- a/handlers/lots-get/search.ts +++ b/handlers/lots-get/search.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express' -import { getMaps } from '../../database/getMaps.js' +import getMaps from '../../database/getMaps.js' import { getLotStatuses, getLotTypes } from '../../helpers/functions.cache.js' import { getConfigProperty } from '../../helpers/functions.config.js' diff --git a/handlers/lots-get/view.js b/handlers/lots-get/view.js index f84a7e08..9b3f2f3b 100644 --- a/handlers/lots-get/view.js +++ b/handlers/lots-get/view.js @@ -1,4 +1,4 @@ -import { getLot } from '../../database/getLot.js'; +import getLot from '../../database/getLot.js'; import { getConfigProperty } from '../../helpers/functions.config.js'; import { getNextLotId, getPreviousLotId } from '../../helpers/functions.lots.js'; export default async function handler(request, response) { diff --git a/handlers/lots-get/view.ts b/handlers/lots-get/view.ts index f50cdc1e..a5d9d197 100644 --- a/handlers/lots-get/view.ts +++ b/handlers/lots-get/view.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express' -import { getLot } from '../../database/getLot.js' +import getLot from '../../database/getLot.js' import { getConfigProperty } from '../../helpers/functions.config.js' import { getNextLotId, getPreviousLotId } from '../../helpers/functions.lots.js' diff --git a/handlers/lots-post/doAddLotComment.js b/handlers/lots-post/doAddLotComment.js index 303be7bf..4bcec715 100644 --- a/handlers/lots-post/doAddLotComment.js +++ b/handlers/lots-post/doAddLotComment.js @@ -1,5 +1,5 @@ import addLotComment from '../../database/addLotComment.js'; -import { getLotComments } from '../../database/getLotComments.js'; +import getLotComments from '../../database/getLotComments.js'; export default async function handler(request, response) { await addLotComment(request.body, request.session.user); const lotComments = await getLotComments(request.body.lotId); diff --git a/handlers/lots-post/doAddLotComment.ts b/handlers/lots-post/doAddLotComment.ts index 04c3b0be..17fba252 100644 --- a/handlers/lots-post/doAddLotComment.ts +++ b/handlers/lots-post/doAddLotComment.ts @@ -3,7 +3,7 @@ import type { Request, Response } from 'express' import addLotComment, { type AddLotCommentForm } from '../../database/addLotComment.js' -import { getLotComments } from '../../database/getLotComments.js' +import getLotComments from '../../database/getLotComments.js' export default async function handler( request: Request, @@ -21,4 +21,3 @@ export default async function handler( lotComments }) } - diff --git a/handlers/lots-post/doDeleteLotComment.js b/handlers/lots-post/doDeleteLotComment.js index 11eac4fc..69b8e818 100644 --- a/handlers/lots-post/doDeleteLotComment.js +++ b/handlers/lots-post/doDeleteLotComment.js @@ -1,5 +1,5 @@ import { deleteRecord } from '../../database/deleteRecord.js'; -import { getLotComments } from '../../database/getLotComments.js'; +import getLotComments from '../../database/getLotComments.js'; export default async function handler(request, response) { const success = await deleteRecord('LotComments', request.body.lotCommentId, request.session.user); const lotComments = await getLotComments(request.body.lotId); diff --git a/handlers/lots-post/doDeleteLotComment.ts b/handlers/lots-post/doDeleteLotComment.ts index 56440c07..2d8ad796 100644 --- a/handlers/lots-post/doDeleteLotComment.ts +++ b/handlers/lots-post/doDeleteLotComment.ts @@ -1,7 +1,7 @@ import type { Request, Response } from 'express' import { deleteRecord } from '../../database/deleteRecord.js' -import { getLotComments } from '../../database/getLotComments.js' +import getLotComments from '../../database/getLotComments.js' export default async function handler( request: Request, @@ -9,15 +9,14 @@ export default async function handler( ): Promise { const success = await deleteRecord( 'LotComments', - request.body.lotCommentId, + request.body.lotCommentId as string, request.session.user as User ) - const lotComments = await getLotComments(request.body.lotId) + const lotComments = await getLotComments(request.body.lotId as string) response.json({ success, lotComments }) } - diff --git a/handlers/lots-post/doSearchLots.js b/handlers/lots-post/doSearchLots.js index a6077e3e..1b2716e3 100644 --- a/handlers/lots-post/doSearchLots.js +++ b/handlers/lots-post/doSearchLots.js @@ -1,4 +1,4 @@ -import { getLots } from '../../database/getLots.js'; +import getLots from '../../database/getLots.js'; export default async function handler(request, response) { const result = await getLots(request.body, { limit: request.body.limit, diff --git a/handlers/lots-post/doSearchLots.ts b/handlers/lots-post/doSearchLots.ts index 549d3237..59ab0590 100644 --- a/handlers/lots-post/doSearchLots.ts +++ b/handlers/lots-post/doSearchLots.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express' -import { getLots } from '../../database/getLots.js' +import getLots from '../../database/getLots.js' export default async function handler(request: Request, response: Response): Promise { const result = await getLots(request.body, { diff --git a/handlers/lots-post/doUpdateLotComment.js b/handlers/lots-post/doUpdateLotComment.js index 05ae6048..d7056390 100644 --- a/handlers/lots-post/doUpdateLotComment.js +++ b/handlers/lots-post/doUpdateLotComment.js @@ -1,4 +1,4 @@ -import { getLotComments } from '../../database/getLotComments.js'; +import getLotComments from '../../database/getLotComments.js'; import { updateLotComment } from '../../database/updateLotComment.js'; export default async function handler(request, response) { const success = await updateLotComment(request.body, request.session.user); diff --git a/handlers/lots-post/doUpdateLotComment.ts b/handlers/lots-post/doUpdateLotComment.ts index 6d4c46bd..69e5be7c 100644 --- a/handlers/lots-post/doUpdateLotComment.ts +++ b/handlers/lots-post/doUpdateLotComment.ts @@ -1,19 +1,21 @@ import type { Request, Response } from 'express' -import { getLotComments } from '../../database/getLotComments.js' +import getLotComments from '../../database/getLotComments.js' import { updateLotComment } from '../../database/updateLotComment.js' export default async function handler( request: Request, response: Response ): Promise { - const success = await updateLotComment(request.body, request.session.user as User) + const success = await updateLotComment( + request.body, + request.session.user as User + ) - const lotComments = await getLotComments(request.body.lotId) + const lotComments = await getLotComments(request.body.lotId as string) response.json({ success, lotComments }) } - diff --git a/handlers/maps-get/edit.js b/handlers/maps-get/edit.js index b79a8018..d5d5ecfc 100644 --- a/handlers/maps-get/edit.js +++ b/handlers/maps-get/edit.js @@ -1,6 +1,6 @@ -import { getLotStatusSummary } from '../../database/getLotStatusSummary.js'; -import { getLotTypeSummary } from '../../database/getLotTypeSummary.js'; -import { getMap } from '../../database/getMap.js'; +import getLotStatusSummary from '../../database/getLotStatusSummary.js'; +import getLotTypeSummary from '../../database/getLotTypeSummary.js'; +import getMap from '../../database/getMap.js'; import { getConfigProperty } from '../../helpers/functions.config.js'; import { getMapSVGs } from '../../helpers/functions.map.js'; export default async function handler(request, response) { diff --git a/handlers/maps-get/edit.ts b/handlers/maps-get/edit.ts index 6c03acab..7997b9a0 100644 --- a/handlers/maps-get/edit.ts +++ b/handlers/maps-get/edit.ts @@ -1,8 +1,8 @@ import type { Request, Response } from 'express' -import { getLotStatusSummary } from '../../database/getLotStatusSummary.js' -import { getLotTypeSummary } from '../../database/getLotTypeSummary.js' -import { getMap } from '../../database/getMap.js' +import getLotStatusSummary from '../../database/getLotStatusSummary.js' +import getLotTypeSummary from '../../database/getLotTypeSummary.js' +import getMap from '../../database/getMap.js' import { getConfigProperty } from '../../helpers/functions.config.js' import { getMapSVGs } from '../../helpers/functions.map.js' diff --git a/handlers/maps-get/next.js b/handlers/maps-get/next.js index 7484da0a..ddccde04 100644 --- a/handlers/maps-get/next.js +++ b/handlers/maps-get/next.js @@ -1,4 +1,4 @@ -import { getNextMapId } from '../../database/getNextMapId.js'; +import getNextMapId from '../../database/getNextMapId.js'; import { getConfigProperty } from '../../helpers/functions.config.js'; export default async function handler(request, response) { const mapId = Number.parseInt(request.params.mapId, 10); diff --git a/handlers/maps-get/next.ts b/handlers/maps-get/next.ts index 062f9375..fc059e0f 100644 --- a/handlers/maps-get/next.ts +++ b/handlers/maps-get/next.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express' -import { getNextMapId } from '../../database/getNextMapId.js' +import getNextMapId from '../../database/getNextMapId.js' import { getConfigProperty } from '../../helpers/functions.config.js' export default async function handler( diff --git a/handlers/maps-get/previous.js b/handlers/maps-get/previous.js index 5a3a3ac7..da0f7988 100644 --- a/handlers/maps-get/previous.js +++ b/handlers/maps-get/previous.js @@ -1,4 +1,4 @@ -import { getPreviousMapId } from '../../database/getPreviousMapId.js'; +import getPreviousMapId from '../../database/getPreviousMapId.js'; import { getConfigProperty } from '../../helpers/functions.config.js'; export default async function handler(request, response) { const mapId = Number.parseInt(request.params.mapId, 10); diff --git a/handlers/maps-get/previous.ts b/handlers/maps-get/previous.ts index 3d4a559e..d40f3854 100644 --- a/handlers/maps-get/previous.ts +++ b/handlers/maps-get/previous.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express' -import { getPreviousMapId } from '../../database/getPreviousMapId.js' +import getPreviousMapId from '../../database/getPreviousMapId.js' import { getConfigProperty } from '../../helpers/functions.config.js' export default async function handler( diff --git a/handlers/maps-get/search.js b/handlers/maps-get/search.js index be4e3dfb..cda635f0 100644 --- a/handlers/maps-get/search.js +++ b/handlers/maps-get/search.js @@ -1,4 +1,4 @@ -import { getMaps } from '../../database/getMaps.js'; +import getMaps from '../../database/getMaps.js'; import { getConfigProperty } from '../../helpers/functions.config.js'; export default async function handler(_request, response) { const maps = await getMaps(); diff --git a/handlers/maps-get/search.ts b/handlers/maps-get/search.ts index d35b2f22..f54a4614 100644 --- a/handlers/maps-get/search.ts +++ b/handlers/maps-get/search.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express' -import { getMaps } from '../../database/getMaps.js' +import getMaps from '../../database/getMaps.js' import { getConfigProperty } from '../../helpers/functions.config.js' export default async function handler( diff --git a/handlers/maps-get/view.js b/handlers/maps-get/view.js index 4bb512dc..6c193ec6 100644 --- a/handlers/maps-get/view.js +++ b/handlers/maps-get/view.js @@ -1,6 +1,6 @@ -import { getLotStatusSummary } from '../../database/getLotStatusSummary.js'; -import { getLotTypeSummary } from '../../database/getLotTypeSummary.js'; -import { getMap } from '../../database/getMap.js'; +import getLotStatusSummary from '../../database/getLotStatusSummary.js'; +import getLotTypeSummary from '../../database/getLotTypeSummary.js'; +import getMap from '../../database/getMap.js'; import { getConfigProperty } from '../../helpers/functions.config.js'; export default async function handler(request, response) { const map = await getMap(request.params.mapId); diff --git a/handlers/maps-get/view.ts b/handlers/maps-get/view.ts index ded27b30..155ee2d9 100644 --- a/handlers/maps-get/view.ts +++ b/handlers/maps-get/view.ts @@ -1,8 +1,8 @@ import type { Request, Response } from 'express' -import { getLotStatusSummary } from '../../database/getLotStatusSummary.js' -import { getLotTypeSummary } from '../../database/getLotTypeSummary.js' -import { getMap } from '../../database/getMap.js' +import getLotStatusSummary from '../../database/getLotStatusSummary.js' +import getLotTypeSummary from '../../database/getLotTypeSummary.js' +import getMap from '../../database/getMap.js' import { getConfigProperty } from '../../helpers/functions.config.js' export default async function handler( diff --git a/handlers/permissions.d.ts b/handlers/permissions.d.ts index 7408620c..7f3dc715 100644 --- a/handlers/permissions.d.ts +++ b/handlers/permissions.d.ts @@ -1,5 +1,5 @@ /// -import type { Request, Response, NextFunction } from 'express'; +import type { NextFunction, Request, Response } from 'express'; export declare function adminGetHandler(request: Request, response: Response, next: NextFunction): void; export declare function adminPostHandler(request: Request, response: Response, next: NextFunction): void; export declare function updateGetHandler(request: Request, response: Response, next: NextFunction): void; diff --git a/handlers/permissions.js b/handlers/permissions.js index 29aee66f..8964cfd0 100644 --- a/handlers/permissions.js +++ b/handlers/permissions.js @@ -1,6 +1,6 @@ -import * as configFunctions from '../helpers/functions.config.js'; +import { getConfigProperty } from '../helpers/functions.config.js'; import * as userFunctions from '../helpers/functions.user.js'; -const urlPrefix = configFunctions.getConfigProperty('reverseProxy.urlPrefix'); +const urlPrefix = getConfigProperty('reverseProxy.urlPrefix'); const forbiddenStatus = 403; const forbiddenJSON = { success: false, diff --git a/handlers/permissions.ts b/handlers/permissions.ts index 40a6e3f3..033c23cc 100644 --- a/handlers/permissions.ts +++ b/handlers/permissions.ts @@ -1,9 +1,9 @@ -import type { Request, Response, NextFunction } from 'express' +import type { NextFunction, Request, Response } from 'express' -import * as configFunctions from '../helpers/functions.config.js' +import { getConfigProperty } from '../helpers/functions.config.js' import * as userFunctions from '../helpers/functions.user.js' -const urlPrefix = configFunctions.getConfigProperty('reverseProxy.urlPrefix') +const urlPrefix = getConfigProperty('reverseProxy.urlPrefix') const forbiddenStatus = 403 diff --git a/handlers/print-get/pdf.js b/handlers/print-get/pdf.js index c89f1e56..a6716070 100644 --- a/handlers/print-get/pdf.js +++ b/handlers/print-get/pdf.js @@ -2,7 +2,7 @@ import path from 'node:path'; import { convertHTMLToPDF } from '@cityssm/pdf-puppeteer'; import * as dateTimeFunctions from '@cityssm/utils-datetime'; import camelcase from 'camelcase'; -import * as ejs from 'ejs'; +import { renderFile as renderEjsFile } from 'ejs'; import * as configFunctions from '../../helpers/functions.config.js'; import * as lotOccupancyFunctions from '../../helpers/functions.lotOccupancy.js'; import { getPdfPrintConfig, getReportData } from '../../helpers/functions.print.js'; @@ -46,6 +46,6 @@ export async function handler(request, response, next) { reportData.configFunctions = configFunctions; reportData.dateTimeFunctions = dateTimeFunctions; reportData.lotOccupancyFunctions = lotOccupancyFunctions; - await ejs.renderFile(reportPath, reportData, {}, ejsCallbackFunction); + await renderEjsFile(reportPath, reportData, {}, ejsCallbackFunction); } export default handler; diff --git a/handlers/print-get/pdf.ts b/handlers/print-get/pdf.ts index 92720f4a..3bb82594 100644 --- a/handlers/print-get/pdf.ts +++ b/handlers/print-get/pdf.ts @@ -3,7 +3,7 @@ import path from 'node:path' import { convertHTMLToPDF } from '@cityssm/pdf-puppeteer' import * as dateTimeFunctions from '@cityssm/utils-datetime' import camelcase from 'camelcase' -import * as ejs from 'ejs' +import {renderFile as renderEjsFile } from 'ejs' import type { NextFunction, Request, Response } from 'express' import * as configFunctions from '../../helpers/functions.config.js' @@ -87,7 +87,7 @@ export async function handler( reportData.dateTimeFunctions = dateTimeFunctions reportData.lotOccupancyFunctions = lotOccupancyFunctions - await ejs.renderFile(reportPath, reportData, {}, ejsCallbackFunction) + await renderEjsFile(reportPath, reportData, {}, ejsCallbackFunction) } export default handler diff --git a/handlers/reports-get/reportName.js b/handlers/reports-get/reportName.js index 39f842ae..6ba587f6 100644 --- a/handlers/reports-get/reportName.js +++ b/handlers/reports-get/reportName.js @@ -1,5 +1,5 @@ import papaparse from 'papaparse'; -import { getReportData } from '../../database/getReportData.js'; +import getReportData from '../../database/getReportData.js'; export default async function handler(request, response) { const reportName = request.params.reportName; const rows = await getReportData(reportName, request.query); diff --git a/handlers/reports-get/reportName.ts b/handlers/reports-get/reportName.ts index 536b03cf..5ac0fb53 100644 --- a/handlers/reports-get/reportName.ts +++ b/handlers/reports-get/reportName.ts @@ -1,8 +1,7 @@ import type { Request, Response } from 'express' import papaparse from 'papaparse' -import { - getReportData, +import getReportData, { type ReportParameters } from '../../database/getReportData.js' @@ -12,7 +11,10 @@ export default async function handler( ): Promise { const reportName = request.params.reportName - const rows = await getReportData(reportName, request.query as ReportParameters) + const rows = await getReportData( + reportName, + request.query as ReportParameters + ) if (rows === undefined) { response.status(404).json({ @@ -34,4 +36,3 @@ export default async function handler( response.send(csv) } - diff --git a/handlers/reports-get/search.js b/handlers/reports-get/search.js index f5512a1b..5cdd2429 100644 --- a/handlers/reports-get/search.js +++ b/handlers/reports-get/search.js @@ -1,6 +1,6 @@ import * as dateTimeFunctions from '@cityssm/utils-datetime'; +import getMaps from '../../database/getMaps.js'; import { getLotStatuses, getLotTypes } from '../../helpers/functions.cache.js'; -import { getMaps } from '../../database/getMaps.js'; export default async function handler(_request, response) { const rightNow = new Date(); const maps = await getMaps(); diff --git a/handlers/reports-get/search.ts b/handlers/reports-get/search.ts index e5072055..be806186 100644 --- a/handlers/reports-get/search.ts +++ b/handlers/reports-get/search.ts @@ -1,10 +1,13 @@ import * as dateTimeFunctions from '@cityssm/utils-datetime' import type { Request, Response } from 'express' +import getMaps from '../../database/getMaps.js' import { getLotStatuses, getLotTypes } from '../../helpers/functions.cache.js' -import { getMaps } from '../../database/getMaps.js' -export default async function handler(_request: Request, response: Response): Promise { +export default async function handler( + _request: Request, + response: Response +): Promise { const rightNow = new Date() const maps = await getMaps() @@ -19,4 +22,3 @@ export default async function handler(_request: Request, response: Response): Pr lotStatuses }) } - diff --git a/handlers/workOrders-get/edit.js b/handlers/workOrders-get/edit.js index 4679b61b..9bdde438 100644 --- a/handlers/workOrders-get/edit.js +++ b/handlers/workOrders-get/edit.js @@ -1,4 +1,4 @@ -import { getWorkOrder } from '../../database/getWorkOrder.js'; +import getWorkOrder from '../../database/getWorkOrder.js'; import { getLotStatuses, getWorkOrderMilestoneTypes, getWorkOrderTypes } from '../../helpers/functions.cache.js'; import { getConfigProperty } from '../../helpers/functions.config.js'; export default async function handler(request, response) { diff --git a/handlers/workOrders-get/edit.ts b/handlers/workOrders-get/edit.ts index d11b5379..ae5e65c0 100644 --- a/handlers/workOrders-get/edit.ts +++ b/handlers/workOrders-get/edit.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express' -import { getWorkOrder } from '../../database/getWorkOrder.js' +import getWorkOrder from '../../database/getWorkOrder.js' import { getLotStatuses, getWorkOrderMilestoneTypes, diff --git a/handlers/workOrders-get/view.js b/handlers/workOrders-get/view.js index aa6862f0..1ede1db2 100644 --- a/handlers/workOrders-get/view.js +++ b/handlers/workOrders-get/view.js @@ -1,4 +1,4 @@ -import { getWorkOrder } from '../../database/getWorkOrder.js'; +import getWorkOrder from '../../database/getWorkOrder.js'; import { getConfigProperty } from '../../helpers/functions.config.js'; export default async function handler(request, response) { const workOrder = await getWorkOrder(request.params.workOrderId, { diff --git a/handlers/workOrders-get/view.ts b/handlers/workOrders-get/view.ts index 3c83dba6..9fb9b141 100644 --- a/handlers/workOrders-get/view.ts +++ b/handlers/workOrders-get/view.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express' -import { getWorkOrder } from '../../database/getWorkOrder.js' +import getWorkOrder from '../../database/getWorkOrder.js' import { getConfigProperty } from '../../helpers/functions.config.js' export default async function handler( diff --git a/handlers/workOrders-post/doAddWorkOrderComment.js b/handlers/workOrders-post/doAddWorkOrderComment.js index c16cd304..c6b01bde 100644 --- a/handlers/workOrders-post/doAddWorkOrderComment.js +++ b/handlers/workOrders-post/doAddWorkOrderComment.js @@ -1,5 +1,5 @@ import addWorkOrderComment from '../../database/addWorkOrderComment.js'; -import { getWorkOrderComments } from '../../database/getWorkOrderComments.js'; +import getWorkOrderComments from '../../database/getWorkOrderComments.js'; export default async function handler(request, response) { await addWorkOrderComment(request.body, request.session.user); const workOrderComments = await getWorkOrderComments(request.body.workOrderId); diff --git a/handlers/workOrders-post/doAddWorkOrderComment.ts b/handlers/workOrders-post/doAddWorkOrderComment.ts index a4041410..65377f76 100644 --- a/handlers/workOrders-post/doAddWorkOrderComment.ts +++ b/handlers/workOrders-post/doAddWorkOrderComment.ts @@ -3,7 +3,7 @@ import type { Request, Response } from 'express' import addWorkOrderComment, { type AddWorkOrderCommentForm } from '../../database/addWorkOrderComment.js' -import { getWorkOrderComments } from '../../database/getWorkOrderComments.js' +import getWorkOrderComments from '../../database/getWorkOrderComments.js' export default async function handler( request: Request, @@ -14,11 +14,12 @@ export default async function handler( request.session.user as User ) - const workOrderComments = await getWorkOrderComments(request.body.workOrderId) + const workOrderComments = await getWorkOrderComments( + request.body.workOrderId as string + ) response.json({ success: true, workOrderComments }) } - diff --git a/handlers/workOrders-post/doAddWorkOrderLot.js b/handlers/workOrders-post/doAddWorkOrderLot.js index 1769cdc4..a527c151 100644 --- a/handlers/workOrders-post/doAddWorkOrderLot.js +++ b/handlers/workOrders-post/doAddWorkOrderLot.js @@ -1,5 +1,5 @@ import addWorkOrderLot from '../../database/addWorkOrderLot.js'; -import { getLots } from '../../database/getLots.js'; +import getLots from '../../database/getLots.js'; export default async function handler(request, response) { const success = await addWorkOrderLot({ workOrderId: request.body.workOrderId, diff --git a/handlers/workOrders-post/doAddWorkOrderLot.ts b/handlers/workOrders-post/doAddWorkOrderLot.ts index a14cc38e..e48f76d7 100644 --- a/handlers/workOrders-post/doAddWorkOrderLot.ts +++ b/handlers/workOrders-post/doAddWorkOrderLot.ts @@ -1,7 +1,7 @@ import type { Request, Response } from 'express' import addWorkOrderLot from '../../database/addWorkOrderLot.js' -import { getLots } from '../../database/getLots.js' +import getLots from '../../database/getLots.js' export default async function handler( request: Request, @@ -9,15 +9,15 @@ export default async function handler( ): Promise { const success = await addWorkOrderLot( { - workOrderId: request.body.workOrderId, - lotId: request.body.lotId + workOrderId: request.body.workOrderId as string, + lotId: request.body.lotId as string }, request.session.user as User ) const workOrderLotsResults = await getLots( { - workOrderId: request.body.workOrderId + workOrderId: request.body.workOrderId as string }, { limit: -1, @@ -31,4 +31,3 @@ export default async function handler( workOrderLots: workOrderLotsResults.lots }) } - diff --git a/handlers/workOrders-post/doAddWorkOrderLotOccupancy.js b/handlers/workOrders-post/doAddWorkOrderLotOccupancy.js index 82955b98..cb3633f6 100644 --- a/handlers/workOrders-post/doAddWorkOrderLotOccupancy.js +++ b/handlers/workOrders-post/doAddWorkOrderLotOccupancy.js @@ -1,5 +1,5 @@ import addWorkOrderLotOccupancy from '../../database/addWorkOrderLotOccupancy.js'; -import { getLotOccupancies } from '../../database/getLotOccupancies.js'; +import getLotOccupancies from '../../database/getLotOccupancies.js'; export default async function handler(request, response) { const success = await addWorkOrderLotOccupancy({ workOrderId: request.body.workOrderId, diff --git a/handlers/workOrders-post/doAddWorkOrderLotOccupancy.ts b/handlers/workOrders-post/doAddWorkOrderLotOccupancy.ts index 4eeab8bf..ce74552f 100644 --- a/handlers/workOrders-post/doAddWorkOrderLotOccupancy.ts +++ b/handlers/workOrders-post/doAddWorkOrderLotOccupancy.ts @@ -1,7 +1,7 @@ import type { Request, Response } from 'express' import addWorkOrderLotOccupancy from '../../database/addWorkOrderLotOccupancy.js' -import { getLotOccupancies } from '../../database/getLotOccupancies.js' +import getLotOccupancies from '../../database/getLotOccupancies.js' export default async function handler( request: Request, @@ -9,15 +9,15 @@ export default async function handler( ): Promise { const success = await addWorkOrderLotOccupancy( { - workOrderId: request.body.workOrderId, - lotOccupancyId: request.body.lotOccupancyId + workOrderId: request.body.workOrderId as string, + lotOccupancyId: request.body.lotOccupancyId as string }, request.session.user as User ) const workOrderLotOccupanciesResults = await getLotOccupancies( { - workOrderId: request.body.workOrderId + workOrderId: request.body.workOrderId as string }, { limit: -1, @@ -33,4 +33,3 @@ export default async function handler( workOrderLotOccupancies: workOrderLotOccupanciesResults.lotOccupancies }) } - diff --git a/handlers/workOrders-post/doAddWorkOrderMilestone.js b/handlers/workOrders-post/doAddWorkOrderMilestone.js index 8c2c94eb..90cebc8e 100644 --- a/handlers/workOrders-post/doAddWorkOrderMilestone.js +++ b/handlers/workOrders-post/doAddWorkOrderMilestone.js @@ -1,5 +1,5 @@ import addWorkOrderMilestone from '../../database/addWorkOrderMilestone.js'; -import { getWorkOrderMilestones } from '../../database/getWorkOrderMilestones.js'; +import getWorkOrderMilestones from '../../database/getWorkOrderMilestones.js'; export default async function handler(request, response) { const success = await addWorkOrderMilestone(request.body, request.session.user); const workOrderMilestones = await getWorkOrderMilestones({ diff --git a/handlers/workOrders-post/doAddWorkOrderMilestone.ts b/handlers/workOrders-post/doAddWorkOrderMilestone.ts index be4eedd5..f6fdfc7c 100644 --- a/handlers/workOrders-post/doAddWorkOrderMilestone.ts +++ b/handlers/workOrders-post/doAddWorkOrderMilestone.ts @@ -3,7 +3,7 @@ import type { Request, Response } from 'express' import addWorkOrderMilestone, { type AddWorkOrderMilestoneForm } from '../../database/addWorkOrderMilestone.js' -import { getWorkOrderMilestones } from '../../database/getWorkOrderMilestones.js' +import getWorkOrderMilestones from '../../database/getWorkOrderMilestones.js' export default async function handler( request: Request, @@ -16,7 +16,7 @@ export default async function handler( const workOrderMilestones = await getWorkOrderMilestones( { - workOrderId: request.body.workOrderId + workOrderId: request.body.workOrderId as string }, { orderBy: 'completion' @@ -28,4 +28,3 @@ export default async function handler( workOrderMilestones }) } - diff --git a/handlers/workOrders-post/doCompleteWorkOrderMilestone.js b/handlers/workOrders-post/doCompleteWorkOrderMilestone.js index 8b1928e3..d39d71e2 100644 --- a/handlers/workOrders-post/doCompleteWorkOrderMilestone.js +++ b/handlers/workOrders-post/doCompleteWorkOrderMilestone.js @@ -1,5 +1,5 @@ import completeWorkOrderMilestone from '../../database/completeWorkOrderMilestone.js'; -import { getWorkOrderMilestones } from '../../database/getWorkOrderMilestones.js'; +import getWorkOrderMilestones from '../../database/getWorkOrderMilestones.js'; export default async function handler(request, response) { const success = await completeWorkOrderMilestone({ workOrderMilestoneId: request.body.workOrderMilestoneId diff --git a/handlers/workOrders-post/doCompleteWorkOrderMilestone.ts b/handlers/workOrders-post/doCompleteWorkOrderMilestone.ts index 6b0b9f20..29e05bbe 100644 --- a/handlers/workOrders-post/doCompleteWorkOrderMilestone.ts +++ b/handlers/workOrders-post/doCompleteWorkOrderMilestone.ts @@ -1,7 +1,7 @@ import type { Request, Response } from 'express' import completeWorkOrderMilestone from '../../database/completeWorkOrderMilestone.js' -import { getWorkOrderMilestones } from '../../database/getWorkOrderMilestones.js' +import getWorkOrderMilestones from '../../database/getWorkOrderMilestones.js' export default async function handler( request: Request, @@ -9,14 +9,14 @@ export default async function handler( ): Promise { const success = await completeWorkOrderMilestone( { - workOrderMilestoneId: request.body.workOrderMilestoneId + workOrderMilestoneId: request.body.workOrderMilestoneId as string }, request.session.user as User ) const workOrderMilestones = await getWorkOrderMilestones( { - workOrderId: request.body.workOrderId + workOrderId: request.body.workOrderId as string }, { orderBy: 'completion' @@ -28,4 +28,3 @@ export default async function handler( workOrderMilestones }) } - diff --git a/handlers/workOrders-post/doDeleteWorkOrderComment.js b/handlers/workOrders-post/doDeleteWorkOrderComment.js index 0cb22853..ce257ac5 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderComment.js +++ b/handlers/workOrders-post/doDeleteWorkOrderComment.js @@ -1,5 +1,5 @@ import { deleteRecord } from '../../database/deleteRecord.js'; -import { getWorkOrderComments } from '../../database/getWorkOrderComments.js'; +import getWorkOrderComments from '../../database/getWorkOrderComments.js'; export default async function handler(request, response) { const success = await deleteRecord('WorkOrderComments', request.body.workOrderCommentId, request.session.user); const workOrderComments = await getWorkOrderComments(request.body.workOrderId); diff --git a/handlers/workOrders-post/doDeleteWorkOrderComment.ts b/handlers/workOrders-post/doDeleteWorkOrderComment.ts index 7e627776..47b1df74 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderComment.ts +++ b/handlers/workOrders-post/doDeleteWorkOrderComment.ts @@ -1,7 +1,7 @@ import type { Request, Response } from 'express' import { deleteRecord } from '../../database/deleteRecord.js' -import { getWorkOrderComments } from '../../database/getWorkOrderComments.js' +import getWorkOrderComments from '../../database/getWorkOrderComments.js' export default async function handler( request: Request, @@ -9,15 +9,16 @@ export default async function handler( ): Promise { const success = await deleteRecord( 'WorkOrderComments', - request.body.workOrderCommentId, + request.body.workOrderCommentId as string, request.session.user as User ) - const workOrderComments = await getWorkOrderComments(request.body.workOrderId) + const workOrderComments = await getWorkOrderComments( + request.body.workOrderId as string + ) response.json({ success, workOrderComments }) } - diff --git a/handlers/workOrders-post/doDeleteWorkOrderLot.js b/handlers/workOrders-post/doDeleteWorkOrderLot.js index 85d92c5f..7a104a22 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderLot.js +++ b/handlers/workOrders-post/doDeleteWorkOrderLot.js @@ -1,5 +1,5 @@ import deleteWorkOrderLot from '../../database/deleteWorkOrderLot.js'; -import { getLots } from '../../database/getLots.js'; +import getLots from '../../database/getLots.js'; export default async function handler(request, response) { const success = await deleteWorkOrderLot(request.body.workOrderId, request.body.lotId, request.session.user); const workOrderLotsResults = await getLots({ diff --git a/handlers/workOrders-post/doDeleteWorkOrderLot.ts b/handlers/workOrders-post/doDeleteWorkOrderLot.ts index 86bbe73b..6fcde8fc 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderLot.ts +++ b/handlers/workOrders-post/doDeleteWorkOrderLot.ts @@ -1,21 +1,21 @@ import type { Request, Response } from 'express' import deleteWorkOrderLot from '../../database/deleteWorkOrderLot.js' -import { getLots } from '../../database/getLots.js' +import getLots from '../../database/getLots.js' export default async function handler( request: Request, response: Response ): Promise { const success = await deleteWorkOrderLot( - request.body.workOrderId, - request.body.lotId, + request.body.workOrderId as string, + request.body.lotId as string, request.session.user as User ) const workOrderLotsResults = await getLots( { - workOrderId: request.body.workOrderId + workOrderId: request.body.workOrderId as string }, { limit: -1, @@ -29,4 +29,3 @@ export default async function handler( workOrderLots: workOrderLotsResults.lots }) } - diff --git a/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.js b/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.js index 5c4fa983..a9eceede 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.js +++ b/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.js @@ -1,5 +1,5 @@ import deleteWorkOrderLotOccupancy from '../../database/deleteWorkOrderLotOccupancy.js'; -import { getLotOccupancies } from '../../database/getLotOccupancies.js'; +import getLotOccupancies from '../../database/getLotOccupancies.js'; export default async function handler(request, response) { const success = await deleteWorkOrderLotOccupancy(request.body.workOrderId, request.body.lotOccupancyId, request.session.user); const workOrderLotOccupancies = await getLotOccupancies({ diff --git a/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.ts b/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.ts index 78ce86c3..e6b82084 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.ts +++ b/handlers/workOrders-post/doDeleteWorkOrderLotOccupancy.ts @@ -1,21 +1,21 @@ import type { Request, Response } from 'express' import deleteWorkOrderLotOccupancy from '../../database/deleteWorkOrderLotOccupancy.js' -import { getLotOccupancies } from '../../database/getLotOccupancies.js' +import getLotOccupancies from '../../database/getLotOccupancies.js' export default async function handler( request: Request, response: Response ): Promise { const success = await deleteWorkOrderLotOccupancy( - request.body.workOrderId, - request.body.lotOccupancyId, + request.body.workOrderId as string, + request.body.lotOccupancyId as string, request.session.user as User ) const workOrderLotOccupancies = await getLotOccupancies( { - workOrderId: request.body.workOrderId + workOrderId: request.body.workOrderId as string }, { limit: -1, diff --git a/handlers/workOrders-post/doDeleteWorkOrderMilestone.js b/handlers/workOrders-post/doDeleteWorkOrderMilestone.js index 4be7675c..e111d67d 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderMilestone.js +++ b/handlers/workOrders-post/doDeleteWorkOrderMilestone.js @@ -1,5 +1,5 @@ import { deleteRecord } from '../../database/deleteRecord.js'; -import { getWorkOrderMilestones } from '../../database/getWorkOrderMilestones.js'; +import getWorkOrderMilestones from '../../database/getWorkOrderMilestones.js'; export default async function handler(request, response) { const success = await deleteRecord('WorkOrderMilestones', request.body.workOrderMilestoneId, request.session.user); const workOrderMilestones = await getWorkOrderMilestones({ diff --git a/handlers/workOrders-post/doDeleteWorkOrderMilestone.ts b/handlers/workOrders-post/doDeleteWorkOrderMilestone.ts index a68e3a17..48f05f46 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderMilestone.ts +++ b/handlers/workOrders-post/doDeleteWorkOrderMilestone.ts @@ -1,7 +1,7 @@ import type { Request, Response } from 'express' import { deleteRecord } from '../../database/deleteRecord.js' -import { getWorkOrderMilestones } from '../../database/getWorkOrderMilestones.js' +import getWorkOrderMilestones from '../../database/getWorkOrderMilestones.js' export default async function handler( request: Request, @@ -9,13 +9,13 @@ export default async function handler( ): Promise { const success = await deleteRecord( 'WorkOrderMilestones', - request.body.workOrderMilestoneId, + request.body.workOrderMilestoneId as string, request.session.user as User ) const workOrderMilestones = await getWorkOrderMilestones( { - workOrderId: request.body.workOrderId + workOrderId: request.body.workOrderId as string }, { orderBy: 'completion' @@ -27,4 +27,3 @@ export default async function handler( workOrderMilestones }) } - diff --git a/handlers/workOrders-post/doGetWorkOrderMilestones.js b/handlers/workOrders-post/doGetWorkOrderMilestones.js index 6c3b2188..52bd03ce 100644 --- a/handlers/workOrders-post/doGetWorkOrderMilestones.js +++ b/handlers/workOrders-post/doGetWorkOrderMilestones.js @@ -1,4 +1,4 @@ -import { getWorkOrderMilestones } from '../../database/getWorkOrderMilestones.js'; +import getWorkOrderMilestones from '../../database/getWorkOrderMilestones.js'; export default async function handler(request, response) { const workOrderMilestones = await getWorkOrderMilestones(request.body, { includeWorkOrders: true, diff --git a/handlers/workOrders-post/doGetWorkOrderMilestones.ts b/handlers/workOrders-post/doGetWorkOrderMilestones.ts index 722c7663..f761a67c 100644 --- a/handlers/workOrders-post/doGetWorkOrderMilestones.ts +++ b/handlers/workOrders-post/doGetWorkOrderMilestones.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express' -import { getWorkOrderMilestones } from '../../database/getWorkOrderMilestones.js' +import getWorkOrderMilestones from '../../database/getWorkOrderMilestones.js' export default async function handler( request: Request, @@ -15,4 +15,3 @@ export default async function handler( workOrderMilestones }) } - diff --git a/handlers/workOrders-post/doReopenWorkOrderMilestone.js b/handlers/workOrders-post/doReopenWorkOrderMilestone.js index e9d26103..59f4f998 100644 --- a/handlers/workOrders-post/doReopenWorkOrderMilestone.js +++ b/handlers/workOrders-post/doReopenWorkOrderMilestone.js @@ -1,4 +1,4 @@ -import { getWorkOrderMilestones } from '../../database/getWorkOrderMilestones.js'; +import getWorkOrderMilestones from '../../database/getWorkOrderMilestones.js'; import { reopenWorkOrderMilestone } from '../../database/reopenWorkOrderMilestone.js'; export default async function handler(request, response) { const success = await reopenWorkOrderMilestone(request.body.workOrderMilestoneId, request.session.user); diff --git a/handlers/workOrders-post/doReopenWorkOrderMilestone.ts b/handlers/workOrders-post/doReopenWorkOrderMilestone.ts index f248b391..f59c16dc 100644 --- a/handlers/workOrders-post/doReopenWorkOrderMilestone.ts +++ b/handlers/workOrders-post/doReopenWorkOrderMilestone.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express' -import { getWorkOrderMilestones } from '../../database/getWorkOrderMilestones.js' +import getWorkOrderMilestones from '../../database/getWorkOrderMilestones.js' import { reopenWorkOrderMilestone } from '../../database/reopenWorkOrderMilestone.js' export default async function handler( @@ -8,7 +8,7 @@ export default async function handler( response: Response ): Promise { const success = await reopenWorkOrderMilestone( - request.body.workOrderMilestoneId, + request.body.workOrderMilestoneId as string, request.session.user as User ) @@ -26,4 +26,3 @@ export default async function handler( workOrderMilestones }) } - diff --git a/handlers/workOrders-post/doUpdateLotStatus.js b/handlers/workOrders-post/doUpdateLotStatus.js index 4b49d365..f9d3570b 100644 --- a/handlers/workOrders-post/doUpdateLotStatus.js +++ b/handlers/workOrders-post/doUpdateLotStatus.js @@ -1,4 +1,4 @@ -import { getLots } from '../../database/getLots.js'; +import getLots from '../../database/getLots.js'; import { updateLotStatus } from '../../database/updateLot.js'; export default async function handler(request, response) { const success = await updateLotStatus(request.body.lotId, request.body.lotStatusId, request.session.user); diff --git a/handlers/workOrders-post/doUpdateLotStatus.ts b/handlers/workOrders-post/doUpdateLotStatus.ts index 95627ab9..c6abf481 100644 --- a/handlers/workOrders-post/doUpdateLotStatus.ts +++ b/handlers/workOrders-post/doUpdateLotStatus.ts @@ -1,6 +1,6 @@ import type { Request, Response } from 'express' -import { getLots } from '../../database/getLots.js' +import getLots from '../../database/getLots.js' import { updateLotStatus } from '../../database/updateLot.js' export default async function handler( @@ -8,14 +8,14 @@ export default async function handler( response: Response ): Promise { const success = await updateLotStatus( - request.body.lotId, - request.body.lotStatusId, + request.body.lotId as string, + request.body.lotStatusId as string, request.session.user as User ) const workOrderLotsResults = await getLots( { - workOrderId: request.body.workOrderId + workOrderId: request.body.workOrderId as string }, { limit: -1, @@ -29,4 +29,3 @@ export default async function handler( workOrderLots: workOrderLotsResults.lots }) } - diff --git a/handlers/workOrders-post/doUpdateWorkOrderComment.js b/handlers/workOrders-post/doUpdateWorkOrderComment.js index 0483a1cf..bad3e471 100644 --- a/handlers/workOrders-post/doUpdateWorkOrderComment.js +++ b/handlers/workOrders-post/doUpdateWorkOrderComment.js @@ -1,4 +1,4 @@ -import { getWorkOrderComments } from '../../database/getWorkOrderComments.js'; +import getWorkOrderComments from '../../database/getWorkOrderComments.js'; import { updateWorkOrderComment } from '../../database/updateWorkOrderComment.js'; export default async function handler(request, response) { const success = await updateWorkOrderComment(request.body, request.session.user); diff --git a/handlers/workOrders-post/doUpdateWorkOrderComment.ts b/handlers/workOrders-post/doUpdateWorkOrderComment.ts index b6d525d9..f07b04f7 100644 --- a/handlers/workOrders-post/doUpdateWorkOrderComment.ts +++ b/handlers/workOrders-post/doUpdateWorkOrderComment.ts @@ -1,19 +1,26 @@ import type { Request, Response } from 'express' -import { getWorkOrderComments } from '../../database/getWorkOrderComments.js' -import { updateWorkOrderComment } from '../../database/updateWorkOrderComment.js' +import getWorkOrderComments from '../../database/getWorkOrderComments.js' +import { + type UpdateWorkOrderCommentForm, + updateWorkOrderComment +} from '../../database/updateWorkOrderComment.js' export default async function handler( request: Request, response: Response ): Promise { - const success = await updateWorkOrderComment(request.body, request.session.user as User) + const success = await updateWorkOrderComment( + request.body as UpdateWorkOrderCommentForm, + request.session.user as User + ) - const workOrderComments = await getWorkOrderComments(request.body.workOrderId) + const workOrderComments = await getWorkOrderComments( + request.body.workOrderId as string + ) response.json({ success, workOrderComments }) } - diff --git a/handlers/workOrders-post/doUpdateWorkOrderMilestone.js b/handlers/workOrders-post/doUpdateWorkOrderMilestone.js index 7c66b949..f3cfda21 100644 --- a/handlers/workOrders-post/doUpdateWorkOrderMilestone.js +++ b/handlers/workOrders-post/doUpdateWorkOrderMilestone.js @@ -1,5 +1,5 @@ -import { getWorkOrderMilestones } from '../../database/getWorkOrderMilestones.js'; -import { updateWorkOrderMilestone } from '../../database/updateWorkOrderMilestone.js'; +import getWorkOrderMilestones from '../../database/getWorkOrderMilestones.js'; +import updateWorkOrderMilestone from '../../database/updateWorkOrderMilestone.js'; export default async function handler(request, response) { const success = await updateWorkOrderMilestone(request.body, request.session.user); const workOrderMilestones = await getWorkOrderMilestones({ diff --git a/handlers/workOrders-post/doUpdateWorkOrderMilestone.ts b/handlers/workOrders-post/doUpdateWorkOrderMilestone.ts index f50c9885..455e3701 100644 --- a/handlers/workOrders-post/doUpdateWorkOrderMilestone.ts +++ b/handlers/workOrders-post/doUpdateWorkOrderMilestone.ts @@ -1,17 +1,22 @@ import type { Request, Response } from 'express' -import { getWorkOrderMilestones } from '../../database/getWorkOrderMilestones.js' -import { updateWorkOrderMilestone } from '../../database/updateWorkOrderMilestone.js' +import getWorkOrderMilestones from '../../database/getWorkOrderMilestones.js' +import updateWorkOrderMilestone, { + type UpdateWorkOrderMilestoneForm +} from '../../database/updateWorkOrderMilestone.js' export default async function handler( request: Request, response: Response ): Promise { - const success = await updateWorkOrderMilestone(request.body, request.session.user as User) + const success = await updateWorkOrderMilestone( + request.body as UpdateWorkOrderMilestoneForm, + request.session.user as User + ) const workOrderMilestones = await getWorkOrderMilestones( { - workOrderId: request.body.workOrderId + workOrderId: request.body.workOrderId as string }, { orderBy: 'completion' @@ -23,4 +28,3 @@ export default async function handler( workOrderMilestones }) } - diff --git a/helpers/functions.cache.d.ts b/helpers/functions.cache.d.ts index 481be9d4..dcbed2c2 100644 --- a/helpers/functions.cache.d.ts +++ b/helpers/functions.cache.d.ts @@ -1,23 +1,23 @@ -import type * as recordTypes from '../types/recordTypes.js'; -export declare function getLotOccupantTypes(): Promise; -export declare function getLotOccupantTypeById(lotOccupantTypeId: number): Promise; -export declare function getLotOccupantTypeByLotOccupantType(lotOccupantType: string): Promise; -export declare function getLotStatuses(): Promise; -export declare function getLotStatusById(lotStatusId: number): Promise; -export declare function getLotStatusByLotStatus(lotStatus: string): Promise; -export declare function getLotTypes(): Promise; -export declare function getLotTypeById(lotTypeId: number): Promise; -export declare function getLotTypesByLotType(lotType: string): Promise; -export declare function getOccupancyTypes(): Promise; -export declare function getAllOccupancyTypeFields(): Promise; -export declare function getOccupancyTypeById(occupancyTypeId: number): Promise; -export declare function getOccupancyTypeByOccupancyType(occupancyTypeString: string): Promise; +import type { LotOccupantType, LotStatus, LotType, OccupancyType, OccupancyTypeField, WorkOrderMilestoneType, WorkOrderType } from '../types/recordTypes.js'; +export declare function getLotOccupantTypes(): Promise; +export declare function getLotOccupantTypeById(lotOccupantTypeId: number): Promise; +export declare function getLotOccupantTypeByLotOccupantType(lotOccupantType: string): Promise; +export declare function getLotStatuses(): Promise; +export declare function getLotStatusById(lotStatusId: number): Promise; +export declare function getLotStatusByLotStatus(lotStatus: string): Promise; +export declare function getLotTypes(): Promise; +export declare function getLotTypeById(lotTypeId: number): Promise; +export declare function getLotTypesByLotType(lotType: string): Promise; +export declare function getOccupancyTypes(): Promise; +export declare function getAllOccupancyTypeFields(): Promise; +export declare function getOccupancyTypeById(occupancyTypeId: number): Promise; +export declare function getOccupancyTypeByOccupancyType(occupancyTypeString: string): Promise; export declare function getOccupancyTypePrintsById(occupancyTypeId: number): Promise; -export declare function getWorkOrderTypes(): Promise; -export declare function getWorkOrderTypeById(workOrderTypeId: number): Promise; -export declare function getWorkOrderMilestoneTypes(): Promise; -export declare function getWorkOrderMilestoneTypeById(workOrderMilestoneTypeId: number): Promise; -export declare function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrderMilestoneTypeString: string): Promise; +export declare function getWorkOrderTypes(): Promise; +export declare function getWorkOrderTypeById(workOrderTypeId: number): Promise; +export declare function getWorkOrderMilestoneTypes(): Promise; +export declare function getWorkOrderMilestoneTypeById(workOrderMilestoneTypeId: number): Promise; +export declare function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrderMilestoneTypeString: string): Promise; export declare function preloadCaches(): Promise; export declare function clearCaches(): void; export declare function clearCacheByTableName(tableName: string, relayMessage?: boolean): void; diff --git a/helpers/functions.cache.js b/helpers/functions.cache.js index 7092a73d..521b53ee 100644 --- a/helpers/functions.cache.js +++ b/helpers/functions.cache.js @@ -1,12 +1,12 @@ import cluster from 'node:cluster'; import Debug from 'debug'; -import { getLotOccupantTypes as getLotOccupantTypesFromDatabase } from '../database/getLotOccupantTypes.js'; -import { getLotStatuses as getLotStatusesFromDatabase } from '../database/getLotStatuses.js'; -import { getLotTypes as getLotTypesFromDatabase } from '../database/getLotTypes.js'; -import { getOccupancyTypeFields as getOccupancyTypeFieldsFromDatabase } from '../database/getOccupancyTypeFields.js'; -import { getOccupancyTypes as getOccupancyTypesFromDatabase } from '../database/getOccupancyTypes.js'; -import { getWorkOrderMilestoneTypes as getWorkOrderMilestoneTypesFromDatabase } from '../database/getWorkOrderMilestoneTypes.js'; -import { getWorkOrderTypes as getWorkOrderTypesFromDatabase } from '../database/getWorkOrderTypes.js'; +import getLotOccupantTypesFromDatabase from '../database/getLotOccupantTypes.js'; +import getLotStatusesFromDatabase from '../database/getLotStatuses.js'; +import getLotTypesFromDatabase from '../database/getLotTypes.js'; +import getOccupancyTypeFieldsFromDatabase from '../database/getOccupancyTypeFields.js'; +import getOccupancyTypesFromDatabase from '../database/getOccupancyTypes.js'; +import getWorkOrderMilestoneTypesFromDatabase from '../database/getWorkOrderMilestoneTypes.js'; +import getWorkOrderTypesFromDatabase from '../database/getWorkOrderTypes.js'; import { getConfigProperty } from './functions.config.js'; const debug = Debug(`lot-occupancy-system:functions.cache:${process.pid}`); let lotOccupantTypes; diff --git a/helpers/functions.cache.ts b/helpers/functions.cache.ts index 4b5ec499..429534df 100644 --- a/helpers/functions.cache.ts +++ b/helpers/functions.cache.ts @@ -2,15 +2,23 @@ import cluster from 'node:cluster' import Debug from 'debug' -import { getLotOccupantTypes as getLotOccupantTypesFromDatabase } from '../database/getLotOccupantTypes.js' -import { getLotStatuses as getLotStatusesFromDatabase } from '../database/getLotStatuses.js' -import { getLotTypes as getLotTypesFromDatabase } from '../database/getLotTypes.js' -import { getOccupancyTypeFields as getOccupancyTypeFieldsFromDatabase } from '../database/getOccupancyTypeFields.js' -import { getOccupancyTypes as getOccupancyTypesFromDatabase } from '../database/getOccupancyTypes.js' -import { getWorkOrderMilestoneTypes as getWorkOrderMilestoneTypesFromDatabase } from '../database/getWorkOrderMilestoneTypes.js' -import { getWorkOrderTypes as getWorkOrderTypesFromDatabase } from '../database/getWorkOrderTypes.js' +import getLotOccupantTypesFromDatabase from '../database/getLotOccupantTypes.js' +import getLotStatusesFromDatabase from '../database/getLotStatuses.js' +import getLotTypesFromDatabase from '../database/getLotTypes.js' +import getOccupancyTypeFieldsFromDatabase from '../database/getOccupancyTypeFields.js' +import getOccupancyTypesFromDatabase from '../database/getOccupancyTypes.js' +import getWorkOrderMilestoneTypesFromDatabase from '../database/getWorkOrderMilestoneTypes.js' +import getWorkOrderTypesFromDatabase from '../database/getWorkOrderTypes.js' import type { ClearCacheWorkerMessage } from '../types/applicationTypes.js' -import type * as recordTypes from '../types/recordTypes.js' +import type { + LotOccupantType, + LotStatus, + LotType, + OccupancyType, + OccupancyTypeField, + WorkOrderMilestoneType, + WorkOrderType +} from '../types/recordTypes.js' import { getConfigProperty } from './functions.config.js' @@ -20,11 +28,9 @@ const debug = Debug(`lot-occupancy-system:functions.cache:${process.pid}`) * Lot Occupant Types */ -let lotOccupantTypes: recordTypes.LotOccupantType[] | undefined +let lotOccupantTypes: LotOccupantType[] | undefined -export async function getLotOccupantTypes(): Promise< - recordTypes.LotOccupantType[] -> { +export async function getLotOccupantTypes(): Promise { if (lotOccupantTypes === undefined) { lotOccupantTypes = await getLotOccupantTypesFromDatabase() } @@ -34,7 +40,7 @@ export async function getLotOccupantTypes(): Promise< export async function getLotOccupantTypeById( lotOccupantTypeId: number -): Promise { +): Promise { const cachedLotOccupantTypes = await getLotOccupantTypes() return cachedLotOccupantTypes.find((currentLotOccupantType) => { @@ -44,7 +50,7 @@ export async function getLotOccupantTypeById( export async function getLotOccupantTypeByLotOccupantType( lotOccupantType: string -): Promise { +): Promise { const cachedLotOccupantTypes = await getLotOccupantTypes() const lotOccupantTypeLowerCase = lotOccupantType.toLowerCase() @@ -65,9 +71,9 @@ function clearLotOccupantTypesCache(): void { * Lot Statuses */ -let lotStatuses: recordTypes.LotStatus[] | undefined +let lotStatuses: LotStatus[] | undefined -export async function getLotStatuses(): Promise { +export async function getLotStatuses(): Promise { if (lotStatuses === undefined) { lotStatuses = await getLotStatusesFromDatabase() } @@ -77,7 +83,7 @@ export async function getLotStatuses(): Promise { export async function getLotStatusById( lotStatusId: number -): Promise { +): Promise { const cachedLotStatuses = await getLotStatuses() return cachedLotStatuses.find((currentLotStatus) => { @@ -87,7 +93,7 @@ export async function getLotStatusById( export async function getLotStatusByLotStatus( lotStatus: string -): Promise { +): Promise { const cachedLotStatuses = await getLotStatuses() const lotStatusLowerCase = lotStatus.toLowerCase() @@ -105,9 +111,9 @@ function clearLotStatusesCache(): void { * Lot Types */ -let lotTypes: recordTypes.LotType[] | undefined +let lotTypes: LotType[] | undefined -export async function getLotTypes(): Promise { +export async function getLotTypes(): Promise { if (lotTypes === undefined) { lotTypes = await getLotTypesFromDatabase() } @@ -117,7 +123,7 @@ export async function getLotTypes(): Promise { export async function getLotTypeById( lotTypeId: number -): Promise { +): Promise { const cachedLotTypes = await getLotTypes() return cachedLotTypes.find((currentLotType) => { @@ -127,7 +133,7 @@ export async function getLotTypeById( export async function getLotTypesByLotType( lotType: string -): Promise { +): Promise { const cachedLotTypes = await getLotTypes() const lotTypeLowerCase = lotType.toLowerCase() @@ -145,12 +151,10 @@ function clearLotTypesCache(): void { * Occupancy Types */ -let occupancyTypes: recordTypes.OccupancyType[] | undefined -let allOccupancyTypeFields: recordTypes.OccupancyTypeField[] | undefined +let occupancyTypes: OccupancyType[] | undefined +let allOccupancyTypeFields: OccupancyTypeField[] | undefined -export async function getOccupancyTypes(): Promise< - recordTypes.OccupancyType[] -> { +export async function getOccupancyTypes(): Promise { if (occupancyTypes === undefined) { occupancyTypes = await getOccupancyTypesFromDatabase() } @@ -159,7 +163,7 @@ export async function getOccupancyTypes(): Promise< } export async function getAllOccupancyTypeFields(): Promise< - recordTypes.OccupancyTypeField[] + OccupancyTypeField[] > { if (allOccupancyTypeFields === undefined) { allOccupancyTypeFields = await getOccupancyTypeFieldsFromDatabase() @@ -169,7 +173,7 @@ export async function getAllOccupancyTypeFields(): Promise< export async function getOccupancyTypeById( occupancyTypeId: number -): Promise { +): Promise { const cachedOccupancyTypes = await getOccupancyTypes() return cachedOccupancyTypes.find((currentOccupancyType) => { @@ -179,7 +183,7 @@ export async function getOccupancyTypeById( export async function getOccupancyTypeByOccupancyType( occupancyTypeString: string -): Promise { +): Promise { const cachedOccupancyTypes = await getOccupancyTypes() const occupancyTypeLowerCase = occupancyTypeString.toLowerCase() @@ -220,11 +224,9 @@ function clearOccupancyTypesCache(): void { * Work Order Types */ -let workOrderTypes: recordTypes.WorkOrderType[] | undefined +let workOrderTypes: WorkOrderType[] | undefined -export async function getWorkOrderTypes(): Promise< - recordTypes.WorkOrderType[] -> { +export async function getWorkOrderTypes(): Promise { if (workOrderTypes === undefined) { workOrderTypes = await getWorkOrderTypesFromDatabase() } @@ -234,7 +236,7 @@ export async function getWorkOrderTypes(): Promise< export async function getWorkOrderTypeById( workOrderTypeId: number -): Promise { +): Promise { const cachedWorkOrderTypes = await getWorkOrderTypes() return cachedWorkOrderTypes.find((currentWorkOrderType) => { @@ -250,10 +252,10 @@ function clearWorkOrderTypesCache(): void { * Work Order Milestone Types */ -let workOrderMilestoneTypes: recordTypes.WorkOrderMilestoneType[] | undefined +let workOrderMilestoneTypes: WorkOrderMilestoneType[] | undefined export async function getWorkOrderMilestoneTypes(): Promise< - recordTypes.WorkOrderMilestoneType[] + WorkOrderMilestoneType[] > { if (workOrderMilestoneTypes === undefined) { workOrderMilestoneTypes = await getWorkOrderMilestoneTypesFromDatabase() @@ -264,7 +266,7 @@ export async function getWorkOrderMilestoneTypes(): Promise< export async function getWorkOrderMilestoneTypeById( workOrderMilestoneTypeId: number -): Promise { +): Promise { const cachedWorkOrderMilestoneTypes = await getWorkOrderMilestoneTypes() return cachedWorkOrderMilestoneTypes.find((currentWorkOrderMilestoneType) => { @@ -277,7 +279,7 @@ export async function getWorkOrderMilestoneTypeById( export async function getWorkOrderMilestoneTypeByWorkOrderMilestoneType( workOrderMilestoneTypeString: string -): Promise { +): Promise { const cachedWorkOrderMilestoneTypes = await getWorkOrderMilestoneTypes() const workOrderMilestoneTypeLowerCase = diff --git a/helpers/functions.print.js b/helpers/functions.print.js index d43c6d55..ab1ee239 100644 --- a/helpers/functions.print.js +++ b/helpers/functions.print.js @@ -1,10 +1,10 @@ -import { getLot } from '../database/getLot.js'; -import { getLotOccupancy } from '../database/getLotOccupancy.js'; -import { getWorkOrder } from '../database/getWorkOrder.js'; -import * as configFunctions from './functions.config.js'; +import getLot from '../database/getLot.js'; +import getLotOccupancy from '../database/getLotOccupancy.js'; +import getWorkOrder from '../database/getWorkOrder.js'; +import { getConfigProperty } from './functions.config.js'; const screenPrintConfigs = { lotOccupancy: { - title: `${configFunctions.getConfigProperty('aliases.lot')} ${configFunctions.getConfigProperty('aliases.occupancy')} Print`, + title: `${getConfigProperty('aliases.lot')} ${getConfigProperty('aliases.occupancy')} Print`, params: ['lotOccupancyId'] } }; diff --git a/helpers/functions.print.ts b/helpers/functions.print.ts index 8ec3fc10..d02ff4e9 100644 --- a/helpers/functions.print.ts +++ b/helpers/functions.print.ts @@ -1,8 +1,8 @@ -import { getLot } from '../database/getLot.js' -import { getLotOccupancy } from '../database/getLotOccupancy.js' -import { getWorkOrder } from '../database/getWorkOrder.js' +import getLot from '../database/getLot.js' +import getLotOccupancy from '../database/getLotOccupancy.js' +import getWorkOrder from '../database/getWorkOrder.js' -import * as configFunctions from './functions.config.js' +import { getConfigProperty } from './functions.config.js' interface PrintConfig { title: string @@ -11,9 +11,9 @@ interface PrintConfig { const screenPrintConfigs: Record = { lotOccupancy: { - title: `${configFunctions.getConfigProperty( + title: `${getConfigProperty( 'aliases.lot' - )} ${configFunctions.getConfigProperty('aliases.occupancy')} Print`, + )} ${getConfigProperty('aliases.occupancy')} Print`, params: ['lotOccupancyId'] } } diff --git a/temp/legacy.importFromCSV.js b/temp/legacy.importFromCSV.js index eb03de6b..14891060 100644 --- a/temp/legacy.importFromCSV.js +++ b/temp/legacy.importFromCSV.js @@ -16,10 +16,10 @@ import addWorkOrderLot from '../database/addWorkOrderLot.js'; import addWorkOrderLotOccupancy from '../database/addWorkOrderLotOccupancy.js'; import addWorkOrderMilestone from '../database/addWorkOrderMilestone.js'; import closeWorkOrder from '../database/closeWorkOrder.js'; -import { getLot, getLotByLotName } from '../database/getLot.js'; -import { getLotOccupancies } from '../database/getLotOccupancies.js'; -import { getMap as getMapFromDatabase } from '../database/getMap.js'; -import { getWorkOrder, getWorkOrderByWorkOrderNumber } from '../database/getWorkOrder.js'; +import getLot, { getLotByLotName } from '../database/getLot.js'; +import getLotOccupancies from '../database/getLotOccupancies.js'; +import getMapFromDatabase from '../database/getMap.js'; +import getWorkOrder, { getWorkOrderByWorkOrderNumber } from '../database/getWorkOrder.js'; import { reopenWorkOrder } from '../database/reopenWorkOrder.js'; import { updateLotStatus } from '../database/updateLot.js'; import * as importData from './legacy.importFromCsv.data.js'; diff --git a/temp/legacy.importFromCSV.ts b/temp/legacy.importFromCSV.ts index 41ad462f..a94e0d0b 100644 --- a/temp/legacy.importFromCSV.ts +++ b/temp/legacy.importFromCSV.ts @@ -18,11 +18,10 @@ import addWorkOrderLot from '../database/addWorkOrderLot.js' import addWorkOrderLotOccupancy from '../database/addWorkOrderLotOccupancy.js' import addWorkOrderMilestone from '../database/addWorkOrderMilestone.js' import closeWorkOrder from '../database/closeWorkOrder.js' -import { getLot, getLotByLotName } from '../database/getLot.js' -import { getLotOccupancies } from '../database/getLotOccupancies.js' -import { getMap as getMapFromDatabase } from '../database/getMap.js' -import { - getWorkOrder, +import getLot, { getLotByLotName } from '../database/getLot.js' +import getLotOccupancies from '../database/getLotOccupancies.js' +import getMapFromDatabase from '../database/getMap.js' +import getWorkOrder, { getWorkOrderByWorkOrderNumber } from '../database/getWorkOrder.js' import { reopenWorkOrder } from '../database/reopenWorkOrder.js'