From 4f6fc87e051bfc7bda6a341fd96d357bb0c9af57 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Thu, 24 Apr 2025 11:59:27 -0400 Subject: [PATCH] remove better-sqlite-pool --- database/addBurialSite.d.ts | 2 +- database/addBurialSite.js | 15 ++- database/addBurialSite.ts | 20 +-- database/addBurialSiteComment.d.ts | 2 +- database/addBurialSiteComment.js | 9 +- database/addBurialSiteComment.ts | 11 +- database/addBurialSiteTypeField.d.ts | 6 +- database/addBurialSiteTypeField.js | 9 +- database/addBurialSiteTypeField.ts | 21 +-- database/addCemetery.d.ts | 2 +- database/addCemetery.js | 9 +- database/addCemetery.ts | 12 +- database/addCommittalType.d.ts | 2 +- database/addCommittalType.js | 9 +- database/addCommittalType.ts | 14 +- database/addContract.d.ts | 4 +- database/addContract.js | 11 +- database/addContract.ts | 18 +-- database/addContractComment.d.ts | 2 +- database/addContractComment.js | 9 +- database/addContractComment.ts | 13 +- database/addContractFee.d.ts | 4 +- database/addContractFee.js | 9 +- database/addContractFee.ts | 17 ++- database/addContractFeeCategory.js | 9 +- database/addContractFeeCategory.ts | 14 +- database/addContractInterment.d.ts | 4 +- database/addContractInterment.js | 13 +- database/addContractInterment.ts | 21 ++- database/addContractTransaction.d.ts | 2 +- database/addContractTransaction.js | 9 +- database/addContractTransaction.ts | 11 +- database/addContractType.d.ts | 2 +- database/addContractType.js | 9 +- database/addContractType.ts | 14 +- database/addContractTypeField.d.ts | 8 +- database/addContractTypeField.js | 9 +- database/addContractTypeField.ts | 20 +-- database/addContractTypePrint.d.ts | 4 +- database/addContractTypePrint.js | 9 +- database/addContractTypePrint.ts | 15 ++- database/addFee.d.ts | 8 +- database/addFee.js | 9 +- database/addFee.ts | 19 ++- database/addFeeCategory.d.ts | 2 +- database/addFeeCategory.js | 9 +- database/addFeeCategory.ts | 12 +- database/addFuneralHome.d.ts | 4 +- database/addFuneralHome.js | 9 +- database/addFuneralHome.ts | 17 +-- database/addIntermentContainerType.d.ts | 2 +- database/addIntermentContainerType.js | 9 +- database/addIntermentContainerType.ts | 13 +- database/addOrUpdateBurialSiteField.d.ts | 8 +- database/addOrUpdateBurialSiteField.js | 9 +- database/addOrUpdateBurialSiteField.ts | 18 +-- database/addOrUpdateContractField.d.ts | 8 +- database/addOrUpdateContractField.js | 9 +- database/addOrUpdateContractField.ts | 18 +-- database/addRecord.d.ts | 2 +- database/addRecord.js | 9 +- database/addRecord.ts | 13 +- database/addWorkOrder.d.ts | 2 +- database/addWorkOrder.js | 13 +- database/addWorkOrder.ts | 16 ++- database/addWorkOrderBurialSite.d.ts | 2 +- database/addWorkOrderBurialSite.js | 9 +- database/addWorkOrderBurialSite.ts | 12 +- database/addWorkOrderComment.d.ts | 2 +- database/addWorkOrderComment.js | 9 +- database/addWorkOrderComment.ts | 11 +- database/addWorkOrderContract.d.ts | 6 +- database/addWorkOrderContract.js | 9 +- database/addWorkOrderContract.ts | 21 ++- database/addWorkOrderMilestone.d.ts | 4 +- database/addWorkOrderMilestone.js | 9 +- database/addWorkOrderMilestone.ts | 16 ++- database/cleanupDatabase.d.ts | 4 +- database/cleanupDatabase.js | 9 +- database/cleanupDatabase.ts | 27 ++-- database/closeWorkOrder.d.ts | 2 +- database/closeWorkOrder.js | 9 +- database/closeWorkOrder.ts | 12 +- database/completeWorkOrderMilestone.d.ts | 4 +- database/completeWorkOrderMilestone.js | 9 +- database/completeWorkOrderMilestone.ts | 14 +- database/copyContract.js | 13 +- database/copyContract.ts | 13 +- database/deleteBurialSite.d.ts | 2 +- database/deleteBurialSite.js | 11 +- database/deleteBurialSite.ts | 14 +- database/deleteBurialSiteField.d.ts | 4 +- database/deleteBurialSiteField.js | 9 +- database/deleteBurialSiteField.ts | 14 +- database/deleteCemetery.d.ts | 2 +- database/deleteCemetery.js | 11 +- database/deleteCemetery.ts | 13 +- database/deleteContractFee.d.ts | 2 +- database/deleteContractFee.js | 9 +- database/deleteContractFee.ts | 12 +- database/deleteContractField.d.ts | 4 +- database/deleteContractField.js | 9 +- database/deleteContractField.ts | 14 +- database/deleteContractInterment.d.ts | 2 +- database/deleteContractInterment.js | 9 +- database/deleteContractInterment.ts | 12 +- database/deleteContractTransaction.d.ts | 2 +- database/deleteContractTransaction.js | 9 +- database/deleteContractTransaction.ts | 12 +- database/deleteContractTypePrint.d.ts | 2 +- database/deleteContractTypePrint.js | 9 +- database/deleteContractTypePrint.ts | 13 +- database/deleteRecord.d.ts | 2 +- database/deleteRecord.js | 9 +- database/deleteRecord.ts | 13 +- database/deleteWorkOrderBurialSite.d.ts | 2 +- database/deleteWorkOrderBurialSite.js | 9 +- database/deleteWorkOrderBurialSite.ts | 12 +- database/deleteWorkOrderContract.d.ts | 2 +- database/deleteWorkOrderContract.js | 9 +- database/deleteWorkOrderContract.ts | 12 +- database/getBurialSite.js | 11 +- database/getBurialSite.ts | 12 +- database/getBurialSiteComments.d.ts | 4 +- database/getBurialSiteComments.js | 9 +- database/getBurialSiteComments.ts | 16 +-- database/getBurialSiteFields.d.ts | 4 +- database/getBurialSiteFields.js | 9 +- database/getBurialSiteFields.ts | 15 +-- database/getBurialSiteStatusSummary.d.ts | 8 +- database/getBurialSiteStatusSummary.js | 9 +- database/getBurialSiteStatusSummary.ts | 21 +-- database/getBurialSiteStatuses.d.ts | 2 +- database/getBurialSiteStatuses.js | 9 +- database/getBurialSiteStatuses.ts | 10 +- database/getBurialSiteTypeFields.d.ts | 4 +- database/getBurialSiteTypeFields.js | 9 +- database/getBurialSiteTypeFields.ts | 14 +- database/getBurialSiteTypeSummary.d.ts | 2 +- database/getBurialSiteTypeSummary.js | 9 +- database/getBurialSiteTypeSummary.ts | 13 +- database/getBurialSiteTypes.d.ts | 2 +- database/getBurialSiteTypes.js | 11 +- database/getBurialSiteTypes.ts | 12 +- database/getBurialSites.d.ts | 6 +- database/getBurialSites.js | 82 ++++++------ database/getBurialSites.ts | 118 ++++++++--------- database/getCemeteries.d.ts | 3 +- database/getCemeteries.js | 11 +- database/getCemeteries.ts | 21 +-- database/getCemetery.d.ts | 6 +- database/getCemetery.js | 19 +-- database/getCemetery.ts | 35 ++--- database/getCommittalTypes.d.ts | 2 +- database/getCommittalTypes.js | 9 +- database/getCommittalTypes.ts | 10 +- database/getContract.d.ts | 4 +- database/getContract.js | 15 ++- database/getContract.ts | 33 ++--- database/getContractComments.d.ts | 4 +- database/getContractComments.js | 9 +- database/getContractComments.ts | 16 +-- database/getContractFees.d.ts | 4 +- database/getContractFees.js | 9 +- database/getContractFees.ts | 15 +-- database/getContractFields.d.ts | 4 +- database/getContractFields.js | 9 +- database/getContractFields.ts | 22 ++- database/getContractInterments.d.ts | 4 +- database/getContractInterments.js | 9 +- database/getContractInterments.ts | 20 ++- database/getContractTransactions.d.ts | 4 +- database/getContractTransactions.js | 7 +- database/getContractTransactions.ts | 12 +- database/getContractTypeFields.d.ts | 4 +- database/getContractTypeFields.js | 9 +- database/getContractTypeFields.ts | 14 +- database/getContractTypePrints.d.ts | 4 +- database/getContractTypePrints.js | 9 +- database/getContractTypePrints.ts | 15 +-- database/getContractTypes.d.ts | 2 +- database/getContractTypes.js | 13 +- database/getContractTypes.ts | 15 ++- database/getContracts.d.ts | 6 +- database/getContracts.js | 17 +-- database/getContracts.ts | 28 ++-- database/getFee.d.ts | 4 +- database/getFee.js | 9 +- database/getFee.ts | 15 +-- database/getFeeCategories.d.ts | 6 +- database/getFeeCategories.js | 15 ++- database/getFeeCategories.ts | 28 ++-- database/getFees.d.ts | 4 +- database/getFees.js | 15 ++- database/getFees.ts | 20 +-- database/getFuneralHome.d.ts | 4 +- database/getFuneralHome.js | 17 +-- database/getFuneralHome.ts | 25 ++-- database/getFuneralHomes.d.ts | 2 +- database/getFuneralHomes.js | 9 +- database/getFuneralHomes.ts | 11 +- database/getIntermentContainerTypes.d.ts | 2 +- database/getIntermentContainerTypes.js | 12 +- database/getIntermentContainerTypes.ts | 15 ++- database/getNextBurialSiteId.d.ts | 2 +- database/getNextBurialSiteId.js | 9 +- database/getNextBurialSiteId.ts | 12 +- database/getNextCemeteryId.d.ts | 2 +- database/getNextCemeteryId.js | 9 +- database/getNextCemeteryId.ts | 12 +- database/getNextContractId.d.ts | 2 +- database/getNextContractId.js | 9 +- database/getNextContractId.ts | 12 +- database/getNextWorkOrderNumber.d.ts | 4 +- database/getNextWorkOrderNumber.js | 9 +- database/getNextWorkOrderNumber.ts | 15 +-- database/getPreviousBurialSiteId.d.ts | 2 +- database/getPreviousBurialSiteId.js | 9 +- database/getPreviousBurialSiteId.ts | 12 +- database/getPreviousCemeteryId.d.ts | 2 +- database/getPreviousCemeteryId.js | 9 +- database/getPreviousCemeteryId.ts | 12 +- database/getPreviousContractId.d.ts | 2 +- database/getPreviousContractId.js | 9 +- database/getPreviousContractId.ts | 12 +- database/getReportData.d.ts | 2 +- database/getReportData.js | 9 +- database/getReportData.ts | 11 +- database/getWorkOrder.d.ts | 4 +- database/getWorkOrder.js | 9 +- database/getWorkOrder.ts | 15 ++- database/getWorkOrderComments.d.ts | 4 +- database/getWorkOrderComments.js | 9 +- database/getWorkOrderComments.ts | 16 +-- database/getWorkOrderMilestoneTypes.d.ts | 2 +- database/getWorkOrderMilestoneTypes.js | 9 +- database/getWorkOrderMilestoneTypes.ts | 12 +- database/getWorkOrderMilestones.d.ts | 4 +- database/getWorkOrderMilestones.js | 9 +- database/getWorkOrderMilestones.ts | 13 +- database/getWorkOrderTypes.d.ts | 2 +- database/getWorkOrderTypes.js | 9 +- database/getWorkOrderTypes.ts | 10 +- database/getWorkOrders.d.ts | 8 +- database/getWorkOrders.js | 11 +- database/getWorkOrders.ts | 21 ++- database/moveBurialSiteTypeField.d.ts | 8 +- database/moveBurialSiteTypeField.js | 29 ++-- database/moveBurialSiteTypeField.ts | 40 +++--- database/moveContractTypeField.d.ts | 8 +- database/moveContractTypeField.js | 29 ++-- database/moveContractTypeField.ts | 40 +++--- database/moveContractTypePrintDown.d.ts | 4 +- database/moveContractTypePrintDown.js | 15 ++- database/moveContractTypePrintDown.ts | 21 +-- database/moveContractTypePrintUp.d.ts | 4 +- database/moveContractTypePrintUp.js | 17 +-- database/moveContractTypePrintUp.ts | 23 ++-- database/moveFee.d.ts | 8 +- database/moveFee.js | 37 +++--- database/moveFee.ts | 40 +++--- database/moveRecord.d.ts | 8 +- database/moveRecord.js | 29 ++-- database/moveRecord.ts | 38 +++--- database/pool.d.ts | 2 - database/pool.js | 14 -- database/pool.ts | 19 --- database/rebuildBurialSiteNames.d.ts | 4 +- database/rebuildBurialSiteNames.js | 13 +- database/rebuildBurialSiteNames.ts | 18 +-- database/reopenWorkOrder.d.ts | 2 +- database/reopenWorkOrder.js | 9 +- database/reopenWorkOrder.ts | 12 +- database/reopenWorkOrderMilestone.d.ts | 2 +- database/reopenWorkOrderMilestone.js | 9 +- database/reopenWorkOrderMilestone.ts | 12 +- database/updateBurialSite.d.ts | 4 +- database/updateBurialSite.js | 23 ++-- database/updateBurialSite.ts | 28 ++-- database/updateBurialSiteComment.d.ts | 2 +- database/updateBurialSiteComment.js | 9 +- database/updateBurialSiteComment.ts | 11 +- database/updateBurialSiteTypeField.d.ts | 4 +- database/updateBurialSiteTypeField.js | 9 +- database/updateBurialSiteTypeField.ts | 17 ++- database/updateCemetery.d.ts | 2 +- database/updateCemetery.js | 9 +- database/updateCemetery.ts | 12 +- database/updateContract.d.ts | 4 +- database/updateContract.js | 14 +- database/updateContract.ts | 24 ++-- database/updateContractComment.d.ts | 6 +- database/updateContractComment.js | 9 +- database/updateContractComment.ts | 15 ++- database/updateContractFeeQuantity.d.ts | 2 +- database/updateContractFeeQuantity.js | 9 +- database/updateContractFeeQuantity.ts | 12 +- database/updateContractInterment.d.ts | 2 +- database/updateContractInterment.js | 9 +- database/updateContractInterment.ts | 11 +- database/updateContractTransaction.d.ts | 2 +- database/updateContractTransaction.js | 9 +- database/updateContractTransaction.ts | 11 +- database/updateContractType.d.ts | 2 +- database/updateContractType.js | 9 +- database/updateContractType.ts | 13 +- database/updateContractTypeField.d.ts | 2 +- database/updateContractTypeField.js | 9 +- database/updateContractTypeField.ts | 13 +- database/updateFee.d.ts | 4 +- database/updateFee.js | 15 ++- database/updateFee.ts | 21 ++- database/updateFeeCategory.d.ts | 2 +- database/updateFeeCategory.js | 9 +- database/updateFeeCategory.ts | 14 +- database/updateFuneralHome.d.ts | 2 +- database/updateFuneralHome.js | 9 +- database/updateFuneralHome.ts | 12 +- database/updateRecord.d.ts | 2 +- database/updateRecord.js | 9 +- database/updateRecord.ts | 13 +- database/updateRecordOrderNumber.d.ts | 4 +- database/updateRecordOrderNumber.ts | 4 +- database/updateWorkOrder.d.ts | 2 +- database/updateWorkOrder.js | 9 +- database/updateWorkOrder.ts | 11 +- database/updateWorkOrderComment.d.ts | 2 +- database/updateWorkOrderComment.js | 9 +- database/updateWorkOrderComment.ts | 11 +- database/updateWorkOrderMilestone.d.ts | 2 +- database/updateWorkOrderMilestone.js | 9 +- database/updateWorkOrderMilestone.ts | 11 +- handlers/admin-get/burialSiteTypes.d.ts | 2 +- handlers/admin-get/burialSiteTypes.js | 4 +- handlers/admin-get/burialSiteTypes.ts | 6 +- handlers/admin-get/contractTypes.d.ts | 2 +- handlers/admin-get/contractTypes.js | 6 +- handlers/admin-get/contractTypes.ts | 8 +- handlers/admin-get/fees.d.ts | 2 +- handlers/admin-get/fees.js | 8 +- handlers/admin-get/fees.ts | 10 +- handlers/admin-get/tables.d.ts | 2 +- handlers/admin-get/tables.js | 8 +- handlers/admin-get/tables.ts | 11 +- .../admin-post/doAddBurialSiteStatus.d.ts | 2 +- handlers/admin-post/doAddBurialSiteStatus.js | 6 +- handlers/admin-post/doAddBurialSiteStatus.ts | 8 +- handlers/admin-post/doAddBurialSiteType.d.ts | 2 +- handlers/admin-post/doAddBurialSiteType.js | 6 +- handlers/admin-post/doAddBurialSiteType.ts | 10 +- .../admin-post/doAddBurialSiteTypeField.d.ts | 2 +- .../admin-post/doAddBurialSiteTypeField.js | 6 +- .../admin-post/doAddBurialSiteTypeField.ts | 8 +- handlers/admin-post/doAddContractType.d.ts | 2 +- handlers/admin-post/doAddContractType.js | 8 +- handlers/admin-post/doAddContractType.ts | 10 +- .../admin-post/doAddContractTypeField.d.ts | 2 +- handlers/admin-post/doAddContractTypeField.js | 12 +- handlers/admin-post/doAddContractTypeField.ts | 15 ++- .../admin-post/doAddContractTypePrint.d.ts | 2 +- handlers/admin-post/doAddContractTypePrint.js | 12 +- handlers/admin-post/doAddContractTypePrint.ts | 15 ++- handlers/admin-post/doAddFee.d.ts | 2 +- handlers/admin-post/doAddFee.js | 10 +- handlers/admin-post/doAddFee.ts | 17 +-- handlers/admin-post/doAddFeeCategory.d.ts | 2 +- handlers/admin-post/doAddFeeCategory.js | 10 +- handlers/admin-post/doAddFeeCategory.ts | 14 +- .../doAddWorkOrderMilestoneType.d.ts | 2 +- .../admin-post/doAddWorkOrderMilestoneType.js | 6 +- .../admin-post/doAddWorkOrderMilestoneType.ts | 8 +- handlers/admin-post/doAddWorkOrderType.d.ts | 2 +- handlers/admin-post/doAddWorkOrderType.js | 6 +- handlers/admin-post/doAddWorkOrderType.ts | 8 +- handlers/admin-post/doCleanupDatabase.d.ts | 2 +- handlers/admin-post/doCleanupDatabase.js | 4 +- handlers/admin-post/doCleanupDatabase.ts | 6 +- .../admin-post/doDeleteBurialSiteStatus.d.ts | 2 +- .../admin-post/doDeleteBurialSiteStatus.js | 6 +- .../admin-post/doDeleteBurialSiteStatus.ts | 8 +- .../admin-post/doDeleteBurialSiteType.d.ts | 2 +- handlers/admin-post/doDeleteBurialSiteType.js | 6 +- handlers/admin-post/doDeleteBurialSiteType.ts | 8 +- .../doDeleteBurialSiteTypeField.d.ts | 2 +- .../admin-post/doDeleteBurialSiteTypeField.js | 6 +- .../admin-post/doDeleteBurialSiteTypeField.ts | 8 +- handlers/admin-post/doDeleteContractType.d.ts | 2 +- handlers/admin-post/doDeleteContractType.js | 8 +- handlers/admin-post/doDeleteContractType.ts | 10 +- .../admin-post/doDeleteContractTypeField.d.ts | 2 +- .../admin-post/doDeleteContractTypeField.js | 8 +- .../admin-post/doDeleteContractTypeField.ts | 10 +- .../admin-post/doDeleteContractTypePrint.d.ts | 2 +- .../admin-post/doDeleteContractTypePrint.js | 8 +- .../admin-post/doDeleteContractTypePrint.ts | 10 +- handlers/admin-post/doDeleteFee.d.ts | 2 +- handlers/admin-post/doDeleteFee.js | 6 +- handlers/admin-post/doDeleteFee.ts | 10 +- handlers/admin-post/doDeleteFeeCategory.d.ts | 2 +- handlers/admin-post/doDeleteFeeCategory.js | 6 +- handlers/admin-post/doDeleteFeeCategory.ts | 8 +- .../doDeleteWorkOrderMilestoneType.d.ts | 2 +- .../doDeleteWorkOrderMilestoneType.js | 6 +- .../doDeleteWorkOrderMilestoneType.ts | 8 +- .../admin-post/doDeleteWorkOrderType.d.ts | 2 +- handlers/admin-post/doDeleteWorkOrderType.js | 6 +- handlers/admin-post/doDeleteWorkOrderType.ts | 10 +- .../doMoveBurialSiteStatusDown.d.ts | 2 +- .../admin-post/doMoveBurialSiteStatusDown.js | 8 +- .../admin-post/doMoveBurialSiteStatusDown.ts | 15 +-- .../admin-post/doMoveBurialSiteStatusUp.d.ts | 2 +- .../admin-post/doMoveBurialSiteStatusUp.js | 8 +- .../admin-post/doMoveBurialSiteStatusUp.ts | 17 +-- .../admin-post/doMoveBurialSiteTypeDown.d.ts | 2 +- .../admin-post/doMoveBurialSiteTypeDown.js | 8 +- .../admin-post/doMoveBurialSiteTypeDown.ts | 14 +- .../doMoveBurialSiteTypeFieldDown.d.ts | 2 +- .../doMoveBurialSiteTypeFieldDown.js | 8 +- .../doMoveBurialSiteTypeFieldDown.ts | 11 +- .../doMoveBurialSiteTypeFieldUp.d.ts | 2 +- .../admin-post/doMoveBurialSiteTypeFieldUp.js | 8 +- .../admin-post/doMoveBurialSiteTypeFieldUp.ts | 11 +- .../admin-post/doMoveBurialSiteTypeUp.d.ts | 2 +- handlers/admin-post/doMoveBurialSiteTypeUp.js | 8 +- handlers/admin-post/doMoveBurialSiteTypeUp.ts | 14 +- .../admin-post/doMoveContractTypeDown.d.ts | 2 +- handlers/admin-post/doMoveContractTypeDown.js | 14 +- handlers/admin-post/doMoveContractTypeDown.ts | 20 ++- .../doMoveContractTypeFieldDown.d.ts | 2 +- .../admin-post/doMoveContractTypeFieldDown.js | 14 +- .../admin-post/doMoveContractTypeFieldDown.ts | 19 ++- .../admin-post/doMoveContractTypeFieldUp.d.ts | 2 +- .../admin-post/doMoveContractTypeFieldUp.js | 14 +- .../admin-post/doMoveContractTypeFieldUp.ts | 17 +-- .../doMoveContractTypePrintDown.d.ts | 2 +- .../admin-post/doMoveContractTypePrintDown.js | 14 +- .../admin-post/doMoveContractTypePrintDown.ts | 17 +-- .../admin-post/doMoveContractTypePrintUp.d.ts | 2 +- .../admin-post/doMoveContractTypePrintUp.js | 14 +- .../admin-post/doMoveContractTypePrintUp.ts | 17 +-- handlers/admin-post/doMoveContractTypeUp.d.ts | 2 +- handlers/admin-post/doMoveContractTypeUp.js | 14 +- handlers/admin-post/doMoveContractTypeUp.ts | 17 +-- .../admin-post/doMoveFeeCategoryDown.d.ts | 2 +- handlers/admin-post/doMoveFeeCategoryDown.js | 8 +- handlers/admin-post/doMoveFeeCategoryDown.ts | 14 +- handlers/admin-post/doMoveFeeCategoryUp.d.ts | 2 +- handlers/admin-post/doMoveFeeCategoryUp.js | 8 +- handlers/admin-post/doMoveFeeCategoryUp.ts | 17 ++- handlers/admin-post/doMoveFeeDown.d.ts | 2 +- handlers/admin-post/doMoveFeeDown.js | 8 +- handlers/admin-post/doMoveFeeDown.ts | 11 +- handlers/admin-post/doMoveFeeUp.d.ts | 2 +- handlers/admin-post/doMoveFeeUp.js | 8 +- handlers/admin-post/doMoveFeeUp.ts | 11 +- .../doMoveWorkOrderMilestoneTypeDown.d.ts | 2 +- .../doMoveWorkOrderMilestoneTypeDown.js | 8 +- .../doMoveWorkOrderMilestoneTypeDown.ts | 10 +- .../doMoveWorkOrderMilestoneTypeUp.d.ts | 2 +- .../doMoveWorkOrderMilestoneTypeUp.js | 8 +- .../doMoveWorkOrderMilestoneTypeUp.ts | 10 +- .../admin-post/doMoveWorkOrderTypeDown.d.ts | 2 +- .../admin-post/doMoveWorkOrderTypeDown.js | 8 +- .../admin-post/doMoveWorkOrderTypeDown.ts | 13 +- .../admin-post/doMoveWorkOrderTypeUp.d.ts | 2 +- handlers/admin-post/doMoveWorkOrderTypeUp.js | 8 +- handlers/admin-post/doMoveWorkOrderTypeUp.ts | 10 +- .../admin-post/doUpdateBurialSiteStatus.d.ts | 2 +- .../admin-post/doUpdateBurialSiteStatus.js | 6 +- .../admin-post/doUpdateBurialSiteStatus.ts | 9 +- .../admin-post/doUpdateBurialSiteType.d.ts | 2 +- handlers/admin-post/doUpdateBurialSiteType.js | 6 +- handlers/admin-post/doUpdateBurialSiteType.ts | 15 ++- .../doUpdateBurialSiteTypeField.d.ts | 2 +- .../admin-post/doUpdateBurialSiteTypeField.js | 6 +- .../admin-post/doUpdateBurialSiteTypeField.ts | 10 +- handlers/admin-post/doUpdateContractType.d.ts | 2 +- handlers/admin-post/doUpdateContractType.js | 12 +- handlers/admin-post/doUpdateContractType.ts | 18 ++- .../admin-post/doUpdateContractTypeField.d.ts | 2 +- .../admin-post/doUpdateContractTypeField.js | 12 +- .../admin-post/doUpdateContractTypeField.ts | 15 ++- handlers/admin-post/doUpdateFee.d.ts | 2 +- handlers/admin-post/doUpdateFee.js | 6 +- handlers/admin-post/doUpdateFee.ts | 13 +- handlers/admin-post/doUpdateFeeAmount.d.ts | 2 +- handlers/admin-post/doUpdateFeeAmount.js | 6 +- handlers/admin-post/doUpdateFeeAmount.ts | 10 +- handlers/admin-post/doUpdateFeeCategory.d.ts | 2 +- handlers/admin-post/doUpdateFeeCategory.js | 6 +- handlers/admin-post/doUpdateFeeCategory.ts | 10 +- .../doUpdateWorkOrderMilestoneType.d.ts | 2 +- .../doUpdateWorkOrderMilestoneType.js | 6 +- .../doUpdateWorkOrderMilestoneType.ts | 8 +- .../admin-post/doUpdateWorkOrderType.d.ts | 2 +- handlers/admin-post/doUpdateWorkOrderType.js | 6 +- handlers/admin-post/doUpdateWorkOrderType.ts | 14 +- handlers/api-get/milestoneICS.ts | 1 + handlers/burialSites-get/edit.js | 8 +- handlers/burialSites-get/edit.ts | 8 +- handlers/burialSites-get/new.js | 8 +- handlers/burialSites-get/new.ts | 8 +- handlers/burialSites-get/next.d.ts | 2 +- handlers/burialSites-get/next.js | 4 +- handlers/burialSites-get/next.ts | 7 +- handlers/burialSites-get/previous.d.ts | 2 +- handlers/burialSites-get/previous.js | 4 +- handlers/burialSites-get/previous.ts | 7 +- handlers/burialSites-get/search.d.ts | 2 +- handlers/burialSites-get/search.js | 18 +-- handlers/burialSites-get/search.ts | 23 ++-- handlers/burialSites-get/view.js | 4 +- handlers/burialSites-get/view.ts | 6 +- .../doAddBurialSiteComment.d.ts | 2 +- .../doAddBurialSiteComment.js | 6 +- .../doAddBurialSiteComment.ts | 10 +- .../burialSites-post/doCreateBurialSite.d.ts | 2 +- .../burialSites-post/doCreateBurialSite.js | 4 +- .../burialSites-post/doCreateBurialSite.ts | 8 +- .../burialSites-post/doDeleteBurialSite.d.ts | 2 +- .../burialSites-post/doDeleteBurialSite.js | 4 +- .../burialSites-post/doDeleteBurialSite.ts | 9 +- .../doDeleteBurialSiteComment.d.ts | 2 +- .../doDeleteBurialSiteComment.js | 6 +- .../doDeleteBurialSiteComment.ts | 12 +- .../doGetBurialSiteTypeFields.d.ts | 2 +- .../doGetBurialSiteTypeFields.js | 4 +- .../doGetBurialSiteTypeFields.ts | 6 +- .../burialSites-post/doSearchBurialSites.d.ts | 2 +- .../burialSites-post/doSearchBurialSites.js | 4 +- .../burialSites-post/doSearchBurialSites.ts | 6 +- .../burialSites-post/doUpdateBurialSite.d.ts | 2 +- .../burialSites-post/doUpdateBurialSite.js | 4 +- .../burialSites-post/doUpdateBurialSite.ts | 11 +- .../doUpdateBurialSiteComment.d.ts | 2 +- .../doUpdateBurialSiteComment.js | 6 +- .../doUpdateBurialSiteComment.ts | 10 +- handlers/cemeteries-get/edit.js | 8 +- handlers/cemeteries-get/edit.ts | 8 +- handlers/cemeteries-get/new.js | 2 +- handlers/cemeteries-get/new.ts | 2 +- handlers/cemeteries-get/next.d.ts | 2 +- handlers/cemeteries-get/next.js | 4 +- handlers/cemeteries-get/next.ts | 6 +- handlers/cemeteries-get/previous.d.ts | 2 +- handlers/cemeteries-get/previous.js | 4 +- handlers/cemeteries-get/previous.ts | 7 +- handlers/cemeteries-get/search.d.ts | 2 +- handlers/cemeteries-get/search.js | 6 +- handlers/cemeteries-get/search.ts | 11 +- handlers/cemeteries-get/view.d.ts | 2 +- handlers/cemeteries-get/view.js | 8 +- handlers/cemeteries-get/view.ts | 11 +- .../cemeteries-post/doCreateCemetery.d.ts | 2 +- handlers/cemeteries-post/doCreateCemetery.js | 4 +- handlers/cemeteries-post/doCreateCemetery.ts | 11 +- .../cemeteries-post/doDeleteCemetery.d.ts | 2 +- handlers/cemeteries-post/doDeleteCemetery.js | 4 +- handlers/cemeteries-post/doDeleteCemetery.ts | 6 +- .../cemeteries-post/doUpdateCemetery.d.ts | 2 +- handlers/cemeteries-post/doUpdateCemetery.js | 6 +- handlers/cemeteries-post/doUpdateCemetery.ts | 11 +- handlers/contracts-get/edit.js | 12 +- handlers/contracts-get/edit.ts | 20 ++- handlers/contracts-get/new.js | 8 +- handlers/contracts-get/new.ts | 14 +- handlers/contracts-get/next.d.ts | 2 +- handlers/contracts-get/next.js | 4 +- handlers/contracts-get/next.ts | 6 +- handlers/contracts-get/previous.d.ts | 2 +- handlers/contracts-get/previous.js | 4 +- handlers/contracts-get/previous.ts | 6 +- handlers/contracts-get/search.d.ts | 2 +- handlers/contracts-get/search.js | 10 +- handlers/contracts-get/search.ts | 13 +- handlers/contracts-get/view.js | 2 +- handlers/contracts-get/view.ts | 10 +- .../contracts-post/doAddContractComment.d.ts | 2 +- .../contracts-post/doAddContractComment.js | 6 +- .../contracts-post/doAddContractComment.ts | 9 +- handlers/contracts-post/doAddContractFee.js | 2 +- handlers/contracts-post/doAddContractFee.ts | 5 +- .../doAddContractFeeCategory.js | 2 +- .../doAddContractFeeCategory.ts | 10 +- .../doAddContractInterment.d.ts | 2 +- .../contracts-post/doAddContractInterment.js | 6 +- .../contracts-post/doAddContractInterment.ts | 11 +- .../doAddContractTransaction.js | 2 +- .../doAddContractTransaction.ts | 14 +- handlers/contracts-post/doCopyContract.ts | 1 + handlers/contracts-post/doCreateContract.d.ts | 2 +- handlers/contracts-post/doCreateContract.js | 4 +- handlers/contracts-post/doCreateContract.ts | 11 +- handlers/contracts-post/doDeleteContract.d.ts | 2 +- handlers/contracts-post/doDeleteContract.js | 4 +- handlers/contracts-post/doDeleteContract.ts | 6 +- .../doDeleteContractComment.d.ts | 2 +- .../contracts-post/doDeleteContractComment.js | 6 +- .../contracts-post/doDeleteContractComment.ts | 11 +- .../contracts-post/doDeleteContractFee.d.ts | 2 +- .../contracts-post/doDeleteContractFee.js | 6 +- .../contracts-post/doDeleteContractFee.ts | 17 +-- .../doDeleteContractInterment.d.ts | 2 +- .../doDeleteContractInterment.js | 6 +- .../doDeleteContractInterment.ts | 11 +- .../doDeleteContractTransaction.js | 2 +- .../doDeleteContractTransaction.ts | 11 +- .../doGetContractTypeFields.d.ts | 2 +- .../contracts-post/doGetContractTypeFields.js | 6 +- .../contracts-post/doGetContractTypeFields.ts | 10 +- .../doGetDynamicsGPDocument.d.ts | 4 +- .../contracts-post/doGetDynamicsGPDocument.js | 2 +- .../contracts-post/doGetDynamicsGPDocument.ts | 6 +- handlers/contracts-post/doGetFees.js | 2 +- handlers/contracts-post/doGetFees.ts | 6 +- handlers/contracts-post/doUpdateContract.d.ts | 2 +- handlers/contracts-post/doUpdateContract.js | 4 +- handlers/contracts-post/doUpdateContract.ts | 7 +- .../doUpdateContractComment.d.ts | 2 +- .../contracts-post/doUpdateContractComment.js | 6 +- .../contracts-post/doUpdateContractComment.ts | 17 +-- .../doUpdateContractFeeQuantity.d.ts | 2 +- .../doUpdateContractFeeQuantity.js | 6 +- .../doUpdateContractFeeQuantity.ts | 11 +- .../doUpdateContractInterment.d.ts | 2 +- .../doUpdateContractInterment.js | 6 +- .../doUpdateContractInterment.ts | 13 +- .../doUpdateContractTransaction.js | 2 +- .../doUpdateContractTransaction.ts | 14 +- handlers/funeralHomes-get/edit.d.ts | 2 +- handlers/funeralHomes-get/edit.js | 4 +- handlers/funeralHomes-get/edit.ts | 7 +- handlers/funeralHomes-get/search.d.ts | 2 +- handlers/funeralHomes-get/search.js | 6 +- handlers/funeralHomes-get/search.ts | 11 +- handlers/funeralHomes-get/view.d.ts | 2 +- handlers/funeralHomes-get/view.js | 4 +- handlers/funeralHomes-get/view.ts | 7 +- .../doCreateFuneralHome.d.ts | 2 +- .../funeralHomes-post/doCreateFuneralHome.js | 4 +- .../funeralHomes-post/doCreateFuneralHome.ts | 8 +- .../doDeleteFuneralHome.d.ts | 2 +- .../funeralHomes-post/doDeleteFuneralHome.js | 4 +- .../funeralHomes-post/doDeleteFuneralHome.ts | 6 +- .../doUpdateFuneralHome.d.ts | 2 +- .../funeralHomes-post/doUpdateFuneralHome.js | 4 +- .../funeralHomes-post/doUpdateFuneralHome.ts | 11 +- handlers/reports-get/reportName.d.ts | 2 +- handlers/reports-get/reportName.js | 4 +- handlers/reports-get/reportName.ts | 11 +- handlers/reports-get/search.d.ts | 2 +- handlers/reports-get/search.js | 8 +- handlers/reports-get/search.ts | 10 +- handlers/workOrders-get/edit.js | 6 +- handlers/workOrders-get/edit.ts | 8 +- handlers/workOrders-get/new.d.ts | 2 +- handlers/workOrders-get/new.js | 4 +- handlers/workOrders-get/new.ts | 7 +- handlers/workOrders-get/outlook.d.ts | 2 +- handlers/workOrders-get/outlook.js | 6 +- handlers/workOrders-get/outlook.ts | 9 +- handlers/workOrders-get/search.d.ts | 2 +- handlers/workOrders-get/search.js | 4 +- handlers/workOrders-get/search.ts | 7 +- .../doAddWorkOrderBurialSite.d.ts | 2 +- .../doAddWorkOrderBurialSite.js | 6 +- .../doAddWorkOrderBurialSite.ts | 10 +- .../doAddWorkOrderComment.d.ts | 2 +- .../workOrders-post/doAddWorkOrderComment.js | 6 +- .../workOrders-post/doAddWorkOrderComment.ts | 10 +- .../workOrders-post/doAddWorkOrderContract.js | 2 +- .../workOrders-post/doAddWorkOrderContract.ts | 2 +- .../doAddWorkOrderMilestone.js | 2 +- .../doAddWorkOrderMilestone.ts | 2 +- .../workOrders-post/doCloseWorkOrder.d.ts | 2 +- handlers/workOrders-post/doCloseWorkOrder.js | 4 +- handlers/workOrders-post/doCloseWorkOrder.ts | 9 +- .../doCompleteWorkOrderMilestone.js | 2 +- .../doCompleteWorkOrderMilestone.ts | 2 +- .../workOrders-post/doCreateWorkOrder.d.ts | 2 +- handlers/workOrders-post/doCreateWorkOrder.js | 4 +- handlers/workOrders-post/doCreateWorkOrder.ts | 8 +- .../workOrders-post/doDeleteWorkOrder.d.ts | 4 +- handlers/workOrders-post/doDeleteWorkOrder.js | 4 +- handlers/workOrders-post/doDeleteWorkOrder.ts | 9 +- .../doDeleteWorkOrderBurialSite.d.ts | 2 +- .../doDeleteWorkOrderBurialSite.js | 6 +- .../doDeleteWorkOrderBurialSite.ts | 14 +- .../doDeleteWorkOrderComment.d.ts | 2 +- .../doDeleteWorkOrderComment.js | 6 +- .../doDeleteWorkOrderComment.ts | 9 +- .../doDeleteWorkOrderContract.js | 2 +- .../doDeleteWorkOrderContract.ts | 5 +- .../doDeleteWorkOrderMilestone.js | 2 +- .../doDeleteWorkOrderMilestone.ts | 2 +- .../workOrders-post/doReopenWorkOrder.d.ts | 2 +- handlers/workOrders-post/doReopenWorkOrder.js | 4 +- handlers/workOrders-post/doReopenWorkOrder.ts | 7 +- .../doReopenWorkOrderMilestone.js | 2 +- .../doReopenWorkOrderMilestone.ts | 2 +- .../workOrders-post/doSearchWorkOrders.d.ts | 3 +- .../workOrders-post/doSearchWorkOrders.js | 4 +- .../workOrders-post/doSearchWorkOrders.ts | 13 +- .../doUpdateBurialSiteStatus.d.ts | 2 +- .../doUpdateBurialSiteStatus.js | 6 +- .../doUpdateBurialSiteStatus.ts | 9 +- .../workOrders-post/doUpdateWorkOrder.d.ts | 3 +- handlers/workOrders-post/doUpdateWorkOrder.js | 4 +- handlers/workOrders-post/doUpdateWorkOrder.ts | 11 +- .../doUpdateWorkOrderComment.d.ts | 5 +- .../doUpdateWorkOrderComment.js | 6 +- .../doUpdateWorkOrderComment.ts | 16 ++- .../doUpdateWorkOrderMilestone.d.ts | 5 +- .../doUpdateWorkOrderMilestone.js | 2 +- .../doUpdateWorkOrderMilestone.ts | 10 +- helpers/burialSites.helpers.d.ts | 4 +- helpers/burialSites.helpers.js | 8 +- helpers/burialSites.helpers.ts | 12 +- helpers/functions.cache.d.ts | 42 +++--- helpers/functions.cache.js | 96 +++++++------- helpers/functions.cache.ts | 125 +++++++++--------- package-lock.json | 9 -- package.json | 1 - 723 files changed, 3193 insertions(+), 3143 deletions(-) delete mode 100644 database/pool.d.ts delete mode 100644 database/pool.js delete mode 100644 database/pool.ts diff --git a/database/addBurialSite.d.ts b/database/addBurialSite.d.ts index 23e57225..40fe226c 100644 --- a/database/addBurialSite.d.ts +++ b/database/addBurialSite.d.ts @@ -21,4 +21,4 @@ export interface AddBurialSiteForm { * @returns The new burial site's id. * @throws If an active burial site with the same name already exists. */ -export default function addBurialSite(burialSiteForm: AddBurialSiteForm, user: User): Promise; +export default function addBurialSite(burialSiteForm: AddBurialSiteForm, user: User): number; diff --git a/database/addBurialSite.js b/database/addBurialSite.js index 729bbdaa..1119204c 100644 --- a/database/addBurialSite.js +++ b/database/addBurialSite.js @@ -1,7 +1,8 @@ +import sqlite from 'better-sqlite3'; import { buildBurialSiteName } from '../helpers/burialSites.helpers.js'; +import { sunriseDB } from '../helpers/database.helpers.js'; import addOrUpdateBurialSiteField from './addOrUpdateBurialSiteField.js'; import getCemetery from './getCemetery.js'; -import { acquireConnection } from './pool.js'; /** * Creates a new burial site. * @param burialSiteForm - The new burial site's information @@ -9,12 +10,12 @@ import { acquireConnection } from './pool.js'; * @returns The new burial site's id. * @throws If an active burial site with the same name already exists. */ -export default async function addBurialSite(burialSiteForm, user) { - const database = await acquireConnection(); +export default function addBurialSite(burialSiteForm, user) { + const database = sqlite(sunriseDB); const rightNowMillis = Date.now(); const cemetery = burialSiteForm.cemeteryId === '' ? undefined - : await getCemetery(burialSiteForm.cemeteryId, database); + : getCemetery(burialSiteForm.cemeteryId, database); const burialSiteName = buildBurialSiteName(cemetery?.cemeteryKey, burialSiteForm); // Ensure no active burial sites share the same name const existingBurialSite = database @@ -25,7 +26,7 @@ export default async function addBurialSite(burialSiteForm, user) { .pluck() .get(burialSiteName); if (existingBurialSite !== undefined) { - database.release(); + database.close(); throw new Error('An active burial site with that name already exists.'); } const result = database @@ -57,13 +58,13 @@ export default async function addBurialSite(burialSiteForm, user) { for (const burialSiteTypeFieldId of burialSiteTypeFieldIds) { const fieldValue = burialSiteForm[`burialSiteFieldValue_${burialSiteTypeFieldId}`]; if ((fieldValue ?? '') !== '') { - await addOrUpdateBurialSiteField({ + addOrUpdateBurialSiteField({ burialSiteId, burialSiteTypeFieldId, fieldValue: fieldValue ?? '' }, user, database); } } - database.release(); + database.close(); return burialSiteId; } diff --git a/database/addBurialSite.ts b/database/addBurialSite.ts index 5fa5d7d8..91324147 100644 --- a/database/addBurialSite.ts +++ b/database/addBurialSite.ts @@ -1,8 +1,10 @@ +import sqlite from 'better-sqlite3' + import { buildBurialSiteName } from '../helpers/burialSites.helpers.js' +import { sunriseDB } from '../helpers/database.helpers.js' import addOrUpdateBurialSiteField from './addOrUpdateBurialSiteField.js' import getCemetery from './getCemetery.js' -import { acquireConnection } from './pool.js' export interface AddBurialSiteForm { burialSiteNameSegment1?: string @@ -22,7 +24,7 @@ export interface AddBurialSiteForm { burialSiteLongitude: string burialSiteTypeFieldIds?: string - + [fieldValue_burialSiteTypeFieldId: string]: unknown } @@ -33,18 +35,18 @@ export interface AddBurialSiteForm { * @returns The new burial site's id. * @throws If an active burial site with the same name already exists. */ -export default async function addBurialSite( +export default function addBurialSite( burialSiteForm: AddBurialSiteForm, user: User -): Promise { - const database = await acquireConnection() +): number { + const database = sqlite(sunriseDB) const rightNowMillis = Date.now() const cemetery = burialSiteForm.cemeteryId === '' ? undefined - : await getCemetery(burialSiteForm.cemeteryId, database) + : getCemetery(burialSiteForm.cemeteryId, database) const burialSiteName = buildBurialSiteName( cemetery?.cemeteryKey, @@ -64,7 +66,7 @@ export default async function addBurialSite( .get(burialSiteName) as number | undefined if (existingBurialSite !== undefined) { - database.release() + database.close() throw new Error('An active burial site with that name already exists.') } @@ -125,7 +127,7 @@ export default async function addBurialSite( ] as string | undefined if ((fieldValue ?? '') !== '') { - await addOrUpdateBurialSiteField( + addOrUpdateBurialSiteField( { burialSiteId, burialSiteTypeFieldId, @@ -137,7 +139,7 @@ export default async function addBurialSite( } } - database.release() + database.close() return burialSiteId } diff --git a/database/addBurialSiteComment.d.ts b/database/addBurialSiteComment.d.ts index 0324c67e..2f3595e3 100644 --- a/database/addBurialSiteComment.d.ts +++ b/database/addBurialSiteComment.d.ts @@ -2,4 +2,4 @@ export interface AddBurialSiteCommentForm { burialSiteId: string; comment: string; } -export default function addBurialSiteComment(commentForm: AddBurialSiteCommentForm, user: User): Promise; +export default function addBurialSiteComment(commentForm: AddBurialSiteCommentForm, user: User): number; diff --git a/database/addBurialSiteComment.js b/database/addBurialSiteComment.js index 808d0a5a..7d8de1a3 100644 --- a/database/addBurialSiteComment.js +++ b/database/addBurialSiteComment.js @@ -1,7 +1,8 @@ import { dateToInteger, dateToTimeInteger } from '@cityssm/utils-datetime'; -import { acquireConnection } from './pool.js'; -export default async function addBurialSiteComment(commentForm, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function addBurialSiteComment(commentForm, user) { + const database = sqlite(sunriseDB); const rightNow = new Date(); const result = database .prepare(`insert into BurialSiteComments ( @@ -11,6 +12,6 @@ export default async function addBurialSiteComment(commentForm, user) { recordUpdate_userName, recordUpdate_timeMillis) values (?, ?, ?, ?, ?, ?, ?, ?)`) .run(commentForm.burialSiteId, dateToInteger(rightNow), dateToTimeInteger(rightNow), commentForm.comment, user.userName, rightNow.getTime(), user.userName, rightNow.getTime()); - database.release(); + database.close(); return result.lastInsertRowid; } diff --git a/database/addBurialSiteComment.ts b/database/addBurialSiteComment.ts index aa54cc35..909bfb1f 100644 --- a/database/addBurialSiteComment.ts +++ b/database/addBurialSiteComment.ts @@ -1,17 +1,18 @@ import { dateToInteger, dateToTimeInteger } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' export interface AddBurialSiteCommentForm { burialSiteId: string comment: string } -export default async function addBurialSiteComment( +export default function addBurialSiteComment( commentForm: AddBurialSiteCommentForm, user: User -): Promise { - const database = await acquireConnection() +): number { + const database = sqlite(sunriseDB) const rightNow = new Date() @@ -35,7 +36,7 @@ export default async function addBurialSiteComment( rightNow.getTime() ) - database.release() + database.close() return result.lastInsertRowid as number } diff --git a/database/addBurialSiteTypeField.d.ts b/database/addBurialSiteTypeField.d.ts index 007778c9..5f4d022f 100644 --- a/database/addBurialSiteTypeField.d.ts +++ b/database/addBurialSiteTypeField.d.ts @@ -4,9 +4,9 @@ export interface AddBurialSiteTypeFieldForm { fieldType?: string; fieldValues?: string; isRequired?: string; - pattern?: string; - minLength?: number | string; maxLength?: number | string; + minLength?: number | string; + pattern?: string; orderNumber?: number; } -export default function addBurialSiteTypeField(addForm: AddBurialSiteTypeFieldForm, user: User): Promise; +export default function addBurialSiteTypeField(addForm: AddBurialSiteTypeFieldForm, user: User): number; diff --git a/database/addBurialSiteTypeField.js b/database/addBurialSiteTypeField.js index 25b95998..232c4df6 100644 --- a/database/addBurialSiteTypeField.js +++ b/database/addBurialSiteTypeField.js @@ -1,7 +1,8 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { clearCacheByTableName } from '../helpers/functions.cache.js'; -import { acquireConnection } from './pool.js'; -export default async function addBurialSiteTypeField(addForm, user) { - const database = await acquireConnection(); +export default function addBurialSiteTypeField(addForm, user) { + const database = sqlite(sunriseDB); const rightNowMillis = Date.now(); const result = database .prepare(`insert into BurialSiteTypeFields ( @@ -14,7 +15,7 @@ export default async function addBurialSiteTypeField(addForm, user) { recordUpdate_userName, recordUpdate_timeMillis) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) .run(addForm.burialSiteTypeId, addForm.burialSiteTypeField, addForm.fieldType ?? 'text', addForm.fieldValues ?? '', addForm.isRequired === '' ? 0 : 1, addForm.pattern ?? '', addForm.minLength ?? 0, addForm.maxLength ?? 100, addForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis); - database.release(); + database.close(); clearCacheByTableName('BurialSiteTypeFields'); return result.lastInsertRowid; } diff --git a/database/addBurialSiteTypeField.ts b/database/addBurialSiteTypeField.ts index fbc7b21a..8ba547a4 100644 --- a/database/addBurialSiteTypeField.ts +++ b/database/addBurialSiteTypeField.ts @@ -1,24 +1,29 @@ -import { clearCacheByTableName } from '../helpers/functions.cache.js' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' +import { clearCacheByTableName } from '../helpers/functions.cache.js' export interface AddBurialSiteTypeFieldForm { burialSiteTypeId: number | string + burialSiteTypeField: string + fieldType?: string fieldValues?: string + isRequired?: string - pattern?: string - minLength?: number | string maxLength?: number | string + minLength?: number | string + pattern?: string + orderNumber?: number } -export default async function addBurialSiteTypeField( +export default function addBurialSiteTypeField( addForm: AddBurialSiteTypeFieldForm, user: User -): Promise { - const database = await acquireConnection() +): number { + const database = sqlite(sunriseDB) const rightNowMillis = Date.now() @@ -50,7 +55,7 @@ export default async function addBurialSiteTypeField( rightNowMillis ) - database.release() + database.close() clearCacheByTableName('BurialSiteTypeFields') diff --git a/database/addCemetery.d.ts b/database/addCemetery.d.ts index 6bba5c4c..6ed9b413 100644 --- a/database/addCemetery.d.ts +++ b/database/addCemetery.d.ts @@ -13,4 +13,4 @@ export interface AddCemeteryForm { cemeteryProvince: string; cemeteryPhoneNumber: string; } -export default function addCemetery(addForm: AddCemeteryForm, user: User): Promise; +export default function addCemetery(addForm: AddCemeteryForm, user: User): number; diff --git a/database/addCemetery.js b/database/addCemetery.js index f3dadb52..a28a0db3 100644 --- a/database/addCemetery.js +++ b/database/addCemetery.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function addCemetery(addForm, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function addCemetery(addForm, user) { + const database = sqlite(sunriseDB); const rightNowMillis = Date.now(); const result = database .prepare(`insert into Cemeteries ( @@ -14,6 +15,6 @@ export default async function addCemetery(addForm, user) { recordUpdate_userName, recordUpdate_timeMillis) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) .run(addForm.cemeteryName, addForm.cemeteryKey, addForm.cemeteryDescription, addForm.cemeterySvg, addForm.cemeteryLatitude === '' ? undefined : addForm.cemeteryLatitude, addForm.cemeteryLongitude === '' ? undefined : addForm.cemeteryLongitude, addForm.cemeteryAddress1, addForm.cemeteryAddress2, addForm.cemeteryCity, addForm.cemeteryProvince, addForm.cemeteryPostalCode, addForm.cemeteryPhoneNumber, addForm.parentCemeteryId === '' ? undefined : addForm.parentCemeteryId, user.userName, rightNowMillis, user.userName, rightNowMillis); - database.release(); + database.close(); return result.lastInsertRowid; } diff --git a/database/addCemetery.ts b/database/addCemetery.ts index def5c39e..023910d5 100644 --- a/database/addCemetery.ts +++ b/database/addCemetery.ts @@ -1,4 +1,6 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' export interface AddCemeteryForm { cemeteryDescription: string @@ -19,11 +21,11 @@ export interface AddCemeteryForm { cemeteryPhoneNumber: string } -export default async function addCemetery( +export default function addCemetery( addForm: AddCemeteryForm, user: User -): Promise { - const database = await acquireConnection() +): number { + const database = sqlite(sunriseDB) const rightNowMillis = Date.now() @@ -60,7 +62,7 @@ export default async function addCemetery( rightNowMillis ) - database.release() + database.close() return result.lastInsertRowid as number } diff --git a/database/addCommittalType.d.ts b/database/addCommittalType.d.ts index 04ac7e4d..6551d9cd 100644 --- a/database/addCommittalType.d.ts +++ b/database/addCommittalType.d.ts @@ -3,4 +3,4 @@ export interface AddForm { committalTypeKey?: string; orderNumber?: number; } -export default function addCommittalType(addForm: AddForm, user: User): Promise; +export default function addCommittalType(addForm: AddForm, user: User): number; diff --git a/database/addCommittalType.js b/database/addCommittalType.js index eb757ebb..d4da0c76 100644 --- a/database/addCommittalType.js +++ b/database/addCommittalType.js @@ -1,7 +1,8 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { clearCacheByTableName } from '../helpers/functions.cache.js'; -import { acquireConnection } from './pool.js'; -export default async function addCommittalType(addForm, user) { - const database = await acquireConnection(); +export default function addCommittalType(addForm, user) { + const database = sqlite(sunriseDB); const rightNowMillis = Date.now(); const result = database .prepare(`insert into CommittalTypes ( @@ -10,7 +11,7 @@ export default async function addCommittalType(addForm, user) { recordUpdate_userName, recordUpdate_timeMillis) values (?, ?, ?, ?, ?, ?, ?)`) .run(addForm.committalType, addForm.committalTypeKey ?? '', addForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis); - database.release(); + database.close(); clearCacheByTableName('CommittalTypes'); return result.lastInsertRowid; } diff --git a/database/addCommittalType.ts b/database/addCommittalType.ts index 70a194fe..da37739e 100644 --- a/database/addCommittalType.ts +++ b/database/addCommittalType.ts @@ -1,6 +1,7 @@ -import { clearCacheByTableName } from '../helpers/functions.cache.js' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' +import { clearCacheByTableName } from '../helpers/functions.cache.js' export interface AddForm { committalType: string @@ -8,11 +9,8 @@ export interface AddForm { orderNumber?: number } -export default async function addCommittalType( - addForm: AddForm, - user: User -): Promise { - const database = await acquireConnection() +export default function addCommittalType(addForm: AddForm, user: User): number { + const database = sqlite(sunriseDB) const rightNowMillis = Date.now() @@ -34,7 +32,7 @@ export default async function addCommittalType( rightNowMillis ) - database.release() + database.close() clearCacheByTableName('CommittalTypes') diff --git a/database/addContract.d.ts b/database/addContract.d.ts index 8b0e539c..fbea2b76 100644 --- a/database/addContract.d.ts +++ b/database/addContract.d.ts @@ -1,5 +1,5 @@ -import type { PoolConnection } from 'better-sqlite-pool'; import { type DateString, type TimeString } from '@cityssm/utils-datetime'; +import sqlite from 'better-sqlite3'; export interface AddContractForm { burialSiteId: number | string; contractEndDateString: '' | DateString; @@ -35,4 +35,4 @@ export interface AddContractForm { deceasedProvince?: string; intermentContainerTypeId?: number | string; } -export default function addContract(addForm: AddContractForm, user: User, connectedDatabase?: PoolConnection): Promise; +export default function addContract(addForm: AddContractForm, user: User, connectedDatabase?: sqlite.Database): number; diff --git a/database/addContract.js b/database/addContract.js index 4f3a0e37..d358029c 100644 --- a/database/addContract.js +++ b/database/addContract.js @@ -1,9 +1,10 @@ import { dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime'; +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import addOrUpdateContractField from './addOrUpdateContractField.js'; -import { acquireConnection } from './pool.js'; // eslint-disable-next-line complexity -export default async function addContract(addForm, user, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); +export default function addContract(addForm, user, connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB); const rightNowMillis = Date.now(); const contractStartDate = dateStringToInteger(addForm.contractStartDateString); const result = database @@ -34,7 +35,7 @@ export default async function addContract(addForm, user, connectedDatabase) { for (const contractTypeFieldId of contractTypeFieldIds) { const fieldValue = addForm[`fieldValue_${contractTypeFieldId}`]; if ((fieldValue ?? '') !== '') { - await addOrUpdateContractField({ + addOrUpdateContractField({ contractId, contractTypeFieldId, fieldValue: fieldValue ?? '' @@ -66,7 +67,7 @@ export default async function addContract(addForm, user, connectedDatabase) { : addForm.intermentContainerTypeId, user.userName, rightNowMillis, user.userName, rightNowMillis); } if (connectedDatabase === undefined) { - database.release(); + database.close(); } return contractId; } diff --git a/database/addContract.ts b/database/addContract.ts index 0946f9e5..04f35fce 100644 --- a/database/addContract.ts +++ b/database/addContract.ts @@ -1,14 +1,14 @@ -import type { PoolConnection } from 'better-sqlite-pool' - import { type DateString, type TimeString, dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' import addOrUpdateContractField from './addOrUpdateContractField.js' -import { acquireConnection } from './pool.js' export interface AddContractForm { burialSiteId: number | string @@ -51,12 +51,12 @@ export interface AddContractForm { } // eslint-disable-next-line complexity -export default async function addContract( +export default function addContract( addForm: AddContractForm, user: User, - connectedDatabase?: PoolConnection -): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + connectedDatabase?: sqlite.Database +): number { + const database = connectedDatabase ?? sqlite(sunriseDB) const rightNowMillis = Date.now() @@ -124,7 +124,7 @@ export default async function addContract( | undefined if ((fieldValue ?? '') !== '') { - await addOrUpdateContractField( + addOrUpdateContractField( { contractId, contractTypeFieldId, @@ -186,7 +186,7 @@ export default async function addContract( } if (connectedDatabase === undefined) { - database.release() + database.close() } return contractId diff --git a/database/addContractComment.d.ts b/database/addContractComment.d.ts index f05b9934..312c44d7 100644 --- a/database/addContractComment.d.ts +++ b/database/addContractComment.d.ts @@ -5,4 +5,4 @@ export interface AddContractCommentForm { commentDateString?: DateString; commentTimeString?: TimeString; } -export default function addContractComment(commentForm: AddContractCommentForm, user: User): Promise; +export default function addContractComment(commentForm: AddContractCommentForm, user: User): number; diff --git a/database/addContractComment.js b/database/addContractComment.js index 9e224735..ca025dcb 100644 --- a/database/addContractComment.js +++ b/database/addContractComment.js @@ -1,6 +1,7 @@ import { dateStringToInteger, dateToInteger, dateToTimeInteger, timeStringToInteger } from '@cityssm/utils-datetime'; -import { acquireConnection } from './pool.js'; -export default async function addContractComment(commentForm, user) { +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function addContractComment(commentForm, user) { const rightNow = new Date(); let commentDate = 0; let commentTime = 0; @@ -12,7 +13,7 @@ export default async function addContractComment(commentForm, user) { commentDate = dateStringToInteger(commentForm.commentDateString); commentTime = timeStringToInteger(commentForm.commentTimeString); } - const database = await acquireConnection(); + const database = sqlite(sunriseDB); const result = database .prepare(`insert into ContractComments ( contractId, @@ -22,6 +23,6 @@ export default async function addContractComment(commentForm, user) { recordUpdate_userName, recordUpdate_timeMillis) values (?, ?, ?, ?, ?, ?, ?, ?)`) .run(commentForm.contractId, commentDate, commentTime ?? 0, commentForm.comment, user.userName, rightNow.getTime(), user.userName, rightNow.getTime()); - database.release(); + database.close(); return result.lastInsertRowid; } diff --git a/database/addContractComment.ts b/database/addContractComment.ts index 91b8e93a..02aad3fc 100644 --- a/database/addContractComment.ts +++ b/database/addContractComment.ts @@ -6,21 +6,22 @@ import { dateToTimeInteger, timeStringToInteger } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' export interface AddContractCommentForm { contractId: number | string - + comment: string commentDateString?: DateString commentTimeString?: TimeString } -export default async function addContractComment( +export default function addContractComment( commentForm: AddContractCommentForm, user: User -): Promise { +): number { const rightNow = new Date() let commentDate = 0 @@ -38,7 +39,7 @@ export default async function addContractComment( ) } - const database = await acquireConnection() + const database = sqlite(sunriseDB) const result = database .prepare( @@ -61,7 +62,7 @@ export default async function addContractComment( rightNow.getTime() ) - database.release() + database.close() return result.lastInsertRowid as number } diff --git a/database/addContractFee.d.ts b/database/addContractFee.d.ts index 25453c82..9e46a0df 100644 --- a/database/addContractFee.d.ts +++ b/database/addContractFee.d.ts @@ -1,4 +1,4 @@ -import type { PoolConnection } from 'better-sqlite-pool'; +import sqlite from 'better-sqlite3'; export interface AddContractFeeForm { contractId: number | string; feeId: number | string; @@ -6,4 +6,4 @@ export interface AddContractFeeForm { quantity: number | string; taxAmount?: number | string; } -export default function addContractFee(addFeeForm: AddContractFeeForm, user: User, connectedDatabase?: PoolConnection): Promise; +export default function addContractFee(addFeeForm: AddContractFeeForm, user: User, connectedDatabase?: sqlite.Database): Promise; diff --git a/database/addContractFee.js b/database/addContractFee.js index 2ceca371..90fcf238 100644 --- a/database/addContractFee.js +++ b/database/addContractFee.js @@ -1,16 +1,17 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { calculateFeeAmount, calculateTaxAmount } from '../helpers/functions.fee.js'; import getContract from './getContract.js'; import getFee from './getFee.js'; -import { acquireConnection } from './pool.js'; export default async function addContractFee(addFeeForm, user, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); + const database = connectedDatabase ?? sqlite(sunriseDB); const rightNowMillis = Date.now(); // Calculate fee and tax (if not set) let feeAmount; let taxAmount; if ((addFeeForm.feeAmount ?? '') === '') { const contract = (await getContract(addFeeForm.contractId)); - const fee = (await getFee(addFeeForm.feeId)); + const fee = getFee(addFeeForm.feeId); feeAmount = calculateFeeAmount(fee, contract); taxAmount = calculateTaxAmount(fee, feeAmount); } @@ -83,7 +84,7 @@ export default async function addContractFee(addFeeForm, user, connectedDatabase } finally { if (connectedDatabase === undefined) { - database.release(); + database.close(); } } } diff --git a/database/addContractFee.ts b/database/addContractFee.ts index b82c0eb3..1dcd780f 100644 --- a/database/addContractFee.ts +++ b/database/addContractFee.ts @@ -1,5 +1,6 @@ -import type { PoolConnection } from 'better-sqlite-pool' +import sqlite from 'better-sqlite3' +import { sunriseDB } from '../helpers/database.helpers.js' import { calculateFeeAmount, calculateTaxAmount @@ -8,7 +9,6 @@ import type { Contract, Fee } from '../types/record.types.js' import getContract from './getContract.js' import getFee from './getFee.js' -import { acquireConnection } from './pool.js' export interface AddContractFeeForm { contractId: number | string @@ -22,9 +22,9 @@ export interface AddContractFeeForm { export default async function addContractFee( addFeeForm: AddContractFeeForm, user: User, - connectedDatabase?: PoolConnection + connectedDatabase?: sqlite.Database ): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + const database = connectedDatabase ?? sqlite(sunriseDB) const rightNowMillis = Date.now() @@ -33,11 +33,9 @@ export default async function addContractFee( let taxAmount: number if ((addFeeForm.feeAmount ?? '') === '') { - const contract = (await getContract( - addFeeForm.contractId - )) as Contract + const contract = (await getContract(addFeeForm.contractId)) as Contract - const fee = (await getFee(addFeeForm.feeId)) as Fee + const fee = getFee(addFeeForm.feeId) as Fee feeAmount = calculateFeeAmount(fee, contract) taxAmount = calculateTaxAmount(fee, feeAmount) @@ -65,6 +63,7 @@ export default async function addContractFee( | { feeAmount: number | null taxAmount: number | null + recordDelete_timeMillis: number | null } | undefined @@ -156,7 +155,7 @@ export default async function addContractFee( return result.changes > 0 } finally { if (connectedDatabase === undefined) { - database.release() + database.close() } } } diff --git a/database/addContractFeeCategory.js b/database/addContractFeeCategory.js index aee4a7e1..b59ae3c4 100644 --- a/database/addContractFeeCategory.js +++ b/database/addContractFeeCategory.js @@ -1,9 +1,10 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import addContractFee from './addContractFee.js'; import { getFeeCategory } from './getFeeCategories.js'; -import { acquireConnection } from './pool.js'; export default async function addContractFeeCategory(addFeeCategoryForm, user) { - const database = await acquireConnection(); - const feeCategory = await getFeeCategory(addFeeCategoryForm.feeCategoryId, database); + const database = sqlite(sunriseDB); + const feeCategory = getFeeCategory(addFeeCategoryForm.feeCategoryId, database); let addedFeeCount = 0; for (const fee of feeCategory?.fees ?? []) { const success = await addContractFee({ @@ -15,6 +16,6 @@ export default async function addContractFeeCategory(addFeeCategoryForm, user) { addedFeeCount += 1; } } - database.release(); + database.close(); return addedFeeCount; } diff --git a/database/addContractFeeCategory.ts b/database/addContractFeeCategory.ts index 24530e04..c168bd37 100644 --- a/database/addContractFeeCategory.ts +++ b/database/addContractFeeCategory.ts @@ -1,6 +1,9 @@ +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' + import addContractFee from './addContractFee.js' import { getFeeCategory } from './getFeeCategories.js' -import { acquireConnection } from './pool.js' export interface AddContractCategoryForm { contractId: number | string @@ -11,12 +14,9 @@ export default async function addContractFeeCategory( addFeeCategoryForm: AddContractCategoryForm, user: User ): Promise { - const database = await acquireConnection() + const database = sqlite(sunriseDB) - const feeCategory = await getFeeCategory( - addFeeCategoryForm.feeCategoryId, - database - ) + const feeCategory = getFeeCategory(addFeeCategoryForm.feeCategoryId, database) let addedFeeCount = 0 @@ -36,7 +36,7 @@ export default async function addContractFeeCategory( } } - database.release() + database.close() return addedFeeCount } diff --git a/database/addContractInterment.d.ts b/database/addContractInterment.d.ts index 811bf530..954c3f6e 100644 --- a/database/addContractInterment.d.ts +++ b/database/addContractInterment.d.ts @@ -1,5 +1,5 @@ -import type { PoolConnection } from 'better-sqlite-pool'; import { type DateString } from '@cityssm/utils-datetime'; +import sqlite from 'better-sqlite3'; export interface AddForm { contractId: number | string; deceasedName: string; @@ -16,4 +16,4 @@ export interface AddForm { deathAgePeriod: string; intermentContainerTypeId: number | string; } -export default function addContractInterment(contractForm: AddForm, user: User, connectedDatabase?: PoolConnection): Promise; +export default function addContractInterment(contractForm: AddForm, user: User, connectedDatabase?: sqlite.Database): number; diff --git a/database/addContractInterment.js b/database/addContractInterment.js index ce12b5c9..ab391047 100644 --- a/database/addContractInterment.js +++ b/database/addContractInterment.js @@ -1,11 +1,12 @@ import { dateStringToInteger } from '@cityssm/utils-datetime'; -import { acquireConnection } from './pool.js'; -export default async function addContractInterment(contractForm, user, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function addContractInterment(contractForm, user, connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB); const maxIntermentNumber = (database .prepare(`select max(intermentNumber) as maxIntermentNumber - from ContractInterments - where contractId = ?`) + from ContractInterments + where contractId = ?`) .pluck() .get(contractForm.contractId) ?? 0); const newIntermentNumber = maxIntermentNumber + 1; @@ -26,7 +27,7 @@ export default async function addContractInterment(contractForm, user, connected ? undefined : contractForm.intermentContainerTypeId, user.userName, rightNowMillis, user.userName, rightNowMillis); if (connectedDatabase === undefined) { - database.release(); + database.close(); } return newIntermentNumber; } diff --git a/database/addContractInterment.ts b/database/addContractInterment.ts index 9baa1e28..6c1e6a52 100644 --- a/database/addContractInterment.ts +++ b/database/addContractInterment.ts @@ -1,8 +1,7 @@ -import type { PoolConnection } from 'better-sqlite-pool' - import { type DateString, dateStringToInteger } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' export interface AddForm { contractId: number | string @@ -22,22 +21,22 @@ export interface AddForm { deathAge: number | string deathAgePeriod: string - + intermentContainerTypeId: number | string } -export default async function addContractInterment( +export default function addContractInterment( contractForm: AddForm, user: User, - connectedDatabase?: PoolConnection -): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + connectedDatabase?: sqlite.Database +): number { + const database = connectedDatabase ?? sqlite(sunriseDB) const maxIntermentNumber = (database .prepare( `select max(intermentNumber) as maxIntermentNumber - from ContractInterments - where contractId = ?` + from ContractInterments + where contractId = ?` ) .pluck() .get(contractForm.contractId) ?? 0) as number @@ -82,7 +81,7 @@ export default async function addContractInterment( ) if (connectedDatabase === undefined) { - database.release() + database.close() } return newIntermentNumber diff --git a/database/addContractTransaction.d.ts b/database/addContractTransaction.d.ts index a55f778d..003d07b6 100644 --- a/database/addContractTransaction.d.ts +++ b/database/addContractTransaction.d.ts @@ -6,4 +6,4 @@ export interface AddTransactionForm { transactionAmount: number | string; transactionNote: string; } -export default function addContractTransaction(contractTransactionForm: AddTransactionForm, user: User): Promise; +export default function addContractTransaction(contractTransactionForm: AddTransactionForm, user: User): number; diff --git a/database/addContractTransaction.js b/database/addContractTransaction.js index e5cdf207..13fe4593 100644 --- a/database/addContractTransaction.js +++ b/database/addContractTransaction.js @@ -1,7 +1,8 @@ import { dateStringToInteger, dateToInteger, dateToTimeInteger, timeStringToInteger } from '@cityssm/utils-datetime'; -import { acquireConnection } from './pool.js'; -export default async function addContractTransaction(contractTransactionForm, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function addContractTransaction(contractTransactionForm, user) { + const database = sqlite(sunriseDB); let transactionIndex = 0; const maxIndexResult = database .prepare(`select transactionIndex @@ -29,6 +30,6 @@ export default async function addContractTransaction(contractTransactionForm, us recordUpdate_userName, recordUpdate_timeMillis) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) .run(contractTransactionForm.contractId, transactionIndex, transactionDate, transactionTime, contractTransactionForm.transactionAmount, contractTransactionForm.externalReceiptNumber, contractTransactionForm.transactionNote, user.userName, rightNow.getTime(), user.userName, rightNow.getTime()); - database.release(); + database.close(); return transactionIndex; } diff --git a/database/addContractTransaction.ts b/database/addContractTransaction.ts index 48c51207..76f673bf 100644 --- a/database/addContractTransaction.ts +++ b/database/addContractTransaction.ts @@ -4,8 +4,9 @@ import { dateToTimeInteger, timeStringToInteger } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' export interface AddTransactionForm { contractId: number | string @@ -18,11 +19,11 @@ export interface AddTransactionForm { transactionNote: string } -export default async function addContractTransaction( +export default function addContractTransaction( contractTransactionForm: AddTransactionForm, user: User -): Promise { - const database = await acquireConnection() +): number { + const database = sqlite(sunriseDB) let transactionIndex = 0 @@ -76,7 +77,7 @@ export default async function addContractTransaction( rightNow.getTime() ) - database.release() + database.close() return transactionIndex } diff --git a/database/addContractType.d.ts b/database/addContractType.d.ts index 17f5ae3a..1e926e2d 100644 --- a/database/addContractType.d.ts +++ b/database/addContractType.d.ts @@ -3,4 +3,4 @@ export interface AddForm { isPreneed?: string; orderNumber?: number; } -export default function addContractType(addForm: AddForm, user: User): Promise; +export default function addContractType(addForm: AddForm, user: User): number; diff --git a/database/addContractType.js b/database/addContractType.js index fd9f9fc8..fc37854a 100644 --- a/database/addContractType.js +++ b/database/addContractType.js @@ -1,7 +1,8 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { clearCacheByTableName } from '../helpers/functions.cache.js'; -import { acquireConnection } from './pool.js'; -export default async function addContractType(addForm, user) { - const database = await acquireConnection(); +export default function addContractType(addForm, user) { + const database = sqlite(sunriseDB); const rightNowMillis = Date.now(); const result = database .prepare(`insert into ContractTypes ( @@ -10,7 +11,7 @@ export default async function addContractType(addForm, user) { recordUpdate_userName, recordUpdate_timeMillis) values (?, ?, ?, ?, ?, ?, ?)`) .run(addForm.contractType, addForm.isPreneed === undefined ? 0 : 1, addForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis); - database.release(); + database.close(); clearCacheByTableName('ContractTypes'); return result.lastInsertRowid; } diff --git a/database/addContractType.ts b/database/addContractType.ts index 6a9fe4c6..bf71f2fe 100644 --- a/database/addContractType.ts +++ b/database/addContractType.ts @@ -1,6 +1,7 @@ -import { clearCacheByTableName } from '../helpers/functions.cache.js' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' +import { clearCacheByTableName } from '../helpers/functions.cache.js' export interface AddForm { contractType: string @@ -8,11 +9,8 @@ export interface AddForm { orderNumber?: number } -export default async function addContractType( - addForm: AddForm, - user: User -): Promise { - const database = await acquireConnection() +export default function addContractType(addForm: AddForm, user: User): number { + const database = sqlite(sunriseDB) const rightNowMillis = Date.now() @@ -34,7 +32,7 @@ export default async function addContractType( rightNowMillis ) - database.release() + database.close() clearCacheByTableName('ContractTypes') diff --git a/database/addContractTypeField.d.ts b/database/addContractTypeField.d.ts index d743c20e..c33fa590 100644 --- a/database/addContractTypeField.d.ts +++ b/database/addContractTypeField.d.ts @@ -1,12 +1,12 @@ export interface AddContractTypeFieldForm { - contractTypeId?: string | number; + contractTypeId?: number | string; contractTypeField: string; fieldValues?: string; fieldType?: string; isRequired?: string; + maxLength?: number | string; + minLength?: number | string; pattern?: string; - minLength?: string | number; - maxLength?: string | number; orderNumber?: number; } -export default function addContractTypeField(addForm: AddContractTypeFieldForm, user: User): Promise; +export default function addContractTypeField(addForm: AddContractTypeFieldForm, user: User): number; diff --git a/database/addContractTypeField.js b/database/addContractTypeField.js index 3b5a4b92..cd04e7f7 100644 --- a/database/addContractTypeField.js +++ b/database/addContractTypeField.js @@ -1,7 +1,8 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { clearCacheByTableName } from '../helpers/functions.cache.js'; -import { acquireConnection } from './pool.js'; -export default async function addContractTypeField(addForm, user) { - const database = await acquireConnection(); +export default function addContractTypeField(addForm, user) { + const database = sqlite(sunriseDB); const rightNowMillis = Date.now(); const result = database .prepare(`insert into ContractTypeFields ( @@ -13,7 +14,7 @@ export default async function addContractTypeField(addForm, user) { recordUpdate_userName, recordUpdate_timeMillis) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) .run(addForm.contractTypeId ?? undefined, addForm.contractTypeField, addForm.fieldType ?? 'text', addForm.fieldValues ?? '', addForm.isRequired === '' ? 0 : 1, addForm.pattern ?? '', addForm.minLength ?? 0, addForm.maxLength ?? 100, addForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis); - database.release(); + database.close(); clearCacheByTableName('ContractTypeFields'); return result.lastInsertRowid; } diff --git a/database/addContractTypeField.ts b/database/addContractTypeField.ts index 2c3fc87a..de86ea8a 100644 --- a/database/addContractTypeField.ts +++ b/database/addContractTypeField.ts @@ -1,24 +1,26 @@ +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' import { clearCacheByTableName } from '../helpers/functions.cache.js' -import { acquireConnection } from './pool.js' - export interface AddContractTypeFieldForm { - contractTypeId?: string | number + contractTypeId?: number | string contractTypeField: string fieldValues?: string fieldType?: string isRequired?: string + maxLength?: number | string + minLength?: number | string pattern?: string - minLength?: string | number - maxLength?: string | number + orderNumber?: number } -export default async function addContractTypeField( +export default function addContractTypeField( addForm: AddContractTypeFieldForm, user: User -): Promise { - const database = await acquireConnection() +): number { + const database = sqlite(sunriseDB) const rightNowMillis = Date.now() @@ -49,7 +51,7 @@ export default async function addContractTypeField( rightNowMillis ) - database.release() + database.close() clearCacheByTableName('ContractTypeFields') diff --git a/database/addContractTypePrint.d.ts b/database/addContractTypePrint.d.ts index e399846b..8ea03514 100644 --- a/database/addContractTypePrint.d.ts +++ b/database/addContractTypePrint.d.ts @@ -1,6 +1,6 @@ export interface AddContractTypePrintForm { - contractTypeId: string | number; + contractTypeId: number | string; printEJS: string; orderNumber?: number; } -export default function addContractTypePrint(addForm: AddContractTypePrintForm, user: User): Promise; +export default function addContractTypePrint(addForm: AddContractTypePrintForm, user: User): boolean; diff --git a/database/addContractTypePrint.js b/database/addContractTypePrint.js index cb2314d4..7f3c21c5 100644 --- a/database/addContractTypePrint.js +++ b/database/addContractTypePrint.js @@ -1,7 +1,8 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { clearCacheByTableName } from '../helpers/functions.cache.js'; -import { acquireConnection } from './pool.js'; -export default async function addContractTypePrint(addForm, user) { - const database = await acquireConnection(); +export default function addContractTypePrint(addForm, user) { + const database = sqlite(sunriseDB); const rightNowMillis = Date.now(); let result = database .prepare(`update ContractTypePrints @@ -21,7 +22,7 @@ export default async function addContractTypePrint(addForm, user) { values (?, ?, ?, ?, ?, ?, ?)`) .run(addForm.contractTypeId, addForm.printEJS, addForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis); } - database.release(); + database.close(); clearCacheByTableName('ContractTypePrints'); return result.changes > 0; } diff --git a/database/addContractTypePrint.ts b/database/addContractTypePrint.ts index d978c529..8cddd337 100644 --- a/database/addContractTypePrint.ts +++ b/database/addContractTypePrint.ts @@ -1,18 +1,19 @@ +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' import { clearCacheByTableName } from '../helpers/functions.cache.js' -import { acquireConnection } from './pool.js' - export interface AddContractTypePrintForm { - contractTypeId: string | number + contractTypeId: number | string printEJS: string orderNumber?: number } -export default async function addContractTypePrint( +export default function addContractTypePrint( addForm: AddContractTypePrintForm, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const rightNowMillis = Date.now() @@ -53,7 +54,7 @@ export default async function addContractTypePrint( ) } - database.release() + database.close() clearCacheByTableName('ContractTypePrints') diff --git a/database/addFee.d.ts b/database/addFee.d.ts index 8cad91e2..bf95208b 100644 --- a/database/addFee.d.ts +++ b/database/addFee.d.ts @@ -1,10 +1,10 @@ export interface AddFeeForm { - feeCategoryId: string | number; + feeCategoryId: number | string; feeName: string; feeDescription: string; feeAccount: string; - contractTypeId: string | number; - burialSiteTypeId: string | number; + contractTypeId: number | string; + burialSiteTypeId: number | string; feeAmount?: string; feeFunction?: string; taxAmount?: string; @@ -14,4 +14,4 @@ export interface AddFeeForm { isRequired?: '' | '1'; orderNumber?: number; } -export default function addFee(feeForm: AddFeeForm, user: User): Promise; +export default function addFee(feeForm: AddFeeForm, user: User): number; diff --git a/database/addFee.js b/database/addFee.js index fc3b86df..6619bfd4 100644 --- a/database/addFee.js +++ b/database/addFee.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function addFee(feeForm, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function addFee(feeForm, user) { + const database = sqlite(sunriseDB); const rightNowMillis = Date.now(); const result = database .prepare(`insert into Fees ( @@ -15,6 +16,6 @@ export default async function addFee(feeForm, user) { recordUpdate_userName, recordUpdate_timeMillis) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) .run(feeForm.feeCategoryId, feeForm.feeName, feeForm.feeDescription, feeForm.feeAccount, feeForm.contractTypeId === '' ? undefined : feeForm.contractTypeId, feeForm.burialSiteTypeId === '' ? undefined : feeForm.burialSiteTypeId, feeForm.feeAmount === '' ? undefined : feeForm.feeAmount, feeForm.feeFunction ?? undefined, feeForm.taxAmount === '' ? undefined : feeForm.taxAmount, feeForm.taxPercentage === '' ? undefined : feeForm.taxPercentage, (feeForm.includeQuantity ?? '') === '' ? 0 : 1, feeForm.quantityUnit, (feeForm.isRequired ?? '') === '' ? 0 : 1, feeForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis); - database.release(); + database.close(); return result.lastInsertRowid; } diff --git a/database/addFee.ts b/database/addFee.ts index 8328755b..7bb8261e 100644 --- a/database/addFee.ts +++ b/database/addFee.ts @@ -1,12 +1,14 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' export interface AddFeeForm { - feeCategoryId: string | number + feeCategoryId: number | string feeName: string feeDescription: string feeAccount: string - contractTypeId: string | number - burialSiteTypeId: string | number + contractTypeId: number | string + burialSiteTypeId: number | string feeAmount?: string feeFunction?: string taxAmount?: string @@ -17,11 +19,8 @@ export interface AddFeeForm { orderNumber?: number } -export default async function addFee( - feeForm: AddFeeForm, - user: User -): Promise { - const database = await acquireConnection() +export default function addFee(feeForm: AddFeeForm, user: User): number { + const database = sqlite(sunriseDB) const rightNowMillis = Date.now() @@ -60,7 +59,7 @@ export default async function addFee( rightNowMillis ) - database.release() + database.close() return result.lastInsertRowid as number } diff --git a/database/addFeeCategory.d.ts b/database/addFeeCategory.d.ts index 2101d5aa..1d477235 100644 --- a/database/addFeeCategory.d.ts +++ b/database/addFeeCategory.d.ts @@ -3,4 +3,4 @@ export interface AddFeeCategoryForm { isGroupedFee?: '1'; orderNumber?: number; } -export default function addFeeCategory(feeCategoryForm: AddFeeCategoryForm, user: User): Promise; +export default function addFeeCategory(feeCategoryForm: AddFeeCategoryForm, user: User): number; diff --git a/database/addFeeCategory.js b/database/addFeeCategory.js index 46b6834b..69fed6f1 100644 --- a/database/addFeeCategory.js +++ b/database/addFeeCategory.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function addFeeCategory(feeCategoryForm, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function addFeeCategory(feeCategoryForm, user) { + const database = sqlite(sunriseDB); const rightNowMillis = Date.now(); const result = database .prepare(`insert into FeeCategories ( @@ -10,6 +11,6 @@ export default async function addFeeCategory(feeCategoryForm, user) { recordUpdate_userName, recordUpdate_timeMillis) values (?, ?, ?, ?, ?, ?, ?)`) .run(feeCategoryForm.feeCategory, (feeCategoryForm.isGroupedFee ?? '') === '1' ? 1 : 0, feeCategoryForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis); - database.release(); + database.close(); return result.lastInsertRowid; } diff --git a/database/addFeeCategory.ts b/database/addFeeCategory.ts index 3eca01f8..56a44c6e 100644 --- a/database/addFeeCategory.ts +++ b/database/addFeeCategory.ts @@ -1,4 +1,6 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' export interface AddFeeCategoryForm { feeCategory: string @@ -6,11 +8,11 @@ export interface AddFeeCategoryForm { orderNumber?: number } -export default async function addFeeCategory( +export default function addFeeCategory( feeCategoryForm: AddFeeCategoryForm, user: User -): Promise { - const database = await acquireConnection() +): number { + const database = sqlite(sunriseDB) const rightNowMillis = Date.now() @@ -33,7 +35,7 @@ export default async function addFeeCategory( rightNowMillis ) - database.release() + database.close() return result.lastInsertRowid as number } diff --git a/database/addFuneralHome.d.ts b/database/addFuneralHome.d.ts index 7edc71be..7e651cee 100644 --- a/database/addFuneralHome.d.ts +++ b/database/addFuneralHome.d.ts @@ -4,8 +4,8 @@ export interface AddForm { funeralHomeAddress1: string; funeralHomeAddress2: string; funeralHomeCity: string; - funeralHomeProvince: string; funeralHomePostalCode: string; + funeralHomeProvince: string; funeralHomePhoneNumber: string; } -export default function addFuneralHome(addForm: AddForm, user: User): Promise; +export default function addFuneralHome(addForm: AddForm, user: User): number; diff --git a/database/addFuneralHome.js b/database/addFuneralHome.js index 57ed93e2..c8518d1e 100644 --- a/database/addFuneralHome.js +++ b/database/addFuneralHome.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function addFuneralHome(addForm, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function addFuneralHome(addForm, user) { + const database = sqlite(sunriseDB); const rightNowMillis = Date.now(); const result = database .prepare(`insert into FuneralHomes ( @@ -10,6 +11,6 @@ export default async function addFuneralHome(addForm, user) { recordUpdate_userName, recordUpdate_timeMillis) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) .run(addForm.funeralHomeName, addForm.funeralHomeKey, addForm.funeralHomeAddress1, addForm.funeralHomeAddress2, addForm.funeralHomeCity, addForm.funeralHomeProvince, addForm.funeralHomePostalCode, addForm.funeralHomePhoneNumber, user.userName, rightNowMillis, user.userName, rightNowMillis); - database.release(); + database.close(); return result.lastInsertRowid; } diff --git a/database/addFuneralHome.ts b/database/addFuneralHome.ts index 037c5e4d..ddf3d74a 100644 --- a/database/addFuneralHome.ts +++ b/database/addFuneralHome.ts @@ -1,21 +1,22 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' export interface AddForm { funeralHomeName: string funeralHomeKey: string + funeralHomeAddress1: string funeralHomeAddress2: string funeralHomeCity: string - funeralHomeProvince: string funeralHomePostalCode: string + funeralHomeProvince: string + funeralHomePhoneNumber: string } -export default async function addFuneralHome( - addForm: AddForm, - user: User -): Promise { - const database = await acquireConnection() +export default function addFuneralHome(addForm: AddForm, user: User): number { + const database = sqlite(sunriseDB) const rightNowMillis = Date.now() @@ -43,7 +44,7 @@ export default async function addFuneralHome( rightNowMillis ) - database.release() + database.close() return result.lastInsertRowid as number } diff --git a/database/addIntermentContainerType.d.ts b/database/addIntermentContainerType.d.ts index 77414dad..21ecbde4 100644 --- a/database/addIntermentContainerType.d.ts +++ b/database/addIntermentContainerType.d.ts @@ -4,4 +4,4 @@ export interface AddForm { isCremationType?: string; orderNumber?: number; } -export default function addIntermentContainerType(addForm: AddForm, user: User): Promise; +export default function addIntermentContainerType(addForm: AddForm, user: User): number; diff --git a/database/addIntermentContainerType.js b/database/addIntermentContainerType.js index dd7a88bc..235a5c7d 100644 --- a/database/addIntermentContainerType.js +++ b/database/addIntermentContainerType.js @@ -1,7 +1,8 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { clearCacheByTableName } from '../helpers/functions.cache.js'; -import { acquireConnection } from './pool.js'; -export default async function addIntermentContainerType(addForm, user) { - const database = await acquireConnection(); +export default function addIntermentContainerType(addForm, user) { + const database = sqlite(sunriseDB); const rightNowMillis = Date.now(); const result = database .prepare(`insert into IntermentContainerTypes ( @@ -10,7 +11,7 @@ export default async function addIntermentContainerType(addForm, user) { recordUpdate_userName, recordUpdate_timeMillis) values (?, ?, ?, ?, ?, ?, ?, ?)`) .run(addForm.intermentContainerType, addForm.intermentContainerTypeKey ?? '', addForm.isCremationType === undefined ? 0 : 1, addForm.orderNumber ?? -1, user.userName, rightNowMillis, user.userName, rightNowMillis); - database.release(); + database.close(); clearCacheByTableName('IntermentContainerTypes'); return result.lastInsertRowid; } diff --git a/database/addIntermentContainerType.ts b/database/addIntermentContainerType.ts index 40a424b3..25315c09 100644 --- a/database/addIntermentContainerType.ts +++ b/database/addIntermentContainerType.ts @@ -1,6 +1,7 @@ -import { clearCacheByTableName } from '../helpers/functions.cache.js' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' +import { clearCacheByTableName } from '../helpers/functions.cache.js' export interface AddForm { intermentContainerType: string @@ -9,11 +10,11 @@ export interface AddForm { orderNumber?: number } -export default async function addIntermentContainerType( +export default function addIntermentContainerType( addForm: AddForm, user: User -): Promise { - const database = await acquireConnection() +): number { + const database = sqlite(sunriseDB) const rightNowMillis = Date.now() @@ -36,7 +37,7 @@ export default async function addIntermentContainerType( rightNowMillis ) - database.release() + database.close() clearCacheByTableName('IntermentContainerTypes') diff --git a/database/addOrUpdateBurialSiteField.d.ts b/database/addOrUpdateBurialSiteField.d.ts index 321f71a9..0cede8f3 100644 --- a/database/addOrUpdateBurialSiteField.d.ts +++ b/database/addOrUpdateBurialSiteField.d.ts @@ -1,7 +1,7 @@ -import type { PoolConnection } from 'better-sqlite-pool'; +import sqlite from 'better-sqlite3'; export interface BurialSiteFieldForm { - burialSiteId: string | number; - burialSiteTypeFieldId: string | number; + burialSiteId: number | string; + burialSiteTypeFieldId: number | string; fieldValue: string; } -export default function addOrUpdateBurialSiteField(fieldForm: BurialSiteFieldForm, user: User, connectedDatabase?: PoolConnection): Promise; +export default function addOrUpdateBurialSiteField(fieldForm: BurialSiteFieldForm, user: User, connectedDatabase?: sqlite.Database): boolean; diff --git a/database/addOrUpdateBurialSiteField.js b/database/addOrUpdateBurialSiteField.js index de3296cc..b9ef32ac 100644 --- a/database/addOrUpdateBurialSiteField.js +++ b/database/addOrUpdateBurialSiteField.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function addOrUpdateBurialSiteField(fieldForm, user, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function addOrUpdateBurialSiteField(fieldForm, user, connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB); const rightNowMillis = Date.now(); let result = database .prepare(`update BurialSiteFields @@ -22,7 +23,7 @@ export default async function addOrUpdateBurialSiteField(fieldForm, user, connec .run(fieldForm.burialSiteId, fieldForm.burialSiteTypeFieldId, fieldForm.fieldValue, user.userName, rightNowMillis, user.userName, rightNowMillis); } if (connectedDatabase === undefined) { - database.release(); + database.close(); } return result.changes > 0; } diff --git a/database/addOrUpdateBurialSiteField.ts b/database/addOrUpdateBurialSiteField.ts index 3307740b..3e5cff5b 100644 --- a/database/addOrUpdateBurialSiteField.ts +++ b/database/addOrUpdateBurialSiteField.ts @@ -1,19 +1,19 @@ -import type { PoolConnection } from 'better-sqlite-pool' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' export interface BurialSiteFieldForm { - burialSiteId: string | number - burialSiteTypeFieldId: string | number + burialSiteId: number | string + burialSiteTypeFieldId: number | string fieldValue: string } -export default async function addOrUpdateBurialSiteField( +export default function addOrUpdateBurialSiteField( fieldForm: BurialSiteFieldForm, user: User, - connectedDatabase?: PoolConnection -): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + connectedDatabase?: sqlite.Database +): boolean { + const database = connectedDatabase ?? sqlite(sunriseDB) const rightNowMillis = Date.now() @@ -57,7 +57,7 @@ export default async function addOrUpdateBurialSiteField( } if (connectedDatabase === undefined) { - database.release() + database.close() } return result.changes > 0 diff --git a/database/addOrUpdateContractField.d.ts b/database/addOrUpdateContractField.d.ts index 71dac326..a88feb02 100644 --- a/database/addOrUpdateContractField.d.ts +++ b/database/addOrUpdateContractField.d.ts @@ -1,7 +1,7 @@ -import type { PoolConnection } from 'better-sqlite-pool'; +import sqlite from 'better-sqlite3'; export interface ContractFieldForm { - contractId: string | number; - contractTypeFieldId: string | number; + contractId: number | string; + contractTypeFieldId: number | string; fieldValue: string; } -export default function addOrUpdateContractField(fieldForm: ContractFieldForm, user: User, connectedDatabase?: PoolConnection): Promise; +export default function addOrUpdateContractField(fieldForm: ContractFieldForm, user: User, connectedDatabase?: sqlite.Database): boolean; diff --git a/database/addOrUpdateContractField.js b/database/addOrUpdateContractField.js index 32f6275e..d3d3699e 100644 --- a/database/addOrUpdateContractField.js +++ b/database/addOrUpdateContractField.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function addOrUpdateContractField(fieldForm, user, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function addOrUpdateContractField(fieldForm, user, connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB); const rightNowMillis = Date.now(); let result = database .prepare(`update ContractFields @@ -22,7 +23,7 @@ export default async function addOrUpdateContractField(fieldForm, user, connecte .run(fieldForm.contractId, fieldForm.contractTypeFieldId, fieldForm.fieldValue, user.userName, rightNowMillis, user.userName, rightNowMillis); } if (connectedDatabase === undefined) { - database.release(); + database.close(); } return result.changes > 0; } diff --git a/database/addOrUpdateContractField.ts b/database/addOrUpdateContractField.ts index 6329cbe6..dfcfaa49 100644 --- a/database/addOrUpdateContractField.ts +++ b/database/addOrUpdateContractField.ts @@ -1,19 +1,19 @@ -import type { PoolConnection } from 'better-sqlite-pool' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' export interface ContractFieldForm { - contractId: string | number - contractTypeFieldId: string | number + contractId: number | string + contractTypeFieldId: number | string fieldValue: string } -export default async function addOrUpdateContractField( +export default function addOrUpdateContractField( fieldForm: ContractFieldForm, user: User, - connectedDatabase?: PoolConnection -): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + connectedDatabase?: sqlite.Database +): boolean { + const database = connectedDatabase ?? sqlite(sunriseDB) const rightNowMillis = Date.now() @@ -57,7 +57,7 @@ export default async function addOrUpdateContractField( } if (connectedDatabase === undefined) { - database.release() + database.close() } return result.changes > 0 diff --git a/database/addRecord.d.ts b/database/addRecord.d.ts index 887976a7..7e2f4b79 100644 --- a/database/addRecord.d.ts +++ b/database/addRecord.d.ts @@ -1,3 +1,3 @@ type RecordTable = 'BurialSiteStatuses' | 'BurialSiteTypes' | 'WorkOrderMilestoneTypes' | 'WorkOrderTypes'; -export default function addRecord(recordTable: RecordTable, recordName: string, orderNumber: number | string, user: User): Promise; +export default function addRecord(recordTable: RecordTable, recordName: string, orderNumber: number | string, user: User): number; export {}; diff --git a/database/addRecord.js b/database/addRecord.js index 12854a14..39cd84d1 100644 --- a/database/addRecord.js +++ b/database/addRecord.js @@ -1,13 +1,14 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { clearCacheByTableName } from '../helpers/functions.cache.js'; -import { acquireConnection } from './pool.js'; const recordNameColumns = new Map([ ['BurialSiteStatuses', 'burialSiteStatus'], ['BurialSiteTypes', 'burialSiteType'], ['WorkOrderMilestoneTypes', 'workOrderMilestoneType'], ['WorkOrderTypes', 'workOrderType'] ]); -export default async function addRecord(recordTable, recordName, orderNumber, user) { - const database = await acquireConnection(); +export default function addRecord(recordTable, recordName, orderNumber, user) { + const database = sqlite(sunriseDB); const rightNowMillis = Date.now(); const result = database .prepare(`insert into ${recordTable} ( @@ -17,7 +18,7 @@ export default async function addRecord(recordTable, recordName, orderNumber, us recordUpdate_userName, recordUpdate_timeMillis) values (?, ?, ?, ?, ?, ?)`) .run(recordName, orderNumber === '' ? -1 : orderNumber, user.userName, rightNowMillis, user.userName, rightNowMillis); - database.release(); + database.close(); clearCacheByTableName(recordTable); return result.lastInsertRowid; } diff --git a/database/addRecord.ts b/database/addRecord.ts index 93856271..5ff358ef 100644 --- a/database/addRecord.ts +++ b/database/addRecord.ts @@ -1,6 +1,7 @@ -import { clearCacheByTableName } from '../helpers/functions.cache.js' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' +import { clearCacheByTableName } from '../helpers/functions.cache.js' type RecordTable = | 'BurialSiteStatuses' @@ -15,13 +16,13 @@ const recordNameColumns = new Map([ ['WorkOrderTypes', 'workOrderType'] ]) -export default async function addRecord( +export default function addRecord( recordTable: RecordTable, recordName: string, orderNumber: number | string, user: User -): Promise { - const database = await acquireConnection() +): number { + const database = sqlite(sunriseDB) const rightNowMillis = Date.now() @@ -43,7 +44,7 @@ export default async function addRecord( rightNowMillis ) - database.release() + database.close() clearCacheByTableName(recordTable) diff --git a/database/addWorkOrder.d.ts b/database/addWorkOrder.d.ts index 4131e3a2..192fa602 100644 --- a/database/addWorkOrder.d.ts +++ b/database/addWorkOrder.d.ts @@ -6,4 +6,4 @@ export interface AddWorkOrderForm { workOrderCloseDateString?: string; contractId?: string; } -export default function addWorkOrder(workOrderForm: AddWorkOrderForm, user: User): Promise; +export default function addWorkOrder(workOrderForm: AddWorkOrderForm, user: User): number; diff --git a/database/addWorkOrder.js b/database/addWorkOrder.js index 6c68ddc8..b964c69f 100644 --- a/database/addWorkOrder.js +++ b/database/addWorkOrder.js @@ -1,13 +1,14 @@ import { dateStringToInteger, dateToInteger } from '@cityssm/utils-datetime'; +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import addWorkOrderContract from './addWorkOrderContract.js'; import getNextWorkOrderNumber from './getNextWorkOrderNumber.js'; -import { acquireConnection } from './pool.js'; -export default async function addWorkOrder(workOrderForm, user) { - const database = await acquireConnection(); +export default function addWorkOrder(workOrderForm, user) { + const database = sqlite(sunriseDB); const rightNow = new Date(); let workOrderNumber = workOrderForm.workOrderNumber; if ((workOrderNumber ?? '') === '') { - workOrderNumber = await getNextWorkOrderNumber(database); + workOrderNumber = getNextWorkOrderNumber(database); } const result = database .prepare(`insert into WorkOrders ( @@ -23,11 +24,11 @@ export default async function addWorkOrder(workOrderForm, user) { : dateStringToInteger(workOrderForm.workOrderCloseDateString), user.userName, rightNow.getTime(), user.userName, rightNow.getTime()); const workOrderId = result.lastInsertRowid; if ((workOrderForm.contractId ?? '') !== '') { - await addWorkOrderContract({ + addWorkOrderContract({ workOrderId, contractId: workOrderForm.contractId }, user, database); } - database.release(); + database.close(); return workOrderId; } diff --git a/database/addWorkOrder.ts b/database/addWorkOrder.ts index ad4a1d50..a9f99854 100644 --- a/database/addWorkOrder.ts +++ b/database/addWorkOrder.ts @@ -3,10 +3,12 @@ import { dateStringToInteger, dateToInteger } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' import addWorkOrderContract from './addWorkOrderContract.js' import getNextWorkOrderNumber from './getNextWorkOrderNumber.js' -import { acquireConnection } from './pool.js' export interface AddWorkOrderForm { workOrderTypeId: number | string @@ -17,18 +19,18 @@ export interface AddWorkOrderForm { contractId?: string } -export default async function addWorkOrder( +export default function addWorkOrder( workOrderForm: AddWorkOrderForm, user: User -): Promise { - const database = await acquireConnection() +): number { + const database = sqlite(sunriseDB) const rightNow = new Date() let workOrderNumber = workOrderForm.workOrderNumber if ((workOrderNumber ?? '') === '') { - workOrderNumber = await getNextWorkOrderNumber(database) + workOrderNumber = getNextWorkOrderNumber(database) } const result = database @@ -63,7 +65,7 @@ export default async function addWorkOrder( const workOrderId = result.lastInsertRowid as number if ((workOrderForm.contractId ?? '') !== '') { - await addWorkOrderContract( + addWorkOrderContract( { workOrderId, contractId: workOrderForm.contractId as string @@ -73,7 +75,7 @@ export default async function addWorkOrder( ) } - database.release() + database.close() return workOrderId } diff --git a/database/addWorkOrderBurialSite.d.ts b/database/addWorkOrderBurialSite.d.ts index 0d57c515..057617b4 100644 --- a/database/addWorkOrderBurialSite.d.ts +++ b/database/addWorkOrderBurialSite.d.ts @@ -2,4 +2,4 @@ export interface AddForm { workOrderId: number | string; burialSiteId: number | string; } -export default function addWorkOrderBurialSite(workOrderLotForm: AddForm, user: User): Promise; +export default function addWorkOrderBurialSite(workOrderLotForm: AddForm, user: User): boolean; diff --git a/database/addWorkOrderBurialSite.js b/database/addWorkOrderBurialSite.js index c7ed6ec2..830564e0 100644 --- a/database/addWorkOrderBurialSite.js +++ b/database/addWorkOrderBurialSite.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function addWorkOrderBurialSite(workOrderLotForm, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function addWorkOrderBurialSite(workOrderLotForm, user) { + const database = sqlite(sunriseDB); const rightNowMillis = Date.now(); const row = database .prepare(`select recordDelete_timeMillis @@ -32,6 +33,6 @@ export default async function addWorkOrderBurialSite(workOrderLotForm, user) { .run(user.userName, rightNowMillis, user.userName, rightNowMillis, workOrderLotForm.workOrderId, workOrderLotForm.burialSiteId); } } - database.release(); + database.close(); return true; } diff --git a/database/addWorkOrderBurialSite.ts b/database/addWorkOrderBurialSite.ts index 44f44c04..8a56acd5 100644 --- a/database/addWorkOrderBurialSite.ts +++ b/database/addWorkOrderBurialSite.ts @@ -1,15 +1,17 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' export interface AddForm { workOrderId: number | string burialSiteId: number | string } -export default async function addWorkOrderBurialSite( +export default function addWorkOrderBurialSite( workOrderLotForm: AddForm, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const rightNowMillis = Date.now() @@ -68,7 +70,7 @@ export default async function addWorkOrderBurialSite( } } - database.release() + database.close() return true } diff --git a/database/addWorkOrderComment.d.ts b/database/addWorkOrderComment.d.ts index a37c0583..14527ab1 100644 --- a/database/addWorkOrderComment.d.ts +++ b/database/addWorkOrderComment.d.ts @@ -2,4 +2,4 @@ export interface AddWorkOrderCommentForm { workOrderId: string; comment: string; } -export default function addWorkOrderComment(workOrderCommentForm: AddWorkOrderCommentForm, user: User): Promise; +export default function addWorkOrderComment(workOrderCommentForm: AddWorkOrderCommentForm, user: User): number; diff --git a/database/addWorkOrderComment.js b/database/addWorkOrderComment.js index 7dda5538..7c5bd9f7 100644 --- a/database/addWorkOrderComment.js +++ b/database/addWorkOrderComment.js @@ -1,7 +1,8 @@ import { dateToInteger, dateToTimeInteger } from '@cityssm/utils-datetime'; -import { acquireConnection } from './pool.js'; -export default async function addWorkOrderComment(workOrderCommentForm, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function addWorkOrderComment(workOrderCommentForm, user) { + const database = sqlite(sunriseDB); const rightNow = new Date(); const result = database .prepare(`insert into WorkOrderComments ( @@ -12,6 +13,6 @@ export default async function addWorkOrderComment(workOrderCommentForm, user) { recordUpdate_userName, recordUpdate_timeMillis) values (?, ?, ?, ?, ?, ?, ?, ?)`) .run(workOrderCommentForm.workOrderId, dateToInteger(rightNow), dateToTimeInteger(rightNow), workOrderCommentForm.comment, user.userName, rightNow.getTime(), user.userName, rightNow.getTime()); - database.release(); + database.close(); return result.lastInsertRowid; } diff --git a/database/addWorkOrderComment.ts b/database/addWorkOrderComment.ts index 5b7d81db..47d6734c 100644 --- a/database/addWorkOrderComment.ts +++ b/database/addWorkOrderComment.ts @@ -1,17 +1,18 @@ import { dateToInteger, dateToTimeInteger } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' export interface AddWorkOrderCommentForm { workOrderId: string comment: string } -export default async function addWorkOrderComment( +export default function addWorkOrderComment( workOrderCommentForm: AddWorkOrderCommentForm, user: User -): Promise { - const database = await acquireConnection() +): number { + const database = sqlite(sunriseDB) const rightNow = new Date() @@ -36,7 +37,7 @@ export default async function addWorkOrderComment( rightNow.getTime() ) - database.release() + database.close() return result.lastInsertRowid as number } diff --git a/database/addWorkOrderContract.d.ts b/database/addWorkOrderContract.d.ts index c1b66cb9..60d9a046 100644 --- a/database/addWorkOrderContract.d.ts +++ b/database/addWorkOrderContract.d.ts @@ -1,6 +1,6 @@ -import type { PoolConnection } from 'better-sqlite-pool'; +import sqlite from 'better-sqlite3'; export interface AddForm { - workOrderId: number | string; contractId: number | string; + workOrderId: number | string; } -export default function addWorkOrderContract(addForm: AddForm, user: User, connectedDatabase?: PoolConnection): Promise; +export default function addWorkOrderContract(addForm: AddForm, user: User, connectedDatabase?: sqlite.Database): boolean; diff --git a/database/addWorkOrderContract.js b/database/addWorkOrderContract.js index 1d94fb7d..e978428c 100644 --- a/database/addWorkOrderContract.js +++ b/database/addWorkOrderContract.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function addWorkOrderContract(addForm, user, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function addWorkOrderContract(addForm, user, connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB); const rightNowMillis = Date.now(); const recordDeleteTimeMillis = database .prepare(`select recordDelete_timeMillis @@ -34,7 +35,7 @@ export default async function addWorkOrderContract(addForm, user, connectedDatab } } if (connectedDatabase === undefined) { - database.release(); + database.close(); } return true; } diff --git a/database/addWorkOrderContract.ts b/database/addWorkOrderContract.ts index 58710071..b491bbde 100644 --- a/database/addWorkOrderContract.ts +++ b/database/addWorkOrderContract.ts @@ -1,18 +1,18 @@ -import type { PoolConnection } from 'better-sqlite-pool' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' export interface AddForm { - workOrderId: number | string contractId: number | string + workOrderId: number | string } -export default async function addWorkOrderContract( +export default function addWorkOrderContract( addForm: AddForm, user: User, - connectedDatabase?: PoolConnection -): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + connectedDatabase?: sqlite.Database +): boolean { + const database = connectedDatabase ?? sqlite(sunriseDB) const rightNowMillis = Date.now() @@ -24,10 +24,7 @@ export default async function addWorkOrderContract( and contractId = ?` ) .pluck() - .get( - addForm.workOrderId, - addForm.contractId - ) as number | null | undefined + .get(addForm.workOrderId, addForm.contractId) as number | null | undefined if (recordDeleteTimeMillis === undefined) { database @@ -72,7 +69,7 @@ export default async function addWorkOrderContract( } if (connectedDatabase === undefined) { - database.release() + database.close() } return true diff --git a/database/addWorkOrderMilestone.d.ts b/database/addWorkOrderMilestone.d.ts index a0b62410..9659d80c 100644 --- a/database/addWorkOrderMilestone.d.ts +++ b/database/addWorkOrderMilestone.d.ts @@ -1,5 +1,5 @@ export interface AddWorkOrderMilestoneForm { - workOrderId: string | number; + workOrderId: number | string; workOrderMilestoneTypeId: number | string; workOrderMilestoneDateString: string; workOrderMilestoneTimeString?: string; @@ -7,4 +7,4 @@ export interface AddWorkOrderMilestoneForm { workOrderMilestoneCompletionDateString?: string; workOrderMilestoneCompletionTimeString?: string; } -export default function addWorkOrderMilestone(milestoneForm: AddWorkOrderMilestoneForm, user: User): Promise; +export default function addWorkOrderMilestone(milestoneForm: AddWorkOrderMilestoneForm, user: User): number; diff --git a/database/addWorkOrderMilestone.js b/database/addWorkOrderMilestone.js index c1039657..fbf7da53 100644 --- a/database/addWorkOrderMilestone.js +++ b/database/addWorkOrderMilestone.js @@ -1,8 +1,9 @@ import { dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime'; -import { acquireConnection } from './pool.js'; -export default async function addWorkOrderMilestone(milestoneForm, user) { +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function addWorkOrderMilestone(milestoneForm, user) { const rightNowMillis = Date.now(); - const database = await acquireConnection(); + const database = sqlite(sunriseDB); const result = database .prepare(`insert into WorkOrderMilestones ( workOrderId, workOrderMilestoneTypeId, @@ -23,6 +24,6 @@ export default async function addWorkOrderMilestone(milestoneForm, user) { : dateStringToInteger(milestoneForm.workOrderMilestoneCompletionDateString), (milestoneForm.workOrderMilestoneCompletionTimeString ?? '') === '' ? undefined : timeStringToInteger(milestoneForm.workOrderMilestoneCompletionTimeString), user.userName, rightNowMillis, user.userName, rightNowMillis); - database.release(); + database.close(); return result.lastInsertRowid; } diff --git a/database/addWorkOrderMilestone.ts b/database/addWorkOrderMilestone.ts index cda926b3..311bcbfc 100644 --- a/database/addWorkOrderMilestone.ts +++ b/database/addWorkOrderMilestone.ts @@ -2,26 +2,30 @@ import { dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' export interface AddWorkOrderMilestoneForm { - workOrderId: string | number + workOrderId: number | string workOrderMilestoneTypeId: number | string + workOrderMilestoneDateString: string workOrderMilestoneTimeString?: string + workOrderMilestoneDescription: string + workOrderMilestoneCompletionDateString?: string workOrderMilestoneCompletionTimeString?: string } -export default async function addWorkOrderMilestone( +export default function addWorkOrderMilestone( milestoneForm: AddWorkOrderMilestoneForm, user: User -): Promise { +): number { const rightNowMillis = Date.now() - const database = await acquireConnection() + const database = sqlite(sunriseDB) const result = database .prepare( @@ -62,7 +66,7 @@ export default async function addWorkOrderMilestone( rightNowMillis ) - database.release() + database.close() return result.lastInsertRowid as number } diff --git a/database/cleanupDatabase.d.ts b/database/cleanupDatabase.d.ts index 7e92206d..5f8c1624 100644 --- a/database/cleanupDatabase.d.ts +++ b/database/cleanupDatabase.d.ts @@ -1,4 +1,4 @@ -export default function cleanupDatabase(user: User): Promise<{ +export default function cleanupDatabase(user: User): { inactivatedRecordCount: number; purgedRecordCount: number; -}>; +}; diff --git a/database/cleanupDatabase.js b/database/cleanupDatabase.js index c7750b54..212e9ecf 100644 --- a/database/cleanupDatabase.js +++ b/database/cleanupDatabase.js @@ -1,8 +1,9 @@ import { daysToMillis } from '@cityssm/to-millis'; +import sqlite from 'better-sqlite3'; import { getConfigProperty } from '../helpers/config.helpers.js'; -import { acquireConnection } from './pool.js'; -export default async function cleanupDatabase(user) { - const database = await acquireConnection(); +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function cleanupDatabase(user) { + const database = sqlite(sunriseDB); const rightNowMillis = Date.now(); const recordDeleteTimeMillisMin = rightNowMillis - daysToMillis(getConfigProperty('settings.adminCleanup.recordDeleteAgeDays')); @@ -279,7 +280,7 @@ export default async function cleanupDatabase(user) { where recordDelete_timeMillis <= ? and burialSiteTypeId not in (select burialSiteTypeId from BurialSites)`) .run(recordDeleteTimeMillisMin).changes; - database.release(); + database.close(); return { inactivatedRecordCount, purgedRecordCount diff --git a/database/cleanupDatabase.ts b/database/cleanupDatabase.ts index 144abbec..851b5c1f 100644 --- a/database/cleanupDatabase.ts +++ b/database/cleanupDatabase.ts @@ -1,13 +1,14 @@ import { daysToMillis } from '@cityssm/to-millis' +import sqlite from 'better-sqlite3' import { getConfigProperty } from '../helpers/config.helpers.js' +import { sunriseDB } from '../helpers/database.helpers.js' -import { acquireConnection } from './pool.js' - -export default async function cleanupDatabase( - user: User -): Promise<{ inactivatedRecordCount: number; purgedRecordCount: number }> { - const database = await acquireConnection() +export default function cleanupDatabase(user: User): { + inactivatedRecordCount: number + purgedRecordCount: number +} { + const database = sqlite(sunriseDB) const rightNowMillis = Date.now() const recordDeleteTimeMillisMin = @@ -155,9 +156,7 @@ export default async function cleanupDatabase( .run(user.userName, rightNowMillis).changes purgedRecordCount += database - .prepare( - 'delete from ContractComments where recordDelete_timeMillis <= ?' - ) + .prepare('delete from ContractComments where recordDelete_timeMillis <= ?') .run(recordDeleteTimeMillisMin).changes /* @@ -175,9 +174,7 @@ export default async function cleanupDatabase( .run(user.userName, rightNowMillis).changes purgedRecordCount += database - .prepare( - 'delete from ContractFields where recordDelete_timeMillis <= ?' - ) + .prepare('delete from ContractFields where recordDelete_timeMillis <= ?') .run(recordDeleteTimeMillisMin).changes /* @@ -186,9 +183,7 @@ export default async function cleanupDatabase( */ purgedRecordCount += database - .prepare( - 'delete from ContractFees where recordDelete_timeMillis <= ?' - ) + .prepare('delete from ContractFees where recordDelete_timeMillis <= ?') .run(recordDeleteTimeMillisMin).changes purgedRecordCount += database @@ -414,7 +409,7 @@ export default async function cleanupDatabase( ) .run(recordDeleteTimeMillisMin).changes - database.release() + database.close() return { inactivatedRecordCount, diff --git a/database/closeWorkOrder.d.ts b/database/closeWorkOrder.d.ts index 0989d5c1..c24f9a65 100644 --- a/database/closeWorkOrder.d.ts +++ b/database/closeWorkOrder.d.ts @@ -2,4 +2,4 @@ export interface CloseWorkOrderForm { workOrderId: number | string; workOrderCloseDateString?: string; } -export default function closeWorkOrder(workOrderForm: CloseWorkOrderForm, user: User): Promise; +export default function closeWorkOrder(workOrderForm: CloseWorkOrderForm, user: User): boolean; diff --git a/database/closeWorkOrder.js b/database/closeWorkOrder.js index f1d43ce5..76d88484 100644 --- a/database/closeWorkOrder.js +++ b/database/closeWorkOrder.js @@ -1,7 +1,8 @@ import { dateStringToInteger, dateToInteger } from '@cityssm/utils-datetime'; -import { acquireConnection } from './pool.js'; -export default async function closeWorkOrder(workOrderForm, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function closeWorkOrder(workOrderForm, user) { + const database = sqlite(sunriseDB); const rightNow = new Date(); const result = database .prepare(`update WorkOrders @@ -12,6 +13,6 @@ export default async function closeWorkOrder(workOrderForm, user) { .run(workOrderForm.workOrderCloseDateString ? dateStringToInteger(workOrderForm.workOrderCloseDateString) : dateToInteger(new Date()), user.userName, rightNow.getTime(), workOrderForm.workOrderId); - database.release(); + database.close(); return result.changes > 0; } diff --git a/database/closeWorkOrder.ts b/database/closeWorkOrder.ts index 45384c83..e1c5ceec 100644 --- a/database/closeWorkOrder.ts +++ b/database/closeWorkOrder.ts @@ -1,17 +1,19 @@ import { dateStringToInteger, dateToInteger } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' export interface CloseWorkOrderForm { workOrderId: number | string + workOrderCloseDateString?: string } -export default async function closeWorkOrder( +export default function closeWorkOrder( workOrderForm: CloseWorkOrderForm, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const rightNow = new Date() @@ -32,7 +34,7 @@ export default async function closeWorkOrder( workOrderForm.workOrderId ) - database.release() + database.close() return result.changes > 0 } diff --git a/database/completeWorkOrderMilestone.d.ts b/database/completeWorkOrderMilestone.d.ts index fc283b46..60b2a5f1 100644 --- a/database/completeWorkOrderMilestone.d.ts +++ b/database/completeWorkOrderMilestone.d.ts @@ -1,6 +1,6 @@ export interface CompleteWorkOrderMilestoneForm { - workOrderMilestoneId: string | number; + workOrderMilestoneId: number | string; workOrderMilestoneCompletionDateString?: string; workOrderMilestoneCompletionTimeString?: string; } -export default function completeWorkOrderMilestone(milestoneForm: CompleteWorkOrderMilestoneForm, user: User): Promise; +export default function completeWorkOrderMilestone(milestoneForm: CompleteWorkOrderMilestoneForm, user: User): boolean; diff --git a/database/completeWorkOrderMilestone.js b/database/completeWorkOrderMilestone.js index a4acc57c..8ca1f786 100644 --- a/database/completeWorkOrderMilestone.js +++ b/database/completeWorkOrderMilestone.js @@ -1,8 +1,9 @@ import { dateStringToInteger, dateToInteger, dateToTimeInteger, timeStringToInteger } from '@cityssm/utils-datetime'; -import { acquireConnection } from './pool.js'; -export default async function completeWorkOrderMilestone(milestoneForm, user) { +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function completeWorkOrderMilestone(milestoneForm, user) { const rightNow = new Date(); - const database = await acquireConnection(); + const database = sqlite(sunriseDB); const result = database .prepare(`update WorkOrderMilestones set workOrderMilestoneCompletionDate = ?, @@ -15,6 +16,6 @@ export default async function completeWorkOrderMilestone(milestoneForm, user) { : dateStringToInteger(milestoneForm.workOrderMilestoneCompletionDateString), (milestoneForm.workOrderMilestoneCompletionTimeString ?? '') === '' ? dateToTimeInteger(rightNow) : timeStringToInteger(milestoneForm.workOrderMilestoneCompletionTimeString), user.userName, rightNow.getTime(), milestoneForm.workOrderMilestoneId); - database.release(); + database.close(); return result.changes > 0; } diff --git a/database/completeWorkOrderMilestone.ts b/database/completeWorkOrderMilestone.ts index a4842d09..174b9fd2 100644 --- a/database/completeWorkOrderMilestone.ts +++ b/database/completeWorkOrderMilestone.ts @@ -4,22 +4,24 @@ import { dateToTimeInteger, timeStringToInteger } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' export interface CompleteWorkOrderMilestoneForm { - workOrderMilestoneId: string | number + workOrderMilestoneId: number | string + workOrderMilestoneCompletionDateString?: string workOrderMilestoneCompletionTimeString?: string } -export default async function completeWorkOrderMilestone( +export default function completeWorkOrderMilestone( milestoneForm: CompleteWorkOrderMilestoneForm, user: User -): Promise { +): boolean { const rightNow = new Date() - const database = await acquireConnection() + const database = sqlite(sunriseDB) const result = database .prepare( @@ -46,7 +48,7 @@ export default async function completeWorkOrderMilestone( milestoneForm.workOrderMilestoneId ) - database.release() + database.close() return result.changes > 0 } diff --git a/database/copyContract.js b/database/copyContract.js index 87aff959..6a10229c 100644 --- a/database/copyContract.js +++ b/database/copyContract.js @@ -1,14 +1,15 @@ import { dateToString } from '@cityssm/utils-datetime'; +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import addContract from './addContract.js'; import addContractComment from './addContractComment.js'; import addContractInterment from './addContractInterment.js'; import getContract from './getContract.js'; -import { acquireConnection } from './pool.js'; // eslint-disable-next-line complexity export default async function copyContract(oldContractId, user) { - const database = await acquireConnection(); + const database = sqlite(sunriseDB); const oldContract = (await getContract(oldContractId, database)); - const newContractId = await addContract({ + const newContractId = addContract({ burialSiteId: oldContract.burialSiteId ?? '', contractEndDateString: '', contractStartDateString: dateToString(new Date()), @@ -44,7 +45,7 @@ export default async function copyContract(oldContractId, user) { * Copy Interments */ for (const interment of oldContract.contractInterments ?? []) { - await addContractInterment({ + addContractInterment({ birthDateString: interment.birthDateString ?? '', birthPlace: interment.birthPlace ?? '', contractId: newContractId, @@ -64,10 +65,10 @@ export default async function copyContract(oldContractId, user) { /* * Add Comment */ - await addContractComment({ + addContractComment({ comment: `New record copied from #${oldContractId}.`, contractId: newContractId }, user); - database.release(); + database.close(); return newContractId; } diff --git a/database/copyContract.ts b/database/copyContract.ts index f123b41c..49a2599d 100644 --- a/database/copyContract.ts +++ b/database/copyContract.ts @@ -1,23 +1,24 @@ import { dateToString } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' +import { sunriseDB } from '../helpers/database.helpers.js' import type { Contract } from '../types/record.types.js' import addContract from './addContract.js' import addContractComment from './addContractComment.js' import addContractInterment from './addContractInterment.js' import getContract from './getContract.js' -import { acquireConnection } from './pool.js' // eslint-disable-next-line complexity export default async function copyContract( oldContractId: number | string, user: User ): Promise { - const database = await acquireConnection() + const database = sqlite(sunriseDB) const oldContract = (await getContract(oldContractId, database)) as Contract - const newContractId = await addContract( + const newContractId = addContract( { burialSiteId: oldContract.burialSiteId ?? '', contractEndDateString: '', @@ -74,7 +75,7 @@ export default async function copyContract( */ for (const interment of oldContract.contractInterments ?? []) { - await addContractInterment( + addContractInterment( { birthDateString: interment.birthDateString ?? '', birthPlace: interment.birthPlace ?? '', @@ -102,7 +103,7 @@ export default async function copyContract( * Add Comment */ - await addContractComment( + addContractComment( { comment: `New record copied from #${oldContractId}.`, contractId: newContractId @@ -110,7 +111,7 @@ export default async function copyContract( user ) - database.release() + database.close() return newContractId } diff --git a/database/deleteBurialSite.d.ts b/database/deleteBurialSite.d.ts index 48879dd0..df8f22df 100644 --- a/database/deleteBurialSite.d.ts +++ b/database/deleteBurialSite.d.ts @@ -1 +1 @@ -export declare function deleteBurialSite(burialSiteId: number, user: User): Promise; +export declare function deleteBurialSite(burialSiteId: number, user: User): boolean; diff --git a/database/deleteBurialSite.js b/database/deleteBurialSite.js index 4579a933..dadb1016 100644 --- a/database/deleteBurialSite.js +++ b/database/deleteBurialSite.js @@ -1,7 +1,8 @@ import { dateToInteger } from '@cityssm/utils-datetime'; -import { acquireConnection } from './pool.js'; -export async function deleteBurialSite(burialSiteId, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export function deleteBurialSite(burialSiteId, user) { + const database = sqlite(sunriseDB); /* * Ensure no active contracts reference the burial site */ @@ -15,7 +16,7 @@ export async function deleteBurialSite(burialSiteId, user) { .pluck() .get(burialSiteId, currentDateInteger); if (activeContract !== undefined) { - database.release(); + database.close(); return false; } /* @@ -46,6 +47,6 @@ export async function deleteBurialSite(burialSiteId, user) { where burialSiteId = ? and recordDelete_timeMillis is null`) .run(user.userName, rightNowMillis, burialSiteId); - database.release(); + database.close(); return true; } diff --git a/database/deleteBurialSite.ts b/database/deleteBurialSite.ts index 6d4c1f1d..2db7945c 100644 --- a/database/deleteBurialSite.ts +++ b/database/deleteBurialSite.ts @@ -1,12 +1,10 @@ import { dateToInteger } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' -export async function deleteBurialSite( - burialSiteId: number, - user: User -): Promise { - const database = await acquireConnection() +export function deleteBurialSite(burialSiteId: number, user: User): boolean { + const database = sqlite(sunriseDB) /* * Ensure no active contracts reference the burial site @@ -26,7 +24,7 @@ export async function deleteBurialSite( .get(burialSiteId, currentDateInteger) as number | undefined if (activeContract !== undefined) { - database.release() + database.close() return false } @@ -70,7 +68,7 @@ export async function deleteBurialSite( ) .run(user.userName, rightNowMillis, burialSiteId) - database.release() + database.close() return true } diff --git a/database/deleteBurialSiteField.d.ts b/database/deleteBurialSiteField.d.ts index 5385343b..72bb23b9 100644 --- a/database/deleteBurialSiteField.d.ts +++ b/database/deleteBurialSiteField.d.ts @@ -1,2 +1,2 @@ -import type { PoolConnection } from 'better-sqlite-pool'; -export default function deleteBurialSiteField(burialSiteId: number | string, burialSiteTypeFieldId: number | string, user: User, connectedDatabase?: PoolConnection): Promise; +import sqlite from 'better-sqlite3'; +export default function deleteBurialSiteField(burialSiteId: number | string, burialSiteTypeFieldId: number | string, user: User, connectedDatabase?: sqlite.Database): boolean; diff --git a/database/deleteBurialSiteField.js b/database/deleteBurialSiteField.js index 56fa109a..39e8bc84 100644 --- a/database/deleteBurialSiteField.js +++ b/database/deleteBurialSiteField.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function deleteBurialSiteField(burialSiteId, burialSiteTypeFieldId, user, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function deleteBurialSiteField(burialSiteId, burialSiteTypeFieldId, user, connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB); const result = database .prepare(`update BurialSiteFields set recordDelete_userName = ?, @@ -9,7 +10,7 @@ export default async function deleteBurialSiteField(burialSiteId, burialSiteType and burialSiteTypeFieldId = ?`) .run(user.userName, Date.now(), burialSiteId, burialSiteTypeFieldId); if (connectedDatabase === undefined) { - database.release(); + database.close(); } return result.changes > 0; } diff --git a/database/deleteBurialSiteField.ts b/database/deleteBurialSiteField.ts index 41b49629..0f9edbb7 100644 --- a/database/deleteBurialSiteField.ts +++ b/database/deleteBurialSiteField.ts @@ -1,14 +1,14 @@ -import type { PoolConnection } from 'better-sqlite-pool' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' -export default async function deleteBurialSiteField( +export default function deleteBurialSiteField( burialSiteId: number | string, burialSiteTypeFieldId: number | string, user: User, - connectedDatabase?: PoolConnection -): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + connectedDatabase?: sqlite.Database +): boolean { + const database = connectedDatabase ?? sqlite(sunriseDB) const result = database .prepare( @@ -21,7 +21,7 @@ export default async function deleteBurialSiteField( .run(user.userName, Date.now(), burialSiteId, burialSiteTypeFieldId) if (connectedDatabase === undefined) { - database.release() + database.close() } return result.changes > 0 diff --git a/database/deleteCemetery.d.ts b/database/deleteCemetery.d.ts index 66dfcfff..6e9bb141 100644 --- a/database/deleteCemetery.d.ts +++ b/database/deleteCemetery.d.ts @@ -1 +1 @@ -export default function deleteCemetery(cemeteryId: number | string, user: User): Promise; +export default function deleteCemetery(cemeteryId: number | string, user: User): boolean; diff --git a/database/deleteCemetery.js b/database/deleteCemetery.js index e245934c..0c5e25f7 100644 --- a/database/deleteCemetery.js +++ b/database/deleteCemetery.js @@ -1,7 +1,8 @@ import { dateToInteger } from '@cityssm/utils-datetime'; -import { acquireConnection } from './pool.js'; -export default async function deleteCemetery(cemeteryId, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function deleteCemetery(cemeteryId, user) { + const database = sqlite(sunriseDB); /* * Ensure no active contracts reference the cemetery */ @@ -16,7 +17,7 @@ export default async function deleteCemetery(cemeteryId, user) { .pluck() .get(cemeteryId, currentDateInteger); if (activeContract !== undefined) { - database.release(); + database.close(); return false; } /* @@ -56,6 +57,6 @@ export default async function deleteCemetery(cemeteryId, user) { select burialSiteId from BurialSites where cemeteryId = ?) and recordDelete_timeMillis is null`) .run(user.userName, rightNowMillis, cemeteryId); - database.release(); + database.close(); return true; } diff --git a/database/deleteCemetery.ts b/database/deleteCemetery.ts index b89837a6..89281a51 100644 --- a/database/deleteCemetery.ts +++ b/database/deleteCemetery.ts @@ -1,12 +1,13 @@ import { dateToInteger } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' -export default async function deleteCemetery( +export default function deleteCemetery( cemeteryId: number | string, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) /* * Ensure no active contracts reference the cemetery @@ -27,7 +28,7 @@ export default async function deleteCemetery( .get(cemeteryId, currentDateInteger) as number | undefined if (activeContract !== undefined) { - database.release() + database.close() return false } @@ -83,7 +84,7 @@ export default async function deleteCemetery( ) .run(user.userName, rightNowMillis, cemeteryId) - database.release() + database.close() return true } diff --git a/database/deleteContractFee.d.ts b/database/deleteContractFee.d.ts index 842b3075..3229af44 100644 --- a/database/deleteContractFee.d.ts +++ b/database/deleteContractFee.d.ts @@ -1 +1 @@ -export default function deleteContractFee(contractId: number | string, feeId: number | string, user: User): Promise; +export default function deleteContractFee(contractId: number | string, feeId: number | string, user: User): boolean; diff --git a/database/deleteContractFee.js b/database/deleteContractFee.js index 39c306d7..e445123f 100644 --- a/database/deleteContractFee.js +++ b/database/deleteContractFee.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function deleteContractFee(contractId, feeId, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function deleteContractFee(contractId, feeId, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update ContractFees set recordDelete_userName = ?, @@ -8,6 +9,6 @@ export default async function deleteContractFee(contractId, feeId, user) { where contractId = ? and feeId = ?`) .run(user.userName, Date.now(), contractId, feeId); - database.release(); + database.close(); return result.changes > 0; } diff --git a/database/deleteContractFee.ts b/database/deleteContractFee.ts index 737b8458..ef150df6 100644 --- a/database/deleteContractFee.ts +++ b/database/deleteContractFee.ts @@ -1,11 +1,13 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' -export default async function deleteContractFee( +import { sunriseDB } from '../helpers/database.helpers.js' + +export default function deleteContractFee( contractId: number | string, feeId: number | string, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -17,7 +19,7 @@ export default async function deleteContractFee( ) .run(user.userName, Date.now(), contractId, feeId) - database.release() + database.close() return result.changes > 0 } diff --git a/database/deleteContractField.d.ts b/database/deleteContractField.d.ts index 679dfa75..6c859f7d 100644 --- a/database/deleteContractField.d.ts +++ b/database/deleteContractField.d.ts @@ -1,2 +1,2 @@ -import type { PoolConnection } from 'better-sqlite-pool'; -export default function deleteContractField(contractId: number | string, contractTypeFieldId: number | string, user: User, connectedDatabase?: PoolConnection): Promise; +import sqlite from 'better-sqlite3'; +export default function deleteContractField(contractId: number | string, contractTypeFieldId: number | string, user: User, connectedDatabase?: sqlite.Database): boolean; diff --git a/database/deleteContractField.js b/database/deleteContractField.js index 9c0aaa4b..97171833 100644 --- a/database/deleteContractField.js +++ b/database/deleteContractField.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function deleteContractField(contractId, contractTypeFieldId, user, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function deleteContractField(contractId, contractTypeFieldId, user, connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB); const result = database .prepare(`update ContractFields set recordDelete_userName = ?, @@ -9,7 +10,7 @@ export default async function deleteContractField(contractId, contractTypeFieldI and contractTypeFieldId = ?`) .run(user.userName, Date.now(), contractId, contractTypeFieldId); if (connectedDatabase === undefined) { - database.release(); + database.close(); } return result.changes > 0; } diff --git a/database/deleteContractField.ts b/database/deleteContractField.ts index 2484b31d..064866ce 100644 --- a/database/deleteContractField.ts +++ b/database/deleteContractField.ts @@ -1,14 +1,14 @@ -import type { PoolConnection } from 'better-sqlite-pool' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' -export default async function deleteContractField( +export default function deleteContractField( contractId: number | string, contractTypeFieldId: number | string, user: User, - connectedDatabase?: PoolConnection -): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + connectedDatabase?: sqlite.Database +): boolean { + const database = connectedDatabase ?? sqlite(sunriseDB) const result = database .prepare( @@ -21,7 +21,7 @@ export default async function deleteContractField( .run(user.userName, Date.now(), contractId, contractTypeFieldId) if (connectedDatabase === undefined) { - database.release() + database.close() } return result.changes > 0 diff --git a/database/deleteContractInterment.d.ts b/database/deleteContractInterment.d.ts index d87fb060..83e4d6ba 100644 --- a/database/deleteContractInterment.d.ts +++ b/database/deleteContractInterment.d.ts @@ -1 +1 @@ -export default function deleteContractInterment(contractId: number | string, intermentNumber: number | string, user: User): Promise; +export default function deleteContractInterment(contractId: number | string, intermentNumber: number | string, user: User): boolean; diff --git a/database/deleteContractInterment.js b/database/deleteContractInterment.js index 8c436c92..d87b3bc9 100644 --- a/database/deleteContractInterment.js +++ b/database/deleteContractInterment.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function deleteContractInterment(contractId, intermentNumber, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function deleteContractInterment(contractId, intermentNumber, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update ContractInterments set recordDelete_userName = ?, @@ -8,6 +9,6 @@ export default async function deleteContractInterment(contractId, intermentNumbe where contractId = ? and intermentNumber = ?`) .run(user.userName, Date.now(), contractId, intermentNumber); - database.release(); + database.close(); return result.changes > 0; } diff --git a/database/deleteContractInterment.ts b/database/deleteContractInterment.ts index 90426d28..0208eb4e 100644 --- a/database/deleteContractInterment.ts +++ b/database/deleteContractInterment.ts @@ -1,11 +1,13 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' -export default async function deleteContractInterment( +import { sunriseDB } from '../helpers/database.helpers.js' + +export default function deleteContractInterment( contractId: number | string, intermentNumber: number | string, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -17,7 +19,7 @@ export default async function deleteContractInterment( ) .run(user.userName, Date.now(), contractId, intermentNumber) - database.release() + database.close() return result.changes > 0 } diff --git a/database/deleteContractTransaction.d.ts b/database/deleteContractTransaction.d.ts index 422ed7a4..e9be4a25 100644 --- a/database/deleteContractTransaction.d.ts +++ b/database/deleteContractTransaction.d.ts @@ -1 +1 @@ -export default function deleteContractTransaction(contractId: number | string, transactionIndex: number | string, user: User): Promise; +export default function deleteContractTransaction(contractId: number | string, transactionIndex: number | string, user: User): boolean; diff --git a/database/deleteContractTransaction.js b/database/deleteContractTransaction.js index ccbbde7f..ee77f672 100644 --- a/database/deleteContractTransaction.js +++ b/database/deleteContractTransaction.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function deleteContractTransaction(contractId, transactionIndex, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function deleteContractTransaction(contractId, transactionIndex, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update ContractTransactions set recordDelete_userName = ?, @@ -8,6 +9,6 @@ export default async function deleteContractTransaction(contractId, transactionI where contractId = ? and transactionIndex = ?`) .run(user.userName, Date.now(), contractId, transactionIndex); - database.release(); + database.close(); return result.changes > 0; } diff --git a/database/deleteContractTransaction.ts b/database/deleteContractTransaction.ts index 3b36c19f..a71de41a 100644 --- a/database/deleteContractTransaction.ts +++ b/database/deleteContractTransaction.ts @@ -1,11 +1,13 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' -export default async function deleteContractTransaction( +import { sunriseDB } from '../helpers/database.helpers.js' + +export default function deleteContractTransaction( contractId: number | string, transactionIndex: number | string, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -17,7 +19,7 @@ export default async function deleteContractTransaction( ) .run(user.userName, Date.now(), contractId, transactionIndex) - database.release() + database.close() return result.changes > 0 } diff --git a/database/deleteContractTypePrint.d.ts b/database/deleteContractTypePrint.d.ts index 58058ccd..661d2a3d 100644 --- a/database/deleteContractTypePrint.d.ts +++ b/database/deleteContractTypePrint.d.ts @@ -1 +1 @@ -export default function deleteContractTypePrint(contractTypeId: number | string, printEJS: string, user: User): Promise; +export default function deleteContractTypePrint(contractTypeId: number | string, printEJS: string, user: User): boolean; diff --git a/database/deleteContractTypePrint.js b/database/deleteContractTypePrint.js index 776edb6f..b3d765d9 100644 --- a/database/deleteContractTypePrint.js +++ b/database/deleteContractTypePrint.js @@ -1,7 +1,8 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { clearCacheByTableName } from '../helpers/functions.cache.js'; -import { acquireConnection } from './pool.js'; -export default async function deleteContractTypePrint(contractTypeId, printEJS, user) { - const database = await acquireConnection(); +export default function deleteContractTypePrint(contractTypeId, printEJS, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update ContractTypePrints set recordDelete_userName = ?, @@ -9,7 +10,7 @@ export default async function deleteContractTypePrint(contractTypeId, printEJS, where contractTypeId = ? and printEJS = ?`) .run(user.userName, Date.now(), contractTypeId, printEJS); - database.release(); + database.close(); clearCacheByTableName('ContractTypePrints'); return result.changes > 0; } diff --git a/database/deleteContractTypePrint.ts b/database/deleteContractTypePrint.ts index 840ed211..8db3223e 100644 --- a/database/deleteContractTypePrint.ts +++ b/database/deleteContractTypePrint.ts @@ -1,13 +1,14 @@ +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' import { clearCacheByTableName } from '../helpers/functions.cache.js' -import { acquireConnection } from './pool.js' - -export default async function deleteContractTypePrint( +export default function deleteContractTypePrint( contractTypeId: number | string, printEJS: string, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -19,7 +20,7 @@ export default async function deleteContractTypePrint( ) .run(user.userName, Date.now(), contractTypeId, printEJS) - database.release() + database.close() clearCacheByTableName('ContractTypePrints') diff --git a/database/deleteRecord.d.ts b/database/deleteRecord.d.ts index 20e2f4fa..f9d40a12 100644 --- a/database/deleteRecord.d.ts +++ b/database/deleteRecord.d.ts @@ -1,3 +1,3 @@ type RecordTable = 'BurialSiteComments' | 'BurialSiteStatuses' | 'BurialSiteTypeFields' | 'BurialSiteTypes' | 'ContractComments' | 'Contracts' | 'ContractTypeFields' | 'ContractTypes' | 'FeeCategories' | 'Fees' | 'FuneralHomes' | 'WorkOrderComments' | 'WorkOrderMilestones' | 'WorkOrderMilestoneTypes' | 'WorkOrders' | 'WorkOrderTypes'; -export declare function deleteRecord(recordTable: RecordTable, recordId: number | string, user: User): Promise; +export declare function deleteRecord(recordTable: RecordTable, recordId: number | string, user: User): boolean; export {}; diff --git a/database/deleteRecord.js b/database/deleteRecord.js index 04ac335c..f6e70627 100644 --- a/database/deleteRecord.js +++ b/database/deleteRecord.js @@ -1,5 +1,6 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { clearCacheByTableName } from '../helpers/functions.cache.js'; -import { acquireConnection } from './pool.js'; const recordIdColumns = new Map([ ['BurialSiteComments', 'burialSiteCommentId'], ['BurialSiteStatuses', 'burialSiteStatusId'], @@ -32,8 +33,8 @@ const relatedTables = new Map([ ] ] ]); -export async function deleteRecord(recordTable, recordId, user) { - const database = await acquireConnection(); +export function deleteRecord(recordTable, recordId, user) { + const database = sqlite(sunriseDB); const rightNowMillis = Date.now(); const result = database .prepare(`update ${recordTable} @@ -51,7 +52,7 @@ export async function deleteRecord(recordTable, recordId, user) { and recordDelete_timeMillis is null`) .run(user.userName, rightNowMillis, recordId); } - database.release(); + database.close(); clearCacheByTableName(recordTable); return result.changes > 0; } diff --git a/database/deleteRecord.ts b/database/deleteRecord.ts index 8f188938..29f40a57 100644 --- a/database/deleteRecord.ts +++ b/database/deleteRecord.ts @@ -1,6 +1,7 @@ -import { clearCacheByTableName } from '../helpers/functions.cache.js' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' +import { clearCacheByTableName } from '../helpers/functions.cache.js' type RecordTable = | 'BurialSiteComments' @@ -54,12 +55,12 @@ const relatedTables = new Map([ ] ]) -export async function deleteRecord( +export function deleteRecord( recordTable: RecordTable, recordId: number | string, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const rightNowMillis = Date.now() @@ -85,7 +86,7 @@ export async function deleteRecord( .run(user.userName, rightNowMillis, recordId) } - database.release() + database.close() clearCacheByTableName(recordTable) diff --git a/database/deleteWorkOrderBurialSite.d.ts b/database/deleteWorkOrderBurialSite.d.ts index d4ba162c..e6c5a086 100644 --- a/database/deleteWorkOrderBurialSite.d.ts +++ b/database/deleteWorkOrderBurialSite.d.ts @@ -1 +1 @@ -export default function deleteWorkOrderBurialSite(workOrderId: number | string, burialSiteId: number | string, user: User): Promise; +export default function deleteWorkOrderBurialSite(workOrderId: number | string, burialSiteId: number | string, user: User): boolean; diff --git a/database/deleteWorkOrderBurialSite.js b/database/deleteWorkOrderBurialSite.js index 5fcd6b58..22dcbb48 100644 --- a/database/deleteWorkOrderBurialSite.js +++ b/database/deleteWorkOrderBurialSite.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function deleteWorkOrderBurialSite(workOrderId, burialSiteId, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function deleteWorkOrderBurialSite(workOrderId, burialSiteId, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update WorkOrderBurialSites set recordDelete_userName = ?, @@ -8,6 +9,6 @@ export default async function deleteWorkOrderBurialSite(workOrderId, burialSiteI where workOrderId = ? and burialSiteId = ?`) .run(user.userName, Date.now(), workOrderId, burialSiteId); - database.release(); + database.close(); return result.changes > 0; } diff --git a/database/deleteWorkOrderBurialSite.ts b/database/deleteWorkOrderBurialSite.ts index df99f5ac..8ab874c2 100644 --- a/database/deleteWorkOrderBurialSite.ts +++ b/database/deleteWorkOrderBurialSite.ts @@ -1,11 +1,13 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' -export default async function deleteWorkOrderBurialSite( +import { sunriseDB } from '../helpers/database.helpers.js' + +export default function deleteWorkOrderBurialSite( workOrderId: number | string, burialSiteId: number | string, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -17,7 +19,7 @@ export default async function deleteWorkOrderBurialSite( ) .run(user.userName, Date.now(), workOrderId, burialSiteId) - database.release() + database.close() return result.changes > 0 } diff --git a/database/deleteWorkOrderContract.d.ts b/database/deleteWorkOrderContract.d.ts index 163fe71a..1ee993ae 100644 --- a/database/deleteWorkOrderContract.d.ts +++ b/database/deleteWorkOrderContract.d.ts @@ -1 +1 @@ -export default function deleteWorkOrderContract(workOrderId: number | string, contractId: number | string, user: User): Promise; +export default function deleteWorkOrderContract(workOrderId: number | string, contractId: number | string, user: User): boolean; diff --git a/database/deleteWorkOrderContract.js b/database/deleteWorkOrderContract.js index 6ad8972d..ff566544 100644 --- a/database/deleteWorkOrderContract.js +++ b/database/deleteWorkOrderContract.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function deleteWorkOrderContract(workOrderId, contractId, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function deleteWorkOrderContract(workOrderId, contractId, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update WorkOrderContracts set recordDelete_userName = ?, @@ -8,6 +9,6 @@ export default async function deleteWorkOrderContract(workOrderId, contractId, u where workOrderId = ? and contractId = ?`) .run(user.userName, Date.now(), workOrderId, contractId); - database.release(); + database.close(); return result.changes > 0; } diff --git a/database/deleteWorkOrderContract.ts b/database/deleteWorkOrderContract.ts index 11108668..ea2f9c94 100644 --- a/database/deleteWorkOrderContract.ts +++ b/database/deleteWorkOrderContract.ts @@ -1,11 +1,13 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' -export default async function deleteWorkOrderContract( +import { sunriseDB } from '../helpers/database.helpers.js' + +export default function deleteWorkOrderContract( workOrderId: number | string, contractId: number | string, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -17,7 +19,7 @@ export default async function deleteWorkOrderContract( ) .run(user.userName, Date.now(), workOrderId, contractId) - database.release() + database.close() return result.changes > 0 } diff --git a/database/getBurialSite.js b/database/getBurialSite.js index c4e237fa..84c2819b 100644 --- a/database/getBurialSite.js +++ b/database/getBurialSite.js @@ -1,7 +1,8 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import getBurialSiteComments from './getBurialSiteComments.js'; import getBurialSiteFields from './getBurialSiteFields.js'; import getContracts from './getContracts.js'; -import { acquireConnection } from './pool.js'; const baseSQL = `select l.burialSiteId, l.burialSiteTypeId, t.burialSiteType, l.burialSiteNameSegment1, @@ -29,7 +30,7 @@ export async function getBurialSiteByBurialSiteName(burialSiteName) { return await _getBurialSite(`${baseSQL} and l.burialSiteName = ?`, burialSiteName); } async function _getBurialSite(sql, burialSiteIdOrLotName) { - const database = await acquireConnection(); + const database = sqlite(sunriseDB); const burialSite = database.prepare(sql).get(burialSiteIdOrLotName); if (burialSite !== undefined) { const contracts = await getContracts({ @@ -42,9 +43,9 @@ async function _getBurialSite(sql, burialSiteIdOrLotName) { includeTransactions: false }, database); burialSite.contracts = contracts.contracts; - burialSite.burialSiteFields = await getBurialSiteFields(burialSite.burialSiteId, database); - burialSite.burialSiteComments = await getBurialSiteComments(burialSite.burialSiteId, database); + burialSite.burialSiteFields = getBurialSiteFields(burialSite.burialSiteId, database); + burialSite.burialSiteComments = getBurialSiteComments(burialSite.burialSiteId, database); } - database.release(); + database.close(); return burialSite; } diff --git a/database/getBurialSite.ts b/database/getBurialSite.ts index 92c8d379..3d42771d 100644 --- a/database/getBurialSite.ts +++ b/database/getBurialSite.ts @@ -1,9 +1,11 @@ +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' import type { BurialSite } from '../types/record.types.js' import getBurialSiteComments from './getBurialSiteComments.js' import getBurialSiteFields from './getBurialSiteFields.js' import getContracts from './getContracts.js' -import { acquireConnection } from './pool.js' const baseSQL = `select l.burialSiteId, l.burialSiteTypeId, t.burialSiteType, @@ -45,7 +47,7 @@ async function _getBurialSite( sql: string, burialSiteIdOrLotName: number | string ): Promise { - const database = await acquireConnection() + const database = sqlite(sunriseDB) const burialSite = database.prepare(sql).get(burialSiteIdOrLotName) as | BurialSite @@ -69,18 +71,18 @@ async function _getBurialSite( burialSite.contracts = contracts.contracts - burialSite.burialSiteFields = await getBurialSiteFields( + burialSite.burialSiteFields = getBurialSiteFields( burialSite.burialSiteId, database ) - burialSite.burialSiteComments = await getBurialSiteComments( + burialSite.burialSiteComments = getBurialSiteComments( burialSite.burialSiteId, database ) } - database.release() + database.close() return burialSite } diff --git a/database/getBurialSiteComments.d.ts b/database/getBurialSiteComments.d.ts index 527aa88b..be7fe2f2 100644 --- a/database/getBurialSiteComments.d.ts +++ b/database/getBurialSiteComments.d.ts @@ -1,3 +1,3 @@ -import type { PoolConnection } from 'better-sqlite-pool'; +import sqlite from 'better-sqlite3'; import type { BurialSiteComment } from '../types/record.types.js'; -export default function getBurialSiteComments(burialSiteId: number | string, connectedDatabase?: PoolConnection): Promise; +export default function getBurialSiteComments(burialSiteId: number | string, connectedDatabase?: sqlite.Database): BurialSiteComment[]; diff --git a/database/getBurialSiteComments.js b/database/getBurialSiteComments.js index 1fb507bc..39c4c5d0 100644 --- a/database/getBurialSiteComments.js +++ b/database/getBurialSiteComments.js @@ -1,7 +1,8 @@ import { dateIntegerToString, timeIntegerToPeriodString, timeIntegerToString } from '@cityssm/utils-datetime'; -import { acquireConnection } from './pool.js'; -export default async function getBurialSiteComments(burialSiteId, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function getBurialSiteComments(burialSiteId, connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }); database.function('userFn_dateIntegerToString', dateIntegerToString); database.function('userFn_timeIntegerToString', timeIntegerToString); database.function('userFn_timeIntegerToPeriodString', timeIntegerToPeriodString); @@ -19,7 +20,7 @@ export default async function getBurialSiteComments(burialSiteId, connectedDatab order by commentDate desc, commentTime desc, burialSiteCommentId desc`) .all(burialSiteId); if (connectedDatabase === undefined) { - database.release(); + database.close(); } return comments; } diff --git a/database/getBurialSiteComments.ts b/database/getBurialSiteComments.ts index a563e1bb..f745e1bb 100644 --- a/database/getBurialSiteComments.ts +++ b/database/getBurialSiteComments.ts @@ -1,20 +1,18 @@ -import type { PoolConnection } from 'better-sqlite-pool' - import { dateIntegerToString, timeIntegerToPeriodString, timeIntegerToString } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' +import { sunriseDB } from '../helpers/database.helpers.js' import type { BurialSiteComment } from '../types/record.types.js' -import { acquireConnection } from './pool.js' - -export default async function getBurialSiteComments( +export default function getBurialSiteComments( burialSiteId: number | string, - connectedDatabase?: PoolConnection -): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + connectedDatabase?: sqlite.Database +): BurialSiteComment[] { + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }) database.function('userFn_dateIntegerToString', dateIntegerToString) database.function('userFn_timeIntegerToString', timeIntegerToString) @@ -40,7 +38,7 @@ export default async function getBurialSiteComments( .all(burialSiteId) as BurialSiteComment[] if (connectedDatabase === undefined) { - database.release() + database.close() } return comments diff --git a/database/getBurialSiteFields.d.ts b/database/getBurialSiteFields.d.ts index a46c6477..34806e70 100644 --- a/database/getBurialSiteFields.d.ts +++ b/database/getBurialSiteFields.d.ts @@ -1,3 +1,3 @@ -import type { PoolConnection } from 'better-sqlite-pool'; +import sqlite from 'better-sqlite3'; import type { BurialSiteField } from '../types/record.types.js'; -export default function getBurialSiteFields(burialSiteId: number | string, connectedDatabase?: PoolConnection): Promise; +export default function getBurialSiteFields(burialSiteId: number | string, connectedDatabase?: sqlite.Database): BurialSiteField[]; diff --git a/database/getBurialSiteFields.js b/database/getBurialSiteFields.js index 13f4b4d9..4858df7f 100644 --- a/database/getBurialSiteFields.js +++ b/database/getBurialSiteFields.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function getBurialSiteFields(burialSiteId, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function getBurialSiteFields(burialSiteId, connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }); const burialSiteFields = database .prepare(`select l.burialSiteId, l.burialSiteTypeFieldId, l.fieldValue, @@ -30,7 +31,7 @@ export default async function getBurialSiteFields(burialSiteId, connectedDatabas order by burialSiteTypeOrderNumber, f.orderNumber, f.burialSiteTypeField`) .all(burialSiteId, burialSiteId, burialSiteId, burialSiteId); if (connectedDatabase === undefined) { - database.release(); + database.close(); } return burialSiteFields; } diff --git a/database/getBurialSiteFields.ts b/database/getBurialSiteFields.ts index c3fefe07..111893c7 100644 --- a/database/getBurialSiteFields.ts +++ b/database/getBurialSiteFields.ts @@ -1,14 +1,13 @@ -import type { PoolConnection } from 'better-sqlite-pool' +import sqlite from 'better-sqlite3' +import { sunriseDB } from '../helpers/database.helpers.js' import type { BurialSiteField } from '../types/record.types.js' -import { acquireConnection } from './pool.js' - -export default async function getBurialSiteFields( +export default function getBurialSiteFields( burialSiteId: number | string, - connectedDatabase?: PoolConnection -): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + connectedDatabase?: sqlite.Database +): BurialSiteField[] { + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }) const burialSiteFields = database .prepare( @@ -47,7 +46,7 @@ export default async function getBurialSiteFields( ) as BurialSiteField[] if (connectedDatabase === undefined) { - database.release() + database.close() } return burialSiteFields diff --git a/database/getBurialSiteStatusSummary.d.ts b/database/getBurialSiteStatusSummary.d.ts index 81ed792c..130cac94 100644 --- a/database/getBurialSiteStatusSummary.d.ts +++ b/database/getBurialSiteStatusSummary.d.ts @@ -1,9 +1,9 @@ import type { BurialSiteStatus } from '../types/record.types.js'; -interface GetFilters { - cemeteryId?: number | string; -} interface BurialSiteStatusSummary extends BurialSiteStatus { burialSiteCount: number; } -export default function getBurialSiteStatusSummary(filters: GetFilters): Promise; +interface GetFilters { + cemeteryId?: number | string; +} +export default function getBurialSiteStatusSummary(filters: GetFilters): BurialSiteStatusSummary[]; export {}; diff --git a/database/getBurialSiteStatusSummary.js b/database/getBurialSiteStatusSummary.js index 490627fa..62f8a795 100644 --- a/database/getBurialSiteStatusSummary.js +++ b/database/getBurialSiteStatusSummary.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function getBurialSiteStatusSummary(filters) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function getBurialSiteStatusSummary(filters) { + const database = sqlite(sunriseDB); let sqlWhereClause = ' where l.recordDelete_timeMillis is null'; const sqlParameters = []; if ((filters.cemeteryId ?? '') !== '') { @@ -16,6 +17,6 @@ export default async function getBurialSiteStatusSummary(filters) { group by s.burialSiteStatusId, s.burialSiteStatus, s.orderNumber order by s.orderNumber`) .all(sqlParameters); - database.release(); + database.close(); return statuses; } diff --git a/database/getBurialSiteStatusSummary.ts b/database/getBurialSiteStatusSummary.ts index 7354784e..ac10858f 100644 --- a/database/getBurialSiteStatusSummary.ts +++ b/database/getBurialSiteStatusSummary.ts @@ -1,19 +1,20 @@ +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' import type { BurialSiteStatus } from '../types/record.types.js' -import { acquireConnection } from './pool.js' - -interface GetFilters { - cemeteryId?: number | string -} - interface BurialSiteStatusSummary extends BurialSiteStatus { burialSiteCount: number } -export default async function getBurialSiteStatusSummary( +interface GetFilters { + cemeteryId?: number | string +} + +export default function getBurialSiteStatusSummary( filters: GetFilters -): Promise { - const database = await acquireConnection() +): BurialSiteStatusSummary[] { + const database = sqlite(sunriseDB) let sqlWhereClause = ' where l.recordDelete_timeMillis is null' const sqlParameters: unknown[] = [] @@ -35,7 +36,7 @@ export default async function getBurialSiteStatusSummary( ) .all(sqlParameters) as BurialSiteStatusSummary[] - database.release() + database.close() return statuses } diff --git a/database/getBurialSiteStatuses.d.ts b/database/getBurialSiteStatuses.d.ts index c61c5925..1b56d6a9 100644 --- a/database/getBurialSiteStatuses.d.ts +++ b/database/getBurialSiteStatuses.d.ts @@ -1,2 +1,2 @@ import type { BurialSiteStatus } from '../types/record.types.js'; -export default function getBurialSiteStatuses(): Promise; +export default function getBurialSiteStatuses(): BurialSiteStatus[]; diff --git a/database/getBurialSiteStatuses.js b/database/getBurialSiteStatuses.js index 7188b915..8ab93807 100644 --- a/database/getBurialSiteStatuses.js +++ b/database/getBurialSiteStatuses.js @@ -1,7 +1,8 @@ -import { acquireConnection } from './pool.js'; +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export default async function getBurialSiteStatuses() { - const database = await acquireConnection(); +export default function getBurialSiteStatuses() { + const database = sqlite(sunriseDB); const statuses = database .prepare(`select burialSiteStatusId, burialSiteStatus, orderNumber from BurialSiteStatuses @@ -16,6 +17,6 @@ export default async function getBurialSiteStatuses() { } expectedOrderNumber += 1; } - database.release(); + database.close(); return statuses; } diff --git a/database/getBurialSiteStatuses.ts b/database/getBurialSiteStatuses.ts index 9ed4d510..bff8c015 100644 --- a/database/getBurialSiteStatuses.ts +++ b/database/getBurialSiteStatuses.ts @@ -1,10 +1,12 @@ +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' import type { BurialSiteStatus } from '../types/record.types.js' -import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export default async function getBurialSiteStatuses(): Promise { - const database = await acquireConnection() +export default function getBurialSiteStatuses(): BurialSiteStatus[] { + const database = sqlite(sunriseDB) const statuses = database .prepare( @@ -31,7 +33,7 @@ export default async function getBurialSiteStatuses(): Promise; +export default function getBurialSiteTypeFields(burialSiteTypeId: number, connectedDatabase?: sqlite.Database): BurialSiteTypeField[]; diff --git a/database/getBurialSiteTypeFields.js b/database/getBurialSiteTypeFields.js index 1c089397..27acce46 100644 --- a/database/getBurialSiteTypeFields.js +++ b/database/getBurialSiteTypeFields.js @@ -1,7 +1,8 @@ -import { acquireConnection } from './pool.js'; +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export default async function getBurialSiteTypeFields(burialSiteTypeId, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); +export default function getBurialSiteTypeFields(burialSiteTypeId, connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB); const typeFields = database .prepare(`select burialSiteTypeFieldId, burialSiteTypeField, fieldType, fieldValues, @@ -20,7 +21,7 @@ export default async function getBurialSiteTypeFields(burialSiteTypeId, connecte expectedOrderNumber += 1; } if (connectedDatabase === undefined) { - database.release(); + database.close(); } return typeFields; } diff --git a/database/getBurialSiteTypeFields.ts b/database/getBurialSiteTypeFields.ts index 0f7dc069..257d6eed 100644 --- a/database/getBurialSiteTypeFields.ts +++ b/database/getBurialSiteTypeFields.ts @@ -1,15 +1,15 @@ -import type { PoolConnection } from 'better-sqlite-pool' +import sqlite from 'better-sqlite3' +import { sunriseDB } from '../helpers/database.helpers.js' import type { BurialSiteTypeField } from '../types/record.types.js' -import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export default async function getBurialSiteTypeFields( +export default function getBurialSiteTypeFields( burialSiteTypeId: number, - connectedDatabase?: PoolConnection -): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + connectedDatabase?: sqlite.Database +): BurialSiteTypeField[] { + const database = connectedDatabase ?? sqlite(sunriseDB) const typeFields = database .prepare( @@ -41,7 +41,7 @@ export default async function getBurialSiteTypeFields( } if (connectedDatabase === undefined) { - database.release() + database.close() } return typeFields diff --git a/database/getBurialSiteTypeSummary.d.ts b/database/getBurialSiteTypeSummary.d.ts index 57fd34ae..3757f65a 100644 --- a/database/getBurialSiteTypeSummary.d.ts +++ b/database/getBurialSiteTypeSummary.d.ts @@ -5,5 +5,5 @@ interface BurialSiteTypeSummary extends BurialSiteType { interface GetFilters { cemeteryId?: number | string; } -export default function getBurialSiteTypeSummary(filters: GetFilters): Promise; +export default function getBurialSiteTypeSummary(filters: GetFilters): BurialSiteTypeSummary[]; export {}; diff --git a/database/getBurialSiteTypeSummary.js b/database/getBurialSiteTypeSummary.js index a06ffbb3..1f8487b2 100644 --- a/database/getBurialSiteTypeSummary.js +++ b/database/getBurialSiteTypeSummary.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function getBurialSiteTypeSummary(filters) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function getBurialSiteTypeSummary(filters) { + const database = sqlite(sunriseDB, { readonly: true }); let sqlWhereClause = ' where l.recordDelete_timeMillis is null'; const sqlParameters = []; if ((filters.cemeteryId ?? '') !== '') { @@ -16,6 +17,6 @@ export default async function getBurialSiteTypeSummary(filters) { group by t.burialSiteTypeId, t.burialSiteType, t.orderNumber order by t.orderNumber`) .all(sqlParameters); - database.release(); + database.close(); return burialSiteTypes; } diff --git a/database/getBurialSiteTypeSummary.ts b/database/getBurialSiteTypeSummary.ts index 50173bbf..aa0844ad 100644 --- a/database/getBurialSiteTypeSummary.ts +++ b/database/getBurialSiteTypeSummary.ts @@ -1,6 +1,7 @@ -import type { BurialSiteType } from '../types/record.types.js' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' +import type { BurialSiteType } from '../types/record.types.js' interface BurialSiteTypeSummary extends BurialSiteType { lotCount: number @@ -10,10 +11,10 @@ interface GetFilters { cemeteryId?: number | string } -export default async function getBurialSiteTypeSummary( +export default function getBurialSiteTypeSummary( filters: GetFilters -): Promise { - const database = await acquireConnection() +): BurialSiteTypeSummary[] { + const database = sqlite(sunriseDB, { readonly: true }) let sqlWhereClause = ' where l.recordDelete_timeMillis is null' const sqlParameters: unknown[] = [] @@ -35,7 +36,7 @@ export default async function getBurialSiteTypeSummary( ) .all(sqlParameters) as BurialSiteTypeSummary[] - database.release() + database.close() return burialSiteTypes } diff --git a/database/getBurialSiteTypes.d.ts b/database/getBurialSiteTypes.d.ts index 16bf5485..c5dd3dce 100644 --- a/database/getBurialSiteTypes.d.ts +++ b/database/getBurialSiteTypes.d.ts @@ -1,2 +1,2 @@ import type { BurialSiteType } from '../types/record.types.js'; -export default function getBurialSiteTypes(): Promise; +export default function getBurialSiteTypes(): BurialSiteType[]; diff --git a/database/getBurialSiteTypes.js b/database/getBurialSiteTypes.js index bdf8dd8b..4b1424dd 100644 --- a/database/getBurialSiteTypes.js +++ b/database/getBurialSiteTypes.js @@ -1,8 +1,9 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import getBurialSiteTypeFields from './getBurialSiteTypeFields.js'; -import { acquireConnection } from './pool.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export default async function getBurialSiteTypes() { - const database = await acquireConnection(); +export default function getBurialSiteTypes() { + const database = sqlite(sunriseDB); const burialSiteTypes = database .prepare(`select burialSiteTypeId, burialSiteType, orderNumber from BurialSiteTypes @@ -16,8 +17,8 @@ export default async function getBurialSiteTypes() { updateRecordOrderNumber('BurialSiteTypes', burialSiteType.burialSiteTypeId, expectedOrderNumber, database); burialSiteType.orderNumber = expectedOrderNumber; } - burialSiteType.burialSiteTypeFields = await getBurialSiteTypeFields(burialSiteType.burialSiteTypeId, database); + burialSiteType.burialSiteTypeFields = getBurialSiteTypeFields(burialSiteType.burialSiteTypeId, database); } - database.release(); + database.close(); return burialSiteTypes; } diff --git a/database/getBurialSiteTypes.ts b/database/getBurialSiteTypes.ts index 3d18889e..d776150d 100644 --- a/database/getBurialSiteTypes.ts +++ b/database/getBurialSiteTypes.ts @@ -1,11 +1,13 @@ +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' import type { BurialSiteType } from '../types/record.types.js' import getBurialSiteTypeFields from './getBurialSiteTypeFields.js' -import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export default async function getBurialSiteTypes(): Promise { - const database = await acquireConnection() +export default function getBurialSiteTypes(): BurialSiteType[] { + const database = sqlite(sunriseDB) const burialSiteTypes = database .prepare( @@ -32,13 +34,13 @@ export default async function getBurialSiteTypes(): Promise { burialSiteType.orderNumber = expectedOrderNumber } - burialSiteType.burialSiteTypeFields = await getBurialSiteTypeFields( + burialSiteType.burialSiteTypeFields = getBurialSiteTypeFields( burialSiteType.burialSiteTypeId, database ) } - database.release() + database.close() return burialSiteTypes } diff --git a/database/getBurialSites.d.ts b/database/getBurialSites.d.ts index 3a35bdd3..cf14762e 100644 --- a/database/getBurialSites.d.ts +++ b/database/getBurialSites.d.ts @@ -1,4 +1,4 @@ -import type { PoolConnection } from 'better-sqlite-pool'; +import sqlite from 'better-sqlite3'; import type { BurialSite } from '../types/record.types.js'; export interface GetBurialSitesFilters { burialSiteNameSearchType?: '' | 'endsWith' | 'startsWith'; @@ -15,7 +15,7 @@ export interface GetBurialSitesOptions { offset: number | string; includeContractCount?: boolean; } -export default function getBurialSites(filters: GetBurialSitesFilters, options: GetBurialSitesOptions, connectedDatabase?: PoolConnection): Promise<{ +export default function getBurialSites(filters: GetBurialSitesFilters, options: GetBurialSitesOptions, connectedDatabase?: sqlite.Database): { count: number; burialSites: BurialSite[]; -}>; +}; diff --git a/database/getBurialSites.js b/database/getBurialSites.js index 3242581d..2240db66 100644 --- a/database/getBurialSites.js +++ b/database/getBurialSites.js @@ -1,45 +1,9 @@ import { dateToInteger } from '@cityssm/utils-datetime'; +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { getBurialSiteNameWhereClause } from '../helpers/functions.sqlFilters.js'; -import { acquireConnection } from './pool.js'; -function buildWhereClause(filters) { - let sqlWhereClause = ' where l.recordDelete_timeMillis is null'; - const sqlParameters = []; - const burialSiteNameFilters = getBurialSiteNameWhereClause(filters.burialSiteName, filters.burialSiteNameSearchType ?? '', 'l'); - sqlWhereClause += burialSiteNameFilters.sqlWhereClause; - sqlParameters.push(...burialSiteNameFilters.sqlParameters); - if ((filters.cemeteryId ?? '') !== '') { - sqlWhereClause += ' and (m.cemeteryId = ? or m.parentCemeteryId = ?)'; - sqlParameters.push(filters.cemeteryId, filters.cemeteryId); - } - if ((filters.burialSiteTypeId ?? '') !== '') { - sqlWhereClause += ' and l.burialSiteTypeId = ?'; - sqlParameters.push(filters.burialSiteTypeId); - } - if ((filters.burialSiteStatusId ?? '') !== '') { - sqlWhereClause += ' and l.burialSiteStatusId = ?'; - sqlParameters.push(filters.burialSiteStatusId); - } - if ((filters.contractStatus ?? '') !== '') { - if (filters.contractStatus === 'occupied') { - sqlWhereClause += ' and contractCount > 0'; - } - else if (filters.contractStatus === 'unoccupied') { - sqlWhereClause += - ' and (contractCount is null or contractCount = 0)'; - } - } - if ((filters.workOrderId ?? '') !== '') { - sqlWhereClause += - ' and l.burialSiteId in (select burialSiteId from WorkOrderBurialSites where recordDelete_timeMillis is null and workOrderId = ?)'; - sqlParameters.push(filters.workOrderId); - } - return { - sqlWhereClause, - sqlParameters - }; -} -export default async function getBurialSites(filters, options, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); +export default function getBurialSites(filters, options, connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }); const { sqlWhereClause, sqlParameters } = buildWhereClause(filters); const currentDate = dateToInteger(new Date()); let count = 0; @@ -103,10 +67,46 @@ export default async function getBurialSites(filters, options, connectedDatabase } } if (connectedDatabase === undefined) { - database.release(); + database.close(); } return { count, burialSites }; } +function buildWhereClause(filters) { + let sqlWhereClause = ' where l.recordDelete_timeMillis is null'; + const sqlParameters = []; + const burialSiteNameFilters = getBurialSiteNameWhereClause(filters.burialSiteName, filters.burialSiteNameSearchType ?? '', 'l'); + sqlWhereClause += burialSiteNameFilters.sqlWhereClause; + sqlParameters.push(...burialSiteNameFilters.sqlParameters); + if ((filters.cemeteryId ?? '') !== '') { + sqlWhereClause += ' and (m.cemeteryId = ? or m.parentCemeteryId = ?)'; + sqlParameters.push(filters.cemeteryId, filters.cemeteryId); + } + if ((filters.burialSiteTypeId ?? '') !== '') { + sqlWhereClause += ' and l.burialSiteTypeId = ?'; + sqlParameters.push(filters.burialSiteTypeId); + } + if ((filters.burialSiteStatusId ?? '') !== '') { + sqlWhereClause += ' and l.burialSiteStatusId = ?'; + sqlParameters.push(filters.burialSiteStatusId); + } + if ((filters.contractStatus ?? '') !== '') { + if (filters.contractStatus === 'occupied') { + sqlWhereClause += ' and contractCount > 0'; + } + else if (filters.contractStatus === 'unoccupied') { + sqlWhereClause += ' and (contractCount is null or contractCount = 0)'; + } + } + if ((filters.workOrderId ?? '') !== '') { + sqlWhereClause += + ' and l.burialSiteId in (select burialSiteId from WorkOrderBurialSites where recordDelete_timeMillis is null and workOrderId = ?)'; + sqlParameters.push(filters.workOrderId); + } + return { + sqlParameters, + sqlWhereClause + }; +} diff --git a/database/getBurialSites.ts b/database/getBurialSites.ts index a23ba6f7..20ad86de 100644 --- a/database/getBurialSites.ts +++ b/database/getBurialSites.ts @@ -1,12 +1,10 @@ -import type { PoolConnection } from 'better-sqlite-pool' - import { dateToInteger } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' +import { sunriseDB } from '../helpers/database.helpers.js' import { getBurialSiteNameWhereClause } from '../helpers/functions.sqlFilters.js' import type { BurialSite } from '../types/record.types.js' -import { acquireConnection } from './pool.js' - export interface GetBurialSitesFilters { burialSiteNameSearchType?: '' | 'endsWith' | 'startsWith' burialSiteName?: string @@ -21,66 +19,16 @@ export interface GetBurialSitesOptions { /** -1 for no limit */ limit: number offset: number | string + includeContractCount?: boolean } -function buildWhereClause(filters: GetBurialSitesFilters): { - sqlWhereClause: string - sqlParameters: unknown[] -} { - let sqlWhereClause = ' where l.recordDelete_timeMillis is null' - const sqlParameters: unknown[] = [] - - const burialSiteNameFilters = getBurialSiteNameWhereClause( - filters.burialSiteName, - filters.burialSiteNameSearchType ?? '', - 'l' - ) - sqlWhereClause += burialSiteNameFilters.sqlWhereClause - sqlParameters.push(...burialSiteNameFilters.sqlParameters) - - if ((filters.cemeteryId ?? '') !== '') { - sqlWhereClause += ' and (m.cemeteryId = ? or m.parentCemeteryId = ?)' - sqlParameters.push(filters.cemeteryId, filters.cemeteryId) - } - - if ((filters.burialSiteTypeId ?? '') !== '') { - sqlWhereClause += ' and l.burialSiteTypeId = ?' - sqlParameters.push(filters.burialSiteTypeId) - } - - if ((filters.burialSiteStatusId ?? '') !== '') { - sqlWhereClause += ' and l.burialSiteStatusId = ?' - sqlParameters.push(filters.burialSiteStatusId) - } - - if ((filters.contractStatus ?? '') !== '') { - if (filters.contractStatus === 'occupied') { - sqlWhereClause += ' and contractCount > 0' - } else if (filters.contractStatus === 'unoccupied') { - sqlWhereClause += - ' and (contractCount is null or contractCount = 0)' - } - } - - if ((filters.workOrderId ?? '') !== '') { - sqlWhereClause += - ' and l.burialSiteId in (select burialSiteId from WorkOrderBurialSites where recordDelete_timeMillis is null and workOrderId = ?)' - sqlParameters.push(filters.workOrderId) - } - - return { - sqlWhereClause, - sqlParameters - } -} - -export default async function getBurialSites( +export default function getBurialSites( filters: GetBurialSitesFilters, options: GetBurialSitesOptions, - connectedDatabase?: PoolConnection -): Promise<{ count: number; burialSites: BurialSite[] }> { - const database = connectedDatabase ?? (await acquireConnection()) + connectedDatabase?: sqlite.Database +): { count: number; burialSites: BurialSite[] } { + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }) const { sqlWhereClause, sqlParameters } = buildWhereClause(filters) @@ -166,7 +114,7 @@ export default async function getBurialSites( } if (connectedDatabase === undefined) { - database.release() + database.close() } return { @@ -174,3 +122,53 @@ export default async function getBurialSites( burialSites } } + +function buildWhereClause(filters: GetBurialSitesFilters): { + sqlParameters: unknown[] + sqlWhereClause: string +} { + let sqlWhereClause = ' where l.recordDelete_timeMillis is null' + const sqlParameters: unknown[] = [] + + const burialSiteNameFilters = getBurialSiteNameWhereClause( + filters.burialSiteName, + filters.burialSiteNameSearchType ?? '', + 'l' + ) + sqlWhereClause += burialSiteNameFilters.sqlWhereClause + sqlParameters.push(...burialSiteNameFilters.sqlParameters) + + if ((filters.cemeteryId ?? '') !== '') { + sqlWhereClause += ' and (m.cemeteryId = ? or m.parentCemeteryId = ?)' + sqlParameters.push(filters.cemeteryId, filters.cemeteryId) + } + + if ((filters.burialSiteTypeId ?? '') !== '') { + sqlWhereClause += ' and l.burialSiteTypeId = ?' + sqlParameters.push(filters.burialSiteTypeId) + } + + if ((filters.burialSiteStatusId ?? '') !== '') { + sqlWhereClause += ' and l.burialSiteStatusId = ?' + sqlParameters.push(filters.burialSiteStatusId) + } + + if ((filters.contractStatus ?? '') !== '') { + if (filters.contractStatus === 'occupied') { + sqlWhereClause += ' and contractCount > 0' + } else if (filters.contractStatus === 'unoccupied') { + sqlWhereClause += ' and (contractCount is null or contractCount = 0)' + } + } + + if ((filters.workOrderId ?? '') !== '') { + sqlWhereClause += + ' and l.burialSiteId in (select burialSiteId from WorkOrderBurialSites where recordDelete_timeMillis is null and workOrderId = ?)' + sqlParameters.push(filters.workOrderId) + } + + return { + sqlParameters, + sqlWhereClause + } +} diff --git a/database/getCemeteries.d.ts b/database/getCemeteries.d.ts index 94cbaaec..0d649e27 100644 --- a/database/getCemeteries.d.ts +++ b/database/getCemeteries.d.ts @@ -1,4 +1,5 @@ +import sqlite from 'better-sqlite3'; import type { Cemetery } from '../types/record.types.js'; export default function getCemeteries(filters?: { parentCemeteryId?: number | string; -}): Promise; +}, connectedDatabase?: sqlite.Database): Cemetery[]; diff --git a/database/getCemeteries.js b/database/getCemeteries.js index 6839f1d8..9c498770 100644 --- a/database/getCemeteries.js +++ b/database/getCemeteries.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function getCemeteries(filters) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function getCemeteries(filters, connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }); const sqlParameters = []; if (filters?.parentCemeteryId !== undefined) { sqlParameters.push(filters.parentCemeteryId); @@ -24,6 +25,8 @@ export default async function getCemeteries(filters) { p.cemeteryId, p.cemeteryName order by m.cemeteryName, m.cemeteryId`) .all(sqlParameters); - database.release(); + if (connectedDatabase === undefined) { + database.close(); + } return cemeteries; } diff --git a/database/getCemeteries.ts b/database/getCemeteries.ts index bd0ad948..a9802932 100644 --- a/database/getCemeteries.ts +++ b/database/getCemeteries.ts @@ -1,12 +1,15 @@ +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' import type { Cemetery } from '../types/record.types.js' -import { acquireConnection } from './pool.js' - -export default async function getCemeteries(filters?: { - parentCemeteryId?: number | string -} -): Promise { - const database = await acquireConnection() +export default function getCemeteries( + filters?: { + parentCemeteryId?: number | string + }, + connectedDatabase?: sqlite.Database +): Cemetery[] { + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }) const sqlParameters: Array = [] @@ -36,7 +39,9 @@ export default async function getCemeteries(filters?: { ) .all(sqlParameters) as Cemetery[] - database.release() + if (connectedDatabase === undefined) { + database.close() + } return cemeteries } diff --git a/database/getCemetery.d.ts b/database/getCemetery.d.ts index 7c36df82..b6f954b9 100644 --- a/database/getCemetery.d.ts +++ b/database/getCemetery.d.ts @@ -1,4 +1,4 @@ -import type { PoolConnection } from 'better-sqlite-pool'; +import sqlite from 'better-sqlite3'; import type { Cemetery } from '../types/record.types.js'; -export default function getCemetery(cemeteryId: number | string, connectedDatabase?: PoolConnection): Promise; -export declare function getCemeteryByKey(cemeteryKey: string, connectedDatabase?: PoolConnection): Promise; +export default function getCemetery(cemeteryId: number | string, connectedDatabase?: sqlite.Database): Cemetery | undefined; +export declare function getCemeteryByKey(cemeteryKey: string, connectedDatabase?: sqlite.Database): Cemetery | undefined; diff --git a/database/getCemetery.js b/database/getCemetery.js index 05047231..88b4315d 100644 --- a/database/getCemetery.js +++ b/database/getCemetery.js @@ -1,13 +1,14 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import getCemeteries from './getCemeteries.js'; -import { acquireConnection } from './pool.js'; -export default async function getCemetery(cemeteryId, connectedDatabase) { - return await _getCemetery('cemeteryId', cemeteryId, connectedDatabase); +export default function getCemetery(cemeteryId, connectedDatabase) { + return _getCemetery('cemeteryId', cemeteryId, connectedDatabase); } -export async function getCemeteryByKey(cemeteryKey, connectedDatabase) { - return await _getCemetery('cemeteryKey', cemeteryKey, connectedDatabase); +export function getCemeteryByKey(cemeteryKey, connectedDatabase) { + return _getCemetery('cemeteryKey', cemeteryKey, connectedDatabase); } -async function _getCemetery(keyColumn, cemeteryIdOrKey, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); +function _getCemetery(keyColumn, cemeteryIdOrKey, connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB); const cemetery = database .prepare(`select m.cemeteryId, m.cemeteryName, m.cemeteryKey, m.cemeteryDescription, m.cemeteryLatitude, m.cemeteryLongitude, m.cemeterySvg, @@ -39,11 +40,11 @@ async function _getCemetery(keyColumn, cemeteryIdOrKey, connectedDatabase) { if (cemetery !== undefined) { cemetery.childCemeteries = cemetery.parentCemeteryId === null - ? await getCemeteries({ parentCemeteryId: cemetery.cemeteryId }) + ? getCemeteries({ parentCemeteryId: cemetery.cemeteryId }, connectedDatabase) : []; } if (connectedDatabase === undefined) { - database.release(); + database.close(); } return cemetery; } diff --git a/database/getCemetery.ts b/database/getCemetery.ts index df7993dd..5e44d51c 100644 --- a/database/getCemetery.ts +++ b/database/getCemetery.ts @@ -1,30 +1,30 @@ -import type { PoolConnection } from 'better-sqlite-pool' +import sqlite from 'better-sqlite3' +import { sunriseDB } from '../helpers/database.helpers.js' import type { Cemetery } from '../types/record.types.js' import getCemeteries from './getCemeteries.js' -import { acquireConnection } from './pool.js' -export default async function getCemetery( +export default function getCemetery( cemeteryId: number | string, - connectedDatabase?: PoolConnection -): Promise { - return await _getCemetery('cemeteryId', cemeteryId, connectedDatabase) + connectedDatabase?: sqlite.Database +): Cemetery | undefined { + return _getCemetery('cemeteryId', cemeteryId, connectedDatabase) } -export async function getCemeteryByKey( +export function getCemeteryByKey( cemeteryKey: string, - connectedDatabase?: PoolConnection -): Promise { - return await _getCemetery('cemeteryKey', cemeteryKey, connectedDatabase) + connectedDatabase?: sqlite.Database +): Cemetery | undefined { + return _getCemetery('cemeteryKey', cemeteryKey, connectedDatabase) } -async function _getCemetery( +function _getCemetery( keyColumn: 'cemeteryId' | 'cemeteryKey', cemeteryIdOrKey: number | string, - connectedDatabase?: PoolConnection -): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + connectedDatabase?: sqlite.Database +): Cemetery | undefined { + const database = connectedDatabase ?? sqlite(sunriseDB) const cemetery = database .prepare( @@ -60,12 +60,15 @@ async function _getCemetery( if (cemetery !== undefined) { cemetery.childCemeteries = cemetery.parentCemeteryId === null - ? await getCemeteries({ parentCemeteryId: cemetery.cemeteryId }) + ? getCemeteries( + { parentCemeteryId: cemetery.cemeteryId }, + connectedDatabase + ) : [] } if (connectedDatabase === undefined) { - database.release() + database.close() } return cemetery diff --git a/database/getCommittalTypes.d.ts b/database/getCommittalTypes.d.ts index c75426b1..5d83bfef 100644 --- a/database/getCommittalTypes.d.ts +++ b/database/getCommittalTypes.d.ts @@ -1,2 +1,2 @@ import type { CommittalType } from '../types/record.types.js'; -export default function getCommittalTypes(): Promise; +export default function getCommittalTypes(): CommittalType[]; diff --git a/database/getCommittalTypes.js b/database/getCommittalTypes.js index 831a6ba7..125efeaa 100644 --- a/database/getCommittalTypes.js +++ b/database/getCommittalTypes.js @@ -1,7 +1,8 @@ -import { acquireConnection } from './pool.js'; +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export default async function getCommittalTypes() { - const database = await acquireConnection(); +export default function getCommittalTypes() { + const database = sqlite(sunriseDB); const committalTypes = database .prepare(`select committalTypeId, committalTypeKey, committalType, orderNumber from CommittalTypes @@ -16,6 +17,6 @@ export default async function getCommittalTypes() { committalType.orderNumber = expectedOrderNumber; } } - database.release(); + database.close(); return committalTypes; } diff --git a/database/getCommittalTypes.ts b/database/getCommittalTypes.ts index 057c33d0..08f787dd 100644 --- a/database/getCommittalTypes.ts +++ b/database/getCommittalTypes.ts @@ -1,10 +1,12 @@ +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' import type { CommittalType } from '../types/record.types.js' -import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export default async function getCommittalTypes(): Promise { - const database = await acquireConnection() +export default function getCommittalTypes(): CommittalType[] { + const database = sqlite(sunriseDB) const committalTypes = database .prepare( @@ -32,7 +34,7 @@ export default async function getCommittalTypes(): Promise { } } - database.release() + database.close() return committalTypes } diff --git a/database/getContract.d.ts b/database/getContract.d.ts index 5e706afc..897dcaa2 100644 --- a/database/getContract.d.ts +++ b/database/getContract.d.ts @@ -1,3 +1,3 @@ -import type { PoolConnection } from 'better-sqlite-pool'; +import sqlite from 'better-sqlite3'; import type { Contract } from '../types/record.types.js'; -export default function getContract(contractId: number | string, connectedDatabase?: PoolConnection): Promise; +export default function getContract(contractId: number | string, connectedDatabase?: sqlite.Database): Promise; diff --git a/database/getContract.js b/database/getContract.js index f982afb2..4bf69770 100644 --- a/database/getContract.js +++ b/database/getContract.js @@ -1,13 +1,14 @@ import { dateIntegerToString, timeIntegerToPeriodString, timeIntegerToString } from '@cityssm/utils-datetime'; +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import getContractComments from './getContractComments.js'; import getContractFees from './getContractFees.js'; import getContractFields from './getContractFields.js'; import getContractInterments from './getContractInterments.js'; import getContractTransactions from './getContractTransactions.js'; import { getWorkOrders } from './getWorkOrders.js'; -import { acquireConnection } from './pool.js'; export default async function getContract(contractId, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); + const database = connectedDatabase ?? sqlite(sunriseDB); database.function('userFn_dateIntegerToString', dateIntegerToString); database.function('userFn_timeIntegerToString', timeIntegerToString); database.function('userFn_timeIntegerToPeriodString', timeIntegerToPeriodString); @@ -40,10 +41,10 @@ export default async function getContract(contractId, connectedDatabase) { and o.contractId = ?`) .get(contractId); if (contract !== undefined) { - contract.contractFields = await getContractFields(contractId, database); - contract.contractInterments = await getContractInterments(contractId, database); - contract.contractComments = await getContractComments(contractId, database); - contract.contractFees = await getContractFees(contractId, database); + contract.contractFields = getContractFields(contractId, database); + contract.contractInterments = getContractInterments(contractId, database); + contract.contractComments = getContractComments(contractId, database); + contract.contractFees = getContractFees(contractId, database); contract.contractTransactions = await getContractTransactions(contractId, { includeIntegrations: true }, database); const workOrdersResults = await getWorkOrders({ contractId @@ -54,7 +55,7 @@ export default async function getContract(contractId, connectedDatabase) { contract.workOrders = workOrdersResults.workOrders; } if (connectedDatabase === undefined) { - database.release(); + database.close(); } return contract; } diff --git a/database/getContract.ts b/database/getContract.ts index 4b951c57..53215ec1 100644 --- a/database/getContract.ts +++ b/database/getContract.ts @@ -1,7 +1,11 @@ -import type { PoolConnection } from 'better-sqlite-pool' - -import { dateIntegerToString, timeIntegerToPeriodString, timeIntegerToString } from '@cityssm/utils-datetime' +import { + dateIntegerToString, + timeIntegerToPeriodString, + timeIntegerToString +} from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' +import { sunriseDB } from '../helpers/database.helpers.js' import type { Contract } from '../types/record.types.js' import getContractComments from './getContractComments.js' @@ -10,17 +14,19 @@ import getContractFields from './getContractFields.js' import getContractInterments from './getContractInterments.js' import getContractTransactions from './getContractTransactions.js' import { getWorkOrders } from './getWorkOrders.js' -import { acquireConnection } from './pool.js' export default async function getContract( contractId: number | string, - connectedDatabase?: PoolConnection + connectedDatabase?: sqlite.Database ): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + const database = connectedDatabase ?? sqlite(sunriseDB) database.function('userFn_dateIntegerToString', dateIntegerToString) database.function('userFn_timeIntegerToString', timeIntegerToString) - database.function('userFn_timeIntegerToPeriodString', timeIntegerToPeriodString) + database.function( + 'userFn_timeIntegerToPeriodString', + timeIntegerToPeriodString + ) const contract = database .prepare( @@ -54,15 +60,12 @@ export default async function getContract( .get(contractId) as Contract | undefined if (contract !== undefined) { - contract.contractFields = await getContractFields(contractId, database) + contract.contractFields = getContractFields(contractId, database) - contract.contractInterments = await getContractInterments( - contractId, - database - ) + contract.contractInterments = getContractInterments(contractId, database) - contract.contractComments = await getContractComments(contractId, database) - contract.contractFees = await getContractFees(contractId, database) + contract.contractComments = getContractComments(contractId, database) + contract.contractFees = getContractFees(contractId, database) contract.contractTransactions = await getContractTransactions( contractId, { includeIntegrations: true }, @@ -84,7 +87,7 @@ export default async function getContract( } if (connectedDatabase === undefined) { - database.release() + database.close() } return contract diff --git a/database/getContractComments.d.ts b/database/getContractComments.d.ts index 1827b54f..37970a33 100644 --- a/database/getContractComments.d.ts +++ b/database/getContractComments.d.ts @@ -1,3 +1,3 @@ -import type { PoolConnection } from 'better-sqlite-pool'; +import sqlite from 'better-sqlite3'; import type { ContractComment } from '../types/record.types.js'; -export default function getContractComments(contractId: number | string, connectedDatabase?: PoolConnection): Promise; +export default function getContractComments(contractId: number | string, connectedDatabase?: sqlite.Database): ContractComment[]; diff --git a/database/getContractComments.js b/database/getContractComments.js index 9f62d190..4c7da533 100644 --- a/database/getContractComments.js +++ b/database/getContractComments.js @@ -1,7 +1,8 @@ import { dateIntegerToString, timeIntegerToPeriodString, timeIntegerToString } from '@cityssm/utils-datetime'; -import { acquireConnection } from './pool.js'; -export default async function getContractComments(contractId, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function getContractComments(contractId, connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }); database.function('userFn_dateIntegerToString', dateIntegerToString); database.function('userFn_timeIntegerToString', timeIntegerToString); database.function('userFn_timeIntegerToPeriodString', timeIntegerToPeriodString); @@ -19,7 +20,7 @@ export default async function getContractComments(contractId, connectedDatabase) order by commentDate desc, commentTime desc, contractCommentId desc`) .all(contractId); if (connectedDatabase === undefined) { - database.release(); + database.close(); } return comments; } diff --git a/database/getContractComments.ts b/database/getContractComments.ts index e22df4b3..b9ca7cd8 100644 --- a/database/getContractComments.ts +++ b/database/getContractComments.ts @@ -1,20 +1,18 @@ -import type { PoolConnection } from 'better-sqlite-pool' - import { dateIntegerToString, timeIntegerToPeriodString, timeIntegerToString } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' +import { sunriseDB } from '../helpers/database.helpers.js' import type { ContractComment } from '../types/record.types.js' -import { acquireConnection } from './pool.js' - -export default async function getContractComments( +export default function getContractComments( contractId: number | string, - connectedDatabase?: PoolConnection -): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + connectedDatabase?: sqlite.Database +): ContractComment[] { + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }) database.function('userFn_dateIntegerToString', dateIntegerToString) database.function('userFn_timeIntegerToString', timeIntegerToString) @@ -40,7 +38,7 @@ export default async function getContractComments( .all(contractId) as ContractComment[] if (connectedDatabase === undefined) { - database.release() + database.close() } return comments diff --git a/database/getContractFees.d.ts b/database/getContractFees.d.ts index d0e2f691..608bfab2 100644 --- a/database/getContractFees.d.ts +++ b/database/getContractFees.d.ts @@ -1,3 +1,3 @@ -import type { PoolConnection } from 'better-sqlite-pool'; +import sqlite from 'better-sqlite3'; import type { ContractFee } from '../types/record.types.js'; -export default function getContractFees(contractId: number | string, connectedDatabase?: PoolConnection): Promise; +export default function getContractFees(contractId: number | string, connectedDatabase?: sqlite.Database): ContractFee[]; diff --git a/database/getContractFees.js b/database/getContractFees.js index 2a5dc94d..7e35e4de 100644 --- a/database/getContractFees.js +++ b/database/getContractFees.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function getContractFees(contractId, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function getContractFees(contractId, connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }); const fees = database .prepare(`select o.contractId, o.feeId, c.feeCategory, f.feeName, @@ -13,7 +14,7 @@ export default async function getContractFees(contractId, connectedDatabase) { order by o.recordCreate_timeMillis`) .all(contractId); if (connectedDatabase === undefined) { - database.release(); + database.close(); } return fees; } diff --git a/database/getContractFees.ts b/database/getContractFees.ts index 2db47223..0fac2aa6 100644 --- a/database/getContractFees.ts +++ b/database/getContractFees.ts @@ -1,14 +1,13 @@ -import type { PoolConnection } from 'better-sqlite-pool' +import sqlite from 'better-sqlite3' +import { sunriseDB } from '../helpers/database.helpers.js' import type { ContractFee } from '../types/record.types.js' -import { acquireConnection } from './pool.js' - -export default async function getContractFees( +export default function getContractFees( contractId: number | string, - connectedDatabase?: PoolConnection -): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + connectedDatabase?: sqlite.Database +): ContractFee[] { + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }) const fees = database .prepare( @@ -25,7 +24,7 @@ export default async function getContractFees( .all(contractId) as ContractFee[] if (connectedDatabase === undefined) { - database.release() + database.close() } return fees diff --git a/database/getContractFields.d.ts b/database/getContractFields.d.ts index 714f51da..120d1dd6 100644 --- a/database/getContractFields.d.ts +++ b/database/getContractFields.d.ts @@ -1,3 +1,3 @@ -import type { PoolConnection } from 'better-sqlite-pool'; +import sqlite from 'better-sqlite3'; import type { ContractField } from '../types/record.types.js'; -export default function getContractField(contractId: number | string, connectedDatabase?: PoolConnection): Promise; +export default function getContractField(contractId: number | string, connectedDatabase?: sqlite.Database): ContractField[]; diff --git a/database/getContractFields.js b/database/getContractFields.js index b3f806b2..17b65f11 100644 --- a/database/getContractFields.js +++ b/database/getContractFields.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function getContractField(contractId, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function getContractField(contractId, connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }); const fields = database .prepare(`select o.contractId, o.contractTypeFieldId, o.fieldValue, f.contractTypeField, f.fieldType, f.fieldValues, @@ -27,7 +28,7 @@ export default async function getContractField(contractId, connectedDatabase) { order by contractTypeOrderNumber, f.orderNumber, f.contractTypeField`) .all(contractId, contractId, contractId, contractId); if (connectedDatabase === undefined) { - database.release(); + database.close(); } return fields; } diff --git a/database/getContractFields.ts b/database/getContractFields.ts index 078c9f83..7f79a138 100644 --- a/database/getContractFields.ts +++ b/database/getContractFields.ts @@ -1,14 +1,13 @@ -import type { PoolConnection } from 'better-sqlite-pool' +import sqlite from 'better-sqlite3' +import { sunriseDB } from '../helpers/database.helpers.js' import type { ContractField } from '../types/record.types.js' -import { acquireConnection } from './pool.js' - -export default async function getContractField( +export default function getContractField( contractId: number | string, - connectedDatabase?: PoolConnection -): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + connectedDatabase?: sqlite.Database +): ContractField[] { + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }) const fields = database .prepare( @@ -36,15 +35,10 @@ export default async function getContractField( and f.contractTypeFieldId not in (select contractTypeFieldId from ContractFields where contractId = ? and recordDelete_timeMillis is null) order by contractTypeOrderNumber, f.orderNumber, f.contractTypeField` ) - .all( - contractId, - contractId, - contractId, - contractId - ) as ContractField[] + .all(contractId, contractId, contractId, contractId) as ContractField[] if (connectedDatabase === undefined) { - database.release() + database.close() } return fields diff --git a/database/getContractInterments.d.ts b/database/getContractInterments.d.ts index 0570f749..dfa8a7f4 100644 --- a/database/getContractInterments.d.ts +++ b/database/getContractInterments.d.ts @@ -1,3 +1,3 @@ -import type { PoolConnection } from 'better-sqlite-pool'; +import sqlite from 'better-sqlite3'; import type { ContractInterment } from '../types/record.types.js'; -export default function getContractInterments(contractId: number | string, connectedDatabase?: PoolConnection): Promise; +export default function getContractInterments(contractId: number | string, connectedDatabase?: sqlite.Database): ContractInterment[]; diff --git a/database/getContractInterments.js b/database/getContractInterments.js index 437b1748..8b0f34c2 100644 --- a/database/getContractInterments.js +++ b/database/getContractInterments.js @@ -1,7 +1,8 @@ import { dateIntegerToString } from '@cityssm/utils-datetime'; -import { acquireConnection } from './pool.js'; -export default async function getContractInterments(contractId, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function getContractInterments(contractId, connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }); database.function('userFn_dateIntegerToString', dateIntegerToString); const interments = database .prepare(`select o.contractId, o.intermentNumber, @@ -24,7 +25,7 @@ export default async function getContractInterments(contractId, connectedDatabas order by t.orderNumber, o.deceasedName, o.intermentNumber`) .all(contractId); if (connectedDatabase === undefined) { - database.release(); + database.close(); } return interments; } diff --git a/database/getContractInterments.ts b/database/getContractInterments.ts index decd7d09..7b608dc8 100644 --- a/database/getContractInterments.ts +++ b/database/getContractInterments.ts @@ -1,18 +1,14 @@ -import type { PoolConnection } from 'better-sqlite-pool' - -import { - dateIntegerToString -} from '@cityssm/utils-datetime' +import { dateIntegerToString } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' +import { sunriseDB } from '../helpers/database.helpers.js' import type { ContractInterment } from '../types/record.types.js' -import { acquireConnection } from './pool.js' - -export default async function getContractInterments( +export default function getContractInterments( contractId: number | string, - connectedDatabase?: PoolConnection -): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + connectedDatabase?: sqlite.Database +): ContractInterment[] { + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }) database.function('userFn_dateIntegerToString', dateIntegerToString) @@ -40,7 +36,7 @@ export default async function getContractInterments( .all(contractId) as ContractInterment[] if (connectedDatabase === undefined) { - database.release() + database.close() } return interments diff --git a/database/getContractTransactions.d.ts b/database/getContractTransactions.d.ts index 2192bcee..77b6a767 100644 --- a/database/getContractTransactions.d.ts +++ b/database/getContractTransactions.d.ts @@ -1,5 +1,5 @@ -import type { PoolConnection } from 'better-sqlite-pool'; +import sqlite from 'better-sqlite3'; import type { ContractTransaction } from '../types/record.types.js'; export default function GetContractTransactions(contractId: number | string, options: { includeIntegrations: boolean; -}, connectedDatabase?: PoolConnection): Promise; +}, connectedDatabase?: sqlite.Database): Promise; diff --git a/database/getContractTransactions.js b/database/getContractTransactions.js index 4101945a..ab18419a 100644 --- a/database/getContractTransactions.js +++ b/database/getContractTransactions.js @@ -1,9 +1,10 @@ import { dateIntegerToString, timeIntegerToString } from '@cityssm/utils-datetime'; +import sqlite from 'better-sqlite3'; import { getConfigProperty } from '../helpers/config.helpers.js'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { getDynamicsGPDocument } from '../helpers/functions.dynamicsGP.js'; -import { acquireConnection } from './pool.js'; export default async function GetContractTransactions(contractId, options, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }); database.function('userFn_dateIntegerToString', dateIntegerToString); database.function('userFn_timeIntegerToString', timeIntegerToString); const contractTransactions = database @@ -17,7 +18,7 @@ export default async function GetContractTransactions(contractId, options, conne order by transactionDate, transactionTime, transactionIndex`) .all(contractId); if (connectedDatabase === undefined) { - database.release(); + database.close(); } if (options.includeIntegrations && getConfigProperty('settings.dynamicsGP.integrationIsEnabled')) { diff --git a/database/getContractTransactions.ts b/database/getContractTransactions.ts index afd2fbc9..55672da7 100644 --- a/database/getContractTransactions.ts +++ b/database/getContractTransactions.ts @@ -1,24 +1,22 @@ -import type { PoolConnection } from 'better-sqlite-pool' - import { dateIntegerToString, timeIntegerToString } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' import { getConfigProperty } from '../helpers/config.helpers.js' +import { sunriseDB } from '../helpers/database.helpers.js' import { getDynamicsGPDocument } from '../helpers/functions.dynamicsGP.js' import type { ContractTransaction } from '../types/record.types.js' -import { acquireConnection } from './pool.js' - export default async function GetContractTransactions( contractId: number | string, options: { includeIntegrations: boolean }, - connectedDatabase?: PoolConnection + connectedDatabase?: sqlite.Database ): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }) database.function('userFn_dateIntegerToString', dateIntegerToString) database.function('userFn_timeIntegerToString', timeIntegerToString) @@ -37,7 +35,7 @@ export default async function GetContractTransactions( .all(contractId) as ContractTransaction[] if (connectedDatabase === undefined) { - database.release() + database.close() } if ( diff --git a/database/getContractTypeFields.d.ts b/database/getContractTypeFields.d.ts index 57ecbb99..df7aadb7 100644 --- a/database/getContractTypeFields.d.ts +++ b/database/getContractTypeFields.d.ts @@ -1,3 +1,3 @@ -import type { PoolConnection } from 'better-sqlite-pool'; +import sqlite from 'better-sqlite3'; import type { ContractTypeField } from '../types/record.types.js'; -export default function getContractTypeFields(contractTypeId?: number, connectedDatabase?: PoolConnection): Promise; +export default function getContractTypeFields(contractTypeId?: number, connectedDatabase?: sqlite.Database): ContractTypeField[]; diff --git a/database/getContractTypeFields.js b/database/getContractTypeFields.js index af8f611a..39d2c354 100644 --- a/database/getContractTypeFields.js +++ b/database/getContractTypeFields.js @@ -1,7 +1,8 @@ -import { acquireConnection } from './pool.js'; +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export default async function getContractTypeFields(contractTypeId, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); +export default function getContractTypeFields(contractTypeId, connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB); const sqlParameters = []; if ((contractTypeId ?? -1) !== -1) { sqlParameters.push(contractTypeId); @@ -25,7 +26,7 @@ export default async function getContractTypeFields(contractTypeId, connectedDat expectedOrderNumber += 1; } if (connectedDatabase === undefined) { - database.release(); + database.close(); } return contractTypeFields; } diff --git a/database/getContractTypeFields.ts b/database/getContractTypeFields.ts index 24b9907a..9337c21d 100644 --- a/database/getContractTypeFields.ts +++ b/database/getContractTypeFields.ts @@ -1,15 +1,15 @@ -import type { PoolConnection } from 'better-sqlite-pool' +import sqlite from 'better-sqlite3' +import { sunriseDB } from '../helpers/database.helpers.js' import type { ContractTypeField } from '../types/record.types.js' -import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export default async function getContractTypeFields( +export default function getContractTypeFields( contractTypeId?: number, - connectedDatabase?: PoolConnection -): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + connectedDatabase?: sqlite.Database +): ContractTypeField[] { + const database = connectedDatabase ?? sqlite(sunriseDB) const sqlParameters: unknown[] = [] @@ -50,7 +50,7 @@ export default async function getContractTypeFields( } if (connectedDatabase === undefined) { - database.release() + database.close() } return contractTypeFields diff --git a/database/getContractTypePrints.d.ts b/database/getContractTypePrints.d.ts index f50f446f..73c38e4d 100644 --- a/database/getContractTypePrints.d.ts +++ b/database/getContractTypePrints.d.ts @@ -1,2 +1,2 @@ -import type { PoolConnection } from 'better-sqlite-pool'; -export default function getContractTypePrints(contractTypeId: number, connectedDatabase?: PoolConnection): Promise; +import sqlite from 'better-sqlite3'; +export default function getContractTypePrints(contractTypeId: number, connectedDatabase?: sqlite.Database): string[]; diff --git a/database/getContractTypePrints.js b/database/getContractTypePrints.js index 4b3f227f..3cffdbe2 100644 --- a/database/getContractTypePrints.js +++ b/database/getContractTypePrints.js @@ -1,5 +1,6 @@ +import sqlite from 'better-sqlite3'; import { getConfigProperty } from '../helpers/config.helpers.js'; -import { acquireConnection } from './pool.js'; +import { sunriseDB } from '../helpers/database.helpers.js'; const availablePrints = getConfigProperty('settings.contracts.prints'); // eslint-disable-next-line @typescript-eslint/naming-convention const userFunction_configContainsPrintEJS = (printEJS) => { @@ -8,8 +9,8 @@ const userFunction_configContainsPrintEJS = (printEJS) => { } return 0; }; -export default async function getContractTypePrints(contractTypeId, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); +export default function getContractTypePrints(contractTypeId, connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB); database.function( // eslint-disable-next-line no-secrets/no-secrets 'userFn_configContainsPrintEJS', userFunction_configContainsPrintEJS); @@ -36,7 +37,7 @@ export default async function getContractTypePrints(contractTypeId, connectedDat prints.push(result.printEJS); } if (connectedDatabase === undefined) { - database.release(); + database.close(); } return prints; } diff --git a/database/getContractTypePrints.ts b/database/getContractTypePrints.ts index a96061cf..3fa0e364 100644 --- a/database/getContractTypePrints.ts +++ b/database/getContractTypePrints.ts @@ -1,8 +1,7 @@ -import type { PoolConnection } from 'better-sqlite-pool' +import sqlite from 'better-sqlite3' import { getConfigProperty } from '../helpers/config.helpers.js' - -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' const availablePrints = getConfigProperty('settings.contracts.prints') @@ -15,11 +14,11 @@ const userFunction_configContainsPrintEJS = (printEJS: string): number => { return 0 } -export default async function getContractTypePrints( +export default function getContractTypePrints( contractTypeId: number, - connectedDatabase?: PoolConnection -): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + connectedDatabase?: sqlite.Database +): string[] { + const database = connectedDatabase ?? sqlite(sunriseDB) database.function( // eslint-disable-next-line no-secrets/no-secrets @@ -60,7 +59,7 @@ export default async function getContractTypePrints( } if (connectedDatabase === undefined) { - database.release() + database.close() } return prints diff --git a/database/getContractTypes.d.ts b/database/getContractTypes.d.ts index 3ab3f17e..cc2af793 100644 --- a/database/getContractTypes.d.ts +++ b/database/getContractTypes.d.ts @@ -1,2 +1,2 @@ import type { ContractType } from '../types/record.types.js'; -export default function getContractTypes(): Promise; +export default function getContractTypes(): ContractType[]; diff --git a/database/getContractTypes.js b/database/getContractTypes.js index 6f290c4b..80a5f83a 100644 --- a/database/getContractTypes.js +++ b/database/getContractTypes.js @@ -1,9 +1,10 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import getContractTypeFields from './getContractTypeFields.js'; import getContractTypePrints from './getContractTypePrints.js'; -import { acquireConnection } from './pool.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export default async function getContractTypes() { - const database = await acquireConnection(); +export default function getContractTypes() { + const database = sqlite(sunriseDB); const contractTypes = database .prepare(`select contractTypeId, contractType, isPreneed, orderNumber from ContractTypes @@ -17,9 +18,9 @@ export default async function getContractTypes() { updateRecordOrderNumber('ContractTypes', contractType.contractTypeId, expectedOrderNumber, database); contractType.orderNumber = expectedOrderNumber; } - contractType.contractTypeFields = await getContractTypeFields(contractType.contractTypeId, database); - contractType.contractTypePrints = await getContractTypePrints(contractType.contractTypeId, database); + contractType.contractTypeFields = getContractTypeFields(contractType.contractTypeId, database); + contractType.contractTypePrints = getContractTypePrints(contractType.contractTypeId, database); } - database.release(); + database.close(); return contractTypes; } diff --git a/database/getContractTypes.ts b/database/getContractTypes.ts index fb5e89df..ae370bb9 100644 --- a/database/getContractTypes.ts +++ b/database/getContractTypes.ts @@ -1,12 +1,14 @@ +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' import type { ContractType } from '../types/record.types.js' import getContractTypeFields from './getContractTypeFields.js' import getContractTypePrints from './getContractTypePrints.js' -import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export default async function getContractTypes(): Promise { - const database = await acquireConnection() +export default function getContractTypes(): ContractType[] { + const database = sqlite(sunriseDB) const contractTypes = database .prepare( @@ -33,19 +35,18 @@ export default async function getContractTypes(): Promise { contractType.orderNumber = expectedOrderNumber } - contractType.contractTypeFields = await getContractTypeFields( + contractType.contractTypeFields = getContractTypeFields( contractType.contractTypeId, database ) - contractType.contractTypePrints = await getContractTypePrints( + contractType.contractTypePrints = getContractTypePrints( contractType.contractTypeId, database ) } - database.release() + database.close() return contractTypes } - diff --git a/database/getContracts.d.ts b/database/getContracts.d.ts index 1d4d3b52..0bda163a 100644 --- a/database/getContracts.d.ts +++ b/database/getContracts.d.ts @@ -1,5 +1,5 @@ -import type { PoolConnection } from 'better-sqlite-pool'; import { type DateString } from '@cityssm/utils-datetime'; +import sqlite from 'better-sqlite3'; import type { Contract } from '../types/record.types.js'; export interface GetContractsFilters { burialSiteId?: number | string; @@ -20,11 +20,11 @@ export interface GetContractsOptions { /** -1 for no limit */ limit: number | string; offset: number | string; - includeInterments: boolean; includeFees: boolean; + includeInterments: boolean; includeTransactions: boolean; } -export default function getContracts(filters: GetContractsFilters, options: GetContractsOptions, connectedDatabase?: PoolConnection): Promise<{ +export default function getContracts(filters: GetContractsFilters, options: GetContractsOptions, connectedDatabase?: sqlite.Database): Promise<{ count: number; contracts: Contract[]; }>; diff --git a/database/getContracts.js b/database/getContracts.js index b504e34e..cd89d487 100644 --- a/database/getContracts.js +++ b/database/getContracts.js @@ -1,13 +1,14 @@ import { dateIntegerToString, dateStringToInteger, timeIntegerToString } from '@cityssm/utils-datetime'; +import sqlite from 'better-sqlite3'; import { getConfigProperty } from '../helpers/config.helpers.js'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { getContractTypeById } from '../helpers/functions.cache.js'; import { getBurialSiteNameWhereClause, getContractTimeWhereClause, getDeceasedNameWhereClause } from '../helpers/functions.sqlFilters.js'; import getContractFees from './getContractFees.js'; import getContractInterments from './getContractInterments.js'; import getContractTransactions from './getContractTransactions.js'; -import { acquireConnection } from './pool.js'; export default async function getContracts(filters, options, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); + const database = connectedDatabase ?? sqlite(sunriseDB); database.function('userFn_dateIntegerToString', dateIntegerToString); database.function('userFn_timeIntegerToString', timeIntegerToString); const { sqlWhereClause, sqlParameters } = buildWhereClause(filters); @@ -62,7 +63,7 @@ export default async function getContracts(filters, options, connectedDatabase) count = contracts.length; } for (const contract of contracts) { - const contractType = await getContractTypeById(contract.contractTypeId); + const contractType = getContractTypeById(contract.contractTypeId); if (contractType !== undefined) { contract.printEJS = (contractType.contractTypePrints ?? []).includes('*') ? getConfigProperty('settings.contracts.prints')[0] @@ -72,7 +73,7 @@ export default async function getContracts(filters, options, connectedDatabase) } } if (connectedDatabase === undefined) { - database.release(); + database.close(); } return { count, @@ -81,13 +82,13 @@ export default async function getContracts(filters, options, connectedDatabase) } async function addInclusions(contract, options, database) { if (options.includeFees) { - contract.contractFees = await getContractFees(contract.contractId, database); + contract.contractFees = getContractFees(contract.contractId, database); } if (options.includeTransactions) { contract.contractTransactions = await getContractTransactions(contract.contractId, { includeIntegrations: false }, database); } if (options.includeInterments) { - contract.contractInterments = await getContractInterments(contract.contractId, database); + contract.contractInterments = getContractInterments(contract.contractId, database); } return contract; } @@ -151,7 +152,7 @@ function buildWhereClause(filters) { sqlParameters.push(filters.notWorkOrderId); } return { - sqlWhereClause, - sqlParameters + sqlParameters, + sqlWhereClause }; } diff --git a/database/getContracts.ts b/database/getContracts.ts index a0965e22..bd29ce5a 100644 --- a/database/getContracts.ts +++ b/database/getContracts.ts @@ -1,13 +1,13 @@ -import type { PoolConnection } from 'better-sqlite-pool' - import { type DateString, dateIntegerToString, dateStringToInteger, timeIntegerToString } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' import { getConfigProperty } from '../helpers/config.helpers.js' +import { sunriseDB } from '../helpers/database.helpers.js' import { getContractTypeById } from '../helpers/functions.cache.js' import { getBurialSiteNameWhereClause, @@ -19,7 +19,6 @@ import type { Contract } from '../types/record.types.js' import getContractFees from './getContractFees.js' import getContractInterments from './getContractInterments.js' import getContractTransactions from './getContractTransactions.js' -import { acquireConnection } from './pool.js' export interface GetContractsFilters { burialSiteId?: number | string @@ -46,17 +45,18 @@ export interface GetContractsOptions { /** -1 for no limit */ limit: number | string offset: number | string - includeInterments: boolean + includeFees: boolean + includeInterments: boolean includeTransactions: boolean } export default async function getContracts( filters: GetContractsFilters, options: GetContractsOptions, - connectedDatabase?: PoolConnection + connectedDatabase?: sqlite.Database ): Promise<{ count: number; contracts: Contract[] }> { - const database = connectedDatabase ?? (await acquireConnection()) + const database = connectedDatabase ?? sqlite(sunriseDB) database.function('userFn_dateIntegerToString', dateIntegerToString) database.function('userFn_timeIntegerToString', timeIntegerToString) @@ -129,7 +129,7 @@ export default async function getContracts( } for (const contract of contracts) { - const contractType = await getContractTypeById(contract.contractTypeId) + const contractType = getContractTypeById(contract.contractTypeId) if (contractType !== undefined) { contract.printEJS = (contractType.contractTypePrints ?? []).includes( @@ -144,7 +144,7 @@ export default async function getContracts( } if (connectedDatabase === undefined) { - database.release() + database.close() } return { @@ -156,10 +156,10 @@ export default async function getContracts( async function addInclusions( contract: Contract, options: GetContractsOptions, - database: PoolConnection + database: sqlite.Database ): Promise { if (options.includeFees) { - contract.contractFees = await getContractFees(contract.contractId, database) + contract.contractFees = getContractFees(contract.contractId, database) } if (options.includeTransactions) { @@ -171,7 +171,7 @@ async function addInclusions( } if (options.includeInterments) { - contract.contractInterments = await getContractInterments( + contract.contractInterments = getContractInterments( contract.contractId, database ) @@ -182,8 +182,8 @@ async function addInclusions( // eslint-disable-next-line complexity function buildWhereClause(filters: GetContractsFilters): { - sqlWhereClause: string sqlParameters: unknown[] + sqlWhereClause: string } { let sqlWhereClause = ' where o.recordDelete_timeMillis is null' const sqlParameters: unknown[] = [] @@ -271,7 +271,7 @@ function buildWhereClause(filters: GetContractsFilters): { } return { - sqlWhereClause, - sqlParameters + sqlParameters, + sqlWhereClause } } diff --git a/database/getFee.d.ts b/database/getFee.d.ts index d69a92c4..ebafcfbd 100644 --- a/database/getFee.d.ts +++ b/database/getFee.d.ts @@ -1,3 +1,3 @@ -import type { PoolConnection } from 'better-sqlite-pool'; +import sqlite from 'better-sqlite3'; import type { Fee } from '../types/record.types.js'; -export default function getFee(feeId: number | string, connectedDatabase?: PoolConnection): Promise; +export default function getFee(feeId: number | string, connectedDatabase?: sqlite.Database): Fee | undefined; diff --git a/database/getFee.js b/database/getFee.js index a1ab35bc..62f0418b 100644 --- a/database/getFee.js +++ b/database/getFee.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function getFee(feeId, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function getFee(feeId, connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }); const fee = database .prepare(`select f.feeId, f.feeCategoryId, c.feeCategory, @@ -19,7 +20,7 @@ export default async function getFee(feeId, connectedDatabase) { and f.feeId = ?`) .get(feeId); if (connectedDatabase === undefined) { - database.release(); + database.close(); } return fee; } diff --git a/database/getFee.ts b/database/getFee.ts index b8d5cd2a..0a010273 100644 --- a/database/getFee.ts +++ b/database/getFee.ts @@ -1,14 +1,13 @@ -import type { PoolConnection } from 'better-sqlite-pool' +import sqlite from 'better-sqlite3' +import { sunriseDB } from '../helpers/database.helpers.js' import type { Fee } from '../types/record.types.js' -import { acquireConnection } from './pool.js' - -export default async function getFee( +export default function getFee( feeId: number | string, - connectedDatabase?: PoolConnection -): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + connectedDatabase?: sqlite.Database +): Fee | undefined { + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }) const fee = database .prepare( @@ -31,7 +30,7 @@ export default async function getFee( .get(feeId) as Fee | undefined if (connectedDatabase === undefined) { - database.release() + database.close() } return fee diff --git a/database/getFeeCategories.d.ts b/database/getFeeCategories.d.ts index aa7b34f7..0bd73ba1 100644 --- a/database/getFeeCategories.d.ts +++ b/database/getFeeCategories.d.ts @@ -1,4 +1,4 @@ -import type { PoolConnection } from 'better-sqlite-pool'; +import sqlite from 'better-sqlite3'; import type { FeeCategory } from '../types/record.types.js'; interface GetFeeCategoriesFilters { burialSiteTypeId?: number | string; @@ -8,6 +8,6 @@ interface GetFeeCategoriesFilters { interface GetFeeCategoriesOptions { includeFees?: boolean; } -export default function getFeeCategories(filters: GetFeeCategoriesFilters, options: GetFeeCategoriesOptions, connectedDatabase?: PoolConnection): Promise; -export declare function getFeeCategory(feeCategoryId: number | string, connectedDatabase?: PoolConnection): Promise; +export default function getFeeCategories(filters: GetFeeCategoriesFilters, options: GetFeeCategoriesOptions, connectedDatabase?: sqlite.Database): FeeCategory[]; +export declare function getFeeCategory(feeCategoryId: number | string, connectedDatabase?: sqlite.Database): FeeCategory | undefined; export {}; diff --git a/database/getFeeCategories.js b/database/getFeeCategories.js index cd652b49..d91cff52 100644 --- a/database/getFeeCategories.js +++ b/database/getFeeCategories.js @@ -1,9 +1,10 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import getFees from './getFees.js'; -import { acquireConnection } from './pool.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export default async function getFeeCategories(filters, options, connectedDatabase) { +export default function getFeeCategories(filters, options, connectedDatabase) { const updateOrderNumbers = !(filters.burialSiteTypeId || filters.contractTypeId) && options.includeFees; - const database = await acquireConnection(); + const database = sqlite(sunriseDB); let sqlWhereClause = ' where recordDelete_timeMillis is null'; const sqlParameters = []; if ((filters.contractTypeId ?? '') !== '') { @@ -35,16 +36,16 @@ export default async function getFeeCategories(filters, options, connectedDataba feeCategory.orderNumber = expectedOrderNumber; } expectedOrderNumber += 1; - feeCategory.fees = await getFees(feeCategory.feeCategoryId, filters, database); + feeCategory.fees = getFees(feeCategory.feeCategoryId, filters, database); } } if (connectedDatabase === undefined) { - database.release(); + database.close(); } return feeCategories; } -export async function getFeeCategory(feeCategoryId, connectedDatabase) { - const feeCategories = await getFeeCategories({ +export function getFeeCategory(feeCategoryId, connectedDatabase) { + const feeCategories = getFeeCategories({ feeCategoryId }, { includeFees: true diff --git a/database/getFeeCategories.ts b/database/getFeeCategories.ts index f94d1a6f..7e4d1b2e 100644 --- a/database/getFeeCategories.ts +++ b/database/getFeeCategories.ts @@ -1,9 +1,9 @@ -import type { PoolConnection } from 'better-sqlite-pool' +import sqlite from 'better-sqlite3' +import { sunriseDB } from '../helpers/database.helpers.js' import type { FeeCategory } from '../types/record.types.js' import getFees from './getFees.js' -import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' interface GetFeeCategoriesFilters { @@ -16,15 +16,15 @@ interface GetFeeCategoriesOptions { includeFees?: boolean } -export default async function getFeeCategories( +export default function getFeeCategories( filters: GetFeeCategoriesFilters, options: GetFeeCategoriesOptions, - connectedDatabase?: PoolConnection -): Promise { + connectedDatabase?: sqlite.Database +): FeeCategory[] { const updateOrderNumbers = !(filters.burialSiteTypeId || filters.contractTypeId) && options.includeFees - const database = await acquireConnection() + const database = sqlite(sunriseDB) let sqlWhereClause = ' where recordDelete_timeMillis is null' @@ -78,26 +78,22 @@ export default async function getFeeCategories( expectedOrderNumber += 1 - feeCategory.fees = await getFees( - feeCategory.feeCategoryId, - filters, - database - ) + feeCategory.fees = getFees(feeCategory.feeCategoryId, filters, database) } } if (connectedDatabase === undefined) { - database.release() + database.close() } return feeCategories } -export async function getFeeCategory( +export function getFeeCategory( feeCategoryId: number | string, - connectedDatabase?: PoolConnection -): Promise { - const feeCategories = await getFeeCategories( + connectedDatabase?: sqlite.Database +): FeeCategory | undefined { + const feeCategories = getFeeCategories( { feeCategoryId }, diff --git a/database/getFees.d.ts b/database/getFees.d.ts index ba1316e6..c30f6ed0 100644 --- a/database/getFees.d.ts +++ b/database/getFees.d.ts @@ -1,8 +1,8 @@ -import type { PoolConnection } from 'better-sqlite-pool'; +import sqlite from 'better-sqlite3'; import type { Fee } from '../types/record.types.js'; interface GetFeesFilters { burialSiteTypeId?: number | string; contractTypeId?: number | string; } -export default function getFees(feeCategoryId: number, additionalFilters: GetFeesFilters, connectedDatabase?: PoolConnection): Promise; +export default function getFees(feeCategoryId: number, additionalFilters: GetFeesFilters, connectedDatabase?: sqlite.Database): Fee[]; export {}; diff --git a/database/getFees.js b/database/getFees.js index 91c1fb16..9d0b7d9a 100644 --- a/database/getFees.js +++ b/database/getFees.js @@ -1,17 +1,18 @@ -import { acquireConnection } from './pool.js'; +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export default async function getFees(feeCategoryId, additionalFilters, connectedDatabase) { +export default function getFees(feeCategoryId, additionalFilters, connectedDatabase) { const updateOrderNumbers = !(additionalFilters.burialSiteTypeId || additionalFilters.contractTypeId); - const database = connectedDatabase ?? (await acquireConnection()); + const database = connectedDatabase ?? sqlite(sunriseDB); let sqlWhereClause = ' where f.recordDelete_timeMillis is null and f.feeCategoryId = ?'; const sqlParameters = [feeCategoryId]; if (additionalFilters.contractTypeId) { - sqlWhereClause += - ' and (f.contractTypeId is null or f.contractTypeId = ?)'; + sqlWhereClause += ' and (f.contractTypeId is null or f.contractTypeId = ?)'; sqlParameters.push(additionalFilters.contractTypeId); } if (additionalFilters.burialSiteTypeId) { - sqlWhereClause += ' and (f.burialSiteTypeId is null or f.burialSiteTypeId = ?)'; + sqlWhereClause += + ' and (f.burialSiteTypeId is null or f.burialSiteTypeId = ?)'; sqlParameters.push(additionalFilters.burialSiteTypeId); } const fees = database @@ -48,7 +49,7 @@ export default async function getFees(feeCategoryId, additionalFilters, connecte } } if (connectedDatabase === undefined) { - database.release(); + database.close(); } return fees; } diff --git a/database/getFees.ts b/database/getFees.ts index e1772727..b4de9c56 100644 --- a/database/getFees.ts +++ b/database/getFees.ts @@ -1,8 +1,8 @@ -import type { PoolConnection } from 'better-sqlite-pool' +import sqlite from 'better-sqlite3' +import { sunriseDB } from '../helpers/database.helpers.js' import type { Fee } from '../types/record.types.js' -import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' interface GetFeesFilters { @@ -10,16 +10,16 @@ interface GetFeesFilters { contractTypeId?: number | string } -export default async function getFees( +export default function getFees( feeCategoryId: number, additionalFilters: GetFeesFilters, - connectedDatabase?: PoolConnection -): Promise { + connectedDatabase?: sqlite.Database +): Fee[] { const updateOrderNumbers = !( additionalFilters.burialSiteTypeId || additionalFilters.contractTypeId ) - const database = connectedDatabase ?? (await acquireConnection()) + const database = connectedDatabase ?? sqlite(sunriseDB) let sqlWhereClause = ' where f.recordDelete_timeMillis is null and f.feeCategoryId = ?' @@ -27,14 +27,14 @@ export default async function getFees( const sqlParameters: unknown[] = [feeCategoryId] if (additionalFilters.contractTypeId) { - sqlWhereClause += - ' and (f.contractTypeId is null or f.contractTypeId = ?)' + sqlWhereClause += ' and (f.contractTypeId is null or f.contractTypeId = ?)' sqlParameters.push(additionalFilters.contractTypeId) } if (additionalFilters.burialSiteTypeId) { - sqlWhereClause += ' and (f.burialSiteTypeId is null or f.burialSiteTypeId = ?)' + sqlWhereClause += + ' and (f.burialSiteTypeId is null or f.burialSiteTypeId = ?)' sqlParameters.push(additionalFilters.burialSiteTypeId) } @@ -84,7 +84,7 @@ export default async function getFees( } if (connectedDatabase === undefined) { - database.release() + database.close() } return fees diff --git a/database/getFuneralHome.d.ts b/database/getFuneralHome.d.ts index a63035aa..1210cf3d 100644 --- a/database/getFuneralHome.d.ts +++ b/database/getFuneralHome.d.ts @@ -1,3 +1,3 @@ import type { FuneralHome } from '../types/record.types.js'; -export default function getFuneralHome(funeralHomeId: number | string): Promise; -export declare function getFuneralHomeByKey(funeralHomeKey: string): Promise; +export default function getFuneralHome(funeralHomeId: number | string): FuneralHome | undefined; +export declare function getFuneralHomeByKey(funeralHomeKey: string): FuneralHome | undefined; diff --git a/database/getFuneralHome.js b/database/getFuneralHome.js index a8372eaa..e83da7f8 100644 --- a/database/getFuneralHome.js +++ b/database/getFuneralHome.js @@ -1,12 +1,13 @@ -import { acquireConnection } from './pool.js'; -export default async function getFuneralHome(funeralHomeId) { - return await _getFuneralHome('funeralHomeId', funeralHomeId); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function getFuneralHome(funeralHomeId) { + return _getFuneralHome('funeralHomeId', funeralHomeId); } -export async function getFuneralHomeByKey(funeralHomeKey) { - return await _getFuneralHome('funeralHomeKey', funeralHomeKey); +export function getFuneralHomeByKey(funeralHomeKey) { + return _getFuneralHome('funeralHomeKey', funeralHomeKey); } -async function _getFuneralHome(keyColumn, funeralHomeIdOrKey) { - const database = await acquireConnection(); +function _getFuneralHome(keyColumn, funeralHomeIdOrKey) { + const database = sqlite(sunriseDB); const funeralHome = database .prepare(`select funeralHomeId, funeralHomeKey, funeralHomeName, funeralHomeAddress1, funeralHomeAddress2, @@ -16,6 +17,6 @@ async function _getFuneralHome(keyColumn, funeralHomeIdOrKey) { and f.${keyColumn} = ? order by f.funeralHomeName, f.funeralHomeId`) .get(funeralHomeIdOrKey); - database.release(); + database.close(); return funeralHome; } diff --git a/database/getFuneralHome.ts b/database/getFuneralHome.ts index 6654a117..1035119d 100644 --- a/database/getFuneralHome.ts +++ b/database/getFuneralHome.ts @@ -1,24 +1,25 @@ +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' import type { Cemetery, FuneralHome } from '../types/record.types.js' -import { acquireConnection } from './pool.js' - -export default async function getFuneralHome( +export default function getFuneralHome( funeralHomeId: number | string -): Promise { - return await _getFuneralHome('funeralHomeId', funeralHomeId) +): FuneralHome | undefined { + return _getFuneralHome('funeralHomeId', funeralHomeId) } -export async function getFuneralHomeByKey( +export function getFuneralHomeByKey( funeralHomeKey: string -): Promise { - return await _getFuneralHome('funeralHomeKey', funeralHomeKey) +): FuneralHome | undefined { + return _getFuneralHome('funeralHomeKey', funeralHomeKey) } -async function _getFuneralHome( +function _getFuneralHome( keyColumn: 'funeralHomeId' | 'funeralHomeKey', funeralHomeIdOrKey: number | string -): Promise { - const database = await acquireConnection() +): FuneralHome | undefined { + const database = sqlite(sunriseDB) const funeralHome = database .prepare( @@ -32,7 +33,7 @@ async function _getFuneralHome( ) .get(funeralHomeIdOrKey) as Cemetery | undefined - database.release() + database.close() return funeralHome } diff --git a/database/getFuneralHomes.d.ts b/database/getFuneralHomes.d.ts index 9f24ddfc..df7af034 100644 --- a/database/getFuneralHomes.d.ts +++ b/database/getFuneralHomes.d.ts @@ -1,2 +1,2 @@ import type { FuneralHome } from '../types/record.types.js'; -export default function getFuneralHomes(): Promise; +export default function getFuneralHomes(): FuneralHome[]; diff --git a/database/getFuneralHomes.js b/database/getFuneralHomes.js index bbf04587..8f4998bb 100644 --- a/database/getFuneralHomes.js +++ b/database/getFuneralHomes.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function getFuneralHomes() { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function getFuneralHomes() { + const database = sqlite(sunriseDB, { readonly: true }); const funeralHomes = database .prepare(`select funeralHomeId, funeralHomeKey, funeralHomeName, funeralHomeAddress1, funeralHomeAddress2, @@ -9,6 +10,6 @@ export default async function getFuneralHomes() { where f.recordDelete_timeMillis is null order by f.funeralHomeName, f.funeralHomeId`) .all(); - database.release(); + database.close(); return funeralHomes; } diff --git a/database/getFuneralHomes.ts b/database/getFuneralHomes.ts index e35665c1..6dc01803 100644 --- a/database/getFuneralHomes.ts +++ b/database/getFuneralHomes.ts @@ -1,9 +1,10 @@ +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' import type { Cemetery, FuneralHome } from '../types/record.types.js' -import { acquireConnection } from './pool.js' - -export default async function getFuneralHomes(): Promise { - const database = await acquireConnection() +export default function getFuneralHomes(): FuneralHome[] { + const database = sqlite(sunriseDB, { readonly: true }) const funeralHomes = database .prepare( @@ -16,7 +17,7 @@ export default async function getFuneralHomes(): Promise { ) .all() as Cemetery[] - database.release() + database.close() return funeralHomes } diff --git a/database/getIntermentContainerTypes.d.ts b/database/getIntermentContainerTypes.d.ts index 905f41ce..7ff64a46 100644 --- a/database/getIntermentContainerTypes.d.ts +++ b/database/getIntermentContainerTypes.d.ts @@ -1,2 +1,2 @@ import type { IntermentContainerType } from '../types/record.types.js'; -export default function getIntermentContainerTypes(): Promise; +export default function getIntermentContainerTypes(): IntermentContainerType[]; diff --git a/database/getIntermentContainerTypes.js b/database/getIntermentContainerTypes.js index 9130e87b..bba16ea2 100644 --- a/database/getIntermentContainerTypes.js +++ b/database/getIntermentContainerTypes.js @@ -1,9 +1,11 @@ -import { acquireConnection } from './pool.js'; +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export default async function getIntermentContainerTypes() { - const database = await acquireConnection(); +export default function getIntermentContainerTypes() { + const database = sqlite(sunriseDB); const containerTypes = database - .prepare(`select intermentContainerTypeId, intermentContainerType, intermentContainerTypeKey, isCremationType, orderNumber + .prepare(`select intermentContainerTypeId, intermentContainerType, intermentContainerTypeKey, + isCremationType, orderNumber from IntermentContainerTypes where recordDelete_timeMillis is null order by isCremationType, orderNumber, intermentContainerType, intermentContainerTypeId`) @@ -16,6 +18,6 @@ export default async function getIntermentContainerTypes() { containerType.orderNumber = expectedOrderNumber; } } - database.release(); + database.close(); return containerTypes; } diff --git a/database/getIntermentContainerTypes.ts b/database/getIntermentContainerTypes.ts index 97da52d0..3c7d85b4 100644 --- a/database/getIntermentContainerTypes.ts +++ b/database/getIntermentContainerTypes.ts @@ -1,16 +1,17 @@ +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' import type { IntermentContainerType } from '../types/record.types.js' -import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export default async function getIntermentContainerTypes(): Promise< - IntermentContainerType[] -> { - const database = await acquireConnection() +export default function getIntermentContainerTypes(): IntermentContainerType[] { + const database = sqlite(sunriseDB) const containerTypes = database .prepare( - `select intermentContainerTypeId, intermentContainerType, intermentContainerTypeKey, isCremationType, orderNumber + `select intermentContainerTypeId, intermentContainerType, intermentContainerTypeKey, + isCremationType, orderNumber from IntermentContainerTypes where recordDelete_timeMillis is null order by isCremationType, orderNumber, intermentContainerType, intermentContainerTypeId` @@ -34,7 +35,7 @@ export default async function getIntermentContainerTypes(): Promise< } } - database.release() + database.close() return containerTypes } diff --git a/database/getNextBurialSiteId.d.ts b/database/getNextBurialSiteId.d.ts index 806f1a31..5c7eeb06 100644 --- a/database/getNextBurialSiteId.d.ts +++ b/database/getNextBurialSiteId.d.ts @@ -1 +1 @@ -export default function getNextBurialSiteId(burialSiteId: number | string): Promise; +export default function getNextBurialSiteId(burialSiteId: number | string): number | undefined; diff --git a/database/getNextBurialSiteId.js b/database/getNextBurialSiteId.js index 1e90e70d..aa731982 100644 --- a/database/getNextBurialSiteId.js +++ b/database/getNextBurialSiteId.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function getNextBurialSiteId(burialSiteId) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function getNextBurialSiteId(burialSiteId) { + const database = sqlite(sunriseDB, { readonly: true }); const result = database .prepare(`select burialSiteId from BurialSites @@ -10,7 +11,7 @@ export default async function getNextBurialSiteId(burialSiteId) { limit 1`) .pluck() .get(burialSiteId); - database.release(); + database.close(); if (result === undefined) { return undefined; } diff --git a/database/getNextBurialSiteId.ts b/database/getNextBurialSiteId.ts index 3d77ae73..d5ad9fda 100644 --- a/database/getNextBurialSiteId.ts +++ b/database/getNextBurialSiteId.ts @@ -1,9 +1,11 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' -export default async function getNextBurialSiteId( +import { sunriseDB } from '../helpers/database.helpers.js' + +export default function getNextBurialSiteId( burialSiteId: number | string -): Promise { - const database = await acquireConnection() +): number | undefined { + const database = sqlite(sunriseDB, { readonly: true }) const result = database .prepare( @@ -17,7 +19,7 @@ export default async function getNextBurialSiteId( .pluck() .get(burialSiteId) as number | undefined - database.release() + database.close() if (result === undefined) { return undefined diff --git a/database/getNextCemeteryId.d.ts b/database/getNextCemeteryId.d.ts index 4d366a88..e13364fd 100644 --- a/database/getNextCemeteryId.d.ts +++ b/database/getNextCemeteryId.d.ts @@ -1 +1 @@ -export default function getNextCemeteryId(cemeteryId: number | string): Promise; +export default function getNextCemeteryId(cemeteryId: number | string): number | undefined; diff --git a/database/getNextCemeteryId.js b/database/getNextCemeteryId.js index 9379e06a..d1720026 100644 --- a/database/getNextCemeteryId.js +++ b/database/getNextCemeteryId.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function getNextCemeteryId(cemeteryId) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function getNextCemeteryId(cemeteryId) { + const database = sqlite(sunriseDB, { readonly: true }); const result = database .prepare(`select cemeteryId from Cemeteries @@ -10,6 +11,6 @@ export default async function getNextCemeteryId(cemeteryId) { limit 1`) .pluck() .get(cemeteryId); - database.release(); + database.close(); return result; } diff --git a/database/getNextCemeteryId.ts b/database/getNextCemeteryId.ts index 8706f188..ed121302 100644 --- a/database/getNextCemeteryId.ts +++ b/database/getNextCemeteryId.ts @@ -1,9 +1,11 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' -export default async function getNextCemeteryId( +import { sunriseDB } from '../helpers/database.helpers.js' + +export default function getNextCemeteryId( cemeteryId: number | string -): Promise { - const database = await acquireConnection() +): number | undefined { + const database = sqlite(sunriseDB, { readonly: true }) const result = database .prepare( @@ -17,7 +19,7 @@ export default async function getNextCemeteryId( .pluck() .get(cemeteryId) as number | undefined - database.release() + database.close() return result } diff --git a/database/getNextContractId.d.ts b/database/getNextContractId.d.ts index b3fb8911..3c743e0c 100644 --- a/database/getNextContractId.d.ts +++ b/database/getNextContractId.d.ts @@ -1 +1 @@ -export default function getNextContractId(contractId: number | string): Promise; +export default function getNextContractId(contractId: number | string): number | undefined; diff --git a/database/getNextContractId.js b/database/getNextContractId.js index 4a3813ed..41befc25 100644 --- a/database/getNextContractId.js +++ b/database/getNextContractId.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function getNextContractId(contractId) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function getNextContractId(contractId) { + const database = sqlite(sunriseDB, { readonly: true }); const result = database .prepare(`select contractId from Contracts @@ -10,6 +11,6 @@ export default async function getNextContractId(contractId) { limit 1`) .pluck() .get(contractId); - database.release(); + database.close(); return result; } diff --git a/database/getNextContractId.ts b/database/getNextContractId.ts index 670ea42b..4332c7b8 100644 --- a/database/getNextContractId.ts +++ b/database/getNextContractId.ts @@ -1,9 +1,11 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' -export default async function getNextContractId( +import { sunriseDB } from '../helpers/database.helpers.js' + +export default function getNextContractId( contractId: number | string -): Promise { - const database = await acquireConnection() +): number | undefined { + const database = sqlite(sunriseDB, { readonly: true }) const result = database .prepare( @@ -17,7 +19,7 @@ export default async function getNextContractId( .pluck() .get(contractId) as number | undefined - database.release() + database.close() return result } diff --git a/database/getNextWorkOrderNumber.d.ts b/database/getNextWorkOrderNumber.d.ts index 2ea61fdd..89b85fa0 100644 --- a/database/getNextWorkOrderNumber.d.ts +++ b/database/getNextWorkOrderNumber.d.ts @@ -1,2 +1,2 @@ -import type { PoolConnection } from 'better-sqlite-pool'; -export default function getNextWorkOrderNumber(connectedDatabase?: PoolConnection): Promise; +import sqlite from 'better-sqlite3'; +export default function getNextWorkOrderNumber(connectedDatabase?: sqlite.Database): string; diff --git a/database/getNextWorkOrderNumber.js b/database/getNextWorkOrderNumber.js index 40af1a1b..2f7767a0 100644 --- a/database/getNextWorkOrderNumber.js +++ b/database/getNextWorkOrderNumber.js @@ -1,7 +1,8 @@ +import sqlite from 'better-sqlite3'; import { getConfigProperty } from '../helpers/config.helpers.js'; -import { acquireConnection } from './pool.js'; -export default async function getNextWorkOrderNumber(connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function getNextWorkOrderNumber(connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }); const paddingLength = getConfigProperty('settings.workOrders.workOrderNumberLength'); const currentYearString = new Date().getFullYear().toString(); const regex = new RegExp(`^${currentYearString}-\\d+$`); @@ -16,7 +17,7 @@ export default async function getNextWorkOrderNumber(connectedDatabase) { order by cast(substr(workOrderNumber, instr(workOrderNumber, '-') + 1) as integer) desc`) .get(); if (connectedDatabase === undefined) { - database.release(); + database.close(); } let workOrderNumberIndex = 0; if (workOrderNumberRecord !== undefined) { diff --git a/database/getNextWorkOrderNumber.ts b/database/getNextWorkOrderNumber.ts index 2ae7f1dc..5b46b51e 100644 --- a/database/getNextWorkOrderNumber.ts +++ b/database/getNextWorkOrderNumber.ts @@ -1,13 +1,12 @@ -import type { PoolConnection } from 'better-sqlite-pool' +import sqlite from 'better-sqlite3' import { getConfigProperty } from '../helpers/config.helpers.js' +import { sunriseDB } from '../helpers/database.helpers.js' -import { acquireConnection } from './pool.js' - -export default async function getNextWorkOrderNumber( - connectedDatabase?: PoolConnection -): Promise { - const database = connectedDatabase ?? (await acquireConnection()) +export default function getNextWorkOrderNumber( + connectedDatabase?: sqlite.Database +): string { + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }) const paddingLength = getConfigProperty( 'settings.workOrders.workOrderNumberLength' @@ -36,7 +35,7 @@ export default async function getNextWorkOrderNumber( | undefined if (connectedDatabase === undefined) { - database.release() + database.close() } let workOrderNumberIndex = 0 diff --git a/database/getPreviousBurialSiteId.d.ts b/database/getPreviousBurialSiteId.d.ts index e4b7956c..3c535361 100644 --- a/database/getPreviousBurialSiteId.d.ts +++ b/database/getPreviousBurialSiteId.d.ts @@ -1 +1 @@ -export default function getPreviousBurialSiteId(burialSiteId: number | string): Promise; +export default function getPreviousBurialSiteId(burialSiteId: number | string): number | undefined; diff --git a/database/getPreviousBurialSiteId.js b/database/getPreviousBurialSiteId.js index 182049ca..4ccfa20b 100644 --- a/database/getPreviousBurialSiteId.js +++ b/database/getPreviousBurialSiteId.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function getPreviousBurialSiteId(burialSiteId) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function getPreviousBurialSiteId(burialSiteId) { + const database = sqlite(sunriseDB, { readonly: true }); const result = database .prepare(`select burialSiteId from BurialSites where recordDelete_timeMillis is null @@ -9,6 +10,6 @@ export default async function getPreviousBurialSiteId(burialSiteId) { limit 1`) .pluck() .get(burialSiteId); - database.release(); + database.close(); return result; } diff --git a/database/getPreviousBurialSiteId.ts b/database/getPreviousBurialSiteId.ts index 98932b00..3460786a 100644 --- a/database/getPreviousBurialSiteId.ts +++ b/database/getPreviousBurialSiteId.ts @@ -1,9 +1,11 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' -export default async function getPreviousBurialSiteId( +import { sunriseDB } from '../helpers/database.helpers.js' + +export default function getPreviousBurialSiteId( burialSiteId: number | string -): Promise { - const database = await acquireConnection() +): number | undefined { + const database = sqlite(sunriseDB, { readonly: true }) const result = database .prepare( @@ -16,7 +18,7 @@ export default async function getPreviousBurialSiteId( .pluck() .get(burialSiteId) as number | undefined - database.release() + database.close() return result } diff --git a/database/getPreviousCemeteryId.d.ts b/database/getPreviousCemeteryId.d.ts index c5dd1acf..a5f26fcb 100644 --- a/database/getPreviousCemeteryId.d.ts +++ b/database/getPreviousCemeteryId.d.ts @@ -1 +1 @@ -export default function getPreviousCemeteryId(cemeteryId: number | string): Promise; +export default function getPreviousCemeteryId(cemeteryId: number | string): number | undefined; diff --git a/database/getPreviousCemeteryId.js b/database/getPreviousCemeteryId.js index f4bd8f8f..82ac6f90 100644 --- a/database/getPreviousCemeteryId.js +++ b/database/getPreviousCemeteryId.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function getPreviousCemeteryId(cemeteryId) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function getPreviousCemeteryId(cemeteryId) { + const database = sqlite(sunriseDB, { readonly: true }); const result = database .prepare(`select cemeteryId from Cemeteries where recordDelete_timeMillis is null @@ -9,6 +10,6 @@ export default async function getPreviousCemeteryId(cemeteryId) { limit 1`) .pluck() .get(cemeteryId); - database.release(); + database.close(); return result; } diff --git a/database/getPreviousCemeteryId.ts b/database/getPreviousCemeteryId.ts index bd5ffcca..f7dafda1 100644 --- a/database/getPreviousCemeteryId.ts +++ b/database/getPreviousCemeteryId.ts @@ -1,9 +1,11 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' -export default async function getPreviousCemeteryId( +import { sunriseDB } from '../helpers/database.helpers.js' + +export default function getPreviousCemeteryId( cemeteryId: number | string -): Promise { - const database = await acquireConnection() +): number | undefined { + const database = sqlite(sunriseDB, { readonly: true }) const result = database .prepare( @@ -16,7 +18,7 @@ export default async function getPreviousCemeteryId( .pluck() .get(cemeteryId) as number | undefined - database.release() + database.close() return result } diff --git a/database/getPreviousContractId.d.ts b/database/getPreviousContractId.d.ts index 83d0051a..31b490ff 100644 --- a/database/getPreviousContractId.d.ts +++ b/database/getPreviousContractId.d.ts @@ -1 +1 @@ -export default function getPreviousContractId(contractId: number | string): Promise; +export default function getPreviousContractId(contractId: number | string): number | undefined; diff --git a/database/getPreviousContractId.js b/database/getPreviousContractId.js index 14b8cd75..40a15443 100644 --- a/database/getPreviousContractId.js +++ b/database/getPreviousContractId.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function getPreviousContractId(contractId) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function getPreviousContractId(contractId) { + const database = sqlite(sunriseDB, { readonly: true }); const result = database .prepare(`select contractId from Contracts @@ -10,6 +11,6 @@ export default async function getPreviousContractId(contractId) { limit 1`) .pluck() .get(contractId); - database.release(); + database.close(); return result; } diff --git a/database/getPreviousContractId.ts b/database/getPreviousContractId.ts index 28818702..a3681de1 100644 --- a/database/getPreviousContractId.ts +++ b/database/getPreviousContractId.ts @@ -1,9 +1,11 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' -export default async function getPreviousContractId( +import { sunriseDB } from '../helpers/database.helpers.js' + +export default function getPreviousContractId( contractId: number | string -): Promise { - const database = await acquireConnection() +): number | undefined { + const database = sqlite(sunriseDB, { readonly: true }) const result = database .prepare( @@ -17,7 +19,7 @@ export default async function getPreviousContractId( .pluck() .get(contractId) as number | undefined - database.release() + database.close() return result } diff --git a/database/getReportData.d.ts b/database/getReportData.d.ts index f2b0d345..b71646ba 100644 --- a/database/getReportData.d.ts +++ b/database/getReportData.d.ts @@ -1,2 +1,2 @@ export type ReportParameters = Record; -export default function getReportData(reportName: string, reportParameters?: ReportParameters): Promise; +export default function getReportData(reportName: string, reportParameters?: ReportParameters): unknown[] | undefined; diff --git a/database/getReportData.js b/database/getReportData.js index fa4244a9..9e7d5a6c 100644 --- a/database/getReportData.js +++ b/database/getReportData.js @@ -1,5 +1,6 @@ import { dateIntegerToString, dateStringToInteger, dateToInteger, timeIntegerToString } from '@cityssm/utils-datetime'; -import { acquireConnection } from './pool.js'; +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; const simpleReports = { 'burialSiteComments-all': 'select * from BurialSiteComments', 'burialSiteFields-all': 'select * from BurialSiteFields', @@ -45,7 +46,7 @@ const simpleReports = { 'workOrders-all': 'select * from WorkOrders', 'workOrderTypes-all': 'select * from WorkOrderTypes' }; -export default async function getReportData(reportName, reportParameters = {}) { +export default function getReportData(reportName, reportParameters = {}) { let sql = ''; const sqlParameters = []; // eslint-disable-next-line security/detect-object-injection @@ -179,10 +180,10 @@ export default async function getReportData(reportName, reportParameters = {}) { else { sql = simpleReports[reportName]; } - const database = await acquireConnection(); + const database = sqlite(sunriseDB); database.function('userFn_dateIntegerToString', dateIntegerToString); database.function('userFn_timeIntegerToString', timeIntegerToString); const rows = database.prepare(sql).all(sqlParameters); - database.release(); + database.close(); return rows; } diff --git a/database/getReportData.ts b/database/getReportData.ts index a3f7a232..c3d0e82f 100644 --- a/database/getReportData.ts +++ b/database/getReportData.ts @@ -5,8 +5,9 @@ import { dateToInteger, timeIntegerToString } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' export type ReportParameters = Record @@ -62,10 +63,10 @@ const simpleReports: Record<`${string}-all` | `${string}-formatted`, string> = { 'workOrderTypes-all': 'select * from WorkOrderTypes' } -export default async function getReportData( +export default function getReportData( reportName: string, reportParameters: ReportParameters = {} -): Promise { +): unknown[] | undefined { let sql = '' const sqlParameters: unknown[] = [] @@ -228,14 +229,14 @@ export default async function getReportData( sql = simpleReports[reportName] } - const database = await acquireConnection() + const database = sqlite(sunriseDB) database.function('userFn_dateIntegerToString', dateIntegerToString) database.function('userFn_timeIntegerToString', timeIntegerToString) const rows = database.prepare(sql).all(sqlParameters) - database.release() + database.close() return rows } diff --git a/database/getWorkOrder.d.ts b/database/getWorkOrder.d.ts index 545a5b55..9b451190 100644 --- a/database/getWorkOrder.d.ts +++ b/database/getWorkOrder.d.ts @@ -1,10 +1,10 @@ -import type { PoolConnection } from 'better-sqlite-pool'; +import sqlite from 'better-sqlite3'; import type { WorkOrder } from '../types/record.types.js'; interface WorkOrderOptions { includeBurialSites: boolean; includeComments: boolean; includeMilestones: boolean; } -export default function getWorkOrder(workOrderId: number | string, options: WorkOrderOptions, connectedDatabase?: PoolConnection): Promise; +export default function getWorkOrder(workOrderId: number | string, options: WorkOrderOptions, connectedDatabase?: sqlite.Database): Promise; export declare function getWorkOrderByWorkOrderNumber(workOrderNumber: string): Promise; export {}; diff --git a/database/getWorkOrder.js b/database/getWorkOrder.js index b25339a4..325a04e5 100644 --- a/database/getWorkOrder.js +++ b/database/getWorkOrder.js @@ -1,9 +1,10 @@ import { dateIntegerToString } from '@cityssm/utils-datetime'; +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import getBurialSites from './getBurialSites.js'; import getContracts from './getContracts.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, w.workOrderNumber, w.workOrderDescription, @@ -24,12 +25,12 @@ export async function getWorkOrderByWorkOrderNumber(workOrderNumber) { }); } async function _getWorkOrder(sql, workOrderIdOrWorkOrderNumber, options, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); + const database = connectedDatabase ?? (sqlite(sunriseDB)); database.function('userFn_dateIntegerToString', dateIntegerToString); const workOrder = database.prepare(sql).get(workOrderIdOrWorkOrderNumber); if (workOrder !== undefined) { if (options.includeBurialSites) { - const burialSiteResults = await getBurialSites({ + const burialSiteResults = getBurialSites({ workOrderId: workOrder.workOrderId }, { includeContractCount: false, @@ -61,7 +62,7 @@ async function _getWorkOrder(sql, workOrderIdOrWorkOrderNumber, options, connect } } if (connectedDatabase === undefined) { - database.release(); + database.close(); } return workOrder; } diff --git a/database/getWorkOrder.ts b/database/getWorkOrder.ts index 61a5ce7d..6301996f 100644 --- a/database/getWorkOrder.ts +++ b/database/getWorkOrder.ts @@ -1,14 +1,15 @@ -import type { PoolConnection } from 'better-sqlite-pool' + import { dateIntegerToString } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' +import { sunriseDB } from '../helpers/database.helpers.js' import type { WorkOrder } from '../types/record.types.js' import getBurialSites from './getBurialSites.js' import getContracts from './getContracts.js' import getWorkOrderComments from './getWorkOrderComments.js' import getWorkOrderMilestones from './getWorkOrderMilestones.js' -import { acquireConnection } from './pool.js' interface WorkOrderOptions { includeBurialSites: boolean @@ -29,7 +30,7 @@ const baseSQL = `select w.workOrderId, export default async function getWorkOrder( workOrderId: number | string, options: WorkOrderOptions, - connectedDatabase?: PoolConnection + connectedDatabase?: sqlite.Database ): Promise { return await _getWorkOrder( `${baseSQL} and w.workOrderId = ?`, @@ -57,9 +58,9 @@ async function _getWorkOrder( sql: string, workOrderIdOrWorkOrderNumber: number | string, options: WorkOrderOptions, - connectedDatabase?: PoolConnection + connectedDatabase?: sqlite.Database ): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + const database = connectedDatabase ?? (sqlite(sunriseDB)) database.function('userFn_dateIntegerToString', dateIntegerToString) @@ -69,7 +70,7 @@ async function _getWorkOrder( if (workOrder !== undefined) { if (options.includeBurialSites) { - const burialSiteResults = await getBurialSites( + const burialSiteResults = getBurialSites( { workOrderId: workOrder.workOrderId }, @@ -122,7 +123,7 @@ async function _getWorkOrder( } if (connectedDatabase === undefined) { - database.release() + database.close() } return workOrder diff --git a/database/getWorkOrderComments.d.ts b/database/getWorkOrderComments.d.ts index e11bb495..15db07df 100644 --- a/database/getWorkOrderComments.d.ts +++ b/database/getWorkOrderComments.d.ts @@ -1,3 +1,3 @@ -import type { PoolConnection } from 'better-sqlite-pool'; +import sqlite from 'better-sqlite3'; import type { WorkOrderComment } from '../types/record.types.js'; -export default function getWorkOrderComments(workOrderId: number | string, connectedDatabase?: PoolConnection): Promise; +export default function getWorkOrderComments(workOrderId: number | string, connectedDatabase?: sqlite.Database): WorkOrderComment[]; diff --git a/database/getWorkOrderComments.js b/database/getWorkOrderComments.js index 36ca3cf8..90ea1850 100644 --- a/database/getWorkOrderComments.js +++ b/database/getWorkOrderComments.js @@ -1,7 +1,8 @@ import { dateIntegerToString, timeIntegerToPeriodString, timeIntegerToString } from '@cityssm/utils-datetime'; -import { acquireConnection } from './pool.js'; -export default async function getWorkOrderComments(workOrderId, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function getWorkOrderComments(workOrderId, connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }); database.function('userFn_dateIntegerToString', dateIntegerToString); database.function('userFn_timeIntegerToString', timeIntegerToString); database.function('userFn_timeIntegerToPeriodString', timeIntegerToPeriodString); @@ -19,7 +20,7 @@ export default async function getWorkOrderComments(workOrderId, connectedDatabas order by commentDate desc, commentTime desc, workOrderCommentId desc`) .all(workOrderId); if (connectedDatabase === undefined) { - database.release(); + database.close(); } return workOrderComments; } diff --git a/database/getWorkOrderComments.ts b/database/getWorkOrderComments.ts index 9f19a938..31d3ee17 100644 --- a/database/getWorkOrderComments.ts +++ b/database/getWorkOrderComments.ts @@ -1,20 +1,18 @@ -import type { PoolConnection } from 'better-sqlite-pool' - import { dateIntegerToString, timeIntegerToPeriodString, timeIntegerToString } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' +import { sunriseDB } from '../helpers/database.helpers.js' import type { WorkOrderComment } from '../types/record.types.js' -import { acquireConnection } from './pool.js' - -export default async function getWorkOrderComments( +export default function getWorkOrderComments( workOrderId: number | string, - connectedDatabase?: PoolConnection -): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + connectedDatabase?: sqlite.Database +): WorkOrderComment[] { + const database = connectedDatabase ?? sqlite(sunriseDB, { readonly: true }) database.function('userFn_dateIntegerToString', dateIntegerToString) database.function('userFn_timeIntegerToString', timeIntegerToString) @@ -40,7 +38,7 @@ export default async function getWorkOrderComments( .all(workOrderId) as WorkOrderComment[] if (connectedDatabase === undefined) { - database.release() + database.close() } return workOrderComments diff --git a/database/getWorkOrderMilestoneTypes.d.ts b/database/getWorkOrderMilestoneTypes.d.ts index dedd17b1..b2c4c1f1 100644 --- a/database/getWorkOrderMilestoneTypes.d.ts +++ b/database/getWorkOrderMilestoneTypes.d.ts @@ -1,2 +1,2 @@ import type { WorkOrderMilestoneType } from '../types/record.types.js'; -export default function getWorkOrderMilestoneTypes(): Promise; +export default function getWorkOrderMilestoneTypes(): WorkOrderMilestoneType[]; diff --git a/database/getWorkOrderMilestoneTypes.js b/database/getWorkOrderMilestoneTypes.js index 20d714c1..a9473802 100644 --- a/database/getWorkOrderMilestoneTypes.js +++ b/database/getWorkOrderMilestoneTypes.js @@ -1,7 +1,8 @@ -import { acquireConnection } from './pool.js'; +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export default async function getWorkOrderMilestoneTypes() { - const database = await acquireConnection(); +export default function getWorkOrderMilestoneTypes() { + const database = sqlite(sunriseDB); const workOrderMilestoneTypes = database .prepare(`select workOrderMilestoneTypeId, workOrderMilestoneType, orderNumber from WorkOrderMilestoneTypes @@ -16,6 +17,6 @@ export default async function getWorkOrderMilestoneTypes() { } expectedOrderNumber += 1; } - database.release(); + database.close(); return workOrderMilestoneTypes; } diff --git a/database/getWorkOrderMilestoneTypes.ts b/database/getWorkOrderMilestoneTypes.ts index 5938eef8..f559e781 100644 --- a/database/getWorkOrderMilestoneTypes.ts +++ b/database/getWorkOrderMilestoneTypes.ts @@ -1,12 +1,12 @@ +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' import type { WorkOrderMilestoneType } from '../types/record.types.js' -import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export default async function getWorkOrderMilestoneTypes(): Promise< - WorkOrderMilestoneType[] -> { - const database = await acquireConnection() +export default function getWorkOrderMilestoneTypes(): WorkOrderMilestoneType[] { + const database = sqlite(sunriseDB) const workOrderMilestoneTypes = database .prepare( @@ -34,7 +34,7 @@ export default async function getWorkOrderMilestoneTypes(): Promise< expectedOrderNumber += 1 } - database.release() + database.close() return workOrderMilestoneTypes } diff --git a/database/getWorkOrderMilestones.d.ts b/database/getWorkOrderMilestones.d.ts index 5704cfa2..14a58776 100644 --- a/database/getWorkOrderMilestones.d.ts +++ b/database/getWorkOrderMilestones.d.ts @@ -1,5 +1,5 @@ -import type { PoolConnection } from 'better-sqlite-pool'; import { type DateString } from '@cityssm/utils-datetime'; +import sqlite from 'better-sqlite3'; import type { WorkOrderMilestone } from '../types/record.types.js'; export interface WorkOrderMilestoneFilters { workOrderId?: number | string; @@ -12,5 +12,5 @@ interface WorkOrderMilestoneOptions { includeWorkOrders?: boolean; orderBy: 'completion' | 'date'; } -export default function getWorkOrderMilestones(filters: WorkOrderMilestoneFilters, options: WorkOrderMilestoneOptions, connectedDatabase?: PoolConnection): Promise; +export default function getWorkOrderMilestones(filters: WorkOrderMilestoneFilters, options: WorkOrderMilestoneOptions, connectedDatabase?: sqlite.Database): Promise; export {}; diff --git a/database/getWorkOrderMilestones.js b/database/getWorkOrderMilestones.js index a03b1e37..8ab9752c 100644 --- a/database/getWorkOrderMilestones.js +++ b/database/getWorkOrderMilestones.js @@ -1,12 +1,13 @@ import { dateIntegerToString, dateStringToInteger, dateToInteger, timeIntegerToPeriodString, timeIntegerToString } from '@cityssm/utils-datetime'; +import sqlite from 'better-sqlite3'; import { getConfigProperty } from '../helpers/config.helpers.js'; +import { sunriseDB } from '../helpers/database.helpers.js'; import getBurialSites from './getBurialSites.js'; import getContracts from './getContracts.js'; -import { acquireConnection } from './pool.js'; // eslint-disable-next-line security/detect-unsafe-regex const commaSeparatedNumbersRegex = /^\d+(?:,\d+)*$/; export default async function getWorkOrderMilestones(filters, options, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); + const database = connectedDatabase ?? sqlite(sunriseDB); database.function('userFn_dateIntegerToString', dateIntegerToString); database.function('userFn_timeIntegerToString', timeIntegerToString); database.function('userFn_timeIntegerToPeriodString', timeIntegerToPeriodString); @@ -64,7 +65,7 @@ export default async function getWorkOrderMilestones(filters, options, connected .all(sqlParameters); if (options.includeWorkOrders ?? false) { for (const workOrderMilestone of workOrderMilestones) { - const burialSites = await getBurialSites({ + const burialSites = getBurialSites({ workOrderId: workOrderMilestone.workOrderId }, { limit: -1, @@ -85,7 +86,7 @@ export default async function getWorkOrderMilestones(filters, options, connected } } if (connectedDatabase === undefined) { - database.release(); + database.close(); } return workOrderMilestones; } diff --git a/database/getWorkOrderMilestones.ts b/database/getWorkOrderMilestones.ts index e9f2b0ca..1a950758 100644 --- a/database/getWorkOrderMilestones.ts +++ b/database/getWorkOrderMilestones.ts @@ -1,5 +1,3 @@ -import type { PoolConnection } from 'better-sqlite-pool' - import { type DateString, dateIntegerToString, @@ -8,13 +6,14 @@ import { timeIntegerToPeriodString, timeIntegerToString } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' import { getConfigProperty } from '../helpers/config.helpers.js' +import { sunriseDB } from '../helpers/database.helpers.js' import type { WorkOrderMilestone } from '../types/record.types.js' import getBurialSites from './getBurialSites.js' import getContracts from './getContracts.js' -import { acquireConnection } from './pool.js' export interface WorkOrderMilestoneFilters { workOrderId?: number | string @@ -41,9 +40,9 @@ const commaSeparatedNumbersRegex = /^\d+(?:,\d+)*$/ export default async function getWorkOrderMilestones( filters: WorkOrderMilestoneFilters, options: WorkOrderMilestoneOptions, - connectedDatabase?: PoolConnection + connectedDatabase?: sqlite.Database ): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + const database = connectedDatabase ?? sqlite(sunriseDB) database.function('userFn_dateIntegerToString', dateIntegerToString) database.function('userFn_timeIntegerToString', timeIntegerToString) @@ -114,7 +113,7 @@ export default async function getWorkOrderMilestones( if (options.includeWorkOrders ?? false) { for (const workOrderMilestone of workOrderMilestones) { - const burialSites = await getBurialSites( + const burialSites = getBurialSites( { workOrderId: workOrderMilestone.workOrderId }, @@ -149,7 +148,7 @@ export default async function getWorkOrderMilestones( } if (connectedDatabase === undefined) { - database.release() + database.close() } return workOrderMilestones diff --git a/database/getWorkOrderTypes.d.ts b/database/getWorkOrderTypes.d.ts index f19b9d08..cc8225a5 100644 --- a/database/getWorkOrderTypes.d.ts +++ b/database/getWorkOrderTypes.d.ts @@ -1,2 +1,2 @@ import type { WorkOrderType } from '../types/record.types.js'; -export default function getWorkOrderTypes(): Promise; +export default function getWorkOrderTypes(): WorkOrderType[]; diff --git a/database/getWorkOrderTypes.js b/database/getWorkOrderTypes.js index 55e47651..e1efb15c 100644 --- a/database/getWorkOrderTypes.js +++ b/database/getWorkOrderTypes.js @@ -1,7 +1,8 @@ -import { acquireConnection } from './pool.js'; +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export default async function getWorkOrderTypes() { - const database = await acquireConnection(); +export default function getWorkOrderTypes() { + const database = sqlite(sunriseDB); const workOrderTypes = database .prepare(`select workOrderTypeId, workOrderType, orderNumber from WorkOrderTypes @@ -16,6 +17,6 @@ export default async function getWorkOrderTypes() { } expectedOrderNumber += 1; } - database.release(); + database.close(); return workOrderTypes; } diff --git a/database/getWorkOrderTypes.ts b/database/getWorkOrderTypes.ts index 0ced1dd1..dcf8e1ac 100644 --- a/database/getWorkOrderTypes.ts +++ b/database/getWorkOrderTypes.ts @@ -1,10 +1,12 @@ +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' import type { WorkOrderType } from '../types/record.types.js' -import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export default async function getWorkOrderTypes(): Promise { - const database = await acquireConnection() +export default function getWorkOrderTypes(): WorkOrderType[] { + const database = sqlite(sunriseDB) const workOrderTypes = database .prepare( @@ -32,7 +34,7 @@ export default async function getWorkOrderTypes(): Promise { expectedOrderNumber += 1 } - database.release() + database.close() return workOrderTypes } diff --git a/database/getWorkOrders.d.ts b/database/getWorkOrders.d.ts index 0cc1e28c..fb43132a 100644 --- a/database/getWorkOrders.d.ts +++ b/database/getWorkOrders.d.ts @@ -1,4 +1,4 @@ -import type { PoolConnection } from 'better-sqlite-pool'; +import sqlite from 'better-sqlite3'; import type { WorkOrder } from '../types/record.types.js'; export interface GetWorkOrdersFilters { workOrderTypeId?: number | string; @@ -8,14 +8,14 @@ export interface GetWorkOrdersFilters { contractId?: number | string; deceasedName?: string; } -interface GetWorkOrdersOptions { +export interface GetWorkOrdersOptions { limit: number; - offset: number; + offset: number | string; includeBurialSites?: boolean; includeComments?: boolean; includeMilestones?: boolean; } -export declare function getWorkOrders(filters: GetWorkOrdersFilters, options: GetWorkOrdersOptions, connectedDatabase?: PoolConnection): Promise<{ +export declare function getWorkOrders(filters: GetWorkOrdersFilters, options: GetWorkOrdersOptions, connectedDatabase?: sqlite.Database): Promise<{ count: number; workOrders: WorkOrder[]; }>; diff --git a/database/getWorkOrders.js b/database/getWorkOrders.js index d213fe95..9faa362f 100644 --- a/database/getWorkOrders.js +++ b/database/getWorkOrders.js @@ -1,12 +1,13 @@ import { dateIntegerToString, dateStringToInteger } from '@cityssm/utils-datetime'; +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { getBurialSiteNameWhereClause, getDeceasedNameWhereClause } from '../helpers/functions.sqlFilters.js'; import getBurialSites from './getBurialSites.js'; import getContracts from './getContracts.js'; import getWorkOrderComments from './getWorkOrderComments.js'; import getWorkOrderMilestones from './getWorkOrderMilestones.js'; -import { acquireConnection } from './pool.js'; export async function getWorkOrders(filters, options, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); + const database = connectedDatabase ?? sqlite(sunriseDB); database.function('userFn_dateIntegerToString', dateIntegerToString); const { sqlParameters, sqlWhereClause } = buildWhereClause(filters); const count = database @@ -55,7 +56,7 @@ export async function getWorkOrders(filters, options, connectedDatabase) { } } if (connectedDatabase === undefined) { - database.release(); + database.close(); } return { count, @@ -64,14 +65,14 @@ export async function getWorkOrders(filters, options, connectedDatabase) { } async function addInclusions(workOrder, options, database) { if (options.includeComments ?? false) { - workOrder.workOrderComments = await getWorkOrderComments(workOrder.workOrderId, database); + workOrder.workOrderComments = getWorkOrderComments(workOrder.workOrderId, database); } if (options.includeBurialSites ?? false) { if (workOrder.workOrderBurialSiteCount === 0) { workOrder.workOrderBurialSites = []; } else { - const workOrderBurialSitesResults = await getBurialSites({ + const workOrderBurialSitesResults = getBurialSites({ workOrderId: workOrder.workOrderId }, { limit: -1, diff --git a/database/getWorkOrders.ts b/database/getWorkOrders.ts index 38d1b5f3..b7429ae2 100644 --- a/database/getWorkOrders.ts +++ b/database/getWorkOrders.ts @@ -1,11 +1,11 @@ -import type { PoolConnection } from 'better-sqlite-pool' - import { type DateString, dateIntegerToString, dateStringToInteger } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' +import { sunriseDB } from '../helpers/database.helpers.js' import { getBurialSiteNameWhereClause, getDeceasedNameWhereClause @@ -16,7 +16,6 @@ import getBurialSites from './getBurialSites.js' import getContracts from './getContracts.js' import getWorkOrderComments from './getWorkOrderComments.js' import getWorkOrderMilestones from './getWorkOrderMilestones.js' -import { acquireConnection } from './pool.js' export interface GetWorkOrdersFilters { workOrderTypeId?: number | string @@ -29,9 +28,9 @@ export interface GetWorkOrdersFilters { deceasedName?: string } -interface GetWorkOrdersOptions { +export interface GetWorkOrdersOptions { limit: number - offset: number + offset: number | string includeBurialSites?: boolean includeComments?: boolean @@ -41,9 +40,9 @@ interface GetWorkOrdersOptions { export async function getWorkOrders( filters: GetWorkOrdersFilters, options: GetWorkOrdersOptions, - connectedDatabase?: PoolConnection + connectedDatabase?: sqlite.Database ): Promise<{ count: number; workOrders: WorkOrder[] }> { - const database = connectedDatabase ?? (await acquireConnection()) + const database = connectedDatabase ?? sqlite(sunriseDB) database.function('userFn_dateIntegerToString', dateIntegerToString) @@ -109,7 +108,7 @@ export async function getWorkOrders( } if (connectedDatabase === undefined) { - database.release() + database.close() } return { @@ -121,10 +120,10 @@ export async function getWorkOrders( async function addInclusions( workOrder: WorkOrder, options: GetWorkOrdersOptions, - database: PoolConnection + database: sqlite.Database ): Promise { if (options.includeComments ?? false) { - workOrder.workOrderComments = await getWorkOrderComments( + workOrder.workOrderComments = getWorkOrderComments( workOrder.workOrderId, database ) @@ -134,7 +133,7 @@ async function addInclusions( if (workOrder.workOrderBurialSiteCount === 0) { workOrder.workOrderBurialSites = [] } else { - const workOrderBurialSitesResults = await getBurialSites( + const workOrderBurialSitesResults = getBurialSites( { workOrderId: workOrder.workOrderId }, diff --git a/database/moveBurialSiteTypeField.d.ts b/database/moveBurialSiteTypeField.d.ts index 8a503006..15373996 100644 --- a/database/moveBurialSiteTypeField.d.ts +++ b/database/moveBurialSiteTypeField.d.ts @@ -1,4 +1,4 @@ -export declare function moveBurialSiteTypeFieldDown(burialSiteTypeFieldId: number | string): Promise; -export declare function moveBurialSiteTypeFieldDownToBottom(burialSiteTypeFieldId: number | string): Promise; -export declare function moveBurialSiteTypeFieldUp(burialSiteTypeFieldId: number | string): Promise; -export declare function moveBurialSiteTypeFieldUpToTop(burialSiteTypeFieldId: number | string): Promise; +export declare function moveBurialSiteTypeFieldDown(burialSiteTypeFieldId: number | string): boolean; +export declare function moveBurialSiteTypeFieldDownToBottom(burialSiteTypeFieldId: number | string): boolean; +export declare function moveBurialSiteTypeFieldUp(burialSiteTypeFieldId: number | string): boolean; +export declare function moveBurialSiteTypeFieldUpToTop(burialSiteTypeFieldId: number | string): boolean; diff --git a/database/moveBurialSiteTypeField.js b/database/moveBurialSiteTypeField.js index a8060079..485993d8 100644 --- a/database/moveBurialSiteTypeField.js +++ b/database/moveBurialSiteTypeField.js @@ -1,8 +1,9 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { clearCacheByTableName } from '../helpers/functions.cache.js'; -import { acquireConnection } from './pool.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export async function moveBurialSiteTypeFieldDown(burialSiteTypeFieldId) { - const database = await acquireConnection(); +export function moveBurialSiteTypeFieldDown(burialSiteTypeFieldId) { + const database = sqlite(sunriseDB); const currentField = getCurrentField(burialSiteTypeFieldId, database); database .prepare(`update BurialSiteTypeFields @@ -11,12 +12,12 @@ export async function moveBurialSiteTypeFieldDown(burialSiteTypeFieldId) { and burialSiteTypeId = ? and orderNumber = ? + 1`) .run(currentField.burialSiteTypeId, currentField.orderNumber); const success = updateRecordOrderNumber('BurialSiteTypeFields', burialSiteTypeFieldId, currentField.orderNumber + 1, database); - database.release(); + database.close(); clearCacheByTableName('BurialSiteTypeFields'); return success; } -export async function moveBurialSiteTypeFieldDownToBottom(burialSiteTypeFieldId) { - const database = await acquireConnection(); +export function moveBurialSiteTypeFieldDownToBottom(burialSiteTypeFieldId) { + const database = sqlite(sunriseDB); const currentField = getCurrentField(burialSiteTypeFieldId, database); const maxOrderNumber = database .prepare(`select max(orderNumber) as maxOrderNumber @@ -34,15 +35,15 @@ export async function moveBurialSiteTypeFieldDownToBottom(burialSiteTypeFieldId) and orderNumber > ?`) .run(currentField.burialSiteTypeId, currentField.orderNumber); } - database.release(); + database.close(); clearCacheByTableName('BurialSiteTypeFields'); return true; } -export async function moveBurialSiteTypeFieldUp(burialSiteTypeFieldId) { - const database = await acquireConnection(); +export function moveBurialSiteTypeFieldUp(burialSiteTypeFieldId) { + const database = sqlite(sunriseDB); const currentField = getCurrentField(burialSiteTypeFieldId, database); if (currentField.orderNumber <= 0) { - database.release(); + database.close(); return true; } database @@ -53,12 +54,12 @@ export async function moveBurialSiteTypeFieldUp(burialSiteTypeFieldId) { and orderNumber = ? - 1`) .run(currentField.burialSiteTypeId, currentField.orderNumber); const success = updateRecordOrderNumber('BurialSiteTypeFields', burialSiteTypeFieldId, currentField.orderNumber - 1, database); - database.release(); + database.close(); clearCacheByTableName('BurialSiteTypeFields'); return success; } -export async function moveBurialSiteTypeFieldUpToTop(burialSiteTypeFieldId) { - const database = await acquireConnection(); +export function moveBurialSiteTypeFieldUpToTop(burialSiteTypeFieldId) { + const database = sqlite(sunriseDB); const currentField = getCurrentField(burialSiteTypeFieldId, database); if (currentField.orderNumber > 0) { updateRecordOrderNumber('BurialSiteTypeFields', burialSiteTypeFieldId, -1, database); @@ -70,7 +71,7 @@ export async function moveBurialSiteTypeFieldUpToTop(burialSiteTypeFieldId) { and orderNumber < ?`) .run(currentField.burialSiteTypeId, currentField.orderNumber); } - database.release(); + database.close(); clearCacheByTableName('BurialSiteTypeFields'); return true; } diff --git a/database/moveBurialSiteTypeField.ts b/database/moveBurialSiteTypeField.ts index c984c3d8..6c42f0ac 100644 --- a/database/moveBurialSiteTypeField.ts +++ b/database/moveBurialSiteTypeField.ts @@ -1,14 +1,14 @@ -import type { PoolConnection } from 'better-sqlite-pool' +import sqlite from 'better-sqlite3' +import { sunriseDB } from '../helpers/database.helpers.js' import { clearCacheByTableName } from '../helpers/functions.cache.js' -import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export async function moveBurialSiteTypeFieldDown( +export function moveBurialSiteTypeFieldDown( burialSiteTypeFieldId: number | string -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const currentField = getCurrentField(burialSiteTypeFieldId, database) @@ -28,17 +28,17 @@ export async function moveBurialSiteTypeFieldDown( database ) - database.release() + database.close() clearCacheByTableName('BurialSiteTypeFields') return success } -export async function moveBurialSiteTypeFieldDownToBottom( +export function moveBurialSiteTypeFieldDownToBottom( burialSiteTypeFieldId: number | string -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const currentField = getCurrentField(burialSiteTypeFieldId, database) @@ -72,22 +72,22 @@ export async function moveBurialSiteTypeFieldDownToBottom( .run(currentField.burialSiteTypeId, currentField.orderNumber) } - database.release() + database.close() clearCacheByTableName('BurialSiteTypeFields') return true } -export async function moveBurialSiteTypeFieldUp( +export function moveBurialSiteTypeFieldUp( burialSiteTypeFieldId: number | string -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const currentField = getCurrentField(burialSiteTypeFieldId, database) if (currentField.orderNumber <= 0) { - database.release() + database.close() return true } @@ -108,17 +108,17 @@ export async function moveBurialSiteTypeFieldUp( database ) - database.release() + database.close() clearCacheByTableName('BurialSiteTypeFields') return success } -export async function moveBurialSiteTypeFieldUpToTop( +export function moveBurialSiteTypeFieldUpToTop( burialSiteTypeFieldId: number | string -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const currentField = getCurrentField(burialSiteTypeFieldId, database) @@ -141,7 +141,7 @@ export async function moveBurialSiteTypeFieldUpToTop( .run(currentField.burialSiteTypeId, currentField.orderNumber) } - database.release() + database.close() clearCacheByTableName('BurialSiteTypeFields') @@ -150,7 +150,7 @@ export async function moveBurialSiteTypeFieldUpToTop( function getCurrentField( burialSiteTypeFieldId: number | string, - connectedDatabase: PoolConnection + connectedDatabase: sqlite.Database ): { burialSiteTypeId?: number; orderNumber: number } { return connectedDatabase .prepare( diff --git a/database/moveContractTypeField.d.ts b/database/moveContractTypeField.d.ts index 8c12b2a7..558322ad 100644 --- a/database/moveContractTypeField.d.ts +++ b/database/moveContractTypeField.d.ts @@ -1,4 +1,4 @@ -export declare function moveContractTypeFieldDown(contractTypeFieldId: number | string): Promise; -export declare function moveContractTypeFieldDownToBottom(contractTypeFieldId: number | string): Promise; -export declare function moveContractTypeFieldUp(contractTypeFieldId: number | string): Promise; -export declare function moveContractTypeFieldUpToTop(contractTypeFieldId: number | string): Promise; +export declare function moveContractTypeFieldDown(contractTypeFieldId: number | string): boolean; +export declare function moveContractTypeFieldDownToBottom(contractTypeFieldId: number | string): boolean; +export declare function moveContractTypeFieldUp(contractTypeFieldId: number | string): boolean; +export declare function moveContractTypeFieldUpToTop(contractTypeFieldId: number | string): boolean; diff --git a/database/moveContractTypeField.js b/database/moveContractTypeField.js index 04f9d0d8..9947d186 100644 --- a/database/moveContractTypeField.js +++ b/database/moveContractTypeField.js @@ -1,8 +1,9 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { clearCacheByTableName } from '../helpers/functions.cache.js'; -import { acquireConnection } from './pool.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export async function moveContractTypeFieldDown(contractTypeFieldId) { - const database = await acquireConnection(); +export function moveContractTypeFieldDown(contractTypeFieldId) { + const database = sqlite(sunriseDB); const currentField = getCurrentField(contractTypeFieldId, database); database .prepare(`update ContractTypeFields @@ -14,12 +15,12 @@ export async function moveContractTypeFieldDown(contractTypeFieldId) { and orderNumber = ? + 1`) .run(currentField.orderNumber); const success = updateRecordOrderNumber('ContractTypeFields', contractTypeFieldId, currentField.orderNumber + 1, database); - database.release(); + database.close(); clearCacheByTableName('ContractTypeFields'); return success; } -export async function moveContractTypeFieldDownToBottom(contractTypeFieldId) { - const database = await acquireConnection(); +export function moveContractTypeFieldDownToBottom(contractTypeFieldId) { + const database = sqlite(sunriseDB); const currentField = getCurrentField(contractTypeFieldId, database); const contractTypeParameters = []; if (currentField.contractTypeId) { @@ -45,15 +46,15 @@ export async function moveContractTypeFieldDownToBottom(contractTypeFieldId) { and orderNumber > ?`) .run(contractTypeParameters); } - database.release(); + database.close(); clearCacheByTableName('ContractTypeFields'); return true; } -export async function moveContractTypeFieldUp(contractTypeFieldId) { - const database = await acquireConnection(); +export function moveContractTypeFieldUp(contractTypeFieldId) { + const database = sqlite(sunriseDB); const currentField = getCurrentField(contractTypeFieldId, database); if (currentField.orderNumber <= 0) { - database.release(); + database.close(); return true; } database @@ -66,12 +67,12 @@ export async function moveContractTypeFieldUp(contractTypeFieldId) { and orderNumber = ? - 1`) .run(currentField.orderNumber); const success = updateRecordOrderNumber('ContractTypeFields', contractTypeFieldId, currentField.orderNumber - 1, database); - database.release(); + database.close(); clearCacheByTableName('ContractTypeFields'); return success; } -export async function moveContractTypeFieldUpToTop(contractTypeFieldId) { - const database = await acquireConnection(); +export function moveContractTypeFieldUpToTop(contractTypeFieldId) { + const database = sqlite(sunriseDB); const currentField = getCurrentField(contractTypeFieldId, database); if (currentField.orderNumber > 0) { updateRecordOrderNumber('ContractTypeFields', contractTypeFieldId, -1, database); @@ -89,7 +90,7 @@ export async function moveContractTypeFieldUpToTop(contractTypeFieldId) { : ' and contractTypeId is null'} and orderNumber < ?`) .run(contractTypeParameters); } - database.release(); + database.close(); clearCacheByTableName('ContractTypeFields'); return true; } diff --git a/database/moveContractTypeField.ts b/database/moveContractTypeField.ts index 60650caa..d2adb230 100644 --- a/database/moveContractTypeField.ts +++ b/database/moveContractTypeField.ts @@ -1,14 +1,14 @@ -import type { PoolConnection } from 'better-sqlite-pool' +import sqlite from 'better-sqlite3' +import { sunriseDB } from '../helpers/database.helpers.js' import { clearCacheByTableName } from '../helpers/functions.cache.js' -import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export async function moveContractTypeFieldDown( +export function moveContractTypeFieldDown( contractTypeFieldId: number | string -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const currentField = getCurrentField(contractTypeFieldId, database) @@ -33,17 +33,17 @@ export async function moveContractTypeFieldDown( database ) - database.release() + database.close() clearCacheByTableName('ContractTypeFields') return success } -export async function moveContractTypeFieldDownToBottom( +export function moveContractTypeFieldDownToBottom( contractTypeFieldId: number | string -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const currentField = getCurrentField(contractTypeFieldId, database) @@ -92,22 +92,22 @@ export async function moveContractTypeFieldDownToBottom( .run(contractTypeParameters) } - database.release() + database.close() clearCacheByTableName('ContractTypeFields') return true } -export async function moveContractTypeFieldUp( +export function moveContractTypeFieldUp( contractTypeFieldId: number | string -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const currentField = getCurrentField(contractTypeFieldId, database) if (currentField.orderNumber <= 0) { - database.release() + database.close() return true } @@ -132,17 +132,17 @@ export async function moveContractTypeFieldUp( database ) - database.release() + database.close() clearCacheByTableName('ContractTypeFields') return success } -export async function moveContractTypeFieldUpToTop( +export function moveContractTypeFieldUpToTop( contractTypeFieldId: number | string -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const currentField = getCurrentField(contractTypeFieldId, database) @@ -176,7 +176,7 @@ export async function moveContractTypeFieldUpToTop( .run(contractTypeParameters) } - database.release() + database.close() clearCacheByTableName('ContractTypeFields') @@ -185,7 +185,7 @@ export async function moveContractTypeFieldUpToTop( function getCurrentField( contractTypeFieldId: number | string, - connectedDatabase: PoolConnection + connectedDatabase: sqlite.Database ): { contractTypeId?: number; orderNumber: number } { return connectedDatabase .prepare( diff --git a/database/moveContractTypePrintDown.d.ts b/database/moveContractTypePrintDown.d.ts index 9865d200..6c1ee0f2 100644 --- a/database/moveContractTypePrintDown.d.ts +++ b/database/moveContractTypePrintDown.d.ts @@ -1,3 +1,3 @@ -export declare function moveContractTypePrintDown(contractTypeId: number | string, printEJS: string): Promise; -export declare function moveContractTypePrintDownToBottom(contractTypeId: number | string, printEJS: string): Promise; +export declare function moveContractTypePrintDown(contractTypeId: number | string, printEJS: string): boolean; +export declare function moveContractTypePrintDownToBottom(contractTypeId: number | string, printEJS: string): boolean; export default moveContractTypePrintDown; diff --git a/database/moveContractTypePrintDown.js b/database/moveContractTypePrintDown.js index 496049ab..5da7ef0c 100644 --- a/database/moveContractTypePrintDown.js +++ b/database/moveContractTypePrintDown.js @@ -1,7 +1,8 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { clearCacheByTableName } from '../helpers/functions.cache.js'; -import { acquireConnection } from './pool.js'; -export async function moveContractTypePrintDown(contractTypeId, printEJS) { - const database = await acquireConnection(); +export function moveContractTypePrintDown(contractTypeId, printEJS) { + const database = sqlite(sunriseDB); const currentOrderNumber = database .prepare('select orderNumber from ContractTypePrints where contractTypeId = ? and printEJS = ?') .get(contractTypeId, printEJS).orderNumber; @@ -15,12 +16,12 @@ export async function moveContractTypePrintDown(contractTypeId, printEJS) { const result = database .prepare('update ContractTypePrints set orderNumber = ? + 1 where contractTypeId = ? and printEJS = ?') .run(currentOrderNumber, contractTypeId, printEJS); - database.release(); + database.close(); clearCacheByTableName('ContractTypePrints'); return result.changes > 0; } -export async function moveContractTypePrintDownToBottom(contractTypeId, printEJS) { - const database = await acquireConnection(); +export function moveContractTypePrintDownToBottom(contractTypeId, printEJS) { + const database = sqlite(sunriseDB); const currentOrderNumber = database .prepare('select orderNumber from ContractTypePrints where contractTypeId = ? and printEJS = ?') .get(contractTypeId, printEJS).orderNumber; @@ -45,7 +46,7 @@ export async function moveContractTypePrintDownToBottom(contractTypeId, printEJS and orderNumber > ?`) .run(contractTypeId, currentOrderNumber); } - database.release(); + database.close(); clearCacheByTableName('ContractTypePrints'); return true; } diff --git a/database/moveContractTypePrintDown.ts b/database/moveContractTypePrintDown.ts index 662b9b7c..2135c0b4 100644 --- a/database/moveContractTypePrintDown.ts +++ b/database/moveContractTypePrintDown.ts @@ -1,12 +1,13 @@ +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' import { clearCacheByTableName } from '../helpers/functions.cache.js' -import { acquireConnection } from './pool.js' - -export async function moveContractTypePrintDown( +export function moveContractTypePrintDown( contractTypeId: number | string, printEJS: string -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const currentOrderNumber = ( database @@ -32,18 +33,18 @@ export async function moveContractTypePrintDown( ) .run(currentOrderNumber, contractTypeId, printEJS) - database.release() + database.close() clearCacheByTableName('ContractTypePrints') return result.changes > 0 } -export async function moveContractTypePrintDownToBottom( +export function moveContractTypePrintDownToBottom( contractTypeId: number | string, printEJS: string -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const currentOrderNumber = ( database @@ -85,7 +86,7 @@ export async function moveContractTypePrintDownToBottom( .run(contractTypeId, currentOrderNumber) } - database.release() + database.close() clearCacheByTableName('ContractTypePrints') diff --git a/database/moveContractTypePrintUp.d.ts b/database/moveContractTypePrintUp.d.ts index 704ac512..5f3df267 100644 --- a/database/moveContractTypePrintUp.d.ts +++ b/database/moveContractTypePrintUp.d.ts @@ -1,3 +1,3 @@ -export declare function moveContractTypePrintUp(contractTypeId: number | string, printEJS: string): Promise; -export declare function moveContractTypePrintUpToTop(contractTypeId: number | string, printEJS: string): Promise; +export declare function moveContractTypePrintUp(contractTypeId: number | string, printEJS: string): boolean; +export declare function moveContractTypePrintUpToTop(contractTypeId: number | string, printEJS: string): boolean; export default moveContractTypePrintUp; diff --git a/database/moveContractTypePrintUp.js b/database/moveContractTypePrintUp.js index 907cf331..979c53eb 100644 --- a/database/moveContractTypePrintUp.js +++ b/database/moveContractTypePrintUp.js @@ -1,12 +1,13 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { clearCacheByTableName } from '../helpers/functions.cache.js'; -import { acquireConnection } from './pool.js'; -export async function moveContractTypePrintUp(contractTypeId, printEJS) { - const database = await acquireConnection(); +export function moveContractTypePrintUp(contractTypeId, printEJS) { + const database = sqlite(sunriseDB); const currentOrderNumber = database .prepare('select orderNumber from ContractTypePrints where contractTypeId = ? and printEJS = ?') .get(contractTypeId, printEJS).orderNumber; if (currentOrderNumber <= 0) { - database.release(); + database.close(); return true; } database @@ -19,12 +20,12 @@ export async function moveContractTypePrintUp(contractTypeId, printEJS) { const result = database .prepare('update ContractTypePrints set orderNumber = ? - 1 where contractTypeId = ? and printEJS = ?') .run(currentOrderNumber, contractTypeId, printEJS); - database.release(); + database.close(); clearCacheByTableName('ContractTypePrints'); return result.changes > 0; } -export async function moveContractTypePrintUpToTop(contractTypeId, printEJS) { - const database = await acquireConnection(); +export function moveContractTypePrintUpToTop(contractTypeId, printEJS) { + const database = sqlite(sunriseDB); const currentOrderNumber = database .prepare('select orderNumber from ContractTypePrints where contractTypeId = ? and printEJS = ?') .get(contractTypeId, printEJS).orderNumber; @@ -43,7 +44,7 @@ export async function moveContractTypePrintUpToTop(contractTypeId, printEJS) { and orderNumber < ?`) .run(contractTypeId, currentOrderNumber); } - database.release(); + database.close(); clearCacheByTableName('ContractTypePrints'); return true; } diff --git a/database/moveContractTypePrintUp.ts b/database/moveContractTypePrintUp.ts index f97e1b21..9dd412cd 100644 --- a/database/moveContractTypePrintUp.ts +++ b/database/moveContractTypePrintUp.ts @@ -1,12 +1,13 @@ +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' import { clearCacheByTableName } from '../helpers/functions.cache.js' -import { acquireConnection } from './pool.js' - -export async function moveContractTypePrintUp( +export function moveContractTypePrintUp( contractTypeId: number | string, printEJS: string -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const currentOrderNumber = ( database @@ -17,7 +18,7 @@ export async function moveContractTypePrintUp( ).orderNumber if (currentOrderNumber <= 0) { - database.release() + database.close() return true } @@ -37,18 +38,18 @@ export async function moveContractTypePrintUp( ) .run(currentOrderNumber, contractTypeId, printEJS) - database.release() + database.close() clearCacheByTableName('ContractTypePrints') return result.changes > 0 } -export async function moveContractTypePrintUpToTop( +export function moveContractTypePrintUpToTop( contractTypeId: number | string, printEJS: string -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const currentOrderNumber = ( database @@ -79,7 +80,7 @@ export async function moveContractTypePrintUpToTop( .run(contractTypeId, currentOrderNumber) } - database.release() + database.close() clearCacheByTableName('ContractTypePrints') diff --git a/database/moveFee.d.ts b/database/moveFee.d.ts index b1fb351d..99f4df4d 100644 --- a/database/moveFee.d.ts +++ b/database/moveFee.d.ts @@ -1,5 +1,5 @@ -export declare function moveFeeDown(feeId: number | string): Promise; -export declare function moveFeeDownToBottom(feeId: number | string): Promise; -export declare function moveFeeUp(feeId: number | string): Promise; -export declare function moveFeeUpToTop(feeId: number | string): Promise; +export declare function moveFeeDown(feeId: number | string): boolean; +export declare function moveFeeDownToBottom(feeId: number | string): boolean; +export declare function moveFeeUp(feeId: number | string): boolean; +export declare function moveFeeUpToTop(feeId: number | string): boolean; export default moveFeeUp; diff --git a/database/moveFee.js b/database/moveFee.js index f45fb10a..5021adfb 100644 --- a/database/moveFee.js +++ b/database/moveFee.js @@ -1,9 +1,10 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import getFee from './getFee.js'; -import { acquireConnection } from './pool.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; -export async function moveFeeDown(feeId) { - const database = await acquireConnection(); - const currentFee = (await getFee(feeId, database)); +export function moveFeeDown(feeId) { + const database = sqlite(sunriseDB); + const currentFee = getFee(feeId, database); database .prepare(`update Fees set orderNumber = orderNumber - 1 @@ -12,12 +13,12 @@ export async function moveFeeDown(feeId) { and orderNumber = ? + 1`) .run(currentFee.feeCategoryId, currentFee.orderNumber); const success = updateRecordOrderNumber('Fees', feeId, currentFee.orderNumber + 1, database); - database.release(); + database.close(); return success; } -export async function moveFeeDownToBottom(feeId) { - const database = await acquireConnection(); - const currentFee = (await getFee(feeId, database)); +export function moveFeeDownToBottom(feeId) { + const database = sqlite(sunriseDB); + const currentFee = getFee(feeId, database); const maxOrderNumber = database .prepare(`select max(orderNumber) as maxOrderNumber from Fees @@ -33,14 +34,14 @@ export async function moveFeeDownToBottom(feeId) { and feeCategoryId = ? and orderNumber > ?`) .run(currentFee.feeCategoryId, currentFee.orderNumber); } - database.release(); + database.close(); return true; } -export async function moveFeeUp(feeId) { - const database = await acquireConnection(); - const currentFee = (await getFee(feeId, database)); +export function moveFeeUp(feeId) { + const database = sqlite(sunriseDB); + const currentFee = getFee(feeId, database); if (currentFee.orderNumber <= 0) { - database.release(); + database.close(); return true; } database @@ -51,12 +52,12 @@ export async function moveFeeUp(feeId) { and orderNumber = ? - 1`) .run(currentFee.feeCategoryId, currentFee.orderNumber); const success = updateRecordOrderNumber('Fees', feeId, currentFee.orderNumber - 1, database); - database.release(); + database.close(); return success; } -export async function moveFeeUpToTop(feeId) { - const database = await acquireConnection(); - const currentFee = (await getFee(feeId, database)); +export function moveFeeUpToTop(feeId) { + const database = sqlite(sunriseDB); + const currentFee = getFee(feeId, database); if (currentFee.orderNumber > 0) { updateRecordOrderNumber('Fees', feeId, -1, database); database @@ -67,7 +68,7 @@ export async function moveFeeUpToTop(feeId) { and orderNumber < ?`) .run(currentFee.feeCategoryId, currentFee.orderNumber); } - database.release(); + database.close(); return true; } export default moveFeeUp; diff --git a/database/moveFee.ts b/database/moveFee.ts index 5ac279b7..e520216e 100644 --- a/database/moveFee.ts +++ b/database/moveFee.ts @@ -1,13 +1,15 @@ +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' import type { Fee } from '../types/record.types.js' import getFee from './getFee.js' -import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' -export async function moveFeeDown(feeId: number | string): Promise { - const database = await acquireConnection() +export function moveFeeDown(feeId: number | string): boolean { + const database = sqlite(sunriseDB) - const currentFee = (await getFee(feeId, database)) as Fee + const currentFee = getFee(feeId, database) as Fee database .prepare( @@ -26,17 +28,15 @@ export async function moveFeeDown(feeId: number | string): Promise { database ) - database.release() + database.close() return success } -export async function moveFeeDownToBottom( - feeId: number | string -): Promise { - const database = await acquireConnection() +export function moveFeeDownToBottom(feeId: number | string): boolean { + const database = sqlite(sunriseDB) - const currentFee = (await getFee(feeId, database)) as Fee + const currentFee = getFee(feeId, database) as Fee const maxOrderNumber = ( database @@ -62,18 +62,18 @@ export async function moveFeeDownToBottom( .run(currentFee.feeCategoryId, currentFee.orderNumber) } - database.release() + database.close() return true } -export async function moveFeeUp(feeId: number | string): Promise { - const database = await acquireConnection() +export function moveFeeUp(feeId: number | string): boolean { + const database = sqlite(sunriseDB) - const currentFee = (await getFee(feeId, database)) as Fee + const currentFee = getFee(feeId, database) as Fee if (currentFee.orderNumber <= 0) { - database.release() + database.close() return true } @@ -94,15 +94,15 @@ export async function moveFeeUp(feeId: number | string): Promise { database ) - database.release() + database.close() return success } -export async function moveFeeUpToTop(feeId: number | string): Promise { - const database = await acquireConnection() +export function moveFeeUpToTop(feeId: number | string): boolean { + const database = sqlite(sunriseDB) - const currentFee = (await getFee(feeId, database)) as Fee + const currentFee = getFee(feeId, database) as Fee if (currentFee.orderNumber > 0) { updateRecordOrderNumber('Fees', feeId, -1, database) @@ -118,7 +118,7 @@ export async function moveFeeUpToTop(feeId: number | string): Promise { .run(currentFee.feeCategoryId, currentFee.orderNumber) } - database.release() + database.close() return true } diff --git a/database/moveRecord.d.ts b/database/moveRecord.d.ts index ad573221..4138e0b3 100644 --- a/database/moveRecord.d.ts +++ b/database/moveRecord.d.ts @@ -1,6 +1,6 @@ type RecordTable = 'BurialSiteStatuses' | 'BurialSiteTypes' | 'ContractTypes' | 'FeeCategories' | 'WorkOrderMilestoneTypes' | 'WorkOrderTypes'; -export declare function moveRecordDown(recordTable: RecordTable, recordId: number | string): Promise; -export declare function moveRecordDownToBottom(recordTable: RecordTable, recordId: number | string): Promise; -export declare function moveRecordUp(recordTable: RecordTable, recordId: number | string): Promise; -export declare function moveRecordUpToTop(recordTable: RecordTable, recordId: number | string): Promise; +export declare function moveRecordDown(recordTable: RecordTable, recordId: number | string): boolean; +export declare function moveRecordDownToBottom(recordTable: RecordTable, recordId: number | string): boolean; +export declare function moveRecordUp(recordTable: RecordTable, recordId: number | string): boolean; +export declare function moveRecordUpToTop(recordTable: RecordTable, recordId: number | string): boolean; export {}; diff --git a/database/moveRecord.js b/database/moveRecord.js index 9654ca62..f7854e2d 100644 --- a/database/moveRecord.js +++ b/database/moveRecord.js @@ -1,5 +1,6 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { clearCacheByTableName } from '../helpers/functions.cache.js'; -import { acquireConnection } from './pool.js'; import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'; const recordIdColumns = new Map([ ['BurialSiteStatuses', 'burialSiteStatusId'], @@ -9,8 +10,8 @@ const recordIdColumns = new Map([ ['WorkOrderMilestoneTypes', 'workOrderMilestoneTypeId'], ['WorkOrderTypes', 'workOrderTypeId'] ]); -export async function moveRecordDown(recordTable, recordId) { - const database = await acquireConnection(); +export function moveRecordDown(recordTable, recordId) { + const database = sqlite(sunriseDB); const currentOrderNumber = getCurrentOrderNumber(recordTable, recordId, database); database .prepare(`update ${recordTable} @@ -19,12 +20,12 @@ export async function moveRecordDown(recordTable, recordId) { and orderNumber = ? + 1`) .run(currentOrderNumber); const success = updateRecordOrderNumber(recordTable, recordId, currentOrderNumber + 1, database); - database.release(); + database.close(); clearCacheByTableName(recordTable); return success; } -export async function moveRecordDownToBottom(recordTable, recordId) { - const database = await acquireConnection(); +export function moveRecordDownToBottom(recordTable, recordId) { + const database = sqlite(sunriseDB); const currentOrderNumber = getCurrentOrderNumber(recordTable, recordId, database); const maxOrderNumber = database .prepare(`select max(orderNumber) as maxOrderNumber @@ -40,15 +41,15 @@ export async function moveRecordDownToBottom(recordTable, recordId) { and orderNumber > ?`) .run(currentOrderNumber); } - database.release(); + database.close(); clearCacheByTableName(recordTable); return true; } -export async function moveRecordUp(recordTable, recordId) { - const database = await acquireConnection(); +export function moveRecordUp(recordTable, recordId) { + const database = sqlite(sunriseDB); const currentOrderNumber = getCurrentOrderNumber(recordTable, recordId, database); if (currentOrderNumber <= 0) { - database.release(); + database.close(); return true; } database @@ -58,12 +59,12 @@ export async function moveRecordUp(recordTable, recordId) { and orderNumber = ? - 1`) .run(currentOrderNumber); const success = updateRecordOrderNumber(recordTable, recordId, currentOrderNumber - 1, database); - database.release(); + database.close(); clearCacheByTableName(recordTable); return success; } -export async function moveRecordUpToTop(recordTable, recordId) { - const database = await acquireConnection(); +export function moveRecordUpToTop(recordTable, recordId) { + const database = sqlite(sunriseDB); const currentOrderNumber = getCurrentOrderNumber(recordTable, recordId, database); if (currentOrderNumber > 0) { updateRecordOrderNumber(recordTable, recordId, -1, database); @@ -74,7 +75,7 @@ export async function moveRecordUpToTop(recordTable, recordId) { and orderNumber < ?`) .run(currentOrderNumber); } - database.release(); + database.close(); clearCacheByTableName(recordTable); return true; } diff --git a/database/moveRecord.ts b/database/moveRecord.ts index e7e2e783..9fb2f615 100644 --- a/database/moveRecord.ts +++ b/database/moveRecord.ts @@ -1,8 +1,8 @@ -import type sqlite from 'better-sqlite3' +import sqlite from 'better-sqlite3' +import { sunriseDB } from '../helpers/database.helpers.js' import { clearCacheByTableName } from '../helpers/functions.cache.js' -import { acquireConnection } from './pool.js' import { updateRecordOrderNumber } from './updateRecordOrderNumber.js' type RecordTable = @@ -22,11 +22,11 @@ const recordIdColumns = new Map([ ['WorkOrderTypes', 'workOrderTypeId'] ]) -export async function moveRecordDown( +export function moveRecordDown( recordTable: RecordTable, recordId: number | string -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const currentOrderNumber = getCurrentOrderNumber( recordTable, @@ -50,18 +50,18 @@ export async function moveRecordDown( database ) - database.release() + database.close() clearCacheByTableName(recordTable) return success } -export async function moveRecordDownToBottom( +export function moveRecordDownToBottom( recordTable: RecordTable, recordId: number | string -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const currentOrderNumber = getCurrentOrderNumber( recordTable, @@ -92,18 +92,18 @@ export async function moveRecordDownToBottom( .run(currentOrderNumber) } - database.release() + database.close() clearCacheByTableName(recordTable) return true } -export async function moveRecordUp( +export function moveRecordUp( recordTable: RecordTable, recordId: number | string -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const currentOrderNumber = getCurrentOrderNumber( recordTable, @@ -112,7 +112,7 @@ export async function moveRecordUp( ) if (currentOrderNumber <= 0) { - database.release() + database.close() return true } @@ -132,18 +132,18 @@ export async function moveRecordUp( database ) - database.release() + database.close() clearCacheByTableName(recordTable) return success } -export async function moveRecordUpToTop( +export function moveRecordUpToTop( recordTable: RecordTable, recordId: number | string -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const currentOrderNumber = getCurrentOrderNumber( recordTable, @@ -164,7 +164,7 @@ export async function moveRecordUpToTop( .run(currentOrderNumber) } - database.release() + database.close() clearCacheByTableName(recordTable) diff --git a/database/pool.d.ts b/database/pool.d.ts deleted file mode 100644 index bc225ff5..00000000 --- a/database/pool.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import { type PoolConnection } from 'better-sqlite-pool'; -export declare function acquireConnection(): Promise; diff --git a/database/pool.js b/database/pool.js deleted file mode 100644 index f4f0a526..00000000 --- a/database/pool.js +++ /dev/null @@ -1,14 +0,0 @@ -import { Pool } from 'better-sqlite-pool'; -import Debug from 'debug'; -import exitHook from 'exit-hook'; -import { DEBUG_NAMESPACE } from '../debug.config.js'; -import { sunriseDB as databasePath } from '../helpers/database.helpers.js'; -const debug = Debug(`${DEBUG_NAMESPACE}:sunriseDB:pool`); -const pool = new Pool(databasePath); -export async function acquireConnection() { - return await pool.acquire(); -} -exitHook(() => { - debug('Closing database pool'); - pool.close(); -}); diff --git a/database/pool.ts b/database/pool.ts deleted file mode 100644 index a1ec8455..00000000 --- a/database/pool.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { type PoolConnection, Pool } from 'better-sqlite-pool' -import Debug from 'debug' -import exitHook from 'exit-hook' - -import { DEBUG_NAMESPACE } from '../debug.config.js' -import { sunriseDB as databasePath } from '../helpers/database.helpers.js' - -const debug = Debug(`${DEBUG_NAMESPACE}:sunriseDB:pool`) - -const pool = new Pool(databasePath) - -export async function acquireConnection(): Promise { - return await pool.acquire() -} - -exitHook(() => { - debug('Closing database pool') - pool.close() -}) diff --git a/database/rebuildBurialSiteNames.d.ts b/database/rebuildBurialSiteNames.d.ts index 0e79dbc9..cc9043d5 100644 --- a/database/rebuildBurialSiteNames.d.ts +++ b/database/rebuildBurialSiteNames.d.ts @@ -1,2 +1,2 @@ -import type { PoolConnection } from 'better-sqlite-pool'; -export default function rebuildBurialSiteNames(cemeteryId: number | string, user: User, connectedDatabase?: PoolConnection): Promise; +import sqlite from 'better-sqlite3'; +export default function rebuildBurialSiteNames(cemeteryId: number | string, user: User, connectedDatabase?: sqlite.Database): number; diff --git a/database/rebuildBurialSiteNames.js b/database/rebuildBurialSiteNames.js index b328778e..658c7e07 100644 --- a/database/rebuildBurialSiteNames.js +++ b/database/rebuildBurialSiteNames.js @@ -1,15 +1,16 @@ +import sqlite from 'better-sqlite3'; import { buildBurialSiteName } from '../helpers/burialSites.helpers.js'; +import { sunriseDB } from '../helpers/database.helpers.js'; import getCemetery from './getCemetery.js'; -import { acquireConnection } from './pool.js'; -export default async function rebuildBurialSiteNames(cemeteryId, user, connectedDatabase) { - const database = connectedDatabase ?? (await acquireConnection()); +export default function rebuildBurialSiteNames(cemeteryId, user, connectedDatabase) { + const database = connectedDatabase ?? sqlite(sunriseDB); /* * Get the cemetery key */ - const cemetery = await getCemetery(cemeteryId, database); + const cemetery = getCemetery(cemeteryId, database); if (cemetery === undefined) { if (connectedDatabase === undefined) { - database.release(); + database.close(); } return 0; } @@ -23,7 +24,7 @@ export default async function rebuildBurialSiteNames(cemeteryId, user, connected and recordDelete_timeMillis is null`) .run(cemetery.cemeteryKey, user.userName, Date.now(), cemeteryId); if (connectedDatabase === undefined) { - database.release(); + database.close(); } return result.changes; } diff --git a/database/rebuildBurialSiteNames.ts b/database/rebuildBurialSiteNames.ts index 718c95ce..b9e312e7 100644 --- a/database/rebuildBurialSiteNames.ts +++ b/database/rebuildBurialSiteNames.ts @@ -1,26 +1,26 @@ -import type { PoolConnection } from 'better-sqlite-pool' +import sqlite from 'better-sqlite3' import { buildBurialSiteName } from '../helpers/burialSites.helpers.js' +import { sunriseDB } from '../helpers/database.helpers.js' import getCemetery from './getCemetery.js' -import { acquireConnection } from './pool.js' -export default async function rebuildBurialSiteNames( +export default function rebuildBurialSiteNames( cemeteryId: number | string, user: User, - connectedDatabase?: PoolConnection -): Promise { - const database = connectedDatabase ?? (await acquireConnection()) + connectedDatabase?: sqlite.Database +): number { + const database = connectedDatabase ?? sqlite(sunriseDB) /* * Get the cemetery key */ - const cemetery = await getCemetery(cemeteryId, database) + const cemetery = getCemetery(cemeteryId, database) if (cemetery === undefined) { if (connectedDatabase === undefined) { - database.release() + database.close() } return 0 @@ -39,7 +39,7 @@ export default async function rebuildBurialSiteNames( .run(cemetery.cemeteryKey, user.userName, Date.now(), cemeteryId) if (connectedDatabase === undefined) { - database.release() + database.close() } return result.changes diff --git a/database/reopenWorkOrder.d.ts b/database/reopenWorkOrder.d.ts index b9f9ac46..21a9a5a8 100644 --- a/database/reopenWorkOrder.d.ts +++ b/database/reopenWorkOrder.d.ts @@ -1 +1 @@ -export default function reopenWorkOrder(workOrderId: number | string, user: User): Promise; +export default function reopenWorkOrder(workOrderId: number | string, user: User): boolean; diff --git a/database/reopenWorkOrder.js b/database/reopenWorkOrder.js index 1cc8714e..4c578eb8 100644 --- a/database/reopenWorkOrder.js +++ b/database/reopenWorkOrder.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function reopenWorkOrder(workOrderId, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function reopenWorkOrder(workOrderId, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update WorkOrders set workOrderCloseDate = null, @@ -9,6 +10,6 @@ export default async function reopenWorkOrder(workOrderId, user) { where workOrderId = ? and workOrderCloseDate is not null`) .run(user.userName, Date.now(), workOrderId); - database.release(); + database.close(); return result.changes > 0; } diff --git a/database/reopenWorkOrder.ts b/database/reopenWorkOrder.ts index 0c575e46..a5cf3588 100644 --- a/database/reopenWorkOrder.ts +++ b/database/reopenWorkOrder.ts @@ -1,10 +1,12 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' -export default async function reopenWorkOrder( +import { sunriseDB } from '../helpers/database.helpers.js' + +export default function reopenWorkOrder( workOrderId: number | string, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -17,7 +19,7 @@ export default async function reopenWorkOrder( ) .run(user.userName, Date.now(), workOrderId) - database.release() + database.close() return result.changes > 0 } diff --git a/database/reopenWorkOrderMilestone.d.ts b/database/reopenWorkOrderMilestone.d.ts index 50e02ec0..cebb148a 100644 --- a/database/reopenWorkOrderMilestone.d.ts +++ b/database/reopenWorkOrderMilestone.d.ts @@ -1 +1 @@ -export default function reopenWorkOrderMilestone(workOrderMilestoneId: number | string, user: User): Promise; +export default function reopenWorkOrderMilestone(workOrderMilestoneId: number | string, user: User): boolean; diff --git a/database/reopenWorkOrderMilestone.js b/database/reopenWorkOrderMilestone.js index 32927c8c..f769b44e 100644 --- a/database/reopenWorkOrderMilestone.js +++ b/database/reopenWorkOrderMilestone.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function reopenWorkOrderMilestone(workOrderMilestoneId, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function reopenWorkOrderMilestone(workOrderMilestoneId, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update WorkOrderMilestones set workOrderMilestoneCompletionDate = null, @@ -10,6 +11,6 @@ export default async function reopenWorkOrderMilestone(workOrderMilestoneId, use where workOrderMilestoneId = ? and workOrderMilestoneCompletionDate is not null`) .run(user.userName, Date.now(), workOrderMilestoneId); - database.release(); + database.close(); return result.changes > 0; } diff --git a/database/reopenWorkOrderMilestone.ts b/database/reopenWorkOrderMilestone.ts index 449d6a1c..2a2aafe9 100644 --- a/database/reopenWorkOrderMilestone.ts +++ b/database/reopenWorkOrderMilestone.ts @@ -1,10 +1,12 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' -export default async function reopenWorkOrderMilestone( +import { sunriseDB } from '../helpers/database.helpers.js' + +export default function reopenWorkOrderMilestone( workOrderMilestoneId: number | string, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -18,7 +20,7 @@ export default async function reopenWorkOrderMilestone( ) .run(user.userName, Date.now(), workOrderMilestoneId) - database.release() + database.close() return result.changes > 0 } diff --git a/database/updateBurialSite.d.ts b/database/updateBurialSite.d.ts index 1c55a105..233e7102 100644 --- a/database/updateBurialSite.d.ts +++ b/database/updateBurialSite.d.ts @@ -22,5 +22,5 @@ export interface UpdateBurialSiteForm { * @returns True if the burial site was updated. * @throws If an active burial site with the same name already exists. */ -export default function updateBurialSite(updateForm: UpdateBurialSiteForm, user: User): Promise; -export declare function updateBurialSiteStatus(burialSiteId: number | string, burialSiteStatusId: number | string, user: User): Promise; +export default function updateBurialSite(updateForm: UpdateBurialSiteForm, user: User): boolean; +export declare function updateBurialSiteStatus(burialSiteId: number | string, burialSiteStatusId: number | string, user: User): boolean; diff --git a/database/updateBurialSite.js b/database/updateBurialSite.js index 873bb87e..5b7af10a 100644 --- a/database/updateBurialSite.js +++ b/database/updateBurialSite.js @@ -1,8 +1,9 @@ +import sqlite from 'better-sqlite3'; import { buildBurialSiteName } from '../helpers/burialSites.helpers.js'; +import { sunriseDB } from '../helpers/database.helpers.js'; import addOrUpdateBurialSiteField from './addOrUpdateBurialSiteField.js'; import deleteBurialSiteField from './deleteBurialSiteField.js'; import getCemetery from './getCemetery.js'; -import { acquireConnection } from './pool.js'; /** * Updates a burial site. * @param updateForm - The burial site's updated information @@ -10,11 +11,11 @@ import { acquireConnection } from './pool.js'; * @returns True if the burial site was updated. * @throws If an active burial site with the same name already exists. */ -export default async function updateBurialSite(updateForm, user) { - const database = await acquireConnection(); +export default function updateBurialSite(updateForm, user) { + const database = sqlite(sunriseDB); const cemetery = updateForm.cemeteryId === '' ? undefined - : await getCemetery(updateForm.cemeteryId, database); + : getCemetery(updateForm.cemeteryId, database); const burialSiteName = buildBurialSiteName(cemetery?.cemeteryKey, updateForm); // Ensure no active burial sites share the same name const existingBurialSite = database @@ -26,7 +27,7 @@ export default async function updateBurialSite(updateForm, user) { .pluck() .get(burialSiteName, updateForm.burialSiteId); if (existingBurialSite !== undefined) { - database.release(); + database.close(); throw new Error('An active burial site with that name already exists.'); } const result = database @@ -59,20 +60,20 @@ export default async function updateBurialSite(updateForm, user) { const burialSiteTypeFieldIds = (updateForm.burialSiteTypeFieldIds ?? '').split(','); for (const burialSiteTypeFieldId of burialSiteTypeFieldIds) { const fieldValue = updateForm[`fieldValue_${burialSiteTypeFieldId}`]; - await ((fieldValue ?? '') === '' + (fieldValue ?? '') === '' ? deleteBurialSiteField(updateForm.burialSiteId, burialSiteTypeFieldId, user, database) : addOrUpdateBurialSiteField({ burialSiteId: updateForm.burialSiteId, burialSiteTypeFieldId, fieldValue: fieldValue ?? '' - }, user, database)); + }, user, database); } } - database.release(); + database.close(); return result.changes > 0; } -export async function updateBurialSiteStatus(burialSiteId, burialSiteStatusId, user) { - const database = await acquireConnection(); +export function updateBurialSiteStatus(burialSiteId, burialSiteStatusId, user) { + const database = sqlite(sunriseDB); const rightNowMillis = Date.now(); const result = database .prepare(`update BurialSites @@ -82,6 +83,6 @@ export async function updateBurialSiteStatus(burialSiteId, burialSiteStatusId, u where burialSiteId = ? and recordDelete_timeMillis is null`) .run(burialSiteStatusId === '' ? undefined : burialSiteStatusId, user.userName, rightNowMillis, burialSiteId); - database.release(); + database.close(); return result.changes > 0; } diff --git a/database/updateBurialSite.ts b/database/updateBurialSite.ts index c10bd3cb..6650bc40 100644 --- a/database/updateBurialSite.ts +++ b/database/updateBurialSite.ts @@ -1,9 +1,11 @@ +import sqlite from 'better-sqlite3' + import { buildBurialSiteName } from '../helpers/burialSites.helpers.js' +import { sunriseDB } from '../helpers/database.helpers.js' import addOrUpdateBurialSiteField from './addOrUpdateBurialSiteField.js' import deleteBurialSiteField from './deleteBurialSiteField.js' import getCemetery from './getCemetery.js' -import { acquireConnection } from './pool.js' export interface UpdateBurialSiteForm { burialSiteId: number | string @@ -35,16 +37,16 @@ export interface UpdateBurialSiteForm { * @returns True if the burial site was updated. * @throws If an active burial site with the same name already exists. */ -export default async function updateBurialSite( +export default function updateBurialSite( updateForm: UpdateBurialSiteForm, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const cemetery = updateForm.cemeteryId === '' ? undefined - : await getCemetery(updateForm.cemeteryId, database) + : getCemetery(updateForm.cemeteryId, database) const burialSiteName = buildBurialSiteName(cemetery?.cemeteryKey, updateForm) @@ -62,7 +64,7 @@ export default async function updateBurialSite( .get(burialSiteName, updateForm.burialSiteId) as number | undefined if (existingBurialSite !== undefined) { - database.release() + database.close() throw new Error('An active burial site with that name already exists.') } @@ -122,7 +124,7 @@ export default async function updateBurialSite( | string | undefined - await ((fieldValue ?? '') === '' + ;(fieldValue ?? '') === '' ? deleteBurialSiteField( updateForm.burialSiteId, burialSiteTypeFieldId, @@ -137,21 +139,21 @@ export default async function updateBurialSite( }, user, database - )) + ) } } - database.release() + database.close() return result.changes > 0 } -export async function updateBurialSiteStatus( +export function updateBurialSiteStatus( burialSiteId: number | string, burialSiteStatusId: number | string, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const rightNowMillis = Date.now() @@ -171,7 +173,7 @@ export async function updateBurialSiteStatus( burialSiteId ) - database.release() + database.close() return result.changes > 0 } diff --git a/database/updateBurialSiteComment.d.ts b/database/updateBurialSiteComment.d.ts index 69948c0d..4255fb7e 100644 --- a/database/updateBurialSiteComment.d.ts +++ b/database/updateBurialSiteComment.d.ts @@ -5,4 +5,4 @@ export interface UpdateBurialSiteCommentForm { commentDateString: DateString; commentTimeString: TimeString; } -export default function updateBurialSiteComment(commentForm: UpdateBurialSiteCommentForm, user: User): Promise; +export default function updateBurialSiteComment(commentForm: UpdateBurialSiteCommentForm, user: User): boolean; diff --git a/database/updateBurialSiteComment.js b/database/updateBurialSiteComment.js index 7442bcd1..7e4a06d0 100644 --- a/database/updateBurialSiteComment.js +++ b/database/updateBurialSiteComment.js @@ -1,7 +1,8 @@ import { dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime'; -import { acquireConnection } from './pool.js'; -export default async function updateBurialSiteComment(commentForm, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function updateBurialSiteComment(commentForm, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update BurialSiteComments set commentDate = ?, @@ -12,6 +13,6 @@ export default async function updateBurialSiteComment(commentForm, user) { where recordDelete_timeMillis is null and burialSiteCommentId = ?`) .run(dateStringToInteger(commentForm.commentDateString), timeStringToInteger(commentForm.commentTimeString), commentForm.comment, user.userName, Date.now(), commentForm.burialSiteCommentId); - database.release(); + database.close(); return result.changes > 0; } diff --git a/database/updateBurialSiteComment.ts b/database/updateBurialSiteComment.ts index c0fb1b15..1ad6f3da 100644 --- a/database/updateBurialSiteComment.ts +++ b/database/updateBurialSiteComment.ts @@ -4,8 +4,9 @@ import { dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' export interface UpdateBurialSiteCommentForm { burialSiteCommentId: number | string @@ -14,11 +15,11 @@ export interface UpdateBurialSiteCommentForm { commentTimeString: TimeString } -export default async function updateBurialSiteComment( +export default function updateBurialSiteComment( commentForm: UpdateBurialSiteCommentForm, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -40,7 +41,7 @@ export default async function updateBurialSiteComment( commentForm.burialSiteCommentId ) - database.release() + database.close() return result.changes > 0 } diff --git a/database/updateBurialSiteTypeField.d.ts b/database/updateBurialSiteTypeField.d.ts index 10cce5dd..b92bab12 100644 --- a/database/updateBurialSiteTypeField.d.ts +++ b/database/updateBurialSiteTypeField.d.ts @@ -3,9 +3,9 @@ export interface UpdateBurialSiteTypeFieldForm { burialSiteTypeField: string; isRequired: '0' | '1'; fieldType?: string; + fieldValues: string; maxLength?: string; minLength?: string; pattern?: string; - fieldValues: string; } -export default function updateBurialSiteTypeField(updateForm: UpdateBurialSiteTypeFieldForm, user: User): Promise; +export default function updateBurialSiteTypeField(updateForm: UpdateBurialSiteTypeFieldForm, user: User): boolean; diff --git a/database/updateBurialSiteTypeField.js b/database/updateBurialSiteTypeField.js index fc2315e8..d2b5d92c 100644 --- a/database/updateBurialSiteTypeField.js +++ b/database/updateBurialSiteTypeField.js @@ -1,7 +1,8 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { clearCacheByTableName } from '../helpers/functions.cache.js'; -import { acquireConnection } from './pool.js'; -export default async function updateBurialSiteTypeField(updateForm, user) { - const database = await acquireConnection(); +export default function updateBurialSiteTypeField(updateForm, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update BurialSiteTypeFields set burialSiteTypeField = ?, @@ -16,7 +17,7 @@ export default async function updateBurialSiteTypeField(updateForm, user) { where burialSiteTypeFieldId = ? and recordDelete_timeMillis is null`) .run(updateForm.burialSiteTypeField, Number.parseInt(updateForm.isRequired, 10), updateForm.fieldType ?? 'text', updateForm.minLength ?? 0, updateForm.maxLength ?? 100, updateForm.pattern ?? '', updateForm.fieldValues, user.userName, Date.now(), updateForm.burialSiteTypeFieldId); - database.release(); + database.close(); clearCacheByTableName('BurialSiteTypeFields'); return result.changes > 0; } diff --git a/database/updateBurialSiteTypeField.ts b/database/updateBurialSiteTypeField.ts index 4614cdba..748a7a2d 100644 --- a/database/updateBurialSiteTypeField.ts +++ b/database/updateBurialSiteTypeField.ts @@ -1,23 +1,26 @@ -import { clearCacheByTableName } from '../helpers/functions.cache.js' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' +import { clearCacheByTableName } from '../helpers/functions.cache.js' export interface UpdateBurialSiteTypeFieldForm { burialSiteTypeFieldId: number | string burialSiteTypeField: string isRequired: '0' | '1' + fieldType?: string + fieldValues: string + maxLength?: string minLength?: string pattern?: string - fieldValues: string } -export default async function updateBurialSiteTypeField( +export default function updateBurialSiteTypeField( updateForm: UpdateBurialSiteTypeFieldForm, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -47,7 +50,7 @@ export default async function updateBurialSiteTypeField( updateForm.burialSiteTypeFieldId ) - database.release() + database.close() clearCacheByTableName('BurialSiteTypeFields') diff --git a/database/updateCemetery.d.ts b/database/updateCemetery.d.ts index d2b2dd55..23a95ff4 100644 --- a/database/updateCemetery.d.ts +++ b/database/updateCemetery.d.ts @@ -21,4 +21,4 @@ export interface UpdateCemeteryForm { * @param user - The user who is updating the cemetery. * @returns `true` if the cemetery was updated successfully, `false` otherwise. */ -export default function updateCemetery(updateForm: UpdateCemeteryForm, user: User): Promise; +export default function updateCemetery(updateForm: UpdateCemeteryForm, user: User): boolean; diff --git a/database/updateCemetery.js b/database/updateCemetery.js index 98a204c3..00519497 100644 --- a/database/updateCemetery.js +++ b/database/updateCemetery.js @@ -1,4 +1,5 @@ -import { acquireConnection } from './pool.js'; +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; /** * Updates a cemetery in the database. * Be sure to rebuild burial site names after updating a cemetery. @@ -6,8 +7,8 @@ import { acquireConnection } from './pool.js'; * @param user - The user who is updating the cemetery. * @returns `true` if the cemetery was updated successfully, `false` otherwise. */ -export default async function updateCemetery(updateForm, user) { - const database = await acquireConnection(); +export default function updateCemetery(updateForm, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update Cemeteries set cemeteryName = ?, @@ -34,6 +35,6 @@ export default async function updateCemetery(updateForm, user) { : updateForm.cemeteryLongitude, updateForm.cemeteryAddress1, updateForm.cemeteryAddress2, updateForm.cemeteryCity, updateForm.cemeteryProvince, updateForm.cemeteryPostalCode, updateForm.cemeteryPhoneNumber, updateForm.parentCemeteryId === '' ? undefined : updateForm.parentCemeteryId, user.userName, Date.now(), updateForm.cemeteryId); - database.release(); + database.close(); return result.changes > 0; } diff --git a/database/updateCemetery.ts b/database/updateCemetery.ts index 5a78d13c..c64a2ede 100644 --- a/database/updateCemetery.ts +++ b/database/updateCemetery.ts @@ -1,4 +1,6 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' export interface UpdateCemeteryForm { cemeteryId: string @@ -28,11 +30,11 @@ export interface UpdateCemeteryForm { * @param user - The user who is updating the cemetery. * @returns `true` if the cemetery was updated successfully, `false` otherwise. */ -export default async function updateCemetery( +export default function updateCemetery( updateForm: UpdateCemeteryForm, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -80,7 +82,7 @@ export default async function updateCemetery( updateForm.cemeteryId ) - database.release() + database.close() return result.changes > 0 } diff --git a/database/updateContract.d.ts b/database/updateContract.d.ts index a1b31043..e935618c 100644 --- a/database/updateContract.d.ts +++ b/database/updateContract.d.ts @@ -19,7 +19,7 @@ export interface UpdateContractForm { purchaserEmail?: string; purchaserPhoneNumber?: string; purchaserRelationship?: string; - contractTypeFieldIds?: string; [fieldValue_contractTypeFieldId: `fieldValue_${string}`]: unknown; + contractTypeFieldIds?: string; } -export default function updateContract(updateForm: UpdateContractForm, user: User): Promise; +export default function updateContract(updateForm: UpdateContractForm, user: User): boolean; diff --git a/database/updateContract.js b/database/updateContract.js index 1bd8c039..b6f067df 100644 --- a/database/updateContract.js +++ b/database/updateContract.js @@ -1,10 +1,11 @@ import { dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime'; +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import addOrUpdateContractField from './addOrUpdateContractField.js'; import deleteContractField from './deleteContractField.js'; -import { acquireConnection } from './pool.js'; // eslint-disable-next-line complexity -export default async function updateContract(updateForm, user) { - const database = await acquireConnection(); +export default function updateContract(updateForm, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update Contracts set contractTypeId = ?, @@ -42,16 +43,15 @@ export default async function updateContract(updateForm, user) { const contractTypeFieldIds = (updateForm.contractTypeFieldIds ?? '').split(','); for (const contractTypeFieldId of contractTypeFieldIds) { const fieldValue = updateForm[`fieldValue_${contractTypeFieldId}`]; - // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition - await ((fieldValue ?? '') === '' + (fieldValue ?? '') === '' ? deleteContractField(updateForm.contractId, contractTypeFieldId, user, database) : addOrUpdateContractField({ contractId: updateForm.contractId, contractTypeFieldId, fieldValue - }, user, database)); + }, user, database); } } - database.release(); + database.close(); return result.changes > 0; } diff --git a/database/updateContract.ts b/database/updateContract.ts index 52fac8b9..b1d95ebb 100644 --- a/database/updateContract.ts +++ b/database/updateContract.ts @@ -4,10 +4,12 @@ import { dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' import addOrUpdateContractField from './addOrUpdateContractField.js' import deleteContractField from './deleteContractField.js' -import { acquireConnection } from './pool.js' export interface UpdateContractForm { contractId: number | string @@ -17,9 +19,9 @@ export interface UpdateContractForm { contractEndDateString: '' | DateString contractStartDateString: DateString - + funeralHomeId?: number | string - + committalTypeId?: number | string funeralDateString: '' | DateString funeralDirectorName: string @@ -32,21 +34,21 @@ export interface UpdateContractForm { purchaserCity?: string purchaserPostalCode?: string purchaserProvince?: string - + purchaserEmail?: string purchaserPhoneNumber?: string purchaserRelationship?: string - contractTypeFieldIds?: string [fieldValue_contractTypeFieldId: `fieldValue_${string}`]: unknown + contractTypeFieldIds?: string } // eslint-disable-next-line complexity -export default async function updateContract( +export default function updateContract( updateForm: UpdateContractForm, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -117,7 +119,7 @@ export default async function updateContract( ] as string // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition - await ((fieldValue ?? '') === '' + ;(fieldValue ?? '') === '' ? deleteContractField( updateForm.contractId, contractTypeFieldId, @@ -132,11 +134,11 @@ export default async function updateContract( }, user, database - )) + ) } } - database.release() + database.close() return result.changes > 0 } diff --git a/database/updateContractComment.d.ts b/database/updateContractComment.d.ts index 99330cb6..1e1a19ce 100644 --- a/database/updateContractComment.d.ts +++ b/database/updateContractComment.d.ts @@ -1,8 +1,8 @@ import { type DateString, type TimeString } from '@cityssm/utils-datetime'; export interface UpdateForm { - contractCommentId: number | string; + comment: string; commentDateString: DateString; commentTimeString: TimeString; - comment: string; + contractCommentId: number | string; } -export default function updateContractComment(commentForm: UpdateForm, user: User): Promise; +export default function updateContractComment(commentForm: UpdateForm, user: User): boolean; diff --git a/database/updateContractComment.js b/database/updateContractComment.js index e7ed4501..81dc43a4 100644 --- a/database/updateContractComment.js +++ b/database/updateContractComment.js @@ -1,7 +1,8 @@ import { dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime'; -import { acquireConnection } from './pool.js'; -export default async function updateContractComment(commentForm, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function updateContractComment(commentForm, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update ContractComments set commentDate = ?, @@ -12,6 +13,6 @@ export default async function updateContractComment(commentForm, user) { where recordDelete_timeMillis is null and contractCommentId = ?`) .run(dateStringToInteger(commentForm.commentDateString), timeStringToInteger(commentForm.commentTimeString), commentForm.comment, user.userName, Date.now(), commentForm.contractCommentId); - database.release(); + database.close(); return result.changes > 0; } diff --git a/database/updateContractComment.ts b/database/updateContractComment.ts index 1963b116..16c7e2d9 100644 --- a/database/updateContractComment.ts +++ b/database/updateContractComment.ts @@ -4,21 +4,22 @@ import { dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' export interface UpdateForm { - contractCommentId: number | string + comment: string commentDateString: DateString commentTimeString: TimeString - comment: string + contractCommentId: number | string } -export default async function updateContractComment( +export default function updateContractComment( commentForm: UpdateForm, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -40,7 +41,7 @@ export default async function updateContractComment( commentForm.contractCommentId ) - database.release() + database.close() return result.changes > 0 } diff --git a/database/updateContractFeeQuantity.d.ts b/database/updateContractFeeQuantity.d.ts index ae0f6ffa..49b4f32a 100644 --- a/database/updateContractFeeQuantity.d.ts +++ b/database/updateContractFeeQuantity.d.ts @@ -3,4 +3,4 @@ export interface UpdateBurialSiteFeeForm { feeId: number | string; quantity: number | string; } -export default function updateContractFeeQuantity(feeQuantityForm: UpdateBurialSiteFeeForm, user: User): Promise; +export default function updateContractFeeQuantity(feeQuantityForm: UpdateBurialSiteFeeForm, user: User): boolean; diff --git a/database/updateContractFeeQuantity.js b/database/updateContractFeeQuantity.js index 8a99be74..11ca40ce 100644 --- a/database/updateContractFeeQuantity.js +++ b/database/updateContractFeeQuantity.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function updateContractFeeQuantity(feeQuantityForm, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function updateContractFeeQuantity(feeQuantityForm, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update ContractFees set quantity = ?, @@ -10,6 +11,6 @@ export default async function updateContractFeeQuantity(feeQuantityForm, user) { and contractId = ? and feeId = ?`) .run(feeQuantityForm.quantity, user.userName, Date.now(), feeQuantityForm.contractId, feeQuantityForm.feeId); - database.release(); + database.close(); return result.changes > 0; } diff --git a/database/updateContractFeeQuantity.ts b/database/updateContractFeeQuantity.ts index 2c6618d9..d31ddbb7 100644 --- a/database/updateContractFeeQuantity.ts +++ b/database/updateContractFeeQuantity.ts @@ -1,4 +1,6 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' export interface UpdateBurialSiteFeeForm { contractId: number | string @@ -6,11 +8,11 @@ export interface UpdateBurialSiteFeeForm { quantity: number | string } -export default async function updateContractFeeQuantity( +export default function updateContractFeeQuantity( feeQuantityForm: UpdateBurialSiteFeeForm, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -30,7 +32,7 @@ export default async function updateContractFeeQuantity( feeQuantityForm.feeId ) - database.release() + database.close() return result.changes > 0 } diff --git a/database/updateContractInterment.d.ts b/database/updateContractInterment.d.ts index d3abf716..bcf1bbf3 100644 --- a/database/updateContractInterment.d.ts +++ b/database/updateContractInterment.d.ts @@ -16,4 +16,4 @@ export interface UpdateForm { deathAgePeriod: string; intermentContainerTypeId: number | string; } -export default function updateContractInterment(contractForm: UpdateForm, user: User): Promise; +export default function updateContractInterment(contractForm: UpdateForm, user: User): boolean; diff --git a/database/updateContractInterment.js b/database/updateContractInterment.js index bb314d83..a8334789 100644 --- a/database/updateContractInterment.js +++ b/database/updateContractInterment.js @@ -1,7 +1,8 @@ import { dateStringToInteger } from '@cityssm/utils-datetime'; -import { acquireConnection } from './pool.js'; -export default async function updateContractInterment(contractForm, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function updateContractInterment(contractForm, user) { + const database = sqlite(sunriseDB); const results = database .prepare(`update ContractInterments set deceasedName = ?, @@ -29,6 +30,6 @@ export default async function updateContractInterment(contractForm, user) { : dateStringToInteger(contractForm.deathDateString), contractForm.deathPlace, contractForm.deathAge, contractForm.deathAgePeriod, contractForm.intermentContainerTypeId === '' ? undefined : contractForm.intermentContainerTypeId, user.userName, Date.now(), contractForm.contractId, contractForm.intermentNumber); - database.release(); + database.close(); return results.changes > 0; } diff --git a/database/updateContractInterment.ts b/database/updateContractInterment.ts index 4cd2bff0..e3625eb9 100644 --- a/database/updateContractInterment.ts +++ b/database/updateContractInterment.ts @@ -1,6 +1,7 @@ import { type DateString, dateStringToInteger } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' export interface UpdateForm { contractId: number | string @@ -25,11 +26,11 @@ export interface UpdateForm { intermentContainerTypeId: number | string } -export default async function updateContractInterment( +export default function updateContractInterment( contractForm: UpdateForm, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const results = database .prepare( @@ -79,7 +80,7 @@ export default async function updateContractInterment( contractForm.intermentNumber ) - database.release() + database.close() return results.changes > 0 } diff --git a/database/updateContractTransaction.d.ts b/database/updateContractTransaction.d.ts index 5bd807c9..e88a3b82 100644 --- a/database/updateContractTransaction.d.ts +++ b/database/updateContractTransaction.d.ts @@ -8,4 +8,4 @@ export interface ContractTransactionUpdateForm { transactionAmount: number | string; transactionNote: string; } -export default function updateContractTransaction(updateForm: ContractTransactionUpdateForm, user: User): Promise; +export default function updateContractTransaction(updateForm: ContractTransactionUpdateForm, user: User): boolean; diff --git a/database/updateContractTransaction.js b/database/updateContractTransaction.js index 7cf08175..4a1c033b 100644 --- a/database/updateContractTransaction.js +++ b/database/updateContractTransaction.js @@ -1,7 +1,8 @@ import { dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime'; -import { acquireConnection } from './pool.js'; -export default async function updateContractTransaction(updateForm, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function updateContractTransaction(updateForm, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update ContractTransactions set transactionAmount = ?, @@ -15,6 +16,6 @@ export default async function updateContractTransaction(updateForm, user) { and contractId = ? and transactionIndex = ?`) .run(updateForm.transactionAmount, updateForm.externalReceiptNumber, updateForm.transactionNote, dateStringToInteger(updateForm.transactionDateString), timeStringToInteger(updateForm.transactionTimeString), user.userName, Date.now(), updateForm.contractId, updateForm.transactionIndex); - database.release(); + database.close(); return result.changes > 0; } diff --git a/database/updateContractTransaction.ts b/database/updateContractTransaction.ts index 45f0866d..3137d7ac 100644 --- a/database/updateContractTransaction.ts +++ b/database/updateContractTransaction.ts @@ -4,8 +4,9 @@ import { dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' export interface ContractTransactionUpdateForm { contractId: number | string @@ -19,11 +20,11 @@ export interface ContractTransactionUpdateForm { transactionNote: string } -export default async function updateContractTransaction( +export default function updateContractTransaction( updateForm: ContractTransactionUpdateForm, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -51,7 +52,7 @@ export default async function updateContractTransaction( updateForm.transactionIndex ) - database.release() + database.close() return result.changes > 0 } diff --git a/database/updateContractType.d.ts b/database/updateContractType.d.ts index e86f5a52..00afe107 100644 --- a/database/updateContractType.d.ts +++ b/database/updateContractType.d.ts @@ -3,4 +3,4 @@ export interface UpdateForm { contractType: string; isPreneed?: string; } -export default function updateContractType(updateForm: UpdateForm, user: User): Promise; +export default function updateContractType(updateForm: UpdateForm, user: User): boolean; diff --git a/database/updateContractType.js b/database/updateContractType.js index ae067ebf..abdc913d 100644 --- a/database/updateContractType.js +++ b/database/updateContractType.js @@ -1,7 +1,8 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { clearCacheByTableName } from '../helpers/functions.cache.js'; -import { acquireConnection } from './pool.js'; -export default async function updateContractType(updateForm, user) { - const database = await acquireConnection(); +export default function updateContractType(updateForm, user) { + const database = sqlite(sunriseDB); const rightNowMillis = Date.now(); const result = database .prepare(`update ContractTypes @@ -12,7 +13,7 @@ export default async function updateContractType(updateForm, user) { where recordDelete_timeMillis is null and contractTypeId = ?`) .run(updateForm.contractType, updateForm.isPreneed === undefined ? 0 : 1, user.userName, rightNowMillis, updateForm.contractTypeId); - database.release(); + database.close(); clearCacheByTableName('ContractTypes'); return result.changes > 0; } diff --git a/database/updateContractType.ts b/database/updateContractType.ts index c7c482a6..74f3cd79 100644 --- a/database/updateContractType.ts +++ b/database/updateContractType.ts @@ -1,6 +1,7 @@ -import { clearCacheByTableName } from '../helpers/functions.cache.js' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' +import { clearCacheByTableName } from '../helpers/functions.cache.js' export interface UpdateForm { contractTypeId: number | string @@ -9,11 +10,11 @@ export interface UpdateForm { isPreneed?: string } -export default async function updateContractType( +export default function updateContractType( updateForm: UpdateForm, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const rightNowMillis = Date.now() @@ -35,7 +36,7 @@ export default async function updateContractType( updateForm.contractTypeId ) - database.release() + database.close() clearCacheByTableName('ContractTypes') diff --git a/database/updateContractTypeField.d.ts b/database/updateContractTypeField.d.ts index 25e19502..25fb1830 100644 --- a/database/updateContractTypeField.d.ts +++ b/database/updateContractTypeField.d.ts @@ -8,4 +8,4 @@ export interface UpdateContractTypeFieldForm { minLength?: string; pattern?: string; } -export default function updateContractTypeField(updateForm: UpdateContractTypeFieldForm, user: User): Promise; +export default function updateContractTypeField(updateForm: UpdateContractTypeFieldForm, user: User): boolean; diff --git a/database/updateContractTypeField.js b/database/updateContractTypeField.js index ee2da5e9..cc306b01 100644 --- a/database/updateContractTypeField.js +++ b/database/updateContractTypeField.js @@ -1,7 +1,8 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { clearCacheByTableName } from '../helpers/functions.cache.js'; -import { acquireConnection } from './pool.js'; -export default async function updateContractTypeField(updateForm, user) { - const database = await acquireConnection(); +export default function updateContractTypeField(updateForm, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update ContractTypeFields set contractTypeField = ?, @@ -16,7 +17,7 @@ export default async function updateContractTypeField(updateForm, user) { where contractTypeFieldId = ? and recordDelete_timeMillis is null`) .run(updateForm.contractTypeField, Number.parseInt(updateForm.isRequired, 10), updateForm.fieldType ?? 'text', updateForm.minLength ?? 0, updateForm.maxLength ?? 100, updateForm.pattern ?? '', updateForm.fieldValues, user.userName, Date.now(), updateForm.contractTypeFieldId); - database.release(); + database.close(); clearCacheByTableName('ContractTypeFields'); return result.changes > 0; } diff --git a/database/updateContractTypeField.ts b/database/updateContractTypeField.ts index d7e06b72..0721ec30 100644 --- a/database/updateContractTypeField.ts +++ b/database/updateContractTypeField.ts @@ -1,6 +1,7 @@ -import { clearCacheByTableName } from '../helpers/functions.cache.js' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' +import { clearCacheByTableName } from '../helpers/functions.cache.js' export interface UpdateContractTypeFieldForm { contractTypeFieldId: number | string @@ -14,11 +15,11 @@ export interface UpdateContractTypeFieldForm { pattern?: string } -export default async function updateContractTypeField( +export default function updateContractTypeField( updateForm: UpdateContractTypeFieldForm, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -48,7 +49,7 @@ export default async function updateContractTypeField( updateForm.contractTypeFieldId ) - database.release() + database.close() clearCacheByTableName('ContractTypeFields') diff --git a/database/updateFee.d.ts b/database/updateFee.d.ts index cfbe5d97..af379191 100644 --- a/database/updateFee.d.ts +++ b/database/updateFee.d.ts @@ -14,9 +14,9 @@ export interface UpdateFeeForm { quantityUnit?: string; isRequired: '' | '1'; } -export default function updateFee(feeForm: UpdateFeeForm, user: User): Promise; +export default function updateFee(feeForm: UpdateFeeForm, user: User): boolean; export interface UpdateFeeAmountForm { feeId: string; feeAmount: string; } -export declare function updateFeeAmount(feeAmountForm: UpdateFeeAmountForm, user: User): Promise; +export declare function updateFeeAmount(feeAmountForm: UpdateFeeAmountForm, user: User): boolean; diff --git a/database/updateFee.js b/database/updateFee.js index 4449a05c..8f3200d0 100644 --- a/database/updateFee.js +++ b/database/updateFee.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function updateFee(feeForm, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function updateFee(feeForm, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update Fees set feeCategoryId = ?, @@ -23,11 +24,11 @@ export default async function updateFee(feeForm, user) { .run(feeForm.feeCategoryId, feeForm.feeName, feeForm.feeDescription, feeForm.feeAccount, feeForm.contractTypeId === '' ? undefined : feeForm.contractTypeId, feeForm.burialSiteTypeId === '' ? undefined : feeForm.burialSiteTypeId, feeForm.feeAmount === undefined || feeForm.feeAmount === '' ? 0 : feeForm.feeAmount, feeForm.feeFunction ?? undefined, feeForm.taxAmount === '' ? undefined : feeForm.taxAmount, feeForm.taxPercentage === '' ? undefined : feeForm.taxPercentage, feeForm.includeQuantity === '' ? 0 : 1, feeForm.quantityUnit, feeForm.isRequired === '' ? 0 : 1, user.userName, Date.now(), feeForm.feeId); - database.release(); + database.close(); return result.changes > 0; } -export async function updateFeeAmount(feeAmountForm, user) { - const database = await acquireConnection(); +export function updateFeeAmount(feeAmountForm, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update Fees set feeAmount = ?, @@ -36,6 +37,6 @@ export async function updateFeeAmount(feeAmountForm, user) { where recordDelete_timeMillis is null and feeId = ?`) .run(feeAmountForm.feeAmount, user.userName, Date.now(), feeAmountForm.feeId); - database.release(); + database.close(); return result.changes > 0; } diff --git a/database/updateFee.ts b/database/updateFee.ts index 2d115898..3e70987c 100644 --- a/database/updateFee.ts +++ b/database/updateFee.ts @@ -1,4 +1,6 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' export interface UpdateFeeForm { feeId: string @@ -17,11 +19,8 @@ export interface UpdateFeeForm { isRequired: '' | '1' } -export default async function updateFee( - feeForm: UpdateFeeForm, - user: User -): Promise { - const database = await acquireConnection() +export default function updateFee(feeForm: UpdateFeeForm, user: User): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -65,7 +64,7 @@ export default async function updateFee( feeForm.feeId ) - database.release() + database.close() return result.changes > 0 } @@ -75,11 +74,11 @@ export interface UpdateFeeAmountForm { feeAmount: string } -export async function updateFeeAmount( +export function updateFeeAmount( feeAmountForm: UpdateFeeAmountForm, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -97,7 +96,7 @@ export async function updateFeeAmount( feeAmountForm.feeId ) - database.release() + database.close() return result.changes > 0 } diff --git a/database/updateFeeCategory.d.ts b/database/updateFeeCategory.d.ts index e13c3755..821cd2ee 100644 --- a/database/updateFeeCategory.d.ts +++ b/database/updateFeeCategory.d.ts @@ -3,4 +3,4 @@ export interface UpdateFeeCategoryForm { feeCategory: string; isGroupedFee?: '1'; } -export default function updateFeeCategory(feeCategoryForm: UpdateFeeCategoryForm, user: User): Promise; +export default function updateFeeCategory(feeCategoryForm: UpdateFeeCategoryForm, user: User): boolean; diff --git a/database/updateFeeCategory.js b/database/updateFeeCategory.js index 58b2b456..4c047940 100644 --- a/database/updateFeeCategory.js +++ b/database/updateFeeCategory.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function updateFeeCategory(feeCategoryForm, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function updateFeeCategory(feeCategoryForm, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update FeeCategories set feeCategory = ?, @@ -10,6 +11,6 @@ export default async function updateFeeCategory(feeCategoryForm, user) { where recordDelete_timeMillis is null and feeCategoryId = ?`) .run(feeCategoryForm.feeCategory, (feeCategoryForm.isGroupedFee ?? '') === '1' ? 1 : 0, user.userName, Date.now(), feeCategoryForm.feeCategoryId); - database.release(); + database.close(); return result.changes > 0; } diff --git a/database/updateFeeCategory.ts b/database/updateFeeCategory.ts index bcaa9b4a..8d063790 100644 --- a/database/updateFeeCategory.ts +++ b/database/updateFeeCategory.ts @@ -1,17 +1,19 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' export interface UpdateFeeCategoryForm { feeCategoryId: number | string - + feeCategory: string isGroupedFee?: '1' } -export default async function updateFeeCategory( +export default function updateFeeCategory( feeCategoryForm: UpdateFeeCategoryForm, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -31,7 +33,7 @@ export default async function updateFeeCategory( feeCategoryForm.feeCategoryId ) - database.release() + database.close() return result.changes > 0 } diff --git a/database/updateFuneralHome.d.ts b/database/updateFuneralHome.d.ts index b872fe7b..74750948 100644 --- a/database/updateFuneralHome.d.ts +++ b/database/updateFuneralHome.d.ts @@ -8,4 +8,4 @@ export interface UpdateForm { funeralHomeProvince: string; funeralHomePhoneNumber: string; } -export default function updateFuneralHome(updateForm: UpdateForm, user: User): Promise; +export default function updateFuneralHome(updateForm: UpdateForm, user: User): boolean; diff --git a/database/updateFuneralHome.js b/database/updateFuneralHome.js index 98d1243e..30a47794 100644 --- a/database/updateFuneralHome.js +++ b/database/updateFuneralHome.js @@ -1,6 +1,7 @@ -import { acquireConnection } from './pool.js'; -export default async function updateFuneralHome(updateForm, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function updateFuneralHome(updateForm, user) { + const database = sqlite(sunriseDB); const rightNowMillis = Date.now(); const result = database .prepare(`update FuneralHomes @@ -12,6 +13,6 @@ export default async function updateFuneralHome(updateForm, user) { where recordDelete_timeMillis is null and funeralHomeId = ?`) .run(updateForm.funeralHomeName, updateForm.funeralHomeAddress1, updateForm.funeralHomeAddress2, updateForm.funeralHomeCity, updateForm.funeralHomeProvince, updateForm.funeralHomePostalCode, updateForm.funeralHomePhoneNumber, user.userName, rightNowMillis, updateForm.funeralHomeId); - database.release(); + database.close(); return result.changes > 0; } diff --git a/database/updateFuneralHome.ts b/database/updateFuneralHome.ts index 4bd88c05..77bea273 100644 --- a/database/updateFuneralHome.ts +++ b/database/updateFuneralHome.ts @@ -1,4 +1,6 @@ -import { acquireConnection } from './pool.js' +import sqlite from 'better-sqlite3' + +import { sunriseDB } from '../helpers/database.helpers.js' export interface UpdateForm { funeralHomeId: number | string @@ -13,11 +15,11 @@ export interface UpdateForm { funeralHomePhoneNumber: string } -export default async function updateFuneralHome( +export default function updateFuneralHome( updateForm: UpdateForm, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const rightNowMillis = Date.now() @@ -45,7 +47,7 @@ export default async function updateFuneralHome( updateForm.funeralHomeId ) - database.release() + database.close() return result.changes > 0 } diff --git a/database/updateRecord.d.ts b/database/updateRecord.d.ts index c2c6feb7..1cb593d6 100644 --- a/database/updateRecord.d.ts +++ b/database/updateRecord.d.ts @@ -1,3 +1,3 @@ type RecordTable = 'BurialSiteStatuses' | 'BurialSiteTypes' | 'WorkOrderMilestoneTypes' | 'WorkOrderTypes'; -export declare function updateRecord(recordTable: RecordTable, recordId: number | string, recordName: string, user: User): Promise; +export declare function updateRecord(recordTable: RecordTable, recordId: number | string, recordName: string, user: User): boolean; export {}; diff --git a/database/updateRecord.js b/database/updateRecord.js index 7c4763a6..3748262a 100644 --- a/database/updateRecord.js +++ b/database/updateRecord.js @@ -1,5 +1,6 @@ +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; import { clearCacheByTableName } from '../helpers/functions.cache.js'; -import { acquireConnection } from './pool.js'; const recordNameIdColumns = new Map([ ['BurialSiteStatuses', ['burialSiteStatus', 'burialSiteStatusId']], ['BurialSiteTypes', ['burialSiteType', 'burialSiteTypeId']], @@ -9,8 +10,8 @@ const recordNameIdColumns = new Map([ ], ['WorkOrderTypes', ['workOrderType', 'workOrderTypeId']] ]); -export async function updateRecord(recordTable, recordId, recordName, user) { - const database = await acquireConnection(); +export function updateRecord(recordTable, recordId, recordName, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update ${recordTable} set ${recordNameIdColumns.get(recordTable)[0]} = ?, @@ -19,7 +20,7 @@ export async function updateRecord(recordTable, recordId, recordName, user) { where recordDelete_timeMillis is null and ${recordNameIdColumns.get(recordTable)[1]} = ?`) .run(recordName, user.userName, Date.now(), recordId); - database.release(); + database.close(); clearCacheByTableName(recordTable); return result.changes > 0; } diff --git a/database/updateRecord.ts b/database/updateRecord.ts index ed0202f9..c7dd9094 100644 --- a/database/updateRecord.ts +++ b/database/updateRecord.ts @@ -1,6 +1,7 @@ -import { clearCacheByTableName } from '../helpers/functions.cache.js' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' +import { clearCacheByTableName } from '../helpers/functions.cache.js' type RecordTable = | 'BurialSiteStatuses' @@ -18,13 +19,13 @@ const recordNameIdColumns = new Map([ ['WorkOrderTypes', ['workOrderType', 'workOrderTypeId']] ]) -export async function updateRecord( +export function updateRecord( recordTable: RecordTable, recordId: number | string, recordName: string, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -37,7 +38,7 @@ export async function updateRecord( ) .run(recordName, user.userName, Date.now(), recordId) - database.release() + database.close() clearCacheByTableName(recordTable) diff --git a/database/updateRecordOrderNumber.d.ts b/database/updateRecordOrderNumber.d.ts index 6c59b578..30c82b18 100644 --- a/database/updateRecordOrderNumber.d.ts +++ b/database/updateRecordOrderNumber.d.ts @@ -1,4 +1,4 @@ -import type { PoolConnection } from 'better-sqlite-pool'; +import type sqlite from 'better-sqlite3'; type RecordTable = 'BurialSiteStatuses' | 'BurialSiteTypeFields' | 'BurialSiteTypes' | 'CommittalTypes' | 'ContractTypeFields' | 'ContractTypes' | 'FeeCategories' | 'Fees' | 'IntermentContainerTypes' | 'WorkOrderMilestoneTypes' | 'WorkOrderTypes'; -export declare function updateRecordOrderNumber(recordTable: RecordTable, recordId: number | string, orderNumber: number | string, connectedDatabase: PoolConnection): boolean; +export declare function updateRecordOrderNumber(recordTable: RecordTable, recordId: number | string, orderNumber: number | string, connectedDatabase: sqlite.Database): boolean; export {}; diff --git a/database/updateRecordOrderNumber.ts b/database/updateRecordOrderNumber.ts index 720f5f0f..6765445a 100644 --- a/database/updateRecordOrderNumber.ts +++ b/database/updateRecordOrderNumber.ts @@ -1,4 +1,4 @@ -import type { PoolConnection } from 'better-sqlite-pool' +import type sqlite from 'better-sqlite3' type RecordTable = | 'BurialSiteStatuses' @@ -31,7 +31,7 @@ export function updateRecordOrderNumber( recordTable: RecordTable, recordId: number | string, orderNumber: number | string, - connectedDatabase: PoolConnection + connectedDatabase: sqlite.Database ): boolean { const result = connectedDatabase .prepare( diff --git a/database/updateWorkOrder.d.ts b/database/updateWorkOrder.d.ts index 96e44134..45561443 100644 --- a/database/updateWorkOrder.d.ts +++ b/database/updateWorkOrder.d.ts @@ -6,4 +6,4 @@ export interface UpdateWorkOrderForm { workOrderOpenDateString: DateString; workOrderTypeId: string; } -export default function updateWorkOrder(workOrderForm: UpdateWorkOrderForm, user: User): Promise; +export default function updateWorkOrder(workOrderForm: UpdateWorkOrderForm, user: User): boolean; diff --git a/database/updateWorkOrder.js b/database/updateWorkOrder.js index d6d1860d..daf65bd6 100644 --- a/database/updateWorkOrder.js +++ b/database/updateWorkOrder.js @@ -1,7 +1,8 @@ import { dateStringToInteger } from '@cityssm/utils-datetime'; -import { acquireConnection } from './pool.js'; -export default async function updateWorkOrder(workOrderForm, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function updateWorkOrder(workOrderForm, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update WorkOrders set workOrderNumber = ?, @@ -13,6 +14,6 @@ export default async function updateWorkOrder(workOrderForm, user) { where workOrderId = ? and recordDelete_timeMillis is null`) .run(workOrderForm.workOrderNumber, workOrderForm.workOrderTypeId, workOrderForm.workOrderDescription, dateStringToInteger(workOrderForm.workOrderOpenDateString), user.userName, Date.now(), workOrderForm.workOrderId); - database.release(); + database.close(); return result.changes > 0; } diff --git a/database/updateWorkOrder.ts b/database/updateWorkOrder.ts index ccd52f2c..7ea54e4b 100644 --- a/database/updateWorkOrder.ts +++ b/database/updateWorkOrder.ts @@ -1,6 +1,7 @@ import { type DateString, dateStringToInteger } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' export interface UpdateWorkOrderForm { workOrderId: string @@ -11,11 +12,11 @@ export interface UpdateWorkOrderForm { workOrderTypeId: string } -export default async function updateWorkOrder( +export default function updateWorkOrder( workOrderForm: UpdateWorkOrderForm, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -39,7 +40,7 @@ export default async function updateWorkOrder( workOrderForm.workOrderId ) - database.release() + database.close() return result.changes > 0 } diff --git a/database/updateWorkOrderComment.d.ts b/database/updateWorkOrderComment.d.ts index ce8eb3a0..08a24a8e 100644 --- a/database/updateWorkOrderComment.d.ts +++ b/database/updateWorkOrderComment.d.ts @@ -5,4 +5,4 @@ export interface UpdateWorkOrderCommentForm { commentDateString: DateString; commentTimeString: TimeString; } -export default function updateWorkOrderComment(commentForm: UpdateWorkOrderCommentForm, user: User): Promise; +export default function updateWorkOrderComment(commentForm: UpdateWorkOrderCommentForm, user: User): boolean; diff --git a/database/updateWorkOrderComment.js b/database/updateWorkOrderComment.js index 5f303bd5..b5566700 100644 --- a/database/updateWorkOrderComment.js +++ b/database/updateWorkOrderComment.js @@ -1,7 +1,8 @@ import { dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime'; -import { acquireConnection } from './pool.js'; -export default async function updateWorkOrderComment(commentForm, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function updateWorkOrderComment(commentForm, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update WorkOrderComments set commentDate = ?, @@ -12,6 +13,6 @@ export default async function updateWorkOrderComment(commentForm, user) { where recordDelete_timeMillis is null and workOrderCommentId = ?`) .run(dateStringToInteger(commentForm.commentDateString), timeStringToInteger(commentForm.commentTimeString), commentForm.comment, user.userName, Date.now(), commentForm.workOrderCommentId); - database.release(); + database.close(); return result.changes > 0; } diff --git a/database/updateWorkOrderComment.ts b/database/updateWorkOrderComment.ts index 69dac7ef..d4195dac 100644 --- a/database/updateWorkOrderComment.ts +++ b/database/updateWorkOrderComment.ts @@ -4,8 +4,9 @@ import { dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' export interface UpdateWorkOrderCommentForm { workOrderCommentId: number | string @@ -15,11 +16,11 @@ export interface UpdateWorkOrderCommentForm { commentTimeString: TimeString } -export default async function updateWorkOrderComment( +export default function updateWorkOrderComment( commentForm: UpdateWorkOrderCommentForm, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -41,7 +42,7 @@ export default async function updateWorkOrderComment( commentForm.workOrderCommentId ) - database.release() + database.close() return result.changes > 0 } diff --git a/database/updateWorkOrderMilestone.d.ts b/database/updateWorkOrderMilestone.d.ts index 6521e13e..6980eaf0 100644 --- a/database/updateWorkOrderMilestone.d.ts +++ b/database/updateWorkOrderMilestone.d.ts @@ -5,4 +5,4 @@ export interface UpdateWorkOrderMilestoneForm { workOrderMilestoneTimeString?: string; workOrderMilestoneTypeId: number | string; } -export default function updateWorkOrderMilestone(milestoneForm: UpdateWorkOrderMilestoneForm, user: User): Promise; +export default function updateWorkOrderMilestone(milestoneForm: UpdateWorkOrderMilestoneForm, user: User): boolean; diff --git a/database/updateWorkOrderMilestone.js b/database/updateWorkOrderMilestone.js index 9a2ba2ae..f07b8c12 100644 --- a/database/updateWorkOrderMilestone.js +++ b/database/updateWorkOrderMilestone.js @@ -1,7 +1,8 @@ import { dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime'; -import { acquireConnection } from './pool.js'; -export default async function updateWorkOrderMilestone(milestoneForm, user) { - const database = await acquireConnection(); +import sqlite from 'better-sqlite3'; +import { sunriseDB } from '../helpers/database.helpers.js'; +export default function updateWorkOrderMilestone(milestoneForm, user) { + const database = sqlite(sunriseDB); const result = database .prepare(`update WorkOrderMilestones set workOrderMilestoneTypeId = ?, @@ -18,6 +19,6 @@ export default async function updateWorkOrderMilestone(milestoneForm, user) { : dateStringToInteger(milestoneForm.workOrderMilestoneDateString), (milestoneForm.workOrderMilestoneTimeString ?? '') === '' ? 0 : timeStringToInteger(milestoneForm.workOrderMilestoneTimeString ?? ''), milestoneForm.workOrderMilestoneDescription, user.userName, Date.now(), milestoneForm.workOrderMilestoneId); - database.release(); + database.close(); return result.changes > 0; } diff --git a/database/updateWorkOrderMilestone.ts b/database/updateWorkOrderMilestone.ts index cc757a0f..eeee5b07 100644 --- a/database/updateWorkOrderMilestone.ts +++ b/database/updateWorkOrderMilestone.ts @@ -2,8 +2,9 @@ import { dateStringToInteger, timeStringToInteger } from '@cityssm/utils-datetime' +import sqlite from 'better-sqlite3' -import { acquireConnection } from './pool.js' +import { sunriseDB } from '../helpers/database.helpers.js' export interface UpdateWorkOrderMilestoneForm { workOrderMilestoneId: number | string @@ -14,11 +15,11 @@ export interface UpdateWorkOrderMilestoneForm { workOrderMilestoneTypeId: number | string } -export default async function updateWorkOrderMilestone( +export default function updateWorkOrderMilestone( milestoneForm: UpdateWorkOrderMilestoneForm, user: User -): Promise { - const database = await acquireConnection() +): boolean { + const database = sqlite(sunriseDB) const result = database .prepare( @@ -48,7 +49,7 @@ export default async function updateWorkOrderMilestone( milestoneForm.workOrderMilestoneId ) - database.release() + database.close() return result.changes > 0 } diff --git a/handlers/admin-get/burialSiteTypes.d.ts b/handlers/admin-get/burialSiteTypes.d.ts index 4bcb65f6..f4584afd 100644 --- a/handlers/admin-get/burialSiteTypes.d.ts +++ b/handlers/admin-get/burialSiteTypes.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(_request: Request, response: Response): Promise; +export default function handler(_request: Request, response: Response): void; diff --git a/handlers/admin-get/burialSiteTypes.js b/handlers/admin-get/burialSiteTypes.js index 73203ad7..5ec7f38a 100644 --- a/handlers/admin-get/burialSiteTypes.js +++ b/handlers/admin-get/burialSiteTypes.js @@ -1,6 +1,6 @@ import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; -export default async function handler(_request, response) { - const burialSiteTypes = await getBurialSiteTypes(); +export default function handler(_request, response) { + const burialSiteTypes = getBurialSiteTypes(); response.render('admin-burialSiteTypes', { headTitle: "Burial Site Type Management", burialSiteTypes diff --git a/handlers/admin-get/burialSiteTypes.ts b/handlers/admin-get/burialSiteTypes.ts index b489cdbc..8c20b594 100644 --- a/handlers/admin-get/burialSiteTypes.ts +++ b/handlers/admin-get/burialSiteTypes.ts @@ -2,11 +2,11 @@ import type { Request, Response } from 'express' import { getBurialSiteTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( _request: Request, response: Response -): Promise { - const burialSiteTypes = await getBurialSiteTypes() +): void { + const burialSiteTypes = getBurialSiteTypes() response.render('admin-burialSiteTypes', { headTitle: "Burial Site Type Management", diff --git a/handlers/admin-get/contractTypes.d.ts b/handlers/admin-get/contractTypes.d.ts index 4bcb65f6..f4584afd 100644 --- a/handlers/admin-get/contractTypes.d.ts +++ b/handlers/admin-get/contractTypes.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(_request: Request, response: Response): Promise; +export default function handler(_request: Request, response: Response): void; diff --git a/handlers/admin-get/contractTypes.js b/handlers/admin-get/contractTypes.js index 11b229c2..515853bc 100644 --- a/handlers/admin-get/contractTypes.js +++ b/handlers/admin-get/contractTypes.js @@ -1,9 +1,9 @@ import { getConfigProperty } from '../../helpers/config.helpers.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; import { getPrintConfig } from '../../helpers/functions.print.js'; -export default async function handler(_request, response) { - const contractTypes = await getContractTypes(); - const allContractTypeFields = await getAllContractTypeFields(); +export default function handler(_request, response) { + const contractTypes = getContractTypes(); + const allContractTypeFields = getAllContractTypeFields(); const contractTypePrints = getConfigProperty('settings.contracts.prints'); const contractTypePrintTitles = {}; for (const printEJS of contractTypePrints) { diff --git a/handlers/admin-get/contractTypes.ts b/handlers/admin-get/contractTypes.ts index c48030b2..c3c190d1 100644 --- a/handlers/admin-get/contractTypes.ts +++ b/handlers/admin-get/contractTypes.ts @@ -7,12 +7,12 @@ import { } from '../../helpers/functions.cache.js' import { getPrintConfig } from '../../helpers/functions.print.js' -export default async function handler( +export default function handler( _request: Request, response: Response -): Promise { - const contractTypes = await getContractTypes() - const allContractTypeFields = await getAllContractTypeFields() +): void { + const contractTypes = getContractTypes() + const allContractTypeFields = getAllContractTypeFields() const contractTypePrints = getConfigProperty('settings.contracts.prints') diff --git a/handlers/admin-get/fees.d.ts b/handlers/admin-get/fees.d.ts index 4bcb65f6..f4584afd 100644 --- a/handlers/admin-get/fees.d.ts +++ b/handlers/admin-get/fees.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(_request: Request, response: Response): Promise; +export default function handler(_request: Request, response: Response): void; diff --git a/handlers/admin-get/fees.js b/handlers/admin-get/fees.js index 328dbb17..0d21b2d0 100644 --- a/handlers/admin-get/fees.js +++ b/handlers/admin-get/fees.js @@ -1,11 +1,11 @@ import getFeeCategories from '../../database/getFeeCategories.js'; import { getBurialSiteTypes, getContractTypes } from '../../helpers/functions.cache.js'; -export default async function handler(_request, response) { - const feeCategories = await getFeeCategories({}, { +export default function handler(_request, response) { + const feeCategories = getFeeCategories({}, { includeFees: true }); - const contractTypes = await getContractTypes(); - const burialSiteTypes = await getBurialSiteTypes(); + const contractTypes = getContractTypes(); + const burialSiteTypes = getBurialSiteTypes(); response.render('admin-fees', { headTitle: 'Fee Management', burialSiteTypes, diff --git a/handlers/admin-get/fees.ts b/handlers/admin-get/fees.ts index 79825dc9..96154bdc 100644 --- a/handlers/admin-get/fees.ts +++ b/handlers/admin-get/fees.ts @@ -6,19 +6,19 @@ import { getContractTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( _request: Request, response: Response -): Promise { - const feeCategories = await getFeeCategories( +): void { + const feeCategories = getFeeCategories( {}, { includeFees: true } ) - const contractTypes = await getContractTypes() - const burialSiteTypes = await getBurialSiteTypes() + const contractTypes = getContractTypes() + const burialSiteTypes = getBurialSiteTypes() response.render('admin-fees', { headTitle: 'Fee Management', diff --git a/handlers/admin-get/tables.d.ts b/handlers/admin-get/tables.d.ts index 4bcb65f6..f4584afd 100644 --- a/handlers/admin-get/tables.d.ts +++ b/handlers/admin-get/tables.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(_request: Request, response: Response): Promise; +export default function handler(_request: Request, response: Response): void; diff --git a/handlers/admin-get/tables.js b/handlers/admin-get/tables.js index 4791be0b..f93e2995 100644 --- a/handlers/admin-get/tables.js +++ b/handlers/admin-get/tables.js @@ -1,8 +1,8 @@ import { getBurialSiteStatuses, getWorkOrderMilestoneTypes, getWorkOrderTypes } from '../../helpers/functions.cache.js'; -export default async function handler(_request, response) { - const workOrderTypes = await getWorkOrderTypes(); - const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes(); - const burialSiteStatuses = await getBurialSiteStatuses(); +export default function handler(_request, response) { + const workOrderTypes = getWorkOrderTypes(); + const workOrderMilestoneTypes = getWorkOrderMilestoneTypes(); + const burialSiteStatuses = getBurialSiteStatuses(); response.render('admin-tables', { headTitle: 'Config Table Management', burialSiteStatuses, diff --git a/handlers/admin-get/tables.ts b/handlers/admin-get/tables.ts index 562a9a30..50e4e075 100644 --- a/handlers/admin-get/tables.ts +++ b/handlers/admin-get/tables.ts @@ -6,13 +6,10 @@ import { getWorkOrderTypes } from '../../helpers/functions.cache.js' -export default async function handler( - _request: Request, - response: Response -): Promise { - const workOrderTypes = await getWorkOrderTypes() - const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes() - const burialSiteStatuses = await getBurialSiteStatuses() +export default function handler(_request: Request, response: Response): void { + const workOrderTypes = getWorkOrderTypes() + const workOrderMilestoneTypes = getWorkOrderMilestoneTypes() + const burialSiteStatuses = getBurialSiteStatuses() response.render('admin-tables', { headTitle: 'Config Table Management', diff --git a/handlers/admin-post/doAddBurialSiteStatus.d.ts b/handlers/admin-post/doAddBurialSiteStatus.d.ts index b0911c26..49ca51a4 100644 --- a/handlers/admin-post/doAddBurialSiteStatus.d.ts +++ b/handlers/admin-post/doAddBurialSiteStatus.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doAddBurialSiteStatus.js b/handlers/admin-post/doAddBurialSiteStatus.js index f3519bcf..a84038df 100644 --- a/handlers/admin-post/doAddBurialSiteStatus.js +++ b/handlers/admin-post/doAddBurialSiteStatus.js @@ -1,8 +1,8 @@ import addRecord from '../../database/addRecord.js'; import { getBurialSiteStatuses } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const burialSiteStatusId = await addRecord('BurialSiteStatuses', request.body.burialSiteStatus, request.body.orderNumber ?? -1, request.session.user); - const burialSiteStatuses = await getBurialSiteStatuses(); +export default function handler(request, response) { + const burialSiteStatusId = addRecord('BurialSiteStatuses', request.body.burialSiteStatus, request.body.orderNumber ?? -1, request.session.user); + const burialSiteStatuses = getBurialSiteStatuses(); response.json({ success: true, burialSiteStatuses, diff --git a/handlers/admin-post/doAddBurialSiteStatus.ts b/handlers/admin-post/doAddBurialSiteStatus.ts index be478bfb..7562899f 100644 --- a/handlers/admin-post/doAddBurialSiteStatus.ts +++ b/handlers/admin-post/doAddBurialSiteStatus.ts @@ -3,22 +3,22 @@ import type { Request, Response } from 'express' import addRecord from '../../database/addRecord.js' import { getBurialSiteStatuses } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { burialSiteStatus: string; orderNumber?: number | string } >, response: Response -): Promise { - const burialSiteStatusId = await addRecord( +): void { + const burialSiteStatusId = addRecord( 'BurialSiteStatuses', request.body.burialSiteStatus, request.body.orderNumber ?? -1, request.session.user as User ) - const burialSiteStatuses = await getBurialSiteStatuses() + const burialSiteStatuses = getBurialSiteStatuses() response.json({ success: true, diff --git a/handlers/admin-post/doAddBurialSiteType.d.ts b/handlers/admin-post/doAddBurialSiteType.d.ts index b56ace0d..0b0b183b 100644 --- a/handlers/admin-post/doAddBurialSiteType.d.ts +++ b/handlers/admin-post/doAddBurialSiteType.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doAddBurialSiteType.js b/handlers/admin-post/doAddBurialSiteType.js index 76b5c0dc..56ab68a6 100644 --- a/handlers/admin-post/doAddBurialSiteType.js +++ b/handlers/admin-post/doAddBurialSiteType.js @@ -1,8 +1,8 @@ import addRecord from '../../database/addRecord.js'; import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const burialSiteTypeId = await addRecord('BurialSiteTypes', request.body.burialSiteType, request.body.orderNumber ?? -1, request.session.user); - const burialSiteTypes = await getBurialSiteTypes(); +export default function handler(request, response) { + const burialSiteTypeId = addRecord('BurialSiteTypes', request.body.burialSiteType, request.body.orderNumber ?? -1, request.session.user); + const burialSiteTypes = getBurialSiteTypes(); response.json({ success: true, burialSiteTypeId, diff --git a/handlers/admin-post/doAddBurialSiteType.ts b/handlers/admin-post/doAddBurialSiteType.ts index a5573132..6e481ff6 100644 --- a/handlers/admin-post/doAddBurialSiteType.ts +++ b/handlers/admin-post/doAddBurialSiteType.ts @@ -3,26 +3,26 @@ import type { Request, Response } from 'express' import addRecord from '../../database/addRecord.js' import { getBurialSiteTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { burialSiteType: string; orderNumber?: number | string } >, response: Response -): Promise { - const burialSiteTypeId = await addRecord( +): void { + const burialSiteTypeId = addRecord( 'BurialSiteTypes', request.body.burialSiteType, request.body.orderNumber ?? -1, request.session.user as User ) - const burialSiteTypes = await getBurialSiteTypes() + const burialSiteTypes = getBurialSiteTypes() response.json({ success: true, - + burialSiteTypeId, burialSiteTypes }) diff --git a/handlers/admin-post/doAddBurialSiteTypeField.d.ts b/handlers/admin-post/doAddBurialSiteTypeField.d.ts index ec48ed71..a8c643d7 100644 --- a/handlers/admin-post/doAddBurialSiteTypeField.d.ts +++ b/handlers/admin-post/doAddBurialSiteTypeField.d.ts @@ -1,3 +1,3 @@ import type { Request, Response } from 'express'; import { type AddBurialSiteTypeFieldForm } from '../../database/addBurialSiteTypeField.js'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/admin-post/doAddBurialSiteTypeField.js b/handlers/admin-post/doAddBurialSiteTypeField.js index 8c7d189f..c6ae8b39 100644 --- a/handlers/admin-post/doAddBurialSiteTypeField.js +++ b/handlers/admin-post/doAddBurialSiteTypeField.js @@ -1,8 +1,8 @@ import addBurialSiteTypeField from '../../database/addBurialSiteTypeField.js'; import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const burialSiteTypeFieldId = await addBurialSiteTypeField(request.body, request.session.user); - const burialSiteTypes = await getBurialSiteTypes(); +export default function handler(request, response) { + const burialSiteTypeFieldId = addBurialSiteTypeField(request.body, request.session.user); + const burialSiteTypes = getBurialSiteTypes(); response.json({ success: true, burialSiteTypeFieldId, diff --git a/handlers/admin-post/doAddBurialSiteTypeField.ts b/handlers/admin-post/doAddBurialSiteTypeField.ts index 11f0f9e9..aa976cf1 100644 --- a/handlers/admin-post/doAddBurialSiteTypeField.ts +++ b/handlers/admin-post/doAddBurialSiteTypeField.ts @@ -5,16 +5,16 @@ import addBurialSiteTypeField, { } from '../../database/addBurialSiteTypeField.js' import { getBurialSiteTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const burialSiteTypeFieldId = await addBurialSiteTypeField( +): void { + const burialSiteTypeFieldId = addBurialSiteTypeField( request.body, request.session.user as User ) - const burialSiteTypes = await getBurialSiteTypes() + const burialSiteTypes = getBurialSiteTypes() response.json({ success: true, diff --git a/handlers/admin-post/doAddContractType.d.ts b/handlers/admin-post/doAddContractType.d.ts index b3f98166..96666c2e 100644 --- a/handlers/admin-post/doAddContractType.d.ts +++ b/handlers/admin-post/doAddContractType.d.ts @@ -1,3 +1,3 @@ import type { Request, Response } from 'express'; import { type AddForm } from '../../database/addContractType.js'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/admin-post/doAddContractType.js b/handlers/admin-post/doAddContractType.js index 758e448d..bd037c7d 100644 --- a/handlers/admin-post/doAddContractType.js +++ b/handlers/admin-post/doAddContractType.js @@ -1,9 +1,9 @@ import addContractType from '../../database/addContractType.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const contractTypeId = await addContractType(request.body, request.session.user); - const contractTypes = await getContractTypes(); - const allContractTypeFields = await getAllContractTypeFields(); +export default function handler(request, response) { + const contractTypeId = addContractType(request.body, request.session.user); + const contractTypes = getContractTypes(); + const allContractTypeFields = getAllContractTypeFields(); response.json({ success: true, allContractTypeFields, diff --git a/handlers/admin-post/doAddContractType.ts b/handlers/admin-post/doAddContractType.ts index 4d167f17..564a7d0a 100644 --- a/handlers/admin-post/doAddContractType.ts +++ b/handlers/admin-post/doAddContractType.ts @@ -8,17 +8,17 @@ import { getContractTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const contractTypeId = await addContractType( +): void { + const contractTypeId = addContractType( request.body, request.session.user as User ) - const contractTypes = await getContractTypes() - const allContractTypeFields = await getAllContractTypeFields() + const contractTypes = getContractTypes() + const allContractTypeFields = getAllContractTypeFields() response.json({ success: true, diff --git a/handlers/admin-post/doAddContractTypeField.d.ts b/handlers/admin-post/doAddContractTypeField.d.ts index 36ac8a03..c7b26f5a 100644 --- a/handlers/admin-post/doAddContractTypeField.d.ts +++ b/handlers/admin-post/doAddContractTypeField.d.ts @@ -1,3 +1,3 @@ import type { Request, Response } from 'express'; import { type AddContractTypeFieldForm } from '../../database/addContractTypeField.js'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/admin-post/doAddContractTypeField.js b/handlers/admin-post/doAddContractTypeField.js index 129c6d84..fe3628bf 100644 --- a/handlers/admin-post/doAddContractTypeField.js +++ b/handlers/admin-post/doAddContractTypeField.js @@ -1,13 +1,13 @@ import addContractTypeField from '../../database/addContractTypeField.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const contractTypeFieldId = await addContractTypeField(request.body, request.session.user); - const contractTypes = await getContractTypes(); - const allContractTypeFields = await getAllContractTypeFields(); +export default function handler(request, response) { + const contractTypeFieldId = addContractTypeField(request.body, request.session.user); + const contractTypes = getContractTypes(); + const allContractTypeFields = getAllContractTypeFields(); response.json({ success: true, + allContractTypeFields, contractTypeFieldId, - contractTypes, - allContractTypeFields + contractTypes }); } diff --git a/handlers/admin-post/doAddContractTypeField.ts b/handlers/admin-post/doAddContractTypeField.ts index b6e4f053..441e3af1 100644 --- a/handlers/admin-post/doAddContractTypeField.ts +++ b/handlers/admin-post/doAddContractTypeField.ts @@ -8,22 +8,23 @@ import { getContractTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const contractTypeFieldId = await addContractTypeField( +): void { + const contractTypeFieldId = addContractTypeField( request.body, request.session.user as User ) - const contractTypes = await getContractTypes() - const allContractTypeFields = await getAllContractTypeFields() + const contractTypes = getContractTypes() + const allContractTypeFields = getAllContractTypeFields() response.json({ success: true, + + allContractTypeFields, contractTypeFieldId, - contractTypes, - allContractTypeFields + contractTypes }) } diff --git a/handlers/admin-post/doAddContractTypePrint.d.ts b/handlers/admin-post/doAddContractTypePrint.d.ts index 5997eac0..d48adabc 100644 --- a/handlers/admin-post/doAddContractTypePrint.d.ts +++ b/handlers/admin-post/doAddContractTypePrint.d.ts @@ -1,3 +1,3 @@ import type { Request, Response } from 'express'; import { type AddContractTypePrintForm } from '../../database/addContractTypePrint.js'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/admin-post/doAddContractTypePrint.js b/handlers/admin-post/doAddContractTypePrint.js index 99ad96aa..94689192 100644 --- a/handlers/admin-post/doAddContractTypePrint.js +++ b/handlers/admin-post/doAddContractTypePrint.js @@ -1,12 +1,12 @@ import addContractTypePrint from '../../database/addContractTypePrint.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = await addContractTypePrint(request.body, request.session.user); - const contractTypes = await getContractTypes(); - const allContractTypeFields = await getAllContractTypeFields(); +export default function handler(request, response) { + const success = addContractTypePrint(request.body, request.session.user); + const contractTypes = getContractTypes(); + const allContractTypeFields = getAllContractTypeFields(); response.json({ success, - contractTypes, - allContractTypeFields + allContractTypeFields, + contractTypes }); } diff --git a/handlers/admin-post/doAddContractTypePrint.ts b/handlers/admin-post/doAddContractTypePrint.ts index 7f4684c6..ed73fc85 100644 --- a/handlers/admin-post/doAddContractTypePrint.ts +++ b/handlers/admin-post/doAddContractTypePrint.ts @@ -8,21 +8,22 @@ import { getContractTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const success = await addContractTypePrint( +): void { + const success = addContractTypePrint( request.body, request.session.user as User ) - const contractTypes = await getContractTypes() - const allContractTypeFields = await getAllContractTypeFields() + const contractTypes = getContractTypes() + const allContractTypeFields = getAllContractTypeFields() response.json({ success, - contractTypes, - allContractTypeFields + + allContractTypeFields, + contractTypes }) } diff --git a/handlers/admin-post/doAddFee.d.ts b/handlers/admin-post/doAddFee.d.ts index 19d32e4d..d5e48cba 100644 --- a/handlers/admin-post/doAddFee.d.ts +++ b/handlers/admin-post/doAddFee.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/admin-post/doAddFee.js b/handlers/admin-post/doAddFee.js index c2099392..95f7b729 100644 --- a/handlers/admin-post/doAddFee.js +++ b/handlers/admin-post/doAddFee.js @@ -1,13 +1,13 @@ import addFee from '../../database/addFee.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({}, { +export default function handler(request, response) { + const feeId = addFee(request.body, request.session.user); + const feeCategories = getFeeCategories({}, { includeFees: true }); response.json({ success: true, - feeId, - feeCategories + feeCategories, + feeId }); } diff --git a/handlers/admin-post/doAddFee.ts b/handlers/admin-post/doAddFee.ts index 44f1e423..521ab951 100644 --- a/handlers/admin-post/doAddFee.ts +++ b/handlers/admin-post/doAddFee.ts @@ -3,16 +3,10 @@ import type { Request, Response } from 'express' import addFee, { type AddFeeForm } from '../../database/addFee.js' import getFeeCategories from '../../database/getFeeCategories.js' -export default async function handler( - request: Request, - response: Response -): Promise { - const feeId = await addFee( - request.body as AddFeeForm, - request.session.user as User - ) +export default function handler(request: Request, response: Response): void { + const feeId = addFee(request.body as AddFeeForm, request.session.user as User) - const feeCategories = await getFeeCategories( + const feeCategories = getFeeCategories( {}, { includeFees: true @@ -21,7 +15,8 @@ export default async function handler( response.json({ success: true, - feeId, - feeCategories + + feeCategories, + feeId }) } diff --git a/handlers/admin-post/doAddFeeCategory.d.ts b/handlers/admin-post/doAddFeeCategory.d.ts index 19d32e4d..d5e48cba 100644 --- a/handlers/admin-post/doAddFeeCategory.d.ts +++ b/handlers/admin-post/doAddFeeCategory.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/admin-post/doAddFeeCategory.js b/handlers/admin-post/doAddFeeCategory.js index 933436dc..8282a9cb 100644 --- a/handlers/admin-post/doAddFeeCategory.js +++ b/handlers/admin-post/doAddFeeCategory.js @@ -1,13 +1,13 @@ import addFeeCategory from '../../database/addFeeCategory.js'; import getFeeCategories from '../../database/getFeeCategories.js'; -export default async function handler(request, response) { - const feeCategoryId = await addFeeCategory(request.body, request.session.user); - const feeCategories = await getFeeCategories({}, { +export default function handler(request, response) { + const feeCategoryId = addFeeCategory(request.body, request.session.user); + const feeCategories = getFeeCategories({}, { includeFees: true }); response.json({ success: true, - feeCategoryId, - feeCategories + feeCategories, + feeCategoryId }); } diff --git a/handlers/admin-post/doAddFeeCategory.ts b/handlers/admin-post/doAddFeeCategory.ts index d8813ff0..b8814160 100644 --- a/handlers/admin-post/doAddFeeCategory.ts +++ b/handlers/admin-post/doAddFeeCategory.ts @@ -5,16 +5,13 @@ import addFeeCategory, { } from '../../database/addFeeCategory.js' import getFeeCategories from '../../database/getFeeCategories.js' -export default async function handler( - request: Request, - response: Response -): Promise { - const feeCategoryId = await addFeeCategory( +export default function handler(request: Request, response: Response): void { + const feeCategoryId = addFeeCategory( request.body as AddFeeCategoryForm, request.session.user as User ) - const feeCategories = await getFeeCategories( + const feeCategories = getFeeCategories( {}, { includeFees: true @@ -23,7 +20,8 @@ export default async function handler( response.json({ success: true, - feeCategoryId, - feeCategories + + feeCategories, + feeCategoryId }) } diff --git a/handlers/admin-post/doAddWorkOrderMilestoneType.d.ts b/handlers/admin-post/doAddWorkOrderMilestoneType.d.ts index 365f0847..b4294856 100644 --- a/handlers/admin-post/doAddWorkOrderMilestoneType.d.ts +++ b/handlers/admin-post/doAddWorkOrderMilestoneType.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doAddWorkOrderMilestoneType.js b/handlers/admin-post/doAddWorkOrderMilestoneType.js index 34aa7a26..b4f0bfc3 100644 --- a/handlers/admin-post/doAddWorkOrderMilestoneType.js +++ b/handlers/admin-post/doAddWorkOrderMilestoneType.js @@ -1,8 +1,8 @@ import addRecord from '../../database/addRecord.js'; import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const workOrderMilestoneTypeId = await addRecord('WorkOrderMilestoneTypes', request.body.workOrderMilestoneType, request.body.orderNumber ?? -1, request.session.user); - const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes(); +export default function handler(request, response) { + const workOrderMilestoneTypeId = addRecord('WorkOrderMilestoneTypes', request.body.workOrderMilestoneType, request.body.orderNumber ?? -1, request.session.user); + const workOrderMilestoneTypes = getWorkOrderMilestoneTypes(); response.json({ success: true, workOrderMilestoneTypeId, diff --git a/handlers/admin-post/doAddWorkOrderMilestoneType.ts b/handlers/admin-post/doAddWorkOrderMilestoneType.ts index 7e589be3..36567455 100644 --- a/handlers/admin-post/doAddWorkOrderMilestoneType.ts +++ b/handlers/admin-post/doAddWorkOrderMilestoneType.ts @@ -3,22 +3,22 @@ import type { Request, Response } from 'express' import addRecord from '../../database/addRecord.js' import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { workOrderMilestoneType: string; orderNumber?: number | string } >, response: Response -): Promise { - const workOrderMilestoneTypeId = await addRecord( +): void { + const workOrderMilestoneTypeId = addRecord( 'WorkOrderMilestoneTypes', request.body.workOrderMilestoneType, request.body.orderNumber ?? -1, request.session.user as User ) - const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes() + const workOrderMilestoneTypes = getWorkOrderMilestoneTypes() response.json({ success: true, diff --git a/handlers/admin-post/doAddWorkOrderType.d.ts b/handlers/admin-post/doAddWorkOrderType.d.ts index 413de996..68794059 100644 --- a/handlers/admin-post/doAddWorkOrderType.d.ts +++ b/handlers/admin-post/doAddWorkOrderType.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doAddWorkOrderType.js b/handlers/admin-post/doAddWorkOrderType.js index c483bee4..25db0d42 100644 --- a/handlers/admin-post/doAddWorkOrderType.js +++ b/handlers/admin-post/doAddWorkOrderType.js @@ -1,8 +1,8 @@ import addRecord from '../../database/addRecord.js'; import { getWorkOrderTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const workOrderTypeId = await addRecord('WorkOrderTypes', request.body.workOrderType, request.body.orderNumber ?? -1, request.session.user); - const workOrderTypes = await getWorkOrderTypes(); +export default function handler(request, response) { + const workOrderTypeId = addRecord('WorkOrderTypes', request.body.workOrderType, request.body.orderNumber ?? -1, request.session.user); + const workOrderTypes = getWorkOrderTypes(); response.json({ success: true, workOrderTypeId, diff --git a/handlers/admin-post/doAddWorkOrderType.ts b/handlers/admin-post/doAddWorkOrderType.ts index c6a4aa50..aa38b4d2 100644 --- a/handlers/admin-post/doAddWorkOrderType.ts +++ b/handlers/admin-post/doAddWorkOrderType.ts @@ -3,22 +3,22 @@ import type { Request, Response } from 'express' import addRecord from '../../database/addRecord.js' import { getWorkOrderTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { workOrderType: string; orderNumber?: number | string } >, response: Response -): Promise { - const workOrderTypeId = await addRecord( +): void { + const workOrderTypeId = addRecord( 'WorkOrderTypes', request.body.workOrderType, request.body.orderNumber ?? -1, request.session.user as User ) - const workOrderTypes = await getWorkOrderTypes() + const workOrderTypes = getWorkOrderTypes() response.json({ success: true, diff --git a/handlers/admin-post/doCleanupDatabase.d.ts b/handlers/admin-post/doCleanupDatabase.d.ts index 19d32e4d..d5e48cba 100644 --- a/handlers/admin-post/doCleanupDatabase.d.ts +++ b/handlers/admin-post/doCleanupDatabase.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/admin-post/doCleanupDatabase.js b/handlers/admin-post/doCleanupDatabase.js index 3d1ed72c..d151062b 100644 --- a/handlers/admin-post/doCleanupDatabase.js +++ b/handlers/admin-post/doCleanupDatabase.js @@ -1,6 +1,6 @@ import cleanupDatabase from '../../database/cleanupDatabase.js'; -export default async function handler(request, response) { - const recordCounts = await cleanupDatabase(request.session.user); +export default function handler(request, response) { + const recordCounts = cleanupDatabase(request.session.user); response.json({ success: true, inactivatedRecordCount: recordCounts.inactivatedRecordCount, diff --git a/handlers/admin-post/doCleanupDatabase.ts b/handlers/admin-post/doCleanupDatabase.ts index 4a6b517b..93fae4fd 100644 --- a/handlers/admin-post/doCleanupDatabase.ts +++ b/handlers/admin-post/doCleanupDatabase.ts @@ -2,11 +2,11 @@ import type { Request, Response } from 'express' import cleanupDatabase from '../../database/cleanupDatabase.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const recordCounts = await cleanupDatabase(request.session.user as User) +): void { + const recordCounts = cleanupDatabase(request.session.user as User) response.json({ success: true, diff --git a/handlers/admin-post/doDeleteBurialSiteStatus.d.ts b/handlers/admin-post/doDeleteBurialSiteStatus.d.ts index 2b230d63..fa2372c8 100644 --- a/handlers/admin-post/doDeleteBurialSiteStatus.d.ts +++ b/handlers/admin-post/doDeleteBurialSiteStatus.d.ts @@ -1,4 +1,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doDeleteBurialSiteStatus.js b/handlers/admin-post/doDeleteBurialSiteStatus.js index 85de2a40..1452f302 100644 --- a/handlers/admin-post/doDeleteBurialSiteStatus.js +++ b/handlers/admin-post/doDeleteBurialSiteStatus.js @@ -1,8 +1,8 @@ import { deleteRecord } from '../../database/deleteRecord.js'; import { getBurialSiteStatuses } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = await deleteRecord('BurialSiteStatuses', request.body.burialSiteStatusId, request.session.user); - const burialSiteStatuses = await getBurialSiteStatuses(); +export default function handler(request, response) { + const success = deleteRecord('BurialSiteStatuses', request.body.burialSiteStatusId, request.session.user); + const burialSiteStatuses = getBurialSiteStatuses(); response.json({ success, burialSiteStatuses diff --git a/handlers/admin-post/doDeleteBurialSiteStatus.ts b/handlers/admin-post/doDeleteBurialSiteStatus.ts index e97d33ed..c041d1b4 100644 --- a/handlers/admin-post/doDeleteBurialSiteStatus.ts +++ b/handlers/admin-post/doDeleteBurialSiteStatus.ts @@ -3,17 +3,17 @@ import type { Request, Response } from 'express' import { deleteRecord } from '../../database/deleteRecord.js' import { getBurialSiteStatuses } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const success = await deleteRecord( +): void { + const success = deleteRecord( 'BurialSiteStatuses', request.body.burialSiteStatusId, request.session.user as User ) - const burialSiteStatuses = await getBurialSiteStatuses() + const burialSiteStatuses = getBurialSiteStatuses() response.json({ success, diff --git a/handlers/admin-post/doDeleteBurialSiteType.d.ts b/handlers/admin-post/doDeleteBurialSiteType.d.ts index af966b40..c62bc882 100644 --- a/handlers/admin-post/doDeleteBurialSiteType.d.ts +++ b/handlers/admin-post/doDeleteBurialSiteType.d.ts @@ -1,4 +1,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doDeleteBurialSiteType.js b/handlers/admin-post/doDeleteBurialSiteType.js index 5c76db93..ae3998e1 100644 --- a/handlers/admin-post/doDeleteBurialSiteType.js +++ b/handlers/admin-post/doDeleteBurialSiteType.js @@ -1,8 +1,8 @@ import { deleteRecord } from '../../database/deleteRecord.js'; import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = await deleteRecord('BurialSiteTypes', request.body.burialSiteTypeId, request.session.user); - const burialSiteTypes = await getBurialSiteTypes(); +export default function handler(request, response) { + const success = deleteRecord('BurialSiteTypes', request.body.burialSiteTypeId, request.session.user); + const burialSiteTypes = getBurialSiteTypes(); response.json({ success, burialSiteTypes diff --git a/handlers/admin-post/doDeleteBurialSiteType.ts b/handlers/admin-post/doDeleteBurialSiteType.ts index 1c19782e..e582fbd2 100644 --- a/handlers/admin-post/doDeleteBurialSiteType.ts +++ b/handlers/admin-post/doDeleteBurialSiteType.ts @@ -3,17 +3,17 @@ import type { Request, Response } from 'express' import { deleteRecord } from '../../database/deleteRecord.js' import { getBurialSiteTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const success = await deleteRecord( +): void { + const success = deleteRecord( 'BurialSiteTypes', request.body.burialSiteTypeId as string, request.session.user as User ) - const burialSiteTypes = await getBurialSiteTypes() + const burialSiteTypes = getBurialSiteTypes() response.json({ success, diff --git a/handlers/admin-post/doDeleteBurialSiteTypeField.d.ts b/handlers/admin-post/doDeleteBurialSiteTypeField.d.ts index fdbce1e3..ce2c4ac5 100644 --- a/handlers/admin-post/doDeleteBurialSiteTypeField.d.ts +++ b/handlers/admin-post/doDeleteBurialSiteTypeField.d.ts @@ -1,4 +1,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doDeleteBurialSiteTypeField.js b/handlers/admin-post/doDeleteBurialSiteTypeField.js index 8eee223c..a28ba502 100644 --- a/handlers/admin-post/doDeleteBurialSiteTypeField.js +++ b/handlers/admin-post/doDeleteBurialSiteTypeField.js @@ -1,8 +1,8 @@ import { deleteRecord } from '../../database/deleteRecord.js'; import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = await deleteRecord('BurialSiteTypeFields', request.body.burialSiteTypeFieldId, request.session.user); - const burialSiteTypes = await getBurialSiteTypes(); +export default function handler(request, response) { + const success = deleteRecord('BurialSiteTypeFields', request.body.burialSiteTypeFieldId, request.session.user); + const burialSiteTypes = getBurialSiteTypes(); response.json({ success, burialSiteTypes diff --git a/handlers/admin-post/doDeleteBurialSiteTypeField.ts b/handlers/admin-post/doDeleteBurialSiteTypeField.ts index 069ea8a6..7dc1fbe2 100644 --- a/handlers/admin-post/doDeleteBurialSiteTypeField.ts +++ b/handlers/admin-post/doDeleteBurialSiteTypeField.ts @@ -3,17 +3,17 @@ import type { Request, Response } from 'express' import { deleteRecord } from '../../database/deleteRecord.js' import { getBurialSiteTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const success = await deleteRecord( +): void { + const success = deleteRecord( 'BurialSiteTypeFields', request.body.burialSiteTypeFieldId as string, request.session.user as User ) - const burialSiteTypes = await getBurialSiteTypes() + const burialSiteTypes = getBurialSiteTypes() response.json({ success, diff --git a/handlers/admin-post/doDeleteContractType.d.ts b/handlers/admin-post/doDeleteContractType.d.ts index dc1620a5..4700d2fa 100644 --- a/handlers/admin-post/doDeleteContractType.d.ts +++ b/handlers/admin-post/doDeleteContractType.d.ts @@ -1,4 +1,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doDeleteContractType.js b/handlers/admin-post/doDeleteContractType.js index fc27f805..ffd68348 100644 --- a/handlers/admin-post/doDeleteContractType.js +++ b/handlers/admin-post/doDeleteContractType.js @@ -1,9 +1,9 @@ import { deleteRecord } from '../../database/deleteRecord.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = await deleteRecord('ContractTypes', request.body.contractTypeId, request.session.user); - const contractTypes = await getContractTypes(); - const allContractTypeFields = await getAllContractTypeFields(); +export default function handler(request, response) { + const success = deleteRecord('ContractTypes', request.body.contractTypeId, request.session.user); + const contractTypes = getContractTypes(); + const allContractTypeFields = getAllContractTypeFields(); response.json({ success, allContractTypeFields, diff --git a/handlers/admin-post/doDeleteContractType.ts b/handlers/admin-post/doDeleteContractType.ts index ff95a1ba..ab0a21f6 100644 --- a/handlers/admin-post/doDeleteContractType.ts +++ b/handlers/admin-post/doDeleteContractType.ts @@ -6,18 +6,18 @@ import { getContractTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const success = await deleteRecord( +): void { + const success = deleteRecord( 'ContractTypes', request.body.contractTypeId, request.session.user as User ) - const contractTypes = await getContractTypes() - const allContractTypeFields = await getAllContractTypeFields() + const contractTypes = getContractTypes() + const allContractTypeFields = getAllContractTypeFields() response.json({ success, diff --git a/handlers/admin-post/doDeleteContractTypeField.d.ts b/handlers/admin-post/doDeleteContractTypeField.d.ts index 99087f64..dd6e4fa2 100644 --- a/handlers/admin-post/doDeleteContractTypeField.d.ts +++ b/handlers/admin-post/doDeleteContractTypeField.d.ts @@ -1,4 +1,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doDeleteContractTypeField.js b/handlers/admin-post/doDeleteContractTypeField.js index 0eddd97a..1b91992b 100644 --- a/handlers/admin-post/doDeleteContractTypeField.js +++ b/handlers/admin-post/doDeleteContractTypeField.js @@ -1,9 +1,9 @@ import { deleteRecord } from '../../database/deleteRecord.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = await deleteRecord('ContractTypeFields', request.body.contractTypeFieldId, request.session.user); - const contractTypes = await getContractTypes(); - const allContractTypeFields = await getAllContractTypeFields(); +export default function handler(request, response) { + const success = deleteRecord('ContractTypeFields', request.body.contractTypeFieldId, request.session.user); + const contractTypes = getContractTypes(); + const allContractTypeFields = getAllContractTypeFields(); response.json({ success, allContractTypeFields, diff --git a/handlers/admin-post/doDeleteContractTypeField.ts b/handlers/admin-post/doDeleteContractTypeField.ts index 2b5bdf3d..e2206f50 100644 --- a/handlers/admin-post/doDeleteContractTypeField.ts +++ b/handlers/admin-post/doDeleteContractTypeField.ts @@ -6,18 +6,18 @@ import { getContractTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const success = await deleteRecord( +): void { + const success = deleteRecord( 'ContractTypeFields', request.body.contractTypeFieldId, request.session.user as User ) - const contractTypes = await getContractTypes() - const allContractTypeFields = await getAllContractTypeFields() + const contractTypes = getContractTypes() + const allContractTypeFields = getAllContractTypeFields() response.json({ success, diff --git a/handlers/admin-post/doDeleteContractTypePrint.d.ts b/handlers/admin-post/doDeleteContractTypePrint.d.ts index b4fa82af..26994af1 100644 --- a/handlers/admin-post/doDeleteContractTypePrint.d.ts +++ b/handlers/admin-post/doDeleteContractTypePrint.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doDeleteContractTypePrint.js b/handlers/admin-post/doDeleteContractTypePrint.js index 3f0812b5..d44c9e99 100644 --- a/handlers/admin-post/doDeleteContractTypePrint.js +++ b/handlers/admin-post/doDeleteContractTypePrint.js @@ -1,9 +1,9 @@ import deleteContractTypePrint from '../../database/deleteContractTypePrint.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = await deleteContractTypePrint(request.body.contractTypeId, request.body.printEJS, request.session.user); - const contractTypes = await getContractTypes(); - const allContractTypeFields = await getAllContractTypeFields(); +export default function handler(request, response) { + const success = deleteContractTypePrint(request.body.contractTypeId, request.body.printEJS, request.session.user); + const contractTypes = getContractTypes(); + const allContractTypeFields = getAllContractTypeFields(); response.json({ success, allContractTypeFields, diff --git a/handlers/admin-post/doDeleteContractTypePrint.ts b/handlers/admin-post/doDeleteContractTypePrint.ts index de8d2731..8cff9d01 100644 --- a/handlers/admin-post/doDeleteContractTypePrint.ts +++ b/handlers/admin-post/doDeleteContractTypePrint.ts @@ -6,22 +6,22 @@ import { getContractTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { contractTypeId: string; printEJS: string } >, response: Response -): Promise { - const success = await deleteContractTypePrint( +): void { + const success = deleteContractTypePrint( request.body.contractTypeId, request.body.printEJS, request.session.user as User ) - const contractTypes = await getContractTypes() - const allContractTypeFields = await getAllContractTypeFields() + const contractTypes = getContractTypes() + const allContractTypeFields = getAllContractTypeFields() response.json({ success, diff --git a/handlers/admin-post/doDeleteFee.d.ts b/handlers/admin-post/doDeleteFee.d.ts index 5875c5fb..e7ece028 100644 --- a/handlers/admin-post/doDeleteFee.d.ts +++ b/handlers/admin-post/doDeleteFee.d.ts @@ -1,4 +1,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doDeleteFee.js b/handlers/admin-post/doDeleteFee.js index 4d2e695b..e7b98211 100644 --- a/handlers/admin-post/doDeleteFee.js +++ b/handlers/admin-post/doDeleteFee.js @@ -1,8 +1,8 @@ import { deleteRecord } from '../../database/deleteRecord.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({}, { +export default function handler(request, response) { + const success = deleteRecord('Fees', request.body.feeId, request.session.user); + const feeCategories = getFeeCategories({}, { includeFees: true }); response.json({ diff --git a/handlers/admin-post/doDeleteFee.ts b/handlers/admin-post/doDeleteFee.ts index d3127132..3d753bfc 100644 --- a/handlers/admin-post/doDeleteFee.ts +++ b/handlers/admin-post/doDeleteFee.ts @@ -3,17 +3,17 @@ import type { Request, Response } from 'express' import { deleteRecord } from '../../database/deleteRecord.js' import getFeeCategories from '../../database/getFeeCategories.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const success = await deleteRecord( +): void { + const success = deleteRecord( 'Fees', request.body.feeId, request.session.user as User ) - const feeCategories = await getFeeCategories( + const feeCategories = getFeeCategories( {}, { includeFees: true @@ -22,7 +22,7 @@ export default async function handler( response.json({ success, - + feeCategories }) } diff --git a/handlers/admin-post/doDeleteFeeCategory.d.ts b/handlers/admin-post/doDeleteFeeCategory.d.ts index 9a714146..7b278952 100644 --- a/handlers/admin-post/doDeleteFeeCategory.d.ts +++ b/handlers/admin-post/doDeleteFeeCategory.d.ts @@ -1,4 +1,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doDeleteFeeCategory.js b/handlers/admin-post/doDeleteFeeCategory.js index 35adda48..3ae05fa6 100644 --- a/handlers/admin-post/doDeleteFeeCategory.js +++ b/handlers/admin-post/doDeleteFeeCategory.js @@ -1,8 +1,8 @@ import { deleteRecord } from '../../database/deleteRecord.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({}, { +export default function handler(request, response) { + const success = deleteRecord('FeeCategories', request.body.feeCategoryId, request.session.user); + const feeCategories = getFeeCategories({}, { includeFees: true }); response.json({ diff --git a/handlers/admin-post/doDeleteFeeCategory.ts b/handlers/admin-post/doDeleteFeeCategory.ts index 21bd4cd7..30f44987 100644 --- a/handlers/admin-post/doDeleteFeeCategory.ts +++ b/handlers/admin-post/doDeleteFeeCategory.ts @@ -3,17 +3,17 @@ import type { Request, Response } from 'express' import { deleteRecord } from '../../database/deleteRecord.js' import getFeeCategories from '../../database/getFeeCategories.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const success = await deleteRecord( +): void { + const success = deleteRecord( 'FeeCategories', request.body.feeCategoryId, request.session.user as User ) - const feeCategories = await getFeeCategories( + const feeCategories = getFeeCategories( {}, { includeFees: true diff --git a/handlers/admin-post/doDeleteWorkOrderMilestoneType.d.ts b/handlers/admin-post/doDeleteWorkOrderMilestoneType.d.ts index 229a4051..e76f1367 100644 --- a/handlers/admin-post/doDeleteWorkOrderMilestoneType.d.ts +++ b/handlers/admin-post/doDeleteWorkOrderMilestoneType.d.ts @@ -1,4 +1,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doDeleteWorkOrderMilestoneType.js b/handlers/admin-post/doDeleteWorkOrderMilestoneType.js index eccda8b6..a93aae0d 100644 --- a/handlers/admin-post/doDeleteWorkOrderMilestoneType.js +++ b/handlers/admin-post/doDeleteWorkOrderMilestoneType.js @@ -1,8 +1,8 @@ import { deleteRecord } from '../../database/deleteRecord.js'; import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = await deleteRecord('WorkOrderMilestoneTypes', request.body.workOrderMilestoneTypeId, request.session.user); - const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes(); +export default function handler(request, response) { + const success = deleteRecord('WorkOrderMilestoneTypes', request.body.workOrderMilestoneTypeId, request.session.user); + const workOrderMilestoneTypes = getWorkOrderMilestoneTypes(); response.json({ success, workOrderMilestoneTypes diff --git a/handlers/admin-post/doDeleteWorkOrderMilestoneType.ts b/handlers/admin-post/doDeleteWorkOrderMilestoneType.ts index d701b00e..6e12873c 100644 --- a/handlers/admin-post/doDeleteWorkOrderMilestoneType.ts +++ b/handlers/admin-post/doDeleteWorkOrderMilestoneType.ts @@ -3,17 +3,17 @@ import type { Request, Response } from 'express' import { deleteRecord } from '../../database/deleteRecord.js' import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const success = await deleteRecord( +): void { + const success = deleteRecord( 'WorkOrderMilestoneTypes', request.body.workOrderMilestoneTypeId, request.session.user as User ) - const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes() + const workOrderMilestoneTypes = getWorkOrderMilestoneTypes() response.json({ success, diff --git a/handlers/admin-post/doDeleteWorkOrderType.d.ts b/handlers/admin-post/doDeleteWorkOrderType.d.ts index 8a7264ac..66e36a38 100644 --- a/handlers/admin-post/doDeleteWorkOrderType.d.ts +++ b/handlers/admin-post/doDeleteWorkOrderType.d.ts @@ -1,4 +1,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doDeleteWorkOrderType.js b/handlers/admin-post/doDeleteWorkOrderType.js index 7a699ab9..3790f684 100644 --- a/handlers/admin-post/doDeleteWorkOrderType.js +++ b/handlers/admin-post/doDeleteWorkOrderType.js @@ -1,8 +1,8 @@ import { deleteRecord } from '../../database/deleteRecord.js'; import { getWorkOrderTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = await deleteRecord('WorkOrderTypes', request.body.workOrderTypeId, request.session.user); - const workOrderTypes = await getWorkOrderTypes(); +export default function handler(request, response) { + const success = deleteRecord('WorkOrderTypes', request.body.workOrderTypeId, request.session.user); + const workOrderTypes = getWorkOrderTypes(); response.json({ success, workOrderTypes diff --git a/handlers/admin-post/doDeleteWorkOrderType.ts b/handlers/admin-post/doDeleteWorkOrderType.ts index 018c260c..d36bd7e1 100644 --- a/handlers/admin-post/doDeleteWorkOrderType.ts +++ b/handlers/admin-post/doDeleteWorkOrderType.ts @@ -3,21 +3,21 @@ import type { Request, Response } from 'express' import { deleteRecord } from '../../database/deleteRecord.js' import { getWorkOrderTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const success = await deleteRecord( +): void { + const success = deleteRecord( 'WorkOrderTypes', request.body.workOrderTypeId, request.session.user as User ) - const workOrderTypes = await getWorkOrderTypes() + const workOrderTypes = getWorkOrderTypes() response.json({ success, - + workOrderTypes }) } diff --git a/handlers/admin-post/doMoveBurialSiteStatusDown.d.ts b/handlers/admin-post/doMoveBurialSiteStatusDown.d.ts index 14175c98..ebd3c2e9 100644 --- a/handlers/admin-post/doMoveBurialSiteStatusDown.d.ts +++ b/handlers/admin-post/doMoveBurialSiteStatusDown.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doMoveBurialSiteStatusDown.js b/handlers/admin-post/doMoveBurialSiteStatusDown.js index 524f71bc..14a7b152 100644 --- a/handlers/admin-post/doMoveBurialSiteStatusDown.js +++ b/handlers/admin-post/doMoveBurialSiteStatusDown.js @@ -1,10 +1,10 @@ import { moveRecordDown, moveRecordDownToBottom } from '../../database/moveRecord.js'; import { getBurialSiteStatuses } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveRecordDownToBottom('BurialSiteStatuses', request.body.burialSiteStatusId) - : await moveRecordDown('BurialSiteStatuses', request.body.burialSiteStatusId); - const burialSiteStatuses = await getBurialSiteStatuses(); + ? moveRecordDownToBottom('BurialSiteStatuses', request.body.burialSiteStatusId) + : moveRecordDown('BurialSiteStatuses', request.body.burialSiteStatusId); + const burialSiteStatuses = getBurialSiteStatuses(); response.json({ success, burialSiteStatuses diff --git a/handlers/admin-post/doMoveBurialSiteStatusDown.ts b/handlers/admin-post/doMoveBurialSiteStatusDown.ts index 11afa3d1..abd93607 100644 --- a/handlers/admin-post/doMoveBurialSiteStatusDown.ts +++ b/handlers/admin-post/doMoveBurialSiteStatusDown.ts @@ -6,30 +6,27 @@ import { } from '../../database/moveRecord.js' import { getBurialSiteStatuses } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { burialSiteStatusId: string; moveToEnd: '0' | '1' } >, response: Response -): Promise { +): void { const success = request.body.moveToEnd === '1' - ? await moveRecordDownToBottom( - 'BurialSiteStatuses', - request.body.burialSiteStatusId - ) - : await moveRecordDown( + ? moveRecordDownToBottom( 'BurialSiteStatuses', request.body.burialSiteStatusId ) + : moveRecordDown('BurialSiteStatuses', request.body.burialSiteStatusId) - const burialSiteStatuses = await getBurialSiteStatuses() + const burialSiteStatuses = getBurialSiteStatuses() response.json({ success, - + burialSiteStatuses }) } diff --git a/handlers/admin-post/doMoveBurialSiteStatusUp.d.ts b/handlers/admin-post/doMoveBurialSiteStatusUp.d.ts index 14175c98..ebd3c2e9 100644 --- a/handlers/admin-post/doMoveBurialSiteStatusUp.d.ts +++ b/handlers/admin-post/doMoveBurialSiteStatusUp.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doMoveBurialSiteStatusUp.js b/handlers/admin-post/doMoveBurialSiteStatusUp.js index 8ae1266e..dedad06b 100644 --- a/handlers/admin-post/doMoveBurialSiteStatusUp.js +++ b/handlers/admin-post/doMoveBurialSiteStatusUp.js @@ -1,10 +1,10 @@ import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js'; import { getBurialSiteStatuses } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveRecordUpToTop('BurialSiteStatuses', request.body.burialSiteStatusId) - : await moveRecordUp('BurialSiteStatuses', request.body.burialSiteStatusId); - const burialSiteStatuses = await getBurialSiteStatuses(); + ? moveRecordUpToTop('BurialSiteStatuses', request.body.burialSiteStatusId) + : moveRecordUp('BurialSiteStatuses', request.body.burialSiteStatusId); + const burialSiteStatuses = getBurialSiteStatuses(); response.json({ success, burialSiteStatuses diff --git a/handlers/admin-post/doMoveBurialSiteStatusUp.ts b/handlers/admin-post/doMoveBurialSiteStatusUp.ts index a70079d7..967cdada 100644 --- a/handlers/admin-post/doMoveBurialSiteStatusUp.ts +++ b/handlers/admin-post/doMoveBurialSiteStatusUp.ts @@ -3,29 +3,24 @@ import type { Request, Response } from 'express' import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js' import { getBurialSiteStatuses } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { burialSiteStatusId: string; moveToEnd: '0' | '1' } >, response: Response -): Promise { +): void { const success = request.body.moveToEnd === '1' - ? await moveRecordUpToTop( - 'BurialSiteStatuses', - request.body.burialSiteStatusId - ) - : await moveRecordUp( - 'BurialSiteStatuses', - request.body.burialSiteStatusId - ) + ? moveRecordUpToTop('BurialSiteStatuses', request.body.burialSiteStatusId) + : moveRecordUp('BurialSiteStatuses', request.body.burialSiteStatusId) - const burialSiteStatuses = await getBurialSiteStatuses() + const burialSiteStatuses = getBurialSiteStatuses() response.json({ success, + burialSiteStatuses }) } diff --git a/handlers/admin-post/doMoveBurialSiteTypeDown.d.ts b/handlers/admin-post/doMoveBurialSiteTypeDown.d.ts index dcbb398c..59b9d906 100644 --- a/handlers/admin-post/doMoveBurialSiteTypeDown.d.ts +++ b/handlers/admin-post/doMoveBurialSiteTypeDown.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doMoveBurialSiteTypeDown.js b/handlers/admin-post/doMoveBurialSiteTypeDown.js index 21253c99..5e7fa726 100644 --- a/handlers/admin-post/doMoveBurialSiteTypeDown.js +++ b/handlers/admin-post/doMoveBurialSiteTypeDown.js @@ -1,10 +1,10 @@ import { moveRecordDown, moveRecordDownToBottom } from '../../database/moveRecord.js'; import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveRecordDownToBottom('BurialSiteTypes', request.body.burialSiteTypeId) - : await moveRecordDown('BurialSiteTypes', request.body.burialSiteTypeId); - const burialSiteTypes = await getBurialSiteTypes(); + ? moveRecordDownToBottom('BurialSiteTypes', request.body.burialSiteTypeId) + : moveRecordDown('BurialSiteTypes', request.body.burialSiteTypeId); + const burialSiteTypes = getBurialSiteTypes(); response.json({ success, burialSiteTypes diff --git a/handlers/admin-post/doMoveBurialSiteTypeDown.ts b/handlers/admin-post/doMoveBurialSiteTypeDown.ts index ac29982d..78a68aa6 100644 --- a/handlers/admin-post/doMoveBurialSiteTypeDown.ts +++ b/handlers/admin-post/doMoveBurialSiteTypeDown.ts @@ -6,26 +6,24 @@ import { } from '../../database/moveRecord.js' import { getBurialSiteTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { burialSiteTypeId: string; moveToEnd: '0' | '1' } >, response: Response -): Promise { +): void { const success = request.body.moveToEnd === '1' - ? await moveRecordDownToBottom( - 'BurialSiteTypes', - request.body.burialSiteTypeId - ) - : await moveRecordDown('BurialSiteTypes', request.body.burialSiteTypeId) + ? moveRecordDownToBottom('BurialSiteTypes', request.body.burialSiteTypeId) + : moveRecordDown('BurialSiteTypes', request.body.burialSiteTypeId) - const burialSiteTypes = await getBurialSiteTypes() + const burialSiteTypes = getBurialSiteTypes() response.json({ success, + burialSiteTypes }) } diff --git a/handlers/admin-post/doMoveBurialSiteTypeFieldDown.d.ts b/handlers/admin-post/doMoveBurialSiteTypeFieldDown.d.ts index 0d706bc0..a202ce56 100644 --- a/handlers/admin-post/doMoveBurialSiteTypeFieldDown.d.ts +++ b/handlers/admin-post/doMoveBurialSiteTypeFieldDown.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doMoveBurialSiteTypeFieldDown.js b/handlers/admin-post/doMoveBurialSiteTypeFieldDown.js index 78e42710..7eda7944 100644 --- a/handlers/admin-post/doMoveBurialSiteTypeFieldDown.js +++ b/handlers/admin-post/doMoveBurialSiteTypeFieldDown.js @@ -1,10 +1,10 @@ import { moveBurialSiteTypeFieldDown, moveBurialSiteTypeFieldDownToBottom } from '../../database/moveBurialSiteTypeField.js'; import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveBurialSiteTypeFieldDownToBottom(request.body.burialSiteTypeFieldId) - : await moveBurialSiteTypeFieldDown(request.body.burialSiteTypeFieldId); - const burialSiteTypes = await getBurialSiteTypes(); + ? moveBurialSiteTypeFieldDownToBottom(request.body.burialSiteTypeFieldId) + : moveBurialSiteTypeFieldDown(request.body.burialSiteTypeFieldId); + const burialSiteTypes = getBurialSiteTypes(); response.json({ success, burialSiteTypes diff --git a/handlers/admin-post/doMoveBurialSiteTypeFieldDown.ts b/handlers/admin-post/doMoveBurialSiteTypeFieldDown.ts index ca74875f..1b13cdfa 100644 --- a/handlers/admin-post/doMoveBurialSiteTypeFieldDown.ts +++ b/handlers/admin-post/doMoveBurialSiteTypeFieldDown.ts @@ -6,23 +6,24 @@ import { } from '../../database/moveBurialSiteTypeField.js' import { getBurialSiteTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { burialSiteTypeFieldId: string; moveToEnd: '0' | '1' } >, response: Response -): Promise { +): void { const success = request.body.moveToEnd === '1' - ? await moveBurialSiteTypeFieldDownToBottom(request.body.burialSiteTypeFieldId) - : await moveBurialSiteTypeFieldDown(request.body.burialSiteTypeFieldId) + ? moveBurialSiteTypeFieldDownToBottom(request.body.burialSiteTypeFieldId) + : moveBurialSiteTypeFieldDown(request.body.burialSiteTypeFieldId) - const burialSiteTypes = await getBurialSiteTypes() + const burialSiteTypes = getBurialSiteTypes() response.json({ success, + burialSiteTypes }) } diff --git a/handlers/admin-post/doMoveBurialSiteTypeFieldUp.d.ts b/handlers/admin-post/doMoveBurialSiteTypeFieldUp.d.ts index 0d706bc0..a202ce56 100644 --- a/handlers/admin-post/doMoveBurialSiteTypeFieldUp.d.ts +++ b/handlers/admin-post/doMoveBurialSiteTypeFieldUp.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doMoveBurialSiteTypeFieldUp.js b/handlers/admin-post/doMoveBurialSiteTypeFieldUp.js index 6e548b0c..5b32a391 100644 --- a/handlers/admin-post/doMoveBurialSiteTypeFieldUp.js +++ b/handlers/admin-post/doMoveBurialSiteTypeFieldUp.js @@ -1,10 +1,10 @@ import { moveBurialSiteTypeFieldUp, moveBurialSiteTypeFieldUpToTop } from '../../database/moveBurialSiteTypeField.js'; import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveBurialSiteTypeFieldUpToTop(request.body.burialSiteTypeFieldId) - : await moveBurialSiteTypeFieldUp(request.body.burialSiteTypeFieldId); - const burialSiteTypes = await getBurialSiteTypes(); + ? moveBurialSiteTypeFieldUpToTop(request.body.burialSiteTypeFieldId) + : moveBurialSiteTypeFieldUp(request.body.burialSiteTypeFieldId); + const burialSiteTypes = getBurialSiteTypes(); response.json({ success, burialSiteTypes diff --git a/handlers/admin-post/doMoveBurialSiteTypeFieldUp.ts b/handlers/admin-post/doMoveBurialSiteTypeFieldUp.ts index 4ec6f60b..ebc78cab 100644 --- a/handlers/admin-post/doMoveBurialSiteTypeFieldUp.ts +++ b/handlers/admin-post/doMoveBurialSiteTypeFieldUp.ts @@ -6,23 +6,24 @@ import { } from '../../database/moveBurialSiteTypeField.js' import { getBurialSiteTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { burialSiteTypeFieldId: string; moveToEnd: '0' | '1' } >, response: Response -): Promise { +): void { const success = request.body.moveToEnd === '1' - ? await moveBurialSiteTypeFieldUpToTop(request.body.burialSiteTypeFieldId) - : await moveBurialSiteTypeFieldUp(request.body.burialSiteTypeFieldId) + ? moveBurialSiteTypeFieldUpToTop(request.body.burialSiteTypeFieldId) + : moveBurialSiteTypeFieldUp(request.body.burialSiteTypeFieldId) - const burialSiteTypes = await getBurialSiteTypes() + const burialSiteTypes = getBurialSiteTypes() response.json({ success, + burialSiteTypes }) } diff --git a/handlers/admin-post/doMoveBurialSiteTypeUp.d.ts b/handlers/admin-post/doMoveBurialSiteTypeUp.d.ts index dcbb398c..59b9d906 100644 --- a/handlers/admin-post/doMoveBurialSiteTypeUp.d.ts +++ b/handlers/admin-post/doMoveBurialSiteTypeUp.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doMoveBurialSiteTypeUp.js b/handlers/admin-post/doMoveBurialSiteTypeUp.js index 83452d6e..25d2f8f4 100644 --- a/handlers/admin-post/doMoveBurialSiteTypeUp.js +++ b/handlers/admin-post/doMoveBurialSiteTypeUp.js @@ -1,10 +1,10 @@ import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js'; import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveRecordUpToTop('BurialSiteTypes', request.body.burialSiteTypeId) - : await moveRecordUp('BurialSiteTypes', request.body.burialSiteTypeId); - const burialSiteTypes = await getBurialSiteTypes(); + ? moveRecordUpToTop('BurialSiteTypes', request.body.burialSiteTypeId) + : moveRecordUp('BurialSiteTypes', request.body.burialSiteTypeId); + const burialSiteTypes = getBurialSiteTypes(); response.json({ success, burialSiteTypes diff --git a/handlers/admin-post/doMoveBurialSiteTypeUp.ts b/handlers/admin-post/doMoveBurialSiteTypeUp.ts index ad4a0108..55331007 100644 --- a/handlers/admin-post/doMoveBurialSiteTypeUp.ts +++ b/handlers/admin-post/doMoveBurialSiteTypeUp.ts @@ -3,26 +3,24 @@ import type { Request, Response } from 'express' import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js' import { getBurialSiteTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { burialSiteTypeId: string; moveToEnd: '0' | '1' } >, response: Response -): Promise { +): void { const success = request.body.moveToEnd === '1' - ? await moveRecordUpToTop( - 'BurialSiteTypes', - request.body.burialSiteTypeId - ) - : await moveRecordUp('BurialSiteTypes', request.body.burialSiteTypeId) + ? moveRecordUpToTop('BurialSiteTypes', request.body.burialSiteTypeId) + : moveRecordUp('BurialSiteTypes', request.body.burialSiteTypeId) - const burialSiteTypes = await getBurialSiteTypes() + const burialSiteTypes = getBurialSiteTypes() response.json({ success, + burialSiteTypes }) } diff --git a/handlers/admin-post/doMoveContractTypeDown.d.ts b/handlers/admin-post/doMoveContractTypeDown.d.ts index 2ff5fd7b..e99f8c5b 100644 --- a/handlers/admin-post/doMoveContractTypeDown.d.ts +++ b/handlers/admin-post/doMoveContractTypeDown.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doMoveContractTypeDown.js b/handlers/admin-post/doMoveContractTypeDown.js index 339fed25..bdd6672e 100644 --- a/handlers/admin-post/doMoveContractTypeDown.js +++ b/handlers/admin-post/doMoveContractTypeDown.js @@ -1,14 +1,14 @@ import { moveRecordDown, moveRecordDownToBottom } from '../../database/moveRecord.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveRecordDownToBottom('ContractTypes', request.body.contractTypeId) - : await moveRecordDown('ContractTypes', request.body.contractTypeId); - const contractTypes = await getContractTypes(); - const allContractTypeFields = await getAllContractTypeFields(); + ? moveRecordDownToBottom('ContractTypes', request.body.contractTypeId) + : moveRecordDown('ContractTypes', request.body.contractTypeId); + const contractTypes = getContractTypes(); + const allContractTypeFields = getAllContractTypeFields(); response.json({ success, - contractTypes, - allContractTypeFields + allContractTypeFields, + contractTypes }); } diff --git a/handlers/admin-post/doMoveContractTypeDown.ts b/handlers/admin-post/doMoveContractTypeDown.ts index 7687daad..50f7f69b 100644 --- a/handlers/admin-post/doMoveContractTypeDown.ts +++ b/handlers/admin-post/doMoveContractTypeDown.ts @@ -9,28 +9,26 @@ import { getContractTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { contractTypeId: string; moveToEnd: '0' | '1' } >, response: Response -): Promise { +): void { const success = request.body.moveToEnd === '1' - ? await moveRecordDownToBottom( - 'ContractTypes', - request.body.contractTypeId - ) - : await moveRecordDown('ContractTypes', request.body.contractTypeId) + ? moveRecordDownToBottom('ContractTypes', request.body.contractTypeId) + : moveRecordDown('ContractTypes', request.body.contractTypeId) - const contractTypes = await getContractTypes() - const allContractTypeFields = await getAllContractTypeFields() + const contractTypes = getContractTypes() + const allContractTypeFields = getAllContractTypeFields() response.json({ success, - contractTypes, - allContractTypeFields + + allContractTypeFields, + contractTypes }) } diff --git a/handlers/admin-post/doMoveContractTypeFieldDown.d.ts b/handlers/admin-post/doMoveContractTypeFieldDown.d.ts index 44fc8cf1..d99c0eca 100644 --- a/handlers/admin-post/doMoveContractTypeFieldDown.d.ts +++ b/handlers/admin-post/doMoveContractTypeFieldDown.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doMoveContractTypeFieldDown.js b/handlers/admin-post/doMoveContractTypeFieldDown.js index 15642a80..dd8fbdc2 100644 --- a/handlers/admin-post/doMoveContractTypeFieldDown.js +++ b/handlers/admin-post/doMoveContractTypeFieldDown.js @@ -1,14 +1,14 @@ import { moveContractTypeFieldDown, moveContractTypeFieldDownToBottom } from '../../database/moveContractTypeField.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveContractTypeFieldDownToBottom(request.body.contractTypeFieldId) - : await moveContractTypeFieldDown(request.body.contractTypeFieldId); - const contractTypes = await getContractTypes(); - const allContractTypeFields = await getAllContractTypeFields(); + ? moveContractTypeFieldDownToBottom(request.body.contractTypeFieldId) + : moveContractTypeFieldDown(request.body.contractTypeFieldId); + const contractTypes = getContractTypes(); + const allContractTypeFields = getAllContractTypeFields(); response.json({ success, - contractTypes, - allContractTypeFields + allContractTypeFields, + contractTypes }); } diff --git a/handlers/admin-post/doMoveContractTypeFieldDown.ts b/handlers/admin-post/doMoveContractTypeFieldDown.ts index 1a20056f..1b216c46 100644 --- a/handlers/admin-post/doMoveContractTypeFieldDown.ts +++ b/handlers/admin-post/doMoveContractTypeFieldDown.ts @@ -9,27 +9,26 @@ import { getContractTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { contractTypeFieldId: string; moveToEnd: '0' | '1' } >, response: Response -): Promise { +): void { const success = request.body.moveToEnd === '1' - ? await moveContractTypeFieldDownToBottom( - request.body.contractTypeFieldId - ) - : await moveContractTypeFieldDown(request.body.contractTypeFieldId) + ? moveContractTypeFieldDownToBottom(request.body.contractTypeFieldId) + : moveContractTypeFieldDown(request.body.contractTypeFieldId) - const contractTypes = await getContractTypes() - const allContractTypeFields = await getAllContractTypeFields() + const contractTypes = getContractTypes() + const allContractTypeFields = getAllContractTypeFields() response.json({ success, - contractTypes, - allContractTypeFields + + allContractTypeFields, + contractTypes }) } diff --git a/handlers/admin-post/doMoveContractTypeFieldUp.d.ts b/handlers/admin-post/doMoveContractTypeFieldUp.d.ts index 44fc8cf1..d99c0eca 100644 --- a/handlers/admin-post/doMoveContractTypeFieldUp.d.ts +++ b/handlers/admin-post/doMoveContractTypeFieldUp.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doMoveContractTypeFieldUp.js b/handlers/admin-post/doMoveContractTypeFieldUp.js index 42345bb4..7613730c 100644 --- a/handlers/admin-post/doMoveContractTypeFieldUp.js +++ b/handlers/admin-post/doMoveContractTypeFieldUp.js @@ -1,14 +1,14 @@ import { moveContractTypeFieldUp, moveContractTypeFieldUpToTop } from '../../database/moveContractTypeField.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveContractTypeFieldUpToTop(request.body.contractTypeFieldId) - : await moveContractTypeFieldUp(request.body.contractTypeFieldId); - const contractTypes = await getContractTypes(); - const allContractTypeFields = await getAllContractTypeFields(); + ? moveContractTypeFieldUpToTop(request.body.contractTypeFieldId) + : moveContractTypeFieldUp(request.body.contractTypeFieldId); + const contractTypes = getContractTypes(); + const allContractTypeFields = getAllContractTypeFields(); response.json({ success, - contractTypes, - allContractTypeFields + allContractTypeFields, + contractTypes }); } diff --git a/handlers/admin-post/doMoveContractTypeFieldUp.ts b/handlers/admin-post/doMoveContractTypeFieldUp.ts index bffa4fc7..e116c533 100644 --- a/handlers/admin-post/doMoveContractTypeFieldUp.ts +++ b/handlers/admin-post/doMoveContractTypeFieldUp.ts @@ -9,25 +9,26 @@ import { getContractTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { contractTypeFieldId: string; moveToEnd: '0' | '1' } >, response: Response -): Promise { +): void { const success = request.body.moveToEnd === '1' - ? await moveContractTypeFieldUpToTop(request.body.contractTypeFieldId) - : await moveContractTypeFieldUp(request.body.contractTypeFieldId) + ? moveContractTypeFieldUpToTop(request.body.contractTypeFieldId) + : moveContractTypeFieldUp(request.body.contractTypeFieldId) - const contractTypes = await getContractTypes() - const allContractTypeFields = await getAllContractTypeFields() + const contractTypes = getContractTypes() + const allContractTypeFields = getAllContractTypeFields() response.json({ success, - contractTypes, - allContractTypeFields + + allContractTypeFields, + contractTypes }) } diff --git a/handlers/admin-post/doMoveContractTypePrintDown.d.ts b/handlers/admin-post/doMoveContractTypePrintDown.d.ts index e1a5dac8..7d000a93 100644 --- a/handlers/admin-post/doMoveContractTypePrintDown.d.ts +++ b/handlers/admin-post/doMoveContractTypePrintDown.d.ts @@ -3,4 +3,4 @@ export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doMoveContractTypePrintDown.js b/handlers/admin-post/doMoveContractTypePrintDown.js index 45ef7477..d712e641 100644 --- a/handlers/admin-post/doMoveContractTypePrintDown.js +++ b/handlers/admin-post/doMoveContractTypePrintDown.js @@ -1,14 +1,14 @@ import { moveContractTypePrintDown, moveContractTypePrintDownToBottom } from '../../database/moveContractTypePrintDown.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveContractTypePrintDownToBottom(request.body.contractTypeId, request.body.printEJS) - : await moveContractTypePrintDown(request.body.contractTypeId, request.body.printEJS); - const contractTypes = await getContractTypes(); - const allContractTypeFields = await getAllContractTypeFields(); + ? moveContractTypePrintDownToBottom(request.body.contractTypeId, request.body.printEJS) + : moveContractTypePrintDown(request.body.contractTypeId, request.body.printEJS); + const contractTypes = getContractTypes(); + const allContractTypeFields = getAllContractTypeFields(); response.json({ success, - contractTypes, - allContractTypeFields + allContractTypeFields, + contractTypes }); } diff --git a/handlers/admin-post/doMoveContractTypePrintDown.ts b/handlers/admin-post/doMoveContractTypePrintDown.ts index 4720f2bb..7ea9b753 100644 --- a/handlers/admin-post/doMoveContractTypePrintDown.ts +++ b/handlers/admin-post/doMoveContractTypePrintDown.ts @@ -9,31 +9,32 @@ import { getContractTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { contractTypeId: string; printEJS: string; moveToEnd: '0' | '1' } >, response: Response -): Promise { +): void { const success = request.body.moveToEnd === '1' - ? await moveContractTypePrintDownToBottom( + ? moveContractTypePrintDownToBottom( request.body.contractTypeId, request.body.printEJS ) - : await moveContractTypePrintDown( + : moveContractTypePrintDown( request.body.contractTypeId, request.body.printEJS ) - const contractTypes = await getContractTypes() - const allContractTypeFields = await getAllContractTypeFields() + const contractTypes = getContractTypes() + const allContractTypeFields = getAllContractTypeFields() response.json({ success, - contractTypes, - allContractTypeFields + + allContractTypeFields, + contractTypes }) } diff --git a/handlers/admin-post/doMoveContractTypePrintUp.d.ts b/handlers/admin-post/doMoveContractTypePrintUp.d.ts index e1a5dac8..7d000a93 100644 --- a/handlers/admin-post/doMoveContractTypePrintUp.d.ts +++ b/handlers/admin-post/doMoveContractTypePrintUp.d.ts @@ -3,4 +3,4 @@ export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doMoveContractTypePrintUp.js b/handlers/admin-post/doMoveContractTypePrintUp.js index 2cc6c47d..293d6c24 100644 --- a/handlers/admin-post/doMoveContractTypePrintUp.js +++ b/handlers/admin-post/doMoveContractTypePrintUp.js @@ -1,14 +1,14 @@ import { moveContractTypePrintUp, moveContractTypePrintUpToTop } from '../../database/moveContractTypePrintUp.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveContractTypePrintUpToTop(request.body.contractTypeId, request.body.printEJS) - : await moveContractTypePrintUp(request.body.contractTypeId, request.body.printEJS); - const contractTypes = await getContractTypes(); - const allContractTypeFields = await getAllContractTypeFields(); + ? moveContractTypePrintUpToTop(request.body.contractTypeId, request.body.printEJS) + : moveContractTypePrintUp(request.body.contractTypeId, request.body.printEJS); + const contractTypes = getContractTypes(); + const allContractTypeFields = getAllContractTypeFields(); response.json({ success, - contractTypes, - allContractTypeFields + allContractTypeFields, + contractTypes }); } diff --git a/handlers/admin-post/doMoveContractTypePrintUp.ts b/handlers/admin-post/doMoveContractTypePrintUp.ts index 6d153889..16c215c6 100644 --- a/handlers/admin-post/doMoveContractTypePrintUp.ts +++ b/handlers/admin-post/doMoveContractTypePrintUp.ts @@ -9,31 +9,32 @@ import { getContractTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { contractTypeId: string; printEJS: string; moveToEnd: '0' | '1' } >, response: Response -): Promise { +): void { const success = request.body.moveToEnd === '1' - ? await moveContractTypePrintUpToTop( + ? moveContractTypePrintUpToTop( request.body.contractTypeId, request.body.printEJS ) - : await moveContractTypePrintUp( + : moveContractTypePrintUp( request.body.contractTypeId, request.body.printEJS ) - const contractTypes = await getContractTypes() - const allContractTypeFields = await getAllContractTypeFields() + const contractTypes = getContractTypes() + const allContractTypeFields = getAllContractTypeFields() response.json({ success, - contractTypes, - allContractTypeFields + + allContractTypeFields, + contractTypes }) } diff --git a/handlers/admin-post/doMoveContractTypeUp.d.ts b/handlers/admin-post/doMoveContractTypeUp.d.ts index 2ff5fd7b..e99f8c5b 100644 --- a/handlers/admin-post/doMoveContractTypeUp.d.ts +++ b/handlers/admin-post/doMoveContractTypeUp.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doMoveContractTypeUp.js b/handlers/admin-post/doMoveContractTypeUp.js index cea229c4..d42d36f4 100644 --- a/handlers/admin-post/doMoveContractTypeUp.js +++ b/handlers/admin-post/doMoveContractTypeUp.js @@ -1,14 +1,14 @@ import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveRecordUpToTop('ContractTypes', request.body.contractTypeId) - : await moveRecordUp('ContractTypes', request.body.contractTypeId); - const contractTypes = await getContractTypes(); - const allContractTypeFields = await getAllContractTypeFields(); + ? moveRecordUpToTop('ContractTypes', request.body.contractTypeId) + : moveRecordUp('ContractTypes', request.body.contractTypeId); + const contractTypes = getContractTypes(); + const allContractTypeFields = getAllContractTypeFields(); response.json({ success, - contractTypes, - allContractTypeFields + allContractTypeFields, + contractTypes }); } diff --git a/handlers/admin-post/doMoveContractTypeUp.ts b/handlers/admin-post/doMoveContractTypeUp.ts index f5aaacf7..e7e7828a 100644 --- a/handlers/admin-post/doMoveContractTypeUp.ts +++ b/handlers/admin-post/doMoveContractTypeUp.ts @@ -6,25 +6,26 @@ import { getContractTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { contractTypeId: string; moveToEnd: '0' | '1' } >, response: Response -): Promise { +): void { const success = request.body.moveToEnd === '1' - ? await moveRecordUpToTop('ContractTypes', request.body.contractTypeId) - : await moveRecordUp('ContractTypes', request.body.contractTypeId) + ? moveRecordUpToTop('ContractTypes', request.body.contractTypeId) + : moveRecordUp('ContractTypes', request.body.contractTypeId) - const contractTypes = await getContractTypes() - const allContractTypeFields = await getAllContractTypeFields() + const contractTypes = getContractTypes() + const allContractTypeFields = getAllContractTypeFields() response.json({ success, - contractTypes, - allContractTypeFields + + allContractTypeFields, + contractTypes }) } diff --git a/handlers/admin-post/doMoveFeeCategoryDown.d.ts b/handlers/admin-post/doMoveFeeCategoryDown.d.ts index 07049eb0..9f8b8165 100644 --- a/handlers/admin-post/doMoveFeeCategoryDown.d.ts +++ b/handlers/admin-post/doMoveFeeCategoryDown.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doMoveFeeCategoryDown.js b/handlers/admin-post/doMoveFeeCategoryDown.js index 0e4e93d8..0754bd51 100644 --- a/handlers/admin-post/doMoveFeeCategoryDown.js +++ b/handlers/admin-post/doMoveFeeCategoryDown.js @@ -1,10 +1,10 @@ import getFeeCategories from '../../database/getFeeCategories.js'; import { moveRecordDown, moveRecordDownToBottom } from '../../database/moveRecord.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveRecordDownToBottom('FeeCategories', request.body.feeCategoryId) - : await moveRecordDown('FeeCategories', request.body.feeCategoryId); - const feeCategories = await getFeeCategories({}, { + ? moveRecordDownToBottom('FeeCategories', request.body.feeCategoryId) + : moveRecordDown('FeeCategories', request.body.feeCategoryId); + const feeCategories = getFeeCategories({}, { includeFees: true }); response.json({ diff --git a/handlers/admin-post/doMoveFeeCategoryDown.ts b/handlers/admin-post/doMoveFeeCategoryDown.ts index 7aad10e8..1098c232 100644 --- a/handlers/admin-post/doMoveFeeCategoryDown.ts +++ b/handlers/admin-post/doMoveFeeCategoryDown.ts @@ -6,23 +6,20 @@ import { moveRecordDownToBottom } from '../../database/moveRecord.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { feeCategoryId: string; moveToEnd: '0' | '1' } >, response: Response -): Promise { +): void { const success = request.body.moveToEnd === '1' - ? await moveRecordDownToBottom( - 'FeeCategories', - request.body.feeCategoryId - ) - : await moveRecordDown('FeeCategories', request.body.feeCategoryId) + ? moveRecordDownToBottom('FeeCategories', request.body.feeCategoryId) + : moveRecordDown('FeeCategories', request.body.feeCategoryId) - const feeCategories = await getFeeCategories( + const feeCategories = getFeeCategories( {}, { includeFees: true @@ -31,6 +28,7 @@ export default async function handler( response.json({ success, + feeCategories }) } diff --git a/handlers/admin-post/doMoveFeeCategoryUp.d.ts b/handlers/admin-post/doMoveFeeCategoryUp.d.ts index 07049eb0..9f8b8165 100644 --- a/handlers/admin-post/doMoveFeeCategoryUp.d.ts +++ b/handlers/admin-post/doMoveFeeCategoryUp.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doMoveFeeCategoryUp.js b/handlers/admin-post/doMoveFeeCategoryUp.js index 22e28cc4..7c6f3f9b 100644 --- a/handlers/admin-post/doMoveFeeCategoryUp.js +++ b/handlers/admin-post/doMoveFeeCategoryUp.js @@ -1,10 +1,10 @@ import getFeeCategories from '../../database/getFeeCategories.js'; import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveRecordUpToTop('FeeCategories', request.body.feeCategoryId) - : await moveRecordUp('FeeCategories', request.body.feeCategoryId); - const feeCategories = await getFeeCategories({}, { + ? moveRecordUpToTop('FeeCategories', request.body.feeCategoryId) + : moveRecordUp('FeeCategories', request.body.feeCategoryId); + const feeCategories = getFeeCategories({}, { includeFees: true }); response.json({ diff --git a/handlers/admin-post/doMoveFeeCategoryUp.ts b/handlers/admin-post/doMoveFeeCategoryUp.ts index 5b7bc018..6ce66619 100644 --- a/handlers/admin-post/doMoveFeeCategoryUp.ts +++ b/handlers/admin-post/doMoveFeeCategoryUp.ts @@ -3,16 +3,20 @@ import type { Request, Response } from 'express' import getFeeCategories from '../../database/getFeeCategories.js' import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js' -export default async function handler( - request: Request, +export default function handler( + request: Request< + unknown, + unknown, + { feeCategoryId: string; moveToEnd: '0' | '1' } + >, response: Response -): Promise { +): void { const success = request.body.moveToEnd === '1' - ? await moveRecordUpToTop('FeeCategories', request.body.feeCategoryId) - : await moveRecordUp('FeeCategories', request.body.feeCategoryId) + ? moveRecordUpToTop('FeeCategories', request.body.feeCategoryId) + : moveRecordUp('FeeCategories', request.body.feeCategoryId) - const feeCategories = await getFeeCategories( + const feeCategories = getFeeCategories( {}, { includeFees: true @@ -21,6 +25,7 @@ export default async function handler( response.json({ success, + feeCategories }) } diff --git a/handlers/admin-post/doMoveFeeDown.d.ts b/handlers/admin-post/doMoveFeeDown.d.ts index c461a36f..fe2cb5a9 100644 --- a/handlers/admin-post/doMoveFeeDown.d.ts +++ b/handlers/admin-post/doMoveFeeDown.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doMoveFeeDown.js b/handlers/admin-post/doMoveFeeDown.js index d6e9a95f..446a0772 100644 --- a/handlers/admin-post/doMoveFeeDown.js +++ b/handlers/admin-post/doMoveFeeDown.js @@ -1,10 +1,10 @@ import getFeeCategories from '../../database/getFeeCategories.js'; import { moveFeeDown, moveFeeDownToBottom } from '../../database/moveFee.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveFeeDownToBottom(request.body.feeId) - : await moveFeeDown(request.body.feeId); - const feeCategories = await getFeeCategories({}, { + ? moveFeeDownToBottom(request.body.feeId) + : moveFeeDown(request.body.feeId); + const feeCategories = getFeeCategories({}, { includeFees: true }); response.json({ diff --git a/handlers/admin-post/doMoveFeeDown.ts b/handlers/admin-post/doMoveFeeDown.ts index 6e8d77a2..98ab91d5 100644 --- a/handlers/admin-post/doMoveFeeDown.ts +++ b/handlers/admin-post/doMoveFeeDown.ts @@ -3,16 +3,16 @@ import type { Request, Response } from 'express' import getFeeCategories from '../../database/getFeeCategories.js' import { moveFeeDown, moveFeeDownToBottom } from '../../database/moveFee.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { +): void { const success = request.body.moveToEnd === '1' - ? await moveFeeDownToBottom(request.body.feeId) - : await moveFeeDown(request.body.feeId) + ? moveFeeDownToBottom(request.body.feeId) + : moveFeeDown(request.body.feeId) - const feeCategories = await getFeeCategories( + const feeCategories = getFeeCategories( {}, { includeFees: true @@ -21,6 +21,7 @@ export default async function handler( response.json({ success, + feeCategories }) } diff --git a/handlers/admin-post/doMoveFeeUp.d.ts b/handlers/admin-post/doMoveFeeUp.d.ts index c461a36f..fe2cb5a9 100644 --- a/handlers/admin-post/doMoveFeeUp.d.ts +++ b/handlers/admin-post/doMoveFeeUp.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doMoveFeeUp.js b/handlers/admin-post/doMoveFeeUp.js index 6ef9ef5a..f2462ac5 100644 --- a/handlers/admin-post/doMoveFeeUp.js +++ b/handlers/admin-post/doMoveFeeUp.js @@ -1,10 +1,10 @@ import getFeeCategories from '../../database/getFeeCategories.js'; import { moveFeeUp, moveFeeUpToTop } from '../../database/moveFee.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveFeeUpToTop(request.body.feeId) - : await moveFeeUp(request.body.feeId); - const feeCategories = await getFeeCategories({}, { + ? moveFeeUpToTop(request.body.feeId) + : moveFeeUp(request.body.feeId); + const feeCategories = getFeeCategories({}, { includeFees: true }); response.json({ diff --git a/handlers/admin-post/doMoveFeeUp.ts b/handlers/admin-post/doMoveFeeUp.ts index 3845fc93..194b00a2 100644 --- a/handlers/admin-post/doMoveFeeUp.ts +++ b/handlers/admin-post/doMoveFeeUp.ts @@ -3,16 +3,16 @@ import type { Request, Response } from 'express' import getFeeCategories from '../../database/getFeeCategories.js' import { moveFeeUp, moveFeeUpToTop } from '../../database/moveFee.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { +): void { const success = request.body.moveToEnd === '1' - ? await moveFeeUpToTop(request.body.feeId) - : await moveFeeUp(request.body.feeId) + ? moveFeeUpToTop(request.body.feeId) + : moveFeeUp(request.body.feeId) - const feeCategories = await getFeeCategories( + const feeCategories = getFeeCategories( {}, { includeFees: true @@ -21,6 +21,7 @@ export default async function handler( response.json({ success, + feeCategories }) } diff --git a/handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.d.ts b/handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.d.ts index 2ce59ba1..a1c64338 100644 --- a/handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.d.ts +++ b/handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.js b/handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.js index 54d49fe3..50637d26 100644 --- a/handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.js +++ b/handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.js @@ -1,10 +1,10 @@ import { moveRecordDown, moveRecordDownToBottom } from '../../database/moveRecord.js'; import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveRecordDownToBottom('WorkOrderMilestoneTypes', request.body.workOrderMilestoneTypeId) - : await moveRecordDown('WorkOrderMilestoneTypes', request.body.workOrderMilestoneTypeId); - const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes(); + ? moveRecordDownToBottom('WorkOrderMilestoneTypes', request.body.workOrderMilestoneTypeId) + : moveRecordDown('WorkOrderMilestoneTypes', request.body.workOrderMilestoneTypeId); + const workOrderMilestoneTypes = getWorkOrderMilestoneTypes(); response.json({ success, workOrderMilestoneTypes diff --git a/handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.ts b/handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.ts index bcbabdec..e885f035 100644 --- a/handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.ts +++ b/handlers/admin-post/doMoveWorkOrderMilestoneTypeDown.ts @@ -6,26 +6,26 @@ import { } from '../../database/moveRecord.js' import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { workOrderMilestoneTypeId: string; moveToEnd: '0' | '1' } >, response: Response -): Promise { +): void { const success = request.body.moveToEnd === '1' - ? await moveRecordDownToBottom( + ? moveRecordDownToBottom( 'WorkOrderMilestoneTypes', request.body.workOrderMilestoneTypeId ) - : await moveRecordDown( + : moveRecordDown( 'WorkOrderMilestoneTypes', request.body.workOrderMilestoneTypeId ) - const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes() + const workOrderMilestoneTypes = getWorkOrderMilestoneTypes() response.json({ success, diff --git a/handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.d.ts b/handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.d.ts index 2ce59ba1..a1c64338 100644 --- a/handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.d.ts +++ b/handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.js b/handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.js index 5964f33c..0fa66ede 100644 --- a/handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.js +++ b/handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.js @@ -1,10 +1,10 @@ import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js'; import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveRecordUpToTop('WorkOrderMilestoneTypes', request.body.workOrderMilestoneTypeId) - : await moveRecordUp('WorkOrderMilestoneTypes', request.body.workOrderMilestoneTypeId); - const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes(); + ? moveRecordUpToTop('WorkOrderMilestoneTypes', request.body.workOrderMilestoneTypeId) + : moveRecordUp('WorkOrderMilestoneTypes', request.body.workOrderMilestoneTypeId); + const workOrderMilestoneTypes = getWorkOrderMilestoneTypes(); response.json({ success, workOrderMilestoneTypes diff --git a/handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.ts b/handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.ts index 279d6e61..c55cf84c 100644 --- a/handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.ts +++ b/handlers/admin-post/doMoveWorkOrderMilestoneTypeUp.ts @@ -3,26 +3,26 @@ import type { Request, Response } from 'express' import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js' import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { workOrderMilestoneTypeId: string; moveToEnd: '0' | '1' } >, response: Response -): Promise { +): void { const success = request.body.moveToEnd === '1' - ? await moveRecordUpToTop( + ? moveRecordUpToTop( 'WorkOrderMilestoneTypes', request.body.workOrderMilestoneTypeId ) - : await moveRecordUp( + : moveRecordUp( 'WorkOrderMilestoneTypes', request.body.workOrderMilestoneTypeId ) - const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes() + const workOrderMilestoneTypes = getWorkOrderMilestoneTypes() response.json({ success, diff --git a/handlers/admin-post/doMoveWorkOrderTypeDown.d.ts b/handlers/admin-post/doMoveWorkOrderTypeDown.d.ts index 13f16c74..bd1125db 100644 --- a/handlers/admin-post/doMoveWorkOrderTypeDown.d.ts +++ b/handlers/admin-post/doMoveWorkOrderTypeDown.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doMoveWorkOrderTypeDown.js b/handlers/admin-post/doMoveWorkOrderTypeDown.js index 5bb1ee0d..a6978549 100644 --- a/handlers/admin-post/doMoveWorkOrderTypeDown.js +++ b/handlers/admin-post/doMoveWorkOrderTypeDown.js @@ -1,10 +1,10 @@ import { moveRecordDown, moveRecordDownToBottom } from '../../database/moveRecord.js'; import { getWorkOrderTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveRecordDownToBottom('WorkOrderTypes', request.body.workOrderTypeId) - : await moveRecordDown('WorkOrderTypes', request.body.workOrderTypeId); - const workOrderTypes = await getWorkOrderTypes(); + ? moveRecordDownToBottom('WorkOrderTypes', request.body.workOrderTypeId) + : moveRecordDown('WorkOrderTypes', request.body.workOrderTypeId); + const workOrderTypes = getWorkOrderTypes(); response.json({ success, workOrderTypes diff --git a/handlers/admin-post/doMoveWorkOrderTypeDown.ts b/handlers/admin-post/doMoveWorkOrderTypeDown.ts index e5e4e526..132ae678 100644 --- a/handlers/admin-post/doMoveWorkOrderTypeDown.ts +++ b/handlers/admin-post/doMoveWorkOrderTypeDown.ts @@ -6,23 +6,20 @@ import { } from '../../database/moveRecord.js' import { getWorkOrderTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { workOrderTypeId: string; moveToEnd: '0' | '1' } >, response: Response -): Promise { +): void { const success = request.body.moveToEnd === '1' - ? await moveRecordDownToBottom( - 'WorkOrderTypes', - request.body.workOrderTypeId - ) - : await moveRecordDown('WorkOrderTypes', request.body.workOrderTypeId) + ? moveRecordDownToBottom('WorkOrderTypes', request.body.workOrderTypeId) + : moveRecordDown('WorkOrderTypes', request.body.workOrderTypeId) - const workOrderTypes = await getWorkOrderTypes() + const workOrderTypes = getWorkOrderTypes() response.json({ success, diff --git a/handlers/admin-post/doMoveWorkOrderTypeUp.d.ts b/handlers/admin-post/doMoveWorkOrderTypeUp.d.ts index 13f16c74..bd1125db 100644 --- a/handlers/admin-post/doMoveWorkOrderTypeUp.d.ts +++ b/handlers/admin-post/doMoveWorkOrderTypeUp.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doMoveWorkOrderTypeUp.js b/handlers/admin-post/doMoveWorkOrderTypeUp.js index 2e4c8476..1e7866f8 100644 --- a/handlers/admin-post/doMoveWorkOrderTypeUp.js +++ b/handlers/admin-post/doMoveWorkOrderTypeUp.js @@ -1,10 +1,10 @@ import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js'; import { getWorkOrderTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const success = request.body.moveToEnd === '1' - ? await moveRecordUpToTop('WorkOrderTypes', request.body.workOrderTypeId) - : await moveRecordUp('WorkOrderTypes', request.body.workOrderTypeId); - const workOrderTypes = await getWorkOrderTypes(); + ? moveRecordUpToTop('WorkOrderTypes', request.body.workOrderTypeId) + : moveRecordUp('WorkOrderTypes', request.body.workOrderTypeId); + const workOrderTypes = getWorkOrderTypes(); response.json({ success, workOrderTypes diff --git a/handlers/admin-post/doMoveWorkOrderTypeUp.ts b/handlers/admin-post/doMoveWorkOrderTypeUp.ts index 9df5d6ea..08389ece 100644 --- a/handlers/admin-post/doMoveWorkOrderTypeUp.ts +++ b/handlers/admin-post/doMoveWorkOrderTypeUp.ts @@ -3,20 +3,20 @@ import type { Request, Response } from 'express' import { moveRecordUp, moveRecordUpToTop } from '../../database/moveRecord.js' import { getWorkOrderTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { workOrderTypeId: string; moveToEnd: '0' | '1' } >, response: Response -): Promise { +): void { const success = request.body.moveToEnd === '1' - ? await moveRecordUpToTop('WorkOrderTypes', request.body.workOrderTypeId) - : await moveRecordUp('WorkOrderTypes', request.body.workOrderTypeId) + ? moveRecordUpToTop('WorkOrderTypes', request.body.workOrderTypeId) + : moveRecordUp('WorkOrderTypes', request.body.workOrderTypeId) - const workOrderTypes = await getWorkOrderTypes() + const workOrderTypes = getWorkOrderTypes() response.json({ success, diff --git a/handlers/admin-post/doUpdateBurialSiteStatus.d.ts b/handlers/admin-post/doUpdateBurialSiteStatus.d.ts index 0186900b..f4b2d70d 100644 --- a/handlers/admin-post/doUpdateBurialSiteStatus.d.ts +++ b/handlers/admin-post/doUpdateBurialSiteStatus.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doUpdateBurialSiteStatus.js b/handlers/admin-post/doUpdateBurialSiteStatus.js index 7dc48ccb..db850af8 100644 --- a/handlers/admin-post/doUpdateBurialSiteStatus.js +++ b/handlers/admin-post/doUpdateBurialSiteStatus.js @@ -1,8 +1,8 @@ import { updateRecord } from '../../database/updateRecord.js'; import { getBurialSiteStatuses } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = await updateRecord('BurialSiteStatuses', request.body.burialSiteStatusId, request.body.burialSiteStatus, request.session.user); - const burialSiteStatuses = await getBurialSiteStatuses(); +export default function handler(request, response) { + const success = updateRecord('BurialSiteStatuses', request.body.burialSiteStatusId, request.body.burialSiteStatus, request.session.user); + const burialSiteStatuses = getBurialSiteStatuses(); response.json({ success, burialSiteStatuses diff --git a/handlers/admin-post/doUpdateBurialSiteStatus.ts b/handlers/admin-post/doUpdateBurialSiteStatus.ts index 57f18fd3..1854ffb3 100644 --- a/handlers/admin-post/doUpdateBurialSiteStatus.ts +++ b/handlers/admin-post/doUpdateBurialSiteStatus.ts @@ -3,25 +3,26 @@ import type { Request, Response } from 'express' import { updateRecord } from '../../database/updateRecord.js' import { getBurialSiteStatuses } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { burialSiteStatusId: string; burialSiteStatus: string } >, response: Response -): Promise { - const success = await updateRecord( +): void { + const success = updateRecord( 'BurialSiteStatuses', request.body.burialSiteStatusId, request.body.burialSiteStatus, request.session.user as User ) - const burialSiteStatuses = await getBurialSiteStatuses() + const burialSiteStatuses = getBurialSiteStatuses() response.json({ success, + burialSiteStatuses }) } diff --git a/handlers/admin-post/doUpdateBurialSiteType.d.ts b/handlers/admin-post/doUpdateBurialSiteType.d.ts index 2fca9bcd..d77f376f 100644 --- a/handlers/admin-post/doUpdateBurialSiteType.d.ts +++ b/handlers/admin-post/doUpdateBurialSiteType.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doUpdateBurialSiteType.js b/handlers/admin-post/doUpdateBurialSiteType.js index 4fa955c3..1dd9c6d8 100644 --- a/handlers/admin-post/doUpdateBurialSiteType.js +++ b/handlers/admin-post/doUpdateBurialSiteType.js @@ -1,8 +1,8 @@ import { updateRecord } from '../../database/updateRecord.js'; import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = await updateRecord('BurialSiteTypes', request.body.burialSiteTypeId, request.body.burialSiteType, request.session.user); - const burialSiteTypes = await getBurialSiteTypes(); +export default function handler(request, response) { + const success = updateRecord('BurialSiteTypes', request.body.burialSiteTypeId, request.body.burialSiteType, request.session.user); + const burialSiteTypes = getBurialSiteTypes(); response.json({ success, burialSiteTypes diff --git a/handlers/admin-post/doUpdateBurialSiteType.ts b/handlers/admin-post/doUpdateBurialSiteType.ts index 2cbe47c3..5de0ea91 100644 --- a/handlers/admin-post/doUpdateBurialSiteType.ts +++ b/handlers/admin-post/doUpdateBurialSiteType.ts @@ -3,21 +3,26 @@ import type { Request, Response } from 'express' import { updateRecord } from '../../database/updateRecord.js' import { getBurialSiteTypes } from '../../helpers/functions.cache.js' -export default async function handler( - request: Request, +export default function handler( + request: Request< + unknown, + unknown, + { burialSiteTypeId: string; burialSiteType: string } + >, response: Response -): Promise { - const success = await updateRecord( +): void { + const success = updateRecord( 'BurialSiteTypes', request.body.burialSiteTypeId, request.body.burialSiteType, request.session.user as User ) - const burialSiteTypes = await getBurialSiteTypes() + const burialSiteTypes = getBurialSiteTypes() response.json({ success, + burialSiteTypes }) } diff --git a/handlers/admin-post/doUpdateBurialSiteTypeField.d.ts b/handlers/admin-post/doUpdateBurialSiteTypeField.d.ts index 19d32e4d..d5e48cba 100644 --- a/handlers/admin-post/doUpdateBurialSiteTypeField.d.ts +++ b/handlers/admin-post/doUpdateBurialSiteTypeField.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/admin-post/doUpdateBurialSiteTypeField.js b/handlers/admin-post/doUpdateBurialSiteTypeField.js index 88032cc3..5f833eb4 100644 --- a/handlers/admin-post/doUpdateBurialSiteTypeField.js +++ b/handlers/admin-post/doUpdateBurialSiteTypeField.js @@ -1,8 +1,8 @@ import updateBurialSiteTypeField from '../../database/updateBurialSiteTypeField.js'; import { getBurialSiteTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = await updateBurialSiteTypeField(request.body, request.session.user); - const burialSiteTypes = await getBurialSiteTypes(); +export default function handler(request, response) { + const success = updateBurialSiteTypeField(request.body, request.session.user); + const burialSiteTypes = getBurialSiteTypes(); response.json({ success, burialSiteTypes diff --git a/handlers/admin-post/doUpdateBurialSiteTypeField.ts b/handlers/admin-post/doUpdateBurialSiteTypeField.ts index f950be5b..28fd8d56 100644 --- a/handlers/admin-post/doUpdateBurialSiteTypeField.ts +++ b/handlers/admin-post/doUpdateBurialSiteTypeField.ts @@ -5,19 +5,17 @@ import updateBurialSiteTypeField, { } from '../../database/updateBurialSiteTypeField.js' import { getBurialSiteTypes } from '../../helpers/functions.cache.js' -export default async function handler( - request: Request, - response: Response -): Promise { - const success = await updateBurialSiteTypeField( +export default function handler(request: Request, response: Response): void { + const success = updateBurialSiteTypeField( request.body as UpdateBurialSiteTypeFieldForm, request.session.user as User ) - const burialSiteTypes = await getBurialSiteTypes() + const burialSiteTypes = getBurialSiteTypes() response.json({ success, + burialSiteTypes }) } diff --git a/handlers/admin-post/doUpdateContractType.d.ts b/handlers/admin-post/doUpdateContractType.d.ts index 0746ff1a..94179750 100644 --- a/handlers/admin-post/doUpdateContractType.d.ts +++ b/handlers/admin-post/doUpdateContractType.d.ts @@ -1,3 +1,3 @@ import type { Request, Response } from 'express'; import { type UpdateForm } from '../../database/updateContractType.js'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/admin-post/doUpdateContractType.js b/handlers/admin-post/doUpdateContractType.js index a22d133e..6998545c 100644 --- a/handlers/admin-post/doUpdateContractType.js +++ b/handlers/admin-post/doUpdateContractType.js @@ -1,12 +1,12 @@ import updateContractType from '../../database/updateContractType.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = await updateContractType(request.body, request.session.user); - const contractTypes = await getContractTypes(); - const allContractTypeFields = await getAllContractTypeFields(); +export default function handler(request, response) { + const success = updateContractType(request.body, request.session.user); + const contractTypes = getContractTypes(); + const allContractTypeFields = getAllContractTypeFields(); response.json({ success, - contractTypes, - allContractTypeFields + allContractTypeFields, + contractTypes }); } diff --git a/handlers/admin-post/doUpdateContractType.ts b/handlers/admin-post/doUpdateContractType.ts index 6a6936a6..8db646b4 100644 --- a/handlers/admin-post/doUpdateContractType.ts +++ b/handlers/admin-post/doUpdateContractType.ts @@ -8,21 +8,19 @@ import { getContractTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const success = await updateContractType( - request.body, - request.session.user as User - ) +): void { + const success = updateContractType(request.body, request.session.user as User) - const contractTypes = await getContractTypes() - const allContractTypeFields = await getAllContractTypeFields() + const contractTypes = getContractTypes() + const allContractTypeFields = getAllContractTypeFields() response.json({ success, - contractTypes, - allContractTypeFields + + allContractTypeFields, + contractTypes }) } diff --git a/handlers/admin-post/doUpdateContractTypeField.d.ts b/handlers/admin-post/doUpdateContractTypeField.d.ts index 725e2d46..da61e6bf 100644 --- a/handlers/admin-post/doUpdateContractTypeField.d.ts +++ b/handlers/admin-post/doUpdateContractTypeField.d.ts @@ -1,3 +1,3 @@ import type { Request, Response } from 'express'; import { type UpdateContractTypeFieldForm } from '../../database/updateContractTypeField.js'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/admin-post/doUpdateContractTypeField.js b/handlers/admin-post/doUpdateContractTypeField.js index 9ff8e5b0..c0307f9c 100644 --- a/handlers/admin-post/doUpdateContractTypeField.js +++ b/handlers/admin-post/doUpdateContractTypeField.js @@ -1,12 +1,12 @@ import updateContractTypeField from '../../database/updateContractTypeField.js'; import { getAllContractTypeFields, getContractTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const success = await updateContractTypeField(request.body, request.session.user); - const contractTypes = await getContractTypes(); - const allContractTypeFields = await getAllContractTypeFields(); +export default function handler(request, response) { + const success = updateContractTypeField(request.body, request.session.user); + const contractTypes = getContractTypes(); + const allContractTypeFields = getAllContractTypeFields(); response.json({ success, - contractTypes, - allContractTypeFields + allContractTypeFields, + contractTypes }); } diff --git a/handlers/admin-post/doUpdateContractTypeField.ts b/handlers/admin-post/doUpdateContractTypeField.ts index 4bc1111c..8a90b25a 100644 --- a/handlers/admin-post/doUpdateContractTypeField.ts +++ b/handlers/admin-post/doUpdateContractTypeField.ts @@ -8,21 +8,22 @@ import { getContractTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const success = await updateContractTypeField( +): void { + const success = updateContractTypeField( request.body, request.session.user as User ) - const contractTypes = await getContractTypes() - const allContractTypeFields = await getAllContractTypeFields() + const contractTypes = getContractTypes() + const allContractTypeFields = getAllContractTypeFields() response.json({ success, - contractTypes, - allContractTypeFields + + allContractTypeFields, + contractTypes }) } diff --git a/handlers/admin-post/doUpdateFee.d.ts b/handlers/admin-post/doUpdateFee.d.ts index 19d32e4d..d5e48cba 100644 --- a/handlers/admin-post/doUpdateFee.d.ts +++ b/handlers/admin-post/doUpdateFee.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/admin-post/doUpdateFee.js b/handlers/admin-post/doUpdateFee.js index 98498b8b..1b5e5903 100644 --- a/handlers/admin-post/doUpdateFee.js +++ b/handlers/admin-post/doUpdateFee.js @@ -1,8 +1,8 @@ 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); - const feeCategories = await getFeeCategories({}, { +export default function handler(request, response) { + const success = updateFee(request.body, request.session.user); + const feeCategories = getFeeCategories({}, { includeFees: true }); response.json({ diff --git a/handlers/admin-post/doUpdateFee.ts b/handlers/admin-post/doUpdateFee.ts index 55e21a82..c86bb19a 100644 --- a/handlers/admin-post/doUpdateFee.ts +++ b/handlers/admin-post/doUpdateFee.ts @@ -3,13 +3,13 @@ import type { Request, Response } from 'express' import getFeeCategories from '../../database/getFeeCategories.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 as UpdateFeeForm, request.session.user as User) +export default function handler(request: Request, response: Response): void { + const success = updateFee( + request.body as UpdateFeeForm, + request.session.user as User + ) - const feeCategories = await getFeeCategories( + const feeCategories = getFeeCategories( {}, { includeFees: true @@ -18,6 +18,7 @@ export default async function handler( response.json({ success, + feeCategories }) } diff --git a/handlers/admin-post/doUpdateFeeAmount.d.ts b/handlers/admin-post/doUpdateFeeAmount.d.ts index 19d32e4d..d5e48cba 100644 --- a/handlers/admin-post/doUpdateFeeAmount.d.ts +++ b/handlers/admin-post/doUpdateFeeAmount.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/admin-post/doUpdateFeeAmount.js b/handlers/admin-post/doUpdateFeeAmount.js index 29d353ed..eeb79294 100644 --- a/handlers/admin-post/doUpdateFeeAmount.js +++ b/handlers/admin-post/doUpdateFeeAmount.js @@ -1,8 +1,8 @@ import getFeeCategories from '../../database/getFeeCategories.js'; import { updateFeeAmount } from '../../database/updateFee.js'; -export default async function handler(request, response) { - const success = await updateFeeAmount(request.body, request.session.user); - const feeCategories = await getFeeCategories({}, { +export default function handler(request, response) { + const success = updateFeeAmount(request.body, request.session.user); + const feeCategories = getFeeCategories({}, { includeFees: true }); response.json({ diff --git a/handlers/admin-post/doUpdateFeeAmount.ts b/handlers/admin-post/doUpdateFeeAmount.ts index 82110861..35d7833c 100644 --- a/handlers/admin-post/doUpdateFeeAmount.ts +++ b/handlers/admin-post/doUpdateFeeAmount.ts @@ -6,16 +6,13 @@ import { updateFeeAmount } from '../../database/updateFee.js' -export default async function handler( - request: Request, - response: Response -): Promise { - const success = await updateFeeAmount( +export default function handler(request: Request, response: Response): void { + const success = updateFeeAmount( request.body as UpdateFeeAmountForm, request.session.user as User ) - const feeCategories = await getFeeCategories( + const feeCategories = getFeeCategories( {}, { includeFees: true @@ -24,6 +21,7 @@ export default async function handler( response.json({ success, + feeCategories }) } diff --git a/handlers/admin-post/doUpdateFeeCategory.d.ts b/handlers/admin-post/doUpdateFeeCategory.d.ts index 19d32e4d..d5e48cba 100644 --- a/handlers/admin-post/doUpdateFeeCategory.d.ts +++ b/handlers/admin-post/doUpdateFeeCategory.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/admin-post/doUpdateFeeCategory.js b/handlers/admin-post/doUpdateFeeCategory.js index 7c29db41..37846069 100644 --- a/handlers/admin-post/doUpdateFeeCategory.js +++ b/handlers/admin-post/doUpdateFeeCategory.js @@ -1,8 +1,8 @@ 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); - const feeCategories = await getFeeCategories({}, { +export default function handler(request, response) { + const success = updateFeeCategory(request.body, request.session.user); + const feeCategories = getFeeCategories({}, { includeFees: true }); response.json({ diff --git a/handlers/admin-post/doUpdateFeeCategory.ts b/handlers/admin-post/doUpdateFeeCategory.ts index 4796c1be..17d0c7a9 100644 --- a/handlers/admin-post/doUpdateFeeCategory.ts +++ b/handlers/admin-post/doUpdateFeeCategory.ts @@ -5,16 +5,13 @@ import updateFeeCategory, { type UpdateFeeCategoryForm } from '../../database/updateFeeCategory.js' -export default async function handler( - request: Request, - response: Response -): Promise { - const success = await updateFeeCategory( +export default function handler(request: Request, response: Response): void { + const success = updateFeeCategory( request.body as UpdateFeeCategoryForm, request.session.user as User ) - const feeCategories = await getFeeCategories( + const feeCategories = getFeeCategories( {}, { includeFees: true @@ -23,6 +20,7 @@ export default async function handler( response.json({ success, + feeCategories }) } diff --git a/handlers/admin-post/doUpdateWorkOrderMilestoneType.d.ts b/handlers/admin-post/doUpdateWorkOrderMilestoneType.d.ts index 5e69808b..beb09d2d 100644 --- a/handlers/admin-post/doUpdateWorkOrderMilestoneType.d.ts +++ b/handlers/admin-post/doUpdateWorkOrderMilestoneType.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doUpdateWorkOrderMilestoneType.js b/handlers/admin-post/doUpdateWorkOrderMilestoneType.js index ad10e1b2..1cf2f07a 100644 --- a/handlers/admin-post/doUpdateWorkOrderMilestoneType.js +++ b/handlers/admin-post/doUpdateWorkOrderMilestoneType.js @@ -1,8 +1,8 @@ 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(); +export default function handler(request, response) { + const success = updateRecord('WorkOrderMilestoneTypes', request.body.workOrderMilestoneTypeId, request.body.workOrderMilestoneType, request.session.user); + const workOrderMilestoneTypes = getWorkOrderMilestoneTypes(); response.json({ success, workOrderMilestoneTypes diff --git a/handlers/admin-post/doUpdateWorkOrderMilestoneType.ts b/handlers/admin-post/doUpdateWorkOrderMilestoneType.ts index bbf11f36..f104c733 100644 --- a/handlers/admin-post/doUpdateWorkOrderMilestoneType.ts +++ b/handlers/admin-post/doUpdateWorkOrderMilestoneType.ts @@ -3,22 +3,22 @@ import type { Request, Response } from 'express' import { updateRecord } from '../../database/updateRecord.js' import { getWorkOrderMilestoneTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { workOrderMilestoneTypeId: string; workOrderMilestoneType: string } >, response: Response -): Promise { - const success = await updateRecord( +): void { + const success = updateRecord( 'WorkOrderMilestoneTypes', request.body.workOrderMilestoneTypeId, request.body.workOrderMilestoneType, request.session.user as User ) - const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes() + const workOrderMilestoneTypes = getWorkOrderMilestoneTypes() response.json({ success, diff --git a/handlers/admin-post/doUpdateWorkOrderType.d.ts b/handlers/admin-post/doUpdateWorkOrderType.d.ts index 0c46df88..7fd428e6 100644 --- a/handlers/admin-post/doUpdateWorkOrderType.d.ts +++ b/handlers/admin-post/doUpdateWorkOrderType.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/admin-post/doUpdateWorkOrderType.js b/handlers/admin-post/doUpdateWorkOrderType.js index f3f0c3bf..9f2261d4 100644 --- a/handlers/admin-post/doUpdateWorkOrderType.js +++ b/handlers/admin-post/doUpdateWorkOrderType.js @@ -1,8 +1,8 @@ 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(); +export default function handler(request, response) { + const success = updateRecord('WorkOrderTypes', request.body.workOrderTypeId, request.body.workOrderType, request.session.user); + const workOrderTypes = getWorkOrderTypes(); response.json({ success, workOrderTypes diff --git a/handlers/admin-post/doUpdateWorkOrderType.ts b/handlers/admin-post/doUpdateWorkOrderType.ts index cbbfff80..c87edbc0 100644 --- a/handlers/admin-post/doUpdateWorkOrderType.ts +++ b/handlers/admin-post/doUpdateWorkOrderType.ts @@ -3,18 +3,22 @@ import type { Request, Response } from 'express' import { updateRecord } from '../../database/updateRecord.js' import { getWorkOrderTypes } from '../../helpers/functions.cache.js' -export default async function handler( - request: Request, +export default function handler( + request: Request< + unknown, + unknown, + { workOrderTypeId: string; workOrderType: string } + >, response: Response -): Promise { - const success = await updateRecord( +): void { + const success = updateRecord( 'WorkOrderTypes', request.body.workOrderTypeId, request.body.workOrderType, request.session.user as User ) - const workOrderTypes = await getWorkOrderTypes() + const workOrderTypes = getWorkOrderTypes() response.json({ success, diff --git a/handlers/api-get/milestoneICS.ts b/handlers/api-get/milestoneICS.ts index ff45bb6b..91b346a3 100644 --- a/handlers/api-get/milestoneICS.ts +++ b/handlers/api-get/milestoneICS.ts @@ -1,6 +1,7 @@ /* eslint-disable unicorn/filename-case, @eslint-community/eslint-comments/disable-enable-pair */ import type { Request, Response } from 'express' + import ical, { type ICalEventData, ICalEventStatus } from 'ical-generator' import getWorkOrderMilestones, { diff --git a/handlers/burialSites-get/edit.js b/handlers/burialSites-get/edit.js index c77b5b74..8340a698 100644 --- a/handlers/burialSites-get/edit.js +++ b/handlers/burialSites-get/edit.js @@ -9,10 +9,10 @@ export default async function handler(request, response) { response.redirect(`${getConfigProperty('reverseProxy.urlPrefix')}/burialSites/?error=burialSiteIdNotFound`); return; } - const cemeteries = await getCemeteries(); - const burialSiteImages = await getBurialSiteImages(); - const burialSiteTypes = await getBurialSiteTypes(); - const burialSiteStatuses = await getBurialSiteStatuses(); + const cemeteries = getCemeteries(); + const burialSiteImages = getBurialSiteImages(); + const burialSiteTypes = getBurialSiteTypes(); + const burialSiteStatuses = getBurialSiteStatuses(); response.render('burialSite-edit', { headTitle: burialSite.burialSiteName, burialSite, diff --git a/handlers/burialSites-get/edit.ts b/handlers/burialSites-get/edit.ts index ad3f8474..567ad782 100644 --- a/handlers/burialSites-get/edit.ts +++ b/handlers/burialSites-get/edit.ts @@ -22,10 +22,10 @@ export default async function handler( return } - const cemeteries = await getCemeteries() - const burialSiteImages = await getBurialSiteImages() - const burialSiteTypes = await getBurialSiteTypes() - const burialSiteStatuses = await getBurialSiteStatuses() + const cemeteries = getCemeteries() + const burialSiteImages = getBurialSiteImages() + const burialSiteTypes = getBurialSiteTypes() + const burialSiteStatuses = getBurialSiteStatuses() response.render('burialSite-edit', { headTitle: burialSite.burialSiteName, diff --git a/handlers/burialSites-get/new.js b/handlers/burialSites-get/new.js index c85e6f81..384b426b 100644 --- a/handlers/burialSites-get/new.js +++ b/handlers/burialSites-get/new.js @@ -6,7 +6,7 @@ export default async function handler(request, response) { burialSiteId: -1, contracts: [] }; - const cemeteries = await getCemeteries(); + const cemeteries = getCemeteries(); if (request.query.cemeteryId !== undefined) { const cemeteryId = Number.parseInt(request.query.cemeteryId, 10); const cemetery = cemeteries.find((possibleMatch) => cemeteryId === possibleMatch.cemeteryId); @@ -16,8 +16,8 @@ export default async function handler(request, response) { } } const burialSiteImages = await getBurialSiteImages(); - const burialSiteTypes = await getBurialSiteTypes(); - const burialSiteStatuses = await getBurialSiteStatuses(); + const burialSiteTypes = getBurialSiteTypes(); + const burialSiteStatuses = getBurialSiteStatuses(); response.render('burialSite-edit', { headTitle: 'Create a New Burial Site', burialSite, @@ -25,6 +25,6 @@ export default async function handler(request, response) { burialSiteImages, burialSiteStatuses, burialSiteTypes, - cemeteries, + cemeteries }); } diff --git a/handlers/burialSites-get/new.ts b/handlers/burialSites-get/new.ts index 07f257ea..9007f111 100644 --- a/handlers/burialSites-get/new.ts +++ b/handlers/burialSites-get/new.ts @@ -17,7 +17,7 @@ export default async function handler( contracts: [] } - const cemeteries = await getCemeteries() + const cemeteries = getCemeteries() if (request.query.cemeteryId !== undefined) { const cemeteryId = Number.parseInt(request.query.cemeteryId as string, 10) @@ -33,8 +33,8 @@ export default async function handler( } const burialSiteImages = await getBurialSiteImages() - const burialSiteTypes = await getBurialSiteTypes() - const burialSiteStatuses = await getBurialSiteStatuses() + const burialSiteTypes = getBurialSiteTypes() + const burialSiteStatuses = getBurialSiteStatuses() response.render('burialSite-edit', { headTitle: 'Create a New Burial Site', @@ -45,6 +45,6 @@ export default async function handler( burialSiteImages, burialSiteStatuses, burialSiteTypes, - cemeteries, + cemeteries }) } diff --git a/handlers/burialSites-get/next.d.ts b/handlers/burialSites-get/next.d.ts index 19d32e4d..d5e48cba 100644 --- a/handlers/burialSites-get/next.d.ts +++ b/handlers/burialSites-get/next.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/burialSites-get/next.js b/handlers/burialSites-get/next.js index 28603a85..2782e6da 100644 --- a/handlers/burialSites-get/next.js +++ b/handlers/burialSites-get/next.js @@ -1,8 +1,8 @@ import { getNextBurialSiteId } from '../../helpers/burialSites.helpers.js'; import { getConfigProperty } from '../../helpers/config.helpers.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const burialSiteId = Number.parseInt(request.params.burialSiteId, 10); - const nextBurialSiteId = await getNextBurialSiteId(burialSiteId); + const nextBurialSiteId = getNextBurialSiteId(burialSiteId); if (nextBurialSiteId === undefined) { response.redirect(`${getConfigProperty('reverseProxy.urlPrefix')}/burialSites/?error=noNextBurialSiteIdFound`); return; diff --git a/handlers/burialSites-get/next.ts b/handlers/burialSites-get/next.ts index 5194f2c7..982a9cd0 100644 --- a/handlers/burialSites-get/next.ts +++ b/handlers/burialSites-get/next.ts @@ -3,13 +3,10 @@ import type { Request, Response } from 'express' import { getNextBurialSiteId } from '../../helpers/burialSites.helpers.js' import { getConfigProperty } from '../../helpers/config.helpers.js' -export default async function handler( - request: Request, - response: Response -): Promise { +export default function handler(request: Request, response: Response): void { const burialSiteId = Number.parseInt(request.params.burialSiteId, 10) - const nextBurialSiteId = await getNextBurialSiteId(burialSiteId) + const nextBurialSiteId = getNextBurialSiteId(burialSiteId) if (nextBurialSiteId === undefined) { response.redirect( diff --git a/handlers/burialSites-get/previous.d.ts b/handlers/burialSites-get/previous.d.ts index 19d32e4d..d5e48cba 100644 --- a/handlers/burialSites-get/previous.d.ts +++ b/handlers/burialSites-get/previous.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/burialSites-get/previous.js b/handlers/burialSites-get/previous.js index 8b15fb6d..85d62aa2 100644 --- a/handlers/burialSites-get/previous.js +++ b/handlers/burialSites-get/previous.js @@ -1,8 +1,8 @@ import { getPreviousBurialSiteId } from '../../helpers/burialSites.helpers.js'; import { getConfigProperty } from '../../helpers/config.helpers.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const burialSiteId = Number.parseInt(request.params.burialSiteId, 10); - const previousBurialSiteId = await getPreviousBurialSiteId(burialSiteId); + const previousBurialSiteId = getPreviousBurialSiteId(burialSiteId); if (previousBurialSiteId === undefined) { response.redirect(`${getConfigProperty('reverseProxy.urlPrefix')}/burialSites/?error=noPreviousBurialSiteIdFound`); return; diff --git a/handlers/burialSites-get/previous.ts b/handlers/burialSites-get/previous.ts index a7baa971..476d66f4 100644 --- a/handlers/burialSites-get/previous.ts +++ b/handlers/burialSites-get/previous.ts @@ -3,13 +3,10 @@ import type { Request, Response } from 'express' import { getPreviousBurialSiteId } from '../../helpers/burialSites.helpers.js' import { getConfigProperty } from '../../helpers/config.helpers.js' -export default async function handler( - request: Request, - response: Response -): Promise { +export default function handler(request: Request, response: Response): void { const burialSiteId = Number.parseInt(request.params.burialSiteId, 10) - const previousBurialSiteId = await getPreviousBurialSiteId(burialSiteId) + const previousBurialSiteId = getPreviousBurialSiteId(burialSiteId) if (previousBurialSiteId === undefined) { response.redirect( diff --git a/handlers/burialSites-get/search.d.ts b/handlers/burialSites-get/search.d.ts index 19d32e4d..d5e48cba 100644 --- a/handlers/burialSites-get/search.d.ts +++ b/handlers/burialSites-get/search.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/burialSites-get/search.js b/handlers/burialSites-get/search.js index a89195d6..6d1461a1 100644 --- a/handlers/burialSites-get/search.js +++ b/handlers/burialSites-get/search.js @@ -1,16 +1,16 @@ import getCemeteries from '../../database/getCemeteries.js'; import { getBurialSiteStatuses, getBurialSiteTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const cemeteries = await getCemeteries(); - const burialSiteTypes = await getBurialSiteTypes(); - const burialSiteStatuses = await getBurialSiteStatuses(); +export default function handler(request, response) { + const cemeteries = getCemeteries(); + const burialSiteTypes = getBurialSiteTypes(); + const burialSiteStatuses = getBurialSiteStatuses(); response.render('burialSite-search', { - headTitle: "Burial Site Search", - cemeteries, - burialSiteTypes, + headTitle: 'Burial Site Search', burialSiteStatuses, - cemeteryId: request.query.cemeteryId, + burialSiteTypes, + cemeteries, + burialSiteStatusId: request.query.burialSiteStatusId, burialSiteTypeId: request.query.burialSiteTypeId, - burialSiteStatusId: request.query.burialSiteStatusId + cemeteryId: request.query.cemeteryId }); } diff --git a/handlers/burialSites-get/search.ts b/handlers/burialSites-get/search.ts index 541c626c..9419ac74 100644 --- a/handlers/burialSites-get/search.ts +++ b/handlers/burialSites-get/search.ts @@ -6,21 +6,20 @@ import { getBurialSiteTypes } from '../../helpers/functions.cache.js' -export default async function handler( - request: Request, - response: Response -): Promise { - const cemeteries = await getCemeteries() - const burialSiteTypes = await getBurialSiteTypes() - const burialSiteStatuses = await getBurialSiteStatuses() +export default function handler(request: Request, response: Response): void { + const cemeteries = getCemeteries() + const burialSiteTypes = getBurialSiteTypes() + const burialSiteStatuses = getBurialSiteStatuses() response.render('burialSite-search', { - headTitle: "Burial Site Search", - cemeteries, - burialSiteTypes, + headTitle: 'Burial Site Search', + burialSiteStatuses, - cemeteryId: request.query.cemeteryId, + burialSiteTypes, + cemeteries, + + burialSiteStatusId: request.query.burialSiteStatusId, burialSiteTypeId: request.query.burialSiteTypeId, - burialSiteStatusId: request.query.burialSiteStatusId + cemeteryId: request.query.cemeteryId }) } diff --git a/handlers/burialSites-get/view.js b/handlers/burialSites-get/view.js index 0d460e0d..a3c60580 100644 --- a/handlers/burialSites-get/view.js +++ b/handlers/burialSites-get/view.js @@ -12,7 +12,7 @@ export default async function handler(request, response) { burialSite }); response.on('finish', () => { - void getNextBurialSiteId(burialSite.burialSiteId); - void getPreviousBurialSiteId(burialSite.burialSiteId); + getNextBurialSiteId(burialSite.burialSiteId); + getPreviousBurialSiteId(burialSite.burialSiteId); }); } diff --git a/handlers/burialSites-get/view.ts b/handlers/burialSites-get/view.ts index 17c5718b..9d7c6582 100644 --- a/handlers/burialSites-get/view.ts +++ b/handlers/burialSites-get/view.ts @@ -22,12 +22,12 @@ export default async function handler( response.render('burialSite-view', { headTitle: burialSite.burialSiteName, - + burialSite }) response.on('finish', () => { - void getNextBurialSiteId(burialSite.burialSiteId) - void getPreviousBurialSiteId(burialSite.burialSiteId) + getNextBurialSiteId(burialSite.burialSiteId) + getPreviousBurialSiteId(burialSite.burialSiteId) }) } diff --git a/handlers/burialSites-post/doAddBurialSiteComment.d.ts b/handlers/burialSites-post/doAddBurialSiteComment.d.ts index b0018359..e8629357 100644 --- a/handlers/burialSites-post/doAddBurialSiteComment.d.ts +++ b/handlers/burialSites-post/doAddBurialSiteComment.d.ts @@ -1,3 +1,3 @@ import type { Request, Response } from 'express'; import { type AddBurialSiteCommentForm } from '../../database/addBurialSiteComment.js'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/burialSites-post/doAddBurialSiteComment.js b/handlers/burialSites-post/doAddBurialSiteComment.js index b00b8c11..a00a561a 100644 --- a/handlers/burialSites-post/doAddBurialSiteComment.js +++ b/handlers/burialSites-post/doAddBurialSiteComment.js @@ -1,8 +1,8 @@ import addBurialSiteComment from '../../database/addBurialSiteComment.js'; import getBurialSiteComments from '../../database/getBurialSiteComments.js'; -export default async function handler(request, response) { - await addBurialSiteComment(request.body, request.session.user); - const burialSiteComments = await getBurialSiteComments(request.body.burialSiteId); +export default function handler(request, response) { + addBurialSiteComment(request.body, request.session.user); + const burialSiteComments = getBurialSiteComments(request.body.burialSiteId); response.json({ success: true, burialSiteComments diff --git a/handlers/burialSites-post/doAddBurialSiteComment.ts b/handlers/burialSites-post/doAddBurialSiteComment.ts index 7ff07eef..dc0300fb 100644 --- a/handlers/burialSites-post/doAddBurialSiteComment.ts +++ b/handlers/burialSites-post/doAddBurialSiteComment.ts @@ -5,15 +5,13 @@ import addBurialSiteComment, { } from '../../database/addBurialSiteComment.js' import getBurialSiteComments from '../../database/getBurialSiteComments.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - await addBurialSiteComment(request.body, request.session.user as User) +): void { + addBurialSiteComment(request.body, request.session.user as User) - const burialSiteComments = await getBurialSiteComments( - request.body.burialSiteId - ) + const burialSiteComments = getBurialSiteComments(request.body.burialSiteId) response.json({ success: true, diff --git a/handlers/burialSites-post/doCreateBurialSite.d.ts b/handlers/burialSites-post/doCreateBurialSite.d.ts index 553f79f8..5ff30c01 100644 --- a/handlers/burialSites-post/doCreateBurialSite.d.ts +++ b/handlers/burialSites-post/doCreateBurialSite.d.ts @@ -1,3 +1,3 @@ import type { Request, Response } from 'express'; import { type AddBurialSiteForm } from '../../database/addBurialSite.js'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/burialSites-post/doCreateBurialSite.js b/handlers/burialSites-post/doCreateBurialSite.js index d78718a2..cdd1c36a 100644 --- a/handlers/burialSites-post/doCreateBurialSite.js +++ b/handlers/burialSites-post/doCreateBurialSite.js @@ -1,8 +1,8 @@ import addBurialSite from '../../database/addBurialSite.js'; import { clearNextPreviousBurialSiteIdCache } from '../../helpers/burialSites.helpers.js'; -export default async function handler(request, response) { +export default function handler(request, response) { try { - const burialSiteId = await addBurialSite(request.body, request.session.user); + const burialSiteId = addBurialSite(request.body, request.session.user); response.json({ success: true, burialSiteId diff --git a/handlers/burialSites-post/doCreateBurialSite.ts b/handlers/burialSites-post/doCreateBurialSite.ts index c777a427..fa28a54f 100644 --- a/handlers/burialSites-post/doCreateBurialSite.ts +++ b/handlers/burialSites-post/doCreateBurialSite.ts @@ -5,19 +5,19 @@ import addBurialSite, { } from '../../database/addBurialSite.js' import { clearNextPreviousBurialSiteIdCache } from '../../helpers/burialSites.helpers.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { +): void { try { - const burialSiteId = await addBurialSite( + const burialSiteId = addBurialSite( request.body, request.session.user as User ) response.json({ success: true, - + burialSiteId }) diff --git a/handlers/burialSites-post/doDeleteBurialSite.d.ts b/handlers/burialSites-post/doDeleteBurialSite.d.ts index 87af9038..69ed4485 100644 --- a/handlers/burialSites-post/doDeleteBurialSite.d.ts +++ b/handlers/burialSites-post/doDeleteBurialSite.d.ts @@ -1,4 +1,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/burialSites-post/doDeleteBurialSite.js b/handlers/burialSites-post/doDeleteBurialSite.js index ff55fc25..0d9f8158 100644 --- a/handlers/burialSites-post/doDeleteBurialSite.js +++ b/handlers/burialSites-post/doDeleteBurialSite.js @@ -1,8 +1,8 @@ import { deleteBurialSite } from '../../database/deleteBurialSite.js'; import { clearNextPreviousBurialSiteIdCache } from '../../helpers/burialSites.helpers.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const burialSiteId = Number.parseInt(request.body.burialSiteId, 10); - const success = await deleteBurialSite(burialSiteId, request.session.user); + const success = deleteBurialSite(burialSiteId, request.session.user); response.json({ success, errorMessage: success diff --git a/handlers/burialSites-post/doDeleteBurialSite.ts b/handlers/burialSites-post/doDeleteBurialSite.ts index a9265f2a..751d5d8a 100644 --- a/handlers/burialSites-post/doDeleteBurialSite.ts +++ b/handlers/burialSites-post/doDeleteBurialSite.ts @@ -3,16 +3,13 @@ import type { Request, Response } from 'express' import { deleteBurialSite } from '../../database/deleteBurialSite.js' import { clearNextPreviousBurialSiteIdCache } from '../../helpers/burialSites.helpers.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { +): void { const burialSiteId = Number.parseInt(request.body.burialSiteId, 10) - const success = await deleteBurialSite( - burialSiteId, - request.session.user as User - ) + const success = deleteBurialSite(burialSiteId, request.session.user as User) response.json({ success, diff --git a/handlers/burialSites-post/doDeleteBurialSiteComment.d.ts b/handlers/burialSites-post/doDeleteBurialSiteComment.d.ts index 52039e36..5c5ea13e 100644 --- a/handlers/burialSites-post/doDeleteBurialSiteComment.d.ts +++ b/handlers/burialSites-post/doDeleteBurialSiteComment.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/burialSites-post/doDeleteBurialSiteComment.js b/handlers/burialSites-post/doDeleteBurialSiteComment.js index de49a434..4f166a73 100644 --- a/handlers/burialSites-post/doDeleteBurialSiteComment.js +++ b/handlers/burialSites-post/doDeleteBurialSiteComment.js @@ -1,8 +1,8 @@ import { deleteRecord } from '../../database/deleteRecord.js'; import getBurialSiteComments from '../../database/getBurialSiteComments.js'; -export default async function handler(request, response) { - const success = await deleteRecord('BurialSiteComments', request.body.burialSiteCommentId, request.session.user); - const burialSiteComments = await getBurialSiteComments(request.body.burialSiteId); +export default function handler(request, response) { + const success = deleteRecord('BurialSiteComments', request.body.burialSiteCommentId, request.session.user); + const burialSiteComments = getBurialSiteComments(request.body.burialSiteId); response.json({ success, burialSiteComments diff --git a/handlers/burialSites-post/doDeleteBurialSiteComment.ts b/handlers/burialSites-post/doDeleteBurialSiteComment.ts index 353c74c8..a71ac279 100644 --- a/handlers/burialSites-post/doDeleteBurialSiteComment.ts +++ b/handlers/burialSites-post/doDeleteBurialSiteComment.ts @@ -3,27 +3,27 @@ import type { Request, Response } from 'express' import { deleteRecord } from '../../database/deleteRecord.js' import getBurialSiteComments from '../../database/getBurialSiteComments.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, - { burialSiteCommentId: string; burialSiteId: string; } + { burialSiteCommentId: string; burialSiteId: string } >, response: Response -): Promise { - const success = await deleteRecord( +): void { + const success = deleteRecord( 'BurialSiteComments', request.body.burialSiteCommentId, request.session.user as User ) - const burialSiteComments = await getBurialSiteComments( + const burialSiteComments = getBurialSiteComments( request.body.burialSiteId as string ) response.json({ success, - + burialSiteComments }) } diff --git a/handlers/burialSites-post/doGetBurialSiteTypeFields.d.ts b/handlers/burialSites-post/doGetBurialSiteTypeFields.d.ts index af966b40..c62bc882 100644 --- a/handlers/burialSites-post/doGetBurialSiteTypeFields.d.ts +++ b/handlers/burialSites-post/doGetBurialSiteTypeFields.d.ts @@ -1,4 +1,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/burialSites-post/doGetBurialSiteTypeFields.js b/handlers/burialSites-post/doGetBurialSiteTypeFields.js index a48b4faa..e27baffa 100644 --- a/handlers/burialSites-post/doGetBurialSiteTypeFields.js +++ b/handlers/burialSites-post/doGetBurialSiteTypeFields.js @@ -1,6 +1,6 @@ import { getBurialSiteTypeById } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const burialSiteType = await getBurialSiteTypeById(Number.parseInt(request.body.burialSiteTypeId, 10)); +export default function handler(request, response) { + const burialSiteType = getBurialSiteTypeById(Number.parseInt(request.body.burialSiteTypeId, 10)); response.json({ burialSiteTypeFields: burialSiteType?.burialSiteTypeFields ?? [] }); diff --git a/handlers/burialSites-post/doGetBurialSiteTypeFields.ts b/handlers/burialSites-post/doGetBurialSiteTypeFields.ts index 3b09a8d3..09a8761b 100644 --- a/handlers/burialSites-post/doGetBurialSiteTypeFields.ts +++ b/handlers/burialSites-post/doGetBurialSiteTypeFields.ts @@ -2,11 +2,11 @@ import type { Request, Response } from 'express' import { getBurialSiteTypeById } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const burialSiteType = await getBurialSiteTypeById( +): void { + const burialSiteType = getBurialSiteTypeById( Number.parseInt(request.body.burialSiteTypeId, 10) ) diff --git a/handlers/burialSites-post/doSearchBurialSites.d.ts b/handlers/burialSites-post/doSearchBurialSites.d.ts index cd2d8778..469740ce 100644 --- a/handlers/burialSites-post/doSearchBurialSites.d.ts +++ b/handlers/burialSites-post/doSearchBurialSites.d.ts @@ -1,3 +1,3 @@ import type { Request, Response } from 'express'; import { type GetBurialSitesFilters, type GetBurialSitesOptions } from '../../database/getBurialSites.js'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/burialSites-post/doSearchBurialSites.js b/handlers/burialSites-post/doSearchBurialSites.js index c0b0f156..c7f8055a 100644 --- a/handlers/burialSites-post/doSearchBurialSites.js +++ b/handlers/burialSites-post/doSearchBurialSites.js @@ -1,6 +1,6 @@ import getBurialSites from '../../database/getBurialSites.js'; -export default async function handler(request, response) { - const result = await getBurialSites(request.body, { +export default function handler(request, response) { + const result = getBurialSites(request.body, { limit: request.body.limit, offset: request.body.offset, includeContractCount: true diff --git a/handlers/burialSites-post/doSearchBurialSites.ts b/handlers/burialSites-post/doSearchBurialSites.ts index f295364a..bb563df7 100644 --- a/handlers/burialSites-post/doSearchBurialSites.ts +++ b/handlers/burialSites-post/doSearchBurialSites.ts @@ -5,15 +5,15 @@ import getBurialSites, { type GetBurialSitesOptions } from '../../database/getBurialSites.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, GetBurialSitesFilters & GetBurialSitesOptions >, response: Response -): Promise { - const result = await getBurialSites(request.body, { +): void { + const result = getBurialSites(request.body, { limit: request.body.limit, offset: request.body.offset, diff --git a/handlers/burialSites-post/doUpdateBurialSite.d.ts b/handlers/burialSites-post/doUpdateBurialSite.d.ts index afec09b5..9afa5a7f 100644 --- a/handlers/burialSites-post/doUpdateBurialSite.d.ts +++ b/handlers/burialSites-post/doUpdateBurialSite.d.ts @@ -1,3 +1,3 @@ import type { Request, Response } from 'express'; import { type UpdateBurialSiteForm } from '../../database/updateBurialSite.js'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/burialSites-post/doUpdateBurialSite.js b/handlers/burialSites-post/doUpdateBurialSite.js index 70dcef1a..a59aa30e 100644 --- a/handlers/burialSites-post/doUpdateBurialSite.js +++ b/handlers/burialSites-post/doUpdateBurialSite.js @@ -1,8 +1,8 @@ import updateBurialSite from '../../database/updateBurialSite.js'; import { clearNextPreviousBurialSiteIdCache } from '../../helpers/burialSites.helpers.js'; -export default async function handler(request, response) { +export default function handler(request, response) { try { - const success = await updateBurialSite(request.body, request.session.user); + const success = updateBurialSite(request.body, request.session.user); const burialSiteId = typeof request.body.burialSiteId === 'string' ? Number.parseInt(request.body.burialSiteId, 10) : request.body.burialSiteId; diff --git a/handlers/burialSites-post/doUpdateBurialSite.ts b/handlers/burialSites-post/doUpdateBurialSite.ts index 195e0cde..70c70986 100644 --- a/handlers/burialSites-post/doUpdateBurialSite.ts +++ b/handlers/burialSites-post/doUpdateBurialSite.ts @@ -5,15 +5,12 @@ import updateBurialSite, { } from '../../database/updateBurialSite.js' import { clearNextPreviousBurialSiteIdCache } from '../../helpers/burialSites.helpers.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { +): void { try { - const success = await updateBurialSite( - request.body, - request.session.user as User - ) + const success = updateBurialSite(request.body, request.session.user as User) const burialSiteId = typeof request.body.burialSiteId === 'string' @@ -22,7 +19,7 @@ export default async function handler( response.json({ success, - + burialSiteId }) diff --git a/handlers/burialSites-post/doUpdateBurialSiteComment.d.ts b/handlers/burialSites-post/doUpdateBurialSiteComment.d.ts index e451de2f..a59ca79a 100644 --- a/handlers/burialSites-post/doUpdateBurialSiteComment.d.ts +++ b/handlers/burialSites-post/doUpdateBurialSiteComment.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; import { type UpdateBurialSiteCommentForm } from '../../database/updateBurialSiteComment.js'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/burialSites-post/doUpdateBurialSiteComment.js b/handlers/burialSites-post/doUpdateBurialSiteComment.js index cf684380..9627bc7f 100644 --- a/handlers/burialSites-post/doUpdateBurialSiteComment.js +++ b/handlers/burialSites-post/doUpdateBurialSiteComment.js @@ -1,8 +1,8 @@ import getBurialSiteComments from '../../database/getBurialSiteComments.js'; import updateBurialSiteComment from '../../database/updateBurialSiteComment.js'; -export default async function handler(request, response) { - const success = await updateBurialSiteComment(request.body, request.session.user); - const burialSiteComments = await getBurialSiteComments(request.body.burialSiteId); +export default function handler(request, response) { + const success = updateBurialSiteComment(request.body, request.session.user); + const burialSiteComments = getBurialSiteComments(request.body.burialSiteId); response.json({ success, burialSiteComments diff --git a/handlers/burialSites-post/doUpdateBurialSiteComment.ts b/handlers/burialSites-post/doUpdateBurialSiteComment.ts index 90007ac8..c85c08b9 100644 --- a/handlers/burialSites-post/doUpdateBurialSiteComment.ts +++ b/handlers/burialSites-post/doUpdateBurialSiteComment.ts @@ -5,22 +5,20 @@ import updateBurialSiteComment, { type UpdateBurialSiteCommentForm } from '../../database/updateBurialSiteComment.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, UpdateBurialSiteCommentForm & { burialSiteId: string } >, response: Response -): Promise { - const success = await updateBurialSiteComment( +): void { + const success = updateBurialSiteComment( request.body, request.session.user as User ) - const burialSiteComments = await getBurialSiteComments( - request.body.burialSiteId - ) + const burialSiteComments = getBurialSiteComments(request.body.burialSiteId) response.json({ success, diff --git a/handlers/cemeteries-get/edit.js b/handlers/cemeteries-get/edit.js index e4f394c6..d2ba7f77 100644 --- a/handlers/cemeteries-get/edit.js +++ b/handlers/cemeteries-get/edit.js @@ -5,17 +5,17 @@ import getCemetery from '../../database/getCemetery.js'; import { getConfigProperty } from '../../helpers/config.helpers.js'; import { getCemeterySVGs } from '../../helpers/images.helpers.js'; export default async function handler(request, response) { - const cemetery = await getCemetery(request.params.cemeteryId); + const cemetery = getCemetery(request.params.cemeteryId); if (cemetery === undefined) { response.redirect(`${getConfigProperty('reverseProxy.urlPrefix')}/cemeteries/?error=cemeteryIdNotFound`); return; } - const cemeteries = await getCemeteries(); + const cemeteries = getCemeteries(); const cemeterySVGs = await getCemeterySVGs(); - const burialSiteTypeSummary = await getBurialSiteTypeSummary({ + const burialSiteTypeSummary = getBurialSiteTypeSummary({ cemeteryId: cemetery.cemeteryId }); - const burialSiteStatusSummary = await getBurialSiteStatusSummary({ + const burialSiteStatusSummary = getBurialSiteStatusSummary({ cemeteryId: cemetery.cemeteryId }); response.render('cemetery-edit', { diff --git a/handlers/cemeteries-get/edit.ts b/handlers/cemeteries-get/edit.ts index 5381e88a..74722478 100644 --- a/handlers/cemeteries-get/edit.ts +++ b/handlers/cemeteries-get/edit.ts @@ -11,7 +11,7 @@ export default async function handler( request: Request, response: Response ): Promise { - const cemetery = await getCemetery(request.params.cemeteryId) + const cemetery = getCemetery(request.params.cemeteryId) if (cemetery === undefined) { response.redirect( @@ -20,15 +20,15 @@ export default async function handler( return } - const cemeteries = await getCemeteries() + const cemeteries = getCemeteries() const cemeterySVGs = await getCemeterySVGs() - const burialSiteTypeSummary = await getBurialSiteTypeSummary({ + const burialSiteTypeSummary = getBurialSiteTypeSummary({ cemeteryId: cemetery.cemeteryId }) - const burialSiteStatusSummary = await getBurialSiteStatusSummary({ + const burialSiteStatusSummary = getBurialSiteStatusSummary({ cemeteryId: cemetery.cemeteryId }) diff --git a/handlers/cemeteries-get/new.js b/handlers/cemeteries-get/new.js index af0e9971..b31cbd89 100644 --- a/handlers/cemeteries-get/new.js +++ b/handlers/cemeteries-get/new.js @@ -14,7 +14,7 @@ export default async function handler(_request, response) { cemeteryPostalCode: '', childCemeteries: [] }; - const cemeteries = await getCemeteries(); + const cemeteries = getCemeteries(); const cemeterySVGs = await getCemeterySVGs(); response.render('cemetery-edit', { headTitle: 'Create a Cemetery', diff --git a/handlers/cemeteries-get/new.ts b/handlers/cemeteries-get/new.ts index 549aa964..e3f2dcf3 100644 --- a/handlers/cemeteries-get/new.ts +++ b/handlers/cemeteries-get/new.ts @@ -24,7 +24,7 @@ export default async function handler( childCemeteries: [] } - const cemeteries = await getCemeteries() + const cemeteries = getCemeteries() const cemeterySVGs = await getCemeterySVGs() diff --git a/handlers/cemeteries-get/next.d.ts b/handlers/cemeteries-get/next.d.ts index 5e3c4b8f..8d9b4d13 100644 --- a/handlers/cemeteries-get/next.d.ts +++ b/handlers/cemeteries-get/next.d.ts @@ -1,4 +1,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request<{ cemeteryId: string; -}>, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/cemeteries-get/next.js b/handlers/cemeteries-get/next.js index e8c9a0a2..a780fb3b 100644 --- a/handlers/cemeteries-get/next.js +++ b/handlers/cemeteries-get/next.js @@ -1,8 +1,8 @@ import getNextCemeteryId from '../../database/getNextCemeteryId.js'; import { getConfigProperty } from '../../helpers/config.helpers.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const cemeteryId = Number.parseInt(request.params.cemeteryId, 10); - const nextCemeteryId = await getNextCemeteryId(cemeteryId); + const nextCemeteryId = getNextCemeteryId(cemeteryId); if (nextCemeteryId === undefined) { response.redirect(`${getConfigProperty('reverseProxy.urlPrefix')}/cemeteries/?error=noNextCemeteryIdFound`); return; diff --git a/handlers/cemeteries-get/next.ts b/handlers/cemeteries-get/next.ts index f3a090b0..850f6e47 100644 --- a/handlers/cemeteries-get/next.ts +++ b/handlers/cemeteries-get/next.ts @@ -3,13 +3,13 @@ import type { Request, Response } from 'express' import getNextCemeteryId from '../../database/getNextCemeteryId.js' import { getConfigProperty } from '../../helpers/config.helpers.js' -export default async function handler( +export default function handler( request: Request<{ cemeteryId: string }>, response: Response -): Promise { +): void { const cemeteryId = Number.parseInt(request.params.cemeteryId, 10) - const nextCemeteryId = await getNextCemeteryId(cemeteryId) + const nextCemeteryId = getNextCemeteryId(cemeteryId) if (nextCemeteryId === undefined) { response.redirect( diff --git a/handlers/cemeteries-get/previous.d.ts b/handlers/cemeteries-get/previous.d.ts index 19d32e4d..d5e48cba 100644 --- a/handlers/cemeteries-get/previous.d.ts +++ b/handlers/cemeteries-get/previous.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/cemeteries-get/previous.js b/handlers/cemeteries-get/previous.js index a22cd8e3..f03dee56 100644 --- a/handlers/cemeteries-get/previous.js +++ b/handlers/cemeteries-get/previous.js @@ -1,8 +1,8 @@ import getPreviousCemeteryId from '../../database/getPreviousCemeteryId.js'; import { getConfigProperty } from '../../helpers/config.helpers.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const cemeteryId = Number.parseInt(request.params.cemeteryId, 10); - const previousCemeteryId = await getPreviousCemeteryId(cemeteryId); + const previousCemeteryId = getPreviousCemeteryId(cemeteryId); if (previousCemeteryId === undefined) { response.redirect(`${getConfigProperty('reverseProxy.urlPrefix')}/cemeteries/?error=noPreviousCemeteryIdFound`); return; diff --git a/handlers/cemeteries-get/previous.ts b/handlers/cemeteries-get/previous.ts index 6b797826..de93aa60 100644 --- a/handlers/cemeteries-get/previous.ts +++ b/handlers/cemeteries-get/previous.ts @@ -3,13 +3,10 @@ import type { Request, Response } from 'express' import getPreviousCemeteryId from '../../database/getPreviousCemeteryId.js' import { getConfigProperty } from '../../helpers/config.helpers.js' -export default async function handler( - request: Request, - response: Response -): Promise { +export default function handler(request: Request, response: Response): void { const cemeteryId = Number.parseInt(request.params.cemeteryId, 10) - const previousCemeteryId = await getPreviousCemeteryId(cemeteryId) + const previousCemeteryId = getPreviousCemeteryId(cemeteryId) if (previousCemeteryId === undefined) { response.redirect( diff --git a/handlers/cemeteries-get/search.d.ts b/handlers/cemeteries-get/search.d.ts index 4bcb65f6..f4584afd 100644 --- a/handlers/cemeteries-get/search.d.ts +++ b/handlers/cemeteries-get/search.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(_request: Request, response: Response): Promise; +export default function handler(_request: Request, response: Response): void; diff --git a/handlers/cemeteries-get/search.js b/handlers/cemeteries-get/search.js index 8486eb15..cd8a03c0 100644 --- a/handlers/cemeteries-get/search.js +++ b/handlers/cemeteries-get/search.js @@ -1,8 +1,8 @@ import getCemeteries from '../../database/getCemeteries.js'; -export default async function handler(_request, response) { - const cemeteries = await getCemeteries(); +export default function handler(_request, response) { + const cemeteries = getCemeteries(); response.render('cemetery-search', { - headTitle: "Cemetery Search", + headTitle: 'Cemetery Search', cemeteries }); } diff --git a/handlers/cemeteries-get/search.ts b/handlers/cemeteries-get/search.ts index f8f714bf..e66cbde7 100644 --- a/handlers/cemeteries-get/search.ts +++ b/handlers/cemeteries-get/search.ts @@ -2,15 +2,12 @@ import type { Request, Response } from 'express' import getCemeteries from '../../database/getCemeteries.js' -export default async function handler( - _request: Request, - response: Response -): Promise { - const cemeteries = await getCemeteries() +export default function handler(_request: Request, response: Response): void { + const cemeteries = getCemeteries() response.render('cemetery-search', { - headTitle: "Cemetery Search", - + headTitle: 'Cemetery Search', + cemeteries }) } diff --git a/handlers/cemeteries-get/view.d.ts b/handlers/cemeteries-get/view.d.ts index 19d32e4d..d5e48cba 100644 --- a/handlers/cemeteries-get/view.d.ts +++ b/handlers/cemeteries-get/view.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/cemeteries-get/view.js b/handlers/cemeteries-get/view.js index 2f4a691a..4f7e76e0 100644 --- a/handlers/cemeteries-get/view.js +++ b/handlers/cemeteries-get/view.js @@ -2,16 +2,16 @@ import getBurialSiteStatusSummary from '../../database/getBurialSiteStatusSummar import getBurialSiteTypeSummary from '../../database/getBurialSiteTypeSummary.js'; import getCemetery from '../../database/getCemetery.js'; import { getConfigProperty } from '../../helpers/config.helpers.js'; -export default async function handler(request, response) { - const cemetery = await getCemetery(request.params.cemeteryId); +export default function handler(request, response) { + const cemetery = getCemetery(request.params.cemeteryId); if (cemetery === undefined) { response.redirect(`${getConfigProperty('reverseProxy.urlPrefix')}/cemeteries/?error=cemeteryIdNotFound`); return; } - const burialSiteTypeSummary = await getBurialSiteTypeSummary({ + const burialSiteTypeSummary = getBurialSiteTypeSummary({ cemeteryId: cemetery.cemeteryId }); - const burialSiteStatusSummary = await getBurialSiteStatusSummary({ + const burialSiteStatusSummary = getBurialSiteStatusSummary({ cemeteryId: cemetery.cemeteryId }); response.render('cemetery-view', { diff --git a/handlers/cemeteries-get/view.ts b/handlers/cemeteries-get/view.ts index 2a9b7e11..3cf09ed1 100644 --- a/handlers/cemeteries-get/view.ts +++ b/handlers/cemeteries-get/view.ts @@ -5,11 +5,8 @@ import getBurialSiteTypeSummary from '../../database/getBurialSiteTypeSummary.js import getCemetery from '../../database/getCemetery.js' import { getConfigProperty } from '../../helpers/config.helpers.js' -export default async function handler( - request: Request, - response: Response -): Promise { - const cemetery = await getCemetery(request.params.cemeteryId) +export default function handler(request: Request, response: Response): void { + const cemetery = getCemetery(request.params.cemeteryId) if (cemetery === undefined) { response.redirect( @@ -18,11 +15,11 @@ export default async function handler( return } - const burialSiteTypeSummary = await getBurialSiteTypeSummary({ + const burialSiteTypeSummary = getBurialSiteTypeSummary({ cemeteryId: cemetery.cemeteryId }) - const burialSiteStatusSummary = await getBurialSiteStatusSummary({ + const burialSiteStatusSummary = getBurialSiteStatusSummary({ cemeteryId: cemetery.cemeteryId }) diff --git a/handlers/cemeteries-post/doCreateCemetery.d.ts b/handlers/cemeteries-post/doCreateCemetery.d.ts index 12553b0f..9ae26c70 100644 --- a/handlers/cemeteries-post/doCreateCemetery.d.ts +++ b/handlers/cemeteries-post/doCreateCemetery.d.ts @@ -1,3 +1,3 @@ import type { Request, Response } from 'express'; import { type AddCemeteryForm } from '../../database/addCemetery.js'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/cemeteries-post/doCreateCemetery.js b/handlers/cemeteries-post/doCreateCemetery.js index 0892cc3c..fa467a7d 100644 --- a/handlers/cemeteries-post/doCreateCemetery.js +++ b/handlers/cemeteries-post/doCreateCemetery.js @@ -1,6 +1,6 @@ import addCemetery from '../../database/addCemetery.js'; -export default async function handler(request, response) { - const cemeteryId = await addCemetery(request.body, request.session.user); +export default function handler(request, response) { + const cemeteryId = addCemetery(request.body, request.session.user); response.json({ success: true, cemeteryId diff --git a/handlers/cemeteries-post/doCreateCemetery.ts b/handlers/cemeteries-post/doCreateCemetery.ts index a64cf531..0a46aa50 100644 --- a/handlers/cemeteries-post/doCreateCemetery.ts +++ b/handlers/cemeteries-post/doCreateCemetery.ts @@ -4,18 +4,15 @@ import addCemetery, { type AddCemeteryForm } from '../../database/addCemetery.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const cemeteryId = await addCemetery( - request.body, - request.session.user as User - ) +): void { + const cemeteryId = addCemetery(request.body, request.session.user as User) response.json({ success: true, - + cemeteryId }) } diff --git a/handlers/cemeteries-post/doDeleteCemetery.d.ts b/handlers/cemeteries-post/doDeleteCemetery.d.ts index f4f9ece7..fb8a09ee 100644 --- a/handlers/cemeteries-post/doDeleteCemetery.d.ts +++ b/handlers/cemeteries-post/doDeleteCemetery.d.ts @@ -1,4 +1,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/cemeteries-post/doDeleteCemetery.js b/handlers/cemeteries-post/doDeleteCemetery.js index 025613bd..33b16cd5 100644 --- a/handlers/cemeteries-post/doDeleteCemetery.js +++ b/handlers/cemeteries-post/doDeleteCemetery.js @@ -1,7 +1,7 @@ import deleteCemetery from '../../database/deleteCemetery.js'; import { clearNextPreviousBurialSiteIdCache } from '../../helpers/burialSites.helpers.js'; -export default async function handler(request, response) { - const success = await deleteCemetery(request.body.cemeteryId, request.session.user); +export default function handler(request, response) { + const success = deleteCemetery(request.body.cemeteryId, request.session.user); response.json({ errorMessage: success ? '' diff --git a/handlers/cemeteries-post/doDeleteCemetery.ts b/handlers/cemeteries-post/doDeleteCemetery.ts index 5cb5256d..310cc390 100644 --- a/handlers/cemeteries-post/doDeleteCemetery.ts +++ b/handlers/cemeteries-post/doDeleteCemetery.ts @@ -3,11 +3,11 @@ import type { Request, Response } from 'express' import deleteCemetery from '../../database/deleteCemetery.js' import { clearNextPreviousBurialSiteIdCache } from '../../helpers/burialSites.helpers.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const success = await deleteCemetery( +): void { + const success = deleteCemetery( request.body.cemeteryId, request.session.user as User ) diff --git a/handlers/cemeteries-post/doUpdateCemetery.d.ts b/handlers/cemeteries-post/doUpdateCemetery.d.ts index d04e73c4..3bd40b60 100644 --- a/handlers/cemeteries-post/doUpdateCemetery.d.ts +++ b/handlers/cemeteries-post/doUpdateCemetery.d.ts @@ -1,3 +1,3 @@ import type { Request, Response } from 'express'; import { type UpdateCemeteryForm } from '../../database/updateCemetery.js'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/cemeteries-post/doUpdateCemetery.js b/handlers/cemeteries-post/doUpdateCemetery.js index 19b6845e..33c8b8c0 100644 --- a/handlers/cemeteries-post/doUpdateCemetery.js +++ b/handlers/cemeteries-post/doUpdateCemetery.js @@ -1,15 +1,15 @@ import rebuildBurialSiteNames from '../../database/rebuildBurialSiteNames.js'; import updateCemetery from '../../database/updateCemetery.js'; import { clearNextPreviousBurialSiteIdCache } from '../../helpers/burialSites.helpers.js'; -export default async function handler(request, response) { - const success = await updateCemetery(request.body, request.session.user); +export default function handler(request, response) { + const success = updateCemetery(request.body, request.session.user); response.json({ success, cemeteryId: request.body.cemeteryId }); if (success) { response.on('finish', () => { - void rebuildBurialSiteNames(request.body.cemeteryId, request.session.user); + rebuildBurialSiteNames(request.body.cemeteryId, request.session.user); clearNextPreviousBurialSiteIdCache(); }); } diff --git a/handlers/cemeteries-post/doUpdateCemetery.ts b/handlers/cemeteries-post/doUpdateCemetery.ts index 2002c194..e82ee77b 100644 --- a/handlers/cemeteries-post/doUpdateCemetery.ts +++ b/handlers/cemeteries-post/doUpdateCemetery.ts @@ -6,14 +6,11 @@ import updateCemetery, { } from '../../database/updateCemetery.js' import { clearNextPreviousBurialSiteIdCache } from '../../helpers/burialSites.helpers.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const success = await updateCemetery( - request.body, - request.session.user as User - ) +): void { + const success = updateCemetery(request.body, request.session.user as User) response.json({ success, @@ -23,7 +20,7 @@ export default async function handler( if (success) { response.on('finish', () => { - void rebuildBurialSiteNames( + rebuildBurialSiteNames( request.body.cemeteryId, request.session.user as User ) diff --git a/handlers/contracts-get/edit.js b/handlers/contracts-get/edit.js index ab8b24bb..d3cd1695 100644 --- a/handlers/contracts-get/edit.js +++ b/handlers/contracts-get/edit.js @@ -8,12 +8,12 @@ export default async function handler(request, response) { response.redirect(`${getConfigProperty('reverseProxy.urlPrefix')}/contracts/?error=contractIdNotFound`); return; } - const contractTypePrints = await getContractTypePrintsById(contract.contractTypeId); - const contractTypes = await getContractTypes(); - const funeralHomes = await getFuneralHomes(); - const committalTypes = await getCommittalTypes(); - const intermentContainerTypes = await getIntermentContainerTypes(); - const workOrderTypes = await getWorkOrderTypes(); + const contractTypePrints = getContractTypePrintsById(contract.contractTypeId); + const contractTypes = getContractTypes(); + const funeralHomes = getFuneralHomes(); + const committalTypes = getCommittalTypes(); + const intermentContainerTypes = getIntermentContainerTypes(); + const workOrderTypes = getWorkOrderTypes(); response.render('contract-edit', { headTitle: 'Contract Update', contract, diff --git a/handlers/contracts-get/edit.ts b/handlers/contracts-get/edit.ts index cfb9c5a8..c3398f1b 100644 --- a/handlers/contracts-get/edit.ts +++ b/handlers/contracts-get/edit.ts @@ -15,9 +15,7 @@ export default async function handler( request: Request, response: Response ): Promise { - const contract = await getContract( - request.params.contractId - ) + const contract = await getContract(request.params.contractId) if (contract === undefined) { response.redirect( @@ -28,21 +26,19 @@ export default async function handler( return } - const contractTypePrints = await getContractTypePrintsById( - contract.contractTypeId - ) + const contractTypePrints = getContractTypePrintsById(contract.contractTypeId) - const contractTypes = await getContractTypes() - const funeralHomes = await getFuneralHomes() - const committalTypes = await getCommittalTypes() - const intermentContainerTypes = await getIntermentContainerTypes() - const workOrderTypes = await getWorkOrderTypes() + const contractTypes = getContractTypes() + const funeralHomes = getFuneralHomes() + const committalTypes = getCommittalTypes() + const intermentContainerTypes = getIntermentContainerTypes() + const workOrderTypes = getWorkOrderTypes() response.render('contract-edit', { headTitle: 'Contract Update', contract, - + committalTypes, contractTypePrints, contractTypes, diff --git a/handlers/contracts-get/new.js b/handlers/contracts-get/new.js index c06bf2ca..633b42fe 100644 --- a/handlers/contracts-get/new.js +++ b/handlers/contracts-get/new.js @@ -21,10 +21,10 @@ export default async function handler(request, response) { contract.cemeteryName = burialSite.cemeteryName; } } - const contractTypes = await getContractTypes(); - const funeralHomes = await getFuneralHomes(); - const committalTypes = await getCommittalTypes(); - const intermentContainerTypes = await getIntermentContainerTypes(); + const contractTypes = getContractTypes(); + const funeralHomes = getFuneralHomes(); + const committalTypes = getCommittalTypes(); + const intermentContainerTypes = getIntermentContainerTypes(); response.render('contract-edit', { headTitle: 'Create a New Contract', contract, diff --git a/handlers/contracts-get/new.ts b/handlers/contracts-get/new.ts index b8df21db..68f52f05 100644 --- a/handlers/contracts-get/new.ts +++ b/handlers/contracts-get/new.ts @@ -5,7 +5,11 @@ import { dateToInteger, dateToString } from '@cityssm/utils-datetime' import getBurialSite from '../../database/getBurialSite.js' import getFuneralHomes from '../../database/getFuneralHomes.js' import { getConfigProperty } from '../../helpers/config.helpers.js' -import { getCommittalTypes, getContractTypes, getIntermentContainerTypes } from '../../helpers/functions.cache.js' +import { + getCommittalTypes, + getContractTypes, + getIntermentContainerTypes +} from '../../helpers/functions.cache.js' import type { Contract } from '../../types/record.types.js' export default async function handler( @@ -33,10 +37,10 @@ export default async function handler( } } - const contractTypes = await getContractTypes() - const funeralHomes = await getFuneralHomes() - const committalTypes = await getCommittalTypes() - const intermentContainerTypes = await getIntermentContainerTypes() + const contractTypes = getContractTypes() + const funeralHomes = getFuneralHomes() + const committalTypes = getCommittalTypes() + const intermentContainerTypes = getIntermentContainerTypes() response.render('contract-edit', { headTitle: 'Create a New Contract', diff --git a/handlers/contracts-get/next.d.ts b/handlers/contracts-get/next.d.ts index 509fad91..041e41ca 100644 --- a/handlers/contracts-get/next.d.ts +++ b/handlers/contracts-get/next.d.ts @@ -1,4 +1,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request<{ contractId: string; -}>, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/contracts-get/next.js b/handlers/contracts-get/next.js index a7a58478..0b2a1822 100644 --- a/handlers/contracts-get/next.js +++ b/handlers/contracts-get/next.js @@ -1,8 +1,8 @@ import getNextContractId from '../../database/getNextContractId.js'; import { getConfigProperty } from '../../helpers/config.helpers.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const contractId = Number.parseInt(request.params.contractId, 10); - const nextContractId = await getNextContractId(contractId); + const nextContractId = getNextContractId(contractId); if (nextContractId === undefined) { response.redirect(`${getConfigProperty('reverseProxy.urlPrefix')}/contracts/?error=noNextContractIdFound`); return; diff --git a/handlers/contracts-get/next.ts b/handlers/contracts-get/next.ts index a094219b..80dcd3bb 100644 --- a/handlers/contracts-get/next.ts +++ b/handlers/contracts-get/next.ts @@ -3,13 +3,13 @@ import type { Request, Response } from 'express' import getNextContractId from '../../database/getNextContractId.js' import { getConfigProperty } from '../../helpers/config.helpers.js' -export default async function handler( +export default function handler( request: Request<{ contractId: string }>, response: Response -): Promise { +): void { const contractId = Number.parseInt(request.params.contractId, 10) - const nextContractId = await getNextContractId(contractId) + const nextContractId = getNextContractId(contractId) if (nextContractId === undefined) { response.redirect( diff --git a/handlers/contracts-get/previous.d.ts b/handlers/contracts-get/previous.d.ts index 509fad91..041e41ca 100644 --- a/handlers/contracts-get/previous.d.ts +++ b/handlers/contracts-get/previous.d.ts @@ -1,4 +1,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request<{ contractId: string; -}>, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/contracts-get/previous.js b/handlers/contracts-get/previous.js index e0fb0509..85d198e7 100644 --- a/handlers/contracts-get/previous.js +++ b/handlers/contracts-get/previous.js @@ -1,8 +1,8 @@ import getPreviousContractId from '../../database/getPreviousContractId.js'; import { getConfigProperty } from '../../helpers/config.helpers.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const contractId = Number.parseInt(request.params.contractId, 10); - const previousContractId = await getPreviousContractId(contractId); + const previousContractId = getPreviousContractId(contractId); if (previousContractId === undefined) { response.redirect(`${getConfigProperty('reverseProxy.urlPrefix')}/contracts/?error=noPreviousContractIdFound`); return; diff --git a/handlers/contracts-get/previous.ts b/handlers/contracts-get/previous.ts index 37326503..758381e8 100644 --- a/handlers/contracts-get/previous.ts +++ b/handlers/contracts-get/previous.ts @@ -3,13 +3,13 @@ import type { Request, Response } from 'express' import getPreviousContractId from '../../database/getPreviousContractId.js' import { getConfigProperty } from '../../helpers/config.helpers.js' -export default async function handler( +export default function handler( request: Request<{ contractId: string }>, response: Response -): Promise { +): void { const contractId = Number.parseInt(request.params.contractId, 10) - const previousContractId = await getPreviousContractId(contractId) + const previousContractId = getPreviousContractId(contractId) if (previousContractId === undefined) { response.redirect( diff --git a/handlers/contracts-get/search.d.ts b/handlers/contracts-get/search.d.ts index 19d32e4d..d5e48cba 100644 --- a/handlers/contracts-get/search.d.ts +++ b/handlers/contracts-get/search.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/contracts-get/search.js b/handlers/contracts-get/search.js index 60019092..3f93e2f4 100644 --- a/handlers/contracts-get/search.js +++ b/handlers/contracts-get/search.js @@ -1,11 +1,11 @@ import getCemeteries from '../../database/getCemeteries.js'; import getFuneralHomes from '../../database/getFuneralHomes.js'; import { getBurialSiteTypes, getContractTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const cemeteries = await getCemeteries(); - const burialSiteTypes = await getBurialSiteTypes(); - const contractTypes = await getContractTypes(); - const funeralHomes = await getFuneralHomes(); +export default function handler(request, response) { + const cemeteries = getCemeteries(); + const burialSiteTypes = getBurialSiteTypes(); + const contractTypes = getContractTypes(); + const funeralHomes = getFuneralHomes(); response.render('contract-search', { headTitle: 'Contract Search', burialSiteTypes, diff --git a/handlers/contracts-get/search.ts b/handlers/contracts-get/search.ts index 408af85f..043d82d4 100644 --- a/handlers/contracts-get/search.ts +++ b/handlers/contracts-get/search.ts @@ -7,14 +7,11 @@ import { getContractTypes } from '../../helpers/functions.cache.js' -export default async function handler( - request: Request, - response: Response -): Promise { - const cemeteries = await getCemeteries() - const burialSiteTypes = await getBurialSiteTypes() - const contractTypes = await getContractTypes() - const funeralHomes = await getFuneralHomes() +export default function handler(request: Request, response: Response): void { + const cemeteries = getCemeteries() + const burialSiteTypes = getBurialSiteTypes() + const contractTypes = getContractTypes() + const funeralHomes = getFuneralHomes() response.render('contract-search', { headTitle: 'Contract Search', diff --git a/handlers/contracts-get/view.js b/handlers/contracts-get/view.js index 6cc7a445..dabaa6de 100644 --- a/handlers/contracts-get/view.js +++ b/handlers/contracts-get/view.js @@ -7,7 +7,7 @@ export default async function handler(request, response) { response.redirect(`${getConfigProperty('reverseProxy.urlPrefix')}/contracts/?error=contractIdNotFound`); return; } - const contractTypePrints = await getContractTypePrintsById(contract.contractTypeId); + const contractTypePrints = getContractTypePrintsById(contract.contractTypeId); response.render('contract-view', { headTitle: `Contract #${contract.contractId.toString()}`, contract, diff --git a/handlers/contracts-get/view.ts b/handlers/contracts-get/view.ts index 47c67745..2e24331e 100644 --- a/handlers/contracts-get/view.ts +++ b/handlers/contracts-get/view.ts @@ -8,9 +8,7 @@ export default async function handler( request: Request, response: Response ): Promise { - const contract = await getContract( - request.params.contractId - ) + const contract = await getContract(request.params.contractId) if (contract === undefined) { response.redirect( @@ -21,13 +19,11 @@ export default async function handler( return } - const contractTypePrints = await getContractTypePrintsById( - contract.contractTypeId - ) + const contractTypePrints = getContractTypePrintsById(contract.contractTypeId) response.render('contract-view', { headTitle: `Contract #${contract.contractId.toString()}`, - + contract, contractTypePrints }) diff --git a/handlers/contracts-post/doAddContractComment.d.ts b/handlers/contracts-post/doAddContractComment.d.ts index 8b914dcd..3db2ccbd 100644 --- a/handlers/contracts-post/doAddContractComment.d.ts +++ b/handlers/contracts-post/doAddContractComment.d.ts @@ -1,3 +1,3 @@ import type { Request, Response } from 'express'; import { type AddContractCommentForm } from '../../database/addContractComment.js'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/contracts-post/doAddContractComment.js b/handlers/contracts-post/doAddContractComment.js index 760fd828..9198d3b7 100644 --- a/handlers/contracts-post/doAddContractComment.js +++ b/handlers/contracts-post/doAddContractComment.js @@ -1,8 +1,8 @@ import addContractComment from '../../database/addContractComment.js'; import getContractComments from '../../database/getContractComments.js'; -export default async function handler(request, response) { - await addContractComment(request.body, request.session.user); - const contractComments = await getContractComments(request.body.contractId); +export default function handler(request, response) { + addContractComment(request.body, request.session.user); + const contractComments = getContractComments(request.body.contractId); response.json({ success: true, contractComments diff --git a/handlers/contracts-post/doAddContractComment.ts b/handlers/contracts-post/doAddContractComment.ts index 063d3ce2..7463c33e 100644 --- a/handlers/contracts-post/doAddContractComment.ts +++ b/handlers/contracts-post/doAddContractComment.ts @@ -5,18 +5,19 @@ import addContractComment, { } from '../../database/addContractComment.js' import getContractComments from '../../database/getContractComments.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - await addContractComment(request.body, request.session.user as User) +): void { + addContractComment(request.body, request.session.user as User) - const contractComments = await getContractComments( + const contractComments = getContractComments( request.body.contractId as string ) response.json({ success: true, + contractComments }) } diff --git a/handlers/contracts-post/doAddContractFee.js b/handlers/contracts-post/doAddContractFee.js index 87b1b183..452929b2 100644 --- a/handlers/contracts-post/doAddContractFee.js +++ b/handlers/contracts-post/doAddContractFee.js @@ -2,7 +2,7 @@ import addContractFee from '../../database/addContractFee.js'; import getContractFees from '../../database/getContractFees.js'; export default async function handler(request, response) { await addContractFee(request.body, request.session.user); - const contractFees = await getContractFees(request.body.contractId); + const contractFees = getContractFees(request.body.contractId); response.json({ success: true, contractFees diff --git a/handlers/contracts-post/doAddContractFee.ts b/handlers/contracts-post/doAddContractFee.ts index 45527b59..d7b19943 100644 --- a/handlers/contracts-post/doAddContractFee.ts +++ b/handlers/contracts-post/doAddContractFee.ts @@ -11,12 +11,11 @@ export default async function handler( ): Promise { await addContractFee(request.body, request.session.user as User) - const contractFees = await getContractFees( - request.body.contractId as string - ) + const contractFees = getContractFees(request.body.contractId as string) response.json({ success: true, + contractFees }) } diff --git a/handlers/contracts-post/doAddContractFeeCategory.js b/handlers/contracts-post/doAddContractFeeCategory.js index 4094b8c9..7675130d 100644 --- a/handlers/contracts-post/doAddContractFeeCategory.js +++ b/handlers/contracts-post/doAddContractFeeCategory.js @@ -2,7 +2,7 @@ import addContractFeeCategory from '../../database/addContractFeeCategory.js'; import getContractFees from '../../database/getContractFees.js'; export default async function handler(request, response) { await addContractFeeCategory(request.body, request.session.user); - const contractFees = await getContractFees(request.body.contractId); + const contractFees = getContractFees(request.body.contractId); response.json({ success: true, contractFees diff --git a/handlers/contracts-post/doAddContractFeeCategory.ts b/handlers/contracts-post/doAddContractFeeCategory.ts index 54e02c0b..cd921699 100644 --- a/handlers/contracts-post/doAddContractFeeCategory.ts +++ b/handlers/contracts-post/doAddContractFeeCategory.ts @@ -9,17 +9,13 @@ export default async function handler( request: Request, response: Response ): Promise { - await addContractFeeCategory( - request.body, - request.session.user as User - ) + await addContractFeeCategory(request.body, request.session.user as User) - const contractFees = await getContractFees( - request.body.contractId as string - ) + const contractFees = getContractFees(request.body.contractId as string) response.json({ success: true, + contractFees }) } diff --git a/handlers/contracts-post/doAddContractInterment.d.ts b/handlers/contracts-post/doAddContractInterment.d.ts index 3c0ca003..d1710437 100644 --- a/handlers/contracts-post/doAddContractInterment.d.ts +++ b/handlers/contracts-post/doAddContractInterment.d.ts @@ -1,3 +1,3 @@ import type { Request, Response } from 'express'; import { type AddForm } from '../../database/addContractInterment.js'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/contracts-post/doAddContractInterment.js b/handlers/contracts-post/doAddContractInterment.js index 7b1835d0..9417bf39 100644 --- a/handlers/contracts-post/doAddContractInterment.js +++ b/handlers/contracts-post/doAddContractInterment.js @@ -1,8 +1,8 @@ import addContractInterment from '../../database/addContractInterment.js'; import getContractInterments from '../../database/getContractInterments.js'; -export default async function handler(request, response) { - await addContractInterment(request.body, request.session.user); - const contractInterments = await getContractInterments(request.body.contractId); +export default function handler(request, response) { + addContractInterment(request.body, request.session.user); + const contractInterments = getContractInterments(request.body.contractId); response.json({ success: true, contractInterments diff --git a/handlers/contracts-post/doAddContractInterment.ts b/handlers/contracts-post/doAddContractInterment.ts index 6c35b227..6bd4e6b2 100644 --- a/handlers/contracts-post/doAddContractInterment.ts +++ b/handlers/contracts-post/doAddContractInterment.ts @@ -5,18 +5,17 @@ import addContractInterment, { } from '../../database/addContractInterment.js' import getContractInterments from '../../database/getContractInterments.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - await addContractInterment(request.body, request.session.user as User) +): void { + addContractInterment(request.body, request.session.user as User) - const contractInterments = await getContractInterments( - request.body.contractId - ) + const contractInterments = getContractInterments(request.body.contractId) response.json({ success: true, + contractInterments }) } diff --git a/handlers/contracts-post/doAddContractTransaction.js b/handlers/contracts-post/doAddContractTransaction.js index 20ff00c9..66ee925f 100644 --- a/handlers/contracts-post/doAddContractTransaction.js +++ b/handlers/contracts-post/doAddContractTransaction.js @@ -1,7 +1,7 @@ import addContractTransaction from '../../database/addContractTransaction.js'; import getContractTransactions from '../../database/getContractTransactions.js'; export default async function handler(request, response) { - await addContractTransaction(request.body, request.session.user); + addContractTransaction(request.body, request.session.user); const contractTransactions = await getContractTransactions(request.body.contractId, { includeIntegrations: true }); diff --git a/handlers/contracts-post/doAddContractTransaction.ts b/handlers/contracts-post/doAddContractTransaction.ts index 88ba02b6..d91a76fb 100644 --- a/handlers/contracts-post/doAddContractTransaction.ts +++ b/handlers/contracts-post/doAddContractTransaction.ts @@ -9,18 +9,18 @@ export default async function handler( request: Request, response: Response ): Promise { - await addContractTransaction( - request.body, - request.session.user as User - ) + addContractTransaction(request.body, request.session.user as User) - const contractTransactions = - await getContractTransactions(request.body.contractId, { + const contractTransactions = await getContractTransactions( + request.body.contractId, + { includeIntegrations: true - }) + } + ) response.json({ success: true, + contractTransactions }) } diff --git a/handlers/contracts-post/doCopyContract.ts b/handlers/contracts-post/doCopyContract.ts index 84d82589..90d292cd 100644 --- a/handlers/contracts-post/doCopyContract.ts +++ b/handlers/contracts-post/doCopyContract.ts @@ -13,6 +13,7 @@ export default async function handler( response.json({ success: true, + contractId }) } diff --git a/handlers/contracts-post/doCreateContract.d.ts b/handlers/contracts-post/doCreateContract.d.ts index 43cf7302..d49d8fc9 100644 --- a/handlers/contracts-post/doCreateContract.d.ts +++ b/handlers/contracts-post/doCreateContract.d.ts @@ -1,3 +1,3 @@ import type { Request, Response } from 'express'; import { type AddContractForm } from '../../database/addContract.js'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/contracts-post/doCreateContract.js b/handlers/contracts-post/doCreateContract.js index b1a3fac1..b645e966 100644 --- a/handlers/contracts-post/doCreateContract.js +++ b/handlers/contracts-post/doCreateContract.js @@ -1,6 +1,6 @@ import addContract from '../../database/addContract.js'; -export default async function handler(request, response) { - const contractId = await addContract(request.body, request.session.user); +export default function handler(request, response) { + const contractId = addContract(request.body, request.session.user); response.json({ success: true, contractId diff --git a/handlers/contracts-post/doCreateContract.ts b/handlers/contracts-post/doCreateContract.ts index f2f22b94..6713cb7f 100644 --- a/handlers/contracts-post/doCreateContract.ts +++ b/handlers/contracts-post/doCreateContract.ts @@ -4,18 +4,15 @@ import addContract, { type AddContractForm } from '../../database/addContract.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const contractId = await addContract( - request.body, - request.session.user as User - ) +): void { + const contractId = addContract(request.body, request.session.user as User) response.json({ success: true, + contractId }) } - diff --git a/handlers/contracts-post/doDeleteContract.d.ts b/handlers/contracts-post/doDeleteContract.d.ts index 1b8f821d..4e0180d1 100644 --- a/handlers/contracts-post/doDeleteContract.d.ts +++ b/handlers/contracts-post/doDeleteContract.d.ts @@ -1,4 +1,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/contracts-post/doDeleteContract.js b/handlers/contracts-post/doDeleteContract.js index c507d6c0..84dcdbde 100644 --- a/handlers/contracts-post/doDeleteContract.js +++ b/handlers/contracts-post/doDeleteContract.js @@ -1,6 +1,6 @@ import { deleteRecord } from '../../database/deleteRecord.js'; -export default async function handler(request, response) { - const success = await deleteRecord('Contracts', request.body.contractId, request.session.user); +export default function handler(request, response) { + const success = deleteRecord('Contracts', request.body.contractId, request.session.user); response.json({ success }); diff --git a/handlers/contracts-post/doDeleteContract.ts b/handlers/contracts-post/doDeleteContract.ts index 54e92eee..0b96c531 100644 --- a/handlers/contracts-post/doDeleteContract.ts +++ b/handlers/contracts-post/doDeleteContract.ts @@ -2,11 +2,11 @@ import type { Request, Response } from 'express' import { deleteRecord } from '../../database/deleteRecord.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const success = await deleteRecord( +): void { + const success = deleteRecord( 'Contracts', request.body.contractId, request.session.user as User diff --git a/handlers/contracts-post/doDeleteContractComment.d.ts b/handlers/contracts-post/doDeleteContractComment.d.ts index 2f18d678..95f25277 100644 --- a/handlers/contracts-post/doDeleteContractComment.d.ts +++ b/handlers/contracts-post/doDeleteContractComment.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/contracts-post/doDeleteContractComment.js b/handlers/contracts-post/doDeleteContractComment.js index 1124789a..15e34dda 100644 --- a/handlers/contracts-post/doDeleteContractComment.js +++ b/handlers/contracts-post/doDeleteContractComment.js @@ -1,8 +1,8 @@ import { deleteRecord } from '../../database/deleteRecord.js'; import getContractComments from '../../database/getContractComments.js'; -export default async function handler(request, response) { - const success = await deleteRecord('ContractComments', request.body.contractCommentId, request.session.user); - const contractComments = await getContractComments(request.body.contractId); +export default function handler(request, response) { + const success = deleteRecord('ContractComments', request.body.contractCommentId, request.session.user); + const contractComments = getContractComments(request.body.contractId); response.json({ success, contractComments diff --git a/handlers/contracts-post/doDeleteContractComment.ts b/handlers/contracts-post/doDeleteContractComment.ts index ff2f535a..8b0e78a3 100644 --- a/handlers/contracts-post/doDeleteContractComment.ts +++ b/handlers/contracts-post/doDeleteContractComment.ts @@ -3,26 +3,25 @@ import type { Request, Response } from 'express' import { deleteRecord } from '../../database/deleteRecord.js' import getContractComments from '../../database/getContractComments.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { contractCommentId: string; contractId: string } >, response: Response -): Promise { - const success = await deleteRecord( +): void { + const success = deleteRecord( 'ContractComments', request.body.contractCommentId, request.session.user as User ) - const contractComments = await getContractComments( - request.body.contractId - ) + const contractComments = getContractComments(request.body.contractId) response.json({ success, + contractComments }) } diff --git a/handlers/contracts-post/doDeleteContractFee.d.ts b/handlers/contracts-post/doDeleteContractFee.d.ts index a866eba0..eca6367c 100644 --- a/handlers/contracts-post/doDeleteContractFee.d.ts +++ b/handlers/contracts-post/doDeleteContractFee.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/contracts-post/doDeleteContractFee.js b/handlers/contracts-post/doDeleteContractFee.js index fffd8fee..19027011 100644 --- a/handlers/contracts-post/doDeleteContractFee.js +++ b/handlers/contracts-post/doDeleteContractFee.js @@ -1,8 +1,8 @@ import deleteContractFee from '../../database/deleteContractFee.js'; import getContractFees from '../../database/getContractFees.js'; -export default async function handler(request, response) { - const success = await deleteContractFee(request.body.contractId, request.body.feeId, request.session.user); - const contractFees = await getContractFees(request.body.contractId); +export default function handler(request, response) { + const success = deleteContractFee(request.body.contractId, request.body.feeId, request.session.user); + const contractFees = getContractFees(request.body.contractId); response.json({ success, contractFees diff --git a/handlers/contracts-post/doDeleteContractFee.ts b/handlers/contracts-post/doDeleteContractFee.ts index 5b8c0deb..7b98a5e6 100644 --- a/handlers/contracts-post/doDeleteContractFee.ts +++ b/handlers/contracts-post/doDeleteContractFee.ts @@ -3,26 +3,21 @@ import type { Request, Response } from 'express' import deleteContractFee from '../../database/deleteContractFee.js' import getContractFees from '../../database/getContractFees.js' -export default async function handler( - request: Request< - unknown, - unknown, - { contractId: string; feeId: string } - >, +export default function handler( + request: Request, response: Response -): Promise { - const success = await deleteContractFee( +): void { + const success = deleteContractFee( request.body.contractId, request.body.feeId, request.session.user as User ) - const contractFees = await getContractFees( - request.body.contractId - ) + const contractFees = getContractFees(request.body.contractId) response.json({ success, + contractFees }) } diff --git a/handlers/contracts-post/doDeleteContractInterment.d.ts b/handlers/contracts-post/doDeleteContractInterment.d.ts index 2c0a449a..76fc7013 100644 --- a/handlers/contracts-post/doDeleteContractInterment.d.ts +++ b/handlers/contracts-post/doDeleteContractInterment.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/contracts-post/doDeleteContractInterment.js b/handlers/contracts-post/doDeleteContractInterment.js index de50e30c..58a3ad39 100644 --- a/handlers/contracts-post/doDeleteContractInterment.js +++ b/handlers/contracts-post/doDeleteContractInterment.js @@ -1,8 +1,8 @@ import deleteContractInterment from '../../database/deleteContractInterment.js'; import getContractInterments from '../../database/getContractInterments.js'; -export default async function handler(request, response) { - const success = await deleteContractInterment(request.body.contractId, request.body.intermentNumber, request.session.user); - const contractInterments = await getContractInterments(request.body.contractId); +export default function handler(request, response) { + const success = deleteContractInterment(request.body.contractId, request.body.intermentNumber, request.session.user); + const contractInterments = getContractInterments(request.body.contractId); response.json({ success, contractInterments diff --git a/handlers/contracts-post/doDeleteContractInterment.ts b/handlers/contracts-post/doDeleteContractInterment.ts index 9242dd49..115e335a 100644 --- a/handlers/contracts-post/doDeleteContractInterment.ts +++ b/handlers/contracts-post/doDeleteContractInterment.ts @@ -3,26 +3,25 @@ import type { Request, Response } from 'express' import deleteContractInterment from '../../database/deleteContractInterment.js' import getContractInterments from '../../database/getContractInterments.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { contractId: string; intermentNumber: string } >, response: Response -): Promise { - const success = await deleteContractInterment( +): void { + const success = deleteContractInterment( request.body.contractId, request.body.intermentNumber, request.session.user as User ) - const contractInterments = await getContractInterments( - request.body.contractId - ) + const contractInterments = getContractInterments(request.body.contractId) response.json({ success, + contractInterments }) } diff --git a/handlers/contracts-post/doDeleteContractTransaction.js b/handlers/contracts-post/doDeleteContractTransaction.js index 8627ef43..1239c778 100644 --- a/handlers/contracts-post/doDeleteContractTransaction.js +++ b/handlers/contracts-post/doDeleteContractTransaction.js @@ -1,7 +1,7 @@ import deleteContractTransaction from '../../database/deleteContractTransaction.js'; import getContractTransactions from '../../database/getContractTransactions.js'; export default async function handler(request, response) { - const success = await deleteContractTransaction(request.body.contractId, request.body.transactionIndex, request.session.user); + const success = deleteContractTransaction(request.body.contractId, request.body.transactionIndex, request.session.user); const contractTransactions = await getContractTransactions(request.body.contractId, { includeIntegrations: true }); diff --git a/handlers/contracts-post/doDeleteContractTransaction.ts b/handlers/contracts-post/doDeleteContractTransaction.ts index f8d9f6d3..f64a26c4 100644 --- a/handlers/contracts-post/doDeleteContractTransaction.ts +++ b/handlers/contracts-post/doDeleteContractTransaction.ts @@ -11,19 +11,22 @@ export default async function handler( >, response: Response ): Promise { - const success = await deleteContractTransaction( + const success = deleteContractTransaction( request.body.contractId, request.body.transactionIndex, request.session.user as User ) - const contractTransactions = - await getContractTransactions(request.body.contractId, { + const contractTransactions = await getContractTransactions( + request.body.contractId, + { includeIntegrations: true - }) + } + ) response.json({ success, + contractTransactions }) } diff --git a/handlers/contracts-post/doGetContractTypeFields.d.ts b/handlers/contracts-post/doGetContractTypeFields.d.ts index dc1620a5..4700d2fa 100644 --- a/handlers/contracts-post/doGetContractTypeFields.d.ts +++ b/handlers/contracts-post/doGetContractTypeFields.d.ts @@ -1,4 +1,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/contracts-post/doGetContractTypeFields.js b/handlers/contracts-post/doGetContractTypeFields.js index 115efc95..3070e222 100644 --- a/handlers/contracts-post/doGetContractTypeFields.js +++ b/handlers/contracts-post/doGetContractTypeFields.js @@ -1,7 +1,7 @@ import { getAllContractTypeFields, getContractTypeById } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const allContractTypeFields = await getAllContractTypeFields(); - const result = (await getContractTypeById(Number.parseInt(request.body.contractTypeId, 10))); +export default function handler(request, response) { + const allContractTypeFields = getAllContractTypeFields(); + const result = getContractTypeById(Number.parseInt(request.body.contractTypeId, 10)); const contractTypeFields = [...allContractTypeFields]; contractTypeFields.push(...(result.contractTypeFields ?? [])); response.json({ diff --git a/handlers/contracts-post/doGetContractTypeFields.ts b/handlers/contracts-post/doGetContractTypeFields.ts index 74c11d51..4e76e5eb 100644 --- a/handlers/contracts-post/doGetContractTypeFields.ts +++ b/handlers/contracts-post/doGetContractTypeFields.ts @@ -6,15 +6,15 @@ import { } from '../../helpers/functions.cache.js' import type { ContractType } from '../../types/record.types.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const allContractTypeFields = await getAllContractTypeFields() +): void { + const allContractTypeFields = getAllContractTypeFields() - const result = (await getContractTypeById( + const result = getContractTypeById( Number.parseInt(request.body.contractTypeId, 10) - )) as ContractType + ) as ContractType const contractTypeFields = [...allContractTypeFields] diff --git a/handlers/contracts-post/doGetDynamicsGPDocument.d.ts b/handlers/contracts-post/doGetDynamicsGPDocument.d.ts index 19d32e4d..84f4d409 100644 --- a/handlers/contracts-post/doGetDynamicsGPDocument.d.ts +++ b/handlers/contracts-post/doGetDynamicsGPDocument.d.ts @@ -1,2 +1,4 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/contracts-post/doGetDynamicsGPDocument.js b/handlers/contracts-post/doGetDynamicsGPDocument.js index b34b29e9..769a82cc 100644 --- a/handlers/contracts-post/doGetDynamicsGPDocument.js +++ b/handlers/contracts-post/doGetDynamicsGPDocument.js @@ -1,4 +1,4 @@ -/* eslint-disable unicorn/filename-case */ +/* eslint-disable @eslint-community/eslint-comments/disable-enable-pair, unicorn/filename-case */ import { getDynamicsGPDocument } from '../../helpers/functions.dynamicsGP.js'; export default async function handler(request, response) { const externalReceiptNumber = request.body.externalReceiptNumber; diff --git a/handlers/contracts-post/doGetDynamicsGPDocument.ts b/handlers/contracts-post/doGetDynamicsGPDocument.ts index d28c5fa7..d52c7a34 100644 --- a/handlers/contracts-post/doGetDynamicsGPDocument.ts +++ b/handlers/contracts-post/doGetDynamicsGPDocument.ts @@ -1,11 +1,11 @@ -/* eslint-disable unicorn/filename-case */ +/* eslint-disable @eslint-community/eslint-comments/disable-enable-pair, unicorn/filename-case */ import type { Request, Response } from 'express' import { getDynamicsGPDocument } from '../../helpers/functions.dynamicsGP.js' export default async function handler( - request: Request, + request: Request, response: Response ): Promise { const externalReceiptNumber = request.body.externalReceiptNumber @@ -19,8 +19,8 @@ export default async function handler( } else { response.json({ success: true, + dynamicsGPDocument }) } } - diff --git a/handlers/contracts-post/doGetFees.js b/handlers/contracts-post/doGetFees.js index 87cd8bb0..913db951 100644 --- a/handlers/contracts-post/doGetFees.js +++ b/handlers/contracts-post/doGetFees.js @@ -3,7 +3,7 @@ import getFeeCategories from '../../database/getFeeCategories.js'; export default async function handler(request, response) { const contractId = request.body.contractId; const contract = (await getContract(contractId)); - const feeCategories = await getFeeCategories({ + const feeCategories = getFeeCategories({ contractTypeId: contract.contractTypeId, burialSiteTypeId: contract.burialSiteTypeId }, { diff --git a/handlers/contracts-post/doGetFees.ts b/handlers/contracts-post/doGetFees.ts index a464728f..6f3cd194 100644 --- a/handlers/contracts-post/doGetFees.ts +++ b/handlers/contracts-post/doGetFees.ts @@ -10,11 +10,9 @@ export default async function handler( ): Promise { const contractId = request.body.contractId - const contract = (await getContract( - contractId - )) as Contract + const contract = (await getContract(contractId)) as Contract - const feeCategories = await getFeeCategories( + const feeCategories = getFeeCategories( { contractTypeId: contract.contractTypeId, burialSiteTypeId: contract.burialSiteTypeId diff --git a/handlers/contracts-post/doUpdateContract.d.ts b/handlers/contracts-post/doUpdateContract.d.ts index 2f1de434..a3b5f2a7 100644 --- a/handlers/contracts-post/doUpdateContract.d.ts +++ b/handlers/contracts-post/doUpdateContract.d.ts @@ -1,3 +1,3 @@ import type { Request, Response } from 'express'; import { type UpdateContractForm } from '../../database/updateContract.js'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/contracts-post/doUpdateContract.js b/handlers/contracts-post/doUpdateContract.js index e21d89bd..30d7eee0 100644 --- a/handlers/contracts-post/doUpdateContract.js +++ b/handlers/contracts-post/doUpdateContract.js @@ -1,6 +1,6 @@ import updateContract from '../../database/updateContract.js'; -export default async function handler(request, response) { - const success = await updateContract(request.body, request.session.user); +export default function handler(request, response) { + const success = updateContract(request.body, request.session.user); response.json({ success, contractId: request.body.contractId diff --git a/handlers/contracts-post/doUpdateContract.ts b/handlers/contracts-post/doUpdateContract.ts index 8b99cdda..359857dd 100644 --- a/handlers/contracts-post/doUpdateContract.ts +++ b/handlers/contracts-post/doUpdateContract.ts @@ -4,17 +4,18 @@ import updateContract, { type UpdateContractForm } from '../../database/updateContract.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const success = await updateContract( +): void { + const success = updateContract( request.body, request.session.user as User ) response.json({ success, + contractId: request.body.contractId }) } diff --git a/handlers/contracts-post/doUpdateContractComment.d.ts b/handlers/contracts-post/doUpdateContractComment.d.ts index af52aba5..65c29208 100644 --- a/handlers/contracts-post/doUpdateContractComment.d.ts +++ b/handlers/contracts-post/doUpdateContractComment.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; import { type UpdateForm } from '../../database/updateContractComment.js'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/contracts-post/doUpdateContractComment.js b/handlers/contracts-post/doUpdateContractComment.js index 8127ba00..b392436c 100644 --- a/handlers/contracts-post/doUpdateContractComment.js +++ b/handlers/contracts-post/doUpdateContractComment.js @@ -1,8 +1,8 @@ import getContractComments from '../../database/getContractComments.js'; import updateContractComment from '../../database/updateContractComment.js'; -export default async function handler(request, response) { - const success = await updateContractComment(request.body, request.session.user); - const contractComments = await getContractComments(request.body.contractId); +export default function handler(request, response) { + const success = updateContractComment(request.body, request.session.user); + const contractComments = getContractComments(request.body.contractId); response.json({ success, contractComments diff --git a/handlers/contracts-post/doUpdateContractComment.ts b/handlers/contracts-post/doUpdateContractComment.ts index 0f884146..80cb9cbd 100644 --- a/handlers/contracts-post/doUpdateContractComment.ts +++ b/handlers/contracts-post/doUpdateContractComment.ts @@ -5,25 +5,20 @@ import updateContractComment, { type UpdateForm } from '../../database/updateContractComment.js' -export default async function handler( - request: Request< - unknown, - unknown, - UpdateForm & { contractId: string } - >, +export default function handler( + request: Request, response: Response -): Promise { - const success = await updateContractComment( +): void { + const success = updateContractComment( request.body, request.session.user as User ) - const contractComments = await getContractComments( - request.body.contractId - ) + const contractComments = getContractComments(request.body.contractId) response.json({ success, + contractComments }) } diff --git a/handlers/contracts-post/doUpdateContractFeeQuantity.d.ts b/handlers/contracts-post/doUpdateContractFeeQuantity.d.ts index 051c760d..2499d234 100644 --- a/handlers/contracts-post/doUpdateContractFeeQuantity.d.ts +++ b/handlers/contracts-post/doUpdateContractFeeQuantity.d.ts @@ -1,3 +1,3 @@ import type { Request, Response } from 'express'; import { type UpdateBurialSiteFeeForm } from '../../database/updateContractFeeQuantity.js'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/contracts-post/doUpdateContractFeeQuantity.js b/handlers/contracts-post/doUpdateContractFeeQuantity.js index 35ea75ba..5c0a2ceb 100644 --- a/handlers/contracts-post/doUpdateContractFeeQuantity.js +++ b/handlers/contracts-post/doUpdateContractFeeQuantity.js @@ -1,8 +1,8 @@ import getContractFees from '../../database/getContractFees.js'; import updateContractFeeQuantity from '../../database/updateContractFeeQuantity.js'; -export default async function handler(request, response) { - const success = await updateContractFeeQuantity(request.body, request.session.user); - const contractFees = await getContractFees(request.body.contractId); +export default function handler(request, response) { + const success = updateContractFeeQuantity(request.body, request.session.user); + const contractFees = getContractFees(request.body.contractId); response.json({ success, contractFees diff --git a/handlers/contracts-post/doUpdateContractFeeQuantity.ts b/handlers/contracts-post/doUpdateContractFeeQuantity.ts index 9b68e14f..7a220c05 100644 --- a/handlers/contracts-post/doUpdateContractFeeQuantity.ts +++ b/handlers/contracts-post/doUpdateContractFeeQuantity.ts @@ -5,21 +5,20 @@ import updateContractFeeQuantity, { type UpdateBurialSiteFeeForm } from '../../database/updateContractFeeQuantity.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const success = await updateContractFeeQuantity( +): void { + const success = updateContractFeeQuantity( request.body, request.session.user as User ) - const contractFees = await getContractFees( - request.body.contractId - ) + const contractFees = getContractFees(request.body.contractId) response.json({ success, + contractFees }) } diff --git a/handlers/contracts-post/doUpdateContractInterment.d.ts b/handlers/contracts-post/doUpdateContractInterment.d.ts index f40b8fa2..89f97a68 100644 --- a/handlers/contracts-post/doUpdateContractInterment.d.ts +++ b/handlers/contracts-post/doUpdateContractInterment.d.ts @@ -1,3 +1,3 @@ import type { Request, Response } from 'express'; import { type UpdateForm } from '../../database/updateContractInterment.js'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/contracts-post/doUpdateContractInterment.js b/handlers/contracts-post/doUpdateContractInterment.js index 72482211..43bf316a 100644 --- a/handlers/contracts-post/doUpdateContractInterment.js +++ b/handlers/contracts-post/doUpdateContractInterment.js @@ -1,8 +1,8 @@ import getContractInterments from '../../database/getContractInterments.js'; import updateContractInterment from '../../database/updateContractInterment.js'; -export default async function handler(request, response) { - await updateContractInterment(request.body, request.session.user); - const contractInterments = await getContractInterments(request.body.contractId); +export default function handler(request, response) { + updateContractInterment(request.body, request.session.user); + const contractInterments = getContractInterments(request.body.contractId); response.json({ success: true, contractInterments diff --git a/handlers/contracts-post/doUpdateContractInterment.ts b/handlers/contracts-post/doUpdateContractInterment.ts index ca689fd9..6bba3a5c 100644 --- a/handlers/contracts-post/doUpdateContractInterment.ts +++ b/handlers/contracts-post/doUpdateContractInterment.ts @@ -5,20 +5,17 @@ import updateContractInterment, { type UpdateForm } from '../../database/updateContractInterment.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - await updateContractInterment( - request.body, - request.session.user as User - ) +): void { + updateContractInterment(request.body, request.session.user as User) - const contractInterments = - await getContractInterments(request.body.contractId) + const contractInterments = getContractInterments(request.body.contractId) response.json({ success: true, + contractInterments }) } diff --git a/handlers/contracts-post/doUpdateContractTransaction.js b/handlers/contracts-post/doUpdateContractTransaction.js index 05b2439d..6611af77 100644 --- a/handlers/contracts-post/doUpdateContractTransaction.js +++ b/handlers/contracts-post/doUpdateContractTransaction.js @@ -1,7 +1,7 @@ import getContractTransactions from '../../database/getContractTransactions.js'; import updateContractTransaction from '../../database/updateContractTransaction.js'; export default async function handler(request, response) { - await updateContractTransaction(request.body, request.session.user); + updateContractTransaction(request.body, request.session.user); const contractTransactions = await getContractTransactions(request.body.contractId, { includeIntegrations: true }); diff --git a/handlers/contracts-post/doUpdateContractTransaction.ts b/handlers/contracts-post/doUpdateContractTransaction.ts index 46bbca48..bc2c42a4 100644 --- a/handlers/contracts-post/doUpdateContractTransaction.ts +++ b/handlers/contracts-post/doUpdateContractTransaction.ts @@ -9,18 +9,18 @@ export default async function handler( request: Request, response: Response ): Promise { - await updateContractTransaction( - request.body, - request.session.user as User - ) + updateContractTransaction(request.body, request.session.user as User) - const contractTransactions = - await getContractTransactions(request.body.contractId, { + const contractTransactions = await getContractTransactions( + request.body.contractId, + { includeIntegrations: true - }) + } + ) response.json({ success: true, + contractTransactions }) } diff --git a/handlers/funeralHomes-get/edit.d.ts b/handlers/funeralHomes-get/edit.d.ts index 19d32e4d..d5e48cba 100644 --- a/handlers/funeralHomes-get/edit.d.ts +++ b/handlers/funeralHomes-get/edit.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/funeralHomes-get/edit.js b/handlers/funeralHomes-get/edit.js index 44ece07d..a22d4aa2 100644 --- a/handlers/funeralHomes-get/edit.js +++ b/handlers/funeralHomes-get/edit.js @@ -1,7 +1,7 @@ import getFuneralHome from '../../database/getFuneralHome.js'; import { getConfigProperty } from '../../helpers/config.helpers.js'; -export default async function handler(request, response) { - const funeralHome = await getFuneralHome(request.params.funeralHomeId); +export default function handler(request, response) { + const funeralHome = getFuneralHome(request.params.funeralHomeId); if (funeralHome === undefined) { response.redirect(`${getConfigProperty('reverseProxy.urlPrefix')}/funeralHomes/?error=funeralHomeIdNotFound`); return; diff --git a/handlers/funeralHomes-get/edit.ts b/handlers/funeralHomes-get/edit.ts index 92ac1281..e72a9073 100644 --- a/handlers/funeralHomes-get/edit.ts +++ b/handlers/funeralHomes-get/edit.ts @@ -3,11 +3,8 @@ import type { Request, Response } from 'express' import getFuneralHome from '../../database/getFuneralHome.js' import { getConfigProperty } from '../../helpers/config.helpers.js' -export default async function handler( - request: Request, - response: Response -): Promise { - const funeralHome = await getFuneralHome(request.params.funeralHomeId) +export default function handler(request: Request, response: Response): void { + const funeralHome = getFuneralHome(request.params.funeralHomeId) if (funeralHome === undefined) { response.redirect( diff --git a/handlers/funeralHomes-get/search.d.ts b/handlers/funeralHomes-get/search.d.ts index 4bcb65f6..f4584afd 100644 --- a/handlers/funeralHomes-get/search.d.ts +++ b/handlers/funeralHomes-get/search.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(_request: Request, response: Response): Promise; +export default function handler(_request: Request, response: Response): void; diff --git a/handlers/funeralHomes-get/search.js b/handlers/funeralHomes-get/search.js index a52849b1..1e4e2d68 100644 --- a/handlers/funeralHomes-get/search.js +++ b/handlers/funeralHomes-get/search.js @@ -1,8 +1,8 @@ import getFuneralHomes from '../../database/getFuneralHomes.js'; -export default async function handler(_request, response) { - const funeralHomes = await getFuneralHomes(); +export default function handler(_request, response) { + const funeralHomes = getFuneralHomes(); response.render('funeralHome-search', { - headTitle: "Funeral Home Search", + headTitle: 'Funeral Home Search', funeralHomes }); } diff --git a/handlers/funeralHomes-get/search.ts b/handlers/funeralHomes-get/search.ts index 2edf9909..4aebeb34 100644 --- a/handlers/funeralHomes-get/search.ts +++ b/handlers/funeralHomes-get/search.ts @@ -2,15 +2,12 @@ import type { Request, Response } from 'express' import getFuneralHomes from '../../database/getFuneralHomes.js' -export default async function handler( - _request: Request, - response: Response -): Promise { - const funeralHomes = await getFuneralHomes() +export default function handler(_request: Request, response: Response): void { + const funeralHomes = getFuneralHomes() response.render('funeralHome-search', { - headTitle: "Funeral Home Search", - + headTitle: 'Funeral Home Search', + funeralHomes }) } diff --git a/handlers/funeralHomes-get/view.d.ts b/handlers/funeralHomes-get/view.d.ts index 19d32e4d..d5e48cba 100644 --- a/handlers/funeralHomes-get/view.d.ts +++ b/handlers/funeralHomes-get/view.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/funeralHomes-get/view.js b/handlers/funeralHomes-get/view.js index 6da81e7b..cba61531 100644 --- a/handlers/funeralHomes-get/view.js +++ b/handlers/funeralHomes-get/view.js @@ -1,7 +1,7 @@ import getFuneralHome from '../../database/getFuneralHome.js'; import { getConfigProperty } from '../../helpers/config.helpers.js'; -export default async function handler(request, response) { - const funeralHome = await getFuneralHome(request.params.funeralHomeId); +export default function handler(request, response) { + const funeralHome = getFuneralHome(request.params.funeralHomeId); if (funeralHome === undefined) { response.redirect(`${getConfigProperty('reverseProxy.urlPrefix')}/funeralHomes/?error=funeralHomeIdNotFound`); return; diff --git a/handlers/funeralHomes-get/view.ts b/handlers/funeralHomes-get/view.ts index 2589ae80..d2449750 100644 --- a/handlers/funeralHomes-get/view.ts +++ b/handlers/funeralHomes-get/view.ts @@ -3,11 +3,8 @@ import type { Request, Response } from 'express' import getFuneralHome from '../../database/getFuneralHome.js' import { getConfigProperty } from '../../helpers/config.helpers.js' -export default async function handler( - request: Request, - response: Response -): Promise { - const funeralHome = await getFuneralHome(request.params.funeralHomeId) +export default function handler(request: Request, response: Response): void { + const funeralHome = getFuneralHome(request.params.funeralHomeId) if (funeralHome === undefined) { response.redirect( diff --git a/handlers/funeralHomes-post/doCreateFuneralHome.d.ts b/handlers/funeralHomes-post/doCreateFuneralHome.d.ts index 5ca3c69d..a66e524b 100644 --- a/handlers/funeralHomes-post/doCreateFuneralHome.d.ts +++ b/handlers/funeralHomes-post/doCreateFuneralHome.d.ts @@ -1,3 +1,3 @@ import type { Request, Response } from 'express'; import { type AddForm } from '../../database/addFuneralHome.js'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/funeralHomes-post/doCreateFuneralHome.js b/handlers/funeralHomes-post/doCreateFuneralHome.js index 588d107e..054b29a4 100644 --- a/handlers/funeralHomes-post/doCreateFuneralHome.js +++ b/handlers/funeralHomes-post/doCreateFuneralHome.js @@ -1,6 +1,6 @@ import addFuneralHome from '../../database/addFuneralHome.js'; -export default async function handler(request, response) { - const funeralHomeId = await addFuneralHome(request.body, request.session.user); +export default function handler(request, response) { + const funeralHomeId = addFuneralHome(request.body, request.session.user); response.json({ success: true, funeralHomeId diff --git a/handlers/funeralHomes-post/doCreateFuneralHome.ts b/handlers/funeralHomes-post/doCreateFuneralHome.ts index be64a7aa..51725398 100644 --- a/handlers/funeralHomes-post/doCreateFuneralHome.ts +++ b/handlers/funeralHomes-post/doCreateFuneralHome.ts @@ -2,18 +2,18 @@ import type { Request, Response } from 'express' import addFuneralHome, { type AddForm } from '../../database/addFuneralHome.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const funeralHomeId = await addFuneralHome( +): void { + const funeralHomeId = addFuneralHome( request.body, request.session.user as User ) response.json({ success: true, - + funeralHomeId }) } diff --git a/handlers/funeralHomes-post/doDeleteFuneralHome.d.ts b/handlers/funeralHomes-post/doDeleteFuneralHome.d.ts index 43bf7cbf..47f34127 100644 --- a/handlers/funeralHomes-post/doDeleteFuneralHome.d.ts +++ b/handlers/funeralHomes-post/doDeleteFuneralHome.d.ts @@ -1,4 +1,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/funeralHomes-post/doDeleteFuneralHome.js b/handlers/funeralHomes-post/doDeleteFuneralHome.js index 95027a6a..485bd804 100644 --- a/handlers/funeralHomes-post/doDeleteFuneralHome.js +++ b/handlers/funeralHomes-post/doDeleteFuneralHome.js @@ -1,6 +1,6 @@ import { deleteRecord } from '../../database/deleteRecord.js'; -export default async function handler(request, response) { - const success = await deleteRecord('FuneralHomes', request.body.funeralHomeId, request.session.user); +export default function handler(request, response) { + const success = deleteRecord('FuneralHomes', request.body.funeralHomeId, request.session.user); response.json({ success }); diff --git a/handlers/funeralHomes-post/doDeleteFuneralHome.ts b/handlers/funeralHomes-post/doDeleteFuneralHome.ts index 6445c34b..c7fcc413 100644 --- a/handlers/funeralHomes-post/doDeleteFuneralHome.ts +++ b/handlers/funeralHomes-post/doDeleteFuneralHome.ts @@ -2,11 +2,11 @@ import type { Request, Response } from 'express' import { deleteRecord } from '../../database/deleteRecord.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const success = await deleteRecord( +): void { + const success = deleteRecord( 'FuneralHomes', request.body.funeralHomeId, request.session.user as User diff --git a/handlers/funeralHomes-post/doUpdateFuneralHome.d.ts b/handlers/funeralHomes-post/doUpdateFuneralHome.d.ts index 25c89065..37f49973 100644 --- a/handlers/funeralHomes-post/doUpdateFuneralHome.d.ts +++ b/handlers/funeralHomes-post/doUpdateFuneralHome.d.ts @@ -1,3 +1,3 @@ import type { Request, Response } from 'express'; import { type UpdateForm } from '../../database/updateFuneralHome.js'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/funeralHomes-post/doUpdateFuneralHome.js b/handlers/funeralHomes-post/doUpdateFuneralHome.js index d476b065..61a84e46 100644 --- a/handlers/funeralHomes-post/doUpdateFuneralHome.js +++ b/handlers/funeralHomes-post/doUpdateFuneralHome.js @@ -1,6 +1,6 @@ import updateFuneralHome from '../../database/updateFuneralHome.js'; -export default async function handler(request, response) { - const success = await updateFuneralHome(request.body, request.session.user); +export default function handler(request, response) { + const success = updateFuneralHome(request.body, request.session.user); response.json({ success, funeralHomeId: request.body.funeralHomeId diff --git a/handlers/funeralHomes-post/doUpdateFuneralHome.ts b/handlers/funeralHomes-post/doUpdateFuneralHome.ts index d9e2e0dc..71082b5f 100644 --- a/handlers/funeralHomes-post/doUpdateFuneralHome.ts +++ b/handlers/funeralHomes-post/doUpdateFuneralHome.ts @@ -4,18 +4,15 @@ import updateFuneralHome, { type UpdateForm } from '../../database/updateFuneralHome.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const success = await updateFuneralHome( - request.body, - request.session.user as User - ) +): void { + const success = updateFuneralHome(request.body, request.session.user as User) response.json({ success, - + funeralHomeId: request.body.funeralHomeId }) } diff --git a/handlers/reports-get/reportName.d.ts b/handlers/reports-get/reportName.d.ts index bb919204..06f9b158 100644 --- a/handlers/reports-get/reportName.d.ts +++ b/handlers/reports-get/reportName.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; import { type ReportParameters } from '../../database/getReportData.js'; export default function handler(request: Request<{ reportName: string; -}, unknown, unknown, ReportParameters>, response: Response): Promise; +}, unknown, unknown, ReportParameters>, response: Response): void; diff --git a/handlers/reports-get/reportName.js b/handlers/reports-get/reportName.js index f6ab67c4..9e2c3cb5 100644 --- a/handlers/reports-get/reportName.js +++ b/handlers/reports-get/reportName.js @@ -1,8 +1,8 @@ import papaParse from 'papaparse'; import getReportData from '../../database/getReportData.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const reportName = request.params.reportName; - const rows = await getReportData(reportName, request.query); + const rows = getReportData(reportName, request.query); if (rows === undefined) { response.status(404).json({ success: false, diff --git a/handlers/reports-get/reportName.ts b/handlers/reports-get/reportName.ts index 891fc7f8..c748721c 100644 --- a/handlers/reports-get/reportName.ts +++ b/handlers/reports-get/reportName.ts @@ -6,21 +6,18 @@ import getReportData, { type ReportParameters } from '../../database/getReportData.js' -export default async function handler( +export default function handler( request: Request<{ reportName: string }, unknown, unknown, ReportParameters>, response: Response -): Promise { +): void { const reportName = request.params.reportName - const rows = await getReportData( - reportName, - request.query - ) + const rows = getReportData(reportName, request.query) if (rows === undefined) { response.status(404).json({ success: false, - + message: 'Report Not Found' }) diff --git a/handlers/reports-get/search.d.ts b/handlers/reports-get/search.d.ts index 2a4f791e..76a59b7d 100644 --- a/handlers/reports-get/search.d.ts +++ b/handlers/reports-get/search.d.ts @@ -1,4 +1,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/reports-get/search.js b/handlers/reports-get/search.js index aff44049..70c42c7d 100644 --- a/handlers/reports-get/search.js +++ b/handlers/reports-get/search.js @@ -1,12 +1,12 @@ import { dateToString } from '@cityssm/utils-datetime'; import getCemeteries from '../../database/getCemeteries.js'; import { getBurialSiteStatuses, getBurialSiteTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const rightNow = new Date(); const reportTab = request.query.tab ?? 'workOrders'; - const cemeteries = await getCemeteries(); - const burialSiteTypes = await getBurialSiteTypes(); - const burialSiteStatuses = await getBurialSiteStatuses(); + const cemeteries = getCemeteries(); + const burialSiteTypes = getBurialSiteTypes(); + const burialSiteStatuses = getBurialSiteStatuses(); response.render('report-search', { headTitle: 'Reports', reportTab, diff --git a/handlers/reports-get/search.ts b/handlers/reports-get/search.ts index 337b1711..70b3f2a4 100644 --- a/handlers/reports-get/search.ts +++ b/handlers/reports-get/search.ts @@ -8,17 +8,17 @@ import { getBurialSiteTypes } from '../../helpers/functions.cache.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { +): void { const rightNow = new Date() const reportTab = request.query.tab ?? 'workOrders' - const cemeteries = await getCemeteries() - const burialSiteTypes = await getBurialSiteTypes() - const burialSiteStatuses = await getBurialSiteStatuses() + const cemeteries = getCemeteries() + const burialSiteTypes = getBurialSiteTypes() + const burialSiteStatuses = getBurialSiteStatuses() response.render('report-search', { headTitle: 'Reports', diff --git a/handlers/workOrders-get/edit.js b/handlers/workOrders-get/edit.js index 4a6261d2..dd788e46 100644 --- a/handlers/workOrders-get/edit.js +++ b/handlers/workOrders-get/edit.js @@ -15,9 +15,9 @@ export default async function handler(request, response) { response.redirect(`${getConfigProperty('reverseProxy.urlPrefix')}/workOrders/${workOrder.workOrderId.toString()}/?error=workOrderIsClosed`); return; } - const workOrderTypes = await getWorkOrderTypes(); - const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes(); - const burialSiteStatuses = await getBurialSiteStatuses(); + const workOrderTypes = getWorkOrderTypes(); + const workOrderMilestoneTypes = getWorkOrderMilestoneTypes(); + const burialSiteStatuses = getBurialSiteStatuses(); response.render('workOrder-edit', { headTitle: `Work Order #${workOrder.workOrderNumber}`, workOrder, diff --git a/handlers/workOrders-get/edit.ts b/handlers/workOrders-get/edit.ts index 25209141..00b0fd45 100644 --- a/handlers/workOrders-get/edit.ts +++ b/handlers/workOrders-get/edit.ts @@ -36,17 +36,17 @@ export default async function handler( return } - const workOrderTypes = await getWorkOrderTypes() + const workOrderTypes = getWorkOrderTypes() - const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes() + const workOrderMilestoneTypes = getWorkOrderMilestoneTypes() - const burialSiteStatuses = await getBurialSiteStatuses() + const burialSiteStatuses = getBurialSiteStatuses() response.render('workOrder-edit', { headTitle: `Work Order #${workOrder.workOrderNumber}`, workOrder, - + burialSiteStatuses, isCreate: false, workOrderMilestoneTypes, diff --git a/handlers/workOrders-get/new.d.ts b/handlers/workOrders-get/new.d.ts index 19d32e4d..d5e48cba 100644 --- a/handlers/workOrders-get/new.d.ts +++ b/handlers/workOrders-get/new.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/workOrders-get/new.js b/handlers/workOrders-get/new.js index f333f2bf..a8890c73 100644 --- a/handlers/workOrders-get/new.js +++ b/handlers/workOrders-get/new.js @@ -1,12 +1,12 @@ import { dateToInteger, dateToString } from '@cityssm/utils-datetime'; import { getWorkOrderTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const currentDate = new Date(); const workOrder = { workOrderOpenDate: dateToInteger(currentDate), workOrderOpenDateString: dateToString(currentDate) }; - const workOrderTypes = await getWorkOrderTypes(); + const workOrderTypes = getWorkOrderTypes(); response.render('workOrder-edit', { headTitle: 'New Work Order', workOrder, diff --git a/handlers/workOrders-get/new.ts b/handlers/workOrders-get/new.ts index 511665ff..8b1d27ab 100644 --- a/handlers/workOrders-get/new.ts +++ b/handlers/workOrders-get/new.ts @@ -5,10 +5,7 @@ import { dateToInteger, dateToString } from '@cityssm/utils-datetime' import { getWorkOrderTypes } from '../../helpers/functions.cache.js' import type { WorkOrder } from '../../types/record.types.js' -export default async function handler( - request: Request, - response: Response -): Promise { +export default function handler(request: Request, response: Response): void { const currentDate = new Date() const workOrder: Partial = { @@ -16,7 +13,7 @@ export default async function handler( workOrderOpenDateString: dateToString(currentDate) } - const workOrderTypes = await getWorkOrderTypes() + const workOrderTypes = getWorkOrderTypes() response.render('workOrder-edit', { headTitle: 'New Work Order', diff --git a/handlers/workOrders-get/outlook.d.ts b/handlers/workOrders-get/outlook.d.ts index 19d32e4d..d5e48cba 100644 --- a/handlers/workOrders-get/outlook.d.ts +++ b/handlers/workOrders-get/outlook.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/workOrders-get/outlook.js b/handlers/workOrders-get/outlook.js index 24b1d6d5..7cf70cc2 100644 --- a/handlers/workOrders-get/outlook.js +++ b/handlers/workOrders-get/outlook.js @@ -1,7 +1,7 @@ import { getWorkOrderMilestoneTypes, getWorkOrderTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { - const workOrderTypes = await getWorkOrderTypes(); - const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes(); +export default function handler(request, response) { + const workOrderTypes = getWorkOrderTypes(); + const workOrderMilestoneTypes = getWorkOrderMilestoneTypes(); response.render('workOrder-outlook', { headTitle: 'Work Order Outlook Integration', workOrderMilestoneTypes, diff --git a/handlers/workOrders-get/outlook.ts b/handlers/workOrders-get/outlook.ts index 89b8d134..cc953e33 100644 --- a/handlers/workOrders-get/outlook.ts +++ b/handlers/workOrders-get/outlook.ts @@ -5,12 +5,9 @@ import { getWorkOrderTypes } from '../../helpers/functions.cache.js' -export default async function handler( - request: Request, - response: Response -): Promise { - const workOrderTypes = await getWorkOrderTypes() - const workOrderMilestoneTypes = await getWorkOrderMilestoneTypes() +export default function handler(request: Request, response: Response): void { + const workOrderTypes = getWorkOrderTypes() + const workOrderMilestoneTypes = getWorkOrderMilestoneTypes() response.render('workOrder-outlook', { headTitle: 'Work Order Outlook Integration', diff --git a/handlers/workOrders-get/search.d.ts b/handlers/workOrders-get/search.d.ts index 19d32e4d..d5e48cba 100644 --- a/handlers/workOrders-get/search.d.ts +++ b/handlers/workOrders-get/search.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/workOrders-get/search.js b/handlers/workOrders-get/search.js index 56609013..fc1ab0df 100644 --- a/handlers/workOrders-get/search.js +++ b/handlers/workOrders-get/search.js @@ -1,7 +1,7 @@ import { getWorkOrderTypes } from '../../helpers/functions.cache.js'; -export default async function handler(request, response) { +export default function handler(request, response) { const workOrderOpenDateString = request.query.workOrderOpenDateString; - const workOrderTypes = await getWorkOrderTypes(); + const workOrderTypes = getWorkOrderTypes(); response.render('workOrder-search', { headTitle: 'Work Order Search', workOrderOpenDateString, diff --git a/handlers/workOrders-get/search.ts b/handlers/workOrders-get/search.ts index 502efdc4..f1d21c57 100644 --- a/handlers/workOrders-get/search.ts +++ b/handlers/workOrders-get/search.ts @@ -2,13 +2,10 @@ import type { Request, Response } from 'express' import { getWorkOrderTypes } from '../../helpers/functions.cache.js' -export default async function handler( - request: Request, - response: Response -): Promise { +export default function handler(request: Request, response: Response): void { const workOrderOpenDateString = request.query.workOrderOpenDateString - const workOrderTypes = await getWorkOrderTypes() + const workOrderTypes = getWorkOrderTypes() response.render('workOrder-search', { headTitle: 'Work Order Search', diff --git a/handlers/workOrders-post/doAddWorkOrderBurialSite.d.ts b/handlers/workOrders-post/doAddWorkOrderBurialSite.d.ts index 52d690e3..1034f3b4 100644 --- a/handlers/workOrders-post/doAddWorkOrderBurialSite.d.ts +++ b/handlers/workOrders-post/doAddWorkOrderBurialSite.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/workOrders-post/doAddWorkOrderBurialSite.js b/handlers/workOrders-post/doAddWorkOrderBurialSite.js index ec95f3a9..52099ef3 100644 --- a/handlers/workOrders-post/doAddWorkOrderBurialSite.js +++ b/handlers/workOrders-post/doAddWorkOrderBurialSite.js @@ -1,11 +1,11 @@ import addWorkOrderBurialSite from '../../database/addWorkOrderBurialSite.js'; import getBurialSites from '../../database/getBurialSites.js'; -export default async function handler(request, response) { - const success = await addWorkOrderBurialSite({ +export default function handler(request, response) { + const success = addWorkOrderBurialSite({ burialSiteId: request.body.burialSiteId, workOrderId: request.body.workOrderId }, request.session.user); - const results = await getBurialSites({ + const results = getBurialSites({ workOrderId: request.body.workOrderId }, { limit: -1, diff --git a/handlers/workOrders-post/doAddWorkOrderBurialSite.ts b/handlers/workOrders-post/doAddWorkOrderBurialSite.ts index 41e07756..f6edd837 100644 --- a/handlers/workOrders-post/doAddWorkOrderBurialSite.ts +++ b/handlers/workOrders-post/doAddWorkOrderBurialSite.ts @@ -3,15 +3,15 @@ import type { Request, Response } from 'express' import addWorkOrderBurialSite from '../../database/addWorkOrderBurialSite.js' import getBurialSites from '../../database/getBurialSites.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, - { burialSiteId: string; workOrderId: string; } + { burialSiteId: string; workOrderId: string } >, response: Response -): Promise { - const success = await addWorkOrderBurialSite( +): void { + const success = addWorkOrderBurialSite( { burialSiteId: request.body.burialSiteId, workOrderId: request.body.workOrderId @@ -19,7 +19,7 @@ export default async function handler( request.session.user as User ) - const results = await getBurialSites( + const results = getBurialSites( { workOrderId: request.body.workOrderId }, diff --git a/handlers/workOrders-post/doAddWorkOrderComment.d.ts b/handlers/workOrders-post/doAddWorkOrderComment.d.ts index 63274cfb..54469434 100644 --- a/handlers/workOrders-post/doAddWorkOrderComment.d.ts +++ b/handlers/workOrders-post/doAddWorkOrderComment.d.ts @@ -1,3 +1,3 @@ import type { Request, Response } from 'express'; import { type AddWorkOrderCommentForm } from '../../database/addWorkOrderComment.js'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/workOrders-post/doAddWorkOrderComment.js b/handlers/workOrders-post/doAddWorkOrderComment.js index c6b01bde..473c9794 100644 --- a/handlers/workOrders-post/doAddWorkOrderComment.js +++ b/handlers/workOrders-post/doAddWorkOrderComment.js @@ -1,8 +1,8 @@ import addWorkOrderComment from '../../database/addWorkOrderComment.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); +export default function handler(request, response) { + addWorkOrderComment(request.body, request.session.user); + const workOrderComments = getWorkOrderComments(request.body.workOrderId); response.json({ success: true, workOrderComments diff --git a/handlers/workOrders-post/doAddWorkOrderComment.ts b/handlers/workOrders-post/doAddWorkOrderComment.ts index 700e8506..38d43166 100644 --- a/handlers/workOrders-post/doAddWorkOrderComment.ts +++ b/handlers/workOrders-post/doAddWorkOrderComment.ts @@ -5,15 +5,13 @@ import addWorkOrderComment, { } from '../../database/addWorkOrderComment.js' import getWorkOrderComments from '../../database/getWorkOrderComments.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - await addWorkOrderComment(request.body, request.session.user as User) +): void { + addWorkOrderComment(request.body, request.session.user as User) - const workOrderComments = await getWorkOrderComments( - request.body.workOrderId as string - ) + const workOrderComments = getWorkOrderComments(request.body.workOrderId) response.json({ success: true, diff --git a/handlers/workOrders-post/doAddWorkOrderContract.js b/handlers/workOrders-post/doAddWorkOrderContract.js index 4978fea6..35d6cf5d 100644 --- a/handlers/workOrders-post/doAddWorkOrderContract.js +++ b/handlers/workOrders-post/doAddWorkOrderContract.js @@ -1,7 +1,7 @@ import addWorkOrderContract from '../../database/addWorkOrderContract.js'; import getContracts from '../../database/getContracts.js'; export default async function handler(request, response) { - const success = await addWorkOrderContract({ + const success = addWorkOrderContract({ contractId: request.body.contractId, workOrderId: request.body.workOrderId }, request.session.user); diff --git a/handlers/workOrders-post/doAddWorkOrderContract.ts b/handlers/workOrders-post/doAddWorkOrderContract.ts index a87bacc3..1c7c425f 100644 --- a/handlers/workOrders-post/doAddWorkOrderContract.ts +++ b/handlers/workOrders-post/doAddWorkOrderContract.ts @@ -11,7 +11,7 @@ export default async function handler( >, response: Response ): Promise { - const success = await addWorkOrderContract( + const success = addWorkOrderContract( { contractId: request.body.contractId, workOrderId: request.body.workOrderId diff --git a/handlers/workOrders-post/doAddWorkOrderMilestone.js b/handlers/workOrders-post/doAddWorkOrderMilestone.js index 90cebc8e..9c9ac4a4 100644 --- a/handlers/workOrders-post/doAddWorkOrderMilestone.js +++ b/handlers/workOrders-post/doAddWorkOrderMilestone.js @@ -1,7 +1,7 @@ import addWorkOrderMilestone from '../../database/addWorkOrderMilestone.js'; import getWorkOrderMilestones from '../../database/getWorkOrderMilestones.js'; export default async function handler(request, response) { - const success = await addWorkOrderMilestone(request.body, request.session.user); + const success = addWorkOrderMilestone(request.body, request.session.user); const workOrderMilestones = await getWorkOrderMilestones({ workOrderId: request.body.workOrderId }, { diff --git a/handlers/workOrders-post/doAddWorkOrderMilestone.ts b/handlers/workOrders-post/doAddWorkOrderMilestone.ts index 77ed798c..640efbf2 100644 --- a/handlers/workOrders-post/doAddWorkOrderMilestone.ts +++ b/handlers/workOrders-post/doAddWorkOrderMilestone.ts @@ -9,7 +9,7 @@ export default async function handler( request: Request, response: Response ): Promise { - const success = await addWorkOrderMilestone( + const success = addWorkOrderMilestone( request.body, request.session.user as User ) diff --git a/handlers/workOrders-post/doCloseWorkOrder.d.ts b/handlers/workOrders-post/doCloseWorkOrder.d.ts index c7b0d12d..8ad627c0 100644 --- a/handlers/workOrders-post/doCloseWorkOrder.d.ts +++ b/handlers/workOrders-post/doCloseWorkOrder.d.ts @@ -1,3 +1,3 @@ import type { Request, Response } from 'express'; import { type CloseWorkOrderForm } from '../../database/closeWorkOrder.js'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/workOrders-post/doCloseWorkOrder.js b/handlers/workOrders-post/doCloseWorkOrder.js index 63108001..c86e408f 100644 --- a/handlers/workOrders-post/doCloseWorkOrder.js +++ b/handlers/workOrders-post/doCloseWorkOrder.js @@ -1,6 +1,6 @@ import closeWorkOrder from '../../database/closeWorkOrder.js'; -export default async function handler(request, response) { - const success = await closeWorkOrder(request.body, request.session.user); +export default function handler(request, response) { + const success = closeWorkOrder(request.body, request.session.user); response.json({ success }); diff --git a/handlers/workOrders-post/doCloseWorkOrder.ts b/handlers/workOrders-post/doCloseWorkOrder.ts index f97ad73e..999caa3d 100644 --- a/handlers/workOrders-post/doCloseWorkOrder.ts +++ b/handlers/workOrders-post/doCloseWorkOrder.ts @@ -4,14 +4,11 @@ import closeWorkOrder, { type CloseWorkOrderForm } from '../../database/closeWorkOrder.js' -export default async function handler( +export default function handler( request: Request, response: Response -): Promise { - const success = await closeWorkOrder( - request.body, - request.session.user as User - ) +): void { + const success = closeWorkOrder(request.body, request.session.user as User) response.json({ success diff --git a/handlers/workOrders-post/doCompleteWorkOrderMilestone.js b/handlers/workOrders-post/doCompleteWorkOrderMilestone.js index d39d71e2..24db1b9a 100644 --- a/handlers/workOrders-post/doCompleteWorkOrderMilestone.js +++ b/handlers/workOrders-post/doCompleteWorkOrderMilestone.js @@ -1,7 +1,7 @@ import completeWorkOrderMilestone from '../../database/completeWorkOrderMilestone.js'; import getWorkOrderMilestones from '../../database/getWorkOrderMilestones.js'; export default async function handler(request, response) { - const success = await completeWorkOrderMilestone({ + const success = completeWorkOrderMilestone({ workOrderMilestoneId: request.body.workOrderMilestoneId }, request.session.user); const workOrderMilestones = await getWorkOrderMilestones({ diff --git a/handlers/workOrders-post/doCompleteWorkOrderMilestone.ts b/handlers/workOrders-post/doCompleteWorkOrderMilestone.ts index 265b2115..0bf5ff48 100644 --- a/handlers/workOrders-post/doCompleteWorkOrderMilestone.ts +++ b/handlers/workOrders-post/doCompleteWorkOrderMilestone.ts @@ -11,7 +11,7 @@ export default async function handler( >, response: Response ): Promise { - const success = await completeWorkOrderMilestone( + const success = completeWorkOrderMilestone( { workOrderMilestoneId: request.body.workOrderMilestoneId }, diff --git a/handlers/workOrders-post/doCreateWorkOrder.d.ts b/handlers/workOrders-post/doCreateWorkOrder.d.ts index 19d32e4d..d5e48cba 100644 --- a/handlers/workOrders-post/doCreateWorkOrder.d.ts +++ b/handlers/workOrders-post/doCreateWorkOrder.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/workOrders-post/doCreateWorkOrder.js b/handlers/workOrders-post/doCreateWorkOrder.js index 72a4ce65..db161f55 100644 --- a/handlers/workOrders-post/doCreateWorkOrder.js +++ b/handlers/workOrders-post/doCreateWorkOrder.js @@ -1,6 +1,6 @@ import addWorkOrder from '../../database/addWorkOrder.js'; -export default async function handler(request, response) { - const workOrderId = await addWorkOrder(request.body, request.session.user); +export default function handler(request, response) { + const workOrderId = addWorkOrder(request.body, request.session.user); response.json({ success: true, workOrderId diff --git a/handlers/workOrders-post/doCreateWorkOrder.ts b/handlers/workOrders-post/doCreateWorkOrder.ts index 4ae5b330..f12055a3 100644 --- a/handlers/workOrders-post/doCreateWorkOrder.ts +++ b/handlers/workOrders-post/doCreateWorkOrder.ts @@ -4,11 +4,8 @@ import addWorkOrder, { type AddWorkOrderForm } from '../../database/addWorkOrder.js' -export default async function handler( - request: Request, - response: Response -): Promise { - const workOrderId = await addWorkOrder( +export default function handler(request: Request, response: Response): void { + const workOrderId = addWorkOrder( request.body as AddWorkOrderForm, request.session.user as User ) @@ -18,4 +15,3 @@ export default async function handler( workOrderId }) } - diff --git a/handlers/workOrders-post/doDeleteWorkOrder.d.ts b/handlers/workOrders-post/doDeleteWorkOrder.d.ts index 19d32e4d..9b255c23 100644 --- a/handlers/workOrders-post/doDeleteWorkOrder.d.ts +++ b/handlers/workOrders-post/doDeleteWorkOrder.d.ts @@ -1,2 +1,4 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/workOrders-post/doDeleteWorkOrder.js b/handlers/workOrders-post/doDeleteWorkOrder.js index 419e76ba..da4ec516 100644 --- a/handlers/workOrders-post/doDeleteWorkOrder.js +++ b/handlers/workOrders-post/doDeleteWorkOrder.js @@ -1,6 +1,6 @@ import { deleteRecord } from '../../database/deleteRecord.js'; -export default async function handler(request, response) { - const success = await deleteRecord('WorkOrders', request.body.workOrderId, request.session.user); +export default function handler(request, response) { + const success = deleteRecord('WorkOrders', request.body.workOrderId, request.session.user); response.json({ success }); diff --git a/handlers/workOrders-post/doDeleteWorkOrder.ts b/handlers/workOrders-post/doDeleteWorkOrder.ts index 9b295c83..3bfde91c 100644 --- a/handlers/workOrders-post/doDeleteWorkOrder.ts +++ b/handlers/workOrders-post/doDeleteWorkOrder.ts @@ -2,11 +2,11 @@ import type { Request, Response } from 'express' import { deleteRecord } from '../../database/deleteRecord.js' -export default async function handler( - request: Request, +export default function handler( + request: Request, response: Response -): Promise { - const success = await deleteRecord( +): void { + const success = deleteRecord( 'WorkOrders', request.body.workOrderId, request.session.user as User @@ -16,4 +16,3 @@ export default async function handler( success }) } - diff --git a/handlers/workOrders-post/doDeleteWorkOrderBurialSite.d.ts b/handlers/workOrders-post/doDeleteWorkOrderBurialSite.d.ts index b088724b..9dd14bea 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderBurialSite.d.ts +++ b/handlers/workOrders-post/doDeleteWorkOrderBurialSite.d.ts @@ -2,4 +2,4 @@ import type { Request, Response } from 'express'; export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/workOrders-post/doDeleteWorkOrderBurialSite.js b/handlers/workOrders-post/doDeleteWorkOrderBurialSite.js index 6b640eea..2986bc63 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderBurialSite.js +++ b/handlers/workOrders-post/doDeleteWorkOrderBurialSite.js @@ -1,8 +1,8 @@ import deleteWorkOrderBurialSite from '../../database/deleteWorkOrderBurialSite.js'; import getBurialSites from '../../database/getBurialSites.js'; -export default async function handler(request, response) { - const success = await deleteWorkOrderBurialSite(request.body.workOrderId, request.body.burialSiteId, request.session.user); - const results = await getBurialSites({ +export default function handler(request, response) { + const success = deleteWorkOrderBurialSite(request.body.workOrderId, request.body.burialSiteId, request.session.user); + const results = getBurialSites({ workOrderId: request.body.workOrderId }, { limit: -1, diff --git a/handlers/workOrders-post/doDeleteWorkOrderBurialSite.ts b/handlers/workOrders-post/doDeleteWorkOrderBurialSite.ts index f83ff520..3e4de549 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderBurialSite.ts +++ b/handlers/workOrders-post/doDeleteWorkOrderBurialSite.ts @@ -3,17 +3,21 @@ import type { Request, Response } from 'express' import deleteWorkOrderBurialSite from '../../database/deleteWorkOrderBurialSite.js' import getBurialSites from '../../database/getBurialSites.js' -export default async function handler( - request: Request, +export default function handler( + request: Request< + unknown, + unknown, + { workOrderId: string; burialSiteId: string } + >, response: Response -): Promise { - const success = await deleteWorkOrderBurialSite( +): void { + const success = deleteWorkOrderBurialSite( request.body.workOrderId, request.body.burialSiteId, request.session.user as User ) - const results = await getBurialSites( + const results = getBurialSites( { workOrderId: request.body.workOrderId }, diff --git a/handlers/workOrders-post/doDeleteWorkOrderComment.d.ts b/handlers/workOrders-post/doDeleteWorkOrderComment.d.ts index 19d32e4d..d5e48cba 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderComment.d.ts +++ b/handlers/workOrders-post/doDeleteWorkOrderComment.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/workOrders-post/doDeleteWorkOrderComment.js b/handlers/workOrders-post/doDeleteWorkOrderComment.js index ce257ac5..7f1c1167 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderComment.js +++ b/handlers/workOrders-post/doDeleteWorkOrderComment.js @@ -1,8 +1,8 @@ import { deleteRecord } from '../../database/deleteRecord.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); +export default function handler(request, response) { + const success = deleteRecord('WorkOrderComments', request.body.workOrderCommentId, request.session.user); + const workOrderComments = getWorkOrderComments(request.body.workOrderId); response.json({ success, workOrderComments diff --git a/handlers/workOrders-post/doDeleteWorkOrderComment.ts b/handlers/workOrders-post/doDeleteWorkOrderComment.ts index 47b1df74..58a3db1b 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderComment.ts +++ b/handlers/workOrders-post/doDeleteWorkOrderComment.ts @@ -3,17 +3,14 @@ import type { Request, Response } from 'express' import { deleteRecord } from '../../database/deleteRecord.js' import getWorkOrderComments from '../../database/getWorkOrderComments.js' -export default async function handler( - request: Request, - response: Response -): Promise { - const success = await deleteRecord( +export default function handler(request: Request, response: Response): void { + const success = deleteRecord( 'WorkOrderComments', request.body.workOrderCommentId as string, request.session.user as User ) - const workOrderComments = await getWorkOrderComments( + const workOrderComments = getWorkOrderComments( request.body.workOrderId as string ) diff --git a/handlers/workOrders-post/doDeleteWorkOrderContract.js b/handlers/workOrders-post/doDeleteWorkOrderContract.js index cd4dd354..79153131 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderContract.js +++ b/handlers/workOrders-post/doDeleteWorkOrderContract.js @@ -1,7 +1,7 @@ import deleteWorkOrderContract from '../../database/deleteWorkOrderContract.js'; import getContracts from '../../database/getContracts.js'; export default async function handler(request, response) { - const success = await deleteWorkOrderContract(request.body.workOrderId, request.body.contractId, request.session.user); + const success = deleteWorkOrderContract(request.body.workOrderId, request.body.contractId, request.session.user); const workOrderContracts = await getContracts({ workOrderId: request.body.workOrderId }, { diff --git a/handlers/workOrders-post/doDeleteWorkOrderContract.ts b/handlers/workOrders-post/doDeleteWorkOrderContract.ts index 3ed9d8a9..f4cf43bf 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderContract.ts +++ b/handlers/workOrders-post/doDeleteWorkOrderContract.ts @@ -11,7 +11,7 @@ export default async function handler( >, response: Response ): Promise { - const success = await deleteWorkOrderContract( + const success = deleteWorkOrderContract( request.body.workOrderId, request.body.contractId, request.session.user as User @@ -32,7 +32,6 @@ export default async function handler( response.json({ success, - workOrderContracts: - workOrderContracts.contracts + workOrderContracts: workOrderContracts.contracts }) } diff --git a/handlers/workOrders-post/doDeleteWorkOrderMilestone.js b/handlers/workOrders-post/doDeleteWorkOrderMilestone.js index e111d67d..f50dd99e 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderMilestone.js +++ b/handlers/workOrders-post/doDeleteWorkOrderMilestone.js @@ -1,7 +1,7 @@ import { deleteRecord } from '../../database/deleteRecord.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 success = deleteRecord('WorkOrderMilestones', request.body.workOrderMilestoneId, request.session.user); const workOrderMilestones = await getWorkOrderMilestones({ workOrderId: request.body.workOrderId }, { diff --git a/handlers/workOrders-post/doDeleteWorkOrderMilestone.ts b/handlers/workOrders-post/doDeleteWorkOrderMilestone.ts index 48f05f46..5aeb6f11 100644 --- a/handlers/workOrders-post/doDeleteWorkOrderMilestone.ts +++ b/handlers/workOrders-post/doDeleteWorkOrderMilestone.ts @@ -7,7 +7,7 @@ export default async function handler( request: Request, response: Response ): Promise { - const success = await deleteRecord( + const success = deleteRecord( 'WorkOrderMilestones', request.body.workOrderMilestoneId as string, request.session.user as User diff --git a/handlers/workOrders-post/doReopenWorkOrder.d.ts b/handlers/workOrders-post/doReopenWorkOrder.d.ts index 19d32e4d..d5e48cba 100644 --- a/handlers/workOrders-post/doReopenWorkOrder.d.ts +++ b/handlers/workOrders-post/doReopenWorkOrder.d.ts @@ -1,2 +1,2 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/workOrders-post/doReopenWorkOrder.js b/handlers/workOrders-post/doReopenWorkOrder.js index 115cce4f..5ca62a5d 100644 --- a/handlers/workOrders-post/doReopenWorkOrder.js +++ b/handlers/workOrders-post/doReopenWorkOrder.js @@ -1,6 +1,6 @@ import reopenWorkOrder from '../../database/reopenWorkOrder.js'; -export default async function handler(request, response) { - const success = await reopenWorkOrder(request.body.workOrderId, request.session.user); +export default function handler(request, response) { + const success = reopenWorkOrder(request.body.workOrderId, request.session.user); response.json({ success, workOrderId: request.body.workOrderId diff --git a/handlers/workOrders-post/doReopenWorkOrder.ts b/handlers/workOrders-post/doReopenWorkOrder.ts index 4b789c48..f025c7a5 100644 --- a/handlers/workOrders-post/doReopenWorkOrder.ts +++ b/handlers/workOrders-post/doReopenWorkOrder.ts @@ -2,11 +2,8 @@ import type { Request, Response } from 'express' import reopenWorkOrder from '../../database/reopenWorkOrder.js' -export default async function handler( - request: Request, - response: Response -): Promise { - const success = await reopenWorkOrder( +export default function handler(request: Request, response: Response): void { + const success = reopenWorkOrder( request.body.workOrderId as string, request.session.user as User ) diff --git a/handlers/workOrders-post/doReopenWorkOrderMilestone.js b/handlers/workOrders-post/doReopenWorkOrderMilestone.js index fb6699da..ba776705 100644 --- a/handlers/workOrders-post/doReopenWorkOrderMilestone.js +++ b/handlers/workOrders-post/doReopenWorkOrderMilestone.js @@ -1,7 +1,7 @@ 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); + const success = reopenWorkOrderMilestone(request.body.workOrderMilestoneId, request.session.user); const workOrderMilestones = await getWorkOrderMilestones({ workOrderId: request.body.workOrderId }, { diff --git a/handlers/workOrders-post/doReopenWorkOrderMilestone.ts b/handlers/workOrders-post/doReopenWorkOrderMilestone.ts index 2cfa7a2a..1ad345cc 100644 --- a/handlers/workOrders-post/doReopenWorkOrderMilestone.ts +++ b/handlers/workOrders-post/doReopenWorkOrderMilestone.ts @@ -7,7 +7,7 @@ export default async function handler( request: Request, response: Response ): Promise { - const success = await reopenWorkOrderMilestone( + const success = reopenWorkOrderMilestone( request.body.workOrderMilestoneId as string, request.session.user as User ) diff --git a/handlers/workOrders-post/doSearchWorkOrders.d.ts b/handlers/workOrders-post/doSearchWorkOrders.d.ts index 19d32e4d..29133e57 100644 --- a/handlers/workOrders-post/doSearchWorkOrders.d.ts +++ b/handlers/workOrders-post/doSearchWorkOrders.d.ts @@ -1,2 +1,3 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +import { type GetWorkOrdersFilters, type GetWorkOrdersOptions } from '../../database/getWorkOrders.js'; +export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doSearchWorkOrders.js b/handlers/workOrders-post/doSearchWorkOrders.js index 5786efab..af6dd3c5 100644 --- a/handlers/workOrders-post/doSearchWorkOrders.js +++ b/handlers/workOrders-post/doSearchWorkOrders.js @@ -7,7 +7,9 @@ export default async function handler(request, response) { }); response.json({ count: result.count, - offset: Number.parseInt(request.body.offset, 10), + offset: typeof request.body.offset === 'string' + ? Number.parseInt(request.body.offset, 10) + : request.body.offset, workOrders: result.workOrders }); } diff --git a/handlers/workOrders-post/doSearchWorkOrders.ts b/handlers/workOrders-post/doSearchWorkOrders.ts index 7f35d38b..ee472965 100644 --- a/handlers/workOrders-post/doSearchWorkOrders.ts +++ b/handlers/workOrders-post/doSearchWorkOrders.ts @@ -2,22 +2,31 @@ import type { Request, Response } from 'express' import { type GetWorkOrdersFilters, + type GetWorkOrdersOptions, getWorkOrders } from '../../database/getWorkOrders.js' export default async function handler( - request: Request, + request: Request< + unknown, + unknown, + GetWorkOrdersFilters & GetWorkOrdersOptions + >, response: Response ): Promise { const result = await getWorkOrders(request.body as GetWorkOrdersFilters, { limit: request.body.limit, offset: request.body.offset, + includeBurialSites: true }) response.json({ count: result.count, - offset: Number.parseInt(request.body.offset, 10), + offset: + typeof request.body.offset === 'string' + ? Number.parseInt(request.body.offset, 10) + : request.body.offset, workOrders: result.workOrders }) } diff --git a/handlers/workOrders-post/doUpdateBurialSiteStatus.d.ts b/handlers/workOrders-post/doUpdateBurialSiteStatus.d.ts index ce9e06c2..46b52944 100644 --- a/handlers/workOrders-post/doUpdateBurialSiteStatus.d.ts +++ b/handlers/workOrders-post/doUpdateBurialSiteStatus.d.ts @@ -3,4 +3,4 @@ export default function handler(request: Request, response: Response): Promise; +}>, response: Response): void; diff --git a/handlers/workOrders-post/doUpdateBurialSiteStatus.js b/handlers/workOrders-post/doUpdateBurialSiteStatus.js index b5db744c..093ee628 100644 --- a/handlers/workOrders-post/doUpdateBurialSiteStatus.js +++ b/handlers/workOrders-post/doUpdateBurialSiteStatus.js @@ -1,8 +1,8 @@ import getBurialSites from '../../database/getBurialSites.js'; import { updateBurialSiteStatus } from '../../database/updateBurialSite.js'; -export default async function handler(request, response) { - const success = await updateBurialSiteStatus(request.body.burialSiteId, request.body.burialSiteStatusId, request.session.user); - const results = await getBurialSites({ +export default function handler(request, response) { + const success = updateBurialSiteStatus(request.body.burialSiteId, request.body.burialSiteStatusId, request.session.user); + const results = getBurialSites({ workOrderId: request.body.workOrderId }, { limit: -1, diff --git a/handlers/workOrders-post/doUpdateBurialSiteStatus.ts b/handlers/workOrders-post/doUpdateBurialSiteStatus.ts index af90fab5..216de649 100644 --- a/handlers/workOrders-post/doUpdateBurialSiteStatus.ts +++ b/handlers/workOrders-post/doUpdateBurialSiteStatus.ts @@ -3,27 +3,28 @@ import type { Request, Response } from 'express' import getBurialSites from '../../database/getBurialSites.js' import { updateBurialSiteStatus } from '../../database/updateBurialSite.js' -export default async function handler( +export default function handler( request: Request< unknown, unknown, { burialSiteId: string; burialSiteStatusId: string; workOrderId: string } >, response: Response -): Promise { - const success = await updateBurialSiteStatus( +): void { + const success = updateBurialSiteStatus( request.body.burialSiteId, request.body.burialSiteStatusId, request.session.user as User ) - const results = await getBurialSites( + const results = getBurialSites( { workOrderId: request.body.workOrderId }, { limit: -1, offset: 0, + includeContractCount: true } ) diff --git a/handlers/workOrders-post/doUpdateWorkOrder.d.ts b/handlers/workOrders-post/doUpdateWorkOrder.d.ts index 19d32e4d..e27aab26 100644 --- a/handlers/workOrders-post/doUpdateWorkOrder.d.ts +++ b/handlers/workOrders-post/doUpdateWorkOrder.d.ts @@ -1,2 +1,3 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +import { type UpdateWorkOrderForm } from '../../database/updateWorkOrder.js'; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/workOrders-post/doUpdateWorkOrder.js b/handlers/workOrders-post/doUpdateWorkOrder.js index fe58e0d3..81ef8fef 100644 --- a/handlers/workOrders-post/doUpdateWorkOrder.js +++ b/handlers/workOrders-post/doUpdateWorkOrder.js @@ -1,6 +1,6 @@ import updateWorkOrder from '../../database/updateWorkOrder.js'; -export default async function handler(request, response) { - const success = await updateWorkOrder(request.body, request.session.user); +export default function handler(request, response) { + const success = updateWorkOrder(request.body, request.session.user); response.json({ success, workOrderId: request.body.workOrderId diff --git a/handlers/workOrders-post/doUpdateWorkOrder.ts b/handlers/workOrders-post/doUpdateWorkOrder.ts index 877d8fc3..371a42d5 100644 --- a/handlers/workOrders-post/doUpdateWorkOrder.ts +++ b/handlers/workOrders-post/doUpdateWorkOrder.ts @@ -4,14 +4,11 @@ import updateWorkOrder, { type UpdateWorkOrderForm } from '../../database/updateWorkOrder.js' -export default async function handler( - request: Request, +export default function handler( + request: Request, response: Response -): Promise { - const success = await updateWorkOrder( - request.body as UpdateWorkOrderForm, - request.session.user as User - ) +): void { + const success = updateWorkOrder(request.body, request.session.user as User) response.json({ success, diff --git a/handlers/workOrders-post/doUpdateWorkOrderComment.d.ts b/handlers/workOrders-post/doUpdateWorkOrderComment.d.ts index 19d32e4d..e791c1bd 100644 --- a/handlers/workOrders-post/doUpdateWorkOrderComment.d.ts +++ b/handlers/workOrders-post/doUpdateWorkOrderComment.d.ts @@ -1,2 +1,5 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +import { type UpdateWorkOrderCommentForm } from '../../database/updateWorkOrderComment.js'; +export default function handler(request: Request, response: Response): void; diff --git a/handlers/workOrders-post/doUpdateWorkOrderComment.js b/handlers/workOrders-post/doUpdateWorkOrderComment.js index 81fb33cd..700d6177 100644 --- a/handlers/workOrders-post/doUpdateWorkOrderComment.js +++ b/handlers/workOrders-post/doUpdateWorkOrderComment.js @@ -1,8 +1,8 @@ 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); - const workOrderComments = await getWorkOrderComments(request.body.workOrderId); +export default function handler(request, response) { + const success = updateWorkOrderComment(request.body, request.session.user); + const workOrderComments = getWorkOrderComments(request.body.workOrderId); response.json({ success, workOrderComments diff --git a/handlers/workOrders-post/doUpdateWorkOrderComment.ts b/handlers/workOrders-post/doUpdateWorkOrderComment.ts index 117dc8a6..5c98f92b 100644 --- a/handlers/workOrders-post/doUpdateWorkOrderComment.ts +++ b/handlers/workOrders-post/doUpdateWorkOrderComment.ts @@ -5,18 +5,20 @@ import updateWorkOrderComment, { type UpdateWorkOrderCommentForm } from '../../database/updateWorkOrderComment.js' -export default async function handler( - request: Request, +export default function handler( + request: Request< + unknown, + unknown, + UpdateWorkOrderCommentForm & { workOrderId: string } + >, response: Response -): Promise { - const success = await updateWorkOrderComment( +): void { + const success = updateWorkOrderComment( request.body as UpdateWorkOrderCommentForm, request.session.user as User ) - const workOrderComments = await getWorkOrderComments( - request.body.workOrderId as string - ) + const workOrderComments = getWorkOrderComments(request.body.workOrderId) response.json({ success, diff --git a/handlers/workOrders-post/doUpdateWorkOrderMilestone.d.ts b/handlers/workOrders-post/doUpdateWorkOrderMilestone.d.ts index 19d32e4d..af775013 100644 --- a/handlers/workOrders-post/doUpdateWorkOrderMilestone.d.ts +++ b/handlers/workOrders-post/doUpdateWorkOrderMilestone.d.ts @@ -1,2 +1,5 @@ import type { Request, Response } from 'express'; -export default function handler(request: Request, response: Response): Promise; +import { type UpdateWorkOrderMilestoneForm } from '../../database/updateWorkOrderMilestone.js'; +export default function handler(request: Request, response: Response): Promise; diff --git a/handlers/workOrders-post/doUpdateWorkOrderMilestone.js b/handlers/workOrders-post/doUpdateWorkOrderMilestone.js index f3cfda21..33200145 100644 --- a/handlers/workOrders-post/doUpdateWorkOrderMilestone.js +++ b/handlers/workOrders-post/doUpdateWorkOrderMilestone.js @@ -1,7 +1,7 @@ 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 success = updateWorkOrderMilestone(request.body, request.session.user); const workOrderMilestones = await getWorkOrderMilestones({ workOrderId: request.body.workOrderId }, { diff --git a/handlers/workOrders-post/doUpdateWorkOrderMilestone.ts b/handlers/workOrders-post/doUpdateWorkOrderMilestone.ts index 455e3701..dd980f83 100644 --- a/handlers/workOrders-post/doUpdateWorkOrderMilestone.ts +++ b/handlers/workOrders-post/doUpdateWorkOrderMilestone.ts @@ -6,17 +6,21 @@ import updateWorkOrderMilestone, { } from '../../database/updateWorkOrderMilestone.js' export default async function handler( - request: Request, + request: Request< + unknown, + unknown, + UpdateWorkOrderMilestoneForm & { workOrderId: string } + >, response: Response ): Promise { - const success = await updateWorkOrderMilestone( + const success = updateWorkOrderMilestone( request.body as UpdateWorkOrderMilestoneForm, request.session.user as User ) const workOrderMilestones = await getWorkOrderMilestones( { - workOrderId: request.body.workOrderId as string + workOrderId: request.body.workOrderId }, { orderBy: 'completion' diff --git a/helpers/burialSites.helpers.d.ts b/helpers/burialSites.helpers.d.ts index 0dd6c061..dbeb6b0f 100644 --- a/helpers/burialSites.helpers.d.ts +++ b/helpers/burialSites.helpers.d.ts @@ -1,6 +1,6 @@ export declare function clearNextPreviousBurialSiteIdCache(burialSiteId?: number, relayMessage?: boolean): void; -export declare function getNextBurialSiteId(burialSiteId: number): Promise; -export declare function getPreviousBurialSiteId(burialSiteId: number): Promise; +export declare function getNextBurialSiteId(burialSiteId: number): number | undefined; +export declare function getPreviousBurialSiteId(burialSiteId: number): number | undefined; export declare function buildBurialSiteName(cemeteryKey: string | undefined, segments: { burialSiteNameSegment1?: string; burialSiteNameSegment2?: string; diff --git a/helpers/burialSites.helpers.js b/helpers/burialSites.helpers.js index e981a13f..0d9192c4 100644 --- a/helpers/burialSites.helpers.js +++ b/helpers/burialSites.helpers.js @@ -48,20 +48,20 @@ export function clearNextPreviousBurialSiteIdCache(burialSiteId = -1, relayMessa // Ignore } } -export async function getNextBurialSiteId(burialSiteId) { +export function getNextBurialSiteId(burialSiteId) { let nextBurialSiteId = nextBurialSiteIdCache.get(burialSiteId); if (nextBurialSiteId === undefined) { - nextBurialSiteId = await getNextBurialSiteIdFromDatabase(burialSiteId); + nextBurialSiteId = getNextBurialSiteIdFromDatabase(burialSiteId); if (nextBurialSiteId !== undefined) { cacheBurialSiteIds(burialSiteId, nextBurialSiteId); } } return nextBurialSiteId; } -export async function getPreviousBurialSiteId(burialSiteId) { +export function getPreviousBurialSiteId(burialSiteId) { let previousBurialSiteId = previousBurialSiteIdCache.get(burialSiteId); if (previousBurialSiteId === undefined) { - previousBurialSiteId = await getPreviousBurialSiteIdFromDatabase(burialSiteId); + previousBurialSiteId = getPreviousBurialSiteIdFromDatabase(burialSiteId); if (previousBurialSiteId !== undefined) { cacheBurialSiteIds(previousBurialSiteId, burialSiteId); } diff --git a/helpers/burialSites.helpers.ts b/helpers/burialSites.helpers.ts index 4b00563e..fd3ffb86 100644 --- a/helpers/burialSites.helpers.ts +++ b/helpers/burialSites.helpers.ts @@ -75,14 +75,14 @@ export function clearNextPreviousBurialSiteIdCache( } } -export async function getNextBurialSiteId( +export function getNextBurialSiteId( burialSiteId: number -): Promise { +): number | undefined { let nextBurialSiteId: number | undefined = nextBurialSiteIdCache.get(burialSiteId) if (nextBurialSiteId === undefined) { - nextBurialSiteId = await getNextBurialSiteIdFromDatabase(burialSiteId) + nextBurialSiteId = getNextBurialSiteIdFromDatabase(burialSiteId) if (nextBurialSiteId !== undefined) { cacheBurialSiteIds(burialSiteId, nextBurialSiteId) @@ -92,14 +92,14 @@ export async function getNextBurialSiteId( return nextBurialSiteId } -export async function getPreviousBurialSiteId( +export function getPreviousBurialSiteId( burialSiteId: number -): Promise { +): number | undefined { let previousBurialSiteId: number | undefined = previousBurialSiteIdCache.get(burialSiteId) if (previousBurialSiteId === undefined) { - previousBurialSiteId = await getPreviousBurialSiteIdFromDatabase(burialSiteId) + previousBurialSiteId = getPreviousBurialSiteIdFromDatabase(burialSiteId) if (previousBurialSiteId !== undefined) { cacheBurialSiteIds(previousBurialSiteId, burialSiteId) diff --git a/helpers/functions.cache.d.ts b/helpers/functions.cache.d.ts index 4d833f2e..143556d6 100644 --- a/helpers/functions.cache.d.ts +++ b/helpers/functions.cache.d.ts @@ -1,25 +1,25 @@ import type { BurialSiteStatus, BurialSiteType, CommittalType, ContractType, ContractTypeField, IntermentContainerType, WorkOrderMilestoneType, WorkOrderType } from '../types/record.types.js'; -export declare function getBurialSiteStatusByBurialSiteStatus(burialSiteStatus: string): Promise; -export declare function getBurialSiteStatusById(burialSiteStatusId: number): Promise; -export declare function getBurialSiteStatuses(): Promise; -export declare function getBurialSiteTypeById(burialSiteTypeId: number): Promise; -export declare function getBurialSiteTypes(): Promise; -export declare function getBurialSiteTypesByBurialSiteType(burialSiteType: string): Promise; -export declare function getAllContractTypeFields(): Promise; -export declare function getContractTypeByContractType(contractTypeString: string): Promise; -export declare function getContractTypeById(contractTypeId: number): Promise; -export declare function getContractTypePrintsById(contractTypeId: number): Promise; -export declare function getContractTypes(): Promise; -export declare function getIntermentContainerTypeById(intermentContainerTypeId: number): Promise; -export declare function getIntermentContainerTypes(): Promise; -export declare function getCommittalTypeById(committalTypeId: number): Promise; -export declare function getCommittalTypes(): Promise; -export declare function getWorkOrderTypeById(workOrderTypeId: number): Promise; -export declare function getWorkOrderTypes(): Promise; -export declare function getWorkOrderMilestoneTypeById(workOrderMilestoneTypeId: number): Promise; -export declare function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrderMilestoneTypeString: string): Promise; -export declare function getWorkOrderMilestoneTypes(): Promise; -export declare function preloadCaches(): Promise; +export declare function getBurialSiteStatusByBurialSiteStatus(burialSiteStatus: string): BurialSiteStatus | undefined; +export declare function getBurialSiteStatusById(burialSiteStatusId: number): BurialSiteStatus | undefined; +export declare function getBurialSiteStatuses(): BurialSiteStatus[]; +export declare function getBurialSiteTypeById(burialSiteTypeId: number): BurialSiteType | undefined; +export declare function getBurialSiteTypes(): BurialSiteType[]; +export declare function getBurialSiteTypesByBurialSiteType(burialSiteType: string): BurialSiteType | undefined; +export declare function getAllContractTypeFields(): ContractTypeField[]; +export declare function getContractTypeByContractType(contractTypeString: string): ContractType | undefined; +export declare function getContractTypeById(contractTypeId: number): ContractType | undefined; +export declare function getContractTypePrintsById(contractTypeId: number): string[]; +export declare function getContractTypes(): ContractType[]; +export declare function getIntermentContainerTypeById(intermentContainerTypeId: number): IntermentContainerType | undefined; +export declare function getIntermentContainerTypes(): IntermentContainerType[]; +export declare function getCommittalTypeById(committalTypeId: number): CommittalType | undefined; +export declare function getCommittalTypes(): CommittalType[]; +export declare function getWorkOrderTypeById(workOrderTypeId: number): WorkOrderType | undefined; +export declare function getWorkOrderTypes(): WorkOrderType[]; +export declare function getWorkOrderMilestoneTypeById(workOrderMilestoneTypeId: number): WorkOrderMilestoneType | undefined; +export declare function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrderMilestoneTypeString: string): WorkOrderMilestoneType | undefined; +export declare function getWorkOrderMilestoneTypes(): WorkOrderMilestoneType[]; +export declare function preloadCaches(): void; type CacheTableNames = 'BurialSiteStatuses' | 'BurialSiteTypeFields' | 'BurialSiteTypes' | 'CommittalTypes' | 'ContractTypeFields' | 'ContractTypePrints' | 'ContractTypes' | 'FeeCategories' | 'Fees' | 'IntermentContainerTypes' | 'WorkOrderMilestoneTypes' | 'WorkOrderTypes'; export declare function clearCacheByTableName(tableName: CacheTableNames, relayMessage?: boolean): void; export declare function clearCaches(): void; diff --git a/helpers/functions.cache.js b/helpers/functions.cache.js index 525d3cb0..b455cc1c 100644 --- a/helpers/functions.cache.js +++ b/helpers/functions.cache.js @@ -17,17 +17,17 @@ const debug = Debug(`${DEBUG_NAMESPACE}:functions.cache:${process.pid}`); * Burial Site Statuses */ let burialSiteStatuses; -export async function getBurialSiteStatusByBurialSiteStatus(burialSiteStatus) { - const cachedStatuses = await getBurialSiteStatuses(); +export function getBurialSiteStatusByBurialSiteStatus(burialSiteStatus) { + const cachedStatuses = getBurialSiteStatuses(); const statusLowerCase = burialSiteStatus.toLowerCase(); return cachedStatuses.find((currentStatus) => currentStatus.burialSiteStatus.toLowerCase() === statusLowerCase); } -export async function getBurialSiteStatusById(burialSiteStatusId) { - const cachedStatuses = await getBurialSiteStatuses(); +export function getBurialSiteStatusById(burialSiteStatusId) { + const cachedStatuses = getBurialSiteStatuses(); return cachedStatuses.find((currentStatus) => currentStatus.burialSiteStatusId === burialSiteStatusId); } -export async function getBurialSiteStatuses() { - burialSiteStatuses ??= await getBurialSiteStatusesFromDatabase(); +export function getBurialSiteStatuses() { + burialSiteStatuses ??= getBurialSiteStatusesFromDatabase(); return burialSiteStatuses; } function clearBurialSiteStatusesCache() { @@ -37,16 +37,16 @@ function clearBurialSiteStatusesCache() { * Burial Site Types */ let burialSiteTypes; -export async function getBurialSiteTypeById(burialSiteTypeId) { - const cachedTypes = await getBurialSiteTypes(); +export function getBurialSiteTypeById(burialSiteTypeId) { + const cachedTypes = getBurialSiteTypes(); return cachedTypes.find((currentType) => currentType.burialSiteTypeId === burialSiteTypeId); } -export async function getBurialSiteTypes() { - burialSiteTypes ??= await getBurialSiteTypesFromDatabase(); +export function getBurialSiteTypes() { + burialSiteTypes ??= getBurialSiteTypesFromDatabase(); return burialSiteTypes; } -export async function getBurialSiteTypesByBurialSiteType(burialSiteType) { - const cachedTypes = await getBurialSiteTypes(); +export function getBurialSiteTypesByBurialSiteType(burialSiteType) { + const cachedTypes = getBurialSiteTypes(); const typeLowerCase = burialSiteType.toLowerCase(); return cachedTypes.find((currentType) => currentType.burialSiteType.toLowerCase() === typeLowerCase); } @@ -58,21 +58,21 @@ function clearBurialSiteTypesCache() { */ let contractTypes; let allContractTypeFields; -export async function getAllContractTypeFields() { - allContractTypeFields ??= await getContractTypeFieldsFromDatabase(); +export function getAllContractTypeFields() { + allContractTypeFields ??= getContractTypeFieldsFromDatabase(); return allContractTypeFields; } -export async function getContractTypeByContractType(contractTypeString) { - const cachedTypes = await getContractTypes(); +export function getContractTypeByContractType(contractTypeString) { + const cachedTypes = getContractTypes(); const typeLowerCase = contractTypeString.toLowerCase(); return cachedTypes.find((currentType) => currentType.contractType.toLowerCase() === typeLowerCase); } -export async function getContractTypeById(contractTypeId) { - const cachedTypes = await getContractTypes(); +export function getContractTypeById(contractTypeId) { + const cachedTypes = getContractTypes(); return cachedTypes.find((currentType) => currentType.contractTypeId === contractTypeId); } -export async function getContractTypePrintsById(contractTypeId) { - const contractType = await getContractTypeById(contractTypeId); +export function getContractTypePrintsById(contractTypeId) { + const contractType = getContractTypeById(contractTypeId); if (contractType?.contractTypePrints === undefined || contractType.contractTypePrints.length === 0) { return []; @@ -82,8 +82,8 @@ export async function getContractTypePrintsById(contractTypeId) { } return contractType.contractTypePrints ?? []; } -export async function getContractTypes() { - contractTypes ??= await getContractTypesFromDatabase(); +export function getContractTypes() { + contractTypes ??= getContractTypesFromDatabase(); return contractTypes; } function clearContractTypesCache() { @@ -94,12 +94,12 @@ function clearContractTypesCache() { * Interment Container Types */ let intermentContainerTypes; -export async function getIntermentContainerTypeById(intermentContainerTypeId) { - const cachedContainerTypes = await getIntermentContainerTypes(); +export function getIntermentContainerTypeById(intermentContainerTypeId) { + const cachedContainerTypes = getIntermentContainerTypes(); return cachedContainerTypes.find((currentContainerType) => currentContainerType.intermentContainerTypeId === intermentContainerTypeId); } -export async function getIntermentContainerTypes() { - intermentContainerTypes ??= await getIntermentContainerTypesFromDatabase(); +export function getIntermentContainerTypes() { + intermentContainerTypes ??= getIntermentContainerTypesFromDatabase(); return intermentContainerTypes; } function clearIntermentContainerTypesCache() { @@ -109,12 +109,12 @@ function clearIntermentContainerTypesCache() { * Committal Types */ let committalTypes; -export async function getCommittalTypeById(committalTypeId) { - const cachedCommittalTypes = await getCommittalTypes(); +export function getCommittalTypeById(committalTypeId) { + const cachedCommittalTypes = getCommittalTypes(); return cachedCommittalTypes.find((currentCommittalType) => currentCommittalType.committalTypeId === committalTypeId); } -export async function getCommittalTypes() { - committalTypes ??= await getCommittalTypesFromDatabase(); +export function getCommittalTypes() { + committalTypes ??= getCommittalTypesFromDatabase(); return committalTypes; } function clearCommittalTypesCache() { @@ -124,12 +124,12 @@ function clearCommittalTypesCache() { * Work Order Types */ let workOrderTypes; -export async function getWorkOrderTypeById(workOrderTypeId) { - const cachedWorkOrderTypes = await getWorkOrderTypes(); +export function getWorkOrderTypeById(workOrderTypeId) { + const cachedWorkOrderTypes = getWorkOrderTypes(); return cachedWorkOrderTypes.find((currentWorkOrderType) => currentWorkOrderType.workOrderTypeId === workOrderTypeId); } -export async function getWorkOrderTypes() { - workOrderTypes ??= await getWorkOrderTypesFromDatabase(); +export function getWorkOrderTypes() { + workOrderTypes ??= getWorkOrderTypesFromDatabase(); return workOrderTypes; } function clearWorkOrderTypesCache() { @@ -139,19 +139,19 @@ function clearWorkOrderTypesCache() { * Work Order Milestone Types */ let workOrderMilestoneTypes; -export async function getWorkOrderMilestoneTypeById(workOrderMilestoneTypeId) { - const cachedWorkOrderMilestoneTypes = await getWorkOrderMilestoneTypes(); +export function getWorkOrderMilestoneTypeById(workOrderMilestoneTypeId) { + const cachedWorkOrderMilestoneTypes = getWorkOrderMilestoneTypes(); return cachedWorkOrderMilestoneTypes.find((currentWorkOrderMilestoneType) => currentWorkOrderMilestoneType.workOrderMilestoneTypeId === workOrderMilestoneTypeId); } -export async function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrderMilestoneTypeString) { - const cachedWorkOrderMilestoneTypes = await getWorkOrderMilestoneTypes(); +export function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrderMilestoneTypeString) { + const cachedWorkOrderMilestoneTypes = getWorkOrderMilestoneTypes(); const workOrderMilestoneTypeLowerCase = workOrderMilestoneTypeString.toLowerCase(); return cachedWorkOrderMilestoneTypes.find((currentWorkOrderMilestoneType) => currentWorkOrderMilestoneType.workOrderMilestoneType.toLowerCase() === workOrderMilestoneTypeLowerCase); } -export async function getWorkOrderMilestoneTypes() { - workOrderMilestoneTypes ??= await getWorkOrderMilestoneTypesFromDatabase(); +export function getWorkOrderMilestoneTypes() { + workOrderMilestoneTypes ??= getWorkOrderMilestoneTypesFromDatabase(); return workOrderMilestoneTypes; } function clearWorkOrderMilestoneTypesCache() { @@ -160,15 +160,15 @@ function clearWorkOrderMilestoneTypesCache() { /* * Cache Management */ -export async function preloadCaches() { +export function preloadCaches() { debug('Preloading caches'); - await getBurialSiteStatuses(); - await getBurialSiteTypes(); - await getContractTypes(); - await getCommittalTypes(); - await getIntermentContainerTypes(); - await getWorkOrderTypes(); - await getWorkOrderMilestoneTypes(); + getBurialSiteStatuses(); + getBurialSiteTypes(); + getContractTypes(); + getCommittalTypes(); + getIntermentContainerTypes(); + getWorkOrderTypes(); + getWorkOrderMilestoneTypes(); } export function clearCacheByTableName(tableName, relayMessage = true) { switch (tableName) { diff --git a/helpers/functions.cache.ts b/helpers/functions.cache.ts index ec819f35..0c682f7a 100644 --- a/helpers/functions.cache.ts +++ b/helpers/functions.cache.ts @@ -39,10 +39,10 @@ const debug = Debug(`${DEBUG_NAMESPACE}:functions.cache:${process.pid}`) let burialSiteStatuses: BurialSiteStatus[] | undefined -export async function getBurialSiteStatusByBurialSiteStatus( +export function getBurialSiteStatusByBurialSiteStatus( burialSiteStatus: string -): Promise { - const cachedStatuses = await getBurialSiteStatuses() +): BurialSiteStatus | undefined { + const cachedStatuses = getBurialSiteStatuses() const statusLowerCase = burialSiteStatus.toLowerCase() @@ -52,18 +52,18 @@ export async function getBurialSiteStatusByBurialSiteStatus( ) } -export async function getBurialSiteStatusById( +export function getBurialSiteStatusById( burialSiteStatusId: number -): Promise { - const cachedStatuses = await getBurialSiteStatuses() +): BurialSiteStatus | undefined { + const cachedStatuses = getBurialSiteStatuses() return cachedStatuses.find( (currentStatus) => currentStatus.burialSiteStatusId === burialSiteStatusId ) } -export async function getBurialSiteStatuses(): Promise { - burialSiteStatuses ??= await getBurialSiteStatusesFromDatabase() +export function getBurialSiteStatuses(): BurialSiteStatus[] { + burialSiteStatuses ??= getBurialSiteStatusesFromDatabase() return burialSiteStatuses } @@ -77,25 +77,25 @@ function clearBurialSiteStatusesCache(): void { let burialSiteTypes: BurialSiteType[] | undefined -export async function getBurialSiteTypeById( +export function getBurialSiteTypeById( burialSiteTypeId: number -): Promise { - const cachedTypes = await getBurialSiteTypes() +): BurialSiteType | undefined { + const cachedTypes = getBurialSiteTypes() return cachedTypes.find( (currentType) => currentType.burialSiteTypeId === burialSiteTypeId ) } -export async function getBurialSiteTypes(): Promise { - burialSiteTypes ??= await getBurialSiteTypesFromDatabase() +export function getBurialSiteTypes(): BurialSiteType[] { + burialSiteTypes ??= getBurialSiteTypesFromDatabase() return burialSiteTypes } -export async function getBurialSiteTypesByBurialSiteType( +export function getBurialSiteTypesByBurialSiteType( burialSiteType: string -): Promise { - const cachedTypes = await getBurialSiteTypes() +): BurialSiteType | undefined { + const cachedTypes = getBurialSiteTypes() const typeLowerCase = burialSiteType.toLowerCase() @@ -115,15 +115,15 @@ function clearBurialSiteTypesCache(): void { let contractTypes: ContractType[] | undefined let allContractTypeFields: ContractTypeField[] | undefined -export async function getAllContractTypeFields(): Promise { - allContractTypeFields ??= await getContractTypeFieldsFromDatabase() +export function getAllContractTypeFields(): ContractTypeField[] { + allContractTypeFields ??= getContractTypeFieldsFromDatabase() return allContractTypeFields } -export async function getContractTypeByContractType( +export function getContractTypeByContractType( contractTypeString: string -): Promise { - const cachedTypes = await getContractTypes() +): ContractType | undefined { + const cachedTypes = getContractTypes() const typeLowerCase = contractTypeString.toLowerCase() @@ -132,20 +132,18 @@ export async function getContractTypeByContractType( ) } -export async function getContractTypeById( +export function getContractTypeById( contractTypeId: number -): Promise { - const cachedTypes = await getContractTypes() +): ContractType | undefined { + const cachedTypes = getContractTypes() return cachedTypes.find( (currentType) => currentType.contractTypeId === contractTypeId ) } -export async function getContractTypePrintsById( - contractTypeId: number -): Promise { - const contractType = await getContractTypeById(contractTypeId) +export function getContractTypePrintsById(contractTypeId: number): string[] { + const contractType = getContractTypeById(contractTypeId) if ( contractType?.contractTypePrints === undefined || @@ -161,8 +159,8 @@ export async function getContractTypePrintsById( return contractType.contractTypePrints ?? [] } -export async function getContractTypes(): Promise { - contractTypes ??= await getContractTypesFromDatabase() +export function getContractTypes(): ContractType[] { + contractTypes ??= getContractTypesFromDatabase() return contractTypes } @@ -177,10 +175,10 @@ function clearContractTypesCache(): void { let intermentContainerTypes: IntermentContainerType[] | undefined -export async function getIntermentContainerTypeById( +export function getIntermentContainerTypeById( intermentContainerTypeId: number -): Promise { - const cachedContainerTypes = await getIntermentContainerTypes() +): IntermentContainerType | undefined { + const cachedContainerTypes = getIntermentContainerTypes() return cachedContainerTypes.find( (currentContainerType) => @@ -188,10 +186,8 @@ export async function getIntermentContainerTypeById( ) } -export async function getIntermentContainerTypes(): Promise< - IntermentContainerType[] -> { - intermentContainerTypes ??= await getIntermentContainerTypesFromDatabase() +export function getIntermentContainerTypes(): IntermentContainerType[] { + intermentContainerTypes ??= getIntermentContainerTypesFromDatabase() return intermentContainerTypes } @@ -205,10 +201,10 @@ function clearIntermentContainerTypesCache(): void { let committalTypes: CommittalType[] | undefined -export async function getCommittalTypeById( +export function getCommittalTypeById( committalTypeId: number -): Promise { - const cachedCommittalTypes = await getCommittalTypes() +): CommittalType | undefined { + const cachedCommittalTypes = getCommittalTypes() return cachedCommittalTypes.find( (currentCommittalType) => @@ -216,8 +212,8 @@ export async function getCommittalTypeById( ) } -export async function getCommittalTypes(): Promise { - committalTypes ??= await getCommittalTypesFromDatabase() +export function getCommittalTypes(): CommittalType[] { + committalTypes ??= getCommittalTypesFromDatabase() return committalTypes } @@ -231,10 +227,10 @@ function clearCommittalTypesCache(): void { let workOrderTypes: WorkOrderType[] | undefined -export async function getWorkOrderTypeById( +export function getWorkOrderTypeById( workOrderTypeId: number -): Promise { - const cachedWorkOrderTypes = await getWorkOrderTypes() +): WorkOrderType | undefined { + const cachedWorkOrderTypes = getWorkOrderTypes() return cachedWorkOrderTypes.find( (currentWorkOrderType) => @@ -242,8 +238,8 @@ export async function getWorkOrderTypeById( ) } -export async function getWorkOrderTypes(): Promise { - workOrderTypes ??= await getWorkOrderTypesFromDatabase() +export function getWorkOrderTypes(): WorkOrderType[] { + workOrderTypes ??= getWorkOrderTypesFromDatabase() return workOrderTypes } @@ -257,10 +253,10 @@ function clearWorkOrderTypesCache(): void { let workOrderMilestoneTypes: WorkOrderMilestoneType[] | undefined -export async function getWorkOrderMilestoneTypeById( +export function getWorkOrderMilestoneTypeById( workOrderMilestoneTypeId: number -): Promise { - const cachedWorkOrderMilestoneTypes = await getWorkOrderMilestoneTypes() +): WorkOrderMilestoneType | undefined { + const cachedWorkOrderMilestoneTypes = getWorkOrderMilestoneTypes() return cachedWorkOrderMilestoneTypes.find( (currentWorkOrderMilestoneType) => @@ -269,10 +265,10 @@ export async function getWorkOrderMilestoneTypeById( ) } -export async function getWorkOrderMilestoneTypeByWorkOrderMilestoneType( +export function getWorkOrderMilestoneTypeByWorkOrderMilestoneType( workOrderMilestoneTypeString: string -): Promise { - const cachedWorkOrderMilestoneTypes = await getWorkOrderMilestoneTypes() +): WorkOrderMilestoneType | undefined { + const cachedWorkOrderMilestoneTypes = getWorkOrderMilestoneTypes() const workOrderMilestoneTypeLowerCase = workOrderMilestoneTypeString.toLowerCase() @@ -284,14 +280,11 @@ export async function getWorkOrderMilestoneTypeByWorkOrderMilestoneType( ) } -export async function getWorkOrderMilestoneTypes(): Promise< - WorkOrderMilestoneType[] -> { - workOrderMilestoneTypes ??= await getWorkOrderMilestoneTypesFromDatabase() +export function getWorkOrderMilestoneTypes(): WorkOrderMilestoneType[] { + workOrderMilestoneTypes ??= getWorkOrderMilestoneTypesFromDatabase() return workOrderMilestoneTypes } - function clearWorkOrderMilestoneTypesCache(): void { workOrderMilestoneTypes = undefined } @@ -300,15 +293,15 @@ function clearWorkOrderMilestoneTypesCache(): void { * Cache Management */ -export async function preloadCaches(): Promise { +export function preloadCaches(): void { debug('Preloading caches') - await getBurialSiteStatuses() - await getBurialSiteTypes() - await getContractTypes() - await getCommittalTypes() - await getIntermentContainerTypes() - await getWorkOrderTypes() - await getWorkOrderMilestoneTypes() + getBurialSiteStatuses() + getBurialSiteTypes() + getContractTypes() + getCommittalTypes() + getIntermentContainerTypes() + getWorkOrderTypes() + getWorkOrderMilestoneTypes() } type CacheTableNames = diff --git a/package-lock.json b/package-lock.json index 35e70490..ec9510b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,6 @@ "@cityssm/utils-datetime": "^1.3.0", "@fortawesome/fontawesome-free": "^6.7.2", "activedirectory2": "^2.2.0", - "better-sqlite-pool": "^0.3.2", "better-sqlite3": "^11.9.1", "bulma-tooltip": "^3.0.2", "camelcase": "^8.0.0", @@ -3057,14 +3056,6 @@ "tweetnacl": "^0.14.3" } }, - "node_modules/better-sqlite-pool": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/better-sqlite-pool/-/better-sqlite-pool-0.3.2.tgz", - "integrity": "sha512-vxDciEbhENe5g5z1JGBftx/AFeiGwkkLgey7H2LnY011GxSgUw27yNuGY3eo5dy+6u8uUjRXg8/ZV7dJx1kXuQ==", - "engines": { - "node": ">=10.0" - } - }, "node_modules/better-sqlite3": { "version": "11.9.1", "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-11.9.1.tgz", diff --git a/package.json b/package.json index aedd0ef1..2423e5b4 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,6 @@ "@cityssm/utils-datetime": "^1.3.0", "@fortawesome/fontawesome-free": "^6.7.2", "activedirectory2": "^2.2.0", - "better-sqlite-pool": "^0.3.2", "better-sqlite3": "^11.9.1", "bulma-tooltip": "^3.0.2", "camelcase": "^8.0.0",