From bd0b68cbb146d257783c605387b993b2000fa431 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Mon, 24 Jun 2024 14:25:15 -0400 Subject: [PATCH] refactoring --- database/getPastLotOccupancyOccupants.d.ts | 2 +- database/getPastLotOccupancyOccupants.ts | 2 +- database/getWorkOrders.d.ts | 2 +- database/getWorkOrders.ts | 6 ++++-- database/reopenWorkOrder.d.ts | 3 +-- database/reopenWorkOrder.js | 3 +-- database/reopenWorkOrder.ts | 4 +--- database/reopenWorkOrderMilestone.d.ts | 3 +-- database/reopenWorkOrderMilestone.js | 3 +-- database/reopenWorkOrderMilestone.ts | 4 +--- database/updateFee.d.ts | 5 ++--- database/updateFee.js | 3 +-- database/updateFee.ts | 6 ++---- database/updateFeeCategory.d.ts | 5 ++--- database/updateFeeCategory.js | 3 +-- database/updateFeeCategory.ts | 6 ++---- database/updateLot.d.ts | 5 ++--- database/updateLot.js | 3 +-- database/updateLot.ts | 6 ++---- database/updateLotComment.d.ts | 5 ++--- database/updateLotComment.js | 3 +-- database/updateLotComment.ts | 6 ++---- database/updateLotOccupancy.d.ts | 5 ++--- database/updateLotOccupancy.js | 3 +-- database/updateLotOccupancy.ts | 6 ++---- database/updateLotOccupancyComment.d.ts | 10 +++++----- database/updateLotOccupancyComment.js | 3 +-- database/updateLotOccupancyComment.ts | 12 ++++++------ database/updateLotOccupancyFeeQuantity.d.ts | 5 ++--- database/updateLotOccupancyFeeQuantity.js | 3 +-- database/updateLotOccupancyFeeQuantity.ts | 6 ++---- database/updateLotOccupancyOccupant.d.ts | 5 ++--- database/updateLotOccupancyOccupant.js | 3 +-- database/updateLotOccupancyOccupant.ts | 6 ++---- database/updateLotOccupancyTransaction.d.ts | 10 +++++----- database/updateLotOccupancyTransaction.js | 3 +-- database/updateLotOccupancyTransaction.ts | 12 ++++++------ database/updateLotOccupantType.d.ts | 5 ++--- database/updateLotOccupantType.js | 3 +-- database/updateLotOccupantType.ts | 6 ++---- database/updateLotTypeField.d.ts | 5 ++--- database/updateLotTypeField.js | 3 +-- database/updateLotTypeField.ts | 6 ++---- database/updateMap.d.ts | 5 ++--- database/updateMap.js | 3 +-- database/updateMap.ts | 6 ++---- database/updateOccupancyTypeField.d.ts | 5 ++--- database/updateOccupancyTypeField.js | 3 +-- database/updateOccupancyTypeField.ts | 6 ++---- database/updateWorkOrder.d.ts | 8 ++++---- database/updateWorkOrder.js | 3 +-- database/updateWorkOrder.ts | 10 ++++------ database/updateWorkOrderComment.d.ts | 8 ++++---- database/updateWorkOrderComment.js | 3 +-- database/updateWorkOrderComment.ts | 10 +++++----- handlers/admin-post/doUpdateFee.js | 2 +- handlers/admin-post/doUpdateFee.ts | 4 ++-- handlers/admin-post/doUpdateFeeCategory.js | 2 +- handlers/admin-post/doUpdateFeeCategory.ts | 6 ++++-- handlers/admin-post/doUpdateLotOccupantType.js | 2 +- handlers/admin-post/doUpdateLotOccupantType.ts | 7 ++++--- handlers/admin-post/doUpdateLotStatus.js | 2 +- handlers/admin-post/doUpdateLotStatus.ts | 7 +++---- handlers/admin-post/doUpdateLotType.ts | 4 ++-- handlers/admin-post/doUpdateLotTypeField.js | 2 +- handlers/admin-post/doUpdateLotTypeField.ts | 7 ++++--- handlers/admin-post/doUpdateOccupancyType.js | 2 +- handlers/admin-post/doUpdateOccupancyType.ts | 7 +++---- handlers/admin-post/doUpdateOccupancyTypeField.js | 2 +- handlers/admin-post/doUpdateOccupancyTypeField.ts | 7 ++++--- .../admin-post/doUpdateWorkOrderMilestoneType.js | 2 +- .../admin-post/doUpdateWorkOrderMilestoneType.ts | 7 +++---- handlers/admin-post/doUpdateWorkOrderType.js | 2 +- handlers/admin-post/doUpdateWorkOrderType.ts | 7 +++---- .../lotOccupancies-post/doSearchPastOccupants.ts | 13 +++++++++---- .../lotOccupancies-post/doUpdateLotOccupancy.js | 2 +- .../lotOccupancies-post/doUpdateLotOccupancy.ts | 12 ++++++++---- .../doUpdateLotOccupancyComment.js | 2 +- .../doUpdateLotOccupancyComment.ts | 8 +++++--- .../doUpdateLotOccupancyFeeQuantity.js | 2 +- .../doUpdateLotOccupancyFeeQuantity.ts | 8 +++++--- .../doUpdateLotOccupancyOccupant.js | 2 +- .../doUpdateLotOccupancyOccupant.ts | 8 +++++--- .../doUpdateLotOccupancyTransaction.js | 2 +- .../doUpdateLotOccupancyTransaction.ts | 8 +++++--- handlers/lots-post/doUpdateLot.js | 2 +- handlers/lots-post/doUpdateLot.ts | 12 +++++++----- handlers/lots-post/doUpdateLotComment.js | 2 +- handlers/lots-post/doUpdateLotComment.ts | 6 ++++-- handlers/maps-post/doUpdateMap.js | 2 +- handlers/maps-post/doUpdateMap.ts | 10 ++++++---- handlers/workOrders-post/doReopenWorkOrder.js | 2 +- handlers/workOrders-post/doReopenWorkOrder.ts | 10 ++++++---- .../workOrders-post/doReopenWorkOrderMilestone.js | 2 +- .../workOrders-post/doReopenWorkOrderMilestone.ts | 4 ++-- handlers/workOrders-post/doSearchWorkOrders.ts | 8 +++++--- handlers/workOrders-post/doUpdateWorkOrder.js | 2 +- handlers/workOrders-post/doUpdateWorkOrder.ts | 9 +++++---- .../workOrders-post/doUpdateWorkOrderComment.js | 2 +- .../workOrders-post/doUpdateWorkOrderComment.ts | 5 ++--- 100 files changed, 238 insertions(+), 266 deletions(-) diff --git a/database/getPastLotOccupancyOccupants.d.ts b/database/getPastLotOccupancyOccupants.d.ts index 82851b13..1f1ae0f6 100644 --- a/database/getPastLotOccupancyOccupants.d.ts +++ b/database/getPastLotOccupancyOccupants.d.ts @@ -1,5 +1,5 @@ import type { LotOccupancyOccupant } from '../types/recordTypes.js'; -interface GetPastLotOccupancyOccupantsFilters { +export interface GetPastLotOccupancyOccupantsFilters { searchFilter: string; } interface GetPastLotOccupancyOccupantsOptions { diff --git a/database/getPastLotOccupancyOccupants.ts b/database/getPastLotOccupancyOccupants.ts index 09bd690e..11e5227d 100644 --- a/database/getPastLotOccupancyOccupants.ts +++ b/database/getPastLotOccupancyOccupants.ts @@ -2,7 +2,7 @@ import type { LotOccupancyOccupant } from '../types/recordTypes.js' import { acquireConnection } from './pool.js' -interface GetPastLotOccupancyOccupantsFilters { +export interface GetPastLotOccupancyOccupantsFilters { searchFilter: string } diff --git a/database/getWorkOrders.d.ts b/database/getWorkOrders.d.ts index 4d9fab70..7fa3a46c 100644 --- a/database/getWorkOrders.d.ts +++ b/database/getWorkOrders.d.ts @@ -1,6 +1,6 @@ import type { PoolConnection } from 'better-sqlite-pool'; import type { WorkOrder } from '../types/recordTypes.js'; -interface GetWorkOrdersFilters { +export interface GetWorkOrdersFilters { workOrderTypeId?: number | string; workOrderOpenStatus?: '' | 'open' | 'closed'; workOrderOpenDateString?: string; diff --git a/database/getWorkOrders.ts b/database/getWorkOrders.ts index e17d7c63..b6f159d9 100644 --- a/database/getWorkOrders.ts +++ b/database/getWorkOrders.ts @@ -17,7 +17,7 @@ import getWorkOrderComments from './getWorkOrderComments.js' import getWorkOrderMilestones from './getWorkOrderMilestones.js' import { acquireConnection } from './pool.js' -interface GetWorkOrdersFilters { +export interface GetWorkOrdersFilters { workOrderTypeId?: number | string workOrderOpenStatus?: '' | 'open' | 'closed' workOrderOpenDateString?: string @@ -56,7 +56,9 @@ function buildWhereClause(filters: GetWorkOrdersFilters): { if ((filters.workOrderOpenDateString ?? '') !== '') { sqlWhereClause += ' and w.workOrderOpenDate = ?' - sqlParameters.push(dateStringToInteger(filters.workOrderOpenDateString as DateString)) + sqlParameters.push( + dateStringToInteger(filters.workOrderOpenDateString as DateString) + ) } const occupantNameFilters = getOccupantNameWhereClause( diff --git a/database/reopenWorkOrder.d.ts b/database/reopenWorkOrder.d.ts index 28e58e0b..b9f9ac46 100644 --- a/database/reopenWorkOrder.d.ts +++ b/database/reopenWorkOrder.d.ts @@ -1,2 +1 @@ -export declare function reopenWorkOrder(workOrderId: number | string, user: User): Promise; -export default reopenWorkOrder; +export default function reopenWorkOrder(workOrderId: number | string, user: User): Promise; diff --git a/database/reopenWorkOrder.js b/database/reopenWorkOrder.js index 9ec07ef3..1cc8714e 100644 --- a/database/reopenWorkOrder.js +++ b/database/reopenWorkOrder.js @@ -1,5 +1,5 @@ import { acquireConnection } from './pool.js'; -export async function reopenWorkOrder(workOrderId, user) { +export default async function reopenWorkOrder(workOrderId, user) { const database = await acquireConnection(); const result = database .prepare(`update WorkOrders @@ -12,4 +12,3 @@ export async function reopenWorkOrder(workOrderId, user) { database.release(); return result.changes > 0; } -export default reopenWorkOrder; diff --git a/database/reopenWorkOrder.ts b/database/reopenWorkOrder.ts index 9cb073ae..0c575e46 100644 --- a/database/reopenWorkOrder.ts +++ b/database/reopenWorkOrder.ts @@ -1,6 +1,6 @@ import { acquireConnection } from './pool.js' -export async function reopenWorkOrder( +export default async function reopenWorkOrder( workOrderId: number | string, user: User ): Promise { @@ -21,5 +21,3 @@ export async function reopenWorkOrder( return result.changes > 0 } - -export default reopenWorkOrder diff --git a/database/reopenWorkOrderMilestone.d.ts b/database/reopenWorkOrderMilestone.d.ts index 0e0f7945..50e02ec0 100644 --- a/database/reopenWorkOrderMilestone.d.ts +++ b/database/reopenWorkOrderMilestone.d.ts @@ -1,2 +1 @@ -export declare function reopenWorkOrderMilestone(workOrderMilestoneId: number | string, user: User): Promise; -export default reopenWorkOrderMilestone; +export default function reopenWorkOrderMilestone(workOrderMilestoneId: number | string, user: User): Promise; diff --git a/database/reopenWorkOrderMilestone.js b/database/reopenWorkOrderMilestone.js index 5d50b63e..32927c8c 100644 --- a/database/reopenWorkOrderMilestone.js +++ b/database/reopenWorkOrderMilestone.js @@ -1,5 +1,5 @@ import { acquireConnection } from './pool.js'; -export async function reopenWorkOrderMilestone(workOrderMilestoneId, user) { +export default async function reopenWorkOrderMilestone(workOrderMilestoneId, user) { const database = await acquireConnection(); const result = database .prepare(`update WorkOrderMilestones @@ -13,4 +13,3 @@ export async function reopenWorkOrderMilestone(workOrderMilestoneId, user) { database.release(); return result.changes > 0; } -export default reopenWorkOrderMilestone; diff --git a/database/reopenWorkOrderMilestone.ts b/database/reopenWorkOrderMilestone.ts index 00a781e6..449d6a1c 100644 --- a/database/reopenWorkOrderMilestone.ts +++ b/database/reopenWorkOrderMilestone.ts @@ -1,6 +1,6 @@ import { acquireConnection } from './pool.js' -export async function reopenWorkOrderMilestone( +export default async function reopenWorkOrderMilestone( workOrderMilestoneId: number | string, user: User ): Promise { @@ -22,5 +22,3 @@ export async function reopenWorkOrderMilestone( return result.changes > 0 } - -export default reopenWorkOrderMilestone diff --git a/database/updateFee.d.ts b/database/updateFee.d.ts index 240b44cb..d9c54b06 100644 --- a/database/updateFee.d.ts +++ b/database/updateFee.d.ts @@ -1,4 +1,4 @@ -interface UpdateFeeForm { +export interface UpdateFeeForm { feeId: string; feeCategoryId: string; feeName: string; @@ -14,5 +14,4 @@ interface UpdateFeeForm { quantityUnit?: string; isRequired: '' | '1'; } -export declare function updateFee(feeForm: UpdateFeeForm, user: User): Promise; -export default updateFee; +export default function updateFee(feeForm: UpdateFeeForm, user: User): Promise; diff --git a/database/updateFee.js b/database/updateFee.js index ea92cfee..95a44164 100644 --- a/database/updateFee.js +++ b/database/updateFee.js @@ -1,5 +1,5 @@ import { acquireConnection } from './pool.js'; -export async function updateFee(feeForm, user) { +export default async function updateFee(feeForm, user) { const database = await acquireConnection(); const result = database .prepare(`update Fees @@ -26,4 +26,3 @@ export async function updateFee(feeForm, user) { database.release(); return result.changes > 0; } -export default updateFee; diff --git a/database/updateFee.ts b/database/updateFee.ts index 8b259fd1..56fd4517 100644 --- a/database/updateFee.ts +++ b/database/updateFee.ts @@ -1,6 +1,6 @@ import { acquireConnection } from './pool.js' -interface UpdateFeeForm { +export interface UpdateFeeForm { feeId: string feeCategoryId: string feeName: string @@ -17,7 +17,7 @@ interface UpdateFeeForm { isRequired: '' | '1' } -export async function updateFee( +export default async function updateFee( feeForm: UpdateFeeForm, user: User ): Promise { @@ -69,5 +69,3 @@ export async function updateFee( return result.changes > 0 } - -export default updateFee diff --git a/database/updateFeeCategory.d.ts b/database/updateFeeCategory.d.ts index 4d174a19..a3ca19cc 100644 --- a/database/updateFeeCategory.d.ts +++ b/database/updateFeeCategory.d.ts @@ -1,6 +1,5 @@ -interface UpdateFeeCategoryForm { +export interface UpdateFeeCategoryForm { feeCategoryId: number | string; feeCategory: string; } -export declare function updateFeeCategory(feeCategoryForm: UpdateFeeCategoryForm, user: User): Promise; -export default updateFeeCategory; +export default function updateFeeCategory(feeCategoryForm: UpdateFeeCategoryForm, user: User): Promise; diff --git a/database/updateFeeCategory.js b/database/updateFeeCategory.js index 24b7a944..7e2961f9 100644 --- a/database/updateFeeCategory.js +++ b/database/updateFeeCategory.js @@ -1,5 +1,4 @@ import { updateRecord } from './updateRecord.js'; -export async function updateFeeCategory(feeCategoryForm, user) { +export default async function updateFeeCategory(feeCategoryForm, user) { return await updateRecord('FeeCategories', feeCategoryForm.feeCategoryId, feeCategoryForm.feeCategory, user); } -export default updateFeeCategory; diff --git a/database/updateFeeCategory.ts b/database/updateFeeCategory.ts index fb094e73..5d617b2a 100644 --- a/database/updateFeeCategory.ts +++ b/database/updateFeeCategory.ts @@ -1,11 +1,11 @@ import { updateRecord } from './updateRecord.js' -interface UpdateFeeCategoryForm { +export interface UpdateFeeCategoryForm { feeCategoryId: number | string feeCategory: string } -export async function updateFeeCategory( +export default async function updateFeeCategory( feeCategoryForm: UpdateFeeCategoryForm, user: User ): Promise { @@ -16,5 +16,3 @@ export async function updateFeeCategory( user ) } - -export default updateFeeCategory diff --git a/database/updateLot.d.ts b/database/updateLot.d.ts index 6dfc197c..75b80d34 100644 --- a/database/updateLot.d.ts +++ b/database/updateLot.d.ts @@ -1,4 +1,4 @@ -interface UpdateLotForm { +export interface UpdateLotForm { lotId: string | number; lotName: string; lotTypeId: string | number; @@ -10,6 +10,5 @@ interface UpdateLotForm { lotTypeFieldIds?: string; [lotFieldValue_lotTypeFieldId: string]: unknown; } -export declare function updateLot(lotForm: UpdateLotForm, user: User): Promise; +export default function updateLot(lotForm: UpdateLotForm, user: User): Promise; export declare function updateLotStatus(lotId: number | string, lotStatusId: number | string, user: User): Promise; -export default updateLot; diff --git a/database/updateLot.js b/database/updateLot.js index 05ce15df..2da3f6a1 100644 --- a/database/updateLot.js +++ b/database/updateLot.js @@ -1,7 +1,7 @@ import addOrUpdateLotField from './addOrUpdateLotField.js'; import deleteLotField from './deleteLotField.js'; import { acquireConnection } from './pool.js'; -export async function updateLot(lotForm, user) { +export default async function updateLot(lotForm, user) { const database = await acquireConnection(); const result = database .prepare(`update Lots @@ -47,4 +47,3 @@ export async function updateLotStatus(lotId, lotStatusId, user) { database.release(); return result.changes > 0; } -export default updateLot; diff --git a/database/updateLot.ts b/database/updateLot.ts index 02d79539..f2df1ef3 100644 --- a/database/updateLot.ts +++ b/database/updateLot.ts @@ -2,7 +2,7 @@ import addOrUpdateLotField from './addOrUpdateLotField.js' import deleteLotField from './deleteLotField.js' import { acquireConnection } from './pool.js' -interface UpdateLotForm { +export interface UpdateLotForm { lotId: string | number lotName: string lotTypeId: string | number @@ -18,7 +18,7 @@ interface UpdateLotForm { [lotFieldValue_lotTypeFieldId: string]: unknown } -export async function updateLot( +export default async function updateLot( lotForm: UpdateLotForm, user: User ): Promise { @@ -108,5 +108,3 @@ export async function updateLotStatus( return result.changes > 0 } - -export default updateLot diff --git a/database/updateLotComment.d.ts b/database/updateLotComment.d.ts index 83deb8c7..5d2e9e12 100644 --- a/database/updateLotComment.d.ts +++ b/database/updateLotComment.d.ts @@ -1,9 +1,8 @@ import { type DateString, type TimeString } from '@cityssm/utils-datetime'; -interface UpdateLotCommentForm { +export interface UpdateLotCommentForm { lotCommentId: string | number; lotCommentDateString: DateString; lotCommentTimeString: TimeString; lotComment: string; } -export declare function updateLotComment(commentForm: UpdateLotCommentForm, user: User): Promise; -export default updateLotComment; +export default function updateLotComment(commentForm: UpdateLotCommentForm, user: User): Promise; diff --git a/database/updateLotComment.js b/database/updateLotComment.js index 01b5f1ea..0d19eb2a 100644 --- a/database/updateLotComment.js +++ b/database/updateLotComment.js @@ -1,6 +1,6 @@ import { dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime'; import { acquireConnection } from './pool.js'; -export async function updateLotComment(commentForm, user) { +export default async function updateLotComment(commentForm, user) { const database = await acquireConnection(); const result = database .prepare(`update LotComments @@ -15,4 +15,3 @@ export async function updateLotComment(commentForm, user) { database.release(); return result.changes > 0; } -export default updateLotComment; diff --git a/database/updateLotComment.ts b/database/updateLotComment.ts index b4edccf9..898f53f5 100644 --- a/database/updateLotComment.ts +++ b/database/updateLotComment.ts @@ -7,14 +7,14 @@ import { import { acquireConnection } from './pool.js' -interface UpdateLotCommentForm { +export interface UpdateLotCommentForm { lotCommentId: string | number lotCommentDateString: DateString lotCommentTimeString: TimeString lotComment: string } -export async function updateLotComment( +export default async function updateLotComment( commentForm: UpdateLotCommentForm, user: User ): Promise { @@ -44,5 +44,3 @@ export async function updateLotComment( return result.changes > 0 } - -export default updateLotComment diff --git a/database/updateLotOccupancy.d.ts b/database/updateLotOccupancy.d.ts index 78128f5a..f714042c 100644 --- a/database/updateLotOccupancy.d.ts +++ b/database/updateLotOccupancy.d.ts @@ -1,5 +1,5 @@ import { type DateString } from '@cityssm/utils-datetime'; -interface UpdateLotOccupancyForm { +export interface UpdateLotOccupancyForm { lotOccupancyId: string | number; occupancyTypeId: string | number; lotId: string | number; @@ -8,5 +8,4 @@ interface UpdateLotOccupancyForm { occupancyTypeFieldIds?: string; [lotOccupancyFieldValue_occupancyTypeFieldId: string]: unknown; } -export declare function updateLotOccupancy(lotOccupancyForm: UpdateLotOccupancyForm, user: User): Promise; -export default updateLotOccupancy; +export default function updateLotOccupancy(lotOccupancyForm: UpdateLotOccupancyForm, user: User): Promise; diff --git a/database/updateLotOccupancy.js b/database/updateLotOccupancy.js index 9e4a0d57..11d44d1c 100644 --- a/database/updateLotOccupancy.js +++ b/database/updateLotOccupancy.js @@ -2,7 +2,7 @@ import { dateStringToInteger } from '@cityssm/utils-datetime'; import addOrUpdateLotOccupancyField from './addOrUpdateLotOccupancyField.js'; import deleteLotOccupancyField from './deleteLotOccupancyField.js'; import { acquireConnection } from './pool.js'; -export async function updateLotOccupancy(lotOccupancyForm, user) { +export default async function updateLotOccupancy(lotOccupancyForm, user) { const database = await acquireConnection(); const result = database .prepare(`update LotOccupancies @@ -33,4 +33,3 @@ export async function updateLotOccupancy(lotOccupancyForm, user) { database.release(); return result.changes > 0; } -export default updateLotOccupancy; diff --git a/database/updateLotOccupancy.ts b/database/updateLotOccupancy.ts index a507df3f..e2b66478 100644 --- a/database/updateLotOccupancy.ts +++ b/database/updateLotOccupancy.ts @@ -4,7 +4,7 @@ import addOrUpdateLotOccupancyField from './addOrUpdateLotOccupancyField.js' import deleteLotOccupancyField from './deleteLotOccupancyField.js' import { acquireConnection } from './pool.js' -interface UpdateLotOccupancyForm { +export interface UpdateLotOccupancyForm { lotOccupancyId: string | number occupancyTypeId: string | number lotId: string | number @@ -16,7 +16,7 @@ interface UpdateLotOccupancyForm { [lotOccupancyFieldValue_occupancyTypeFieldId: string]: unknown } -export async function updateLotOccupancy( +export default async function updateLotOccupancy( lotOccupancyForm: UpdateLotOccupancyForm, user: User ): Promise { @@ -79,5 +79,3 @@ export async function updateLotOccupancy( return result.changes > 0 } - -export default updateLotOccupancy diff --git a/database/updateLotOccupancyComment.d.ts b/database/updateLotOccupancyComment.d.ts index 908cf50a..20b8949a 100644 --- a/database/updateLotOccupancyComment.d.ts +++ b/database/updateLotOccupancyComment.d.ts @@ -1,8 +1,8 @@ -interface UpdateLotOccupancyCommentForm { +import { type DateString, type TimeString } from '@cityssm/utils-datetime'; +export interface UpdateLotOccupancyCommentForm { lotOccupancyCommentId: string | number; - lotOccupancyCommentDateString: string; - lotOccupancyCommentTimeString: string; + lotOccupancyCommentDateString: DateString; + lotOccupancyCommentTimeString: TimeString; lotOccupancyComment: string; } -export declare function updateLotOccupancyComment(commentForm: UpdateLotOccupancyCommentForm, user: User): Promise; -export default updateLotOccupancyComment; +export default function updateLotOccupancyComment(commentForm: UpdateLotOccupancyCommentForm, user: User): Promise; diff --git a/database/updateLotOccupancyComment.js b/database/updateLotOccupancyComment.js index fb82021b..2597ac7a 100644 --- a/database/updateLotOccupancyComment.js +++ b/database/updateLotOccupancyComment.js @@ -1,6 +1,6 @@ import { dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime'; import { acquireConnection } from './pool.js'; -export async function updateLotOccupancyComment(commentForm, user) { +export default async function updateLotOccupancyComment(commentForm, user) { const database = await acquireConnection(); const result = database .prepare(`update LotOccupancyComments @@ -15,4 +15,3 @@ export async function updateLotOccupancyComment(commentForm, user) { database.release(); return result.changes > 0; } -export default updateLotOccupancyComment; diff --git a/database/updateLotOccupancyComment.ts b/database/updateLotOccupancyComment.ts index fc9de96f..fdbe3ceb 100644 --- a/database/updateLotOccupancyComment.ts +++ b/database/updateLotOccupancyComment.ts @@ -1,18 +1,20 @@ import { + type DateString, + type TimeString, dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime' import { acquireConnection } from './pool.js' -interface UpdateLotOccupancyCommentForm { +export interface UpdateLotOccupancyCommentForm { lotOccupancyCommentId: string | number - lotOccupancyCommentDateString: string - lotOccupancyCommentTimeString: string + lotOccupancyCommentDateString: DateString + lotOccupancyCommentTimeString: TimeString lotOccupancyComment: string } -export async function updateLotOccupancyComment( +export default async function updateLotOccupancyComment( commentForm: UpdateLotOccupancyCommentForm, user: User ): Promise { @@ -42,5 +44,3 @@ export async function updateLotOccupancyComment( return result.changes > 0 } - -export default updateLotOccupancyComment diff --git a/database/updateLotOccupancyFeeQuantity.d.ts b/database/updateLotOccupancyFeeQuantity.d.ts index b36c14e2..a43667ee 100644 --- a/database/updateLotOccupancyFeeQuantity.d.ts +++ b/database/updateLotOccupancyFeeQuantity.d.ts @@ -1,7 +1,6 @@ -interface UpdateLotOccupancyFeeQuantityForm { +export interface UpdateLotOccupancyFeeQuantityForm { lotOccupancyId: string | number; feeId: string | number; quantity: string | number; } -export declare function updateLotOccupancyFeeQuantity(feeQuantityForm: UpdateLotOccupancyFeeQuantityForm, user: User): Promise; -export default updateLotOccupancyFeeQuantity; +export default function updateLotOccupancyFeeQuantity(feeQuantityForm: UpdateLotOccupancyFeeQuantityForm, user: User): Promise; diff --git a/database/updateLotOccupancyFeeQuantity.js b/database/updateLotOccupancyFeeQuantity.js index 28618a66..fa41c090 100644 --- a/database/updateLotOccupancyFeeQuantity.js +++ b/database/updateLotOccupancyFeeQuantity.js @@ -1,5 +1,5 @@ import { acquireConnection } from './pool.js'; -export async function updateLotOccupancyFeeQuantity(feeQuantityForm, user) { +export default async function updateLotOccupancyFeeQuantity(feeQuantityForm, user) { const database = await acquireConnection(); const result = database .prepare(`update LotOccupancyFees @@ -13,4 +13,3 @@ export async function updateLotOccupancyFeeQuantity(feeQuantityForm, user) { database.release(); return result.changes > 0; } -export default updateLotOccupancyFeeQuantity; diff --git a/database/updateLotOccupancyFeeQuantity.ts b/database/updateLotOccupancyFeeQuantity.ts index e7300c2e..113552b5 100644 --- a/database/updateLotOccupancyFeeQuantity.ts +++ b/database/updateLotOccupancyFeeQuantity.ts @@ -1,12 +1,12 @@ import { acquireConnection } from './pool.js' -interface UpdateLotOccupancyFeeQuantityForm { +export interface UpdateLotOccupancyFeeQuantityForm { lotOccupancyId: string | number feeId: string | number quantity: string | number } -export async function updateLotOccupancyFeeQuantity( +export default async function updateLotOccupancyFeeQuantity( feeQuantityForm: UpdateLotOccupancyFeeQuantityForm, user: User ): Promise { @@ -34,5 +34,3 @@ export async function updateLotOccupancyFeeQuantity( return result.changes > 0 } - -export default updateLotOccupancyFeeQuantity diff --git a/database/updateLotOccupancyOccupant.d.ts b/database/updateLotOccupancyOccupant.d.ts index 8fb53ed8..8ba2e555 100644 --- a/database/updateLotOccupancyOccupant.d.ts +++ b/database/updateLotOccupancyOccupant.d.ts @@ -1,4 +1,4 @@ -interface UpdateLotOccupancyOccupantForm { +export interface UpdateLotOccupancyOccupantForm { lotOccupancyId: string | number; lotOccupantIndex: string | number; lotOccupantTypeId: string | number; @@ -13,5 +13,4 @@ interface UpdateLotOccupancyOccupantForm { occupantEmailAddress: string; occupantComment: string; } -export declare function updateLotOccupancyOccupant(lotOccupancyOccupantForm: UpdateLotOccupancyOccupantForm, user: User): Promise; -export default updateLotOccupancyOccupant; +export default function updateLotOccupancyOccupant(lotOccupancyOccupantForm: UpdateLotOccupancyOccupantForm, user: User): Promise; diff --git a/database/updateLotOccupancyOccupant.js b/database/updateLotOccupancyOccupant.js index c47f6ac4..65de0d7f 100644 --- a/database/updateLotOccupancyOccupant.js +++ b/database/updateLotOccupancyOccupant.js @@ -1,5 +1,5 @@ import { acquireConnection } from './pool.js'; -export async function updateLotOccupancyOccupant(lotOccupancyOccupantForm, user) { +export default async function updateLotOccupancyOccupant(lotOccupancyOccupantForm, user) { const database = await acquireConnection(); const results = database .prepare(`update LotOccupancyOccupants @@ -23,4 +23,3 @@ export async function updateLotOccupancyOccupant(lotOccupancyOccupantForm, user) database.release(); return results.changes > 0; } -export default updateLotOccupancyOccupant; diff --git a/database/updateLotOccupancyOccupant.ts b/database/updateLotOccupancyOccupant.ts index acc1cce8..bcdaa390 100644 --- a/database/updateLotOccupancyOccupant.ts +++ b/database/updateLotOccupancyOccupant.ts @@ -1,6 +1,6 @@ import { acquireConnection } from './pool.js' -interface UpdateLotOccupancyOccupantForm { +export interface UpdateLotOccupancyOccupantForm { lotOccupancyId: string | number lotOccupantIndex: string | number lotOccupantTypeId: string | number @@ -16,7 +16,7 @@ interface UpdateLotOccupancyOccupantForm { occupantComment: string } -export async function updateLotOccupancyOccupant( +export default async function updateLotOccupancyOccupant( lotOccupancyOccupantForm: UpdateLotOccupancyOccupantForm, user: User ): Promise { @@ -64,5 +64,3 @@ export async function updateLotOccupancyOccupant( return results.changes > 0 } - -export default updateLotOccupancyOccupant diff --git a/database/updateLotOccupancyTransaction.d.ts b/database/updateLotOccupancyTransaction.d.ts index dc20e788..a9728b32 100644 --- a/database/updateLotOccupancyTransaction.d.ts +++ b/database/updateLotOccupancyTransaction.d.ts @@ -1,11 +1,11 @@ -interface UpdateLotOccupancyTransactionForm { +import { type DateString, type TimeString } from '@cityssm/utils-datetime'; +export interface UpdateLotOccupancyTransactionForm { lotOccupancyId: string | number; transactionIndex: string | number; - transactionDateString: string; - transactionTimeString: string; + transactionDateString: DateString; + transactionTimeString: TimeString; transactionAmount: string | number; externalReceiptNumber: string; transactionNote: string; } -export declare function updateLotOccupancyTransaction(lotOccupancyTransactionForm: UpdateLotOccupancyTransactionForm, user: User): Promise; -export default updateLotOccupancyTransaction; +export default function updateLotOccupancyTransaction(lotOccupancyTransactionForm: UpdateLotOccupancyTransactionForm, user: User): Promise; diff --git a/database/updateLotOccupancyTransaction.js b/database/updateLotOccupancyTransaction.js index e1261257..8d06ec37 100644 --- a/database/updateLotOccupancyTransaction.js +++ b/database/updateLotOccupancyTransaction.js @@ -1,6 +1,6 @@ import { dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime'; import { acquireConnection } from './pool.js'; -export async function updateLotOccupancyTransaction(lotOccupancyTransactionForm, user) { +export default async function updateLotOccupancyTransaction(lotOccupancyTransactionForm, user) { const database = await acquireConnection(); const result = database .prepare(`update LotOccupancyTransactions @@ -18,4 +18,3 @@ export async function updateLotOccupancyTransaction(lotOccupancyTransactionForm, database.release(); return result.changes > 0; } -export default updateLotOccupancyTransaction; diff --git a/database/updateLotOccupancyTransaction.ts b/database/updateLotOccupancyTransaction.ts index 2808e80b..ca4ec1dd 100644 --- a/database/updateLotOccupancyTransaction.ts +++ b/database/updateLotOccupancyTransaction.ts @@ -1,21 +1,23 @@ import { + type DateString, + type TimeString, dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime' import { acquireConnection } from './pool.js' -interface UpdateLotOccupancyTransactionForm { +export interface UpdateLotOccupancyTransactionForm { lotOccupancyId: string | number transactionIndex: string | number - transactionDateString: string - transactionTimeString: string + transactionDateString: DateString + transactionTimeString: TimeString transactionAmount: string | number externalReceiptNumber: string transactionNote: string } -export async function updateLotOccupancyTransaction( +export default async function updateLotOccupancyTransaction( lotOccupancyTransactionForm: UpdateLotOccupancyTransactionForm, user: User ): Promise { @@ -51,5 +53,3 @@ export async function updateLotOccupancyTransaction( return result.changes > 0 } - -export default updateLotOccupancyTransaction diff --git a/database/updateLotOccupantType.d.ts b/database/updateLotOccupantType.d.ts index 8dd02e10..848b071f 100644 --- a/database/updateLotOccupantType.d.ts +++ b/database/updateLotOccupantType.d.ts @@ -1,8 +1,7 @@ -interface UpdateLotOccupantTypeForm { +export interface UpdateLotOccupantTypeForm { lotOccupantTypeId: number | string; lotOccupantType: string; fontAwesomeIconClass: string; occupantCommentTitle: string; } -export declare function updateLotOccupantType(lotOccupantTypeForm: UpdateLotOccupantTypeForm, user: User): Promise; -export default updateLotOccupantType; +export default function updateLotOccupantType(lotOccupantTypeForm: UpdateLotOccupantTypeForm, user: User): Promise; diff --git a/database/updateLotOccupantType.js b/database/updateLotOccupantType.js index 7b57ab06..e0db3e7e 100644 --- a/database/updateLotOccupantType.js +++ b/database/updateLotOccupantType.js @@ -1,6 +1,6 @@ import { clearCacheByTableName } from '../helpers/functions.cache.js'; import { acquireConnection } from './pool.js'; -export async function updateLotOccupantType(lotOccupantTypeForm, user) { +export default async function updateLotOccupantType(lotOccupantTypeForm, user) { const database = await acquireConnection(); const result = database .prepare(`update LotOccupantTypes @@ -16,4 +16,3 @@ export async function updateLotOccupantType(lotOccupantTypeForm, user) { clearCacheByTableName('LotOccupantTypes'); return result.changes > 0; } -export default updateLotOccupantType; diff --git a/database/updateLotOccupantType.ts b/database/updateLotOccupantType.ts index bd2d8aa4..2574340e 100644 --- a/database/updateLotOccupantType.ts +++ b/database/updateLotOccupantType.ts @@ -2,14 +2,14 @@ import { clearCacheByTableName } from '../helpers/functions.cache.js' import { acquireConnection } from './pool.js' -interface UpdateLotOccupantTypeForm { +export interface UpdateLotOccupantTypeForm { lotOccupantTypeId: number | string lotOccupantType: string fontAwesomeIconClass: string occupantCommentTitle: string } -export async function updateLotOccupantType( +export default async function updateLotOccupantType( lotOccupantTypeForm: UpdateLotOccupantTypeForm, user: User ): Promise { @@ -41,5 +41,3 @@ export async function updateLotOccupantType( return result.changes > 0 } - -export default updateLotOccupantType diff --git a/database/updateLotTypeField.d.ts b/database/updateLotTypeField.d.ts index e3cd13ec..cf84113f 100644 --- a/database/updateLotTypeField.d.ts +++ b/database/updateLotTypeField.d.ts @@ -1,4 +1,4 @@ -interface UpdateLotTypeFieldForm { +export interface UpdateLotTypeFieldForm { lotTypeFieldId: number | string; lotTypeField: string; isRequired: '0' | '1'; @@ -7,5 +7,4 @@ interface UpdateLotTypeFieldForm { pattern?: string; lotTypeFieldValues: string; } -export declare function updateLotTypeField(lotTypeFieldForm: UpdateLotTypeFieldForm, user: User): Promise; -export default updateLotTypeField; +export default function updateLotTypeField(lotTypeFieldForm: UpdateLotTypeFieldForm, user: User): Promise; diff --git a/database/updateLotTypeField.js b/database/updateLotTypeField.js index b1369ab5..39583499 100644 --- a/database/updateLotTypeField.js +++ b/database/updateLotTypeField.js @@ -1,6 +1,6 @@ import { clearCacheByTableName } from '../helpers/functions.cache.js'; import { acquireConnection } from './pool.js'; -export async function updateLotTypeField(lotTypeFieldForm, user) { +export default async function updateLotTypeField(lotTypeFieldForm, user) { const database = await acquireConnection(); const result = database .prepare(`update LotTypeFields @@ -19,4 +19,3 @@ export async function updateLotTypeField(lotTypeFieldForm, user) { clearCacheByTableName('LotTypeFields'); return result.changes > 0; } -export default updateLotTypeField; diff --git a/database/updateLotTypeField.ts b/database/updateLotTypeField.ts index 736932e2..a249717d 100644 --- a/database/updateLotTypeField.ts +++ b/database/updateLotTypeField.ts @@ -2,7 +2,7 @@ import { clearCacheByTableName } from '../helpers/functions.cache.js' import { acquireConnection } from './pool.js' -interface UpdateLotTypeFieldForm { +export interface UpdateLotTypeFieldForm { lotTypeFieldId: number | string lotTypeField: string isRequired: '0' | '1' @@ -12,7 +12,7 @@ interface UpdateLotTypeFieldForm { lotTypeFieldValues: string } -export async function updateLotTypeField( +export default async function updateLotTypeField( lotTypeFieldForm: UpdateLotTypeFieldForm, user: User ): Promise { @@ -50,5 +50,3 @@ export async function updateLotTypeField( return result.changes > 0 } - -export default updateLotTypeField diff --git a/database/updateMap.d.ts b/database/updateMap.d.ts index 5e151b1c..71ba0db8 100644 --- a/database/updateMap.d.ts +++ b/database/updateMap.d.ts @@ -1,4 +1,4 @@ -interface UpdateMapForm { +export interface UpdateMapForm { mapId: string; mapName: string; mapDescription: string; @@ -12,5 +12,4 @@ interface UpdateMapForm { mapPostalCode: string; mapPhoneNumber: string; } -export declare function updateMap(mapForm: UpdateMapForm, user: User): Promise; -export default updateMap; +export default function updateMap(mapForm: UpdateMapForm, user: User): Promise; diff --git a/database/updateMap.js b/database/updateMap.js index 87aea9df..de6e1939 100644 --- a/database/updateMap.js +++ b/database/updateMap.js @@ -1,5 +1,5 @@ import { acquireConnection } from './pool.js'; -export async function updateMap(mapForm, user) { +export default async function updateMap(mapForm, user) { const database = await acquireConnection(); const result = database .prepare(`update Maps @@ -22,4 +22,3 @@ export async function updateMap(mapForm, user) { database.release(); return result.changes > 0; } -export default updateMap; diff --git a/database/updateMap.ts b/database/updateMap.ts index b1d8356c..c5a2db6e 100644 --- a/database/updateMap.ts +++ b/database/updateMap.ts @@ -1,6 +1,6 @@ import { acquireConnection } from './pool.js' -interface UpdateMapForm { +export interface UpdateMapForm { mapId: string mapName: string mapDescription: string @@ -15,7 +15,7 @@ interface UpdateMapForm { mapPhoneNumber: string } -export async function updateMap( +export default async function updateMap( mapForm: UpdateMapForm, user: User ): Promise { @@ -61,5 +61,3 @@ export async function updateMap( return result.changes > 0 } - -export default updateMap diff --git a/database/updateOccupancyTypeField.d.ts b/database/updateOccupancyTypeField.d.ts index 43a3248e..5eac9ba0 100644 --- a/database/updateOccupancyTypeField.d.ts +++ b/database/updateOccupancyTypeField.d.ts @@ -1,4 +1,4 @@ -interface UpdateOccupancyTypeFieldForm { +export interface UpdateOccupancyTypeFieldForm { occupancyTypeFieldId: number | string; occupancyTypeField: string; isRequired: '0' | '1'; @@ -7,5 +7,4 @@ interface UpdateOccupancyTypeFieldForm { pattern?: string; occupancyTypeFieldValues: string; } -export declare function updateOccupancyTypeField(occupancyTypeFieldForm: UpdateOccupancyTypeFieldForm, user: User): Promise; -export default updateOccupancyTypeField; +export default function updateOccupancyTypeField(occupancyTypeFieldForm: UpdateOccupancyTypeFieldForm, user: User): Promise; diff --git a/database/updateOccupancyTypeField.js b/database/updateOccupancyTypeField.js index 736d62c9..90515744 100644 --- a/database/updateOccupancyTypeField.js +++ b/database/updateOccupancyTypeField.js @@ -1,6 +1,6 @@ import { clearCacheByTableName } from '../helpers/functions.cache.js'; import { acquireConnection } from './pool.js'; -export async function updateOccupancyTypeField(occupancyTypeFieldForm, user) { +export default async function updateOccupancyTypeField(occupancyTypeFieldForm, user) { const database = await acquireConnection(); const result = database .prepare(`update OccupancyTypeFields @@ -19,4 +19,3 @@ export async function updateOccupancyTypeField(occupancyTypeFieldForm, user) { clearCacheByTableName('OccupancyTypeFields'); return result.changes > 0; } -export default updateOccupancyTypeField; diff --git a/database/updateOccupancyTypeField.ts b/database/updateOccupancyTypeField.ts index 6f8a4bf7..5298d836 100644 --- a/database/updateOccupancyTypeField.ts +++ b/database/updateOccupancyTypeField.ts @@ -2,7 +2,7 @@ import { clearCacheByTableName } from '../helpers/functions.cache.js' import { acquireConnection } from './pool.js' -interface UpdateOccupancyTypeFieldForm { +export interface UpdateOccupancyTypeFieldForm { occupancyTypeFieldId: number | string occupancyTypeField: string isRequired: '0' | '1' @@ -12,7 +12,7 @@ interface UpdateOccupancyTypeFieldForm { occupancyTypeFieldValues: string } -export async function updateOccupancyTypeField( +export default async function updateOccupancyTypeField( occupancyTypeFieldForm: UpdateOccupancyTypeFieldForm, user: User ): Promise { @@ -50,5 +50,3 @@ export async function updateOccupancyTypeField( return result.changes > 0 } - -export default updateOccupancyTypeField diff --git a/database/updateWorkOrder.d.ts b/database/updateWorkOrder.d.ts index 4efad549..1319306d 100644 --- a/database/updateWorkOrder.d.ts +++ b/database/updateWorkOrder.d.ts @@ -1,9 +1,9 @@ -interface UpdateWorkOrderForm { +import { type DateString } from '@cityssm/utils-datetime'; +export interface UpdateWorkOrderForm { workOrderId: string; workOrderNumber: string; workOrderTypeId: string; workOrderDescription: string; - workOrderOpenDateString: string; + workOrderOpenDateString: DateString; } -export declare function updateWorkOrder(workOrderForm: UpdateWorkOrderForm, user: User): Promise; -export default updateWorkOrder; +export default function updateWorkOrder(workOrderForm: UpdateWorkOrderForm, user: User): Promise; diff --git a/database/updateWorkOrder.js b/database/updateWorkOrder.js index d5f299e6..035f428d 100644 --- a/database/updateWorkOrder.js +++ b/database/updateWorkOrder.js @@ -1,6 +1,6 @@ import { dateStringToInteger } from '@cityssm/utils-datetime'; import { acquireConnection } from './pool.js'; -export async function updateWorkOrder(workOrderForm, user) { +export default async function updateWorkOrder(workOrderForm, user) { const database = await acquireConnection(); const result = database .prepare(`update WorkOrders @@ -16,4 +16,3 @@ export async function updateWorkOrder(workOrderForm, user) { database.release(); return result.changes > 0; } -export default updateWorkOrder; diff --git a/database/updateWorkOrder.ts b/database/updateWorkOrder.ts index 604a2c7a..68fa8210 100644 --- a/database/updateWorkOrder.ts +++ b/database/updateWorkOrder.ts @@ -1,16 +1,16 @@ -import { dateStringToInteger } from '@cityssm/utils-datetime' +import { type DateString, dateStringToInteger } from '@cityssm/utils-datetime' import { acquireConnection } from './pool.js' -interface UpdateWorkOrderForm { +export interface UpdateWorkOrderForm { workOrderId: string workOrderNumber: string workOrderTypeId: string workOrderDescription: string - workOrderOpenDateString: string + workOrderOpenDateString: DateString } -export async function updateWorkOrder( +export default async function updateWorkOrder( workOrderForm: UpdateWorkOrderForm, user: User ): Promise { @@ -42,5 +42,3 @@ export async function updateWorkOrder( return result.changes > 0 } - -export default updateWorkOrder diff --git a/database/updateWorkOrderComment.d.ts b/database/updateWorkOrderComment.d.ts index 848b7fc9..3ea6a547 100644 --- a/database/updateWorkOrderComment.d.ts +++ b/database/updateWorkOrderComment.d.ts @@ -1,8 +1,8 @@ +import { type DateString, type TimeString } from '@cityssm/utils-datetime'; export interface UpdateWorkOrderCommentForm { workOrderCommentId: string | number; - workOrderCommentDateString: string; - workOrderCommentTimeString: string; + workOrderCommentDateString: DateString; + workOrderCommentTimeString: TimeString; workOrderComment: string; } -export declare function updateWorkOrderComment(commentForm: UpdateWorkOrderCommentForm, user: User): Promise; -export default updateWorkOrderComment; +export default function updateWorkOrderComment(commentForm: UpdateWorkOrderCommentForm, user: User): Promise; diff --git a/database/updateWorkOrderComment.js b/database/updateWorkOrderComment.js index cc97a4dc..46b9082d 100644 --- a/database/updateWorkOrderComment.js +++ b/database/updateWorkOrderComment.js @@ -1,6 +1,6 @@ import { dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime'; import { acquireConnection } from './pool.js'; -export async function updateWorkOrderComment(commentForm, user) { +export default async function updateWorkOrderComment(commentForm, user) { const database = await acquireConnection(); const result = database .prepare(`update WorkOrderComments @@ -15,4 +15,3 @@ export async function updateWorkOrderComment(commentForm, user) { database.release(); return result.changes > 0; } -export default updateWorkOrderComment; diff --git a/database/updateWorkOrderComment.ts b/database/updateWorkOrderComment.ts index 66a854b1..b0c18371 100644 --- a/database/updateWorkOrderComment.ts +++ b/database/updateWorkOrderComment.ts @@ -1,4 +1,6 @@ import { + type DateString, + type TimeString, dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime' @@ -7,12 +9,12 @@ import { acquireConnection } from './pool.js' export interface UpdateWorkOrderCommentForm { workOrderCommentId: string | number - workOrderCommentDateString: string - workOrderCommentTimeString: string + workOrderCommentDateString: DateString + workOrderCommentTimeString: TimeString workOrderComment: string } -export async function updateWorkOrderComment( +export default async function updateWorkOrderComment( commentForm: UpdateWorkOrderCommentForm, user: User ): Promise { @@ -42,5 +44,3 @@ export async function updateWorkOrderComment( return result.changes > 0 } - -export default updateWorkOrderComment diff --git a/handlers/admin-post/doUpdateFee.js b/handlers/admin-post/doUpdateFee.js index e42ee2e7..98498b8b 100644 --- a/handlers/admin-post/doUpdateFee.js +++ b/handlers/admin-post/doUpdateFee.js @@ -1,5 +1,5 @@ import getFeeCategories from '../../database/getFeeCategories.js'; -import { updateFee } from '../../database/updateFee.js'; +import updateFee from '../../database/updateFee.js'; export default async function handler(request, response) { const success = await updateFee(request.body, request.session.user); const feeCategories = await getFeeCategories({}, { diff --git a/handlers/admin-post/doUpdateFee.ts b/handlers/admin-post/doUpdateFee.ts index 24560bb1..55e21a82 100644 --- a/handlers/admin-post/doUpdateFee.ts +++ b/handlers/admin-post/doUpdateFee.ts @@ -1,13 +1,13 @@ import type { Request, Response } from 'express' import getFeeCategories from '../../database/getFeeCategories.js' -import { updateFee } from '../../database/updateFee.js' +import updateFee, { type UpdateFeeForm } from '../../database/updateFee.js' export default async function handler( request: Request, response: Response ): Promise { - const success = await updateFee(request.body, request.session.user as User) + const success = await updateFee(request.body as UpdateFeeForm, request.session.user as User) const feeCategories = await getFeeCategories( {}, diff --git a/handlers/admin-post/doUpdateFeeCategory.js b/handlers/admin-post/doUpdateFeeCategory.js index 5c5cd876..7c29db41 100644 --- a/handlers/admin-post/doUpdateFeeCategory.js +++ b/handlers/admin-post/doUpdateFeeCategory.js @@ -1,5 +1,5 @@ import getFeeCategories from '../../database/getFeeCategories.js'; -import { updateFeeCategory } from '../../database/updateFeeCategory.js'; +import updateFeeCategory from '../../database/updateFeeCategory.js'; export default async function handler(request, response) { const success = await updateFeeCategory(request.body, request.session.user); const feeCategories = await getFeeCategories({}, { diff --git a/handlers/admin-post/doUpdateFeeCategory.ts b/handlers/admin-post/doUpdateFeeCategory.ts index 1cc1e01a..4796c1be 100644 --- a/handlers/admin-post/doUpdateFeeCategory.ts +++ b/handlers/admin-post/doUpdateFeeCategory.ts @@ -1,14 +1,16 @@ import type { Request, Response } from 'express' import getFeeCategories from '../../database/getFeeCategories.js' -import { updateFeeCategory } from '../../database/updateFeeCategory.js' +import updateFeeCategory, { + type UpdateFeeCategoryForm +} from '../../database/updateFeeCategory.js' export default async function handler( request: Request, response: Response ): Promise { const success = await updateFeeCategory( - request.body, + request.body as UpdateFeeCategoryForm, request.session.user as User ) diff --git a/handlers/admin-post/doUpdateLotOccupantType.js b/handlers/admin-post/doUpdateLotOccupantType.js index 22aca677..856177cc 100644 --- a/handlers/admin-post/doUpdateLotOccupantType.js +++ b/handlers/admin-post/doUpdateLotOccupantType.js @@ -1,5 +1,5 @@ +import updateLotOccupantType from '../../database/updateLotOccupantType.js'; import { getLotOccupantTypes } from '../../helpers/functions.cache.js'; -import { updateLotOccupantType } from '../../database/updateLotOccupantType.js'; export default async function handler(request, response) { const success = await updateLotOccupantType(request.body, request.session.user); const lotOccupantTypes = await getLotOccupantTypes(); diff --git a/handlers/admin-post/doUpdateLotOccupantType.ts b/handlers/admin-post/doUpdateLotOccupantType.ts index d1c15e23..e554dc95 100644 --- a/handlers/admin-post/doUpdateLotOccupantType.ts +++ b/handlers/admin-post/doUpdateLotOccupantType.ts @@ -1,14 +1,16 @@ import type { Request, Response } from 'express' +import updateLotOccupantType, { + type UpdateLotOccupantTypeForm +} from '../../database/updateLotOccupantType.js' import { getLotOccupantTypes } from '../../helpers/functions.cache.js' -import { updateLotOccupantType } from '../../database/updateLotOccupantType.js' export default async function handler( request: Request, response: Response ): Promise { const success = await updateLotOccupantType( - request.body, + request.body as UpdateLotOccupantTypeForm, request.session.user as User ) @@ -19,4 +21,3 @@ export default async function handler( lotOccupantTypes }) } - diff --git a/handlers/admin-post/doUpdateLotStatus.js b/handlers/admin-post/doUpdateLotStatus.js index bc339201..4aedd219 100644 --- a/handlers/admin-post/doUpdateLotStatus.js +++ b/handlers/admin-post/doUpdateLotStatus.js @@ -1,5 +1,5 @@ -import { getLotStatuses } from '../../helpers/functions.cache.js'; import { updateRecord } from '../../database/updateRecord.js'; +import { getLotStatuses } from '../../helpers/functions.cache.js'; export default async function handler(request, response) { const success = await updateRecord('LotStatuses', request.body.lotStatusId, request.body.lotStatus, request.session.user); const lotStatuses = await getLotStatuses(); diff --git a/handlers/admin-post/doUpdateLotStatus.ts b/handlers/admin-post/doUpdateLotStatus.ts index ba75e5c0..e75de909 100644 --- a/handlers/admin-post/doUpdateLotStatus.ts +++ b/handlers/admin-post/doUpdateLotStatus.ts @@ -1,7 +1,7 @@ import type { Request, Response } from 'express' -import { getLotStatuses } from '../../helpers/functions.cache.js' import { updateRecord } from '../../database/updateRecord.js' +import { getLotStatuses } from '../../helpers/functions.cache.js' export default async function handler( request: Request, @@ -9,8 +9,8 @@ export default async function handler( ): Promise { const success = await updateRecord( 'LotStatuses', - request.body.lotStatusId, - request.body.lotStatus, + request.body.lotStatusId as string, + request.body.lotStatus as string, request.session.user as User ) @@ -21,4 +21,3 @@ export default async function handler( lotStatuses }) } - diff --git a/handlers/admin-post/doUpdateLotType.ts b/handlers/admin-post/doUpdateLotType.ts index e36be25f..26fb7788 100644 --- a/handlers/admin-post/doUpdateLotType.ts +++ b/handlers/admin-post/doUpdateLotType.ts @@ -9,8 +9,8 @@ export default async function handler( ): Promise { const success = await updateRecord( 'LotTypes', - request.body.lotTypeId, - request.body.lotType, + request.body.lotTypeId as string, + request.body.lotType as string, request.session.user as User ) diff --git a/handlers/admin-post/doUpdateLotTypeField.js b/handlers/admin-post/doUpdateLotTypeField.js index ac2e94a8..40a3dcc8 100644 --- a/handlers/admin-post/doUpdateLotTypeField.js +++ b/handlers/admin-post/doUpdateLotTypeField.js @@ -1,5 +1,5 @@ +import updateLotTypeField from '../../database/updateLotTypeField.js'; import { getLotTypes } from '../../helpers/functions.cache.js'; -import { updateLotTypeField } from '../../database/updateLotTypeField.js'; export default async function handler(request, response) { const success = await updateLotTypeField(request.body, request.session.user); const lotTypes = await getLotTypes(); diff --git a/handlers/admin-post/doUpdateLotTypeField.ts b/handlers/admin-post/doUpdateLotTypeField.ts index 1e0f866b..f410cc49 100644 --- a/handlers/admin-post/doUpdateLotTypeField.ts +++ b/handlers/admin-post/doUpdateLotTypeField.ts @@ -1,14 +1,16 @@ import type { Request, Response } from 'express' +import updateLotTypeField, { + type UpdateLotTypeFieldForm +} from '../../database/updateLotTypeField.js' import { getLotTypes } from '../../helpers/functions.cache.js' -import { updateLotTypeField } from '../../database/updateLotTypeField.js' export default async function handler( request: Request, response: Response ): Promise { const success = await updateLotTypeField( - request.body, + request.body as UpdateLotTypeFieldForm, request.session.user as User ) @@ -19,4 +21,3 @@ export default async function handler( lotTypes }) } - diff --git a/handlers/admin-post/doUpdateOccupancyType.js b/handlers/admin-post/doUpdateOccupancyType.js index f82679a5..2cfe2eca 100644 --- a/handlers/admin-post/doUpdateOccupancyType.js +++ b/handlers/admin-post/doUpdateOccupancyType.js @@ -1,5 +1,5 @@ -import { getAllOccupancyTypeFields, getOccupancyTypes } from '../../helpers/functions.cache.js'; import { updateRecord } from '../../database/updateRecord.js'; +import { getAllOccupancyTypeFields, getOccupancyTypes } from '../../helpers/functions.cache.js'; export default async function handler(request, response) { const success = await updateRecord('OccupancyTypes', request.body.occupancyTypeId, request.body.occupancyType, request.session.user); const occupancyTypes = await getOccupancyTypes(); diff --git a/handlers/admin-post/doUpdateOccupancyType.ts b/handlers/admin-post/doUpdateOccupancyType.ts index 98cbb0e1..0963f977 100644 --- a/handlers/admin-post/doUpdateOccupancyType.ts +++ b/handlers/admin-post/doUpdateOccupancyType.ts @@ -1,10 +1,10 @@ import type { Request, Response } from 'express' +import { updateRecord } from '../../database/updateRecord.js' import { getAllOccupancyTypeFields, getOccupancyTypes } from '../../helpers/functions.cache.js' -import { updateRecord } from '../../database/updateRecord.js' export default async function handler( request: Request, @@ -12,8 +12,8 @@ export default async function handler( ): Promise { const success = await updateRecord( 'OccupancyTypes', - request.body.occupancyTypeId, - request.body.occupancyType, + request.body.occupancyTypeId as string, + request.body.occupancyType as string, request.session.user as User ) @@ -26,4 +26,3 @@ export default async function handler( allOccupancyTypeFields }) } - diff --git a/handlers/admin-post/doUpdateOccupancyTypeField.js b/handlers/admin-post/doUpdateOccupancyTypeField.js index 92031650..5f8cd9e4 100644 --- a/handlers/admin-post/doUpdateOccupancyTypeField.js +++ b/handlers/admin-post/doUpdateOccupancyTypeField.js @@ -1,5 +1,5 @@ +import updateOccupancyTypeField from '../../database/updateOccupancyTypeField.js'; import { getAllOccupancyTypeFields, getOccupancyTypes } from '../../helpers/functions.cache.js'; -import { updateOccupancyTypeField } from '../../database/updateOccupancyTypeField.js'; export default async function handler(request, response) { const success = await updateOccupancyTypeField(request.body, request.session.user); const occupancyTypes = await getOccupancyTypes(); diff --git a/handlers/admin-post/doUpdateOccupancyTypeField.ts b/handlers/admin-post/doUpdateOccupancyTypeField.ts index 9d19d1e9..24ac5507 100644 --- a/handlers/admin-post/doUpdateOccupancyTypeField.ts +++ b/handlers/admin-post/doUpdateOccupancyTypeField.ts @@ -1,17 +1,19 @@ import type { Request, Response } from 'express' +import updateOccupancyTypeField, { + type UpdateOccupancyTypeFieldForm +} from '../../database/updateOccupancyTypeField.js' import { getAllOccupancyTypeFields, getOccupancyTypes } from '../../helpers/functions.cache.js' -import { updateOccupancyTypeField } from '../../database/updateOccupancyTypeField.js' export default async function handler( request: Request, response: Response ): Promise { const success = await updateOccupancyTypeField( - request.body, + request.body as UpdateOccupancyTypeFieldForm, request.session.user as User ) @@ -24,4 +26,3 @@ export default async function handler( allOccupancyTypeFields }) } - diff --git a/handlers/admin-post/doUpdateWorkOrderMilestoneType.js b/handlers/admin-post/doUpdateWorkOrderMilestoneType.js index 6b18efff..ad10e1b2 100644 --- a/handlers/admin-post/doUpdateWorkOrderMilestoneType.js +++ b/handlers/admin-post/doUpdateWorkOrderMilestoneType.js @@ -1,5 +1,5 @@ -import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js'; import { updateRecord } from '../../database/updateRecord.js'; +import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js'; export default async function handler(request, response) { const success = await updateRecord('WorkOrderMilestoneTypes', request.body.workOrderMilestoneTypeId, request.body.workOrderMilestoneType, request.session.user); const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes(); diff --git a/handlers/admin-post/doUpdateWorkOrderMilestoneType.ts b/handlers/admin-post/doUpdateWorkOrderMilestoneType.ts index d63f1b79..470de338 100644 --- a/handlers/admin-post/doUpdateWorkOrderMilestoneType.ts +++ b/handlers/admin-post/doUpdateWorkOrderMilestoneType.ts @@ -1,7 +1,7 @@ import type { Request, Response } from 'express' -import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js' import { updateRecord } from '../../database/updateRecord.js' +import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js' export default async function handler( request: Request, @@ -9,8 +9,8 @@ export default async function handler( ): Promise { const success = await updateRecord( 'WorkOrderMilestoneTypes', - request.body.workOrderMilestoneTypeId, - request.body.workOrderMilestoneType, + request.body.workOrderMilestoneTypeId as string, + request.body.workOrderMilestoneType as string, request.session.user as User ) @@ -21,4 +21,3 @@ export default async function handler( workOrderMilestoneTypes }) } - diff --git a/handlers/admin-post/doUpdateWorkOrderType.js b/handlers/admin-post/doUpdateWorkOrderType.js index 17cf6e93..f3f0c3bf 100644 --- a/handlers/admin-post/doUpdateWorkOrderType.js +++ b/handlers/admin-post/doUpdateWorkOrderType.js @@ -1,5 +1,5 @@ -import { getWorkOrderTypes } from '../../helpers/functions.cache.js'; import { updateRecord } from '../../database/updateRecord.js'; +import { getWorkOrderTypes } from '../../helpers/functions.cache.js'; export default async function handler(request, response) { const success = await updateRecord('WorkOrderTypes', request.body.workOrderTypeId, request.body.workOrderType, request.session.user); const workOrderTypes = await getWorkOrderTypes(); diff --git a/handlers/admin-post/doUpdateWorkOrderType.ts b/handlers/admin-post/doUpdateWorkOrderType.ts index f9b5fa8c..87d4a123 100644 --- a/handlers/admin-post/doUpdateWorkOrderType.ts +++ b/handlers/admin-post/doUpdateWorkOrderType.ts @@ -1,7 +1,7 @@ import type { Request, Response } from 'express' -import { getWorkOrderTypes } from '../../helpers/functions.cache.js' import { updateRecord } from '../../database/updateRecord.js' +import { getWorkOrderTypes } from '../../helpers/functions.cache.js' export default async function handler( request: Request, @@ -9,8 +9,8 @@ export default async function handler( ): Promise { const success = await updateRecord( 'WorkOrderTypes', - request.body.workOrderTypeId, - request.body.workOrderType, + request.body.workOrderTypeId as string, + request.body.workOrderType as string, request.session.user as User ) @@ -21,4 +21,3 @@ export default async function handler( workOrderTypes }) } - diff --git a/handlers/lotOccupancies-post/doSearchPastOccupants.ts b/handlers/lotOccupancies-post/doSearchPastOccupants.ts index 5018498f..2dedd03d 100644 --- a/handlers/lotOccupancies-post/doSearchPastOccupants.ts +++ b/handlers/lotOccupancies-post/doSearchPastOccupants.ts @@ -1,14 +1,19 @@ import type { Request, Response } from 'express' -import getPastLotOccupancyOccupants from '../../database/getPastLotOccupancyOccupants.js' +import getPastLotOccupancyOccupants, { + type GetPastLotOccupancyOccupantsFilters +} from '../../database/getPastLotOccupancyOccupants.js' export default async function handler( request: Request, response: Response ): Promise { - const occupants = await getPastLotOccupancyOccupants(request.body, { - limit: Number.parseInt(request.body.limit, 10) - }) + const occupants = await getPastLotOccupancyOccupants( + request.body as GetPastLotOccupancyOccupantsFilters, + { + limit: Number.parseInt(request.body.limit as string, 10) + } + ) response.json({ occupants diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancy.js b/handlers/lotOccupancies-post/doUpdateLotOccupancy.js index 80d38360..db50ed17 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancy.js +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancy.js @@ -1,4 +1,4 @@ -import { updateLotOccupancy } from '../../database/updateLotOccupancy.js'; +import updateLotOccupancy from '../../database/updateLotOccupancy.js'; export default async function handler(request, response) { const success = await updateLotOccupancy(request.body, request.session.user); response.json({ diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancy.ts b/handlers/lotOccupancies-post/doUpdateLotOccupancy.ts index a592ceca..c8642c49 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancy.ts +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancy.ts @@ -1,16 +1,20 @@ import type { Request, Response } from 'express' -import { updateLotOccupancy } from '../../database/updateLotOccupancy.js' +import updateLotOccupancy, { + type UpdateLotOccupancyForm +} from '../../database/updateLotOccupancy.js' export default async function handler( request: Request, response: Response ): Promise { - const success = await updateLotOccupancy(request.body, request.session.user as User) + const success = await updateLotOccupancy( + request.body as UpdateLotOccupancyForm, + request.session.user as User + ) response.json({ success, - lotOccupancyId: request.body.lotOccupancyId + lotOccupancyId: request.body.lotOccupancyId as string }) } - diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancyComment.js b/handlers/lotOccupancies-post/doUpdateLotOccupancyComment.js index 84cfc4c7..519d7f46 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancyComment.js +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancyComment.js @@ -1,5 +1,5 @@ import getLotOccupancyComments from '../../database/getLotOccupancyComments.js'; -import { updateLotOccupancyComment } from '../../database/updateLotOccupancyComment.js'; +import updateLotOccupancyComment from '../../database/updateLotOccupancyComment.js'; export default async function handler(request, response) { const success = await updateLotOccupancyComment(request.body, request.session.user); const lotOccupancyComments = await getLotOccupancyComments(request.body.lotOccupancyId); diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancyComment.ts b/handlers/lotOccupancies-post/doUpdateLotOccupancyComment.ts index 35e02409..3f8c6a8d 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancyComment.ts +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancyComment.ts @@ -1,19 +1,21 @@ import type { Request, Response } from 'express' import getLotOccupancyComments from '../../database/getLotOccupancyComments.js' -import { updateLotOccupancyComment } from '../../database/updateLotOccupancyComment.js' +import updateLotOccupancyComment, { + type UpdateLotOccupancyCommentForm +} from '../../database/updateLotOccupancyComment.js' export default async function handler( request: Request, response: Response ): Promise { const success = await updateLotOccupancyComment( - request.body, + request.body as UpdateLotOccupancyCommentForm, request.session.user as User ) const lotOccupancyComments = await getLotOccupancyComments( - request.body.lotOccupancyId + request.body.lotOccupancyId as string ) response.json({ diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.js b/handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.js index 8d095763..10142361 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.js +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.js @@ -1,5 +1,5 @@ import getLotOccupancyFees from '../../database/getLotOccupancyFees.js'; -import { updateLotOccupancyFeeQuantity } from '../../database/updateLotOccupancyFeeQuantity.js'; +import updateLotOccupancyFeeQuantity from '../../database/updateLotOccupancyFeeQuantity.js'; export default async function handler(request, response) { const success = await updateLotOccupancyFeeQuantity(request.body, request.session.user); const lotOccupancyFees = await getLotOccupancyFees(request.body.lotOccupancyId); diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.ts b/handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.ts index d838877e..fa4ff64f 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.ts +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancyFeeQuantity.ts @@ -1,19 +1,21 @@ import type { Request, Response } from 'express' import getLotOccupancyFees from '../../database/getLotOccupancyFees.js' -import { updateLotOccupancyFeeQuantity } from '../../database/updateLotOccupancyFeeQuantity.js' +import updateLotOccupancyFeeQuantity, { + type UpdateLotOccupancyFeeQuantityForm +} from '../../database/updateLotOccupancyFeeQuantity.js' export default async function handler( request: Request, response: Response ): Promise { const success = await updateLotOccupancyFeeQuantity( - request.body, + request.body as UpdateLotOccupancyFeeQuantityForm, request.session.user as User ) const lotOccupancyFees = await getLotOccupancyFees( - request.body.lotOccupancyId + request.body.lotOccupancyId as string ) response.json({ diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.js b/handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.js index 34ce3b22..d60ecc6b 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.js +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.js @@ -1,5 +1,5 @@ import getLotOccupancyOccupants from '../../database/getLotOccupancyOccupants.js'; -import { updateLotOccupancyOccupant } from '../../database/updateLotOccupancyOccupant.js'; +import updateLotOccupancyOccupant from '../../database/updateLotOccupancyOccupant.js'; export default async function handler(request, response) { const success = await updateLotOccupancyOccupant(request.body, request.session.user); const lotOccupancyOccupants = await getLotOccupancyOccupants(request.body.lotOccupancyId); diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.ts b/handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.ts index 8a0d0b76..302717eb 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.ts +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancyOccupant.ts @@ -1,19 +1,21 @@ import type { Request, Response } from 'express' import getLotOccupancyOccupants from '../../database/getLotOccupancyOccupants.js' -import { updateLotOccupancyOccupant } from '../../database/updateLotOccupancyOccupant.js' +import updateLotOccupancyOccupant, { + type UpdateLotOccupancyOccupantForm +} from '../../database/updateLotOccupancyOccupant.js' export default async function handler( request: Request, response: Response ): Promise { const success = await updateLotOccupancyOccupant( - request.body, + request.body as UpdateLotOccupancyOccupantForm, request.session.user as User ) const lotOccupancyOccupants = await getLotOccupancyOccupants( - request.body.lotOccupancyId + request.body.lotOccupancyId as string ) response.json({ diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.js b/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.js index 334cc815..d9db05ce 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.js +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.js @@ -1,5 +1,5 @@ import getLotOccupancyTransactions from '../../database/getLotOccupancyTransactions.js'; -import { updateLotOccupancyTransaction } from '../../database/updateLotOccupancyTransaction.js'; +import updateLotOccupancyTransaction from '../../database/updateLotOccupancyTransaction.js'; export default async function handler(request, response) { await updateLotOccupancyTransaction(request.body, request.session.user); const lotOccupancyTransactions = await getLotOccupancyTransactions(request.body.lotOccupancyId, { includeIntegrations: true }); diff --git a/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.ts b/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.ts index bbd858dd..17eb6697 100644 --- a/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.ts +++ b/handlers/lotOccupancies-post/doUpdateLotOccupancyTransaction.ts @@ -1,19 +1,21 @@ import type { Request, Response } from 'express' import getLotOccupancyTransactions from '../../database/getLotOccupancyTransactions.js' -import { updateLotOccupancyTransaction } from '../../database/updateLotOccupancyTransaction.js' +import updateLotOccupancyTransaction, { + type UpdateLotOccupancyTransactionForm +} from '../../database/updateLotOccupancyTransaction.js' export default async function handler( request: Request, response: Response ): Promise { await updateLotOccupancyTransaction( - request.body, + request.body as UpdateLotOccupancyTransactionForm, request.session.user as User ) const lotOccupancyTransactions = await getLotOccupancyTransactions( - request.body.lotOccupancyId, + request.body.lotOccupancyId as string, { includeIntegrations: true } ) diff --git a/handlers/lots-post/doUpdateLot.js b/handlers/lots-post/doUpdateLot.js index e7efa2e9..db15965f 100644 --- a/handlers/lots-post/doUpdateLot.js +++ b/handlers/lots-post/doUpdateLot.js @@ -1,5 +1,5 @@ +import updateLot from '../../database/updateLot.js'; import { clearNextPreviousLotIdCache } from '../../helpers/functions.lots.js'; -import { updateLot } from '../../database/updateLot.js'; export default async function handler(request, response) { const lotId = Number.parseInt(request.body.lotId, 10); const success = await updateLot(request.body, request.session.user); diff --git a/handlers/lots-post/doUpdateLot.ts b/handlers/lots-post/doUpdateLot.ts index 5ab98994..882fec0a 100644 --- a/handlers/lots-post/doUpdateLot.ts +++ b/handlers/lots-post/doUpdateLot.ts @@ -1,23 +1,25 @@ import type { Request, Response } from 'express' +import updateLot, { type UpdateLotForm } from '../../database/updateLot.js' import { clearNextPreviousLotIdCache } from '../../helpers/functions.lots.js' -import { updateLot } from '../../database/updateLot.js' export default async function handler( request: Request, response: Response ): Promise { - const lotId = Number.parseInt(request.body.lotId, 10) + const lotId = Number.parseInt(request.body.lotId as string, 10) - const success = await updateLot(request.body, request.session.user as User) + const success = await updateLot( + request.body as UpdateLotForm, + request.session.user as User + ) response.json({ success, - lotId: request.body.lotId + lotId: request.body.lotId as string }) response.on('finish', () => { clearNextPreviousLotIdCache(lotId) }) } - diff --git a/handlers/lots-post/doUpdateLotComment.js b/handlers/lots-post/doUpdateLotComment.js index d7056390..0596e86f 100644 --- a/handlers/lots-post/doUpdateLotComment.js +++ b/handlers/lots-post/doUpdateLotComment.js @@ -1,5 +1,5 @@ import getLotComments from '../../database/getLotComments.js'; -import { updateLotComment } from '../../database/updateLotComment.js'; +import updateLotComment from '../../database/updateLotComment.js'; export default async function handler(request, response) { const success = await updateLotComment(request.body, request.session.user); const lotComments = await getLotComments(request.body.lotId); diff --git a/handlers/lots-post/doUpdateLotComment.ts b/handlers/lots-post/doUpdateLotComment.ts index 69e5be7c..cd799c7a 100644 --- a/handlers/lots-post/doUpdateLotComment.ts +++ b/handlers/lots-post/doUpdateLotComment.ts @@ -1,14 +1,16 @@ import type { Request, Response } from 'express' import getLotComments from '../../database/getLotComments.js' -import { updateLotComment } from '../../database/updateLotComment.js' +import updateLotComment, { + type UpdateLotCommentForm +} from '../../database/updateLotComment.js' export default async function handler( request: Request, response: Response ): Promise { const success = await updateLotComment( - request.body, + request.body as UpdateLotCommentForm, request.session.user as User ) diff --git a/handlers/maps-post/doUpdateMap.js b/handlers/maps-post/doUpdateMap.js index dd290255..82329a4a 100644 --- a/handlers/maps-post/doUpdateMap.js +++ b/handlers/maps-post/doUpdateMap.js @@ -1,4 +1,4 @@ -import { updateMap } from '../../database/updateMap.js'; +import updateMap from '../../database/updateMap.js'; export default async function handler(request, response) { const success = await updateMap(request.body, request.session.user); response.json({ diff --git a/handlers/maps-post/doUpdateMap.ts b/handlers/maps-post/doUpdateMap.ts index 53aad612..3c6651b3 100644 --- a/handlers/maps-post/doUpdateMap.ts +++ b/handlers/maps-post/doUpdateMap.ts @@ -1,16 +1,18 @@ import type { Request, Response } from 'express' -import { updateMap } from '../../database/updateMap.js' +import updateMap, { type UpdateMapForm } from '../../database/updateMap.js' export default async function handler( request: Request, response: Response ): Promise { - const success = await updateMap(request.body, request.session.user as User) + const success = await updateMap( + request.body as UpdateMapForm, + request.session.user as User + ) response.json({ success, - mapId: request.body.mapId + mapId: request.body.mapId as string }) } - diff --git a/handlers/workOrders-post/doReopenWorkOrder.js b/handlers/workOrders-post/doReopenWorkOrder.js index 056d3cce..115cce4f 100644 --- a/handlers/workOrders-post/doReopenWorkOrder.js +++ b/handlers/workOrders-post/doReopenWorkOrder.js @@ -1,4 +1,4 @@ -import { reopenWorkOrder } from '../../database/reopenWorkOrder.js'; +import reopenWorkOrder from '../../database/reopenWorkOrder.js'; export default async function handler(request, response) { const success = await reopenWorkOrder(request.body.workOrderId, request.session.user); response.json({ diff --git a/handlers/workOrders-post/doReopenWorkOrder.ts b/handlers/workOrders-post/doReopenWorkOrder.ts index 8df02db9..4b789c48 100644 --- a/handlers/workOrders-post/doReopenWorkOrder.ts +++ b/handlers/workOrders-post/doReopenWorkOrder.ts @@ -1,16 +1,18 @@ import type { Request, Response } from 'express' -import { reopenWorkOrder } from '../../database/reopenWorkOrder.js' +import reopenWorkOrder from '../../database/reopenWorkOrder.js' export default async function handler( request: Request, response: Response ): Promise { - const success = await reopenWorkOrder(request.body.workOrderId, request.session.user as User) + const success = await reopenWorkOrder( + request.body.workOrderId as string, + request.session.user as User + ) response.json({ success, - workOrderId: request.body.workOrderId + workOrderId: request.body.workOrderId as string }) } - diff --git a/handlers/workOrders-post/doReopenWorkOrderMilestone.js b/handlers/workOrders-post/doReopenWorkOrderMilestone.js index 59f4f998..fb6699da 100644 --- a/handlers/workOrders-post/doReopenWorkOrderMilestone.js +++ b/handlers/workOrders-post/doReopenWorkOrderMilestone.js @@ -1,5 +1,5 @@ import getWorkOrderMilestones from '../../database/getWorkOrderMilestones.js'; -import { reopenWorkOrderMilestone } from '../../database/reopenWorkOrderMilestone.js'; +import reopenWorkOrderMilestone from '../../database/reopenWorkOrderMilestone.js'; export default async function handler(request, response) { const success = await reopenWorkOrderMilestone(request.body.workOrderMilestoneId, request.session.user); const workOrderMilestones = await getWorkOrderMilestones({ diff --git a/handlers/workOrders-post/doReopenWorkOrderMilestone.ts b/handlers/workOrders-post/doReopenWorkOrderMilestone.ts index f59c16dc..2cfa7a2a 100644 --- a/handlers/workOrders-post/doReopenWorkOrderMilestone.ts +++ b/handlers/workOrders-post/doReopenWorkOrderMilestone.ts @@ -1,7 +1,7 @@ import type { Request, Response } from 'express' import getWorkOrderMilestones from '../../database/getWorkOrderMilestones.js' -import { reopenWorkOrderMilestone } from '../../database/reopenWorkOrderMilestone.js' +import reopenWorkOrderMilestone from '../../database/reopenWorkOrderMilestone.js' export default async function handler( request: Request, @@ -14,7 +14,7 @@ export default async function handler( const workOrderMilestones = await getWorkOrderMilestones( { - workOrderId: request.body.workOrderId + workOrderId: request.body.workOrderId as string }, { orderBy: 'completion' diff --git a/handlers/workOrders-post/doSearchWorkOrders.ts b/handlers/workOrders-post/doSearchWorkOrders.ts index 59e7f7cd..c0b1a029 100644 --- a/handlers/workOrders-post/doSearchWorkOrders.ts +++ b/handlers/workOrders-post/doSearchWorkOrders.ts @@ -1,12 +1,15 @@ import type { Request, Response } from 'express' -import { getWorkOrders } from '../../database/getWorkOrders.js' +import { + type GetWorkOrdersFilters, + getWorkOrders +} from '../../database/getWorkOrders.js' export default async function handler( request: Request, response: Response ): Promise { - const result = await getWorkOrders(request.body, { + const result = await getWorkOrders(request.body as GetWorkOrdersFilters, { limit: request.body.limit, offset: request.body.offset, includeLotsAndLotOccupancies: true @@ -18,4 +21,3 @@ export default async function handler( workOrders: result.workOrders }) } - diff --git a/handlers/workOrders-post/doUpdateWorkOrder.js b/handlers/workOrders-post/doUpdateWorkOrder.js index ae90d789..fe58e0d3 100644 --- a/handlers/workOrders-post/doUpdateWorkOrder.js +++ b/handlers/workOrders-post/doUpdateWorkOrder.js @@ -1,4 +1,4 @@ -import { updateWorkOrder } from '../../database/updateWorkOrder.js'; +import updateWorkOrder from '../../database/updateWorkOrder.js'; export default async function handler(request, response) { const success = await updateWorkOrder(request.body, request.session.user); response.json({ diff --git a/handlers/workOrders-post/doUpdateWorkOrder.ts b/handlers/workOrders-post/doUpdateWorkOrder.ts index e737c553..877d8fc3 100644 --- a/handlers/workOrders-post/doUpdateWorkOrder.ts +++ b/handlers/workOrders-post/doUpdateWorkOrder.ts @@ -1,19 +1,20 @@ import type { Request, Response } from 'express' -import { updateWorkOrder } from '../../database/updateWorkOrder.js' +import updateWorkOrder, { + type UpdateWorkOrderForm +} from '../../database/updateWorkOrder.js' export default async function handler( request: Request, response: Response ): Promise { const success = await updateWorkOrder( - request.body, + request.body as UpdateWorkOrderForm, request.session.user as User ) response.json({ success, - workOrderId: request.body.workOrderId + workOrderId: request.body.workOrderId as string }) } - diff --git a/handlers/workOrders-post/doUpdateWorkOrderComment.js b/handlers/workOrders-post/doUpdateWorkOrderComment.js index bad3e471..81fb33cd 100644 --- a/handlers/workOrders-post/doUpdateWorkOrderComment.js +++ b/handlers/workOrders-post/doUpdateWorkOrderComment.js @@ -1,5 +1,5 @@ import getWorkOrderComments from '../../database/getWorkOrderComments.js'; -import { updateWorkOrderComment } from '../../database/updateWorkOrderComment.js'; +import updateWorkOrderComment from '../../database/updateWorkOrderComment.js'; export default async function handler(request, response) { const success = await updateWorkOrderComment(request.body, request.session.user); const workOrderComments = await getWorkOrderComments(request.body.workOrderId); diff --git a/handlers/workOrders-post/doUpdateWorkOrderComment.ts b/handlers/workOrders-post/doUpdateWorkOrderComment.ts index f07b04f7..117dc8a6 100644 --- a/handlers/workOrders-post/doUpdateWorkOrderComment.ts +++ b/handlers/workOrders-post/doUpdateWorkOrderComment.ts @@ -1,9 +1,8 @@ import type { Request, Response } from 'express' import getWorkOrderComments from '../../database/getWorkOrderComments.js' -import { - type UpdateWorkOrderCommentForm, - updateWorkOrderComment +import updateWorkOrderComment, { + type UpdateWorkOrderCommentForm } from '../../database/updateWorkOrderComment.js' export default async function handler(