diff --git a/handlers/admin-post/doAddFee.js b/handlers/admin-post/doAddFee.js index fd592402..b4c95c18 100644 --- a/handlers/admin-post/doAddFee.js +++ b/handlers/admin-post/doAddFee.js @@ -1,7 +1,7 @@ import { addFee } from "../../helpers/lotOccupancyDB/addFee.js"; import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js"; export const handler = async (request, response) => { - const feeId = addFee(request.body, request.session); + const feeId = addFee({ feeForm: request.body, requestSession: request.session }); const feeCategories = getFeeCategories({}, { includeFees: true }); diff --git a/handlers/admin-post/doAddFee.ts b/handlers/admin-post/doAddFee.ts index 8e94e922..60777585 100644 --- a/handlers/admin-post/doAddFee.ts +++ b/handlers/admin-post/doAddFee.ts @@ -5,7 +5,7 @@ import { addFee } from "../../helpers/lotOccupancyDB/addFee.js"; import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js"; export const handler: RequestHandler = async (request, response) => { - const feeId = addFee(request.body, request.session); + const feeId = addFee({ feeForm: request.body, requestSession: request.session }); const feeCategories = getFeeCategories( {}, diff --git a/helpers/lotOccupancyDB/addFee.d.ts b/helpers/lotOccupancyDB/addFee.d.ts index 937be70a..f7372ef8 100644 --- a/helpers/lotOccupancyDB/addFee.d.ts +++ b/helpers/lotOccupancyDB/addFee.d.ts @@ -14,5 +14,5 @@ interface AddFeeForm { isRequired: "" | "1"; orderNumber?: number; } -export declare const addFee: (feeForm: AddFeeForm, requestSession: recordTypes.PartialSession) => number; +export declare function addFee(feeForm: AddFeeForm, requestSession: recordTypes.PartialSession): number; export default addFee; diff --git a/helpers/lotOccupancyDB/addFee.js b/helpers/lotOccupancyDB/addFee.js index 09b6507a..acf5c4fa 100644 --- a/helpers/lotOccupancyDB/addFee.js +++ b/helpers/lotOccupancyDB/addFee.js @@ -1,21 +1,22 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const addFee = (feeForm, requestSession) => { +export function addFee(feeForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("insert into Fees (" + - "feeCategoryId, feeName, feeDescription," + - " occupancyTypeId, lotTypeId," + - " feeAmount, feeFunction," + - " taxAmount, taxPercentage," + - " includeQuantity, quantityUnit," + - " isRequired, orderNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)") + .prepare(`insert into Fees ( + feeCategoryId, + feeName, feeDescription, + occupancyTypeId, lotTypeId, + feeAmount, feeFunction, + taxAmount, taxPercentage, + includeQuantity, quantityUnit, + isRequired, orderNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) .run(feeForm.feeCategoryId, feeForm.feeName, feeForm.feeDescription, feeForm.occupancyTypeId || undefined, feeForm.lotTypeId || undefined, feeForm.feeAmount || undefined, feeForm.feeFunction || undefined, feeForm.taxAmount || undefined, feeForm.taxPercentage || undefined, feeForm.includeQuantity ? 1 : 0, feeForm.quantityUnit, feeForm.isRequired ? 1 : 0, feeForm.orderNumber || -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); database.close(); return result.lastInsertRowid; -}; +} export default addFee; diff --git a/helpers/lotOccupancyDB/addFee.ts b/helpers/lotOccupancyDB/addFee.ts index 345da39b..bfb4667c 100644 --- a/helpers/lotOccupancyDB/addFee.ts +++ b/helpers/lotOccupancyDB/addFee.ts @@ -19,26 +19,24 @@ interface AddFeeForm { orderNumber?: number; } -export const addFee = ( - feeForm: AddFeeForm, - requestSession: recordTypes.PartialSession -): number => { +export function addFee(feeForm: AddFeeForm, requestSession: recordTypes.PartialSession): number { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "insert into Fees (" + - "feeCategoryId, feeName, feeDescription," + - " occupancyTypeId, lotTypeId," + - " feeAmount, feeFunction," + - " taxAmount, taxPercentage," + - " includeQuantity, quantityUnit," + - " isRequired, orderNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" + `insert into Fees ( + feeCategoryId, + feeName, feeDescription, + occupancyTypeId, lotTypeId, + feeAmount, feeFunction, + taxAmount, taxPercentage, + includeQuantity, quantityUnit, + isRequired, orderNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` ) .run( feeForm.feeCategoryId, @@ -63,6 +61,6 @@ export const addFee = ( database.close(); return result.lastInsertRowid as number; -}; +} export default addFee; diff --git a/helpers/lotOccupancyDB/addFeeCategory.d.ts b/helpers/lotOccupancyDB/addFeeCategory.d.ts index 1023ec23..4f9391ce 100644 --- a/helpers/lotOccupancyDB/addFeeCategory.d.ts +++ b/helpers/lotOccupancyDB/addFeeCategory.d.ts @@ -3,5 +3,5 @@ interface AddFeeCategoryForm { feeCategory: string; orderNumber?: number; } -export declare const addFeeCategory: (feeCategoryForm: AddFeeCategoryForm, requestSession: recordTypes.PartialSession) => number; +export declare function addFeeCategory(feeCategoryForm: AddFeeCategoryForm, requestSession: recordTypes.PartialSession): number; export default addFeeCategory; diff --git a/helpers/lotOccupancyDB/addFeeCategory.js b/helpers/lotOccupancyDB/addFeeCategory.js index 7d2bd35e..02293e37 100644 --- a/helpers/lotOccupancyDB/addFeeCategory.js +++ b/helpers/lotOccupancyDB/addFeeCategory.js @@ -1,16 +1,16 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const addFeeCategory = (feeCategoryForm, requestSession) => { +export function addFeeCategory(feeCategoryForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("insert into FeeCategories (" + - "feeCategory, orderNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?)") + .prepare(`insert into FeeCategories ( + feeCategory, orderNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?)`) .run(feeCategoryForm.feeCategory, feeCategoryForm.orderNumber || -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); database.close(); return result.lastInsertRowid; -}; +} export default addFeeCategory; diff --git a/helpers/lotOccupancyDB/addFeeCategory.ts b/helpers/lotOccupancyDB/addFeeCategory.ts index 1503e17e..71febad1 100644 --- a/helpers/lotOccupancyDB/addFeeCategory.ts +++ b/helpers/lotOccupancyDB/addFeeCategory.ts @@ -8,21 +8,21 @@ interface AddFeeCategoryForm { orderNumber?: number; } -export const addFeeCategory = ( +export function addFeeCategory( feeCategoryForm: AddFeeCategoryForm, requestSession: recordTypes.PartialSession -): number => { +): number { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "insert into FeeCategories (" + - "feeCategory, orderNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?)" + `insert into FeeCategories ( + feeCategory, orderNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?)` ) .run( feeCategoryForm.feeCategory, @@ -36,6 +36,6 @@ export const addFeeCategory = ( database.close(); return result.lastInsertRowid as number; -}; +} export default addFeeCategory; diff --git a/helpers/lotOccupancyDB/addLot.d.ts b/helpers/lotOccupancyDB/addLot.d.ts index df637278..0c6a5396 100644 --- a/helpers/lotOccupancyDB/addLot.d.ts +++ b/helpers/lotOccupancyDB/addLot.d.ts @@ -10,5 +10,5 @@ interface AddLotForm { lotTypeFieldIds?: string; [lotFieldValue_lotTypeFieldId: string]: unknown; } -export declare const addLot: (lotForm: AddLotForm, requestSession: recordTypes.PartialSession) => number; +export declare function addLot(lotForm: AddLotForm, requestSession: recordTypes.PartialSession): number; export default addLot; diff --git a/helpers/lotOccupancyDB/addLot.js b/helpers/lotOccupancyDB/addLot.js index 749b8cad..debd36a3 100644 --- a/helpers/lotOccupancyDB/addLot.js +++ b/helpers/lotOccupancyDB/addLot.js @@ -1,17 +1,17 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { addOrUpdateLotField } from "./addOrUpdateLotField.js"; -export const addLot = (lotForm, requestSession) => { +export function addLot(lotForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("insert into Lots (" + - "lotName, lotTypeId, lotStatusId," + - " mapId, mapKey," + - " lotLatitude, lotLongitude," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)") + .prepare(`insert into Lots ( + lotName, lotTypeId, lotStatusId, + mapId, mapKey, + lotLatitude, lotLongitude, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) .run(lotForm.lotName, lotForm.lotTypeId, lotForm.lotStatusId === "" ? undefined : lotForm.lotStatusId, lotForm.mapId === "" ? undefined : lotForm.mapId, lotForm.mapKey, lotForm.lotLatitude === "" ? undefined : lotForm.lotLatitude, lotForm.lotLongitude === "" ? undefined : lotForm.lotLongitude, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); const lotId = result.lastInsertRowid; const lotTypeFieldIds = (lotForm.lotTypeFieldIds || "").split(","); @@ -27,5 +27,5 @@ export const addLot = (lotForm, requestSession) => { } database.close(); return lotId; -}; +} export default addLot; diff --git a/helpers/lotOccupancyDB/addLot.ts b/helpers/lotOccupancyDB/addLot.ts index 5dda11c0..9f320811 100644 --- a/helpers/lotOccupancyDB/addLot.ts +++ b/helpers/lotOccupancyDB/addLot.ts @@ -21,20 +21,20 @@ interface AddLotForm { [lotFieldValue_lotTypeFieldId: string]: unknown; } -export const addLot = (lotForm: AddLotForm, requestSession: recordTypes.PartialSession): number => { +export function addLot(lotForm: AddLotForm, requestSession: recordTypes.PartialSession): number { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "insert into Lots (" + - "lotName, lotTypeId, lotStatusId," + - " mapId, mapKey," + - " lotLatitude, lotLongitude," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" + `insert into Lots ( + lotName, lotTypeId, lotStatusId, + mapId, mapKey, + lotLatitude, lotLongitude, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` ) .run( lotForm.lotName, @@ -73,6 +73,6 @@ export const addLot = (lotForm: AddLotForm, requestSession: recordTypes.PartialS database.close(); return lotId; -}; +} export default addLot; diff --git a/helpers/lotOccupancyDB/addLotComment.d.ts b/helpers/lotOccupancyDB/addLotComment.d.ts index 4b6b2634..68f65c6e 100644 --- a/helpers/lotOccupancyDB/addLotComment.d.ts +++ b/helpers/lotOccupancyDB/addLotComment.d.ts @@ -3,5 +3,5 @@ interface AddLotCommentForm { lotId: string; lotComment: string; } -export declare const addLotComment: (lotCommentForm: AddLotCommentForm, requestSession: recordTypes.PartialSession) => number; +export declare function addLotComment(lotCommentForm: AddLotCommentForm, requestSession: recordTypes.PartialSession): number; export default addLotComment; diff --git a/helpers/lotOccupancyDB/addLotComment.js b/helpers/lotOccupancyDB/addLotComment.js index 49cb4ad5..f34d7187 100644 --- a/helpers/lotOccupancyDB/addLotComment.js +++ b/helpers/lotOccupancyDB/addLotComment.js @@ -1,17 +1,18 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import * as dateTimeFunctions from "@cityssm/expressjs-server-js/dateTimeFns.js"; -export const addLotComment = (lotCommentForm, requestSession) => { +export function addLotComment(lotCommentForm, requestSession) { const database = sqlite(databasePath); const rightNow = new Date(); const result = database - .prepare("insert into LotComments (" + - "lotId, lotCommentDate, lotCommentTime, lotComment," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?)") + .prepare(`insert into LotComments ( + lotId, + lotCommentDate, lotCommentTime, lotComment, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?)`) .run(lotCommentForm.lotId, dateTimeFunctions.dateToInteger(rightNow), dateTimeFunctions.dateToTimeInteger(rightNow), lotCommentForm.lotComment, requestSession.user.userName, rightNow.getTime(), requestSession.user.userName, rightNow.getTime()); database.close(); return result.lastInsertRowid; -}; +} export default addLotComment; diff --git a/helpers/lotOccupancyDB/addLotComment.ts b/helpers/lotOccupancyDB/addLotComment.ts index 3bd34e67..c2a6ce10 100644 --- a/helpers/lotOccupancyDB/addLotComment.ts +++ b/helpers/lotOccupancyDB/addLotComment.ts @@ -11,21 +11,22 @@ interface AddLotCommentForm { lotComment: string; } -export const addLotComment = ( +export function addLotComment( lotCommentForm: AddLotCommentForm, requestSession: recordTypes.PartialSession -): number => { +): number { const database = sqlite(databasePath); const rightNow = new Date(); const result = database .prepare( - "insert into LotComments (" + - "lotId, lotCommentDate, lotCommentTime, lotComment," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?)" + `insert into LotComments ( + lotId, + lotCommentDate, lotCommentTime, lotComment, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?)` ) .run( lotCommentForm.lotId, @@ -41,6 +42,6 @@ export const addLotComment = ( database.close(); return result.lastInsertRowid as number; -}; +} export default addLotComment; diff --git a/helpers/lotOccupancyDB/addLotOccupancy.d.ts b/helpers/lotOccupancyDB/addLotOccupancy.d.ts index 7b40d3ec..ec8c3e63 100644 --- a/helpers/lotOccupancyDB/addLotOccupancy.d.ts +++ b/helpers/lotOccupancyDB/addLotOccupancy.d.ts @@ -18,5 +18,5 @@ interface AddLotOccupancyForm { occupantEmailAddress?: string; occupantComment?: string; } -export declare const addLotOccupancy: (lotOccupancyForm: AddLotOccupancyForm, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database) => number; +export declare function addLotOccupancy(lotOccupancyForm: AddLotOccupancyForm, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database): number; export default addLotOccupancy; diff --git a/helpers/lotOccupancyDB/addLotOccupancy.js b/helpers/lotOccupancyDB/addLotOccupancy.js index c0d65150..65dc3231 100644 --- a/helpers/lotOccupancyDB/addLotOccupancy.js +++ b/helpers/lotOccupancyDB/addLotOccupancy.js @@ -3,7 +3,7 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import * as dateTimeFunctions from "@cityssm/expressjs-server-js/dateTimeFns.js"; import { addOrUpdateLotOccupancyField } from "./addOrUpdateLotOccupancyField.js"; import { addLotOccupancyOccupant } from "./addLotOccupancyOccupant.js"; -export const addLotOccupancy = (lotOccupancyForm, requestSession, connectedDatabase) => { +export function addLotOccupancy(lotOccupancyForm, requestSession, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath); const rightNowMillis = Date.now(); const occupancyStartDate = dateTimeFunctions.dateStringToInteger(lotOccupancyForm.occupancyStartDateString); @@ -11,12 +11,12 @@ export const addLotOccupancy = (lotOccupancyForm, requestSession, connectedDatab console.error(lotOccupancyForm); } const result = database - .prepare("insert into LotOccupancies (" + - "occupancyTypeId, lotId," + - " occupancyStartDate, occupancyEndDate," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?)") + .prepare(`insert into LotOccupancies ( + occupancyTypeId, lotId, + occupancyStartDate, occupancyEndDate, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?)`) .run(lotOccupancyForm.occupancyTypeId, lotOccupancyForm.lotId === "" ? undefined : lotOccupancyForm.lotId, occupancyStartDate, lotOccupancyForm.occupancyEndDateString === "" ? undefined : dateTimeFunctions.dateStringToInteger(lotOccupancyForm.occupancyEndDateString), requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); @@ -51,5 +51,5 @@ export const addLotOccupancy = (lotOccupancyForm, requestSession, connectedDatab database.close(); } return lotOccupancyId; -}; +} export default addLotOccupancy; diff --git a/helpers/lotOccupancyDB/addLotOccupancy.ts b/helpers/lotOccupancyDB/addLotOccupancy.ts index 4b58d359..a2edc4a7 100644 --- a/helpers/lotOccupancyDB/addLotOccupancy.ts +++ b/helpers/lotOccupancyDB/addLotOccupancy.ts @@ -31,11 +31,11 @@ interface AddLotOccupancyForm { occupantComment?: string; } -export const addLotOccupancy = ( +export function addLotOccupancy( lotOccupancyForm: AddLotOccupancyForm, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database -): number => { +): number { const database = connectedDatabase || sqlite(databasePath); const rightNowMillis = Date.now(); @@ -50,12 +50,12 @@ export const addLotOccupancy = ( const result = database .prepare( - "insert into LotOccupancies (" + - "occupancyTypeId, lotId," + - " occupancyStartDate, occupancyEndDate," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?)" + `insert into LotOccupancies ( + occupancyTypeId, lotId, + occupancyStartDate, occupancyEndDate, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?)` ) .run( lotOccupancyForm.occupancyTypeId, @@ -117,6 +117,6 @@ export const addLotOccupancy = ( } return lotOccupancyId; -}; +} export default addLotOccupancy; diff --git a/helpers/lotOccupancyDB/addLotOccupancyComment.d.ts b/helpers/lotOccupancyDB/addLotOccupancyComment.d.ts index da115ef5..ae12d134 100644 --- a/helpers/lotOccupancyDB/addLotOccupancyComment.d.ts +++ b/helpers/lotOccupancyDB/addLotOccupancyComment.d.ts @@ -5,5 +5,5 @@ interface AddLotOccupancyCommentForm { lotOccupancyCommentTimeString?: string; lotOccupancyComment: string; } -export declare const addLotOccupancyComment: (commentForm: AddLotOccupancyCommentForm, requestSession: recordTypes.PartialSession) => number; +export declare function addLotOccupancyComment(commentForm: AddLotOccupancyCommentForm, requestSession: recordTypes.PartialSession): number; export default addLotOccupancyComment; diff --git a/helpers/lotOccupancyDB/addLotOccupancyComment.js b/helpers/lotOccupancyDB/addLotOccupancyComment.js index ceb4a950..48b29f29 100644 --- a/helpers/lotOccupancyDB/addLotOccupancyComment.js +++ b/helpers/lotOccupancyDB/addLotOccupancyComment.js @@ -1,7 +1,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { dateStringToInteger, dateToInteger, dateToTimeInteger, timeStringToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js"; -export const addLotOccupancyComment = (commentForm, requestSession) => { +export function addLotOccupancyComment(commentForm, requestSession) { const rightNow = new Date(); let lotOccupancyCommentDate; let lotOccupancyCommentTime; @@ -15,13 +15,15 @@ export const addLotOccupancyComment = (commentForm, requestSession) => { } const database = sqlite(databasePath); const result = database - .prepare("insert into LotOccupancyComments (" + - "lotOccupancyId, lotOccupancyCommentDate, lotOccupancyCommentTime, lotOccupancyComment," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?)") + .prepare(`insert into LotOccupancyComments ( + lotOccupancyId, + lotOccupancyCommentDate, lotOccupancyCommentTime, + lotOccupancyComment, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?)`) .run(commentForm.lotOccupancyId, lotOccupancyCommentDate, lotOccupancyCommentTime, commentForm.lotOccupancyComment, requestSession.user.userName, rightNow.getTime(), requestSession.user.userName, rightNow.getTime()); database.close(); return result.lastInsertRowid; -}; +} export default addLotOccupancyComment; diff --git a/helpers/lotOccupancyDB/addLotOccupancyComment.ts b/helpers/lotOccupancyDB/addLotOccupancyComment.ts index ff61c7e5..d3ed6de5 100644 --- a/helpers/lotOccupancyDB/addLotOccupancyComment.ts +++ b/helpers/lotOccupancyDB/addLotOccupancyComment.ts @@ -18,22 +18,18 @@ interface AddLotOccupancyCommentForm { lotOccupancyComment: string; } -export const addLotOccupancyComment = ( +export function addLotOccupancyComment( commentForm: AddLotOccupancyCommentForm, requestSession: recordTypes.PartialSession -): number => { +): number { const rightNow = new Date(); let lotOccupancyCommentDate: number; let lotOccupancyCommentTime: number; if (commentForm.lotOccupancyCommentDateString) { - lotOccupancyCommentDate = dateStringToInteger( - commentForm.lotOccupancyCommentDateString - ); - lotOccupancyCommentTime = timeStringToInteger( - commentForm.lotOccupancyCommentTimeString - ); + lotOccupancyCommentDate = dateStringToInteger(commentForm.lotOccupancyCommentDateString); + lotOccupancyCommentTime = timeStringToInteger(commentForm.lotOccupancyCommentTimeString); } else { lotOccupancyCommentDate = dateToInteger(rightNow); lotOccupancyCommentTime = dateToTimeInteger(rightNow); @@ -43,11 +39,13 @@ export const addLotOccupancyComment = ( const result = database .prepare( - "insert into LotOccupancyComments (" + - "lotOccupancyId, lotOccupancyCommentDate, lotOccupancyCommentTime, lotOccupancyComment," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?)" + `insert into LotOccupancyComments ( + lotOccupancyId, + lotOccupancyCommentDate, lotOccupancyCommentTime, + lotOccupancyComment, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?)` ) .run( commentForm.lotOccupancyId, @@ -63,6 +61,6 @@ export const addLotOccupancyComment = ( database.close(); return result.lastInsertRowid as number; -}; +} export default addLotOccupancyComment; diff --git a/helpers/lotOccupancyDB/addLotOccupancyFee.d.ts b/helpers/lotOccupancyDB/addLotOccupancyFee.d.ts index 18855df4..ae25ea64 100644 --- a/helpers/lotOccupancyDB/addLotOccupancyFee.d.ts +++ b/helpers/lotOccupancyDB/addLotOccupancyFee.d.ts @@ -6,5 +6,5 @@ interface AddLotOccupancyFeeForm { feeAmount?: number | string; taxAmount?: number | string; } -export declare const addLotOccupancyFee: (lotOccupancyFeeForm: AddLotOccupancyFeeForm, requestSession: recordTypes.PartialSession) => boolean; +export declare function addLotOccupancyFee(lotOccupancyFeeForm: AddLotOccupancyFeeForm, requestSession: recordTypes.PartialSession): boolean; export default addLotOccupancyFee; diff --git a/helpers/lotOccupancyDB/addLotOccupancyFee.js b/helpers/lotOccupancyDB/addLotOccupancyFee.js index 24651684..9fc4631d 100644 --- a/helpers/lotOccupancyDB/addLotOccupancyFee.js +++ b/helpers/lotOccupancyDB/addLotOccupancyFee.js @@ -3,7 +3,7 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { calculateFeeAmount, calculateTaxAmount } from "../functions.fee.js"; import { getFee } from "./getFee.js"; import { getLotOccupancy } from "./getLotOccupancy.js"; -export const addLotOccupancyFee = (lotOccupancyFeeForm, requestSession) => { +export function addLotOccupancyFee(lotOccupancyFeeForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); let feeAmount; @@ -25,29 +25,28 @@ export const addLotOccupancyFee = (lotOccupancyFeeForm, requestSession) => { taxAmount = calculateTaxAmount(fee, feeAmount); } const record = database - .prepare("select feeAmount, taxAmount, recordDelete_timeMillis" + - " from LotOccupancyFees" + - " where lotOccupancyId = ?" + - " and feeId = ?") + .prepare(`select feeAmount, taxAmount, recordDelete_timeMillis + from LotOccupancyFees + where lotOccupancyId = ? + and feeId = ?`) .get(lotOccupancyFeeForm.lotOccupancyId, lotOccupancyFeeForm.feeId); if (record) { if (record.recordDelete_timeMillis) { database - .prepare("delete from LotOccupancyFees" + - " where recordDelete_timeMillis is not null" + - " and lotOccupancyId = ?" + - " and feeId = ?") + .prepare(`delete from LotOccupancyFees + where recordDelete_timeMillis is not null + and lotOccupancyId = ? + and feeId = ?`) .run(lotOccupancyFeeForm.lotOccupancyId, lotOccupancyFeeForm.feeId); } - else if (record.feeAmount === feeAmount && - record.taxAmount === taxAmount) { + else if (record.feeAmount === feeAmount && record.taxAmount === taxAmount) { database - .prepare("update LotOccupancyFees" + - " set quantity = quantity + ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where lotOccupancyId = ?" + - " and feeId = ?") + .prepare(`update LotOccupancyFees + set quantity = quantity + ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotOccupancyId = ? + and feeId = ?`) .run(lotOccupancyFeeForm.quantity, requestSession.user.userName, rightNowMillis, lotOccupancyFeeForm.lotOccupancyId, lotOccupancyFeeForm.feeId); database.close(); return true; @@ -57,28 +56,28 @@ export const addLotOccupancyFee = (lotOccupancyFeeForm, requestSession) => { ? Number.parseFloat(lotOccupancyFeeForm.quantity) : lotOccupancyFeeForm.quantity; database - .prepare("update LotOccupancyFees" + - " set feeAmount = (feeAmount * quantity) + ?," + - " taxAmount = (taxAmount * quantity) + ?," + - " quantity = 1," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where lotOccupancyId = ?" + - " and feeId = ?") + .prepare(`update LotOccupancyFees + set feeAmount = (feeAmount * quantity) + ?, + taxAmount = (taxAmount * quantity) + ?, + quantity = 1, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotOccupancyId = ? + and feeId = ?`) .run(feeAmount * quantity, taxAmount * quantity, requestSession.user.userName, rightNowMillis, lotOccupancyFeeForm.lotOccupancyId, lotOccupancyFeeForm.feeId); database.close(); return true; } } const result = database - .prepare("insert into LotOccupancyFees (" + - "lotOccupancyId, feeId," + - " quantity, feeAmount, taxAmount," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?, ?)") + .prepare(`insert into LotOccupancyFees ( + lotOccupancyId, feeId, + quantity, feeAmount, taxAmount, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?)`) .run(lotOccupancyFeeForm.lotOccupancyId, lotOccupancyFeeForm.feeId, lotOccupancyFeeForm.quantity, feeAmount, taxAmount, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); database.close(); return result.changes > 0; -}; +} export default addLotOccupancyFee; diff --git a/helpers/lotOccupancyDB/addLotOccupancyFee.ts b/helpers/lotOccupancyDB/addLotOccupancyFee.ts index 916f66c6..b3d3e48c 100644 --- a/helpers/lotOccupancyDB/addLotOccupancyFee.ts +++ b/helpers/lotOccupancyDB/addLotOccupancyFee.ts @@ -18,16 +18,15 @@ interface AddLotOccupancyFeeForm { taxAmount?: number | string; } -export const addLotOccupancyFee = ( +export function addLotOccupancyFee( lotOccupancyFeeForm: AddLotOccupancyFeeForm, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); // Calculate fee and tax (if not set) - let feeAmount: number; let taxAmount: number; @@ -41,9 +40,7 @@ export const addLotOccupancyFee = ( ? Number.parseFloat(lotOccupancyFeeForm.taxAmount) : taxAmount; } else { - const lotOccupancy = getLotOccupancy( - lotOccupancyFeeForm.lotOccupancyId - ); + const lotOccupancy = getLotOccupancy(lotOccupancyFeeForm.lotOccupancyId); const fee = getFee(lotOccupancyFeeForm.feeId); feeAmount = calculateFeeAmount(fee, lotOccupancy); @@ -51,17 +48,16 @@ export const addLotOccupancyFee = ( } // Check if record already exists - const record: { feeAmount?: number; taxAmount?: number; recordDelete_timeMillis?: number; } = database .prepare( - "select feeAmount, taxAmount, recordDelete_timeMillis" + - " from LotOccupancyFees" + - " where lotOccupancyId = ?" + - " and feeId = ?" + `select feeAmount, taxAmount, recordDelete_timeMillis + from LotOccupancyFees + where lotOccupancyId = ? + and feeId = ?` ) .get(lotOccupancyFeeForm.lotOccupancyId, lotOccupancyFeeForm.feeId); @@ -69,27 +65,21 @@ export const addLotOccupancyFee = ( if (record.recordDelete_timeMillis) { database .prepare( - "delete from LotOccupancyFees" + - " where recordDelete_timeMillis is not null" + - " and lotOccupancyId = ?" + - " and feeId = ?" + `delete from LotOccupancyFees + where recordDelete_timeMillis is not null + and lotOccupancyId = ? + and feeId = ?` ) - .run( - lotOccupancyFeeForm.lotOccupancyId, - lotOccupancyFeeForm.feeId - ); - } else if ( - record.feeAmount === feeAmount && - record.taxAmount === taxAmount - ) { + .run(lotOccupancyFeeForm.lotOccupancyId, lotOccupancyFeeForm.feeId); + } else if (record.feeAmount === feeAmount && record.taxAmount === taxAmount) { database .prepare( - "update LotOccupancyFees" + - " set quantity = quantity + ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where lotOccupancyId = ?" + - " and feeId = ?" + `update LotOccupancyFees + set quantity = quantity + ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotOccupancyId = ? + and feeId = ?` ) .run( lotOccupancyFeeForm.quantity, @@ -110,14 +100,14 @@ export const addLotOccupancyFee = ( database .prepare( - "update LotOccupancyFees" + - " set feeAmount = (feeAmount * quantity) + ?," + - " taxAmount = (taxAmount * quantity) + ?," + - " quantity = 1," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where lotOccupancyId = ?" + - " and feeId = ?" + `update LotOccupancyFees + set feeAmount = (feeAmount * quantity) + ?, + taxAmount = (taxAmount * quantity) + ?, + quantity = 1, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotOccupancyId = ? + and feeId = ?` ) .run( feeAmount * quantity, @@ -135,15 +125,14 @@ export const addLotOccupancyFee = ( } // Create new record - const result = database .prepare( - "insert into LotOccupancyFees (" + - "lotOccupancyId, feeId," + - " quantity, feeAmount, taxAmount," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?, ?)" + `insert into LotOccupancyFees ( + lotOccupancyId, feeId, + quantity, feeAmount, taxAmount, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?)` ) .run( lotOccupancyFeeForm.lotOccupancyId, @@ -160,6 +149,6 @@ export const addLotOccupancyFee = ( database.close(); return result.changes > 0; -}; +} export default addLotOccupancyFee; diff --git a/helpers/lotOccupancyDB/addLotOccupancyOccupant.d.ts b/helpers/lotOccupancyDB/addLotOccupancyOccupant.d.ts index 197a601e..7183d7ef 100644 --- a/helpers/lotOccupancyDB/addLotOccupancyOccupant.d.ts +++ b/helpers/lotOccupancyDB/addLotOccupancyOccupant.d.ts @@ -13,5 +13,5 @@ interface AddLotOccupancyOccupantForm { occupantEmailAddress: string; occupantComment?: string; } -export declare const addLotOccupancyOccupant: (lotOccupancyOccupantForm: AddLotOccupancyOccupantForm, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database) => number; +export declare function addLotOccupancyOccupant(lotOccupancyOccupantForm: AddLotOccupancyOccupantForm, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database): number; export default addLotOccupancyOccupant; diff --git a/helpers/lotOccupancyDB/addLotOccupancyOccupant.js b/helpers/lotOccupancyDB/addLotOccupancyOccupant.js index 3df97fe5..6da977a7 100644 --- a/helpers/lotOccupancyDB/addLotOccupancyOccupant.js +++ b/helpers/lotOccupancyDB/addLotOccupancyOccupant.js @@ -1,35 +1,35 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const addLotOccupancyOccupant = (lotOccupancyOccupantForm, requestSession, connectedDatabase) => { +export function addLotOccupancyOccupant(lotOccupancyOccupantForm, requestSession, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath); let lotOccupantIndex = 0; const maxIndexResult = database - .prepare("select lotOccupantIndex" + - " from LotOccupancyOccupants" + - " where lotOccupancyId = ?" + - " order by lotOccupantIndex desc" + - " limit 1") + .prepare(`select lotOccupantIndex + from LotOccupancyOccupants + where lotOccupancyId = ? + order by lotOccupantIndex desc + limit 1`) .get(lotOccupancyOccupantForm.lotOccupancyId); if (maxIndexResult) { lotOccupantIndex = maxIndexResult.lotOccupantIndex + 1; } const rightNowMillis = Date.now(); database - .prepare("insert into LotOccupancyOccupants (" + - "lotOccupancyId, lotOccupantIndex," + - " occupantName," + - " occupantAddress1, occupantAddress2," + - " occupantCity, occupantProvince, occupantPostalCode," + - " occupantPhoneNumber, occupantEmailAddress," + - " occupantComment," + - " lotOccupantTypeId," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)") + .prepare(`insert into LotOccupancyOccupants ( + lotOccupancyId, lotOccupantIndex, + occupantName, + occupantAddress1, occupantAddress2, + occupantCity, occupantProvince, occupantPostalCode, + occupantPhoneNumber, occupantEmailAddress, + occupantComment, + lotOccupantTypeId, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) .run(lotOccupancyOccupantForm.lotOccupancyId, lotOccupantIndex, lotOccupancyOccupantForm.occupantName, lotOccupancyOccupantForm.occupantAddress1, lotOccupancyOccupantForm.occupantAddress2, lotOccupancyOccupantForm.occupantCity, lotOccupancyOccupantForm.occupantProvince, lotOccupancyOccupantForm.occupantPostalCode, lotOccupancyOccupantForm.occupantPhoneNumber, lotOccupancyOccupantForm.occupantEmailAddress, lotOccupancyOccupantForm.occupantComment || "", lotOccupancyOccupantForm.lotOccupantTypeId, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); if (!connectedDatabase) { database.close(); } return lotOccupantIndex; -}; +} export default addLotOccupancyOccupant; diff --git a/helpers/lotOccupancyDB/addLotOccupancyOccupant.ts b/helpers/lotOccupancyDB/addLotOccupancyOccupant.ts index 7a47751a..5db534d6 100644 --- a/helpers/lotOccupancyDB/addLotOccupancyOccupant.ts +++ b/helpers/lotOccupancyDB/addLotOccupancyOccupant.ts @@ -18,22 +18,22 @@ interface AddLotOccupancyOccupantForm { occupantComment?: string; } -export const addLotOccupancyOccupant = ( +export function addLotOccupancyOccupant( lotOccupancyOccupantForm: AddLotOccupancyOccupantForm, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database -): number => { +): number { const database = connectedDatabase || sqlite(databasePath); let lotOccupantIndex = 0; const maxIndexResult = database .prepare( - "select lotOccupantIndex" + - " from LotOccupancyOccupants" + - " where lotOccupancyId = ?" + - " order by lotOccupantIndex desc" + - " limit 1" + `select lotOccupantIndex + from LotOccupancyOccupants + where lotOccupancyId = ? + order by lotOccupantIndex desc + limit 1` ) .get(lotOccupancyOccupantForm.lotOccupancyId); @@ -45,17 +45,17 @@ export const addLotOccupancyOccupant = ( database .prepare( - "insert into LotOccupancyOccupants (" + - "lotOccupancyId, lotOccupantIndex," + - " occupantName," + - " occupantAddress1, occupantAddress2," + - " occupantCity, occupantProvince, occupantPostalCode," + - " occupantPhoneNumber, occupantEmailAddress," + - " occupantComment," + - " lotOccupantTypeId," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" + `insert into LotOccupancyOccupants ( + lotOccupancyId, lotOccupantIndex, + occupantName, + occupantAddress1, occupantAddress2, + occupantCity, occupantProvince, occupantPostalCode, + occupantPhoneNumber, occupantEmailAddress, + occupantComment, + lotOccupantTypeId, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` ) .run( lotOccupancyOccupantForm.lotOccupancyId, @@ -81,6 +81,6 @@ export const addLotOccupancyOccupant = ( } return lotOccupantIndex; -}; +} export default addLotOccupancyOccupant; diff --git a/helpers/lotOccupancyDB/addLotOccupancyTransaction.d.ts b/helpers/lotOccupancyDB/addLotOccupancyTransaction.d.ts index ebb864ba..ee8f1bd6 100644 --- a/helpers/lotOccupancyDB/addLotOccupancyTransaction.d.ts +++ b/helpers/lotOccupancyDB/addLotOccupancyTransaction.d.ts @@ -7,5 +7,5 @@ interface AddLotOccupancyTransactionForm { externalReceiptNumber: string; transactionNote: string; } -export declare const addLotOccupancyTransaction: (lotOccupancyTransactionForm: AddLotOccupancyTransactionForm, requestSession: recordTypes.PartialSession) => number; +export declare function addLotOccupancyTransaction(lotOccupancyTransactionForm: AddLotOccupancyTransactionForm, requestSession: recordTypes.PartialSession): number; export default addLotOccupancyTransaction; diff --git a/helpers/lotOccupancyDB/addLotOccupancyTransaction.js b/helpers/lotOccupancyDB/addLotOccupancyTransaction.js index d21e3461..42e8422d 100644 --- a/helpers/lotOccupancyDB/addLotOccupancyTransaction.js +++ b/helpers/lotOccupancyDB/addLotOccupancyTransaction.js @@ -1,15 +1,15 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { dateStringToInteger, dateToInteger, dateToTimeInteger, timeStringToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js"; -export const addLotOccupancyTransaction = (lotOccupancyTransactionForm, requestSession) => { +export function addLotOccupancyTransaction(lotOccupancyTransactionForm, requestSession) { const database = sqlite(databasePath); let transactionIndex = 0; const maxIndexResult = database - .prepare("select transactionIndex" + - " from LotOccupancyTransactions" + - " where lotOccupancyId = ?" + - " order by transactionIndex desc" + - " limit 1") + .prepare(`select transactionIndex + from LotOccupancyTransactions + where lotOccupancyId = ? + order by transactionIndex desc + limit 1`) .get(lotOccupancyTransactionForm.lotOccupancyId); if (maxIndexResult) { transactionIndex = maxIndexResult.transactionIndex + 1; @@ -22,16 +22,15 @@ export const addLotOccupancyTransaction = (lotOccupancyTransactionForm, requestS ? timeStringToInteger(lotOccupancyTransactionForm.transactionTimeString) : dateToTimeInteger(rightNow); database - .prepare("insert into LotOccupancyTransactions (" + - "lotOccupancyId, transactionIndex," + - " transactionDate, transactionTime," + - " transactionAmount, externalReceiptNumber," + - " transactionNote," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)") + .prepare(`insert into LotOccupancyTransactions ( + lotOccupancyId, transactionIndex, + transactionDate, transactionTime, + transactionAmount, externalReceiptNumber, transactionNote, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) .run(lotOccupancyTransactionForm.lotOccupancyId, transactionIndex, transactionDate, transactionTime, lotOccupancyTransactionForm.transactionAmount, lotOccupancyTransactionForm.externalReceiptNumber, lotOccupancyTransactionForm.transactionNote, requestSession.user.userName, rightNow.getTime(), requestSession.user.userName, rightNow.getTime()); database.close(); return transactionIndex; -}; +} export default addLotOccupancyTransaction; diff --git a/helpers/lotOccupancyDB/addLotOccupancyTransaction.ts b/helpers/lotOccupancyDB/addLotOccupancyTransaction.ts index d393b3db..a33d2321 100644 --- a/helpers/lotOccupancyDB/addLotOccupancyTransaction.ts +++ b/helpers/lotOccupancyDB/addLotOccupancyTransaction.ts @@ -20,21 +20,21 @@ interface AddLotOccupancyTransactionForm { transactionNote: string; } -export const addLotOccupancyTransaction = ( +export function addLotOccupancyTransaction( lotOccupancyTransactionForm: AddLotOccupancyTransactionForm, requestSession: recordTypes.PartialSession -): number => { +): number { const database = sqlite(databasePath); let transactionIndex = 0; const maxIndexResult = database .prepare( - "select transactionIndex" + - " from LotOccupancyTransactions" + - " where lotOccupancyId = ?" + - " order by transactionIndex desc" + - " limit 1" + `select transactionIndex + from LotOccupancyTransactions + where lotOccupancyId = ? + order by transactionIndex desc + limit 1` ) .get(lotOccupancyTransactionForm.lotOccupancyId); @@ -54,14 +54,13 @@ export const addLotOccupancyTransaction = ( database .prepare( - "insert into LotOccupancyTransactions (" + - "lotOccupancyId, transactionIndex," + - " transactionDate, transactionTime," + - " transactionAmount, externalReceiptNumber," + - " transactionNote," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" + `insert into LotOccupancyTransactions ( + lotOccupancyId, transactionIndex, + transactionDate, transactionTime, + transactionAmount, externalReceiptNumber, transactionNote, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` ) .run( lotOccupancyTransactionForm.lotOccupancyId, @@ -80,6 +79,6 @@ export const addLotOccupancyTransaction = ( database.close(); return transactionIndex; -}; +} export default addLotOccupancyTransaction; diff --git a/helpers/lotOccupancyDB/addLotOccupantType.d.ts b/helpers/lotOccupancyDB/addLotOccupantType.d.ts index d0a3f431..14ffe3b0 100644 --- a/helpers/lotOccupancyDB/addLotOccupantType.d.ts +++ b/helpers/lotOccupancyDB/addLotOccupantType.d.ts @@ -4,5 +4,5 @@ interface AddLotOccupantTypeForm { fontAwesomeIconClass?: string; orderNumber?: number; } -export declare const addLotOccupantType: (lotOccupantTypeForm: AddLotOccupantTypeForm, requestSession: recordTypes.PartialSession) => number; +export declare function addLotOccupantType(lotOccupantTypeForm: AddLotOccupantTypeForm, requestSession: recordTypes.PartialSession): number; export default addLotOccupantType; diff --git a/helpers/lotOccupancyDB/addLotOccupantType.js b/helpers/lotOccupancyDB/addLotOccupantType.js index ad2814d7..e68620b7 100644 --- a/helpers/lotOccupancyDB/addLotOccupantType.js +++ b/helpers/lotOccupancyDB/addLotOccupantType.js @@ -1,18 +1,18 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotOccupantTypesCache } from "../functions.cache.js"; -export const addLotOccupantType = (lotOccupantTypeForm, requestSession) => { +export function addLotOccupantType(lotOccupantTypeForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("insert into LotOccupantTypes (" + - "lotOccupantType, fontAwesomeIconClass, orderNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?)") + .prepare(`insert into LotOccupantTypes ( + lotOccupantType, fontAwesomeIconClass, orderNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?)`) .run(lotOccupantTypeForm.lotOccupantType, lotOccupantTypeForm.fontAwesomeIconClass || "", lotOccupantTypeForm.orderNumber || -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); database.close(); clearLotOccupantTypesCache(); return result.lastInsertRowid; -}; +} export default addLotOccupantType; diff --git a/helpers/lotOccupancyDB/addLotOccupantType.ts b/helpers/lotOccupancyDB/addLotOccupantType.ts index de986f5c..58441fd2 100644 --- a/helpers/lotOccupancyDB/addLotOccupantType.ts +++ b/helpers/lotOccupancyDB/addLotOccupantType.ts @@ -11,21 +11,21 @@ interface AddLotOccupantTypeForm { orderNumber?: number; } -export const addLotOccupantType = ( +export function addLotOccupantType( lotOccupantTypeForm: AddLotOccupantTypeForm, requestSession: recordTypes.PartialSession -): number => { +): number { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "insert into LotOccupantTypes (" + - "lotOccupantType, fontAwesomeIconClass, orderNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?)" + `insert into LotOccupantTypes ( + lotOccupantType, fontAwesomeIconClass, orderNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?)` ) .run( lotOccupantTypeForm.lotOccupantType, @@ -42,6 +42,6 @@ export const addLotOccupantType = ( clearLotOccupantTypesCache(); return result.lastInsertRowid as number; -}; +} export default addLotOccupantType; diff --git a/helpers/lotOccupancyDB/addLotStatus.d.ts b/helpers/lotOccupancyDB/addLotStatus.d.ts index 412caf55..434c6e68 100644 --- a/helpers/lotOccupancyDB/addLotStatus.d.ts +++ b/helpers/lotOccupancyDB/addLotStatus.d.ts @@ -3,5 +3,5 @@ interface AddLotStatusForm { lotStatus: string; orderNumber?: number; } -export declare const addLotStatus: (lotStatusForm: AddLotStatusForm, requestSession: recordTypes.PartialSession) => number; +export declare function addLotStatus(lotStatusForm: AddLotStatusForm, requestSession: recordTypes.PartialSession): number; export default addLotStatus; diff --git a/helpers/lotOccupancyDB/addLotStatus.js b/helpers/lotOccupancyDB/addLotStatus.js index 304559ad..6379a841 100644 --- a/helpers/lotOccupancyDB/addLotStatus.js +++ b/helpers/lotOccupancyDB/addLotStatus.js @@ -1,18 +1,18 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotStatusesCache } from "../functions.cache.js"; -export const addLotStatus = (lotStatusForm, requestSession) => { +export function addLotStatus(lotStatusForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("insert into LotStatuses (" + - "lotStatus, orderNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?)") + .prepare(`insert into LotStatuses ( + lotStatus, orderNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?)`) .run(lotStatusForm.lotStatus, lotStatusForm.orderNumber || -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); database.close(); clearLotStatusesCache(); return result.lastInsertRowid; -}; +} export default addLotStatus; diff --git a/helpers/lotOccupancyDB/addLotStatus.ts b/helpers/lotOccupancyDB/addLotStatus.ts index 5441bedb..66c2cff9 100644 --- a/helpers/lotOccupancyDB/addLotStatus.ts +++ b/helpers/lotOccupancyDB/addLotStatus.ts @@ -10,21 +10,21 @@ interface AddLotStatusForm { orderNumber?: number; } -export const addLotStatus = ( +export function addLotStatus( lotStatusForm: AddLotStatusForm, requestSession: recordTypes.PartialSession -): number => { +): number { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "insert into LotStatuses (" + - "lotStatus, orderNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?)" + `insert into LotStatuses ( + lotStatus, orderNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?)` ) .run( lotStatusForm.lotStatus, @@ -40,6 +40,6 @@ export const addLotStatus = ( clearLotStatusesCache(); return result.lastInsertRowid as number; -}; +} export default addLotStatus; diff --git a/helpers/lotOccupancyDB/addLotType.d.ts b/helpers/lotOccupancyDB/addLotType.d.ts index ed767ac1..30cfba2e 100644 --- a/helpers/lotOccupancyDB/addLotType.d.ts +++ b/helpers/lotOccupancyDB/addLotType.d.ts @@ -3,5 +3,5 @@ interface AddLotTypeForm { lotType: string; orderNumber?: number; } -export declare const addLotType: (lotTypeForm: AddLotTypeForm, requestSession: recordTypes.PartialSession) => number; +export declare function addLotType(lotTypeForm: AddLotTypeForm, requestSession: recordTypes.PartialSession): number; export default addLotType; diff --git a/helpers/lotOccupancyDB/addLotType.js b/helpers/lotOccupancyDB/addLotType.js index 555caec9..9a58685c 100644 --- a/helpers/lotOccupancyDB/addLotType.js +++ b/helpers/lotOccupancyDB/addLotType.js @@ -1,18 +1,18 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotTypesCache } from "../functions.cache.js"; -export const addLotType = (lotTypeForm, requestSession) => { +export function addLotType(lotTypeForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("insert into LotTypes (" + - "lotType, orderNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?)") + .prepare(`insert into LotTypes ( + lotType, orderNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?)`) .run(lotTypeForm.lotType, lotTypeForm.orderNumber || -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); database.close(); clearLotTypesCache(); return result.lastInsertRowid; -}; +} export default addLotType; diff --git a/helpers/lotOccupancyDB/addLotType.ts b/helpers/lotOccupancyDB/addLotType.ts index 32bc2428..5c237932 100644 --- a/helpers/lotOccupancyDB/addLotType.ts +++ b/helpers/lotOccupancyDB/addLotType.ts @@ -11,21 +11,21 @@ interface AddLotTypeForm { orderNumber?: number; } -export const addLotType = ( +export function addLotType( lotTypeForm: AddLotTypeForm, requestSession: recordTypes.PartialSession -): number => { +): number { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "insert into LotTypes (" + - "lotType, orderNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?)" + `insert into LotTypes ( + lotType, orderNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?)` ) .run( lotTypeForm.lotType, @@ -41,6 +41,6 @@ export const addLotType = ( clearLotTypesCache(); return result.lastInsertRowid as number; -}; +} export default addLotType; diff --git a/helpers/lotOccupancyDB/addLotTypeField.d.ts b/helpers/lotOccupancyDB/addLotTypeField.d.ts index 12e69860..fb1ef32b 100644 --- a/helpers/lotOccupancyDB/addLotTypeField.d.ts +++ b/helpers/lotOccupancyDB/addLotTypeField.d.ts @@ -9,5 +9,5 @@ interface AddLotTypeFieldForm { maximumLength: string | number; orderNumber?: number; } -export declare const addLotTypeField: (lotTypeFieldForm: AddLotTypeFieldForm, requestSession: recordTypes.PartialSession) => number; +export declare function addLotTypeField(lotTypeFieldForm: AddLotTypeFieldForm, requestSession: recordTypes.PartialSession): number; export default addLotTypeField; diff --git a/helpers/lotOccupancyDB/addLotTypeField.js b/helpers/lotOccupancyDB/addLotTypeField.js index ee7e712e..ae6bd5bf 100644 --- a/helpers/lotOccupancyDB/addLotTypeField.js +++ b/helpers/lotOccupancyDB/addLotTypeField.js @@ -1,21 +1,21 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotTypesCache } from "../functions.cache.js"; -export const addLotTypeField = (lotTypeFieldForm, requestSession) => { +export function addLotTypeField(lotTypeFieldForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("insert into LotTypeFields (" + - "lotTypeId, lotTypeField," + - " lotTypeFieldValues, isRequired, pattern," + - " minimumLength, maximumLength," + - " orderNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)") + .prepare(`insert into LotTypeFields ( + lotTypeId, lotTypeField, lotTypeFieldValues, + isRequired, pattern, + minimumLength, maximumLength, + orderNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) .run(lotTypeFieldForm.lotTypeId, lotTypeFieldForm.lotTypeField, lotTypeFieldForm.lotTypeFieldValues || "", lotTypeFieldForm.isRequired ? 1 : 0, lotTypeFieldForm.pattern || "", lotTypeFieldForm.minimumLength || 0, lotTypeFieldForm.maximumLength || 100, lotTypeFieldForm.orderNumber || -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); database.close(); clearLotTypesCache(); return result.lastInsertRowid; -}; +} export default addLotTypeField; diff --git a/helpers/lotOccupancyDB/addLotTypeField.ts b/helpers/lotOccupancyDB/addLotTypeField.ts index 97f4202b..b7c01035 100644 --- a/helpers/lotOccupancyDB/addLotTypeField.ts +++ b/helpers/lotOccupancyDB/addLotTypeField.ts @@ -16,24 +16,24 @@ interface AddLotTypeFieldForm { orderNumber?: number; } -export const addLotTypeField = ( +export function addLotTypeField( lotTypeFieldForm: AddLotTypeFieldForm, requestSession: recordTypes.PartialSession -): number => { +): number { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "insert into LotTypeFields (" + - "lotTypeId, lotTypeField," + - " lotTypeFieldValues, isRequired, pattern," + - " minimumLength, maximumLength," + - " orderNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" + `insert into LotTypeFields ( + lotTypeId, lotTypeField, lotTypeFieldValues, + isRequired, pattern, + minimumLength, maximumLength, + orderNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` ) .run( lotTypeFieldForm.lotTypeId, @@ -55,6 +55,6 @@ export const addLotTypeField = ( clearLotTypesCache(); return result.lastInsertRowid as number; -}; +} export default addLotTypeField; diff --git a/helpers/lotOccupancyDB/addMap.d.ts b/helpers/lotOccupancyDB/addMap.d.ts index 77588578..47be9a34 100644 --- a/helpers/lotOccupancyDB/addMap.d.ts +++ b/helpers/lotOccupancyDB/addMap.d.ts @@ -12,5 +12,5 @@ interface AddMapForm { mapPostalCode: string; mapPhoneNumber: string; } -export declare const addMap: (mapForm: AddMapForm, requestSession: recordTypes.PartialSession) => number; +export declare function addMap(mapForm: AddMapForm, requestSession: recordTypes.PartialSession): number; export default addMap; diff --git a/helpers/lotOccupancyDB/addMap.js b/helpers/lotOccupancyDB/addMap.js index 0f14b7be..9d3540aa 100644 --- a/helpers/lotOccupancyDB/addMap.js +++ b/helpers/lotOccupancyDB/addMap.js @@ -1,18 +1,20 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const addMap = (mapForm, requestSession) => { +export function addMap(mapForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("insert into Maps (" + - "mapName, mapDescription," + - " mapSVG, mapLatitude, mapLongitude," + - " mapAddress1, mapAddress2, mapCity, mapProvince, mapPostalCode, mapPhoneNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)") + .prepare(`insert into Maps ( + mapName, mapDescription, + mapSVG, mapLatitude, mapLongitude, + mapAddress1, mapAddress2, + mapCity, mapProvince, mapPostalCode, + mapPhoneNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) .run(mapForm.mapName, mapForm.mapDescription, mapForm.mapSVG, mapForm.mapLatitude === "" ? undefined : mapForm.mapLatitude, mapForm.mapLongitude === "" ? undefined : mapForm.mapLongitude, mapForm.mapAddress1, mapForm.mapAddress2, mapForm.mapCity, mapForm.mapProvince, mapForm.mapPostalCode, mapForm.mapPhoneNumber, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); database.close(); return result.lastInsertRowid; -}; +} export default addMap; diff --git a/helpers/lotOccupancyDB/addMap.ts b/helpers/lotOccupancyDB/addMap.ts index 0aedc70f..49e50f69 100644 --- a/helpers/lotOccupancyDB/addMap.ts +++ b/helpers/lotOccupancyDB/addMap.ts @@ -18,23 +18,22 @@ interface AddMapForm { mapPhoneNumber: string; } -export const addMap = ( - mapForm: AddMapForm, - requestSession: recordTypes.PartialSession -): number => { +export function addMap(mapForm: AddMapForm, requestSession: recordTypes.PartialSession): number { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "insert into Maps (" + - "mapName, mapDescription," + - " mapSVG, mapLatitude, mapLongitude," + - " mapAddress1, mapAddress2, mapCity, mapProvince, mapPostalCode, mapPhoneNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" + `insert into Maps ( + mapName, mapDescription, + mapSVG, mapLatitude, mapLongitude, + mapAddress1, mapAddress2, + mapCity, mapProvince, mapPostalCode, + mapPhoneNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` ) .run( mapForm.mapName, @@ -57,6 +56,6 @@ export const addMap = ( database.close(); return result.lastInsertRowid as number; -}; +} export default addMap; diff --git a/helpers/lotOccupancyDB/addOccupancyType.d.ts b/helpers/lotOccupancyDB/addOccupancyType.d.ts index 6f0e9efe..38e4789f 100644 --- a/helpers/lotOccupancyDB/addOccupancyType.d.ts +++ b/helpers/lotOccupancyDB/addOccupancyType.d.ts @@ -3,5 +3,5 @@ interface AddOccupancyTypeForm { occupancyType: string; orderNumber?: number; } -export declare const addOccupancyType: (occupancyTypeForm: AddOccupancyTypeForm, requestSession: recordTypes.PartialSession) => number; +export declare function addOccupancyType(occupancyTypeForm: AddOccupancyTypeForm, requestSession: recordTypes.PartialSession): number; export default addOccupancyType; diff --git a/helpers/lotOccupancyDB/addOccupancyType.js b/helpers/lotOccupancyDB/addOccupancyType.js index 59fec62a..0ba4a844 100644 --- a/helpers/lotOccupancyDB/addOccupancyType.js +++ b/helpers/lotOccupancyDB/addOccupancyType.js @@ -1,18 +1,18 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearOccupancyTypesCache } from "../functions.cache.js"; -export const addOccupancyType = (occupancyTypeForm, requestSession) => { +export function addOccupancyType(occupancyTypeForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("insert into OccupancyTypes (" + - "occupancyType, orderNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?)") + .prepare(`insert into OccupancyTypes ( + occupancyType, orderNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?)`) .run(occupancyTypeForm.occupancyType, occupancyTypeForm.orderNumber || -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); database.close(); clearOccupancyTypesCache(); return result.lastInsertRowid; -}; +} export default addOccupancyType; diff --git a/helpers/lotOccupancyDB/addOccupancyType.ts b/helpers/lotOccupancyDB/addOccupancyType.ts index cb59b05b..f35c6f42 100644 --- a/helpers/lotOccupancyDB/addOccupancyType.ts +++ b/helpers/lotOccupancyDB/addOccupancyType.ts @@ -11,21 +11,21 @@ interface AddOccupancyTypeForm { orderNumber?: number; } -export const addOccupancyType = ( +export function addOccupancyType( occupancyTypeForm: AddOccupancyTypeForm, requestSession: recordTypes.PartialSession -): number => { +): number { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "insert into OccupancyTypes (" + - "occupancyType, orderNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?)" + `insert into OccupancyTypes ( + occupancyType, orderNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?)` ) .run( occupancyTypeForm.occupancyType, @@ -41,6 +41,6 @@ export const addOccupancyType = ( clearOccupancyTypesCache(); return result.lastInsertRowid as number; -}; +} export default addOccupancyType; diff --git a/helpers/lotOccupancyDB/addOccupancyTypeField.d.ts b/helpers/lotOccupancyDB/addOccupancyTypeField.d.ts index 5411fd7c..595fdde3 100644 --- a/helpers/lotOccupancyDB/addOccupancyTypeField.d.ts +++ b/helpers/lotOccupancyDB/addOccupancyTypeField.d.ts @@ -9,5 +9,5 @@ interface AddOccupancyTypeFieldForm { maximumLength: string | number; orderNumber?: number; } -export declare const addOccupancyTypeField: (occupancyTypeFieldForm: AddOccupancyTypeFieldForm, requestSession: recordTypes.PartialSession) => number; +export declare function addOccupancyTypeField(occupancyTypeFieldForm: AddOccupancyTypeFieldForm, requestSession: recordTypes.PartialSession): number; export default addOccupancyTypeField; diff --git a/helpers/lotOccupancyDB/addOccupancyTypeField.js b/helpers/lotOccupancyDB/addOccupancyTypeField.js index 7ee98ff5..9d1e5c4b 100644 --- a/helpers/lotOccupancyDB/addOccupancyTypeField.js +++ b/helpers/lotOccupancyDB/addOccupancyTypeField.js @@ -1,21 +1,21 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearOccupancyTypesCache } from "../functions.cache.js"; -export const addOccupancyTypeField = (occupancyTypeFieldForm, requestSession) => { +export function addOccupancyTypeField(occupancyTypeFieldForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("insert into OccupancyTypeFields (" + - "occupancyTypeId, occupancyTypeField," + - " occupancyTypeFieldValues, isRequired, pattern," + - " minimumLength, maximumLength," + - " orderNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)") + .prepare(`insert into OccupancyTypeFields ( + occupancyTypeId, occupancyTypeField, + occupancyTypeFieldValues, isRequired, pattern, + minimumLength, maximumLength, + orderNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) .run(occupancyTypeFieldForm.occupancyTypeId || undefined, occupancyTypeFieldForm.occupancyTypeField, occupancyTypeFieldForm.occupancyTypeFieldValues || "", occupancyTypeFieldForm.isRequired ? 1 : 0, occupancyTypeFieldForm.pattern || "", occupancyTypeFieldForm.minimumLength || 0, occupancyTypeFieldForm.maximumLength || 100, occupancyTypeFieldForm.orderNumber || -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); database.close(); clearOccupancyTypesCache(); return result.lastInsertRowid; -}; +} export default addOccupancyTypeField; diff --git a/helpers/lotOccupancyDB/addOccupancyTypeField.ts b/helpers/lotOccupancyDB/addOccupancyTypeField.ts index f50e5815..0db70572 100644 --- a/helpers/lotOccupancyDB/addOccupancyTypeField.ts +++ b/helpers/lotOccupancyDB/addOccupancyTypeField.ts @@ -16,24 +16,24 @@ interface AddOccupancyTypeFieldForm { orderNumber?: number; } -export const addOccupancyTypeField = ( +export function addOccupancyTypeField( occupancyTypeFieldForm: AddOccupancyTypeFieldForm, requestSession: recordTypes.PartialSession -): number => { +): number { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "insert into OccupancyTypeFields (" + - "occupancyTypeId, occupancyTypeField," + - " occupancyTypeFieldValues, isRequired, pattern," + - " minimumLength, maximumLength," + - " orderNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" + `insert into OccupancyTypeFields ( + occupancyTypeId, occupancyTypeField, + occupancyTypeFieldValues, isRequired, pattern, + minimumLength, maximumLength, + orderNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` ) .run( occupancyTypeFieldForm.occupancyTypeId || undefined, @@ -55,6 +55,6 @@ export const addOccupancyTypeField = ( clearOccupancyTypesCache(); return result.lastInsertRowid as number; -}; +} export default addOccupancyTypeField; diff --git a/helpers/lotOccupancyDB/addOccupancyTypePrint.d.ts b/helpers/lotOccupancyDB/addOccupancyTypePrint.d.ts index 0cf957c5..29a3e556 100644 --- a/helpers/lotOccupancyDB/addOccupancyTypePrint.d.ts +++ b/helpers/lotOccupancyDB/addOccupancyTypePrint.d.ts @@ -4,5 +4,5 @@ interface OccupancyTypePrintForm { printEJS: string; orderNumber?: number; } -export declare const addOccupancyTypePrint: (occupancyTypePrintForm: OccupancyTypePrintForm, requestSession: recordTypes.PartialSession) => boolean; +export declare function addOccupancyTypePrint(occupancyTypePrintForm: OccupancyTypePrintForm, requestSession: recordTypes.PartialSession): boolean; export default addOccupancyTypePrint; diff --git a/helpers/lotOccupancyDB/addOccupancyTypePrint.js b/helpers/lotOccupancyDB/addOccupancyTypePrint.js index fb870a75..a10078e4 100644 --- a/helpers/lotOccupancyDB/addOccupancyTypePrint.js +++ b/helpers/lotOccupancyDB/addOccupancyTypePrint.js @@ -1,30 +1,29 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearOccupancyTypesCache } from "../functions.cache.js"; -export const addOccupancyTypePrint = (occupancyTypePrintForm, requestSession) => { +export function addOccupancyTypePrint(occupancyTypePrintForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); let result = database - .prepare("update OccupancyTypePrints" + - " set recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?," + - " recordDelete_userName = null," + - " recordDelete_timeMillis = null" + - " where occupancyTypeId = ?" + - " and printEJS = ?") + .prepare(`update OccupancyTypePrints + set recordUpdate_userName = ?, + recordUpdate_timeMillis = ?, + recordDelete_userName = null, + recordDelete_timeMillis = null + where occupancyTypeId = ? + and printEJS = ?`) .run(requestSession.user.userName, rightNowMillis, occupancyTypePrintForm.occupancyTypeId, occupancyTypePrintForm.printEJS); if (result.changes === 0) { result = database - .prepare("insert into OccupancyTypePrints (" + - "occupancyTypeId, printEJS," + - " orderNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?)") + .prepare(`insert into OccupancyTypePrints ( + occupancyTypeId, printEJS, orderNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?)`) .run(occupancyTypePrintForm.occupancyTypeId, occupancyTypePrintForm.printEJS, occupancyTypePrintForm.orderNumber || -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); } database.close(); clearOccupancyTypesCache(); return result.changes > 0; -}; +} export default addOccupancyTypePrint; diff --git a/helpers/lotOccupancyDB/addOccupancyTypePrint.ts b/helpers/lotOccupancyDB/addOccupancyTypePrint.ts index 609b1315..8f94ca32 100644 --- a/helpers/lotOccupancyDB/addOccupancyTypePrint.ts +++ b/helpers/lotOccupancyDB/addOccupancyTypePrint.ts @@ -12,23 +12,23 @@ interface OccupancyTypePrintForm { orderNumber?: number; } -export const addOccupancyTypePrint = ( +export function addOccupancyTypePrint( occupancyTypePrintForm: OccupancyTypePrintForm, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); let result = database .prepare( - "update OccupancyTypePrints" + - " set recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?," + - " recordDelete_userName = null," + - " recordDelete_timeMillis = null" + - " where occupancyTypeId = ?" + - " and printEJS = ?" + `update OccupancyTypePrints + set recordUpdate_userName = ?, + recordUpdate_timeMillis = ?, + recordDelete_userName = null, + recordDelete_timeMillis = null + where occupancyTypeId = ? + and printEJS = ?` ) .run( requestSession.user.userName, @@ -40,12 +40,11 @@ export const addOccupancyTypePrint = ( if (result.changes === 0) { result = database .prepare( - "insert into OccupancyTypePrints (" + - "occupancyTypeId, printEJS," + - " orderNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?)" + `insert into OccupancyTypePrints ( + occupancyTypeId, printEJS, orderNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?)` ) .run( occupancyTypePrintForm.occupancyTypeId, @@ -63,6 +62,6 @@ export const addOccupancyTypePrint = ( clearOccupancyTypesCache(); return result.changes > 0; -}; +} export default addOccupancyTypePrint; diff --git a/helpers/lotOccupancyDB/addOrUpdateLotField.d.ts b/helpers/lotOccupancyDB/addOrUpdateLotField.d.ts index 14eedbdf..fc7af740 100644 --- a/helpers/lotOccupancyDB/addOrUpdateLotField.d.ts +++ b/helpers/lotOccupancyDB/addOrUpdateLotField.d.ts @@ -5,5 +5,5 @@ interface LotFieldForm { lotTypeFieldId: string | number; lotFieldValue: string; } -export declare const addOrUpdateLotField: (lotFieldForm: LotFieldForm, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database) => boolean; +export declare function addOrUpdateLotField(lotFieldForm: LotFieldForm, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database): boolean; export default addOrUpdateLotField; diff --git a/helpers/lotOccupancyDB/addOrUpdateLotField.js b/helpers/lotOccupancyDB/addOrUpdateLotField.js index 17c2fb6b..7ff1f900 100644 --- a/helpers/lotOccupancyDB/addOrUpdateLotField.js +++ b/helpers/lotOccupancyDB/addOrUpdateLotField.js @@ -1,31 +1,30 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const addOrUpdateLotField = (lotFieldForm, requestSession, connectedDatabase) => { +export function addOrUpdateLotField(lotFieldForm, requestSession, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath); const rightNowMillis = Date.now(); let result = database - .prepare("update LotFields" + - " set lotFieldValue = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?," + - " recordDelete_userName = null," + - " recordDelete_timeMillis = null" + - " where lotId = ?" + - " and lotTypeFieldId = ?") + .prepare(`update LotFields + set lotFieldValue = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ?, + recordDelete_userName = null, + recordDelete_timeMillis = null + where lotId = ? + and lotTypeFieldId = ?`) .run(lotFieldForm.lotFieldValue, requestSession.user.userName, rightNowMillis, lotFieldForm.lotId, lotFieldForm.lotTypeFieldId); if (result.changes === 0) { result = database - .prepare("insert into LotFields (" + - "lotId, lotTypeFieldId," + - " lotFieldValue," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?)") + .prepare(`insert into LotFields ( + lotId, lotTypeFieldId, lotFieldValue, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?)`) .run(lotFieldForm.lotId, lotFieldForm.lotTypeFieldId, lotFieldForm.lotFieldValue, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); } if (!connectedDatabase) { database.close(); } return result.changes > 0; -}; +} export default addOrUpdateLotField; diff --git a/helpers/lotOccupancyDB/addOrUpdateLotField.ts b/helpers/lotOccupancyDB/addOrUpdateLotField.ts index a47679d9..dbfdc9b1 100644 --- a/helpers/lotOccupancyDB/addOrUpdateLotField.ts +++ b/helpers/lotOccupancyDB/addOrUpdateLotField.ts @@ -10,25 +10,25 @@ interface LotFieldForm { lotFieldValue: string; } -export const addOrUpdateLotField = ( +export function addOrUpdateLotField( lotFieldForm: LotFieldForm, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database -): boolean => { +): boolean { const database = connectedDatabase || sqlite(databasePath); const rightNowMillis = Date.now(); let result = database .prepare( - "update LotFields" + - " set lotFieldValue = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?," + - " recordDelete_userName = null," + - " recordDelete_timeMillis = null" + - " where lotId = ?" + - " and lotTypeFieldId = ?" + `update LotFields + set lotFieldValue = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ?, + recordDelete_userName = null, + recordDelete_timeMillis = null + where lotId = ? + and lotTypeFieldId = ?` ) .run( lotFieldForm.lotFieldValue, @@ -41,12 +41,11 @@ export const addOrUpdateLotField = ( if (result.changes === 0) { result = database .prepare( - "insert into LotFields (" + - "lotId, lotTypeFieldId," + - " lotFieldValue," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?)" + `insert into LotFields ( + lotId, lotTypeFieldId, lotFieldValue, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?)` ) .run( lotFieldForm.lotId, @@ -64,6 +63,6 @@ export const addOrUpdateLotField = ( } return result.changes > 0; -}; +} export default addOrUpdateLotField; diff --git a/helpers/lotOccupancyDB/addOrUpdateLotOccupancyField.d.ts b/helpers/lotOccupancyDB/addOrUpdateLotOccupancyField.d.ts index fea61ac2..e5c85cda 100644 --- a/helpers/lotOccupancyDB/addOrUpdateLotOccupancyField.d.ts +++ b/helpers/lotOccupancyDB/addOrUpdateLotOccupancyField.d.ts @@ -5,5 +5,5 @@ interface LotOccupancyFieldForm { occupancyTypeFieldId: string | number; lotOccupancyFieldValue: string; } -export declare const addOrUpdateLotOccupancyField: (lotOccupancyFieldForm: LotOccupancyFieldForm, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database) => boolean; +export declare function addOrUpdateLotOccupancyField(lotOccupancyFieldForm: LotOccupancyFieldForm, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database): boolean; export default addOrUpdateLotOccupancyField; diff --git a/helpers/lotOccupancyDB/addOrUpdateLotOccupancyField.js b/helpers/lotOccupancyDB/addOrUpdateLotOccupancyField.js index 56e286df..315a1538 100644 --- a/helpers/lotOccupancyDB/addOrUpdateLotOccupancyField.js +++ b/helpers/lotOccupancyDB/addOrUpdateLotOccupancyField.js @@ -1,31 +1,30 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const addOrUpdateLotOccupancyField = (lotOccupancyFieldForm, requestSession, connectedDatabase) => { +export function addOrUpdateLotOccupancyField(lotOccupancyFieldForm, requestSession, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath); const rightNowMillis = Date.now(); let result = database - .prepare("update LotOccupancyFields" + - " set lotOccupancyFieldValue = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?," + - " recordDelete_userName = null," + - " recordDelete_timeMillis = null" + - " where lotOccupancyId = ?" + - " and occupancyTypeFieldId = ?") + .prepare(`update LotOccupancyFields + set lotOccupancyFieldValue = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ?, + recordDelete_userName = null, + recordDelete_timeMillis = null + where lotOccupancyId = ? + and occupancyTypeFieldId = ?`) .run(lotOccupancyFieldForm.lotOccupancyFieldValue, requestSession.user.userName, rightNowMillis, lotOccupancyFieldForm.lotOccupancyId, lotOccupancyFieldForm.occupancyTypeFieldId); if (result.changes === 0) { result = database - .prepare("insert into LotOccupancyFields (" + - "lotOccupancyId, occupancyTypeFieldId," + - " lotOccupancyFieldValue," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?)") + .prepare(`insert into LotOccupancyFields ( + lotOccupancyId, occupancyTypeFieldId, lotOccupancyFieldValue, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?)`) .run(lotOccupancyFieldForm.lotOccupancyId, lotOccupancyFieldForm.occupancyTypeFieldId, lotOccupancyFieldForm.lotOccupancyFieldValue, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); } if (!connectedDatabase) { database.close(); } return result.changes > 0; -}; +} export default addOrUpdateLotOccupancyField; diff --git a/helpers/lotOccupancyDB/addOrUpdateLotOccupancyField.ts b/helpers/lotOccupancyDB/addOrUpdateLotOccupancyField.ts index df236b83..7a4eabbf 100644 --- a/helpers/lotOccupancyDB/addOrUpdateLotOccupancyField.ts +++ b/helpers/lotOccupancyDB/addOrUpdateLotOccupancyField.ts @@ -10,25 +10,25 @@ interface LotOccupancyFieldForm { lotOccupancyFieldValue: string; } -export const addOrUpdateLotOccupancyField = ( +export function addOrUpdateLotOccupancyField( lotOccupancyFieldForm: LotOccupancyFieldForm, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database -): boolean => { +): boolean { const database = connectedDatabase || sqlite(databasePath); const rightNowMillis = Date.now(); let result = database .prepare( - "update LotOccupancyFields" + - " set lotOccupancyFieldValue = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?," + - " recordDelete_userName = null," + - " recordDelete_timeMillis = null" + - " where lotOccupancyId = ?" + - " and occupancyTypeFieldId = ?" + `update LotOccupancyFields + set lotOccupancyFieldValue = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ?, + recordDelete_userName = null, + recordDelete_timeMillis = null + where lotOccupancyId = ? + and occupancyTypeFieldId = ?` ) .run( lotOccupancyFieldForm.lotOccupancyFieldValue, @@ -41,12 +41,11 @@ export const addOrUpdateLotOccupancyField = ( if (result.changes === 0) { result = database .prepare( - "insert into LotOccupancyFields (" + - "lotOccupancyId, occupancyTypeFieldId," + - " lotOccupancyFieldValue," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?)" + `insert into LotOccupancyFields ( + lotOccupancyId, occupancyTypeFieldId, lotOccupancyFieldValue, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?)` ) .run( lotOccupancyFieldForm.lotOccupancyId, @@ -64,6 +63,6 @@ export const addOrUpdateLotOccupancyField = ( } return result.changes > 0; -}; +} export default addOrUpdateLotOccupancyField; diff --git a/helpers/lotOccupancyDB/addWorkOrder.d.ts b/helpers/lotOccupancyDB/addWorkOrder.d.ts index f748d55a..6218ad06 100644 --- a/helpers/lotOccupancyDB/addWorkOrder.d.ts +++ b/helpers/lotOccupancyDB/addWorkOrder.d.ts @@ -7,5 +7,5 @@ interface AddWorkOrderForm { workOrderCloseDateString?: string; lotOccupancyId?: string; } -export declare const addWorkOrder: (workOrderForm: AddWorkOrderForm, requestSession: recordTypes.PartialSession) => number; +export declare function addWorkOrder(workOrderForm: AddWorkOrderForm, requestSession: recordTypes.PartialSession): number; export default addWorkOrder; diff --git a/helpers/lotOccupancyDB/addWorkOrder.js b/helpers/lotOccupancyDB/addWorkOrder.js index 750583ba..168b0e6d 100644 --- a/helpers/lotOccupancyDB/addWorkOrder.js +++ b/helpers/lotOccupancyDB/addWorkOrder.js @@ -1,9 +1,9 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { getNextWorkOrderNumber } from "./getNextWorkOrderNumber.js"; +import { addWorkOrderLotOccupancy } from "./addWorkOrderLotOccupancy.js"; import { dateStringToInteger, dateToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js"; -import addWorkOrderLotOccupancy from "./addWorkOrderLotOccupancy.js"; -export const addWorkOrder = (workOrderForm, requestSession) => { +export function addWorkOrder(workOrderForm, requestSession) { const database = sqlite(databasePath); const rightNow = new Date(); let workOrderNumber = workOrderForm.workOrderNumber; @@ -11,12 +11,12 @@ export const addWorkOrder = (workOrderForm, requestSession) => { workOrderNumber = getNextWorkOrderNumber(database); } const result = database - .prepare("insert into WorkOrders (" + - "workOrderTypeId, workOrderNumber, workOrderDescription," + - " workOrderOpenDate, workOrderCloseDate," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?, ?)") + .prepare(`insert into WorkOrders ( + workOrderTypeId, workOrderNumber, workOrderDescription, + workOrderOpenDate, workOrderCloseDate, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?)`) .run(workOrderForm.workOrderTypeId, workOrderNumber, workOrderForm.workOrderDescription, workOrderForm.workOrderOpenDateString ? dateStringToInteger(workOrderForm.workOrderOpenDateString) : dateToInteger(rightNow), workOrderForm.workOrderCloseDateString @@ -31,5 +31,5 @@ export const addWorkOrder = (workOrderForm, requestSession) => { } database.close(); return workOrderId; -}; +} export default addWorkOrder; diff --git a/helpers/lotOccupancyDB/addWorkOrder.ts b/helpers/lotOccupancyDB/addWorkOrder.ts index e334f0d3..563ae75c 100644 --- a/helpers/lotOccupancyDB/addWorkOrder.ts +++ b/helpers/lotOccupancyDB/addWorkOrder.ts @@ -3,11 +3,11 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { getNextWorkOrderNumber } from "./getNextWorkOrderNumber.js"; +import { addWorkOrderLotOccupancy } from "./addWorkOrderLotOccupancy.js"; import { dateStringToInteger, dateToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js"; import type * as recordTypes from "../../types/recordTypes"; -import addWorkOrderLotOccupancy from "./addWorkOrderLotOccupancy.js"; interface AddWorkOrderForm { workOrderTypeId: number | string; @@ -18,10 +18,10 @@ interface AddWorkOrderForm { lotOccupancyId?: string; } -export const addWorkOrder = ( +export function addWorkOrder( workOrderForm: AddWorkOrderForm, requestSession: recordTypes.PartialSession -): number => { +): number { const database = sqlite(databasePath); const rightNow = new Date(); @@ -34,12 +34,12 @@ export const addWorkOrder = ( const result = database .prepare( - "insert into WorkOrders (" + - "workOrderTypeId, workOrderNumber, workOrderDescription," + - " workOrderOpenDate, workOrderCloseDate," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?, ?)" + `insert into WorkOrders ( + workOrderTypeId, workOrderNumber, workOrderDescription, + workOrderOpenDate, workOrderCloseDate, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?)` ) .run( workOrderForm.workOrderTypeId, @@ -73,6 +73,6 @@ export const addWorkOrder = ( database.close(); return workOrderId; -}; +} export default addWorkOrder; diff --git a/helpers/lotOccupancyDB/addWorkOrderComment.d.ts b/helpers/lotOccupancyDB/addWorkOrderComment.d.ts index 2712f560..6efcf98f 100644 --- a/helpers/lotOccupancyDB/addWorkOrderComment.d.ts +++ b/helpers/lotOccupancyDB/addWorkOrderComment.d.ts @@ -3,5 +3,5 @@ interface AddWorkOrderCommentForm { workOrderId: string; workOrderComment: string; } -export declare const addWorkOrderComment: (workOrderCommentForm: AddWorkOrderCommentForm, requestSession: recordTypes.PartialSession) => number; +export declare function addWorkOrderComment(workOrderCommentForm: AddWorkOrderCommentForm, requestSession: recordTypes.PartialSession): number; export default addWorkOrderComment; diff --git a/helpers/lotOccupancyDB/addWorkOrderComment.js b/helpers/lotOccupancyDB/addWorkOrderComment.js index 7cbb433c..5205f880 100644 --- a/helpers/lotOccupancyDB/addWorkOrderComment.js +++ b/helpers/lotOccupancyDB/addWorkOrderComment.js @@ -1,17 +1,19 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import * as dateTimeFunctions from "@cityssm/expressjs-server-js/dateTimeFns.js"; -export const addWorkOrderComment = (workOrderCommentForm, requestSession) => { +export function addWorkOrderComment(workOrderCommentForm, requestSession) { const database = sqlite(databasePath); const rightNow = new Date(); const result = database - .prepare("insert into WorkOrderComments (" + - "workOrderId, workOrderCommentDate, workOrderCommentTime, workOrderComment," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?)") + .prepare(`insert into WorkOrderComments ( + workOrderId, + workOrderCommentDate, workOrderCommentTime, + workOrderComment, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?)`) .run(workOrderCommentForm.workOrderId, dateTimeFunctions.dateToInteger(rightNow), dateTimeFunctions.dateToTimeInteger(rightNow), workOrderCommentForm.workOrderComment, requestSession.user.userName, rightNow.getTime(), requestSession.user.userName, rightNow.getTime()); database.close(); return result.lastInsertRowid; -}; +} export default addWorkOrderComment; diff --git a/helpers/lotOccupancyDB/addWorkOrderComment.ts b/helpers/lotOccupancyDB/addWorkOrderComment.ts index 2db4214d..84012ebe 100644 --- a/helpers/lotOccupancyDB/addWorkOrderComment.ts +++ b/helpers/lotOccupancyDB/addWorkOrderComment.ts @@ -11,21 +11,23 @@ interface AddWorkOrderCommentForm { workOrderComment: string; } -export const addWorkOrderComment = ( +export function addWorkOrderComment( workOrderCommentForm: AddWorkOrderCommentForm, requestSession: recordTypes.PartialSession -): number => { +): number { const database = sqlite(databasePath); const rightNow = new Date(); const result = database .prepare( - "insert into WorkOrderComments (" + - "workOrderId, workOrderCommentDate, workOrderCommentTime, workOrderComment," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?)" + `insert into WorkOrderComments ( + workOrderId, + workOrderCommentDate, workOrderCommentTime, + workOrderComment, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?)` ) .run( workOrderCommentForm.workOrderId, @@ -41,6 +43,6 @@ export const addWorkOrderComment = ( database.close(); return result.lastInsertRowid as number; -}; +} export default addWorkOrderComment; diff --git a/helpers/lotOccupancyDB/addWorkOrderLot.d.ts b/helpers/lotOccupancyDB/addWorkOrderLot.d.ts index 35bc832d..d94a6291 100644 --- a/helpers/lotOccupancyDB/addWorkOrderLot.d.ts +++ b/helpers/lotOccupancyDB/addWorkOrderLot.d.ts @@ -3,5 +3,5 @@ interface AddWorkOrderLotForm { workOrderId: number | string; lotId: number | string; } -export declare const addWorkOrderLot: (workOrderLotForm: AddWorkOrderLotForm, requestSession: recordTypes.PartialSession) => boolean; +export declare function addWorkOrderLot(workOrderLotForm: AddWorkOrderLotForm, requestSession: recordTypes.PartialSession): boolean; export default addWorkOrderLot; diff --git a/helpers/lotOccupancyDB/addWorkOrderLot.js b/helpers/lotOccupancyDB/addWorkOrderLot.js index b22dee45..eca2f0c8 100644 --- a/helpers/lotOccupancyDB/addWorkOrderLot.js +++ b/helpers/lotOccupancyDB/addWorkOrderLot.js @@ -1,39 +1,39 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const addWorkOrderLot = (workOrderLotForm, requestSession) => { +export function addWorkOrderLot(workOrderLotForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const row = database - .prepare("select recordDelete_timeMillis" + - " from WorkOrderLots" + - " where workOrderId = ?" + - " and lotId = ?") + .prepare(`select recordDelete_timeMillis + from WorkOrderLots + where workOrderId = ? + and lotId = ?`) .get(workOrderLotForm.workOrderId, workOrderLotForm.lotId); if (row) { if (row.recordDelete_timeMillis) { database - .prepare("update WorkOrderLots" + - " set recordCreate_userName = ?," + - " recordCreate_timeMillis = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?," + - " recordDelete_userName = null," + - " recordDelete_timeMillis = null" + - " where workOrderId = ?" + - " and lotId = ?") + .prepare(`update WorkOrderLots + set recordCreate_userName = ?, + recordCreate_timeMillis = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ?, + recordDelete_userName = null, + recordDelete_timeMillis = null + where workOrderId = ? + and lotId = ?`) .run(requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis, workOrderLotForm.workOrderId, workOrderLotForm.lotId); } } else { database - .prepare("insert into WorkOrderLots (" + - "workOrderId, lotId," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?)") + .prepare(`insert into WorkOrderLots ( + workOrderId, lotId, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?)`) .run(workOrderLotForm.workOrderId, workOrderLotForm.lotId, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); } database.close(); return true; -}; +} export default addWorkOrderLot; diff --git a/helpers/lotOccupancyDB/addWorkOrderLot.ts b/helpers/lotOccupancyDB/addWorkOrderLot.ts index df468910..cc732543 100644 --- a/helpers/lotOccupancyDB/addWorkOrderLot.ts +++ b/helpers/lotOccupancyDB/addWorkOrderLot.ts @@ -9,20 +9,20 @@ interface AddWorkOrderLotForm { lotId: number | string; } -export const addWorkOrderLot = ( +export function addWorkOrderLot( workOrderLotForm: AddWorkOrderLotForm, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const row: { recordDelete_timeMillis?: number } = database .prepare( - "select recordDelete_timeMillis" + - " from WorkOrderLots" + - " where workOrderId = ?" + - " and lotId = ?" + `select recordDelete_timeMillis + from WorkOrderLots + where workOrderId = ? + and lotId = ?` ) .get(workOrderLotForm.workOrderId, workOrderLotForm.lotId); @@ -30,15 +30,15 @@ export const addWorkOrderLot = ( if (row.recordDelete_timeMillis) { database .prepare( - "update WorkOrderLots" + - " set recordCreate_userName = ?," + - " recordCreate_timeMillis = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?," + - " recordDelete_userName = null," + - " recordDelete_timeMillis = null" + - " where workOrderId = ?" + - " and lotId = ?" + `update WorkOrderLots + set recordCreate_userName = ?, + recordCreate_timeMillis = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ?, + recordDelete_userName = null, + recordDelete_timeMillis = null + where workOrderId = ? + and lotId = ?` ) .run( requestSession.user.userName, @@ -52,11 +52,11 @@ export const addWorkOrderLot = ( } else { database .prepare( - "insert into WorkOrderLots (" + - "workOrderId, lotId," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?)" + `insert into WorkOrderLots ( + workOrderId, lotId, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?)` ) .run( workOrderLotForm.workOrderId, @@ -71,6 +71,6 @@ export const addWorkOrderLot = ( database.close(); return true; -}; +} export default addWorkOrderLot; diff --git a/helpers/lotOccupancyDB/addWorkOrderLotOccupancy.d.ts b/helpers/lotOccupancyDB/addWorkOrderLotOccupancy.d.ts index 5a8d8d70..2fa8531c 100644 --- a/helpers/lotOccupancyDB/addWorkOrderLotOccupancy.d.ts +++ b/helpers/lotOccupancyDB/addWorkOrderLotOccupancy.d.ts @@ -4,5 +4,5 @@ interface AddWorkOrderLotOccupancyForm { workOrderId: number | string; lotOccupancyId: number | string; } -export declare const addWorkOrderLotOccupancy: (workOrderLotOccupancyForm: AddWorkOrderLotOccupancyForm, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database) => boolean; +export declare function addWorkOrderLotOccupancy(workOrderLotOccupancyForm: AddWorkOrderLotOccupancyForm, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database): boolean; export default addWorkOrderLotOccupancy; diff --git a/helpers/lotOccupancyDB/addWorkOrderLotOccupancy.js b/helpers/lotOccupancyDB/addWorkOrderLotOccupancy.js index c7a0440c..82c6299c 100644 --- a/helpers/lotOccupancyDB/addWorkOrderLotOccupancy.js +++ b/helpers/lotOccupancyDB/addWorkOrderLotOccupancy.js @@ -1,41 +1,41 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const addWorkOrderLotOccupancy = (workOrderLotOccupancyForm, requestSession, connectedDatabase) => { +export function addWorkOrderLotOccupancy(workOrderLotOccupancyForm, requestSession, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath); const rightNowMillis = Date.now(); const row = database - .prepare("select recordDelete_timeMillis" + - " from WorkOrderLotOccupancies" + - " where workOrderId = ?" + - " and lotOccupancyId = ?") + .prepare(`select recordDelete_timeMillis + from WorkOrderLotOccupancies + where workOrderId = ? + and lotOccupancyId = ?`) .get(workOrderLotOccupancyForm.workOrderId, workOrderLotOccupancyForm.lotOccupancyId); if (row) { if (row.recordDelete_timeMillis) { database - .prepare("update WorkOrderLotOccupancies" + - " set recordCreate_userName = ?," + - " recordCreate_timeMillis = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?," + - " recordDelete_userName = null," + - " recordDelete_timeMillis = null" + - " where workOrderId = ?" + - " and lotOccupancyId = ?") + .prepare(`update WorkOrderLotOccupancies + set recordCreate_userName = ?, + recordCreate_timeMillis = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ?, + recordDelete_userName = null, + recordDelete_timeMillis = null + where workOrderId = ? + and lotOccupancyId = ?`) .run(requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis, workOrderLotOccupancyForm.workOrderId, workOrderLotOccupancyForm.lotOccupancyId); } } else { database - .prepare("insert into WorkOrderLotOccupancies (" + - "workOrderId, lotOccupancyId," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?)") + .prepare(`insert into WorkOrderLotOccupancies ( + workOrderId, lotOccupancyId, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?)`) .run(workOrderLotOccupancyForm.workOrderId, workOrderLotOccupancyForm.lotOccupancyId, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); } if (!connectedDatabase) { database.close(); } return true; -}; +} export default addWorkOrderLotOccupancy; diff --git a/helpers/lotOccupancyDB/addWorkOrderLotOccupancy.ts b/helpers/lotOccupancyDB/addWorkOrderLotOccupancy.ts index 33c802d0..ec822f55 100644 --- a/helpers/lotOccupancyDB/addWorkOrderLotOccupancy.ts +++ b/helpers/lotOccupancyDB/addWorkOrderLotOccupancy.ts @@ -9,21 +9,21 @@ interface AddWorkOrderLotOccupancyForm { lotOccupancyId: number | string; } -export const addWorkOrderLotOccupancy = ( +export function addWorkOrderLotOccupancy( workOrderLotOccupancyForm: AddWorkOrderLotOccupancyForm, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database -): boolean => { +): boolean { const database = connectedDatabase || sqlite(databasePath); const rightNowMillis = Date.now(); const row: { recordDelete_timeMillis?: number } = database .prepare( - "select recordDelete_timeMillis" + - " from WorkOrderLotOccupancies" + - " where workOrderId = ?" + - " and lotOccupancyId = ?" + `select recordDelete_timeMillis + from WorkOrderLotOccupancies + where workOrderId = ? + and lotOccupancyId = ?` ) .get(workOrderLotOccupancyForm.workOrderId, workOrderLotOccupancyForm.lotOccupancyId); @@ -31,15 +31,15 @@ export const addWorkOrderLotOccupancy = ( if (row.recordDelete_timeMillis) { database .prepare( - "update WorkOrderLotOccupancies" + - " set recordCreate_userName = ?," + - " recordCreate_timeMillis = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?," + - " recordDelete_userName = null," + - " recordDelete_timeMillis = null" + - " where workOrderId = ?" + - " and lotOccupancyId = ?" + `update WorkOrderLotOccupancies + set recordCreate_userName = ?, + recordCreate_timeMillis = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ?, + recordDelete_userName = null, + recordDelete_timeMillis = null + where workOrderId = ? + and lotOccupancyId = ?` ) .run( requestSession.user.userName, @@ -53,11 +53,11 @@ export const addWorkOrderLotOccupancy = ( } else { database .prepare( - "insert into WorkOrderLotOccupancies (" + - "workOrderId, lotOccupancyId," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?)" + `insert into WorkOrderLotOccupancies ( + workOrderId, lotOccupancyId, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?)` ) .run( workOrderLotOccupancyForm.workOrderId, @@ -74,6 +74,6 @@ export const addWorkOrderLotOccupancy = ( } return true; -}; +} export default addWorkOrderLotOccupancy; diff --git a/helpers/lotOccupancyDB/addWorkOrderMilestone.d.ts b/helpers/lotOccupancyDB/addWorkOrderMilestone.d.ts index b6c59fc3..1cb34777 100644 --- a/helpers/lotOccupancyDB/addWorkOrderMilestone.d.ts +++ b/helpers/lotOccupancyDB/addWorkOrderMilestone.d.ts @@ -8,5 +8,5 @@ interface AddWorkOrderMilestoneForm { workOrderMilestoneCompletionDateString?: string; workOrderMilestoneCompletionTimeString?: string; } -export declare const addWorkOrderMilestone: (milestoneForm: AddWorkOrderMilestoneForm, requestSession: recordTypes.PartialSession) => number; +export declare function addWorkOrderMilestone(milestoneForm: AddWorkOrderMilestoneForm, requestSession: recordTypes.PartialSession): number; export default addWorkOrderMilestone; diff --git a/helpers/lotOccupancyDB/addWorkOrderMilestone.js b/helpers/lotOccupancyDB/addWorkOrderMilestone.js index be6d636f..05c786e3 100644 --- a/helpers/lotOccupancyDB/addWorkOrderMilestone.js +++ b/helpers/lotOccupancyDB/addWorkOrderMilestone.js @@ -1,17 +1,18 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { dateStringToInteger, timeStringToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js"; -export const addWorkOrderMilestone = (milestoneForm, requestSession) => { +export function addWorkOrderMilestone(milestoneForm, requestSession) { const rightNow = new Date(); const database = sqlite(databasePath); const result = database - .prepare("insert into WorkOrderMilestones (" + - "workOrderId, workOrderMilestoneTypeId," + - " workOrderMilestoneDate, workOrderMilestoneTime, workOrderMilestoneDescription," + - " workOrderMilestoneCompletionDate, workOrderMilestoneCompletionTime," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)") + .prepare(`insert into WorkOrderMilestones ( + workOrderId, workOrderMilestoneTypeId, + workOrderMilestoneDate, workOrderMilestoneTime, + workOrderMilestoneDescription, + workOrderMilestoneCompletionDate, workOrderMilestoneCompletionTime, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`) .run(milestoneForm.workOrderId, milestoneForm.workOrderMilestoneTypeId || undefined, dateStringToInteger(milestoneForm.workOrderMilestoneDateString), milestoneForm.workOrderMilestoneTimeString ? timeStringToInteger(milestoneForm.workOrderMilestoneTimeString) : 0, milestoneForm.workOrderMilestoneDescription, milestoneForm.workOrderMilestoneCompletionDateString @@ -21,5 +22,5 @@ export const addWorkOrderMilestone = (milestoneForm, requestSession) => { : undefined, requestSession.user.userName, rightNow.getTime(), requestSession.user.userName, rightNow.getTime()); database.close(); return result.lastInsertRowid; -}; +} export default addWorkOrderMilestone; diff --git a/helpers/lotOccupancyDB/addWorkOrderMilestone.ts b/helpers/lotOccupancyDB/addWorkOrderMilestone.ts index e73b8b8a..50f51cef 100644 --- a/helpers/lotOccupancyDB/addWorkOrderMilestone.ts +++ b/helpers/lotOccupancyDB/addWorkOrderMilestone.ts @@ -19,43 +19,38 @@ interface AddWorkOrderMilestoneForm { workOrderMilestoneCompletionTimeString?: string; } -export const addWorkOrderMilestone = ( +export function addWorkOrderMilestone( milestoneForm: AddWorkOrderMilestoneForm, requestSession: recordTypes.PartialSession -): number => { +): number { const rightNow = new Date(); const database = sqlite(databasePath); const result = database .prepare( - "insert into WorkOrderMilestones (" + - "workOrderId, workOrderMilestoneTypeId," + - " workOrderMilestoneDate, workOrderMilestoneTime, workOrderMilestoneDescription," + - " workOrderMilestoneCompletionDate, workOrderMilestoneCompletionTime," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" + `insert into WorkOrderMilestones ( + workOrderId, workOrderMilestoneTypeId, + workOrderMilestoneDate, workOrderMilestoneTime, + workOrderMilestoneDescription, + workOrderMilestoneCompletionDate, workOrderMilestoneCompletionTime, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)` ) .run( milestoneForm.workOrderId, milestoneForm.workOrderMilestoneTypeId || undefined, dateStringToInteger(milestoneForm.workOrderMilestoneDateString), milestoneForm.workOrderMilestoneTimeString - ? timeStringToInteger( - milestoneForm.workOrderMilestoneTimeString - ) + ? timeStringToInteger(milestoneForm.workOrderMilestoneTimeString) : 0, milestoneForm.workOrderMilestoneDescription, milestoneForm.workOrderMilestoneCompletionDateString - ? dateStringToInteger( - milestoneForm.workOrderMilestoneCompletionDateString - ) + ? dateStringToInteger(milestoneForm.workOrderMilestoneCompletionDateString) : undefined, milestoneForm.workOrderMilestoneCompletionTimeString - ? timeStringToInteger( - milestoneForm.workOrderMilestoneCompletionTimeString - ) + ? timeStringToInteger(milestoneForm.workOrderMilestoneCompletionTimeString) : undefined, requestSession.user.userName, rightNow.getTime(), @@ -66,6 +61,6 @@ export const addWorkOrderMilestone = ( database.close(); return result.lastInsertRowid as number; -}; +} export default addWorkOrderMilestone; diff --git a/helpers/lotOccupancyDB/addWorkOrderMilestoneType.d.ts b/helpers/lotOccupancyDB/addWorkOrderMilestoneType.d.ts index d9fdaf9d..5a919171 100644 --- a/helpers/lotOccupancyDB/addWorkOrderMilestoneType.d.ts +++ b/helpers/lotOccupancyDB/addWorkOrderMilestoneType.d.ts @@ -3,5 +3,5 @@ interface AddWorkOrderMilestoneTypeForm { workOrderMilestoneType: string; orderNumber?: number; } -export declare const addWorkOrderMilestoneType: (workOrderMilestoneTypeForm: AddWorkOrderMilestoneTypeForm, requestSession: recordTypes.PartialSession) => number; +export declare function addWorkOrderMilestoneType(workOrderMilestoneTypeForm: AddWorkOrderMilestoneTypeForm, requestSession: recordTypes.PartialSession): number; export default addWorkOrderMilestoneType; diff --git a/helpers/lotOccupancyDB/addWorkOrderMilestoneType.js b/helpers/lotOccupancyDB/addWorkOrderMilestoneType.js index 98eb01ad..e2728b84 100644 --- a/helpers/lotOccupancyDB/addWorkOrderMilestoneType.js +++ b/helpers/lotOccupancyDB/addWorkOrderMilestoneType.js @@ -1,18 +1,18 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearWorkOrderMilestoneTypesCache } from "../functions.cache.js"; -export const addWorkOrderMilestoneType = (workOrderMilestoneTypeForm, requestSession) => { +export function addWorkOrderMilestoneType(workOrderMilestoneTypeForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("insert into WorkOrderMilestoneTypes (" + - "workOrderMilestoneType, orderNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?)") + .prepare(`insert into WorkOrderMilestoneTypes ( + workOrderMilestoneType, orderNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?)`) .run(workOrderMilestoneTypeForm.workOrderMilestoneType, workOrderMilestoneTypeForm.orderNumber || -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); database.close(); clearWorkOrderMilestoneTypesCache(); return result.lastInsertRowid; -}; +} export default addWorkOrderMilestoneType; diff --git a/helpers/lotOccupancyDB/addWorkOrderMilestoneType.ts b/helpers/lotOccupancyDB/addWorkOrderMilestoneType.ts index bf6340cb..e94be6a3 100644 --- a/helpers/lotOccupancyDB/addWorkOrderMilestoneType.ts +++ b/helpers/lotOccupancyDB/addWorkOrderMilestoneType.ts @@ -11,21 +11,21 @@ interface AddWorkOrderMilestoneTypeForm { orderNumber?: number; } -export const addWorkOrderMilestoneType = ( +export function addWorkOrderMilestoneType( workOrderMilestoneTypeForm: AddWorkOrderMilestoneTypeForm, requestSession: recordTypes.PartialSession -): number => { +): number { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "insert into WorkOrderMilestoneTypes (" + - "workOrderMilestoneType, orderNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?)" + `insert into WorkOrderMilestoneTypes ( + workOrderMilestoneType, orderNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?)` ) .run( workOrderMilestoneTypeForm.workOrderMilestoneType, @@ -41,6 +41,6 @@ export const addWorkOrderMilestoneType = ( clearWorkOrderMilestoneTypesCache(); return result.lastInsertRowid as number; -}; +} export default addWorkOrderMilestoneType; diff --git a/helpers/lotOccupancyDB/addWorkOrderType.d.ts b/helpers/lotOccupancyDB/addWorkOrderType.d.ts index b320376c..2aa59fa5 100644 --- a/helpers/lotOccupancyDB/addWorkOrderType.d.ts +++ b/helpers/lotOccupancyDB/addWorkOrderType.d.ts @@ -3,5 +3,5 @@ interface AddWorkOrderTypeForm { workOrderType: string; orderNumber?: number; } -export declare const addWorkOrderType: (workOrderTypeForm: AddWorkOrderTypeForm, requestSession: recordTypes.PartialSession) => number; +export declare function addWorkOrderType(workOrderTypeForm: AddWorkOrderTypeForm, requestSession: recordTypes.PartialSession): number; export default addWorkOrderType; diff --git a/helpers/lotOccupancyDB/addWorkOrderType.js b/helpers/lotOccupancyDB/addWorkOrderType.js index 411c1cb6..53660d67 100644 --- a/helpers/lotOccupancyDB/addWorkOrderType.js +++ b/helpers/lotOccupancyDB/addWorkOrderType.js @@ -1,18 +1,18 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearWorkOrderTypesCache } from "../functions.cache.js"; -export const addWorkOrderType = (workOrderTypeForm, requestSession) => { +export function addWorkOrderType(workOrderTypeForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("insert into WorkOrderTypes (" + - "workOrderType, orderNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?)") + .prepare(`insert into WorkOrderTypes ( + workOrderType, orderNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?)`) .run(workOrderTypeForm.workOrderType, workOrderTypeForm.orderNumber || -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); database.close(); clearWorkOrderTypesCache(); return result.lastInsertRowid; -}; +} export default addWorkOrderType; diff --git a/helpers/lotOccupancyDB/addWorkOrderType.ts b/helpers/lotOccupancyDB/addWorkOrderType.ts index 7eeadff5..7e6e64a9 100644 --- a/helpers/lotOccupancyDB/addWorkOrderType.ts +++ b/helpers/lotOccupancyDB/addWorkOrderType.ts @@ -11,21 +11,21 @@ interface AddWorkOrderTypeForm { orderNumber?: number; } -export const addWorkOrderType = ( +export function addWorkOrderType( workOrderTypeForm: AddWorkOrderTypeForm, requestSession: recordTypes.PartialSession -): number => { +): number { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "insert into WorkOrderTypes (" + - "workOrderType, orderNumber," + - " recordCreate_userName, recordCreate_timeMillis," + - " recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?)" + `insert into WorkOrderTypes ( + workOrderType, orderNumber, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?)` ) .run( workOrderTypeForm.workOrderType, @@ -41,6 +41,6 @@ export const addWorkOrderType = ( clearWorkOrderTypesCache(); return result.lastInsertRowid as number; -}; +} export default addWorkOrderType; diff --git a/helpers/lotOccupancyDB/cleanupDatabase.d.ts b/helpers/lotOccupancyDB/cleanupDatabase.d.ts index e669edaa..204b482f 100644 --- a/helpers/lotOccupancyDB/cleanupDatabase.d.ts +++ b/helpers/lotOccupancyDB/cleanupDatabase.d.ts @@ -1,5 +1,5 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const cleanupDatabase: (requestSession: recordTypes.PartialSession) => { +export declare function cleanupDatabase(requestSession: recordTypes.PartialSession): { inactivedRecordCount: number; purgedRecordCount: number; }; diff --git a/helpers/lotOccupancyDB/cleanupDatabase.js b/helpers/lotOccupancyDB/cleanupDatabase.js index b6512d4f..eebabd07 100644 --- a/helpers/lotOccupancyDB/cleanupDatabase.js +++ b/helpers/lotOccupancyDB/cleanupDatabase.js @@ -1,7 +1,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import * as configFunctions from "../functions.config.js"; -export const cleanupDatabase = (requestSession) => { +export function cleanupDatabase(requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const recordDelete_timeMillisMin = rightNowMillis - @@ -9,86 +9,95 @@ export const cleanupDatabase = (requestSession) => { let inactivedRecordCount = 0; let purgedRecordCount = 0; inactivedRecordCount += database - .prepare("update WorkOrderComments" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and workOrderId in (select workOrderId from WorkOrders where recordDelete_timeMillis is not null)") + .prepare(`update WorkOrderComments + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and workOrderId in ( + select workOrderId from WorkOrders where recordDelete_timeMillis is not null)`) .run(requestSession.user.userName, rightNowMillis).changes; purgedRecordCount += database .prepare("delete from WorkOrderComments where recordDelete_timeMillis <= ?") .run(recordDelete_timeMillisMin).changes; inactivedRecordCount += database - .prepare("update WorkOrderLotOccupancies" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and workOrderId in (select workOrderId from WorkOrders where recordDelete_timeMillis is not null)") + .prepare(`update WorkOrderLotOccupancies + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and workOrderId in ( + select workOrderId from WorkOrders where recordDelete_timeMillis is not null)`) .run(requestSession.user.userName, rightNowMillis).changes; purgedRecordCount += database .prepare("delete from WorkOrderLotOccupancies where recordDelete_timeMillis <= ?") .run(recordDelete_timeMillisMin).changes; inactivedRecordCount += database - .prepare("update WorkOrderLots" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and workOrderId in (select workOrderId from WorkOrders where recordDelete_timeMillis is not null)") + .prepare(`update WorkOrderLots + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and workOrderId in ( + select workOrderId from WorkOrders where recordDelete_timeMillis is not null)`) .run(requestSession.user.userName, rightNowMillis).changes; purgedRecordCount += database .prepare("delete from WorkOrderLots where recordDelete_timeMillis <= ?") .run(recordDelete_timeMillisMin).changes; inactivedRecordCount += database - .prepare("update WorkOrderMilestones" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and workOrderId in (select workOrderId from WorkOrders where recordDelete_timeMillis is not null)") + .prepare(`update WorkOrderMilestones + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and workOrderId in ( + select workOrderId from WorkOrders where recordDelete_timeMillis is not null)`) .run(requestSession.user.userName, rightNowMillis).changes; purgedRecordCount += database .prepare("delete from WorkOrderMilestones where recordDelete_timeMillis <= ?") .run(recordDelete_timeMillisMin).changes; purgedRecordCount += database - .prepare("delete from WorkOrders where recordDelete_timeMillis <= ?" + - " and workOrderId not in (select workOrderId from WorkOrderComments)" + - " and workOrderId not in (select workOrderId from WorkOrderLotOccupancies)" + - " and workOrderId not in (select workOrderId from WorkOrderLots)" + - " and workOrderId not in (select workOrderId from WorkOrderMilestones)") + .prepare(`delete from WorkOrders + where recordDelete_timeMillis <= ? + and workOrderId not in (select workOrderId from WorkOrderComments) + and workOrderId not in (select workOrderId from WorkOrderLotOccupancies) + and workOrderId not in (select workOrderId from WorkOrderLots) + and workOrderId not in (select workOrderId from WorkOrderMilestones)`) .run(recordDelete_timeMillisMin).changes; purgedRecordCount += database - .prepare("delete from WorkOrderMilestoneTypes where recordDelete_timeMillis <= ?" + - " and workOrderMilestoneTypeId not in (select workOrderMilestoneTypeId from WorkOrderMilestones)") + .prepare(`delete from WorkOrderMilestoneTypes + where recordDelete_timeMillis <= ? + and workOrderMilestoneTypeId not in ( + select workOrderMilestoneTypeId from WorkOrderMilestones)`) .run(recordDelete_timeMillisMin).changes; purgedRecordCount += database - .prepare("delete from WorkOrderTypes where recordDelete_timeMillis <= ?" + - " and workOrderTypeId not in (select workOrderTypeId from WorkOrders)") + .prepare(`delete from WorkOrderTypes + where recordDelete_timeMillis <= ? + and workOrderTypeId not in (select workOrderTypeId from WorkOrders)`) .run(recordDelete_timeMillisMin).changes; inactivedRecordCount += database - .prepare("update LotOccupancyComments" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and lotOccupancyId in (select lotOccupancyId from LotOccupancies where recordDelete_timeMillis is not null)") + .prepare(`update LotOccupancyComments + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and lotOccupancyId in ( + select lotOccupancyId from LotOccupancies where recordDelete_timeMillis is not null)`) .run(requestSession.user.userName, rightNowMillis).changes; purgedRecordCount += database .prepare("delete from LotOccupancyComments where recordDelete_timeMillis <= ?") .run(recordDelete_timeMillisMin).changes; inactivedRecordCount += database - .prepare("update LotOccupancyFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and lotOccupancyId in (select lotOccupancyId from LotOccupancies where recordDelete_timeMillis is not null)") + .prepare(`update LotOccupancyFields + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and lotOccupancyId in (select lotOccupancyId from LotOccupancies where recordDelete_timeMillis is not null)`) .run(requestSession.user.userName, rightNowMillis).changes; purgedRecordCount += database .prepare("delete from LotOccupancyFields where recordDelete_timeMillis <= ?") .run(recordDelete_timeMillisMin).changes; inactivedRecordCount += database - .prepare("update LotOccupancyOccupants" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and lotOccupancyId in (select lotOccupancyId from LotOccupancies where recordDelete_timeMillis is not null)") + .prepare(`update LotOccupancyOccupants + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and lotOccupancyId in (select lotOccupancyId from LotOccupancies where recordDelete_timeMillis is not null)`) .run(requestSession.user.userName, rightNowMillis).changes; purgedRecordCount += database .prepare("delete from LotOccupancyOccupants where recordDelete_timeMillis <= ?") @@ -100,118 +109,128 @@ export const cleanupDatabase = (requestSession) => { .prepare("delete from LotOccupancyTransactions where recordDelete_timeMillis <= ?") .run(recordDelete_timeMillisMin).changes; purgedRecordCount += database - .prepare("delete from LotOccupancies where recordDelete_timeMillis <= ?" + - " and lotOccupancyId not in (select lotOccupancyId from LotOccupancyComments)" + - " and lotOccupancyId not in (select lotOccupancyId from LotOccupancyFees)" + - " and lotOccupancyId not in (select lotOccupancyId from LotOccupancyFields)" + - " and lotOccupancyId not in (select lotOccupancyId from LotOccupancyOccupants)" + - " and lotOccupancyId not in (select lotOccupancyId from LotOccupancyTransactions)" + - " and lotOccupancyId not in (select lotOccupancyId from WorkOrderLotOccupancies)") + .prepare(`delete from LotOccupancies + where recordDelete_timeMillis <= ? + and lotOccupancyId not in (select lotOccupancyId from LotOccupancyComments) + and lotOccupancyId not in (select lotOccupancyId from LotOccupancyFees) + and lotOccupancyId not in (select lotOccupancyId from LotOccupancyFields) + and lotOccupancyId not in (select lotOccupancyId from LotOccupancyOccupants) + and lotOccupancyId not in (select lotOccupancyId from LotOccupancyTransactions) + and lotOccupancyId not in (select lotOccupancyId from WorkOrderLotOccupancies)`) .run(recordDelete_timeMillisMin).changes; inactivedRecordCount += database - .prepare("update Fees" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and feeCategoryId in (select feeCategoryId from FeeCategories where recordDelete_timeMillis is not null)") + .prepare(`update Fees + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and feeCategoryId in (select feeCategoryId from FeeCategories where recordDelete_timeMillis is not null)`) .run(requestSession.user.userName, rightNowMillis).changes; purgedRecordCount += database - .prepare("delete from Fees where recordDelete_timeMillis <= ?" + - " and feeId not in (select feeId from LotOccupancyFees)") + .prepare(`delete from Fees + where recordDelete_timeMillis <= ? + and feeId not in (select feeId from LotOccupancyFees)`) .run(recordDelete_timeMillisMin).changes; purgedRecordCount += database - .prepare("delete from FeeCategories where recordDelete_timeMillis <= ?" + - " and feeCategoryId not in (select feeCategoryId from Fees)") + .prepare(`delete from FeeCategories + where recordDelete_timeMillis <= ? + and feeCategoryId not in (select feeCategoryId from Fees)`) .run(recordDelete_timeMillisMin).changes; inactivedRecordCount += database - .prepare("update OccupancyTypeFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and occupancyTypeId in (select occupancyTypeId from OccupancyTypes where recordDelete_timeMillis is not null)") + .prepare(`update OccupancyTypeFields + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and occupancyTypeId in (select occupancyTypeId from OccupancyTypes where recordDelete_timeMillis is not null)`) .run(requestSession.user.userName, rightNowMillis).changes; purgedRecordCount += database - .prepare("delete from OccupancyTypeFields where recordDelete_timeMillis <= ?" + - " and occupancyTypeFieldId not in (select occupancyTypeFieldId from LotOccupancyFields)") + .prepare(`delete from OccupancyTypeFields + where recordDelete_timeMillis <= ? + and occupancyTypeFieldId not in (select occupancyTypeFieldId from LotOccupancyFields)`) .run(recordDelete_timeMillisMin).changes; inactivedRecordCount += database - .prepare("update OccupancyTypePrints" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and occupancyTypeId in (select occupancyTypeId from OccupancyTypes where recordDelete_timeMillis is not null)") + .prepare(`update OccupancyTypePrints + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and occupancyTypeId in (select occupancyTypeId from OccupancyTypes where recordDelete_timeMillis is not null)`) .run(requestSession.user.userName, rightNowMillis).changes; purgedRecordCount += database .prepare("delete from OccupancyTypePrints where recordDelete_timeMillis <= ?") .run(recordDelete_timeMillisMin).changes; purgedRecordCount += database - .prepare("delete from OccupancyTypes where recordDelete_timeMillis <= ?" + - " and occupancyTypeId not in (select occupancyTypeId from OccupancyTypeFields)" + - " and occupancyTypeId not in (select occupancyTypeId from OccupancyTypePrints)" + - " and occupancyTypeId not in (select occupancyTypeId from LotOccupancies)" + - " and occupancyTypeId not in (select occupancyTypeId from Fees)") + .prepare(`delete from OccupancyTypes + where recordDelete_timeMillis <= ? + and occupancyTypeId not in (select occupancyTypeId from OccupancyTypeFields) + and occupancyTypeId not in (select occupancyTypeId from OccupancyTypePrints) + and occupancyTypeId not in (select occupancyTypeId from LotOccupancies) + and occupancyTypeId not in (select occupancyTypeId from Fees)`) .run(recordDelete_timeMillisMin).changes; purgedRecordCount += database - .prepare("delete from LotOccupantTypes where recordDelete_timeMillis <= ?" + - " and lotOccupantTypeId not in (select lotOccupantTypeId from LotOccupancyOccupants)") + .prepare(`delete from LotOccupantTypes + where recordDelete_timeMillis <= ? + and lotOccupantTypeId not in (select lotOccupantTypeId from LotOccupancyOccupants)`) .run(recordDelete_timeMillisMin).changes; inactivedRecordCount += database - .prepare("update LotComments" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and lotId in (select lotId from Lots where recordDelete_timeMillis is not null)") + .prepare(`update LotComments + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and lotId in (select lotId from Lots where recordDelete_timeMillis is not null)`) .run(requestSession.user.userName, rightNowMillis).changes; purgedRecordCount += database .prepare("delete from LotComments where recordDelete_timeMillis <= ?") .run(recordDelete_timeMillisMin).changes; inactivedRecordCount += database - .prepare("update LotFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and lotId in (select lotId from Lots where recordDelete_timeMillis is not null)") + .prepare(`update LotFields + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and lotId in (select lotId from Lots where recordDelete_timeMillis is not null)`) .run(requestSession.user.userName, rightNowMillis).changes; purgedRecordCount += database .prepare("delete from LotFields where recordDelete_timeMillis <= ?") .run(recordDelete_timeMillisMin).changes; inactivedRecordCount += database - .prepare("update Lots" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and mapId in (select mapId from Maps where recordDelete_timeMillis is not null)") + .prepare(`update Lots + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and mapId in (select mapId from Maps where recordDelete_timeMillis is not null)`) .run(requestSession.user.userName, rightNowMillis).changes; purgedRecordCount += database - .prepare("delete from Lots where recordDelete_timeMillis <= ?" + - " and lotId not in (select lotId from LotComments)" + - " and lotId not in (select lotId from LotFields)" + - " and lotId not in (select lotId from LotOccupancies)" + - " and lotId not in (select lotId from WorkOrderLots)") + .prepare(`delete from Lots + where recordDelete_timeMillis <= ? + and lotId not in (select lotId from LotComments) + and lotId not in (select lotId from LotFields) + and lotId not in (select lotId from LotOccupancies) + and lotId not in (select lotId from WorkOrderLots)`) .run(recordDelete_timeMillisMin).changes; purgedRecordCount += database - .prepare("delete from LotStatuses where recordDelete_timeMillis <= ?" + - " and lotStatusId not in (select lotStatusId from Lots)") + .prepare(`delete from LotStatuses + where recordDelete_timeMillis <= ? + and lotStatusId not in (select lotStatusId from Lots)`) .run(recordDelete_timeMillisMin).changes; inactivedRecordCount += database - .prepare("update LotTypeFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and lotTypeId in (select lotTypeId from LotTypes where recordDelete_timeMillis is not null)") + .prepare(`update LotTypeFields + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and lotTypeId in (select lotTypeId from LotTypes where recordDelete_timeMillis is not null)`) .run(requestSession.user.userName, rightNowMillis).changes; purgedRecordCount += database - .prepare("delete from LotTypeFields where recordDelete_timeMillis <= ?" + - " and lotTypeFieldId not in (select lotTypeFieldId from LotFields)") + .prepare(`delete from LotTypeFields + where recordDelete_timeMillis <= ? + and lotTypeFieldId not in (select lotTypeFieldId from LotFields)`) .run(recordDelete_timeMillisMin).changes; purgedRecordCount += database - .prepare("delete from LotTypes where recordDelete_timeMillis <= ?" + - " and lotTypeId not in (select lotTypeId from Lots)") + .prepare(`delete from LotTypes + where recordDelete_timeMillis <= ? + and lotTypeId not in (select lotTypeId from Lots)`) .run(recordDelete_timeMillisMin).changes; database.close(); return { inactivedRecordCount, purgedRecordCount }; -}; +} export default cleanupDatabase; diff --git a/helpers/lotOccupancyDB/cleanupDatabase.ts b/helpers/lotOccupancyDB/cleanupDatabase.ts index 9c9c6420..a7113b24 100644 --- a/helpers/lotOccupancyDB/cleanupDatabase.ts +++ b/helpers/lotOccupancyDB/cleanupDatabase.ts @@ -6,7 +6,7 @@ import * as configFunctions from "../functions.config.js"; import type * as recordTypes from "../../types/recordTypes"; -export const cleanupDatabase = (requestSession: recordTypes.PartialSession) => { +export function cleanupDatabase(requestSession: recordTypes.PartialSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); @@ -17,15 +17,18 @@ export const cleanupDatabase = (requestSession: recordTypes.PartialSession) => { let inactivedRecordCount = 0; let purgedRecordCount = 0; - // Work Order Comments + /* + * Work Order Comments + */ inactivedRecordCount += database .prepare( - "update WorkOrderComments" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and workOrderId in (select workOrderId from WorkOrders where recordDelete_timeMillis is not null)" + `update WorkOrderComments + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and workOrderId in ( + select workOrderId from WorkOrders where recordDelete_timeMillis is not null)` ) .run(requestSession.user.userName, rightNowMillis).changes; @@ -33,15 +36,18 @@ export const cleanupDatabase = (requestSession: recordTypes.PartialSession) => { .prepare("delete from WorkOrderComments where recordDelete_timeMillis <= ?") .run(recordDelete_timeMillisMin).changes; - // Work Order Lot Occupancies + /* + * Work Order Lot Occupancies + */ inactivedRecordCount += database .prepare( - "update WorkOrderLotOccupancies" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and workOrderId in (select workOrderId from WorkOrders where recordDelete_timeMillis is not null)" + `update WorkOrderLotOccupancies + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and workOrderId in ( + select workOrderId from WorkOrders where recordDelete_timeMillis is not null)` ) .run(requestSession.user.userName, rightNowMillis).changes; @@ -49,15 +55,18 @@ export const cleanupDatabase = (requestSession: recordTypes.PartialSession) => { .prepare("delete from WorkOrderLotOccupancies where recordDelete_timeMillis <= ?") .run(recordDelete_timeMillisMin).changes; - // Work Order Lots + /* + * Work Order Lots + */ inactivedRecordCount += database .prepare( - "update WorkOrderLots" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and workOrderId in (select workOrderId from WorkOrders where recordDelete_timeMillis is not null)" + `update WorkOrderLots + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and workOrderId in ( + select workOrderId from WorkOrders where recordDelete_timeMillis is not null)` ) .run(requestSession.user.userName, rightNowMillis).changes; @@ -65,15 +74,18 @@ export const cleanupDatabase = (requestSession: recordTypes.PartialSession) => { .prepare("delete from WorkOrderLots where recordDelete_timeMillis <= ?") .run(recordDelete_timeMillisMin).changes; - // Work Order Milestones + /* + * Work Order Milestones + */ inactivedRecordCount += database .prepare( - "update WorkOrderMilestones" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and workOrderId in (select workOrderId from WorkOrders where recordDelete_timeMillis is not null)" + `update WorkOrderMilestones + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and workOrderId in ( + select workOrderId from WorkOrders where recordDelete_timeMillis is not null)` ) .run(requestSession.user.userName, rightNowMillis).changes; @@ -81,45 +93,58 @@ export const cleanupDatabase = (requestSession: recordTypes.PartialSession) => { .prepare("delete from WorkOrderMilestones where recordDelete_timeMillis <= ?") .run(recordDelete_timeMillisMin).changes; - // Work Orders + /* + * Work Orders + */ purgedRecordCount += database .prepare( - "delete from WorkOrders where recordDelete_timeMillis <= ?" + - " and workOrderId not in (select workOrderId from WorkOrderComments)" + - " and workOrderId not in (select workOrderId from WorkOrderLotOccupancies)" + - " and workOrderId not in (select workOrderId from WorkOrderLots)" + - " and workOrderId not in (select workOrderId from WorkOrderMilestones)" + `delete from WorkOrders + where recordDelete_timeMillis <= ? + and workOrderId not in (select workOrderId from WorkOrderComments) + and workOrderId not in (select workOrderId from WorkOrderLotOccupancies) + and workOrderId not in (select workOrderId from WorkOrderLots) + and workOrderId not in (select workOrderId from WorkOrderMilestones)` ) .run(recordDelete_timeMillisMin).changes; - // Work Order Milestone Types + /* + * Work Order Milestone Types + */ purgedRecordCount += database .prepare( - "delete from WorkOrderMilestoneTypes where recordDelete_timeMillis <= ?" + - " and workOrderMilestoneTypeId not in (select workOrderMilestoneTypeId from WorkOrderMilestones)" + `delete from WorkOrderMilestoneTypes + where recordDelete_timeMillis <= ? + and workOrderMilestoneTypeId not in ( + select workOrderMilestoneTypeId from WorkOrderMilestones)` ) .run(recordDelete_timeMillisMin).changes; - // Work Order Types + /* + * Work Order Types + */ purgedRecordCount += database .prepare( - "delete from WorkOrderTypes where recordDelete_timeMillis <= ?" + - " and workOrderTypeId not in (select workOrderTypeId from WorkOrders)" + `delete from WorkOrderTypes + where recordDelete_timeMillis <= ? + and workOrderTypeId not in (select workOrderTypeId from WorkOrders)` ) .run(recordDelete_timeMillisMin).changes; - // Lot Occupancy Comments + /* + * Lot Occupancy Comments + */ inactivedRecordCount += database .prepare( - "update LotOccupancyComments" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and lotOccupancyId in (select lotOccupancyId from LotOccupancies where recordDelete_timeMillis is not null)" + `update LotOccupancyComments + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and lotOccupancyId in ( + select lotOccupancyId from LotOccupancies where recordDelete_timeMillis is not null)` ) .run(requestSession.user.userName, rightNowMillis).changes; @@ -127,15 +152,17 @@ export const cleanupDatabase = (requestSession: recordTypes.PartialSession) => { .prepare("delete from LotOccupancyComments where recordDelete_timeMillis <= ?") .run(recordDelete_timeMillisMin).changes; - // Lot Occupancy Fields + /* + * Lot Occupancy Fields + */ inactivedRecordCount += database .prepare( - "update LotOccupancyFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and lotOccupancyId in (select lotOccupancyId from LotOccupancies where recordDelete_timeMillis is not null)" + `update LotOccupancyFields + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and lotOccupancyId in (select lotOccupancyId from LotOccupancies where recordDelete_timeMillis is not null)` ) .run(requestSession.user.userName, rightNowMillis).changes; @@ -143,15 +170,17 @@ export const cleanupDatabase = (requestSession: recordTypes.PartialSession) => { .prepare("delete from LotOccupancyFields where recordDelete_timeMillis <= ?") .run(recordDelete_timeMillisMin).changes; - // Lot Occupancy Occupants + /* + * Lot Occupancy Occupants + */ inactivedRecordCount += database .prepare( - "update LotOccupancyOccupants" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and lotOccupancyId in (select lotOccupancyId from LotOccupancies where recordDelete_timeMillis is not null)" + `update LotOccupancyOccupants + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and lotOccupancyId in (select lotOccupancyId from LotOccupancies where recordDelete_timeMillis is not null)` ) .run(requestSession.user.userName, rightNowMillis).changes; @@ -159,8 +188,10 @@ export const cleanupDatabase = (requestSession: recordTypes.PartialSession) => { .prepare("delete from LotOccupancyOccupants where recordDelete_timeMillis <= ?") .run(recordDelete_timeMillisMin).changes; - // Lot Occupancy Fees/Transactions - // - Maintain financials, do not delete related. + /* + * Lot Occupancy Fees/Transactions + * - Maintain financials, do not delete related. + */ purgedRecordCount += database .prepare("delete from LotOccupancyFees where recordDelete_timeMillis <= ?") @@ -170,76 +201,90 @@ export const cleanupDatabase = (requestSession: recordTypes.PartialSession) => { .prepare("delete from LotOccupancyTransactions where recordDelete_timeMillis <= ?") .run(recordDelete_timeMillisMin).changes; - // Lot Occupancies + /* + * Lot Occupancies + */ purgedRecordCount += database .prepare( - "delete from LotOccupancies where recordDelete_timeMillis <= ?" + - " and lotOccupancyId not in (select lotOccupancyId from LotOccupancyComments)" + - " and lotOccupancyId not in (select lotOccupancyId from LotOccupancyFees)" + - " and lotOccupancyId not in (select lotOccupancyId from LotOccupancyFields)" + - " and lotOccupancyId not in (select lotOccupancyId from LotOccupancyOccupants)" + - " and lotOccupancyId not in (select lotOccupancyId from LotOccupancyTransactions)" + - " and lotOccupancyId not in (select lotOccupancyId from WorkOrderLotOccupancies)" + `delete from LotOccupancies + where recordDelete_timeMillis <= ? + and lotOccupancyId not in (select lotOccupancyId from LotOccupancyComments) + and lotOccupancyId not in (select lotOccupancyId from LotOccupancyFees) + and lotOccupancyId not in (select lotOccupancyId from LotOccupancyFields) + and lotOccupancyId not in (select lotOccupancyId from LotOccupancyOccupants) + and lotOccupancyId not in (select lotOccupancyId from LotOccupancyTransactions) + and lotOccupancyId not in (select lotOccupancyId from WorkOrderLotOccupancies)` ) .run(recordDelete_timeMillisMin).changes; - // Fees + /* + * Fees + */ inactivedRecordCount += database .prepare( - "update Fees" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and feeCategoryId in (select feeCategoryId from FeeCategories where recordDelete_timeMillis is not null)" + `update Fees + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and feeCategoryId in (select feeCategoryId from FeeCategories where recordDelete_timeMillis is not null)` ) .run(requestSession.user.userName, rightNowMillis).changes; purgedRecordCount += database .prepare( - "delete from Fees where recordDelete_timeMillis <= ?" + - " and feeId not in (select feeId from LotOccupancyFees)" + `delete from Fees + where recordDelete_timeMillis <= ? + and feeId not in (select feeId from LotOccupancyFees)` ) .run(recordDelete_timeMillisMin).changes; - // Fee Categories + /* + * Fee Categories + */ purgedRecordCount += database .prepare( - "delete from FeeCategories where recordDelete_timeMillis <= ?" + - " and feeCategoryId not in (select feeCategoryId from Fees)" + `delete from FeeCategories + where recordDelete_timeMillis <= ? + and feeCategoryId not in (select feeCategoryId from Fees)` ) .run(recordDelete_timeMillisMin).changes; - // Occupancy Type Fields + /* + * Occupancy Type Fields + */ inactivedRecordCount += database .prepare( - "update OccupancyTypeFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and occupancyTypeId in (select occupancyTypeId from OccupancyTypes where recordDelete_timeMillis is not null)" + `update OccupancyTypeFields + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and occupancyTypeId in (select occupancyTypeId from OccupancyTypes where recordDelete_timeMillis is not null)` ) .run(requestSession.user.userName, rightNowMillis).changes; purgedRecordCount += database .prepare( - "delete from OccupancyTypeFields where recordDelete_timeMillis <= ?" + - " and occupancyTypeFieldId not in (select occupancyTypeFieldId from LotOccupancyFields)" + `delete from OccupancyTypeFields + where recordDelete_timeMillis <= ? + and occupancyTypeFieldId not in (select occupancyTypeFieldId from LotOccupancyFields)` ) .run(recordDelete_timeMillisMin).changes; - // Occupancy Type Prints + /* + * Occupancy Type Prints + */ inactivedRecordCount += database .prepare( - "update OccupancyTypePrints" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and occupancyTypeId in (select occupancyTypeId from OccupancyTypes where recordDelete_timeMillis is not null)" + `update OccupancyTypePrints + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and occupancyTypeId in (select occupancyTypeId from OccupancyTypes where recordDelete_timeMillis is not null)` ) .run(requestSession.user.userName, rightNowMillis).changes; @@ -247,36 +292,44 @@ export const cleanupDatabase = (requestSession: recordTypes.PartialSession) => { .prepare("delete from OccupancyTypePrints where recordDelete_timeMillis <= ?") .run(recordDelete_timeMillisMin).changes; - // Occupancy Types + /* + * Occupancy Types + */ purgedRecordCount += database .prepare( - "delete from OccupancyTypes where recordDelete_timeMillis <= ?" + - " and occupancyTypeId not in (select occupancyTypeId from OccupancyTypeFields)" + - " and occupancyTypeId not in (select occupancyTypeId from OccupancyTypePrints)" + - " and occupancyTypeId not in (select occupancyTypeId from LotOccupancies)" + - " and occupancyTypeId not in (select occupancyTypeId from Fees)" + `delete from OccupancyTypes + where recordDelete_timeMillis <= ? + and occupancyTypeId not in (select occupancyTypeId from OccupancyTypeFields) + and occupancyTypeId not in (select occupancyTypeId from OccupancyTypePrints) + and occupancyTypeId not in (select occupancyTypeId from LotOccupancies) + and occupancyTypeId not in (select occupancyTypeId from Fees)` ) .run(recordDelete_timeMillisMin).changes; - // Lot Occupant Types + /* + * Lot Occupant Types + */ purgedRecordCount += database .prepare( - "delete from LotOccupantTypes where recordDelete_timeMillis <= ?" + - " and lotOccupantTypeId not in (select lotOccupantTypeId from LotOccupancyOccupants)" + `delete from LotOccupantTypes + where recordDelete_timeMillis <= ? + and lotOccupantTypeId not in (select lotOccupantTypeId from LotOccupancyOccupants)` ) .run(recordDelete_timeMillisMin).changes; - // Lot Comments + /* + * Lot Comments + */ inactivedRecordCount += database .prepare( - "update LotComments" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and lotId in (select lotId from Lots where recordDelete_timeMillis is not null)" + `update LotComments + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and lotId in (select lotId from Lots where recordDelete_timeMillis is not null)` ) .run(requestSession.user.userName, rightNowMillis).changes; @@ -284,15 +337,17 @@ export const cleanupDatabase = (requestSession: recordTypes.PartialSession) => { .prepare("delete from LotComments where recordDelete_timeMillis <= ?") .run(recordDelete_timeMillisMin).changes; - // Lot Fields + /* + * Lot Fields + */ inactivedRecordCount += database .prepare( - "update LotFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and lotId in (select lotId from Lots where recordDelete_timeMillis is not null)" + `update LotFields + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and lotId in (select lotId from Lots where recordDelete_timeMillis is not null)` ) .run(requestSession.user.userName, rightNowMillis).changes; @@ -300,62 +355,74 @@ export const cleanupDatabase = (requestSession: recordTypes.PartialSession) => { .prepare("delete from LotFields where recordDelete_timeMillis <= ?") .run(recordDelete_timeMillisMin).changes; - // Lots + /* + * Lots + */ inactivedRecordCount += database .prepare( - "update Lots" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and mapId in (select mapId from Maps where recordDelete_timeMillis is not null)" + `update Lots + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and mapId in (select mapId from Maps where recordDelete_timeMillis is not null)` ) .run(requestSession.user.userName, rightNowMillis).changes; purgedRecordCount += database .prepare( - "delete from Lots where recordDelete_timeMillis <= ?" + - " and lotId not in (select lotId from LotComments)" + - " and lotId not in (select lotId from LotFields)" + - " and lotId not in (select lotId from LotOccupancies)" + - " and lotId not in (select lotId from WorkOrderLots)" + `delete from Lots + where recordDelete_timeMillis <= ? + and lotId not in (select lotId from LotComments) + and lotId not in (select lotId from LotFields) + and lotId not in (select lotId from LotOccupancies) + and lotId not in (select lotId from WorkOrderLots)` ) .run(recordDelete_timeMillisMin).changes; - // Lot Statuses + /* + * Lot Statuses + */ purgedRecordCount += database .prepare( - "delete from LotStatuses where recordDelete_timeMillis <= ?" + - " and lotStatusId not in (select lotStatusId from Lots)" + `delete from LotStatuses + where recordDelete_timeMillis <= ? + and lotStatusId not in (select lotStatusId from Lots)` ) .run(recordDelete_timeMillisMin).changes; - // Lot Type Fields + /* + * Lot Type Fields + */ inactivedRecordCount += database .prepare( - "update LotTypeFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and lotTypeId in (select lotTypeId from LotTypes where recordDelete_timeMillis is not null)" + `update LotTypeFields + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where recordDelete_timeMillis is null + and lotTypeId in (select lotTypeId from LotTypes where recordDelete_timeMillis is not null)` ) .run(requestSession.user.userName, rightNowMillis).changes; purgedRecordCount += database .prepare( - "delete from LotTypeFields where recordDelete_timeMillis <= ?" + - " and lotTypeFieldId not in (select lotTypeFieldId from LotFields)" + `delete from LotTypeFields + where recordDelete_timeMillis <= ? + and lotTypeFieldId not in (select lotTypeFieldId from LotFields)` ) .run(recordDelete_timeMillisMin).changes; - // Lot Types + /* + * Lot Types + */ purgedRecordCount += database .prepare( - "delete from LotTypes where recordDelete_timeMillis <= ?" + - " and lotTypeId not in (select lotTypeId from Lots)" + `delete from LotTypes + where recordDelete_timeMillis <= ? + and lotTypeId not in (select lotTypeId from Lots)` ) .run(recordDelete_timeMillisMin).changes; @@ -365,6 +432,6 @@ export const cleanupDatabase = (requestSession: recordTypes.PartialSession) => { inactivedRecordCount, purgedRecordCount }; -}; +} export default cleanupDatabase; diff --git a/helpers/lotOccupancyDB/closeWorkOrder.d.ts b/helpers/lotOccupancyDB/closeWorkOrder.d.ts index 617afe74..11052dc1 100644 --- a/helpers/lotOccupancyDB/closeWorkOrder.d.ts +++ b/helpers/lotOccupancyDB/closeWorkOrder.d.ts @@ -3,5 +3,5 @@ interface AddWorkOrderForm { workOrderId: number | string; workOrderCloseDateString?: string; } -export declare const closeWorkOrder: (workOrderForm: AddWorkOrderForm, requestSession: recordTypes.PartialSession) => boolean; +export declare function closeWorkOrder(workOrderForm: AddWorkOrderForm, requestSession: recordTypes.PartialSession): boolean; export default closeWorkOrder; diff --git a/helpers/lotOccupancyDB/closeWorkOrder.js b/helpers/lotOccupancyDB/closeWorkOrder.js index c67c3971..cfc6a9d3 100644 --- a/helpers/lotOccupancyDB/closeWorkOrder.js +++ b/helpers/lotOccupancyDB/closeWorkOrder.js @@ -1,19 +1,19 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { dateStringToInteger, dateToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js"; -export const closeWorkOrder = (workOrderForm, requestSession) => { +export function closeWorkOrder(workOrderForm, requestSession) { const database = sqlite(databasePath); const rightNow = new Date(); const result = database - .prepare("update WorkOrders" + - " set workOrderCloseDate = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where workOrderId = ?") + .prepare(`update WorkOrders + set workOrderCloseDate = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where workOrderId = ?`) .run(workOrderForm.workOrderCloseDateString ? dateStringToInteger(workOrderForm.workOrderCloseDateString) : dateToInteger(new Date()), requestSession.user.userName, rightNow.getTime(), workOrderForm.workOrderId); database.close(); return result.changes > 0; -}; +} export default closeWorkOrder; diff --git a/helpers/lotOccupancyDB/closeWorkOrder.ts b/helpers/lotOccupancyDB/closeWorkOrder.ts index a5b36043..c745d821 100644 --- a/helpers/lotOccupancyDB/closeWorkOrder.ts +++ b/helpers/lotOccupancyDB/closeWorkOrder.ts @@ -2,10 +2,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { - dateStringToInteger, - dateToInteger -} from "@cityssm/expressjs-server-js/dateTimeFns.js"; +import { dateStringToInteger, dateToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js"; import type * as recordTypes from "../../types/recordTypes"; @@ -14,21 +11,21 @@ interface AddWorkOrderForm { workOrderCloseDateString?: string; } -export const closeWorkOrder = ( +export function closeWorkOrder( workOrderForm: AddWorkOrderForm, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNow = new Date(); const result = database .prepare( - "update WorkOrders" + - " set workOrderCloseDate = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where workOrderId = ?" + `update WorkOrders + set workOrderCloseDate = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where workOrderId = ?` ) .run( workOrderForm.workOrderCloseDateString @@ -42,6 +39,6 @@ export const closeWorkOrder = ( database.close(); return result.changes > 0; -}; +} export default closeWorkOrder; diff --git a/helpers/lotOccupancyDB/completeWorkOrderMiletstone.d.ts b/helpers/lotOccupancyDB/completeWorkOrderMiletstone.d.ts index f9da97bf..8b1f3d5b 100644 --- a/helpers/lotOccupancyDB/completeWorkOrderMiletstone.d.ts +++ b/helpers/lotOccupancyDB/completeWorkOrderMiletstone.d.ts @@ -4,5 +4,5 @@ interface CompleteWorkOrderMilestoneForm { workOrderMilestoneCompletionDateString?: string; workOrderMilestoneCompletionTimeString?: string; } -export declare const completeWorkOrderMilestone: (milestoneForm: CompleteWorkOrderMilestoneForm, requestSession: recordTypes.PartialSession) => boolean; +export declare function completeWorkOrderMilestone(milestoneForm: CompleteWorkOrderMilestoneForm, requestSession: recordTypes.PartialSession): boolean; export default completeWorkOrderMilestone; diff --git a/helpers/lotOccupancyDB/completeWorkOrderMiletstone.js b/helpers/lotOccupancyDB/completeWorkOrderMiletstone.js index 07b3b1bd..8c5296f2 100644 --- a/helpers/lotOccupancyDB/completeWorkOrderMiletstone.js +++ b/helpers/lotOccupancyDB/completeWorkOrderMiletstone.js @@ -1,16 +1,16 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { dateStringToInteger, dateToInteger, dateToTimeInteger, timeStringToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js"; -export const completeWorkOrderMilestone = (milestoneForm, requestSession) => { +export function completeWorkOrderMilestone(milestoneForm, requestSession) { const rightNow = new Date(); const database = sqlite(databasePath); const result = database - .prepare("update WorkOrderMilestones" + - " set workOrderMilestoneCompletionDate = ?," + - " workOrderMilestoneCompletionTime = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where workOrderMilestoneId = ?") + .prepare(`update WorkOrderMilestones + set workOrderMilestoneCompletionDate = ?, + workOrderMilestoneCompletionTime = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where workOrderMilestoneId = ?`) .run(milestoneForm.workOrderMilestoneCompletionDateString ? dateStringToInteger(milestoneForm.workOrderMilestoneCompletionDateString) : dateToInteger(rightNow), milestoneForm.workOrderMilestoneCompletionTimeString @@ -18,5 +18,5 @@ export const completeWorkOrderMilestone = (milestoneForm, requestSession) => { : dateToTimeInteger(rightNow), requestSession.user.userName, rightNow.getTime(), milestoneForm.workOrderMilestoneId); database.close(); return result.changes > 0; -}; +} export default completeWorkOrderMilestone; diff --git a/helpers/lotOccupancyDB/completeWorkOrderMiletstone.ts b/helpers/lotOccupancyDB/completeWorkOrderMiletstone.ts index 4152de7e..c454f40c 100644 --- a/helpers/lotOccupancyDB/completeWorkOrderMiletstone.ts +++ b/helpers/lotOccupancyDB/completeWorkOrderMiletstone.ts @@ -17,33 +17,29 @@ interface CompleteWorkOrderMilestoneForm { workOrderMilestoneCompletionTimeString?: string; } -export const completeWorkOrderMilestone = ( +export function completeWorkOrderMilestone( milestoneForm: CompleteWorkOrderMilestoneForm, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const rightNow = new Date(); const database = sqlite(databasePath); const result = database .prepare( - "update WorkOrderMilestones" + - " set workOrderMilestoneCompletionDate = ?," + - " workOrderMilestoneCompletionTime = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where workOrderMilestoneId = ?" + `update WorkOrderMilestones + set workOrderMilestoneCompletionDate = ?, + workOrderMilestoneCompletionTime = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where workOrderMilestoneId = ?` ) .run( milestoneForm.workOrderMilestoneCompletionDateString - ? dateStringToInteger( - milestoneForm.workOrderMilestoneCompletionDateString - ) + ? dateStringToInteger(milestoneForm.workOrderMilestoneCompletionDateString) : dateToInteger(rightNow), milestoneForm.workOrderMilestoneCompletionTimeString - ? timeStringToInteger( - milestoneForm.workOrderMilestoneCompletionTimeString - ) + ? timeStringToInteger(milestoneForm.workOrderMilestoneCompletionTimeString) : dateToTimeInteger(rightNow), requestSession.user.userName, rightNow.getTime(), @@ -53,6 +49,6 @@ export const completeWorkOrderMilestone = ( database.close(); return result.changes > 0; -}; +} export default completeWorkOrderMilestone; diff --git a/helpers/lotOccupancyDB/copyLotOccupancy.d.ts b/helpers/lotOccupancyDB/copyLotOccupancy.d.ts index 704794be..75414278 100644 --- a/helpers/lotOccupancyDB/copyLotOccupancy.d.ts +++ b/helpers/lotOccupancyDB/copyLotOccupancy.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const copyLotOccupancy: (oldLotOccupancyId: number | string, requestSession: recordTypes.PartialSession) => number; +export declare function copyLotOccupancy(oldLotOccupancyId: number | string, requestSession: recordTypes.PartialSession): number; export default copyLotOccupancy; diff --git a/helpers/lotOccupancyDB/copyLotOccupancy.js b/helpers/lotOccupancyDB/copyLotOccupancy.js index ca07c036..f3ebca44 100644 --- a/helpers/lotOccupancyDB/copyLotOccupancy.js +++ b/helpers/lotOccupancyDB/copyLotOccupancy.js @@ -4,7 +4,7 @@ import { getLotOccupancy } from "./getLotOccupancy.js"; import { addLotOccupancy } from "./addLotOccupancy.js"; import { addLotOccupancyOccupant } from "./addLotOccupancyOccupant.js"; import { dateToString } from "@cityssm/expressjs-server-js/dateTimeFns.js"; -export const copyLotOccupancy = (oldLotOccupancyId, requestSession) => { +export function copyLotOccupancy(oldLotOccupancyId, requestSession) { const database = sqlite(databasePath); const oldLotOccupancy = getLotOccupancy(oldLotOccupancyId, database); const newLotOccupancyId = addLotOccupancy({ @@ -16,10 +16,11 @@ export const copyLotOccupancy = (oldLotOccupancyId, requestSession) => { const rightNowMillis = Date.now(); for (const occupancyField of oldLotOccupancy.lotOccupancyFields) { database - .prepare("insert into LotOccupancyFields" + - " (lotOccupancyId, occupancyTypeFieldId, lotOccupancyFieldValue," + - " recordCreate_userName, recordCreate_timeMillis, recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?)") + .prepare(`insert into LotOccupancyFields ( + lotOccupancyId, occupancyTypeFieldId, lotOccupancyFieldValue, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?)`) .run(newLotOccupancyId, occupancyField.occupancyTypeFieldId, occupancyField.lotOccupancyFieldValue, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis); } for (const occupant of oldLotOccupancy.lotOccupancyOccupants) { @@ -38,5 +39,5 @@ export const copyLotOccupancy = (oldLotOccupancyId, requestSession) => { } database.close(); return newLotOccupancyId; -}; +} export default copyLotOccupancy; diff --git a/helpers/lotOccupancyDB/copyLotOccupancy.ts b/helpers/lotOccupancyDB/copyLotOccupancy.ts index 065de521..d31c3033 100644 --- a/helpers/lotOccupancyDB/copyLotOccupancy.ts +++ b/helpers/lotOccupancyDB/copyLotOccupancy.ts @@ -10,10 +10,10 @@ import { dateToString } from "@cityssm/expressjs-server-js/dateTimeFns.js"; import type * as recordTypes from "../../types/recordTypes"; -export const copyLotOccupancy = ( +export function copyLotOccupancy( oldLotOccupancyId: number | string, requestSession: recordTypes.PartialSession -): number => { +): number { const database = sqlite(databasePath); const oldLotOccupancy = getLotOccupancy(oldLotOccupancyId, database); @@ -29,17 +29,20 @@ export const copyLotOccupancy = ( database ); - // Copy Fields + /* + * Copy Fields + */ const rightNowMillis = Date.now(); for (const occupancyField of oldLotOccupancy.lotOccupancyFields) { database .prepare( - "insert into LotOccupancyFields" + - " (lotOccupancyId, occupancyTypeFieldId, lotOccupancyFieldValue," + - " recordCreate_userName, recordCreate_timeMillis, recordUpdate_userName, recordUpdate_timeMillis)" + - " values (?, ?, ?, ?, ?, ?, ?)" + `insert into LotOccupancyFields ( + lotOccupancyId, occupancyTypeFieldId, lotOccupancyFieldValue, + recordCreate_userName, recordCreate_timeMillis, + recordUpdate_userName, recordUpdate_timeMillis) + values (?, ?, ?, ?, ?, ?, ?)` ) .run( newLotOccupancyId, @@ -52,7 +55,9 @@ export const copyLotOccupancy = ( ); } - // Copy Occupants + /* + * Copy Occupants + */ for (const occupant of oldLotOccupancy.lotOccupancyOccupants) { addLotOccupancyOccupant( @@ -76,6 +81,6 @@ export const copyLotOccupancy = ( database.close(); return newLotOccupancyId; -}; +} export default copyLotOccupancy; diff --git a/helpers/lotOccupancyDB/deleteFee.d.ts b/helpers/lotOccupancyDB/deleteFee.d.ts index 48bcdd3b..8f428d73 100644 --- a/helpers/lotOccupancyDB/deleteFee.d.ts +++ b/helpers/lotOccupancyDB/deleteFee.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteFee: (feeId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteFee(feeId: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteFee; diff --git a/helpers/lotOccupancyDB/deleteFee.js b/helpers/lotOccupancyDB/deleteFee.js index 0828772b..feb7a149 100644 --- a/helpers/lotOccupancyDB/deleteFee.js +++ b/helpers/lotOccupancyDB/deleteFee.js @@ -1,15 +1,15 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const deleteFee = (feeId, requestSession) => { +export function deleteFee(feeId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update Fees" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where feeId = ?") + .prepare(`update Fees + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where feeId = ?`) .run(requestSession.user.userName, rightNowMillis, feeId); database.close(); return result.changes > 0; -}; +} export default deleteFee; diff --git a/helpers/lotOccupancyDB/deleteFee.ts b/helpers/lotOccupancyDB/deleteFee.ts index e41d7b69..6b2b8a11 100644 --- a/helpers/lotOccupancyDB/deleteFee.ts +++ b/helpers/lotOccupancyDB/deleteFee.ts @@ -4,26 +4,26 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteFee = ( +export function deleteFee( feeId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update Fees" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where feeId = ?" + `update Fees + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where feeId = ?` ) .run(requestSession.user.userName, rightNowMillis, feeId); database.close(); return result.changes > 0; -}; +} export default deleteFee; diff --git a/helpers/lotOccupancyDB/deleteFeeCategory.d.ts b/helpers/lotOccupancyDB/deleteFeeCategory.d.ts index f5536fb1..551e1484 100644 --- a/helpers/lotOccupancyDB/deleteFeeCategory.d.ts +++ b/helpers/lotOccupancyDB/deleteFeeCategory.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteFeeCategory: (feeCategoryId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteFeeCategory(feeCategoryId: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteFeeCategory; diff --git a/helpers/lotOccupancyDB/deleteFeeCategory.js b/helpers/lotOccupancyDB/deleteFeeCategory.js index 0522140b..baaeee98 100644 --- a/helpers/lotOccupancyDB/deleteFeeCategory.js +++ b/helpers/lotOccupancyDB/deleteFeeCategory.js @@ -1,21 +1,21 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const deleteFeeCategory = (feeCategoryId, requestSession) => { +export function deleteFeeCategory(feeCategoryId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update FeeCategories" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where feeCategoryId = ?") + .prepare(`update FeeCategories + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where feeCategoryId = ?`) .run(requestSession.user.userName, rightNowMillis, feeCategoryId); database - .prepare("update Fees" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where feeCategoryId = ?") + .prepare(`update Fees + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where feeCategoryId = ?`) .run(requestSession.user.userName, rightNowMillis, feeCategoryId); database.close(); return result.changes > 0; -}; +} export default deleteFeeCategory; diff --git a/helpers/lotOccupancyDB/deleteFeeCategory.ts b/helpers/lotOccupancyDB/deleteFeeCategory.ts index ecd0370d..d5eeef7b 100644 --- a/helpers/lotOccupancyDB/deleteFeeCategory.ts +++ b/helpers/lotOccupancyDB/deleteFeeCategory.ts @@ -4,35 +4,35 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteFeeCategory = ( +export function deleteFeeCategory( feeCategoryId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update FeeCategories" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where feeCategoryId = ?" + `update FeeCategories + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where feeCategoryId = ?` ) .run(requestSession.user.userName, rightNowMillis, feeCategoryId); database .prepare( - "update Fees" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where feeCategoryId = ?" + `update Fees + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where feeCategoryId = ?` ) .run(requestSession.user.userName, rightNowMillis, feeCategoryId); database.close(); return result.changes > 0; -}; +} export default deleteFeeCategory; diff --git a/helpers/lotOccupancyDB/deleteLot.d.ts b/helpers/lotOccupancyDB/deleteLot.d.ts index c0235b58..eed4b3c3 100644 --- a/helpers/lotOccupancyDB/deleteLot.d.ts +++ b/helpers/lotOccupancyDB/deleteLot.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteLot: (lotId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteLot(lotId: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteLot; diff --git a/helpers/lotOccupancyDB/deleteLot.js b/helpers/lotOccupancyDB/deleteLot.js index 03cd89c1..827ad97a 100644 --- a/helpers/lotOccupancyDB/deleteLot.js +++ b/helpers/lotOccupancyDB/deleteLot.js @@ -1,27 +1,18 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const deleteLot = (lotId, requestSession) => { +export function deleteLot(lotId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); - const result = database - .prepare("update Lots" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotId = ?") - .run(requestSession.user.userName, rightNowMillis, lotId); - database - .prepare("update LotComments" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotId = ?") - .run(requestSession.user.userName, rightNowMillis, lotId); - database - .prepare("update LotFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotId = ?") - .run(requestSession.user.userName, rightNowMillis, lotId); + let result; + for (const tableName of ["LotFields", "LotComments", "Lots"]) { + result = database + .prepare(`update ${tableName} + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotId = ?`) + .run(requestSession.user.userName, rightNowMillis, lotId); + } database.close(); return result.changes > 0; -}; +} export default deleteLot; diff --git a/helpers/lotOccupancyDB/deleteLot.ts b/helpers/lotOccupancyDB/deleteLot.ts index 45a89184..82313d89 100644 --- a/helpers/lotOccupancyDB/deleteLot.ts +++ b/helpers/lotOccupancyDB/deleteLot.ts @@ -4,44 +4,30 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteLot = ( +export function deleteLot( lotId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); - const result = database - .prepare( - "update Lots" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotId = ?" - ) - .run(requestSession.user.userName, rightNowMillis, lotId); + let result: sqlite.RunResult; - database - .prepare( - "update LotComments" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotId = ?" - ) - .run(requestSession.user.userName, rightNowMillis, lotId); - - database - .prepare( - "update LotFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotId = ?" - ) - .run(requestSession.user.userName, rightNowMillis, lotId); + for (const tableName of ["LotFields", "LotComments", "Lots"]) { + result = database + .prepare( + `update ${tableName} + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotId = ?` + ) + .run(requestSession.user.userName, rightNowMillis, lotId); + } database.close(); return result.changes > 0; -}; +} export default deleteLot; diff --git a/helpers/lotOccupancyDB/deleteLotComment.d.ts b/helpers/lotOccupancyDB/deleteLotComment.d.ts index 0292f9a0..258ffeef 100644 --- a/helpers/lotOccupancyDB/deleteLotComment.d.ts +++ b/helpers/lotOccupancyDB/deleteLotComment.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteLotComment: (lotCommentId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteLotComment(lotCommentId: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteLotComment; diff --git a/helpers/lotOccupancyDB/deleteLotComment.js b/helpers/lotOccupancyDB/deleteLotComment.js index 806a5021..64b113c4 100644 --- a/helpers/lotOccupancyDB/deleteLotComment.js +++ b/helpers/lotOccupancyDB/deleteLotComment.js @@ -1,15 +1,15 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const deleteLotComment = (lotCommentId, requestSession) => { +export function deleteLotComment(lotCommentId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update LotComments" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotCommentId = ?") + .prepare(`update LotComments + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotCommentId = ?`) .run(requestSession.user.userName, rightNowMillis, lotCommentId); database.close(); return result.changes > 0; -}; +} export default deleteLotComment; diff --git a/helpers/lotOccupancyDB/deleteLotComment.ts b/helpers/lotOccupancyDB/deleteLotComment.ts index 2d225236..6868c1cd 100644 --- a/helpers/lotOccupancyDB/deleteLotComment.ts +++ b/helpers/lotOccupancyDB/deleteLotComment.ts @@ -4,26 +4,26 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteLotComment = ( +export function deleteLotComment( lotCommentId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update LotComments" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotCommentId = ?" + `update LotComments + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotCommentId = ?` ) .run(requestSession.user.userName, rightNowMillis, lotCommentId); database.close(); return result.changes > 0; -}; +} export default deleteLotComment; diff --git a/helpers/lotOccupancyDB/deleteLotField.d.ts b/helpers/lotOccupancyDB/deleteLotField.d.ts index 7681aeae..181a01e1 100644 --- a/helpers/lotOccupancyDB/deleteLotField.d.ts +++ b/helpers/lotOccupancyDB/deleteLotField.d.ts @@ -1,4 +1,4 @@ import sqlite from "better-sqlite3"; import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteLotField: (lotId: number | string, lotTypeFieldId: number | string, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database) => boolean; +export declare function deleteLotField(lotId: number | string, lotTypeFieldId: number | string, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database): boolean; export default deleteLotField; diff --git a/helpers/lotOccupancyDB/deleteLotField.js b/helpers/lotOccupancyDB/deleteLotField.js index a8e1b392..2071338b 100644 --- a/helpers/lotOccupancyDB/deleteLotField.js +++ b/helpers/lotOccupancyDB/deleteLotField.js @@ -1,18 +1,18 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const deleteLotField = (lotId, lotTypeFieldId, requestSession, connectedDatabase) => { +export function deleteLotField(lotId, lotTypeFieldId, requestSession, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update LotFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotId = ?" + - " and lotTypeFieldId = ?") + .prepare(`update LotFields + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotId = ? + and lotTypeFieldId = ?`) .run(requestSession.user.userName, rightNowMillis, lotId, lotTypeFieldId); if (!connectedDatabase) { database.close(); } return result.changes > 0; -}; +} export default deleteLotField; diff --git a/helpers/lotOccupancyDB/deleteLotField.ts b/helpers/lotOccupancyDB/deleteLotField.ts index af253080..2ba4e3f0 100644 --- a/helpers/lotOccupancyDB/deleteLotField.ts +++ b/helpers/lotOccupancyDB/deleteLotField.ts @@ -4,23 +4,23 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteLotField = ( +export function deleteLotField( lotId: number | string, lotTypeFieldId: number | string, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database -): boolean => { +): boolean { const database = connectedDatabase || sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update LotFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotId = ?" + - " and lotTypeFieldId = ?" + `update LotFields + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotId = ? + and lotTypeFieldId = ?` ) .run(requestSession.user.userName, rightNowMillis, lotId, lotTypeFieldId); @@ -29,6 +29,6 @@ export const deleteLotField = ( } return result.changes > 0; -}; +} export default deleteLotField; diff --git a/helpers/lotOccupancyDB/deleteLotOccupancy.d.ts b/helpers/lotOccupancyDB/deleteLotOccupancy.d.ts index 32bf63ba..fa6507d0 100644 --- a/helpers/lotOccupancyDB/deleteLotOccupancy.d.ts +++ b/helpers/lotOccupancyDB/deleteLotOccupancy.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteLotOccupancy: (lotOccupancyId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteLotOccupancy(lotOccupancyId: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteLotOccupancy; diff --git a/helpers/lotOccupancyDB/deleteLotOccupancy.js b/helpers/lotOccupancyDB/deleteLotOccupancy.js index 25c5289a..128ea1ac 100644 --- a/helpers/lotOccupancyDB/deleteLotOccupancy.js +++ b/helpers/lotOccupancyDB/deleteLotOccupancy.js @@ -1,33 +1,23 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const deleteLotOccupancy = (lotOccupancyId, requestSession) => { +export function deleteLotOccupancy(lotOccupancyId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); - const result = database - .prepare("update LotOccupancies" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotOccupancyId = ?") - .run(requestSession.user.userName, rightNowMillis, lotOccupancyId); - database - .prepare("update LotOccupancyComments" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotOccupancyId = ?") - .run(requestSession.user.userName, rightNowMillis, lotOccupancyId); - database - .prepare("update LotOccupancyFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotOccupancyId = ?") - .run(requestSession.user.userName, rightNowMillis, lotOccupancyId); - database - .prepare("update LotOccupancyOccupants" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotOccupancyId = ?") - .run(requestSession.user.userName, rightNowMillis, lotOccupancyId); + let result; + for (const tableName of [ + "LotOccupancyOccupants", + "LotOccupancyFields", + "LotOccupancyComments", + "LotOccupancies" + ]) { + result = database + .prepare(`update ${tableName} + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotOccupancyId = ?`) + .run(requestSession.user.userName, rightNowMillis, lotOccupancyId); + } database.close(); return result.changes > 0; -}; +} export default deleteLotOccupancy; diff --git a/helpers/lotOccupancyDB/deleteLotOccupancy.ts b/helpers/lotOccupancyDB/deleteLotOccupancy.ts index 0715e1a0..9816cd53 100644 --- a/helpers/lotOccupancyDB/deleteLotOccupancy.ts +++ b/helpers/lotOccupancyDB/deleteLotOccupancy.ts @@ -4,55 +4,36 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteLotOccupancy = ( +export function deleteLotOccupancy( lotOccupancyId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); - const result = database - .prepare( - "update LotOccupancies" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotOccupancyId = ?" - ) - .run(requestSession.user.userName, rightNowMillis, lotOccupancyId); - - database - .prepare( - "update LotOccupancyComments" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotOccupancyId = ?" - ) - .run(requestSession.user.userName, rightNowMillis, lotOccupancyId); - - database - .prepare( - "update LotOccupancyFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotOccupancyId = ?" - ) - .run(requestSession.user.userName, rightNowMillis, lotOccupancyId); - - database - .prepare( - "update LotOccupancyOccupants" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotOccupancyId = ?" - ) - .run(requestSession.user.userName, rightNowMillis, lotOccupancyId); + let result: sqlite.RunResult; // Do not auto-delete Fees or Transactions. Maintain financials. + for (const tableName of [ + "LotOccupancyOccupants", + "LotOccupancyFields", + "LotOccupancyComments", + "LotOccupancies" + ]) { + result = database + .prepare( + `update ${tableName} + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotOccupancyId = ?` + ) + .run(requestSession.user.userName, rightNowMillis, lotOccupancyId); + } database.close(); return result.changes > 0; -}; +} export default deleteLotOccupancy; diff --git a/helpers/lotOccupancyDB/deleteLotOccupancyComment.d.ts b/helpers/lotOccupancyDB/deleteLotOccupancyComment.d.ts index 5092cd12..48791cdb 100644 --- a/helpers/lotOccupancyDB/deleteLotOccupancyComment.d.ts +++ b/helpers/lotOccupancyDB/deleteLotOccupancyComment.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteLotOccupancyComment: (lotOccupancyCommentId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteLotOccupancyComment(lotOccupancyCommentId: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteLotOccupancyComment; diff --git a/helpers/lotOccupancyDB/deleteLotOccupancyComment.js b/helpers/lotOccupancyDB/deleteLotOccupancyComment.js index 8e90173c..4c9ed8cd 100644 --- a/helpers/lotOccupancyDB/deleteLotOccupancyComment.js +++ b/helpers/lotOccupancyDB/deleteLotOccupancyComment.js @@ -1,15 +1,15 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const deleteLotOccupancyComment = (lotOccupancyCommentId, requestSession) => { +export function deleteLotOccupancyComment(lotOccupancyCommentId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update LotOccupancyComments" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotOccupancyCommentId = ?") + .prepare(`update LotOccupancyComments + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotOccupancyCommentId = ?`) .run(requestSession.user.userName, rightNowMillis, lotOccupancyCommentId); database.close(); return result.changes > 0; -}; +} export default deleteLotOccupancyComment; diff --git a/helpers/lotOccupancyDB/deleteLotOccupancyComment.ts b/helpers/lotOccupancyDB/deleteLotOccupancyComment.ts index 0c5a7516..a631d787 100644 --- a/helpers/lotOccupancyDB/deleteLotOccupancyComment.ts +++ b/helpers/lotOccupancyDB/deleteLotOccupancyComment.ts @@ -4,30 +4,26 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteLotOccupancyComment = ( +export function deleteLotOccupancyComment( lotOccupancyCommentId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update LotOccupancyComments" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotOccupancyCommentId = ?" + `update LotOccupancyComments + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotOccupancyCommentId = ?` ) - .run( - requestSession.user.userName, - rightNowMillis, - lotOccupancyCommentId - ); + .run(requestSession.user.userName, rightNowMillis, lotOccupancyCommentId); database.close(); return result.changes > 0; -}; +} export default deleteLotOccupancyComment; diff --git a/helpers/lotOccupancyDB/deleteLotOccupancyFee.d.ts b/helpers/lotOccupancyDB/deleteLotOccupancyFee.d.ts index c3f6a176..d8ee0b68 100644 --- a/helpers/lotOccupancyDB/deleteLotOccupancyFee.d.ts +++ b/helpers/lotOccupancyDB/deleteLotOccupancyFee.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteLotOccupancyFee: (lotOccupancyId: number | string, feeId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteLotOccupancyFee(lotOccupancyId: number | string, feeId: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteLotOccupancyFee; diff --git a/helpers/lotOccupancyDB/deleteLotOccupancyFee.js b/helpers/lotOccupancyDB/deleteLotOccupancyFee.js index dbed9b9f..3c0b26cd 100644 --- a/helpers/lotOccupancyDB/deleteLotOccupancyFee.js +++ b/helpers/lotOccupancyDB/deleteLotOccupancyFee.js @@ -1,16 +1,16 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const deleteLotOccupancyFee = (lotOccupancyId, feeId, requestSession) => { +export function deleteLotOccupancyFee(lotOccupancyId, feeId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update LotOccupancyFees" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotOccupancyId = ?" + - " and feeId = ?") + .prepare(`update LotOccupancyFees + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotOccupancyId = ? + and feeId = ?`) .run(requestSession.user.userName, rightNowMillis, lotOccupancyId, feeId); database.close(); return result.changes > 0; -}; +} export default deleteLotOccupancyFee; diff --git a/helpers/lotOccupancyDB/deleteLotOccupancyFee.ts b/helpers/lotOccupancyDB/deleteLotOccupancyFee.ts index 6d649801..67211e29 100644 --- a/helpers/lotOccupancyDB/deleteLotOccupancyFee.ts +++ b/helpers/lotOccupancyDB/deleteLotOccupancyFee.ts @@ -4,33 +4,28 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteLotOccupancyFee = ( +export function deleteLotOccupancyFee( lotOccupancyId: number | string, feeId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update LotOccupancyFees" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotOccupancyId = ?" + - " and feeId = ?" + `update LotOccupancyFees + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotOccupancyId = ? + and feeId = ?` ) - .run( - requestSession.user.userName, - rightNowMillis, - lotOccupancyId, - feeId - ); + .run(requestSession.user.userName, rightNowMillis, lotOccupancyId, feeId); database.close(); return result.changes > 0; -}; +} export default deleteLotOccupancyFee; diff --git a/helpers/lotOccupancyDB/deleteLotOccupancyField.d.ts b/helpers/lotOccupancyDB/deleteLotOccupancyField.d.ts index 5c241166..4206b911 100644 --- a/helpers/lotOccupancyDB/deleteLotOccupancyField.d.ts +++ b/helpers/lotOccupancyDB/deleteLotOccupancyField.d.ts @@ -1,4 +1,4 @@ import sqlite from "better-sqlite3"; import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteLotOccupancyField: (lotOccupancyId: number | string, occupancyTypeFieldId: number | string, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database) => boolean; +export declare function deleteLotOccupancyField(lotOccupancyId: number | string, occupancyTypeFieldId: number | string, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database): boolean; export default deleteLotOccupancyField; diff --git a/helpers/lotOccupancyDB/deleteLotOccupancyField.js b/helpers/lotOccupancyDB/deleteLotOccupancyField.js index 2619252e..86e75079 100644 --- a/helpers/lotOccupancyDB/deleteLotOccupancyField.js +++ b/helpers/lotOccupancyDB/deleteLotOccupancyField.js @@ -1,18 +1,18 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const deleteLotOccupancyField = (lotOccupancyId, occupancyTypeFieldId, requestSession, connectedDatabase) => { +export function deleteLotOccupancyField(lotOccupancyId, occupancyTypeFieldId, requestSession, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update LotOccupancyFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotOccupancyId = ?" + - " and occupancyTypeFieldId = ?") + .prepare(`update LotOccupancyFields + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotOccupancyId = ? + and occupancyTypeFieldId = ?`) .run(requestSession.user.userName, rightNowMillis, lotOccupancyId, occupancyTypeFieldId); if (!connectedDatabase) { database.close(); } return result.changes > 0; -}; +} export default deleteLotOccupancyField; diff --git a/helpers/lotOccupancyDB/deleteLotOccupancyField.ts b/helpers/lotOccupancyDB/deleteLotOccupancyField.ts index ee068459..e1b5e756 100644 --- a/helpers/lotOccupancyDB/deleteLotOccupancyField.ts +++ b/helpers/lotOccupancyDB/deleteLotOccupancyField.ts @@ -4,36 +4,31 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteLotOccupancyField = ( +export function deleteLotOccupancyField( lotOccupancyId: number | string, occupancyTypeFieldId: number | string, requestSession: recordTypes.PartialSession, connectedDatabase?: sqlite.Database -): boolean => { +): boolean { const database = connectedDatabase || sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update LotOccupancyFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotOccupancyId = ?" + - " and occupancyTypeFieldId = ?" + `update LotOccupancyFields + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotOccupancyId = ? + and occupancyTypeFieldId = ?` ) - .run( - requestSession.user.userName, - rightNowMillis, - lotOccupancyId, - occupancyTypeFieldId - ); + .run(requestSession.user.userName, rightNowMillis, lotOccupancyId, occupancyTypeFieldId); if (!connectedDatabase) { database.close(); } return result.changes > 0; -}; +} export default deleteLotOccupancyField; diff --git a/helpers/lotOccupancyDB/deleteLotOccupancyOccupant.d.ts b/helpers/lotOccupancyDB/deleteLotOccupancyOccupant.d.ts index 1716e61e..e49fbee8 100644 --- a/helpers/lotOccupancyDB/deleteLotOccupancyOccupant.d.ts +++ b/helpers/lotOccupancyDB/deleteLotOccupancyOccupant.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteLotOccupancyOccupant: (lotOccupancyId: number | string, lotOccupantIndex: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteLotOccupancyOccupant(lotOccupancyId: number | string, lotOccupantIndex: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteLotOccupancyOccupant; diff --git a/helpers/lotOccupancyDB/deleteLotOccupancyOccupant.js b/helpers/lotOccupancyDB/deleteLotOccupancyOccupant.js index c4fc6c09..970e8d87 100644 --- a/helpers/lotOccupancyDB/deleteLotOccupancyOccupant.js +++ b/helpers/lotOccupancyDB/deleteLotOccupancyOccupant.js @@ -1,16 +1,16 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const deleteLotOccupancyOccupant = (lotOccupancyId, lotOccupantIndex, requestSession) => { +export function deleteLotOccupancyOccupant(lotOccupancyId, lotOccupantIndex, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update LotOccupancyOccupants" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotOccupancyId = ?" + - " and lotOccupantIndex = ?") + .prepare(`update LotOccupancyOccupants + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotOccupancyId = ? + and lotOccupantIndex = ?`) .run(requestSession.user.userName, rightNowMillis, lotOccupancyId, lotOccupantIndex); database.close(); return result.changes > 0; -}; +} export default deleteLotOccupancyOccupant; diff --git a/helpers/lotOccupancyDB/deleteLotOccupancyOccupant.ts b/helpers/lotOccupancyDB/deleteLotOccupancyOccupant.ts index 1589c4eb..d6fae85a 100644 --- a/helpers/lotOccupancyDB/deleteLotOccupancyOccupant.ts +++ b/helpers/lotOccupancyDB/deleteLotOccupancyOccupant.ts @@ -4,33 +4,28 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteLotOccupancyOccupant = ( +export function deleteLotOccupancyOccupant( lotOccupancyId: number | string, lotOccupantIndex: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update LotOccupancyOccupants" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotOccupancyId = ?" + - " and lotOccupantIndex = ?" + `update LotOccupancyOccupants + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotOccupancyId = ? + and lotOccupantIndex = ?` ) - .run( - requestSession.user.userName, - rightNowMillis, - lotOccupancyId, - lotOccupantIndex - ); + .run(requestSession.user.userName, rightNowMillis, lotOccupancyId, lotOccupantIndex); database.close(); return result.changes > 0; -}; +} export default deleteLotOccupancyOccupant; diff --git a/helpers/lotOccupancyDB/deleteLotOccupancyTransaction.d.ts b/helpers/lotOccupancyDB/deleteLotOccupancyTransaction.d.ts index 84481caa..970d691b 100644 --- a/helpers/lotOccupancyDB/deleteLotOccupancyTransaction.d.ts +++ b/helpers/lotOccupancyDB/deleteLotOccupancyTransaction.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteLotOccupancyTransaction: (lotOccupancyId: number | string, transactionIndex: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteLotOccupancyTransaction(lotOccupancyId: number | string, transactionIndex: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteLotOccupancyTransaction; diff --git a/helpers/lotOccupancyDB/deleteLotOccupancyTransaction.js b/helpers/lotOccupancyDB/deleteLotOccupancyTransaction.js index 762bb9ba..8059ad6a 100644 --- a/helpers/lotOccupancyDB/deleteLotOccupancyTransaction.js +++ b/helpers/lotOccupancyDB/deleteLotOccupancyTransaction.js @@ -1,16 +1,16 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const deleteLotOccupancyTransaction = (lotOccupancyId, transactionIndex, requestSession) => { +export function deleteLotOccupancyTransaction(lotOccupancyId, transactionIndex, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update LotOccupancyTransactions" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotOccupancyId = ?" + - " and transactionIndex = ?") + .prepare(`update LotOccupancyTransactions + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotOccupancyId = ? + and transactionIndex = ?`) .run(requestSession.user.userName, rightNowMillis, lotOccupancyId, transactionIndex); database.close(); return result.changes > 0; -}; +} export default deleteLotOccupancyTransaction; diff --git a/helpers/lotOccupancyDB/deleteLotOccupancyTransaction.ts b/helpers/lotOccupancyDB/deleteLotOccupancyTransaction.ts index c586b8f7..c5ccde50 100644 --- a/helpers/lotOccupancyDB/deleteLotOccupancyTransaction.ts +++ b/helpers/lotOccupancyDB/deleteLotOccupancyTransaction.ts @@ -4,33 +4,28 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteLotOccupancyTransaction = ( +export function deleteLotOccupancyTransaction( lotOccupancyId: number | string, transactionIndex: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update LotOccupancyTransactions" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotOccupancyId = ?" + - " and transactionIndex = ?" + `update LotOccupancyTransactions + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotOccupancyId = ? + and transactionIndex = ?` ) - .run( - requestSession.user.userName, - rightNowMillis, - lotOccupancyId, - transactionIndex - ); + .run(requestSession.user.userName, rightNowMillis, lotOccupancyId, transactionIndex); database.close(); return result.changes > 0; -}; +} export default deleteLotOccupancyTransaction; diff --git a/helpers/lotOccupancyDB/deleteLotOccupantType.d.ts b/helpers/lotOccupancyDB/deleteLotOccupantType.d.ts index 4e095f08..b5817df7 100644 --- a/helpers/lotOccupancyDB/deleteLotOccupantType.d.ts +++ b/helpers/lotOccupancyDB/deleteLotOccupantType.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteLotOccupantType: (lotOccupantTypeId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteLotOccupantType(lotOccupantTypeId: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteLotOccupantType; diff --git a/helpers/lotOccupancyDB/deleteLotOccupantType.js b/helpers/lotOccupancyDB/deleteLotOccupantType.js index fc7647eb..ec7d797f 100644 --- a/helpers/lotOccupancyDB/deleteLotOccupantType.js +++ b/helpers/lotOccupancyDB/deleteLotOccupantType.js @@ -1,17 +1,17 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotOccupantTypesCache } from "../functions.cache.js"; -export const deleteLotOccupantType = (lotOccupantTypeId, requestSession) => { +export function deleteLotOccupantType(lotOccupantTypeId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update LotOccupantTypes" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotOccupantTypeId = ?") + .prepare(`update LotOccupantTypes + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotOccupantTypeId = ?`) .run(requestSession.user.userName, rightNowMillis, lotOccupantTypeId); database.close(); clearLotOccupantTypesCache(); return result.changes > 0; -}; +} export default deleteLotOccupantType; diff --git a/helpers/lotOccupancyDB/deleteLotOccupantType.ts b/helpers/lotOccupancyDB/deleteLotOccupantType.ts index b5ef752c..dd81d2f6 100644 --- a/helpers/lotOccupancyDB/deleteLotOccupantType.ts +++ b/helpers/lotOccupancyDB/deleteLotOccupantType.ts @@ -6,20 +6,20 @@ import { clearLotOccupantTypesCache } from "../functions.cache.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteLotOccupantType = ( +export function deleteLotOccupantType( lotOccupantTypeId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update LotOccupantTypes" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotOccupantTypeId = ?" + `update LotOccupantTypes + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotOccupantTypeId = ?` ) .run(requestSession.user.userName, rightNowMillis, lotOccupantTypeId); @@ -28,6 +28,6 @@ export const deleteLotOccupantType = ( clearLotOccupantTypesCache(); return result.changes > 0; -}; +} export default deleteLotOccupantType; diff --git a/helpers/lotOccupancyDB/deleteLotStatus.d.ts b/helpers/lotOccupancyDB/deleteLotStatus.d.ts index 75d14acb..5d5fbf3c 100644 --- a/helpers/lotOccupancyDB/deleteLotStatus.d.ts +++ b/helpers/lotOccupancyDB/deleteLotStatus.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteLotStatus: (lotStatusId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteLotStatus(lotStatusId: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteLotStatus; diff --git a/helpers/lotOccupancyDB/deleteLotStatus.js b/helpers/lotOccupancyDB/deleteLotStatus.js index 53a75359..4f7251b6 100644 --- a/helpers/lotOccupancyDB/deleteLotStatus.js +++ b/helpers/lotOccupancyDB/deleteLotStatus.js @@ -1,17 +1,17 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotStatusesCache } from "../functions.cache.js"; -export const deleteLotStatus = (lotStatusId, requestSession) => { +export function deleteLotStatus(lotStatusId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update LotStatuses" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotStatusId = ?") + .prepare(`update LotStatuses + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotStatusId = ?`) .run(requestSession.user.userName, rightNowMillis, lotStatusId); database.close(); clearLotStatusesCache(); return result.changes > 0; -}; +} export default deleteLotStatus; diff --git a/helpers/lotOccupancyDB/deleteLotStatus.ts b/helpers/lotOccupancyDB/deleteLotStatus.ts index 259a92e0..bb3a5a97 100644 --- a/helpers/lotOccupancyDB/deleteLotStatus.ts +++ b/helpers/lotOccupancyDB/deleteLotStatus.ts @@ -6,20 +6,20 @@ import { clearLotStatusesCache } from "../functions.cache.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteLotStatus = ( +export function deleteLotStatus( lotStatusId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update LotStatuses" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotStatusId = ?" + `update LotStatuses + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotStatusId = ?` ) .run(requestSession.user.userName, rightNowMillis, lotStatusId); @@ -28,6 +28,6 @@ export const deleteLotStatus = ( clearLotStatusesCache(); return result.changes > 0; -}; +} export default deleteLotStatus; diff --git a/helpers/lotOccupancyDB/deleteLotType.d.ts b/helpers/lotOccupancyDB/deleteLotType.d.ts index e95b64e3..2236d377 100644 --- a/helpers/lotOccupancyDB/deleteLotType.d.ts +++ b/helpers/lotOccupancyDB/deleteLotType.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteLotType: (lotTypeId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteLotType(lotTypeId: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteLotType; diff --git a/helpers/lotOccupancyDB/deleteLotType.js b/helpers/lotOccupancyDB/deleteLotType.js index 70542803..5d3ca73d 100644 --- a/helpers/lotOccupancyDB/deleteLotType.js +++ b/helpers/lotOccupancyDB/deleteLotType.js @@ -1,23 +1,20 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotTypesCache } from "../functions.cache.js"; -export const deleteLotType = (lotTypeId, requestSession) => { +export function deleteLotType(lotTypeId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); - const result = database - .prepare("update LotTypes" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotTypeId = ?") - .run(requestSession.user.userName, rightNowMillis, lotTypeId); - database - .prepare("update LotTypeFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotTypeId = ?") - .run(requestSession.user.userName, rightNowMillis, lotTypeId); + let result; + for (const tableName of ["LotTypeFields", "LotTypes"]) { + result = database + .prepare(`update ${tableName} + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotTypeId = ?`) + .run(requestSession.user.userName, rightNowMillis, lotTypeId); + } database.close(); clearLotTypesCache(); return result.changes > 0; -}; +} export default deleteLotType; diff --git a/helpers/lotOccupancyDB/deleteLotType.ts b/helpers/lotOccupancyDB/deleteLotType.ts index a6545927..33e3a74b 100644 --- a/helpers/lotOccupancyDB/deleteLotType.ts +++ b/helpers/lotOccupancyDB/deleteLotType.ts @@ -6,37 +6,32 @@ import { clearLotTypesCache } from "../functions.cache.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteLotType = ( +export function deleteLotType( lotTypeId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); - const result = database - .prepare( - "update LotTypes" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotTypeId = ?" - ) - .run(requestSession.user.userName, rightNowMillis, lotTypeId); + let result: sqlite.RunResult; - database - .prepare( - "update LotTypeFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotTypeId = ?" - ) - .run(requestSession.user.userName, rightNowMillis, lotTypeId) + for (const tableName of ["LotTypeFields", "LotTypes"]) { + result = database + .prepare( + `update ${tableName} + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotTypeId = ?` + ) + .run(requestSession.user.userName, rightNowMillis, lotTypeId); + } database.close(); clearLotTypesCache(); return result.changes > 0; -}; +} export default deleteLotType; diff --git a/helpers/lotOccupancyDB/deleteLotTypeField.d.ts b/helpers/lotOccupancyDB/deleteLotTypeField.d.ts index 029a593b..94cadd65 100644 --- a/helpers/lotOccupancyDB/deleteLotTypeField.d.ts +++ b/helpers/lotOccupancyDB/deleteLotTypeField.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteLotTypeField: (lotTypeFieldId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteLotTypeField(lotTypeFieldId: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteLotTypeField; diff --git a/helpers/lotOccupancyDB/deleteLotTypeField.js b/helpers/lotOccupancyDB/deleteLotTypeField.js index cce3f5a7..a725ef45 100644 --- a/helpers/lotOccupancyDB/deleteLotTypeField.js +++ b/helpers/lotOccupancyDB/deleteLotTypeField.js @@ -1,17 +1,17 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotTypesCache } from "../functions.cache.js"; -export const deleteLotTypeField = (lotTypeFieldId, requestSession) => { +export function deleteLotTypeField(lotTypeFieldId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update LotTypeFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotTypeFieldId = ?") + .prepare(`update LotTypeFields + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotTypeFieldId = ?`) .run(requestSession.user.userName, rightNowMillis, lotTypeFieldId); database.close(); clearLotTypesCache(); return result.changes > 0; -}; +} export default deleteLotTypeField; diff --git a/helpers/lotOccupancyDB/deleteLotTypeField.ts b/helpers/lotOccupancyDB/deleteLotTypeField.ts index ca109a19..896854d8 100644 --- a/helpers/lotOccupancyDB/deleteLotTypeField.ts +++ b/helpers/lotOccupancyDB/deleteLotTypeField.ts @@ -6,20 +6,20 @@ import { clearLotTypesCache } from "../functions.cache.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteLotTypeField = ( +export function deleteLotTypeField( lotTypeFieldId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update LotTypeFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where lotTypeFieldId = ?" + `update LotTypeFields + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where lotTypeFieldId = ?` ) .run(requestSession.user.userName, rightNowMillis, lotTypeFieldId); @@ -28,6 +28,6 @@ export const deleteLotTypeField = ( clearLotTypesCache(); return result.changes > 0; -}; +} export default deleteLotTypeField; diff --git a/helpers/lotOccupancyDB/deleteMap.d.ts b/helpers/lotOccupancyDB/deleteMap.d.ts index 8e055bd2..16605837 100644 --- a/helpers/lotOccupancyDB/deleteMap.d.ts +++ b/helpers/lotOccupancyDB/deleteMap.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteMap: (mapId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteMap(mapId: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteMap; diff --git a/helpers/lotOccupancyDB/deleteMap.js b/helpers/lotOccupancyDB/deleteMap.js index 5a5e1032..77bd79e5 100644 --- a/helpers/lotOccupancyDB/deleteMap.js +++ b/helpers/lotOccupancyDB/deleteMap.js @@ -1,21 +1,18 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const deleteMap = (mapId, requestSession) => { +export function deleteMap(mapId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); - const result = database - .prepare("update Maps" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where mapId = ?") - .run(requestSession.user.userName, rightNowMillis, mapId); - database - .prepare("update Lots" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where mapId = ?") - .run(requestSession.user.userName, rightNowMillis, mapId); + let result; + for (const tableName of ["Lots", "Maps"]) { + result = database + .prepare(`update ${tableName} + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where mapId = ?`) + .run(requestSession.user.userName, rightNowMillis, mapId); + } database.close(); return result.changes > 0; -}; +} export default deleteMap; diff --git a/helpers/lotOccupancyDB/deleteMap.ts b/helpers/lotOccupancyDB/deleteMap.ts index a2c5eaa8..47fdc7fb 100644 --- a/helpers/lotOccupancyDB/deleteMap.ts +++ b/helpers/lotOccupancyDB/deleteMap.ts @@ -4,35 +4,30 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteMap = ( +export function deleteMap( mapId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); - const result = database - .prepare( - "update Maps" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where mapId = ?" - ) - .run(requestSession.user.userName, rightNowMillis, mapId); + let result: sqlite.RunResult; - database - .prepare( - "update Lots" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where mapId = ?" - ) - .run(requestSession.user.userName, rightNowMillis, mapId); + for (const tableName of ["Lots", "Maps"]) { + result = database + .prepare( + `update ${tableName} + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where mapId = ?` + ) + .run(requestSession.user.userName, rightNowMillis, mapId); + } database.close(); return result.changes > 0; -}; +} export default deleteMap; diff --git a/helpers/lotOccupancyDB/deleteOccupancyType.d.ts b/helpers/lotOccupancyDB/deleteOccupancyType.d.ts index 2059c3aa..8201b1a8 100644 --- a/helpers/lotOccupancyDB/deleteOccupancyType.d.ts +++ b/helpers/lotOccupancyDB/deleteOccupancyType.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteOccupancyType: (occupancyTypeId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteOccupancyType(occupancyTypeId: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteOccupancyType; diff --git a/helpers/lotOccupancyDB/deleteOccupancyType.js b/helpers/lotOccupancyDB/deleteOccupancyType.js index 4825da3e..c11b82a4 100644 --- a/helpers/lotOccupancyDB/deleteOccupancyType.js +++ b/helpers/lotOccupancyDB/deleteOccupancyType.js @@ -1,23 +1,20 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearOccupancyTypesCache } from "../functions.cache.js"; -export const deleteOccupancyType = (occupancyTypeId, requestSession) => { +export function deleteOccupancyType(occupancyTypeId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); - const result = database - .prepare("update OccupancyTypes" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where occupancyTypeId = ?") - .run(requestSession.user.userName, rightNowMillis, occupancyTypeId); - database - .prepare("update OccupancyTypeFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where occupancyTypeId = ?") - .run(requestSession.user.userName, rightNowMillis, occupancyTypeId); + let result; + for (const tableName of ["OccupancyTypePrints", "OccupancyTypeFields", "OccupancyTypes"]) { + result = database + .prepare(`update ${tableName} + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where occupancyTypeId = ?`) + .run(requestSession.user.userName, rightNowMillis, occupancyTypeId); + } database.close(); clearOccupancyTypesCache(); return result.changes > 0; -}; +} export default deleteOccupancyType; diff --git a/helpers/lotOccupancyDB/deleteOccupancyType.ts b/helpers/lotOccupancyDB/deleteOccupancyType.ts index 3254c0b5..14db78cf 100644 --- a/helpers/lotOccupancyDB/deleteOccupancyType.ts +++ b/helpers/lotOccupancyDB/deleteOccupancyType.ts @@ -6,37 +6,32 @@ import { clearOccupancyTypesCache } from "../functions.cache.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteOccupancyType = ( +export function deleteOccupancyType( occupancyTypeId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); - const result = database - .prepare( - "update OccupancyTypes" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where occupancyTypeId = ?" - ) - .run(requestSession.user.userName, rightNowMillis, occupancyTypeId); + let result: sqlite.RunResult; - database - .prepare( - "update OccupancyTypeFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where occupancyTypeId = ?" - ) - .run(requestSession.user.userName, rightNowMillis, occupancyTypeId) + for (const tableName of ["OccupancyTypePrints", "OccupancyTypeFields", "OccupancyTypes"]) { + result = database + .prepare( + `update ${tableName} + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where occupancyTypeId = ?` + ) + .run(requestSession.user.userName, rightNowMillis, occupancyTypeId); + } database.close(); clearOccupancyTypesCache(); return result.changes > 0; -}; +} export default deleteOccupancyType; diff --git a/helpers/lotOccupancyDB/deleteOccupancyTypeField.d.ts b/helpers/lotOccupancyDB/deleteOccupancyTypeField.d.ts index 0bae386d..4bc5609a 100644 --- a/helpers/lotOccupancyDB/deleteOccupancyTypeField.d.ts +++ b/helpers/lotOccupancyDB/deleteOccupancyTypeField.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteOccupancyTypeField: (occupancyTypeFieldId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteOccupancyTypeField(occupancyTypeFieldId: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteOccupancyTypeField; diff --git a/helpers/lotOccupancyDB/deleteOccupancyTypeField.js b/helpers/lotOccupancyDB/deleteOccupancyTypeField.js index fb30e23c..ba2ec83a 100644 --- a/helpers/lotOccupancyDB/deleteOccupancyTypeField.js +++ b/helpers/lotOccupancyDB/deleteOccupancyTypeField.js @@ -1,17 +1,17 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearOccupancyTypesCache } from "../functions.cache.js"; -export const deleteOccupancyTypeField = (occupancyTypeFieldId, requestSession) => { +export function deleteOccupancyTypeField(occupancyTypeFieldId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update OccupancyTypeFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where occupancyTypeFieldId = ?") + .prepare(`update OccupancyTypeFields + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where occupancyTypeFieldId = ?`) .run(requestSession.user.userName, rightNowMillis, occupancyTypeFieldId); database.close(); clearOccupancyTypesCache(); return result.changes > 0; -}; +} export default deleteOccupancyTypeField; diff --git a/helpers/lotOccupancyDB/deleteOccupancyTypeField.ts b/helpers/lotOccupancyDB/deleteOccupancyTypeField.ts index 215a8914..229989d0 100644 --- a/helpers/lotOccupancyDB/deleteOccupancyTypeField.ts +++ b/helpers/lotOccupancyDB/deleteOccupancyTypeField.ts @@ -6,20 +6,20 @@ import { clearOccupancyTypesCache } from "../functions.cache.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteOccupancyTypeField = ( +export function deleteOccupancyTypeField( occupancyTypeFieldId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update OccupancyTypeFields" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where occupancyTypeFieldId = ?" + `update OccupancyTypeFields + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where occupancyTypeFieldId = ?` ) .run(requestSession.user.userName, rightNowMillis, occupancyTypeFieldId); @@ -28,6 +28,6 @@ export const deleteOccupancyTypeField = ( clearOccupancyTypesCache(); return result.changes > 0; -}; +} export default deleteOccupancyTypeField; diff --git a/helpers/lotOccupancyDB/deleteOccupancyTypePrint.d.ts b/helpers/lotOccupancyDB/deleteOccupancyTypePrint.d.ts index e94fd823..6e460d73 100644 --- a/helpers/lotOccupancyDB/deleteOccupancyTypePrint.d.ts +++ b/helpers/lotOccupancyDB/deleteOccupancyTypePrint.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteOccupancyTypePrint: (occupancyTypeId: number | string, printEJS: string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteOccupancyTypePrint(occupancyTypeId: number | string, printEJS: string, requestSession: recordTypes.PartialSession): boolean; export default deleteOccupancyTypePrint; diff --git a/helpers/lotOccupancyDB/deleteOccupancyTypePrint.js b/helpers/lotOccupancyDB/deleteOccupancyTypePrint.js index 61d8badd..02761f2b 100644 --- a/helpers/lotOccupancyDB/deleteOccupancyTypePrint.js +++ b/helpers/lotOccupancyDB/deleteOccupancyTypePrint.js @@ -1,18 +1,18 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearOccupancyTypesCache } from "../functions.cache.js"; -export const deleteOccupancyTypePrint = (occupancyTypeId, printEJS, requestSession) => { +export function deleteOccupancyTypePrint(occupancyTypeId, printEJS, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update OccupancyTypePrints" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where occupancyTypeId = ?" + - " and printEJS = ?") + .prepare(`update OccupancyTypePrints + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where occupancyTypeId = ? + and printEJS = ?`) .run(requestSession.user.userName, rightNowMillis, occupancyTypeId, printEJS); database.close(); clearOccupancyTypesCache(); return result.changes > 0; -}; +} export default deleteOccupancyTypePrint; diff --git a/helpers/lotOccupancyDB/deleteOccupancyTypePrint.ts b/helpers/lotOccupancyDB/deleteOccupancyTypePrint.ts index 9f0133a7..0528b2e4 100644 --- a/helpers/lotOccupancyDB/deleteOccupancyTypePrint.ts +++ b/helpers/lotOccupancyDB/deleteOccupancyTypePrint.ts @@ -6,22 +6,22 @@ import { clearOccupancyTypesCache } from "../functions.cache.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteOccupancyTypePrint = ( +export function deleteOccupancyTypePrint( occupancyTypeId: number | string, printEJS: string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update OccupancyTypePrints" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where occupancyTypeId = ?" + - " and printEJS = ?" + `update OccupancyTypePrints + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where occupancyTypeId = ? + and printEJS = ?` ) .run(requestSession.user.userName, rightNowMillis, occupancyTypeId, printEJS); @@ -30,6 +30,6 @@ export const deleteOccupancyTypePrint = ( clearOccupancyTypesCache(); return result.changes > 0; -}; +} export default deleteOccupancyTypePrint; diff --git a/helpers/lotOccupancyDB/deleteWorkOrder.d.ts b/helpers/lotOccupancyDB/deleteWorkOrder.d.ts index df1df960..45201bbf 100644 --- a/helpers/lotOccupancyDB/deleteWorkOrder.d.ts +++ b/helpers/lotOccupancyDB/deleteWorkOrder.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteWorkOrder: (workOrderId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteWorkOrder(workOrderId: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteWorkOrder; diff --git a/helpers/lotOccupancyDB/deleteWorkOrder.js b/helpers/lotOccupancyDB/deleteWorkOrder.js index 80bc3d28..9d30b929 100644 --- a/helpers/lotOccupancyDB/deleteWorkOrder.js +++ b/helpers/lotOccupancyDB/deleteWorkOrder.js @@ -1,39 +1,24 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const deleteWorkOrder = (workOrderId, requestSession) => { +export function deleteWorkOrder(workOrderId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); - const result = database - .prepare("update WorkOrders" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where workOrderId = ?") - .run(requestSession.user.userName, rightNowMillis, workOrderId); - database - .prepare("update WorkOrderComments" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where workOrderId = ?") - .run(requestSession.user.userName, rightNowMillis, workOrderId); - database - .prepare("update WorkOrderLotOccupancies" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where workOrderId = ?") - .run(requestSession.user.userName, rightNowMillis, workOrderId); - database - .prepare("update WorkOrderLots" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where workOrderId = ?") - .run(requestSession.user.userName, rightNowMillis, workOrderId); - database - .prepare("update WorkOrderMilestones" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where workOrderId = ?") - .run(requestSession.user.userName, rightNowMillis, workOrderId); + let result; + for (const tableName of [ + "WorkOrderMilestones", + "WorkOrderLots", + "WorkOrderLotOccupancies", + "WorkOrderComments", + "WorkOrders" + ]) { + result = database + .prepare(`update ${tableName} + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where workOrderId = ?`) + .run(requestSession.user.userName, rightNowMillis, workOrderId); + } database.close(); return result.changes > 0; -}; +} export default deleteWorkOrder; diff --git a/helpers/lotOccupancyDB/deleteWorkOrder.ts b/helpers/lotOccupancyDB/deleteWorkOrder.ts index 02c8426c..a877cfe4 100644 --- a/helpers/lotOccupancyDB/deleteWorkOrder.ts +++ b/helpers/lotOccupancyDB/deleteWorkOrder.ts @@ -4,62 +4,36 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteWorkOrder = ( +export function deleteWorkOrder( workOrderId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); - const result = database - .prepare( - "update WorkOrders" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where workOrderId = ?" - ) - .run(requestSession.user.userName, rightNowMillis, workOrderId); + let result: sqlite.RunResult; - database - .prepare( - "update WorkOrderComments" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where workOrderId = ?" - ) - .run(requestSession.user.userName, rightNowMillis, workOrderId); - - database - .prepare( - "update WorkOrderLotOccupancies" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where workOrderId = ?" - ) - .run(requestSession.user.userName, rightNowMillis, workOrderId); - - database - .prepare( - "update WorkOrderLots" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where workOrderId = ?" - ) - .run(requestSession.user.userName, rightNowMillis, workOrderId); - - database - .prepare( - "update WorkOrderMilestones" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where workOrderId = ?" - ) - .run(requestSession.user.userName, rightNowMillis, workOrderId); + for (const tableName of [ + "WorkOrderMilestones", + "WorkOrderLots", + "WorkOrderLotOccupancies", + "WorkOrderComments", + "WorkOrders" + ]) { + result = database + .prepare( + `update ${tableName} + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where workOrderId = ?` + ) + .run(requestSession.user.userName, rightNowMillis, workOrderId); + } database.close(); return result.changes > 0; -}; +} export default deleteWorkOrder; diff --git a/helpers/lotOccupancyDB/deleteWorkOrderComment.d.ts b/helpers/lotOccupancyDB/deleteWorkOrderComment.d.ts index ce8e38e0..e22e9f0f 100644 --- a/helpers/lotOccupancyDB/deleteWorkOrderComment.d.ts +++ b/helpers/lotOccupancyDB/deleteWorkOrderComment.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteWorkOrderComment: (workOrderCommentId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteWorkOrderComment(workOrderCommentId: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteWorkOrderComment; diff --git a/helpers/lotOccupancyDB/deleteWorkOrderComment.js b/helpers/lotOccupancyDB/deleteWorkOrderComment.js index c14aef38..14b90937 100644 --- a/helpers/lotOccupancyDB/deleteWorkOrderComment.js +++ b/helpers/lotOccupancyDB/deleteWorkOrderComment.js @@ -1,15 +1,15 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const deleteWorkOrderComment = (workOrderCommentId, requestSession) => { +export function deleteWorkOrderComment(workOrderCommentId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update WorkOrderComments" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where workOrderCommentId = ?") + .prepare(`update WorkOrderComments + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where workOrderCommentId = ?`) .run(requestSession.user.userName, rightNowMillis, workOrderCommentId); database.close(); return result.changes > 0; -}; +} export default deleteWorkOrderComment; diff --git a/helpers/lotOccupancyDB/deleteWorkOrderComment.ts b/helpers/lotOccupancyDB/deleteWorkOrderComment.ts index da03ce09..b2b751cc 100644 --- a/helpers/lotOccupancyDB/deleteWorkOrderComment.ts +++ b/helpers/lotOccupancyDB/deleteWorkOrderComment.ts @@ -4,26 +4,26 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteWorkOrderComment = ( +export function deleteWorkOrderComment( workOrderCommentId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update WorkOrderComments" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where workOrderCommentId = ?" + `update WorkOrderComments + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where workOrderCommentId = ?` ) .run(requestSession.user.userName, rightNowMillis, workOrderCommentId); database.close(); return result.changes > 0; -}; +} export default deleteWorkOrderComment; diff --git a/helpers/lotOccupancyDB/deleteWorkOrderLot.d.ts b/helpers/lotOccupancyDB/deleteWorkOrderLot.d.ts index e37b6ba0..138f98bd 100644 --- a/helpers/lotOccupancyDB/deleteWorkOrderLot.d.ts +++ b/helpers/lotOccupancyDB/deleteWorkOrderLot.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteWorkOrderLot: (workOrderId: number | string, lotId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteWorkOrderLot(workOrderId: number | string, lotId: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteWorkOrderLot; diff --git a/helpers/lotOccupancyDB/deleteWorkOrderLot.js b/helpers/lotOccupancyDB/deleteWorkOrderLot.js index 5f9e6fd4..400b617f 100644 --- a/helpers/lotOccupancyDB/deleteWorkOrderLot.js +++ b/helpers/lotOccupancyDB/deleteWorkOrderLot.js @@ -1,16 +1,16 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const deleteWorkOrderLot = (workOrderId, lotId, requestSession) => { +export function deleteWorkOrderLot(workOrderId, lotId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update WorkOrderLots" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where workOrderId = ?" + - " and lotId = ?") + .prepare(`update WorkOrderLots + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where workOrderId = ? + and lotId = ?`) .run(requestSession.user.userName, rightNowMillis, workOrderId, lotId); database.close(); return result.changes > 0; -}; +} export default deleteWorkOrderLot; diff --git a/helpers/lotOccupancyDB/deleteWorkOrderLot.ts b/helpers/lotOccupancyDB/deleteWorkOrderLot.ts index 367ae656..845d70c5 100644 --- a/helpers/lotOccupancyDB/deleteWorkOrderLot.ts +++ b/helpers/lotOccupancyDB/deleteWorkOrderLot.ts @@ -4,28 +4,28 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteWorkOrderLot = ( +export function deleteWorkOrderLot( workOrderId: number | string, lotId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update WorkOrderLots" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where workOrderId = ?" + - " and lotId = ?" + `update WorkOrderLots + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where workOrderId = ? + and lotId = ?` ) .run(requestSession.user.userName, rightNowMillis, workOrderId, lotId); database.close(); return result.changes > 0; -}; +} export default deleteWorkOrderLot; diff --git a/helpers/lotOccupancyDB/deleteWorkOrderLotOccupancy.d.ts b/helpers/lotOccupancyDB/deleteWorkOrderLotOccupancy.d.ts index c9b9430d..f05d8578 100644 --- a/helpers/lotOccupancyDB/deleteWorkOrderLotOccupancy.d.ts +++ b/helpers/lotOccupancyDB/deleteWorkOrderLotOccupancy.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteWorkOrderLotOccupancy: (workOrderId: number | string, lotOccupancyId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteWorkOrderLotOccupancy(workOrderId: number | string, lotOccupancyId: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteWorkOrderLotOccupancy; diff --git a/helpers/lotOccupancyDB/deleteWorkOrderLotOccupancy.js b/helpers/lotOccupancyDB/deleteWorkOrderLotOccupancy.js index 35d43374..9e82cecb 100644 --- a/helpers/lotOccupancyDB/deleteWorkOrderLotOccupancy.js +++ b/helpers/lotOccupancyDB/deleteWorkOrderLotOccupancy.js @@ -1,16 +1,16 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const deleteWorkOrderLotOccupancy = (workOrderId, lotOccupancyId, requestSession) => { +export function deleteWorkOrderLotOccupancy(workOrderId, lotOccupancyId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update WorkOrderLotOccupancies" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where workOrderId = ?" + - " and lotOccupancyId = ?") + .prepare(`update WorkOrderLotOccupancies + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where workOrderId = ? + and lotOccupancyId = ?`) .run(requestSession.user.userName, rightNowMillis, workOrderId, lotOccupancyId); database.close(); return result.changes > 0; -}; +} export default deleteWorkOrderLotOccupancy; diff --git a/helpers/lotOccupancyDB/deleteWorkOrderLotOccupancy.ts b/helpers/lotOccupancyDB/deleteWorkOrderLotOccupancy.ts index bcb9685a..3ca99a29 100644 --- a/helpers/lotOccupancyDB/deleteWorkOrderLotOccupancy.ts +++ b/helpers/lotOccupancyDB/deleteWorkOrderLotOccupancy.ts @@ -4,28 +4,28 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteWorkOrderLotOccupancy = ( +export function deleteWorkOrderLotOccupancy( workOrderId: number | string, lotOccupancyId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update WorkOrderLotOccupancies" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where workOrderId = ?" + - " and lotOccupancyId = ?" + `update WorkOrderLotOccupancies + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where workOrderId = ? + and lotOccupancyId = ?` ) .run(requestSession.user.userName, rightNowMillis, workOrderId, lotOccupancyId); database.close(); return result.changes > 0; -}; +} export default deleteWorkOrderLotOccupancy; diff --git a/helpers/lotOccupancyDB/deleteWorkOrderMilestone.d.ts b/helpers/lotOccupancyDB/deleteWorkOrderMilestone.d.ts index ad3a8c7c..a13d9c97 100644 --- a/helpers/lotOccupancyDB/deleteWorkOrderMilestone.d.ts +++ b/helpers/lotOccupancyDB/deleteWorkOrderMilestone.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteWorkOrderMilestone: (workOrderMilestoneId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteWorkOrderMilestone(workOrderMilestoneId: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteWorkOrderMilestone; diff --git a/helpers/lotOccupancyDB/deleteWorkOrderMilestone.js b/helpers/lotOccupancyDB/deleteWorkOrderMilestone.js index 6edef3e7..70e4d095 100644 --- a/helpers/lotOccupancyDB/deleteWorkOrderMilestone.js +++ b/helpers/lotOccupancyDB/deleteWorkOrderMilestone.js @@ -1,15 +1,15 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const deleteWorkOrderMilestone = (workOrderMilestoneId, requestSession) => { +export function deleteWorkOrderMilestone(workOrderMilestoneId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update WorkOrderMilestones" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where workOrderMilestoneId = ?") + .prepare(`update WorkOrderMilestones + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where workOrderMilestoneId = ?`) .run(requestSession.user.userName, rightNowMillis, workOrderMilestoneId); database.close(); return result.changes > 0; -}; +} export default deleteWorkOrderMilestone; diff --git a/helpers/lotOccupancyDB/deleteWorkOrderMilestone.ts b/helpers/lotOccupancyDB/deleteWorkOrderMilestone.ts index 78e8b83e..2b15e993 100644 --- a/helpers/lotOccupancyDB/deleteWorkOrderMilestone.ts +++ b/helpers/lotOccupancyDB/deleteWorkOrderMilestone.ts @@ -4,26 +4,26 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteWorkOrderMilestone = ( +export function deleteWorkOrderMilestone( workOrderMilestoneId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update WorkOrderMilestones" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where workOrderMilestoneId = ?" + `update WorkOrderMilestones + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where workOrderMilestoneId = ?` ) .run(requestSession.user.userName, rightNowMillis, workOrderMilestoneId); database.close(); return result.changes > 0; -}; +} export default deleteWorkOrderMilestone; diff --git a/helpers/lotOccupancyDB/deleteWorkOrderMilestoneType.d.ts b/helpers/lotOccupancyDB/deleteWorkOrderMilestoneType.d.ts index a84c7757..43ad6d88 100644 --- a/helpers/lotOccupancyDB/deleteWorkOrderMilestoneType.d.ts +++ b/helpers/lotOccupancyDB/deleteWorkOrderMilestoneType.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteWorkOrderMilestoneType: (workOrderMilestoneTypeId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteWorkOrderMilestoneType(workOrderMilestoneTypeId: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteWorkOrderMilestoneType; diff --git a/helpers/lotOccupancyDB/deleteWorkOrderMilestoneType.js b/helpers/lotOccupancyDB/deleteWorkOrderMilestoneType.js index 05a1b9ea..13162372 100644 --- a/helpers/lotOccupancyDB/deleteWorkOrderMilestoneType.js +++ b/helpers/lotOccupancyDB/deleteWorkOrderMilestoneType.js @@ -1,17 +1,17 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearWorkOrderMilestoneTypesCache } from "../functions.cache.js"; -export const deleteWorkOrderMilestoneType = (workOrderMilestoneTypeId, requestSession) => { +export function deleteWorkOrderMilestoneType(workOrderMilestoneTypeId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update WorkOrderMilestoneTypes" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where workOrderMilestoneTypeId = ?") + .prepare(`update WorkOrderMilestoneTypes + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where workOrderMilestoneTypeId = ?`) .run(requestSession.user.userName, rightNowMillis, workOrderMilestoneTypeId); database.close(); clearWorkOrderMilestoneTypesCache(); return result.changes > 0; -}; +} export default deleteWorkOrderMilestoneType; diff --git a/helpers/lotOccupancyDB/deleteWorkOrderMilestoneType.ts b/helpers/lotOccupancyDB/deleteWorkOrderMilestoneType.ts index 1af50800..47a8a68d 100644 --- a/helpers/lotOccupancyDB/deleteWorkOrderMilestoneType.ts +++ b/helpers/lotOccupancyDB/deleteWorkOrderMilestoneType.ts @@ -6,20 +6,20 @@ import { clearWorkOrderMilestoneTypesCache } from "../functions.cache.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteWorkOrderMilestoneType = ( +export function deleteWorkOrderMilestoneType( workOrderMilestoneTypeId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update WorkOrderMilestoneTypes" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where workOrderMilestoneTypeId = ?" + `update WorkOrderMilestoneTypes + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where workOrderMilestoneTypeId = ?` ) .run(requestSession.user.userName, rightNowMillis, workOrderMilestoneTypeId); @@ -28,6 +28,6 @@ export const deleteWorkOrderMilestoneType = ( clearWorkOrderMilestoneTypesCache(); return result.changes > 0; -}; +} export default deleteWorkOrderMilestoneType; diff --git a/helpers/lotOccupancyDB/deleteWorkOrderType.d.ts b/helpers/lotOccupancyDB/deleteWorkOrderType.d.ts index 42e11cd7..15363491 100644 --- a/helpers/lotOccupancyDB/deleteWorkOrderType.d.ts +++ b/helpers/lotOccupancyDB/deleteWorkOrderType.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const deleteWorkOrderType: (workOrderTypeId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function deleteWorkOrderType(workOrderTypeId: number | string, requestSession: recordTypes.PartialSession): boolean; export default deleteWorkOrderType; diff --git a/helpers/lotOccupancyDB/deleteWorkOrderType.js b/helpers/lotOccupancyDB/deleteWorkOrderType.js index eaeaa807..7349c5af 100644 --- a/helpers/lotOccupancyDB/deleteWorkOrderType.js +++ b/helpers/lotOccupancyDB/deleteWorkOrderType.js @@ -1,17 +1,17 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearWorkOrderTypesCache } from "../functions.cache.js"; -export const deleteWorkOrderType = (workOrderTypeId, requestSession) => { +export function deleteWorkOrderType(workOrderTypeId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update WorkOrderTypes" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where workOrderTypeId = ?") + .prepare(`update WorkOrderTypes + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where workOrderTypeId = ?`) .run(requestSession.user.userName, rightNowMillis, workOrderTypeId); database.close(); clearWorkOrderTypesCache(); return result.changes > 0; -}; +} export default deleteWorkOrderType; diff --git a/helpers/lotOccupancyDB/deleteWorkOrderType.ts b/helpers/lotOccupancyDB/deleteWorkOrderType.ts index 62f50182..28826f9a 100644 --- a/helpers/lotOccupancyDB/deleteWorkOrderType.ts +++ b/helpers/lotOccupancyDB/deleteWorkOrderType.ts @@ -6,20 +6,20 @@ import { clearWorkOrderTypesCache } from "../functions.cache.js"; import type * as recordTypes from "../../types/recordTypes"; -export const deleteWorkOrderType = ( +export function deleteWorkOrderType( workOrderTypeId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update WorkOrderTypes" + - " set recordDelete_userName = ?," + - " recordDelete_timeMillis = ?" + - " where workOrderTypeId = ?" + `update WorkOrderTypes + set recordDelete_userName = ?, + recordDelete_timeMillis = ? + where workOrderTypeId = ?` ) .run(requestSession.user.userName, rightNowMillis, workOrderTypeId); @@ -28,6 +28,6 @@ export const deleteWorkOrderType = ( clearWorkOrderTypesCache(); return result.changes > 0; -}; +} export default deleteWorkOrderType; diff --git a/helpers/lotOccupancyDB/getFee.d.ts b/helpers/lotOccupancyDB/getFee.d.ts index 066f6937..efcdfd90 100644 --- a/helpers/lotOccupancyDB/getFee.d.ts +++ b/helpers/lotOccupancyDB/getFee.d.ts @@ -1,4 +1,4 @@ import sqlite from "better-sqlite3"; import type * as recordTypes from "../../types/recordTypes"; -export declare const getFee: (feeId: number | string, connectedDatabase?: sqlite.Database) => recordTypes.Fee; +export declare function getFee(feeId: number | string, connectedDatabase?: sqlite.Database): recordTypes.Fee; export default getFee; diff --git a/helpers/lotOccupancyDB/getFee.js b/helpers/lotOccupancyDB/getFee.js index 032e9e3e..38339c4f 100644 --- a/helpers/lotOccupancyDB/getFee.js +++ b/helpers/lotOccupancyDB/getFee.js @@ -1,30 +1,30 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const getFee = (feeId, connectedDatabase) => { +export function getFee(feeId, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath, { readonly: true }); const fee = database - .prepare("select f.feeId," + - " f.feeCategoryId, c.feeCategory," + - " f.feeName, f.feeDescription," + - " f.occupancyTypeId, o.occupancyType," + - " f.lotTypeId, l.lotType," + - " ifnull(f.feeAmount, 0) as feeAmount, f.feeFunction," + - " f.taxAmount, f.taxPercentage," + - " f.includeQuantity, f.quantityUnit," + - " f.isRequired, f.orderNumber" + - " from Fees f" + - " left join FeeCategories c on f.feeCategoryId = c.feeCategoryId" + - " left join OccupancyTypes o on f.occupancyTypeId = o.occupancyTypeId" + - " left join LotTypes l on f.lotTypeId = l.lotTypeId" + - " where f.recordDelete_timeMillis is null" + - " and f.feeId = ?") + .prepare(`select f.feeId, + f.feeCategoryId, c.feeCategory, + f.feeName, f.feeDescription, + f.occupancyTypeId, o.occupancyType, + f.lotTypeId, l.lotType, + ifnull(f.feeAmount, 0) as feeAmount, f.feeFunction, + f.taxAmount, f.taxPercentage, + f.includeQuantity, f.quantityUnit, + f.isRequired, f.orderNumber + from Fees f + left join FeeCategories c on f.feeCategoryId = c.feeCategoryId + left join OccupancyTypes o on f.occupancyTypeId = o.occupancyTypeId + left join LotTypes l on f.lotTypeId = l.lotTypeId + where f.recordDelete_timeMillis is null + and f.feeId = ?`) .get(feeId); if (!connectedDatabase) { database.close(); } return fee; -}; +} export default getFee; diff --git a/helpers/lotOccupancyDB/getFee.ts b/helpers/lotOccupancyDB/getFee.ts index 402bc5c9..a1893aae 100644 --- a/helpers/lotOccupancyDB/getFee.ts +++ b/helpers/lotOccupancyDB/getFee.ts @@ -4,10 +4,10 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const getFee = ( +export function getFee( feeId: number | string, connectedDatabase?: sqlite.Database -): recordTypes.Fee => { +): recordTypes.Fee { const database = connectedDatabase || sqlite(databasePath, { @@ -16,21 +16,21 @@ export const getFee = ( const fee = database .prepare( - "select f.feeId," + - " f.feeCategoryId, c.feeCategory," + - " f.feeName, f.feeDescription," + - " f.occupancyTypeId, o.occupancyType," + - " f.lotTypeId, l.lotType," + - " ifnull(f.feeAmount, 0) as feeAmount, f.feeFunction," + - " f.taxAmount, f.taxPercentage," + - " f.includeQuantity, f.quantityUnit," + - " f.isRequired, f.orderNumber" + - " from Fees f" + - " left join FeeCategories c on f.feeCategoryId = c.feeCategoryId" + - " left join OccupancyTypes o on f.occupancyTypeId = o.occupancyTypeId" + - " left join LotTypes l on f.lotTypeId = l.lotTypeId" + - " where f.recordDelete_timeMillis is null" + - " and f.feeId = ?" + `select f.feeId, + f.feeCategoryId, c.feeCategory, + f.feeName, f.feeDescription, + f.occupancyTypeId, o.occupancyType, + f.lotTypeId, l.lotType, + ifnull(f.feeAmount, 0) as feeAmount, f.feeFunction, + f.taxAmount, f.taxPercentage, + f.includeQuantity, f.quantityUnit, + f.isRequired, f.orderNumber + from Fees f + left join FeeCategories c on f.feeCategoryId = c.feeCategoryId + left join OccupancyTypes o on f.occupancyTypeId = o.occupancyTypeId + left join LotTypes l on f.lotTypeId = l.lotTypeId + where f.recordDelete_timeMillis is null + and f.feeId = ?` ) .get(feeId); @@ -39,6 +39,6 @@ export const getFee = ( } return fee; -}; +} export default getFee; diff --git a/helpers/lotOccupancyDB/getFeeCategories.d.ts b/helpers/lotOccupancyDB/getFeeCategories.d.ts index f2e30aab..3abac772 100644 --- a/helpers/lotOccupancyDB/getFeeCategories.d.ts +++ b/helpers/lotOccupancyDB/getFeeCategories.d.ts @@ -6,5 +6,5 @@ interface GetFeeCategoriesFilters { interface GetFeeCategoriesOptions { includeFees?: boolean; } -export declare const getFeeCategories: (filters: GetFeeCategoriesFilters, options: GetFeeCategoriesOptions) => recordTypes.FeeCategory[]; +export declare function getFeeCategories(filters: GetFeeCategoriesFilters, options: GetFeeCategoriesOptions): recordTypes.FeeCategory[]; export default getFeeCategories; diff --git a/helpers/lotOccupancyDB/getFeeCategories.js b/helpers/lotOccupancyDB/getFeeCategories.js index 3e933fbd..1f3fcfef 100644 --- a/helpers/lotOccupancyDB/getFeeCategories.js +++ b/helpers/lotOccupancyDB/getFeeCategories.js @@ -2,7 +2,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { getFees } from "./getFees.js"; import { updateFeeCategoryOrderNumber } from "./updateFeeCategory.js"; -export const getFeeCategories = (filters, options) => { +export function getFeeCategories(filters, options) { const updateOrderNumbers = !(filters.lotTypeId || filters.occupancyTypeId) && options.includeFees; const database = sqlite(databasePath, { readonly: !updateOrderNumbers @@ -44,5 +44,5 @@ export const getFeeCategories = (filters, options) => { } database.close(); return feeCategories; -}; +} export default getFeeCategories; diff --git a/helpers/lotOccupancyDB/getFeeCategories.ts b/helpers/lotOccupancyDB/getFeeCategories.ts index 3e992b1f..5a904633 100644 --- a/helpers/lotOccupancyDB/getFeeCategories.ts +++ b/helpers/lotOccupancyDB/getFeeCategories.ts @@ -16,10 +16,10 @@ interface GetFeeCategoriesOptions { includeFees?: boolean; } -export const getFeeCategories = ( +export function getFeeCategories( filters: GetFeeCategoriesFilters, options: GetFeeCategoriesOptions -): recordTypes.FeeCategory[] => { +): recordTypes.FeeCategory[] { const updateOrderNumbers = !(filters.lotTypeId || filters.occupancyTypeId) && options.includeFees; @@ -83,6 +83,6 @@ export const getFeeCategories = ( database.close(); return feeCategories; -}; +} export default getFeeCategories; diff --git a/helpers/lotOccupancyDB/getFees.d.ts b/helpers/lotOccupancyDB/getFees.d.ts index 9b3f9850..097831fe 100644 --- a/helpers/lotOccupancyDB/getFees.d.ts +++ b/helpers/lotOccupancyDB/getFees.d.ts @@ -4,5 +4,5 @@ interface GetFeesFilters { occupancyTypeId?: number | string; lotTypeId?: number | string; } -export declare const getFees: (feeCategoryId: number, additionalFilters: GetFeesFilters, connectedDatabase?: sqlite.Database) => recordTypes.Fee[]; +export declare function getFees(feeCategoryId: number, additionalFilters: GetFeesFilters, connectedDatabase?: sqlite.Database): recordTypes.Fee[]; export default getFees; diff --git a/helpers/lotOccupancyDB/getFees.js b/helpers/lotOccupancyDB/getFees.js index 1866b835..02ae9a07 100644 --- a/helpers/lotOccupancyDB/getFees.js +++ b/helpers/lotOccupancyDB/getFees.js @@ -1,7 +1,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { updateFeeOrderNumber } from "./updateFee.js"; -export const getFees = (feeCategoryId, additionalFilters, connectedDatabase) => { +export function getFees(feeCategoryId, additionalFilters, connectedDatabase) { const updateOrderNumbers = !(additionalFilters.lotTypeId || additionalFilters.occupancyTypeId); const database = connectedDatabase || sqlite(databasePath, { @@ -45,5 +45,5 @@ export const getFees = (feeCategoryId, additionalFilters, connectedDatabase) => database.close(); } return fees; -}; +} export default getFees; diff --git a/helpers/lotOccupancyDB/getFees.ts b/helpers/lotOccupancyDB/getFees.ts index 76d2422e..cc5808da 100644 --- a/helpers/lotOccupancyDB/getFees.ts +++ b/helpers/lotOccupancyDB/getFees.ts @@ -11,11 +11,11 @@ interface GetFeesFilters { lotTypeId?: number | string; } -export const getFees = ( +export function getFees( feeCategoryId: number, additionalFilters: GetFeesFilters, connectedDatabase?: sqlite.Database -): recordTypes.Fee[] => { +): recordTypes.Fee[] { const updateOrderNumbers = !(additionalFilters.lotTypeId || additionalFilters.occupancyTypeId); const database = @@ -76,6 +76,6 @@ export const getFees = ( } return fees; -}; +} export default getFees; diff --git a/helpers/lotOccupancyDB/getLot.d.ts b/helpers/lotOccupancyDB/getLot.d.ts index 4fedfa78..fd731050 100644 --- a/helpers/lotOccupancyDB/getLot.d.ts +++ b/helpers/lotOccupancyDB/getLot.d.ts @@ -1,4 +1,4 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const getLotByLotName: (lotName: string) => recordTypes.Lot | undefined; -export declare const getLot: (lotId: number | string) => recordTypes.Lot; +export declare function getLotByLotName(lotName: string): recordTypes.Lot | undefined; +export declare function getLot(lotId: number | string): recordTypes.Lot; export default getLot; diff --git a/helpers/lotOccupancyDB/getLot.js b/helpers/lotOccupancyDB/getLot.js index f525d7d7..d2516f28 100644 --- a/helpers/lotOccupancyDB/getLot.js +++ b/helpers/lotOccupancyDB/getLot.js @@ -14,7 +14,7 @@ const baseSQL = "select l.lotId," + " left join LotStatuses s on l.lotStatusId = s.lotStatusId" + " left join Maps m on l.mapId = m.mapId" + " where l.recordDelete_timeMillis is null"; -const _getLot = (sql, lotId_or_lotName) => { +function _getLot(sql, lotId_or_lotName) { const database = sqlite(databasePath, { readonly: true }); @@ -32,11 +32,11 @@ const _getLot = (sql, lotId_or_lotName) => { } database.close(); return lot; -}; -export const getLotByLotName = (lotName) => { +} +export function getLotByLotName(lotName) { return _getLot(baseSQL + " and l.lotName = ?", lotName); -}; -export const getLot = (lotId) => { +} +export function getLot(lotId) { return _getLot(baseSQL + " and l.lotId = ?", lotId); -}; +} export default getLot; diff --git a/helpers/lotOccupancyDB/getLot.ts b/helpers/lotOccupancyDB/getLot.ts index c3c4d956..429324b2 100644 --- a/helpers/lotOccupancyDB/getLot.ts +++ b/helpers/lotOccupancyDB/getLot.ts @@ -23,7 +23,7 @@ const baseSQL = " left join Maps m on l.mapId = m.mapId" + " where l.recordDelete_timeMillis is null"; -const _getLot = (sql: string, lotId_or_lotName: number | string): recordTypes.Lot | undefined => { +function _getLot(sql: string, lotId_or_lotName: number | string): recordTypes.Lot | undefined { const database = sqlite(databasePath, { readonly: true }); @@ -51,14 +51,14 @@ const _getLot = (sql: string, lotId_or_lotName: number | string): recordTypes.Lo database.close(); return lot; -}; +} -export const getLotByLotName = (lotName: string): recordTypes.Lot | undefined => { +export function getLotByLotName(lotName: string): recordTypes.Lot | undefined { return _getLot(baseSQL + " and l.lotName = ?", lotName); -}; +} -export const getLot = (lotId: number | string): recordTypes.Lot => { +export function getLot(lotId: number | string): recordTypes.Lot { return _getLot(baseSQL + " and l.lotId = ?", lotId); -}; +} export default getLot; diff --git a/helpers/lotOccupancyDB/getLotComments.d.ts b/helpers/lotOccupancyDB/getLotComments.d.ts index f2fadf61..79355f26 100644 --- a/helpers/lotOccupancyDB/getLotComments.d.ts +++ b/helpers/lotOccupancyDB/getLotComments.d.ts @@ -1,4 +1,4 @@ import sqlite from "better-sqlite3"; import type * as recordTypes from "../../types/recordTypes"; -export declare const getLotComments: (lotId: number | string, connectedDatabase?: sqlite.Database) => recordTypes.LotComment[]; +export declare function getLotComments(lotId: number | string, connectedDatabase?: sqlite.Database): recordTypes.LotComment[]; export default getLotComments; diff --git a/helpers/lotOccupancyDB/getLotComments.js b/helpers/lotOccupancyDB/getLotComments.js index 04d6450f..adacba3b 100644 --- a/helpers/lotOccupancyDB/getLotComments.js +++ b/helpers/lotOccupancyDB/getLotComments.js @@ -1,7 +1,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { dateIntegerToString, timeIntegerToString } from "@cityssm/expressjs-server-js/dateTimeFns.js"; -export const getLotComments = (lotId, connectedDatabase) => { +export function getLotComments(lotId, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath, { readonly: true @@ -9,19 +9,19 @@ export const getLotComments = (lotId, connectedDatabase) => { database.function("userFn_dateIntegerToString", dateIntegerToString); database.function("userFn_timeIntegerToString", timeIntegerToString); const lotComments = database - .prepare("select lotCommentId," + - " lotCommentDate, userFn_dateIntegerToString(lotCommentDate) as lotCommentDateString," + - " lotCommentTime, userFn_timeIntegerToString(lotCommentTime) as lotCommentTimeString," + - " lotComment," + - " recordCreate_userName, recordUpdate_userName" + - " from LotComments" + - " where recordDelete_timeMillis is null" + - " and lotId = ?" + - " order by lotCommentDate desc, lotCommentTime desc, lotCommentId desc") + .prepare(`select lotCommentId, + lotCommentDate, userFn_dateIntegerToString(lotCommentDate) as lotCommentDateString, + lotCommentTime, userFn_timeIntegerToString(lotCommentTime) as lotCommentTimeString, + lotComment, + recordCreate_userName, recordUpdate_userName + from LotComments + where recordDelete_timeMillis is null + and lotId = ? + order by lotCommentDate desc, lotCommentTime desc, lotCommentId desc`) .all(lotId); if (!connectedDatabase) { database.close(); } return lotComments; -}; +} export default getLotComments; diff --git a/helpers/lotOccupancyDB/getLotComments.ts b/helpers/lotOccupancyDB/getLotComments.ts index e885cc90..eecab820 100644 --- a/helpers/lotOccupancyDB/getLotComments.ts +++ b/helpers/lotOccupancyDB/getLotComments.ts @@ -9,10 +9,10 @@ import { import type * as recordTypes from "../../types/recordTypes"; -export const getLotComments = ( +export function getLotComments( lotId: number | string, connectedDatabase?: sqlite.Database -): recordTypes.LotComment[] => { +): recordTypes.LotComment[] { const database = connectedDatabase || sqlite(databasePath, { @@ -24,15 +24,15 @@ export const getLotComments = ( const lotComments = database .prepare( - "select lotCommentId," + - " lotCommentDate, userFn_dateIntegerToString(lotCommentDate) as lotCommentDateString," + - " lotCommentTime, userFn_timeIntegerToString(lotCommentTime) as lotCommentTimeString," + - " lotComment," + - " recordCreate_userName, recordUpdate_userName" + - " from LotComments" + - " where recordDelete_timeMillis is null" + - " and lotId = ?" + - " order by lotCommentDate desc, lotCommentTime desc, lotCommentId desc" + `select lotCommentId, + lotCommentDate, userFn_dateIntegerToString(lotCommentDate) as lotCommentDateString, + lotCommentTime, userFn_timeIntegerToString(lotCommentTime) as lotCommentTimeString, + lotComment, + recordCreate_userName, recordUpdate_userName + from LotComments + where recordDelete_timeMillis is null + and lotId = ? + order by lotCommentDate desc, lotCommentTime desc, lotCommentId desc` ) .all(lotId); @@ -41,6 +41,6 @@ export const getLotComments = ( } return lotComments; -}; +} export default getLotComments; diff --git a/helpers/lotOccupancyDB/getLotFields.d.ts b/helpers/lotOccupancyDB/getLotFields.d.ts index 00406acc..b6486c7d 100644 --- a/helpers/lotOccupancyDB/getLotFields.d.ts +++ b/helpers/lotOccupancyDB/getLotFields.d.ts @@ -1,4 +1,4 @@ import sqlite from "better-sqlite3"; import type * as recordTypes from "../../types/recordTypes"; -export declare const getLotFields: (lotId: number | string, connectedDatabase?: sqlite.Database) => recordTypes.LotField[]; +export declare function getLotFields(lotId: number | string, connectedDatabase?: sqlite.Database): recordTypes.LotField[]; export default getLotFields; diff --git a/helpers/lotOccupancyDB/getLotFields.js b/helpers/lotOccupancyDB/getLotFields.js index 824f551e..6e87598f 100644 --- a/helpers/lotOccupancyDB/getLotFields.js +++ b/helpers/lotOccupancyDB/getLotFields.js @@ -1,37 +1,41 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const getLotFields = (lotId, connectedDatabase) => { +export function getLotFields(lotId, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath, { readonly: true }); const lotFields = database - .prepare("select l.lotId," + - " l.lotTypeFieldId, l.lotFieldValue," + - " f.lotTypeField," + - " f.lotTypeFieldValues, f.isRequired, f.pattern, f.minimumLength, f.maximumLength," + - " f.orderNumber, t.orderNumber as lotTypeOrderNumber" + - " from LotFields l" + - " left join LotTypeFields f on l.lotTypeFieldId = f.lotTypeFieldId" + - " left join LotTypes t on f.lotTypeId = t.lotTypeId" + - " where l.recordDelete_timeMillis is null" + - " and l.lotId = ?" + - " union" + - " select ? as lotId," + - " f.lotTypeFieldId, '' as lotFieldValue," + - " f.lotTypeField," + - " f.lotTypeFieldValues, f.isRequired, f.pattern, f.minimumLength, f.maximumLength," + - " f.orderNumber, t.orderNumber as lotTypeOrderNumber" + - " from LotTypeFields f" + - " left join LotTypes t on f.lotTypeId = t.lotTypeId" + - " where f.recordDelete_timeMillis is null" + - " and (f.lotTypeId is null or f.lotTypeId in (select lotTypeId from Lots where lotId = ?))" + - " and f.lotTypeFieldId not in (select lotTypeFieldId from LotFields where lotId = ? and recordDelete_timeMillis is null)" + - " order by lotTypeOrderNumber, f.orderNumber, f.lotTypeField") + .prepare(`select l.lotId, l.lotTypeFieldId, + l.lotFieldValue, + f.lotTypeField, f.lotTypeFieldValues, + f.isRequired, f.pattern, f.minimumLength, f.maximumLength, + f.orderNumber, t.orderNumber as lotTypeOrderNumber + from LotFields l + left join LotTypeFields f on l.lotTypeFieldId = f.lotTypeFieldId + left join LotTypes t on f.lotTypeId = t.lotTypeId + where l.recordDelete_timeMillis is null + and l.lotId = ? + + union + + select ? as lotId, f.lotTypeFieldId, + '' as lotFieldValue, + f.lotTypeField, f.lotTypeFieldValues, + f.isRequired, f.pattern, f.minimumLength, f.maximumLength, + f.orderNumber, t.orderNumber as lotTypeOrderNumber + from LotTypeFields f + left join LotTypes t on f.lotTypeId = t.lotTypeId + where f.recordDelete_timeMillis is null + and ( + f.lotTypeId is null + or f.lotTypeId in (select lotTypeId from Lots where lotId = ?)) + and f.lotTypeFieldId not in (select lotTypeFieldId from LotFields where lotId = ? and recordDelete_timeMillis is null) + order by lotTypeOrderNumber, f.orderNumber, f.lotTypeField`) .all(lotId, lotId, lotId, lotId); if (!connectedDatabase) { database.close(); } return lotFields; -}; +} export default getLotFields; diff --git a/helpers/lotOccupancyDB/getLotFields.ts b/helpers/lotOccupancyDB/getLotFields.ts index 523a5aac..c933acae 100644 --- a/helpers/lotOccupancyDB/getLotFields.ts +++ b/helpers/lotOccupancyDB/getLotFields.ts @@ -4,10 +4,10 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const getLotFields = ( +export function getLotFields( lotId: number | string, connectedDatabase?: sqlite.Database -): recordTypes.LotField[] => { +): recordTypes.LotField[] { const database = connectedDatabase || sqlite(databasePath, { @@ -16,28 +16,32 @@ export const getLotFields = ( const lotFields: recordTypes.LotField[] = database .prepare( - "select l.lotId," + - " l.lotTypeFieldId, l.lotFieldValue," + - " f.lotTypeField," + - " f.lotTypeFieldValues, f.isRequired, f.pattern, f.minimumLength, f.maximumLength," + - " f.orderNumber, t.orderNumber as lotTypeOrderNumber" + - " from LotFields l" + - " left join LotTypeFields f on l.lotTypeFieldId = f.lotTypeFieldId" + - " left join LotTypes t on f.lotTypeId = t.lotTypeId" + - " where l.recordDelete_timeMillis is null" + - " and l.lotId = ?" + - " union" + - " select ? as lotId," + - " f.lotTypeFieldId, '' as lotFieldValue," + - " f.lotTypeField," + - " f.lotTypeFieldValues, f.isRequired, f.pattern, f.minimumLength, f.maximumLength," + - " f.orderNumber, t.orderNumber as lotTypeOrderNumber" + - " from LotTypeFields f" + - " left join LotTypes t on f.lotTypeId = t.lotTypeId" + - " where f.recordDelete_timeMillis is null" + - " and (f.lotTypeId is null or f.lotTypeId in (select lotTypeId from Lots where lotId = ?))" + - " and f.lotTypeFieldId not in (select lotTypeFieldId from LotFields where lotId = ? and recordDelete_timeMillis is null)" + - " order by lotTypeOrderNumber, f.orderNumber, f.lotTypeField" + `select l.lotId, l.lotTypeFieldId, + l.lotFieldValue, + f.lotTypeField, f.lotTypeFieldValues, + f.isRequired, f.pattern, f.minimumLength, f.maximumLength, + f.orderNumber, t.orderNumber as lotTypeOrderNumber + from LotFields l + left join LotTypeFields f on l.lotTypeFieldId = f.lotTypeFieldId + left join LotTypes t on f.lotTypeId = t.lotTypeId + where l.recordDelete_timeMillis is null + and l.lotId = ? + + union + + select ? as lotId, f.lotTypeFieldId, + '' as lotFieldValue, + f.lotTypeField, f.lotTypeFieldValues, + f.isRequired, f.pattern, f.minimumLength, f.maximumLength, + f.orderNumber, t.orderNumber as lotTypeOrderNumber + from LotTypeFields f + left join LotTypes t on f.lotTypeId = t.lotTypeId + where f.recordDelete_timeMillis is null + and ( + f.lotTypeId is null + or f.lotTypeId in (select lotTypeId from Lots where lotId = ?)) + and f.lotTypeFieldId not in (select lotTypeFieldId from LotFields where lotId = ? and recordDelete_timeMillis is null) + order by lotTypeOrderNumber, f.orderNumber, f.lotTypeField` ) .all(lotId, lotId, lotId, lotId); @@ -46,6 +50,6 @@ export const getLotFields = ( } return lotFields; -}; +} export default getLotFields; diff --git a/helpers/lotOccupancyDB/getLotOccupancies.d.ts b/helpers/lotOccupancyDB/getLotOccupancies.d.ts index 35ced585..3520cb10 100644 --- a/helpers/lotOccupancyDB/getLotOccupancies.d.ts +++ b/helpers/lotOccupancyDB/getLotOccupancies.d.ts @@ -19,7 +19,7 @@ interface GetLotOccupanciesOptions { offset: number; includeOccupants: boolean; } -export declare const getLotOccupancies: (filters: GetLotOccupanciesFilters, options: GetLotOccupanciesOptions, connectedDatabase?: sqlite.Database) => { +export declare function getLotOccupancies(filters: GetLotOccupanciesFilters, options: GetLotOccupanciesOptions, connectedDatabase?: sqlite.Database): { count: number; lotOccupancies: recordTypes.LotOccupancy[]; }; diff --git a/helpers/lotOccupancyDB/getLotOccupancies.js b/helpers/lotOccupancyDB/getLotOccupancies.js index 64c8ba84..b79207b4 100644 --- a/helpers/lotOccupancyDB/getLotOccupancies.js +++ b/helpers/lotOccupancyDB/getLotOccupancies.js @@ -5,7 +5,7 @@ import * as configFunctions from "../functions.config.js"; import { getOccupancyTypeById } from "../functions.cache.js"; import { getLotOccupancyOccupants } from "./getLotOccupancyOccupants.js"; import { getLotNameWhereClause, getOccupancyTimeWhereClause, getOccupantNameWhereClause } from "../functions.sqlFilters.js"; -const buildWhereClause = (filters) => { +function buildWhereClause(filters) { let sqlWhereClause = " where o.recordDelete_timeMillis is null"; const sqlParameters = []; if (filters.lotId) { @@ -17,7 +17,10 @@ const buildWhereClause = (filters) => { sqlParameters.push(...lotNameFilters.sqlParameters); const occupantNameFilters = getOccupantNameWhereClause(filters.occupantName, "o"); if (occupantNameFilters.sqlParameters.length > 0) { - sqlWhereClause += " and o.lotOccupancyId in (select lotOccupancyId from LotOccupancyOccupants o where recordDelete_timeMillis is null" + occupantNameFilters.sqlWhereClause + ")"; + sqlWhereClause += + " and o.lotOccupancyId in (select lotOccupancyId from LotOccupancyOccupants o where recordDelete_timeMillis is null" + + occupantNameFilters.sqlWhereClause + + ")"; sqlParameters.push(...occupantNameFilters.sqlParameters); } if (filters.occupancyTypeId) { @@ -58,8 +61,8 @@ const buildWhereClause = (filters) => { sqlWhereClause, sqlParameters }; -}; -export const getLotOccupancies = (filters, options, connectedDatabase) => { +} +export function getLotOccupancies(filters, options, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath, { readonly: true @@ -117,5 +120,5 @@ export const getLotOccupancies = (filters, options, connectedDatabase) => { count, lotOccupancies }; -}; +} export default getLotOccupancies; diff --git a/helpers/lotOccupancyDB/getLotOccupancies.ts b/helpers/lotOccupancyDB/getLotOccupancies.ts index 2fbfaef1..84323ecd 100644 --- a/helpers/lotOccupancyDB/getLotOccupancies.ts +++ b/helpers/lotOccupancyDB/getLotOccupancies.ts @@ -13,7 +13,11 @@ import { getOccupancyTypeById } from "../functions.cache.js"; import { getLotOccupancyOccupants } from "./getLotOccupancyOccupants.js"; import type * as recordTypes from "../../types/recordTypes"; -import { getLotNameWhereClause, getOccupancyTimeWhereClause, getOccupantNameWhereClause } from "../functions.sqlFilters.js"; +import { + getLotNameWhereClause, + getOccupancyTimeWhereClause, + getOccupantNameWhereClause +} from "../functions.sqlFilters.js"; interface GetLotOccupanciesFilters { lotId?: number | string; @@ -36,9 +40,10 @@ interface GetLotOccupanciesOptions { includeOccupants: boolean; } -const buildWhereClause = ( - filters: GetLotOccupanciesFilters -): { sqlWhereClause: string; sqlParameters: unknown[] } => { +function buildWhereClause(filters: GetLotOccupanciesFilters): { + sqlWhereClause: string; + sqlParameters: unknown[]; +} { let sqlWhereClause = " where o.recordDelete_timeMillis is null"; const sqlParameters: unknown[] = []; @@ -53,7 +58,10 @@ const buildWhereClause = ( const occupantNameFilters = getOccupantNameWhereClause(filters.occupantName, "o"); if (occupantNameFilters.sqlParameters.length > 0) { - sqlWhereClause += " and o.lotOccupancyId in (select lotOccupancyId from LotOccupancyOccupants o where recordDelete_timeMillis is null" + occupantNameFilters.sqlWhereClause + ")"; + sqlWhereClause += + " and o.lotOccupancyId in (select lotOccupancyId from LotOccupancyOccupants o where recordDelete_timeMillis is null" + + occupantNameFilters.sqlWhereClause + + ")"; sqlParameters.push(...occupantNameFilters.sqlParameters); } @@ -106,16 +114,16 @@ const buildWhereClause = ( sqlWhereClause, sqlParameters }; -}; +} -export const getLotOccupancies = ( +export function getLotOccupancies( filters: GetLotOccupanciesFilters, options: GetLotOccupanciesOptions, connectedDatabase?: sqlite.Database ): { count: number; lotOccupancies: recordTypes.LotOccupancy[]; -} => { +} { const database = connectedDatabase || sqlite(databasePath, { @@ -193,6 +201,6 @@ export const getLotOccupancies = ( count, lotOccupancies }; -}; +} export default getLotOccupancies; diff --git a/helpers/lotOccupancyDB/getLotOccupancy.d.ts b/helpers/lotOccupancyDB/getLotOccupancy.d.ts index 68292b02..505b09e0 100644 --- a/helpers/lotOccupancyDB/getLotOccupancy.d.ts +++ b/helpers/lotOccupancyDB/getLotOccupancy.d.ts @@ -1,4 +1,4 @@ import sqlite from "better-sqlite3"; import type * as recordTypes from "../../types/recordTypes"; -export declare const getLotOccupancy: (lotOccupancyId: number | string, connectedDatabase?: sqlite.Database) => recordTypes.LotOccupancy; +export declare function getLotOccupancy(lotOccupancyId: number | string, connectedDatabase?: sqlite.Database): recordTypes.LotOccupancy; export default getLotOccupancy; diff --git a/helpers/lotOccupancyDB/getLotOccupancy.js b/helpers/lotOccupancyDB/getLotOccupancy.js index 5da71dca..fc11937d 100644 --- a/helpers/lotOccupancyDB/getLotOccupancy.js +++ b/helpers/lotOccupancyDB/getLotOccupancy.js @@ -7,26 +7,26 @@ import { getLotOccupancyFields } from "./getLotOccupancyFields.js"; import { getLotOccupancyFees } from "./getLotOccupancyFees.js"; import { getLotOccupancyTransactions } from "./getLotOccupancyTransactions.js"; import { getWorkOrders } from "./getWorkOrders.js"; -export const getLotOccupancy = (lotOccupancyId, connectedDatabase) => { +export function getLotOccupancy(lotOccupancyId, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath, { readonly: true }); database.function("userFn_dateIntegerToString", dateIntegerToString); const lotOccupancy = database - .prepare("select o.lotOccupancyId," + - " o.occupancyTypeId, t.occupancyType," + - " o.lotId, l.lotName, l.lotTypeId," + - " l.mapId, m.mapName," + - " o.occupancyStartDate, userFn_dateIntegerToString(o.occupancyStartDate) as occupancyStartDateString," + - " o.occupancyEndDate, userFn_dateIntegerToString(o.occupancyEndDate) as occupancyEndDateString," + - " o.recordUpdate_timeMillis" + - " from LotOccupancies o" + - " left join OccupancyTypes t on o.occupancyTypeId = t.occupancyTypeId" + - " left join Lots l on o.lotId = l.lotId" + - " left join Maps m on l.mapId = m.mapId" + - " where o.recordDelete_timeMillis is null" + - " and o.lotOccupancyId = ?") + .prepare(`select o.lotOccupancyId, + o.occupancyTypeId, t.occupancyType, + o.lotId, l.lotName, l.lotTypeId, + l.mapId, m.mapName, + o.occupancyStartDate, userFn_dateIntegerToString(o.occupancyStartDate) as occupancyStartDateString, + o.occupancyEndDate, userFn_dateIntegerToString(o.occupancyEndDate) as occupancyEndDateString, + o.recordUpdate_timeMillis + from LotOccupancies o + left join OccupancyTypes t on o.occupancyTypeId = t.occupancyTypeId + left join Lots l on o.lotId = l.lotId + left join Maps m on l.mapId = m.mapId + where o.recordDelete_timeMillis is null + and o.lotOccupancyId = ?`) .get(lotOccupancyId); if (lotOccupancy) { lotOccupancy.lotOccupancyFields = getLotOccupancyFields(lotOccupancyId, database); @@ -45,5 +45,5 @@ export const getLotOccupancy = (lotOccupancyId, connectedDatabase) => { database.close(); } return lotOccupancy; -}; +} export default getLotOccupancy; diff --git a/helpers/lotOccupancyDB/getLotOccupancy.ts b/helpers/lotOccupancyDB/getLotOccupancy.ts index 41346ba5..bf20ee23 100644 --- a/helpers/lotOccupancyDB/getLotOccupancy.ts +++ b/helpers/lotOccupancyDB/getLotOccupancy.ts @@ -5,23 +5,18 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { dateIntegerToString } from "@cityssm/expressjs-server-js/dateTimeFns.js"; import { getLotOccupancyOccupants } from "./getLotOccupancyOccupants.js"; - import { getLotOccupancyComments } from "./getLotOccupancyComments.js"; - import { getLotOccupancyFields } from "./getLotOccupancyFields.js"; - import { getLotOccupancyFees } from "./getLotOccupancyFees.js"; - import { getLotOccupancyTransactions } from "./getLotOccupancyTransactions.js"; - import { getWorkOrders } from "./getWorkOrders.js"; import type * as recordTypes from "../../types/recordTypes"; -export const getLotOccupancy = ( +export function getLotOccupancy( lotOccupancyId: number | string, connectedDatabase?: sqlite.Database -): recordTypes.LotOccupancy => { +): recordTypes.LotOccupancy { const database = connectedDatabase || sqlite(databasePath, { @@ -32,19 +27,19 @@ export const getLotOccupancy = ( const lotOccupancy: recordTypes.LotOccupancy = database .prepare( - "select o.lotOccupancyId," + - " o.occupancyTypeId, t.occupancyType," + - " o.lotId, l.lotName, l.lotTypeId," + - " l.mapId, m.mapName," + - " o.occupancyStartDate, userFn_dateIntegerToString(o.occupancyStartDate) as occupancyStartDateString," + - " o.occupancyEndDate, userFn_dateIntegerToString(o.occupancyEndDate) as occupancyEndDateString," + - " o.recordUpdate_timeMillis" + - " from LotOccupancies o" + - " left join OccupancyTypes t on o.occupancyTypeId = t.occupancyTypeId" + - " left join Lots l on o.lotId = l.lotId" + - " left join Maps m on l.mapId = m.mapId" + - " where o.recordDelete_timeMillis is null" + - " and o.lotOccupancyId = ?" + `select o.lotOccupancyId, + o.occupancyTypeId, t.occupancyType, + o.lotId, l.lotName, l.lotTypeId, + l.mapId, m.mapName, + o.occupancyStartDate, userFn_dateIntegerToString(o.occupancyStartDate) as occupancyStartDateString, + o.occupancyEndDate, userFn_dateIntegerToString(o.occupancyEndDate) as occupancyEndDateString, + o.recordUpdate_timeMillis + from LotOccupancies o + left join OccupancyTypes t on o.occupancyTypeId = t.occupancyTypeId + left join Lots l on o.lotId = l.lotId + left join Maps m on l.mapId = m.mapId + where o.recordDelete_timeMillis is null + and o.lotOccupancyId = ?` ) .get(lotOccupancyId); @@ -75,6 +70,6 @@ export const getLotOccupancy = ( } return lotOccupancy; -}; +} export default getLotOccupancy; diff --git a/helpers/lotOccupancyDB/getLotOccupancyComments.d.ts b/helpers/lotOccupancyDB/getLotOccupancyComments.d.ts index 2fe25051..f4898195 100644 --- a/helpers/lotOccupancyDB/getLotOccupancyComments.d.ts +++ b/helpers/lotOccupancyDB/getLotOccupancyComments.d.ts @@ -1,4 +1,4 @@ import sqlite from "better-sqlite3"; import type * as recordTypes from "../../types/recordTypes"; -export declare const getLotOccupancyComments: (lotOccupancyId: number | string, connectedDatabase?: sqlite.Database) => recordTypes.LotOccupancyComment[]; +export declare function getLotOccupancyComments(lotOccupancyId: number | string, connectedDatabase?: sqlite.Database): recordTypes.LotOccupancyComment[]; export default getLotOccupancyComments; diff --git a/helpers/lotOccupancyDB/getLotOccupancyComments.js b/helpers/lotOccupancyDB/getLotOccupancyComments.js index 9033b5b6..8c95c8fd 100644 --- a/helpers/lotOccupancyDB/getLotOccupancyComments.js +++ b/helpers/lotOccupancyDB/getLotOccupancyComments.js @@ -1,7 +1,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { dateIntegerToString, timeIntegerToString } from "@cityssm/expressjs-server-js/dateTimeFns.js"; -export const getLotOccupancyComments = (lotOccupancyId, connectedDatabase) => { +export function getLotOccupancyComments(lotOccupancyId, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath, { readonly: true @@ -9,19 +9,19 @@ export const getLotOccupancyComments = (lotOccupancyId, connectedDatabase) => { database.function("userFn_dateIntegerToString", dateIntegerToString); database.function("userFn_timeIntegerToString", timeIntegerToString); const lotComments = database - .prepare("select lotOccupancyCommentId," + - " lotOccupancyCommentDate, userFn_dateIntegerToString(lotOccupancyCommentDate) as lotOccupancyCommentDateString," + - " lotOccupancyCommentTime, userFn_timeIntegerToString(lotOccupancyCommentTime) as lotOccupancyCommentTimeString," + - " lotOccupancyComment," + - " recordCreate_userName, recordUpdate_userName" + - " from LotOccupancyComments" + - " where recordDelete_timeMillis is null" + - " and lotOccupancyId = ?" + - " order by lotOccupancyCommentDate desc, lotOccupancyCommentTime desc, lotOccupancyCommentId desc") + .prepare(`select lotOccupancyCommentId, + lotOccupancyCommentDate, userFn_dateIntegerToString(lotOccupancyCommentDate) as lotOccupancyCommentDateString, + lotOccupancyCommentTime, userFn_timeIntegerToString(lotOccupancyCommentTime) as lotOccupancyCommentTimeString, + lotOccupancyComment, + recordCreate_userName, recordUpdate_userName + from LotOccupancyComments + where recordDelete_timeMillis is null + and lotOccupancyId = ? + order by lotOccupancyCommentDate desc, lotOccupancyCommentTime desc, lotOccupancyCommentId desc`) .all(lotOccupancyId); if (!connectedDatabase) { database.close(); } return lotComments; -}; +} export default getLotOccupancyComments; diff --git a/helpers/lotOccupancyDB/getLotOccupancyComments.ts b/helpers/lotOccupancyDB/getLotOccupancyComments.ts index be4a3984..5fdcc35c 100644 --- a/helpers/lotOccupancyDB/getLotOccupancyComments.ts +++ b/helpers/lotOccupancyDB/getLotOccupancyComments.ts @@ -9,10 +9,10 @@ import { import type * as recordTypes from "../../types/recordTypes"; -export const getLotOccupancyComments = ( +export function getLotOccupancyComments( lotOccupancyId: number | string, connectedDatabase?: sqlite.Database -): recordTypes.LotOccupancyComment[] => { +): recordTypes.LotOccupancyComment[] { const database = connectedDatabase || sqlite(databasePath, { @@ -24,15 +24,15 @@ export const getLotOccupancyComments = ( const lotComments = database .prepare( - "select lotOccupancyCommentId," + - " lotOccupancyCommentDate, userFn_dateIntegerToString(lotOccupancyCommentDate) as lotOccupancyCommentDateString," + - " lotOccupancyCommentTime, userFn_timeIntegerToString(lotOccupancyCommentTime) as lotOccupancyCommentTimeString," + - " lotOccupancyComment," + - " recordCreate_userName, recordUpdate_userName" + - " from LotOccupancyComments" + - " where recordDelete_timeMillis is null" + - " and lotOccupancyId = ?" + - " order by lotOccupancyCommentDate desc, lotOccupancyCommentTime desc, lotOccupancyCommentId desc" + `select lotOccupancyCommentId, + lotOccupancyCommentDate, userFn_dateIntegerToString(lotOccupancyCommentDate) as lotOccupancyCommentDateString, + lotOccupancyCommentTime, userFn_timeIntegerToString(lotOccupancyCommentTime) as lotOccupancyCommentTimeString, + lotOccupancyComment, + recordCreate_userName, recordUpdate_userName + from LotOccupancyComments + where recordDelete_timeMillis is null + and lotOccupancyId = ? + order by lotOccupancyCommentDate desc, lotOccupancyCommentTime desc, lotOccupancyCommentId desc` ) .all(lotOccupancyId); @@ -41,6 +41,6 @@ export const getLotOccupancyComments = ( } return lotComments; -}; +} export default getLotOccupancyComments; diff --git a/helpers/lotOccupancyDB/getLotOccupancyFees.d.ts b/helpers/lotOccupancyDB/getLotOccupancyFees.d.ts index 045c70cd..7ce8e6ec 100644 --- a/helpers/lotOccupancyDB/getLotOccupancyFees.d.ts +++ b/helpers/lotOccupancyDB/getLotOccupancyFees.d.ts @@ -1,4 +1,4 @@ import sqlite from "better-sqlite3"; import type * as recordTypes from "../../types/recordTypes"; -export declare const getLotOccupancyFees: (lotOccupancyId: number | string, connectedDatabase?: sqlite.Database) => recordTypes.LotOccupancyFee[]; +export declare function getLotOccupancyFees(lotOccupancyId: number | string, connectedDatabase?: sqlite.Database): recordTypes.LotOccupancyFee[]; export default getLotOccupancyFees; diff --git a/helpers/lotOccupancyDB/getLotOccupancyFees.js b/helpers/lotOccupancyDB/getLotOccupancyFees.js index edbb388c..4484f9bb 100644 --- a/helpers/lotOccupancyDB/getLotOccupancyFees.js +++ b/helpers/lotOccupancyDB/getLotOccupancyFees.js @@ -1,24 +1,24 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const getLotOccupancyFees = (lotOccupancyId, connectedDatabase) => { +export function getLotOccupancyFees(lotOccupancyId, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath, { readonly: true }); const lotOccupancyFees = database - .prepare("select o.lotOccupancyId," + - " o.feeId, c.feeCategory, f.feeName, f.includeQuantity," + - " o.feeAmount, o.taxAmount, o.quantity" + - " from LotOccupancyFees o" + - " left join Fees f on o.feeId = f.feeId" + - " left join FeeCategories c on f.feeCategoryId = c.feeCategoryId" + - " where o.recordDelete_timeMillis is null" + - " and o.lotOccupancyId = ?" + - " order by o.recordCreate_timeMillis") + .prepare(`select o.lotOccupancyId, o.feeId, + c.feeCategory, f.feeName, + f.includeQuantity, o.feeAmount, o.taxAmount, o.quantity + from LotOccupancyFees o + left join Fees f on o.feeId = f.feeId + left join FeeCategories c on f.feeCategoryId = c.feeCategoryId + where o.recordDelete_timeMillis is null + and o.lotOccupancyId = ? + order by o.recordCreate_timeMillis`) .all(lotOccupancyId); if (!connectedDatabase) { database.close(); } return lotOccupancyFees; -}; +} export default getLotOccupancyFees; diff --git a/helpers/lotOccupancyDB/getLotOccupancyFees.ts b/helpers/lotOccupancyDB/getLotOccupancyFees.ts index ad13945c..4ba7ebc2 100644 --- a/helpers/lotOccupancyDB/getLotOccupancyFees.ts +++ b/helpers/lotOccupancyDB/getLotOccupancyFees.ts @@ -4,10 +4,10 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const getLotOccupancyFees = ( +export function getLotOccupancyFees( lotOccupancyId: number | string, connectedDatabase?: sqlite.Database -): recordTypes.LotOccupancyFee[] => { +): recordTypes.LotOccupancyFee[] { const database = connectedDatabase || sqlite(databasePath, { @@ -16,15 +16,15 @@ export const getLotOccupancyFees = ( const lotOccupancyFees: recordTypes.LotOccupancyFee[] = database .prepare( - "select o.lotOccupancyId," + - " o.feeId, c.feeCategory, f.feeName, f.includeQuantity," + - " o.feeAmount, o.taxAmount, o.quantity" + - " from LotOccupancyFees o" + - " left join Fees f on o.feeId = f.feeId" + - " left join FeeCategories c on f.feeCategoryId = c.feeCategoryId" + - " where o.recordDelete_timeMillis is null" + - " and o.lotOccupancyId = ?" + - " order by o.recordCreate_timeMillis" + `select o.lotOccupancyId, o.feeId, + c.feeCategory, f.feeName, + f.includeQuantity, o.feeAmount, o.taxAmount, o.quantity + from LotOccupancyFees o + left join Fees f on o.feeId = f.feeId + left join FeeCategories c on f.feeCategoryId = c.feeCategoryId + where o.recordDelete_timeMillis is null + and o.lotOccupancyId = ? + order by o.recordCreate_timeMillis` ) .all(lotOccupancyId); @@ -33,6 +33,6 @@ export const getLotOccupancyFees = ( } return lotOccupancyFees; -}; +} export default getLotOccupancyFees; diff --git a/helpers/lotOccupancyDB/getLotOccupancyFields.d.ts b/helpers/lotOccupancyDB/getLotOccupancyFields.d.ts index a3619a4d..fdb3db50 100644 --- a/helpers/lotOccupancyDB/getLotOccupancyFields.d.ts +++ b/helpers/lotOccupancyDB/getLotOccupancyFields.d.ts @@ -1,4 +1,4 @@ import sqlite from "better-sqlite3"; import type * as recordTypes from "../../types/recordTypes"; -export declare const getLotOccupancyFields: (lotOccupancyId: number | string, connectedDatabase?: sqlite.Database) => recordTypes.LotOccupancyField[]; +export declare function getLotOccupancyFields(lotOccupancyId: number | string, connectedDatabase?: sqlite.Database): recordTypes.LotOccupancyField[]; export default getLotOccupancyFields; diff --git a/helpers/lotOccupancyDB/getLotOccupancyFields.js b/helpers/lotOccupancyDB/getLotOccupancyFields.js index 5f6585de..164e6cb0 100644 --- a/helpers/lotOccupancyDB/getLotOccupancyFields.js +++ b/helpers/lotOccupancyDB/getLotOccupancyFields.js @@ -1,37 +1,38 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const getLotOccupancyFields = (lotOccupancyId, connectedDatabase) => { +export function getLotOccupancyFields(lotOccupancyId, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath, { readonly: true }); const lotOccupancyFields = database - .prepare("select o.lotOccupancyId," + - " o.occupancyTypeFieldId, o.lotOccupancyFieldValue," + - " f.occupancyTypeField," + - " f.occupancyTypeFieldValues, f.isRequired, f.pattern, f.minimumLength, f.maximumLength," + - " f.orderNumber, t.orderNumber as occupancyTypeOrderNumber" + - " from LotOccupancyFields o" + - " left join OccupancyTypeFields f on o.occupancyTypeFieldId = f.occupancyTypeFieldId" + - " left join OccupancyTypes t on f.occupancyTypeId = t.occupancyTypeId" + - " where o.recordDelete_timeMillis is null" + - " and o.lotOccupancyId = ?" + - " union" + - " select ? as lotOccupancyId," + - " f.occupancyTypeFieldId, '' as lotOccupancyFieldValue," + - " f.occupancyTypeField," + - " f.occupancyTypeFieldValues, f.isRequired, f.pattern, f.minimumLength, f.maximumLength," + - " f.orderNumber, t.orderNumber as occupancyTypeOrderNumber" + - " from OccupancyTypeFields f" + - " left join OccupancyTypes t on f.occupancyTypeId = t.occupancyTypeId" + - " where f.recordDelete_timeMillis is null" + - " and (f.occupancyTypeId is null or f.occupancyTypeId in (select occupancyTypeId from LotOccupancies where lotOccupancyId = ?))" + - " and f.occupancyTypeFieldId not in (select occupancyTypeFieldId from LotOccupancyFields where lotOccupancyId = ? and recordDelete_timeMillis is null)" + - " order by occupancyTypeOrderNumber, f.orderNumber, f.occupancyTypeField") + .prepare(`select o.lotOccupancyId, o.occupancyTypeFieldId, + o.lotOccupancyFieldValue, f.occupancyTypeField, f.occupancyTypeFieldValues, + f.isRequired, f.pattern, f.minimumLength, f.maximumLength, + f.orderNumber, t.orderNumber as occupancyTypeOrderNumber + from LotOccupancyFields o + left join OccupancyTypeFields f on o.occupancyTypeFieldId = f.occupancyTypeFieldId + left join OccupancyTypes t on f.occupancyTypeId = t.occupancyTypeId + where o.recordDelete_timeMillis is null + and o.lotOccupancyId = ? + + union + + select ? as lotOccupancyId, f.occupancyTypeFieldId, + '' as lotOccupancyFieldValue, f.occupancyTypeField, f.occupancyTypeFieldValues, + f.isRequired, f.pattern, f.minimumLength, f.maximumLength, + f.orderNumber, t.orderNumber as occupancyTypeOrderNumber + from OccupancyTypeFields f + left join OccupancyTypes t on f.occupancyTypeId = t.occupancyTypeId + where f.recordDelete_timeMillis is null and ( + f.occupancyTypeId is null + or f.occupancyTypeId in (select occupancyTypeId from LotOccupancies where lotOccupancyId = ?)) + and f.occupancyTypeFieldId not in (select occupancyTypeFieldId from LotOccupancyFields where lotOccupancyId = ? and recordDelete_timeMillis is null) + order by occupancyTypeOrderNumber, f.orderNumber, f.occupancyTypeField`) .all(lotOccupancyId, lotOccupancyId, lotOccupancyId, lotOccupancyId); if (!connectedDatabase) { database.close(); } return lotOccupancyFields; -}; +} export default getLotOccupancyFields; diff --git a/helpers/lotOccupancyDB/getLotOccupancyFields.ts b/helpers/lotOccupancyDB/getLotOccupancyFields.ts index 36ec11df..a0e8279b 100644 --- a/helpers/lotOccupancyDB/getLotOccupancyFields.ts +++ b/helpers/lotOccupancyDB/getLotOccupancyFields.ts @@ -4,10 +4,10 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const getLotOccupancyFields = ( +export function getLotOccupancyFields( lotOccupancyId: number | string, connectedDatabase?: sqlite.Database -): recordTypes.LotOccupancyField[] => { +): recordTypes.LotOccupancyField[] { const database = connectedDatabase || sqlite(databasePath, { @@ -16,28 +16,29 @@ export const getLotOccupancyFields = ( const lotOccupancyFields: recordTypes.LotOccupancyField[] = database .prepare( - "select o.lotOccupancyId," + - " o.occupancyTypeFieldId, o.lotOccupancyFieldValue," + - " f.occupancyTypeField," + - " f.occupancyTypeFieldValues, f.isRequired, f.pattern, f.minimumLength, f.maximumLength," + - " f.orderNumber, t.orderNumber as occupancyTypeOrderNumber" + - " from LotOccupancyFields o" + - " left join OccupancyTypeFields f on o.occupancyTypeFieldId = f.occupancyTypeFieldId" + - " left join OccupancyTypes t on f.occupancyTypeId = t.occupancyTypeId" + - " where o.recordDelete_timeMillis is null" + - " and o.lotOccupancyId = ?" + - " union" + - " select ? as lotOccupancyId," + - " f.occupancyTypeFieldId, '' as lotOccupancyFieldValue," + - " f.occupancyTypeField," + - " f.occupancyTypeFieldValues, f.isRequired, f.pattern, f.minimumLength, f.maximumLength," + - " f.orderNumber, t.orderNumber as occupancyTypeOrderNumber" + - " from OccupancyTypeFields f" + - " left join OccupancyTypes t on f.occupancyTypeId = t.occupancyTypeId" + - " where f.recordDelete_timeMillis is null" + - " and (f.occupancyTypeId is null or f.occupancyTypeId in (select occupancyTypeId from LotOccupancies where lotOccupancyId = ?))" + - " and f.occupancyTypeFieldId not in (select occupancyTypeFieldId from LotOccupancyFields where lotOccupancyId = ? and recordDelete_timeMillis is null)" + - " order by occupancyTypeOrderNumber, f.orderNumber, f.occupancyTypeField" + `select o.lotOccupancyId, o.occupancyTypeFieldId, + o.lotOccupancyFieldValue, f.occupancyTypeField, f.occupancyTypeFieldValues, + f.isRequired, f.pattern, f.minimumLength, f.maximumLength, + f.orderNumber, t.orderNumber as occupancyTypeOrderNumber + from LotOccupancyFields o + left join OccupancyTypeFields f on o.occupancyTypeFieldId = f.occupancyTypeFieldId + left join OccupancyTypes t on f.occupancyTypeId = t.occupancyTypeId + where o.recordDelete_timeMillis is null + and o.lotOccupancyId = ? + + union + + select ? as lotOccupancyId, f.occupancyTypeFieldId, + '' as lotOccupancyFieldValue, f.occupancyTypeField, f.occupancyTypeFieldValues, + f.isRequired, f.pattern, f.minimumLength, f.maximumLength, + f.orderNumber, t.orderNumber as occupancyTypeOrderNumber + from OccupancyTypeFields f + left join OccupancyTypes t on f.occupancyTypeId = t.occupancyTypeId + where f.recordDelete_timeMillis is null and ( + f.occupancyTypeId is null + or f.occupancyTypeId in (select occupancyTypeId from LotOccupancies where lotOccupancyId = ?)) + and f.occupancyTypeFieldId not in (select occupancyTypeFieldId from LotOccupancyFields where lotOccupancyId = ? and recordDelete_timeMillis is null) + order by occupancyTypeOrderNumber, f.orderNumber, f.occupancyTypeField` ) .all(lotOccupancyId, lotOccupancyId, lotOccupancyId, lotOccupancyId); @@ -46,6 +47,6 @@ export const getLotOccupancyFields = ( } return lotOccupancyFields; -}; +} export default getLotOccupancyFields; diff --git a/helpers/lotOccupancyDB/getLotOccupancyOccupants.d.ts b/helpers/lotOccupancyDB/getLotOccupancyOccupants.d.ts index 6f904255..d323eed1 100644 --- a/helpers/lotOccupancyDB/getLotOccupancyOccupants.d.ts +++ b/helpers/lotOccupancyDB/getLotOccupancyOccupants.d.ts @@ -1,4 +1,4 @@ import sqlite from "better-sqlite3"; import type * as recordTypes from "../../types/recordTypes"; -export declare const getLotOccupancyOccupants: (lotOccupancyId: number | string, connectedDatabase?: sqlite.Database) => recordTypes.LotOccupancyOccupant[]; +export declare function getLotOccupancyOccupants(lotOccupancyId: number | string, connectedDatabase?: sqlite.Database): recordTypes.LotOccupancyOccupant[]; export default getLotOccupancyOccupants; diff --git a/helpers/lotOccupancyDB/getLotOccupancyOccupants.js b/helpers/lotOccupancyDB/getLotOccupancyOccupants.js index 1b16e7fa..562cfddf 100644 --- a/helpers/lotOccupancyDB/getLotOccupancyOccupants.js +++ b/helpers/lotOccupancyDB/getLotOccupancyOccupants.js @@ -1,25 +1,28 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const getLotOccupancyOccupants = (lotOccupancyId, connectedDatabase) => { +export function getLotOccupancyOccupants(lotOccupancyId, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath, { readonly: true }); const lotOccupancyOccupants = database - .prepare("select o.lotOccupancyId, o.lotOccupantIndex," + - " o.occupantName, o.occupantAddress1, o.occupantAddress2," + - " o.occupantCity, o.occupantProvince, o.occupantPostalCode," + - " o.occupantPhoneNumber, o.occupantEmailAddress, o.occupantComment," + - " o.lotOccupantTypeId, t.lotOccupantType, t.fontAwesomeIconClass" + - " from LotOccupancyOccupants o" + - " left join LotOccupantTypes t on o.lotOccupantTypeId = t.lotOccupantTypeId" + - " where o.recordDelete_timeMillis is null" + - " and o.lotOccupancyId = ?" + - " order by t.orderNumber, t.lotOccupantType, o.occupantName, o.lotOccupantIndex") + .prepare(`select o.lotOccupancyId, o.lotOccupantIndex, + o.occupantName, + o.occupantAddress1, o.occupantAddress2, + o.occupantCity, o.occupantProvince, o.occupantPostalCode, + o.occupantPhoneNumber, o.occupantEmailAddress, + o.occupantComment, + o.lotOccupantTypeId, t.lotOccupantType, + t.fontAwesomeIconClass + from LotOccupancyOccupants o + left join LotOccupantTypes t on o.lotOccupantTypeId = t.lotOccupantTypeId + where o.recordDelete_timeMillis is null + and o.lotOccupancyId = ? + order by t.orderNumber, t.lotOccupantType, o.occupantName, o.lotOccupantIndex`) .all(lotOccupancyId); if (!connectedDatabase) { database.close(); } return lotOccupancyOccupants; -}; +} export default getLotOccupancyOccupants; diff --git a/helpers/lotOccupancyDB/getLotOccupancyOccupants.ts b/helpers/lotOccupancyDB/getLotOccupancyOccupants.ts index dfd477ea..23854a14 100644 --- a/helpers/lotOccupancyDB/getLotOccupancyOccupants.ts +++ b/helpers/lotOccupancyDB/getLotOccupancyOccupants.ts @@ -4,10 +4,10 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const getLotOccupancyOccupants = ( +export function getLotOccupancyOccupants( lotOccupancyId: number | string, connectedDatabase?: sqlite.Database -): recordTypes.LotOccupancyOccupant[] => { +): recordTypes.LotOccupancyOccupant[] { const database = connectedDatabase || sqlite(databasePath, { @@ -16,16 +16,19 @@ export const getLotOccupancyOccupants = ( const lotOccupancyOccupants: recordTypes.LotOccupancyOccupant[] = database .prepare( - "select o.lotOccupancyId, o.lotOccupantIndex," + - " o.occupantName, o.occupantAddress1, o.occupantAddress2," + - " o.occupantCity, o.occupantProvince, o.occupantPostalCode," + - " o.occupantPhoneNumber, o.occupantEmailAddress, o.occupantComment," + - " o.lotOccupantTypeId, t.lotOccupantType, t.fontAwesomeIconClass" + - " from LotOccupancyOccupants o" + - " left join LotOccupantTypes t on o.lotOccupantTypeId = t.lotOccupantTypeId" + - " where o.recordDelete_timeMillis is null" + - " and o.lotOccupancyId = ?" + - " order by t.orderNumber, t.lotOccupantType, o.occupantName, o.lotOccupantIndex" + `select o.lotOccupancyId, o.lotOccupantIndex, + o.occupantName, + o.occupantAddress1, o.occupantAddress2, + o.occupantCity, o.occupantProvince, o.occupantPostalCode, + o.occupantPhoneNumber, o.occupantEmailAddress, + o.occupantComment, + o.lotOccupantTypeId, t.lotOccupantType, + t.fontAwesomeIconClass + from LotOccupancyOccupants o + left join LotOccupantTypes t on o.lotOccupantTypeId = t.lotOccupantTypeId + where o.recordDelete_timeMillis is null + and o.lotOccupancyId = ? + order by t.orderNumber, t.lotOccupantType, o.occupantName, o.lotOccupantIndex` ) .all(lotOccupancyId); @@ -34,6 +37,6 @@ export const getLotOccupancyOccupants = ( } return lotOccupancyOccupants; -}; +} export default getLotOccupancyOccupants; diff --git a/helpers/lotOccupancyDB/getLotOccupancyTransactions.d.ts b/helpers/lotOccupancyDB/getLotOccupancyTransactions.d.ts index 9f64f68a..8400438f 100644 --- a/helpers/lotOccupancyDB/getLotOccupancyTransactions.d.ts +++ b/helpers/lotOccupancyDB/getLotOccupancyTransactions.d.ts @@ -1,4 +1,4 @@ import sqlite from "better-sqlite3"; import type * as recordTypes from "../../types/recordTypes"; -export declare const getLotOccupancyTransactions: (lotOccupancyId: number | string, connectedDatabase?: sqlite.Database) => recordTypes.LotOccupancyTransaction[]; +export declare function getLotOccupancyTransactions(lotOccupancyId: number | string, connectedDatabase?: sqlite.Database): recordTypes.LotOccupancyTransaction[]; export default getLotOccupancyTransactions; diff --git a/helpers/lotOccupancyDB/getLotOccupancyTransactions.js b/helpers/lotOccupancyDB/getLotOccupancyTransactions.js index 56452161..39f49398 100644 --- a/helpers/lotOccupancyDB/getLotOccupancyTransactions.js +++ b/helpers/lotOccupancyDB/getLotOccupancyTransactions.js @@ -1,7 +1,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { dateIntegerToString, timeIntegerToString } from "@cityssm/expressjs-server-js/dateTimeFns.js"; -export const getLotOccupancyTransactions = (lotOccupancyId, connectedDatabase) => { +export function getLotOccupancyTransactions(lotOccupancyId, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath, { readonly: true @@ -9,18 +9,18 @@ export const getLotOccupancyTransactions = (lotOccupancyId, connectedDatabase) = database.function("userFn_dateIntegerToString", dateIntegerToString); database.function("userFn_timeIntegerToString", timeIntegerToString); const lotOccupancyTransactions = database - .prepare("select lotOccupancyId, transactionIndex," + - " transactionDate, userFn_dateIntegerToString(transactionDate) as transactionDateString," + - " transactionTime, userFn_timeIntegerToString(transactionTime) as transactionTimeString," + - " transactionAmount, externalReceiptNumber, transactionNote" + - " from LotOccupancyTransactions" + - " where recordDelete_timeMillis is null" + - " and lotOccupancyId = ?" + - " order by transactionDate, transactionTime, transactionIndex") + .prepare(`select lotOccupancyId, transactionIndex, + transactionDate, userFn_dateIntegerToString(transactionDate) as transactionDateString, + transactionTime, userFn_timeIntegerToString(transactionTime) as transactionTimeString, + transactionAmount, externalReceiptNumber, transactionNote + from LotOccupancyTransactions + where recordDelete_timeMillis is null + and lotOccupancyId = ? + order by transactionDate, transactionTime, transactionIndex`) .all(lotOccupancyId); if (!connectedDatabase) { database.close(); } return lotOccupancyTransactions; -}; +} export default getLotOccupancyTransactions; diff --git a/helpers/lotOccupancyDB/getLotOccupancyTransactions.ts b/helpers/lotOccupancyDB/getLotOccupancyTransactions.ts index b33f0d3e..1216e335 100644 --- a/helpers/lotOccupancyDB/getLotOccupancyTransactions.ts +++ b/helpers/lotOccupancyDB/getLotOccupancyTransactions.ts @@ -9,10 +9,10 @@ import { import type * as recordTypes from "../../types/recordTypes"; -export const getLotOccupancyTransactions = ( +export function getLotOccupancyTransactions( lotOccupancyId: number | string, connectedDatabase?: sqlite.Database -): recordTypes.LotOccupancyTransaction[] => { +): recordTypes.LotOccupancyTransaction[] { const database = connectedDatabase || sqlite(databasePath, { @@ -22,25 +22,24 @@ export const getLotOccupancyTransactions = ( database.function("userFn_dateIntegerToString", dateIntegerToString); database.function("userFn_timeIntegerToString", timeIntegerToString); - const lotOccupancyTransactions: recordTypes.LotOccupancyTransaction[] = - database - .prepare( - "select lotOccupancyId, transactionIndex," + - " transactionDate, userFn_dateIntegerToString(transactionDate) as transactionDateString," + - " transactionTime, userFn_timeIntegerToString(transactionTime) as transactionTimeString," + - " transactionAmount, externalReceiptNumber, transactionNote" + - " from LotOccupancyTransactions" + - " where recordDelete_timeMillis is null" + - " and lotOccupancyId = ?" + - " order by transactionDate, transactionTime, transactionIndex" - ) - .all(lotOccupancyId); + const lotOccupancyTransactions: recordTypes.LotOccupancyTransaction[] = database + .prepare( + `select lotOccupancyId, transactionIndex, + transactionDate, userFn_dateIntegerToString(transactionDate) as transactionDateString, + transactionTime, userFn_timeIntegerToString(transactionTime) as transactionTimeString, + transactionAmount, externalReceiptNumber, transactionNote + from LotOccupancyTransactions + where recordDelete_timeMillis is null + and lotOccupancyId = ? + order by transactionDate, transactionTime, transactionIndex` + ) + .all(lotOccupancyId); if (!connectedDatabase) { database.close(); } return lotOccupancyTransactions; -}; +} export default getLotOccupancyTransactions; diff --git a/helpers/lotOccupancyDB/getLotOccupantTypes.d.ts b/helpers/lotOccupancyDB/getLotOccupantTypes.d.ts index 2228bdd9..03bf3225 100644 --- a/helpers/lotOccupancyDB/getLotOccupantTypes.d.ts +++ b/helpers/lotOccupancyDB/getLotOccupantTypes.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const getLotOccupantTypes: () => recordTypes.LotOccupantType[]; +export declare function getLotOccupantTypes(): recordTypes.LotOccupantType[]; export default getLotOccupantTypes; diff --git a/helpers/lotOccupancyDB/getLotOccupantTypes.js b/helpers/lotOccupancyDB/getLotOccupantTypes.js index 5f4b3ff8..a453013b 100644 --- a/helpers/lotOccupancyDB/getLotOccupantTypes.js +++ b/helpers/lotOccupancyDB/getLotOccupantTypes.js @@ -1,20 +1,20 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const getLotOccupantTypes = () => { +export function getLotOccupantTypes() { const database = sqlite(databasePath); const lotOccupantTypes = database - .prepare("select lotOccupantTypeId, lotOccupantType, fontAwesomeIconClass" + - " from LotOccupantTypes" + - " where recordDelete_timeMillis is null" + - " order by orderNumber, lotOccupantType") + .prepare(`select lotOccupantTypeId, lotOccupantType, fontAwesomeIconClass + from LotOccupantTypes + where recordDelete_timeMillis is null + order by orderNumber, lotOccupantType`) .all(); let expectedOrderNumber = 0; for (const lotOccupantType of lotOccupantTypes) { if (lotOccupantType.orderNumber !== expectedOrderNumber) { database - .prepare("update LotOccupantTypes" + - " set orderNumber = ?" + - " where lotOccupantTypeId = ?") + .prepare(`update LotOccupantTypes + set orderNumber = ? + where lotOccupantTypeId = ?`) .run(expectedOrderNumber, lotOccupantType.lotOccupantTypeId); lotOccupantType.orderNumber = expectedOrderNumber; } @@ -22,5 +22,5 @@ export const getLotOccupantTypes = () => { } database.close(); return lotOccupantTypes; -}; +} export default getLotOccupantTypes; diff --git a/helpers/lotOccupancyDB/getLotOccupantTypes.ts b/helpers/lotOccupancyDB/getLotOccupantTypes.ts index c649042d..49773229 100644 --- a/helpers/lotOccupancyDB/getLotOccupantTypes.ts +++ b/helpers/lotOccupancyDB/getLotOccupantTypes.ts @@ -4,15 +4,15 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const getLotOccupantTypes = (): recordTypes.LotOccupantType[] => { +export function getLotOccupantTypes(): recordTypes.LotOccupantType[] { const database = sqlite(databasePath); const lotOccupantTypes: recordTypes.LotOccupantType[] = database .prepare( - "select lotOccupantTypeId, lotOccupantType, fontAwesomeIconClass" + - " from LotOccupantTypes" + - " where recordDelete_timeMillis is null" + - " order by orderNumber, lotOccupantType" + `select lotOccupantTypeId, lotOccupantType, fontAwesomeIconClass + from LotOccupantTypes + where recordDelete_timeMillis is null + order by orderNumber, lotOccupantType` ) .all(); @@ -22,9 +22,9 @@ export const getLotOccupantTypes = (): recordTypes.LotOccupantType[] => { if (lotOccupantType.orderNumber !== expectedOrderNumber) { database .prepare( - "update LotOccupantTypes" + - " set orderNumber = ?" + - " where lotOccupantTypeId = ?" + `update LotOccupantTypes + set orderNumber = ? + where lotOccupantTypeId = ?` ) .run(expectedOrderNumber, lotOccupantType.lotOccupantTypeId); @@ -37,6 +37,6 @@ export const getLotOccupantTypes = (): recordTypes.LotOccupantType[] => { database.close(); return lotOccupantTypes; -}; +} export default getLotOccupantTypes; diff --git a/helpers/lotOccupancyDB/getLotStatusSummary.d.ts b/helpers/lotOccupancyDB/getLotStatusSummary.d.ts index fefefd1a..e5c1a797 100644 --- a/helpers/lotOccupancyDB/getLotStatusSummary.d.ts +++ b/helpers/lotOccupancyDB/getLotStatusSummary.d.ts @@ -5,5 +5,5 @@ interface GetFilters { interface LotStatusSummary extends recordTypes.LotStatus { lotCount: number; } -export declare const getLotStatusSummary: (filters?: GetFilters) => LotStatusSummary[]; +export declare function getLotStatusSummary(filters?: GetFilters): LotStatusSummary[]; export default getLotStatusSummary; diff --git a/helpers/lotOccupancyDB/getLotStatusSummary.js b/helpers/lotOccupancyDB/getLotStatusSummary.js index caba59b6..582ceff4 100644 --- a/helpers/lotOccupancyDB/getLotStatusSummary.js +++ b/helpers/lotOccupancyDB/getLotStatusSummary.js @@ -1,6 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const getLotStatusSummary = (filters) => { +export function getLotStatusSummary(filters) { const database = sqlite(databasePath, { readonly: true }); @@ -20,5 +20,5 @@ export const getLotStatusSummary = (filters) => { .all(sqlParameters); database.close(); return lotStatuses; -}; +} export default getLotStatusSummary; diff --git a/helpers/lotOccupancyDB/getLotStatusSummary.ts b/helpers/lotOccupancyDB/getLotStatusSummary.ts index 54574717..7f223e34 100644 --- a/helpers/lotOccupancyDB/getLotStatusSummary.ts +++ b/helpers/lotOccupancyDB/getLotStatusSummary.ts @@ -12,7 +12,7 @@ interface LotStatusSummary extends recordTypes.LotStatus { lotCount: number; } -export const getLotStatusSummary = (filters?: GetFilters): LotStatusSummary[] => { +export function getLotStatusSummary(filters?: GetFilters): LotStatusSummary[] { const database = sqlite(databasePath, { readonly: true }); @@ -39,6 +39,6 @@ export const getLotStatusSummary = (filters?: GetFilters): LotStatusSummary[] => database.close(); return lotStatuses; -}; +} export default getLotStatusSummary; diff --git a/helpers/lotOccupancyDB/getLotStatuses.d.ts b/helpers/lotOccupancyDB/getLotStatuses.d.ts index c90775b3..d756cbf9 100644 --- a/helpers/lotOccupancyDB/getLotStatuses.d.ts +++ b/helpers/lotOccupancyDB/getLotStatuses.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const getLotStatuses: () => recordTypes.LotStatus[]; +export declare function getLotStatuses(): recordTypes.LotStatus[]; export default getLotStatuses; diff --git a/helpers/lotOccupancyDB/getLotStatuses.js b/helpers/lotOccupancyDB/getLotStatuses.js index 0a754c9b..148cb72c 100644 --- a/helpers/lotOccupancyDB/getLotStatuses.js +++ b/helpers/lotOccupancyDB/getLotStatuses.js @@ -1,20 +1,20 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const getLotStatuses = () => { +export function getLotStatuses() { const database = sqlite(databasePath); const lotStatuses = database - .prepare("select lotStatusId, lotStatus" + - " from LotStatuses" + - " where recordDelete_timeMillis is null" + - " order by orderNumber, lotStatus") + .prepare(`select lotStatusId, lotStatus + from LotStatuses + where recordDelete_timeMillis is null + order by orderNumber, lotStatus`) .all(); let expectedOrderNumber = 0; for (const lotStatus of lotStatuses) { if (lotStatus.orderNumber !== expectedOrderNumber) { database - .prepare("update LotStatuses" + - " set orderNumber = ?" + - " where lotStatusId = ?") + .prepare(`update LotStatuses + set orderNumber = ? + where lotStatusId = ?`) .run(expectedOrderNumber, lotStatus.lotStatusId); lotStatus.orderNumber = expectedOrderNumber; } @@ -22,5 +22,5 @@ export const getLotStatuses = () => { } database.close(); return lotStatuses; -}; +} export default getLotStatuses; diff --git a/helpers/lotOccupancyDB/getLotStatuses.ts b/helpers/lotOccupancyDB/getLotStatuses.ts index 391a41e6..da4005b8 100644 --- a/helpers/lotOccupancyDB/getLotStatuses.ts +++ b/helpers/lotOccupancyDB/getLotStatuses.ts @@ -4,15 +4,15 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const getLotStatuses = (): recordTypes.LotStatus[] => { +export function getLotStatuses(): recordTypes.LotStatus[] { const database = sqlite(databasePath); const lotStatuses: recordTypes.LotStatus[] = database .prepare( - "select lotStatusId, lotStatus" + - " from LotStatuses" + - " where recordDelete_timeMillis is null" + - " order by orderNumber, lotStatus" + `select lotStatusId, lotStatus + from LotStatuses + where recordDelete_timeMillis is null + order by orderNumber, lotStatus` ) .all(); @@ -22,9 +22,9 @@ export const getLotStatuses = (): recordTypes.LotStatus[] => { if (lotStatus.orderNumber !== expectedOrderNumber) { database .prepare( - "update LotStatuses" + - " set orderNumber = ?" + - " where lotStatusId = ?" + `update LotStatuses + set orderNumber = ? + where lotStatusId = ?` ) .run(expectedOrderNumber, lotStatus.lotStatusId); @@ -37,6 +37,6 @@ export const getLotStatuses = (): recordTypes.LotStatus[] => { database.close(); return lotStatuses; -}; +} export default getLotStatuses; diff --git a/helpers/lotOccupancyDB/getLotTypeFields.d.ts b/helpers/lotOccupancyDB/getLotTypeFields.d.ts index 6947ca7f..7dfccac7 100644 --- a/helpers/lotOccupancyDB/getLotTypeFields.d.ts +++ b/helpers/lotOccupancyDB/getLotTypeFields.d.ts @@ -1,4 +1,4 @@ import sqlite from "better-sqlite3"; import type * as recordTypes from "../../types/recordTypes"; -export declare const getLotTypeFields: (lotTypeId: number, connectedDatabase?: sqlite.Database) => recordTypes.LotTypeField[]; +export declare function getLotTypeFields(lotTypeId: number, connectedDatabase?: sqlite.Database): recordTypes.LotTypeField[]; export default getLotTypeFields; diff --git a/helpers/lotOccupancyDB/getLotTypeFields.js b/helpers/lotOccupancyDB/getLotTypeFields.js index a3c4611e..fc458031 100644 --- a/helpers/lotOccupancyDB/getLotTypeFields.js +++ b/helpers/lotOccupancyDB/getLotTypeFields.js @@ -1,16 +1,15 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const getLotTypeFields = (lotTypeId, connectedDatabase) => { +export function getLotTypeFields(lotTypeId, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath); const lotTypeFields = database - .prepare("select lotTypeFieldId," + - " lotTypeField, lotTypeFieldValues, isRequired, pattern," + - " minimumLength, maximumLength," + - " orderNumber" + - " from LotTypeFields" + - " where recordDelete_timeMillis is null" + - " and lotTypeId = ?" + - " order by orderNumber, lotTypeField") + .prepare(`select lotTypeFieldId, + lotTypeField, lotTypeFieldValues, + isRequired, pattern, minimumLength, maximumLength, orderNumber + from LotTypeFields + where recordDelete_timeMillis is null + and lotTypeId = ? + order by orderNumber, lotTypeField`) .all(lotTypeId); let expectedFieldOrderNumber = -1; for (const lotTypeField of lotTypeFields) { @@ -26,5 +25,5 @@ export const getLotTypeFields = (lotTypeId, connectedDatabase) => { database.close(); } return lotTypeFields; -}; +} export default getLotTypeFields; diff --git a/helpers/lotOccupancyDB/getLotTypeFields.ts b/helpers/lotOccupancyDB/getLotTypeFields.ts index 75cbc08e..429657cb 100644 --- a/helpers/lotOccupancyDB/getLotTypeFields.ts +++ b/helpers/lotOccupancyDB/getLotTypeFields.ts @@ -4,22 +4,21 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const getLotTypeFields = ( +export function getLotTypeFields( lotTypeId: number, connectedDatabase?: sqlite.Database -): recordTypes.LotTypeField[] => { +): recordTypes.LotTypeField[] { const database = connectedDatabase || sqlite(databasePath); const lotTypeFields: recordTypes.LotTypeField[] = database .prepare( - "select lotTypeFieldId," + - " lotTypeField, lotTypeFieldValues, isRequired, pattern," + - " minimumLength, maximumLength," + - " orderNumber" + - " from LotTypeFields" + - " where recordDelete_timeMillis is null" + - " and lotTypeId = ?" + - " order by orderNumber, lotTypeField" + `select lotTypeFieldId, + lotTypeField, lotTypeFieldValues, + isRequired, pattern, minimumLength, maximumLength, orderNumber + from LotTypeFields + where recordDelete_timeMillis is null + and lotTypeId = ? + order by orderNumber, lotTypeField` ) .all(lotTypeId); @@ -30,9 +29,7 @@ export const getLotTypeFields = ( if (lotTypeField.orderNumber !== expectedFieldOrderNumber) { database - .prepare( - "update LotTypeFields set orderNumber = ? where lotTypeFieldId = ?" - ) + .prepare("update LotTypeFields set orderNumber = ? where lotTypeFieldId = ?") .run(expectedFieldOrderNumber, lotTypeField.lotTypeFieldId); lotTypeField.orderNumber = expectedFieldOrderNumber; @@ -44,6 +41,6 @@ export const getLotTypeFields = ( } return lotTypeFields; -}; +} export default getLotTypeFields; diff --git a/helpers/lotOccupancyDB/getLotTypeSummary.d.ts b/helpers/lotOccupancyDB/getLotTypeSummary.d.ts index 319b15f9..43e40ad7 100644 --- a/helpers/lotOccupancyDB/getLotTypeSummary.d.ts +++ b/helpers/lotOccupancyDB/getLotTypeSummary.d.ts @@ -5,5 +5,5 @@ interface GetFilters { interface LotTypeSummary extends recordTypes.LotType { lotCount: number; } -export declare const getLotTypeSummary: (filters?: GetFilters) => LotTypeSummary[]; +export declare function getLotTypeSummary(filters?: GetFilters): LotTypeSummary[]; export default getLotTypeSummary; diff --git a/helpers/lotOccupancyDB/getLotTypeSummary.js b/helpers/lotOccupancyDB/getLotTypeSummary.js index bf986c12..fbc4f17f 100644 --- a/helpers/lotOccupancyDB/getLotTypeSummary.js +++ b/helpers/lotOccupancyDB/getLotTypeSummary.js @@ -1,6 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const getLotTypeSummary = (filters) => { +export function getLotTypeSummary(filters) { const database = sqlite(databasePath, { readonly: true }); @@ -20,5 +20,5 @@ export const getLotTypeSummary = (filters) => { .all(sqlParameters); database.close(); return lotTypes; -}; +} export default getLotTypeSummary; diff --git a/helpers/lotOccupancyDB/getLotTypeSummary.ts b/helpers/lotOccupancyDB/getLotTypeSummary.ts index 73d3ddf9..36db91bf 100644 --- a/helpers/lotOccupancyDB/getLotTypeSummary.ts +++ b/helpers/lotOccupancyDB/getLotTypeSummary.ts @@ -12,7 +12,7 @@ interface LotTypeSummary extends recordTypes.LotType { lotCount: number; } -export const getLotTypeSummary = (filters?: GetFilters): LotTypeSummary[] => { +export function getLotTypeSummary(filters?: GetFilters): LotTypeSummary[] { const database = sqlite(databasePath, { readonly: true }); @@ -39,6 +39,6 @@ export const getLotTypeSummary = (filters?: GetFilters): LotTypeSummary[] => { database.close(); return lotTypes; -}; +} export default getLotTypeSummary; diff --git a/helpers/lotOccupancyDB/getLotTypes.d.ts b/helpers/lotOccupancyDB/getLotTypes.d.ts index e952d4d2..76b6dbee 100644 --- a/helpers/lotOccupancyDB/getLotTypes.d.ts +++ b/helpers/lotOccupancyDB/getLotTypes.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const getLotTypes: () => recordTypes.LotType[]; +export declare function getLotTypes(): recordTypes.LotType[]; export default getLotTypes; diff --git a/helpers/lotOccupancyDB/getLotTypes.js b/helpers/lotOccupancyDB/getLotTypes.js index 45c82ba8..569d61ab 100644 --- a/helpers/lotOccupancyDB/getLotTypes.js +++ b/helpers/lotOccupancyDB/getLotTypes.js @@ -1,13 +1,13 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { getLotTypeFields } from "./getLotTypeFields.js"; -export const getLotTypes = () => { +export function getLotTypes() { const database = sqlite(databasePath); const lotTypes = database - .prepare("select lotTypeId, lotType, orderNumber" + - " from LotTypes" + - " where recordDelete_timeMillis is null" + - " order by orderNumber, lotType") + .prepare(`select lotTypeId, lotType, orderNumber + from LotTypes + where recordDelete_timeMillis is null + order by orderNumber, lotType`) .all(); let expectedTypeOrderNumber = -1; for (const lotType of lotTypes) { @@ -24,9 +24,7 @@ export const getLotTypes = () => { expectedFieldOrderNumber += 1; if (lotTypeField.orderNumber !== expectedFieldOrderNumber) { database - .prepare("update LotTypeFields" + - " set orderNumber = ?" + - " where lotTypeFieldId = ?") + .prepare(`update LotTypeFields set orderNumber = ? where lotTypeFieldId = ?`) .run(expectedFieldOrderNumber, lotTypeField.lotTypeFieldId); lotTypeField.orderNumber = expectedFieldOrderNumber; } @@ -34,5 +32,5 @@ export const getLotTypes = () => { } database.close(); return lotTypes; -}; +} export default getLotTypes; diff --git a/helpers/lotOccupancyDB/getLotTypes.ts b/helpers/lotOccupancyDB/getLotTypes.ts index b0760d54..efeeacbd 100644 --- a/helpers/lotOccupancyDB/getLotTypes.ts +++ b/helpers/lotOccupancyDB/getLotTypes.ts @@ -6,60 +6,51 @@ import { getLotTypeFields } from "./getLotTypeFields.js"; import type * as recordTypes from "../../types/recordTypes"; -export const getLotTypes = (): recordTypes.LotType[] => { +export function getLotTypes(): recordTypes.LotType[] { const database = sqlite(databasePath); const lotTypes: recordTypes.LotType[] = database .prepare( - "select lotTypeId, lotType, orderNumber" + - " from LotTypes" + - " where recordDelete_timeMillis is null" + - " order by orderNumber, lotType" + `select lotTypeId, lotType, orderNumber + from LotTypes + where recordDelete_timeMillis is null + order by orderNumber, lotType` ) .all(); - let expectedTypeOrderNumber = -1; + let expectedTypeOrderNumber = -1; - for (const lotType of lotTypes) { - expectedTypeOrderNumber += 1; - - if (lotType.orderNumber !== expectedTypeOrderNumber) { + for (const lotType of lotTypes) { + expectedTypeOrderNumber += 1; + + if (lotType.orderNumber !== expectedTypeOrderNumber) { + database + .prepare("update LotTypes set orderNumber = ? where lotTypeId = ?") + .run(expectedTypeOrderNumber, lotType.lotTypeId); + + lotType.orderNumber = expectedTypeOrderNumber; + } + + lotType.lotTypeFields = getLotTypeFields(lotType.lotTypeId as number, database); + + let expectedFieldOrderNumber = -1; + + for (const lotTypeField of lotType.lotTypeFields) { + expectedFieldOrderNumber += 1; + + if (lotTypeField.orderNumber !== expectedFieldOrderNumber) { database - .prepare( - "update LotTypes set orderNumber = ? where lotTypeId = ?" - ) - .run(expectedTypeOrderNumber, lotType.lotTypeId); - - lotType.orderNumber = expectedTypeOrderNumber; - } - - lotType.lotTypeFields = getLotTypeFields( - lotType.lotTypeId as number, - database - ); - - let expectedFieldOrderNumber = -1; - - for (const lotTypeField of lotType.lotTypeFields) { - expectedFieldOrderNumber += 1; - - if (lotTypeField.orderNumber !== expectedFieldOrderNumber) { - database - .prepare( - "update LotTypeFields" + - " set orderNumber = ?" + - " where lotTypeFieldId = ?" - ) - .run(expectedFieldOrderNumber, lotTypeField.lotTypeFieldId); - - lotTypeField.orderNumber = expectedFieldOrderNumber; - } + .prepare(`update LotTypeFields set orderNumber = ? where lotTypeFieldId = ?`) + .run(expectedFieldOrderNumber, lotTypeField.lotTypeFieldId); + + lotTypeField.orderNumber = expectedFieldOrderNumber; } } + } database.close(); return lotTypes; -}; +} export default getLotTypes; diff --git a/helpers/lotOccupancyDB/getLots.d.ts b/helpers/lotOccupancyDB/getLots.d.ts index 2350fe9a..68ad1b51 100644 --- a/helpers/lotOccupancyDB/getLots.d.ts +++ b/helpers/lotOccupancyDB/getLots.d.ts @@ -13,7 +13,7 @@ interface GetLotsOptions { limit: -1 | number; offset: number; } -export declare const getLots: (filters: GetLotsFilters, options: GetLotsOptions, connectedDatabase?: sqlite.Database) => { +export declare function getLots(filters: GetLotsFilters, options: GetLotsOptions, connectedDatabase?: sqlite.Database): { count: number; lots: recordTypes.Lot[]; }; diff --git a/helpers/lotOccupancyDB/getLots.js b/helpers/lotOccupancyDB/getLots.js index d94229f3..6036b513 100644 --- a/helpers/lotOccupancyDB/getLots.js +++ b/helpers/lotOccupancyDB/getLots.js @@ -3,7 +3,7 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { dateToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js"; import * as configFunctions from "../functions.config.js"; import { getLotNameWhereClause } from "../functions.sqlFilters.js"; -const buildWhereClause = (filters) => { +function buildWhereClause(filters) { let sqlWhereClause = " where l.recordDelete_timeMillis is null"; const sqlParameters = []; const lotNameFilters = getLotNameWhereClause(filters.lotName, filters.lotNameSearchType, "l"); @@ -38,8 +38,8 @@ const buildWhereClause = (filters) => { sqlWhereClause, sqlParameters }; -}; -export const getLots = (filters, options, connectedDatabase) => { +} +export function getLots(filters, options, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath, { readonly: true @@ -104,5 +104,5 @@ export const getLots = (filters, options, connectedDatabase) => { count, lots }; -}; +} export default getLots; diff --git a/helpers/lotOccupancyDB/getLots.ts b/helpers/lotOccupancyDB/getLots.ts index 810d7a46..ccea050b 100644 --- a/helpers/lotOccupancyDB/getLots.ts +++ b/helpers/lotOccupancyDB/getLots.ts @@ -24,14 +24,17 @@ interface GetLotsOptions { offset: number; } -const buildWhereClause = (filters: GetLotsFilters): { sqlWhereClause: string; sqlParameters: unknown[];} => { +function buildWhereClause(filters: GetLotsFilters): { + sqlWhereClause: string; + sqlParameters: unknown[]; +} { let sqlWhereClause = " where l.recordDelete_timeMillis is null"; const sqlParameters: unknown[] = []; const lotNameFilters = getLotNameWhereClause(filters.lotName, filters.lotNameSearchType, "l"); sqlWhereClause += lotNameFilters.sqlWhereClause; sqlParameters.push(...lotNameFilters.sqlParameters); - + if (filters.mapId) { sqlWhereClause += " and l.mapId = ?"; sqlParameters.push(filters.mapId); @@ -65,16 +68,16 @@ const buildWhereClause = (filters: GetLotsFilters): { sqlWhereClause: string; sq sqlWhereClause, sqlParameters }; -}; +} -export const getLots = ( +export function getLots( filters: GetLotsFilters, options: GetLotsOptions, connectedDatabase?: sqlite.Database ): { count: number; lots: recordTypes.Lot[]; -} => { +} { const database = connectedDatabase || sqlite(databasePath, { @@ -157,6 +160,6 @@ export const getLots = ( count, lots }; -}; +} export default getLots; diff --git a/helpers/lotOccupancyDB/getMap.d.ts b/helpers/lotOccupancyDB/getMap.d.ts index 20e0b8cc..f05d64d8 100644 --- a/helpers/lotOccupancyDB/getMap.d.ts +++ b/helpers/lotOccupancyDB/getMap.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const getMap: (mapId: number | string) => recordTypes.Map; +export declare function getMap(mapId: number | string): recordTypes.Map; export default getMap; diff --git a/helpers/lotOccupancyDB/getMap.js b/helpers/lotOccupancyDB/getMap.js index af3ddff8..3725dade 100644 --- a/helpers/lotOccupancyDB/getMap.js +++ b/helpers/lotOccupancyDB/getMap.js @@ -1,28 +1,30 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const getMap = (mapId) => { +export function getMap(mapId) { const database = sqlite(databasePath, { readonly: true }); const map = database - .prepare("select m.mapId, m.mapName, m.mapDescription," + - " m.mapLatitude, m.mapLongitude, m.mapSVG," + - " m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode, m.mapPhoneNumber," + - " m.recordCreate_userName, m.recordCreate_timeMillis," + - " m.recordUpdate_userName, m.recordUpdate_timeMillis," + - " m.recordDelete_userName, m.recordDelete_timeMillis," + - " count(l.lotId) as lotCount" + - " from Maps m" + - " left join Lots l on m.mapId = l.mapId and l.recordDelete_timeMillis is null" + - " where m.mapId = ?" + - " group by m.mapId, m.mapName, m.mapDescription," + - " m.mapLatitude, m.mapLongitude, m.mapSVG," + - " m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode, m.mapPhoneNumber," + - " m.recordCreate_userName, m.recordCreate_timeMillis," + - " m.recordUpdate_userName, m.recordUpdate_timeMillis," + - " m.recordDelete_userName, m.recordDelete_timeMillis") + .prepare(`select m.mapId, m.mapName, m.mapDescription, + m.mapLatitude, m.mapLongitude, m.mapSVG, + m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode, + m.mapPhoneNumber, + m.recordCreate_userName, m.recordCreate_timeMillis, + m.recordUpdate_userName, m.recordUpdate_timeMillis, + m.recordDelete_userName, m.recordDelete_timeMillis, + count(l.lotId) as lotCount + from Maps m + left join Lots l on m.mapId = l.mapId and l.recordDelete_timeMillis is null + where m.mapId = ? + group by m.mapId, m.mapName, m.mapDescription, + m.mapLatitude, m.mapLongitude, m.mapSVG, + m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode, + m.mapPhoneNumber, + m.recordCreate_userName, m.recordCreate_timeMillis, + m.recordUpdate_userName, m.recordUpdate_timeMillis, + m.recordDelete_userName, m.recordDelete_timeMillis`) .get(mapId); database.close(); return map; -}; +} export default getMap; diff --git a/helpers/lotOccupancyDB/getMap.ts b/helpers/lotOccupancyDB/getMap.ts index 0c6408e9..4c4a7bba 100644 --- a/helpers/lotOccupancyDB/getMap.ts +++ b/helpers/lotOccupancyDB/getMap.ts @@ -4,35 +4,37 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const getMap = (mapId: number | string): recordTypes.Map => { +export function getMap(mapId: number | string): recordTypes.Map { const database = sqlite(databasePath, { readonly: true }); const map: recordTypes.Map = database .prepare( - "select m.mapId, m.mapName, m.mapDescription," + - " m.mapLatitude, m.mapLongitude, m.mapSVG," + - " m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode, m.mapPhoneNumber," + - " m.recordCreate_userName, m.recordCreate_timeMillis," + - " m.recordUpdate_userName, m.recordUpdate_timeMillis," + - " m.recordDelete_userName, m.recordDelete_timeMillis," + - " count(l.lotId) as lotCount" + - " from Maps m" + - " left join Lots l on m.mapId = l.mapId and l.recordDelete_timeMillis is null" + - " where m.mapId = ?" + - " group by m.mapId, m.mapName, m.mapDescription," + - " m.mapLatitude, m.mapLongitude, m.mapSVG," + - " m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode, m.mapPhoneNumber," + - " m.recordCreate_userName, m.recordCreate_timeMillis," + - " m.recordUpdate_userName, m.recordUpdate_timeMillis," + - " m.recordDelete_userName, m.recordDelete_timeMillis" + `select m.mapId, m.mapName, m.mapDescription, + m.mapLatitude, m.mapLongitude, m.mapSVG, + m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode, + m.mapPhoneNumber, + m.recordCreate_userName, m.recordCreate_timeMillis, + m.recordUpdate_userName, m.recordUpdate_timeMillis, + m.recordDelete_userName, m.recordDelete_timeMillis, + count(l.lotId) as lotCount + from Maps m + left join Lots l on m.mapId = l.mapId and l.recordDelete_timeMillis is null + where m.mapId = ? + group by m.mapId, m.mapName, m.mapDescription, + m.mapLatitude, m.mapLongitude, m.mapSVG, + m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode, + m.mapPhoneNumber, + m.recordCreate_userName, m.recordCreate_timeMillis, + m.recordUpdate_userName, m.recordUpdate_timeMillis, + m.recordDelete_userName, m.recordDelete_timeMillis` ) .get(mapId); database.close(); return map; -}; +} export default getMap; diff --git a/helpers/lotOccupancyDB/getMaps.d.ts b/helpers/lotOccupancyDB/getMaps.d.ts index bbc454fa..b5381f8e 100644 --- a/helpers/lotOccupancyDB/getMaps.d.ts +++ b/helpers/lotOccupancyDB/getMaps.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const getMaps: () => recordTypes.Map[]; +export declare function getMaps(): recordTypes.Map[]; export default getMaps; diff --git a/helpers/lotOccupancyDB/getMaps.js b/helpers/lotOccupancyDB/getMaps.js index 32578e61..b9cf1c24 100644 --- a/helpers/lotOccupancyDB/getMaps.js +++ b/helpers/lotOccupancyDB/getMaps.js @@ -1,24 +1,24 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const getMaps = () => { +export function getMaps() { const database = sqlite(databasePath, { readonly: true }); const maps = database - .prepare("select m.mapId, m.mapName, m.mapDescription," + - " m.mapLatitude, m.mapLongitude, m.mapSVG," + - " m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode, m.mapPhoneNumber," + - " ifnull(l.lotCount,0) as lotCount" + - " from Maps m" + - (" left join (" + - "select mapId, count(lotId) as lotCount" + - " from Lots" + - " where recordDelete_timeMillis is null" + - " group by mapId) l on m.mapId = l.mapId") + - " where m.recordDelete_timeMillis is null" + - " order by m.mapName, m.mapId") + .prepare(`select m.mapId, m.mapName, m.mapDescription, + m.mapLatitude, m.mapLongitude, m.mapSVG, + m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode, + m.mapPhoneNumber, + ifnull(l.lotCount,0) as lotCount + from Maps m + left join ( + select mapId, count(lotId) as lotCount + from Lots + where recordDelete_timeMillis is null group by mapId + ) l on m.mapId = l.mapId + where m.recordDelete_timeMillis is null order by m.mapName, m.mapId`) .all(); database.close(); return maps; -}; +} export default getMaps; diff --git a/helpers/lotOccupancyDB/getMaps.ts b/helpers/lotOccupancyDB/getMaps.ts index a35f6208..249052b4 100644 --- a/helpers/lotOccupancyDB/getMaps.ts +++ b/helpers/lotOccupancyDB/getMaps.ts @@ -4,31 +4,31 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const getMaps = (): recordTypes.Map[] => { +export function getMaps(): recordTypes.Map[] { const database = sqlite(databasePath, { readonly: true }); const maps: recordTypes.Map[] = database .prepare( - "select m.mapId, m.mapName, m.mapDescription," + - " m.mapLatitude, m.mapLongitude, m.mapSVG," + - " m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode, m.mapPhoneNumber," + - " ifnull(l.lotCount,0) as lotCount" + - " from Maps m" + - (" left join (" + - "select mapId, count(lotId) as lotCount" + - " from Lots" + - " where recordDelete_timeMillis is null" + - " group by mapId) l on m.mapId = l.mapId") + - " where m.recordDelete_timeMillis is null" + - " order by m.mapName, m.mapId" + `select m.mapId, m.mapName, m.mapDescription, + m.mapLatitude, m.mapLongitude, m.mapSVG, + m.mapAddress1, m.mapAddress2, m.mapCity, m.mapProvince, m.mapPostalCode, + m.mapPhoneNumber, + ifnull(l.lotCount,0) as lotCount + from Maps m + left join ( + select mapId, count(lotId) as lotCount + from Lots + where recordDelete_timeMillis is null group by mapId + ) l on m.mapId = l.mapId + where m.recordDelete_timeMillis is null order by m.mapName, m.mapId` ) .all(); database.close(); return maps; -}; +} export default getMaps; diff --git a/helpers/lotOccupancyDB/getNextLotId.d.ts b/helpers/lotOccupancyDB/getNextLotId.d.ts index 21c38756..6e4bb3ac 100644 --- a/helpers/lotOccupancyDB/getNextLotId.d.ts +++ b/helpers/lotOccupancyDB/getNextLotId.d.ts @@ -1,2 +1,2 @@ -export declare const getNextLotId: (lotId: number | string) => number | undefined; +export declare function getNextLotId(lotId: number | string): number | undefined; export default getNextLotId; diff --git a/helpers/lotOccupancyDB/getNextLotId.js b/helpers/lotOccupancyDB/getNextLotId.js index 5f7b79dd..74d7ca13 100644 --- a/helpers/lotOccupancyDB/getNextLotId.js +++ b/helpers/lotOccupancyDB/getNextLotId.js @@ -1,22 +1,23 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import * as configFunctions from "../functions.config.js"; -export const getNextLotId = (lotId) => { +export function getNextLotId(lotId) { const database = sqlite(databasePath, { readonly: true }); database.function("userFn_lotNameSortName", configFunctions.getProperty("settings.lot.lotNameSortNameFunction")); const result = database - .prepare("select lotId from Lots" + - " where recordDelete_timeMillis is null" + - " and userFn_lotNameSortName(lotName) > (select userFn_lotNameSortName(lotName) from Lots where lotId = ?)" + - " order by userFn_lotNameSortName(lotName)" + - " limit 1") + .prepare(`select lotId + from Lots + where recordDelete_timeMillis is null + and userFn_lotNameSortName(lotName) > (select userFn_lotNameSortName(lotName) from Lots where lotId = ?) + order by userFn_lotNameSortName(lotName) + limit 1`) .get(lotId); database.close(); if (result) { return result.lotId; } return undefined; -}; +} export default getNextLotId; diff --git a/helpers/lotOccupancyDB/getNextLotId.ts b/helpers/lotOccupancyDB/getNextLotId.ts index aec0ae98..01ed8ce3 100644 --- a/helpers/lotOccupancyDB/getNextLotId.ts +++ b/helpers/lotOccupancyDB/getNextLotId.ts @@ -4,7 +4,7 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import * as configFunctions from "../functions.config.js"; -export const getNextLotId = (lotId: number | string): number | undefined => { +export function getNextLotId(lotId: number | string): number | undefined { const database = sqlite(databasePath, { readonly: true }); @@ -18,11 +18,12 @@ export const getNextLotId = (lotId: number | string): number | undefined => { lotId: number; } = database .prepare( - "select lotId from Lots" + - " where recordDelete_timeMillis is null" + - " and userFn_lotNameSortName(lotName) > (select userFn_lotNameSortName(lotName) from Lots where lotId = ?)" + - " order by userFn_lotNameSortName(lotName)" + - " limit 1" + `select lotId + from Lots + where recordDelete_timeMillis is null + and userFn_lotNameSortName(lotName) > (select userFn_lotNameSortName(lotName) from Lots where lotId = ?) + order by userFn_lotNameSortName(lotName) + limit 1` ) .get(lotId); @@ -33,6 +34,6 @@ export const getNextLotId = (lotId: number | string): number | undefined => { } return undefined; -}; +} export default getNextLotId; diff --git a/helpers/lotOccupancyDB/getNextWorkOrderNumber.d.ts b/helpers/lotOccupancyDB/getNextWorkOrderNumber.d.ts index c91ef8ef..6934f4c5 100644 --- a/helpers/lotOccupancyDB/getNextWorkOrderNumber.d.ts +++ b/helpers/lotOccupancyDB/getNextWorkOrderNumber.d.ts @@ -1,3 +1,3 @@ import sqlite from "better-sqlite3"; -export declare const getNextWorkOrderNumber: (connectedDatabase?: sqlite.Database) => string; +export declare function getNextWorkOrderNumber(connectedDatabase?: sqlite.Database): string; export default getNextWorkOrderNumber; diff --git a/helpers/lotOccupancyDB/getNextWorkOrderNumber.js b/helpers/lotOccupancyDB/getNextWorkOrderNumber.js index 2179c3ff..a2eb38de 100644 --- a/helpers/lotOccupancyDB/getNextWorkOrderNumber.js +++ b/helpers/lotOccupancyDB/getNextWorkOrderNumber.js @@ -1,7 +1,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import * as configFunctions from "../functions.config.js"; -export const getNextWorkOrderNumber = (connectedDatabase) => { +export function getNextWorkOrderNumber(connectedDatabase) { const database = connectedDatabase || sqlite(databasePath, { readonly: true @@ -26,5 +26,5 @@ export const getNextWorkOrderNumber = (connectedDatabase) => { } workOrderNumberIndex += 1; return currentYearString + "-" + workOrderNumberIndex.toString().padStart(paddingLength, "0"); -}; +} export default getNextWorkOrderNumber; diff --git a/helpers/lotOccupancyDB/getNextWorkOrderNumber.ts b/helpers/lotOccupancyDB/getNextWorkOrderNumber.ts index 62a36fb8..7d36f52f 100644 --- a/helpers/lotOccupancyDB/getNextWorkOrderNumber.ts +++ b/helpers/lotOccupancyDB/getNextWorkOrderNumber.ts @@ -4,28 +4,21 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import * as configFunctions from "../functions.config.js"; -export const getNextWorkOrderNumber = ( - connectedDatabase?: sqlite.Database -): string => { +export function getNextWorkOrderNumber(connectedDatabase?: sqlite.Database): string { const database = connectedDatabase || sqlite(databasePath, { readonly: true }); - const paddingLength = configFunctions.getProperty( - "settings.workOrders.workOrderNumberLength" - ); + const paddingLength = configFunctions.getProperty("settings.workOrders.workOrderNumberLength"); const currentYearString = new Date().getFullYear().toString(); const regex = new RegExp("^" + currentYearString + "-\\d+$"); - database.function( - "userFn_matchesWorkOrderNumberSyntax", - (workOrderNumber: string) => { - return regex.test(workOrderNumber) ? 1 : 0; - } - ); + database.function("userFn_matchesWorkOrderNumberSyntax", (workOrderNumber: string) => { + return regex.test(workOrderNumber) ? 1 : 0; + }); const workOrderNumberRecord = database .prepare( @@ -51,6 +44,6 @@ export const getNextWorkOrderNumber = ( workOrderNumberIndex += 1; return currentYearString + "-" + workOrderNumberIndex.toString().padStart(paddingLength, "0"); -}; +} export default getNextWorkOrderNumber; diff --git a/helpers/lotOccupancyDB/getOccupancyTypeFields.d.ts b/helpers/lotOccupancyDB/getOccupancyTypeFields.d.ts index 1a709597..d66df4fe 100644 --- a/helpers/lotOccupancyDB/getOccupancyTypeFields.d.ts +++ b/helpers/lotOccupancyDB/getOccupancyTypeFields.d.ts @@ -1,4 +1,4 @@ import sqlite from "better-sqlite3"; import type * as recordTypes from "../../types/recordTypes"; -export declare const getOccupancyTypeFields: (occupancyTypeId?: number, connectedDatabase?: sqlite.Database) => recordTypes.OccupancyTypeField[]; +export declare function getOccupancyTypeFields(occupancyTypeId?: number, connectedDatabase?: sqlite.Database): recordTypes.OccupancyTypeField[]; export default getOccupancyTypeFields; diff --git a/helpers/lotOccupancyDB/getOccupancyTypeFields.js b/helpers/lotOccupancyDB/getOccupancyTypeFields.js index d5c20434..81061c4c 100644 --- a/helpers/lotOccupancyDB/getOccupancyTypeFields.js +++ b/helpers/lotOccupancyDB/getOccupancyTypeFields.js @@ -1,6 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const getOccupancyTypeFields = (occupancyTypeId, connectedDatabase) => { +export function getOccupancyTypeFields(occupancyTypeId, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath); const sqlParameters = []; if (occupancyTypeId) { @@ -21,9 +21,7 @@ export const getOccupancyTypeFields = (occupancyTypeId, connectedDatabase) => { expectedFieldOrderNumber += 1; if (occupancyTypeField.orderNumber !== expectedFieldOrderNumber) { database - .prepare("update OccupancyTypeFields" + - " set orderNumber = ?" + - " where occupancyTypeFieldId = ?") + .prepare(`update OccupancyTypeFields set orderNumber = ? where occupancyTypeFieldId = ?`) .run(expectedFieldOrderNumber, occupancyTypeField.occupancyTypeFieldId); occupancyTypeField.orderNumber = expectedFieldOrderNumber; } @@ -32,5 +30,5 @@ export const getOccupancyTypeFields = (occupancyTypeId, connectedDatabase) => { database.close(); } return occupancyTypeFields; -}; +} export default getOccupancyTypeFields; diff --git a/helpers/lotOccupancyDB/getOccupancyTypeFields.ts b/helpers/lotOccupancyDB/getOccupancyTypeFields.ts index 22bd9bb5..a4248701 100644 --- a/helpers/lotOccupancyDB/getOccupancyTypeFields.ts +++ b/helpers/lotOccupancyDB/getOccupancyTypeFields.ts @@ -4,10 +4,10 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const getOccupancyTypeFields = ( +export function getOccupancyTypeFields( occupancyTypeId?: number, connectedDatabase?: sqlite.Database -): recordTypes.OccupancyTypeField[] => { +): recordTypes.OccupancyTypeField[] { const database = connectedDatabase || sqlite(databasePath); const sqlParameters: unknown[] = []; @@ -37,9 +37,7 @@ export const getOccupancyTypeFields = ( if (occupancyTypeField.orderNumber !== expectedFieldOrderNumber) { database .prepare( - "update OccupancyTypeFields" + - " set orderNumber = ?" + - " where occupancyTypeFieldId = ?" + `update OccupancyTypeFields set orderNumber = ? where occupancyTypeFieldId = ?` ) .run(expectedFieldOrderNumber, occupancyTypeField.occupancyTypeFieldId); @@ -52,6 +50,6 @@ export const getOccupancyTypeFields = ( } return occupancyTypeFields; -}; +} export default getOccupancyTypeFields; diff --git a/public-typescript/adminFees.js b/public-typescript/adminFees.js index 70fbc6ba..8dc520fa 100644 --- a/public-typescript/adminFees.js +++ b/public-typescript/adminFees.js @@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const feeCategoriesContainerElement = document.querySelector("#container--feeCategories"); let feeCategories = exports.feeCategories; delete exports.feeCategories; - const renderFeeCategories = () => { + function renderFeeCategories() { if (feeCategories.length === 0) { feeCategoriesContainerElement.innerHTML = '
' + @@ -172,7 +172,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); feeCategoryContainerElement.querySelector(".button--moveFeeCategoryDown").addEventListener("click", moveFeeCategoryDown); feeCategoriesContainerElement.append(feeCategoryContainerElement); } - }; + } /* * Fee Categories */ @@ -209,7 +209,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); } }); }); - const openEditFeeCategory = (clickEvent) => { + function openEditFeeCategory(clickEvent) { const feeCategoryId = Number.parseInt(clickEvent.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId, 10); const feeCategory = feeCategories.find((currentFeeCategory) => { return currentFeeCategory.feeCategoryId === feeCategoryId; @@ -247,8 +247,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); bulmaJS.toggleHtmlClipped(); } }); - }; - const confirmDeleteFeeCategory = (clickEvent) => { + } + function confirmDeleteFeeCategory(clickEvent) { const feeCategoryId = Number.parseInt(clickEvent.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId, 10); const doDelete = () => { cityssm.postJSON(los.urlPrefix + "/admin/doDeleteFeeCategory", { @@ -276,8 +276,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); callbackFunction: doDelete } }); - }; - const moveFeeCategoryUp = (clickEvent) => { + } + function moveFeeCategoryUp(clickEvent) { const feeCategoryId = Number.parseInt(clickEvent.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId, 10); cityssm.postJSON(los.urlPrefix + "/admin/doMoveFeeCategoryUp", { feeCategoryId, @@ -295,8 +295,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); }); } }); - }; - const moveFeeCategoryDown = (clickEvent) => { + } + function moveFeeCategoryDown(clickEvent) { const feeCategoryId = Number.parseInt(clickEvent.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId, 10); cityssm.postJSON(los.urlPrefix + "/admin/doMoveFeeCategoryDown", { feeCategoryId, @@ -314,11 +314,11 @@ Object.defineProperty(exports, "__esModule", { value: true }); }); } }); - }; + } /* * Fees */ - const openAddFee = (clickEvent) => { + function openAddFee(clickEvent) { const feeCategoryId = Number.parseInt(clickEvent.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId, 10); let addCloseModalFunction; const doAddFee = (submitEvent) => { @@ -409,8 +409,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); bulmaJS.toggleHtmlClipped(); } }); - }; - const openEditFee = (clickEvent) => { + } + function openEditFee(clickEvent) { clickEvent.preventDefault(); const feeContainerElement = clickEvent.currentTarget.closest(".container--fee"); const feeId = Number.parseInt(feeContainerElement.dataset.feeId, 10); @@ -576,8 +576,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); bulmaJS.toggleHtmlClipped(); } }); - }; - const moveFeeUp = (clickEvent) => { + } + function moveFeeUp(clickEvent) { const feeContainerElement = clickEvent.currentTarget.closest(".container--fee"); const feeId = Number.parseInt(feeContainerElement.dataset.feeId, 10); cityssm.postJSON(los.urlPrefix + "/admin/doMoveFeeUp", { @@ -596,8 +596,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); }); } }); - }; - const moveFeeDown = (clickEvent) => { + } + function moveFeeDown(clickEvent) { const feeContainerElement = clickEvent.currentTarget.closest(".container--fee"); const feeId = Number.parseInt(feeContainerElement.dataset.feeId, 10); cityssm.postJSON(los.urlPrefix + "/admin/doMoveFeeDown", { @@ -616,7 +616,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); }); } }); - }; + } /* * Initialize */ diff --git a/public-typescript/adminFees.ts b/public-typescript/adminFees.ts index 5ad76e68..8598a6ce 100644 --- a/public-typescript/adminFees.ts +++ b/public-typescript/adminFees.ts @@ -20,7 +20,7 @@ declare const bulmaJS: BulmaJS; let feeCategories: recordTypes.FeeCategory[] = exports.feeCategories; delete exports.feeCategories; - const renderFeeCategories = () => { + function renderFeeCategories(): void { if (feeCategories.length === 0) { feeCategoriesContainerElement.innerHTML = '
' + @@ -52,11 +52,11 @@ declare const bulmaJS: BulmaJS; '
' + (feeCategory.fees!.length === 0 ? '
' + - '" + - "
" + '" + + "
" : "") + ('
' + '
" ); } else { for (const fee of feeCategory.fees) { @@ -121,24 +121,24 @@ declare const bulmaJS: BulmaJS; "

" + (hasTagsBlock ? '

' + - (fee.isRequired - ? 'Required' - : "") + - (fee.occupancyTypeId - ? ' ' + - cityssm.escapeHTML(fee.occupancyType || "") + - "" - : "") + - (fee.lotTypeId - ? ' ' + - cityssm.escapeHTML(fee.lotType || "") + - "" - : "") + - "

" + (fee.isRequired + ? 'Required' + : "") + + (fee.occupancyTypeId + ? ' ' + + cityssm.escapeHTML(fee.occupancyType || "") + + "" + : "") + + (fee.lotTypeId + ? ' ' + + cityssm.escapeHTML(fee.lotType || "") + + "" + : "") + + "

" : "") + "
") + ('
' + @@ -146,12 +146,12 @@ declare const bulmaJS: BulmaJS; ('
' + (fee.feeFunction ? cityssm.escapeHTML(fee.feeFunction) + - "
" + - "Fee Function" + "
" + + "Fee Function" : "$" + - fee.feeAmount!.toFixed(2) + - "
" + - "Fee") + + fee.feeAmount!.toFixed(2) + + "
" + + "Fee") + "
") + ('
' + (fee.taxPercentage @@ -162,8 +162,8 @@ declare const bulmaJS: BulmaJS; ('
' + (fee.includeQuantity ? cityssm.escapeHTML(fee.quantityUnit || "") + - "
" + - "Quantity" + "
" + + "Quantity" : "") + "
") + "
" + @@ -230,7 +230,7 @@ declare const bulmaJS: BulmaJS; feeCategoriesContainerElement.append(feeCategoryContainerElement); } - }; + } /* * Fee Categories @@ -288,7 +288,7 @@ declare const bulmaJS: BulmaJS; } ); - const openEditFeeCategory = (clickEvent: Event) => { + function openEditFeeCategory(clickEvent: Event): void { const feeCategoryId = Number.parseInt( ( (clickEvent.currentTarget as HTMLElement).closest( @@ -356,9 +356,9 @@ declare const bulmaJS: BulmaJS; bulmaJS.toggleHtmlClipped(); } }); - }; + } - const confirmDeleteFeeCategory = (clickEvent: Event) => { + function confirmDeleteFeeCategory(clickEvent: Event): void { const feeCategoryId = Number.parseInt( ( (clickEvent.currentTarget as HTMLElement).closest( @@ -402,9 +402,9 @@ declare const bulmaJS: BulmaJS; callbackFunction: doDelete } }); - }; + } - const moveFeeCategoryUp = (clickEvent: MouseEvent) => { + function moveFeeCategoryUp(clickEvent: MouseEvent): void { const feeCategoryId = Number.parseInt( ( (clickEvent.currentTarget as HTMLElement).closest( @@ -437,9 +437,9 @@ declare const bulmaJS: BulmaJS; } } ); - }; + } - const moveFeeCategoryDown = (clickEvent: MouseEvent) => { + function moveFeeCategoryDown(clickEvent: MouseEvent): void { const feeCategoryId = Number.parseInt( ( (clickEvent.currentTarget as HTMLElement).closest( @@ -472,13 +472,13 @@ declare const bulmaJS: BulmaJS; } } ); - }; + } /* * Fees */ - const openAddFee = (clickEvent: Event) => { + function openAddFee(clickEvent: Event): void { const feeCategoryId = Number.parseInt( ( (clickEvent.currentTarget as HTMLElement).closest( @@ -634,9 +634,9 @@ declare const bulmaJS: BulmaJS; bulmaJS.toggleHtmlClipped(); } }); - }; + } - const openEditFee = (clickEvent: Event) => { + function openEditFee(clickEvent: Event): void { clickEvent.preventDefault(); const feeContainerElement = (clickEvent.currentTarget as HTMLElement).closest( @@ -896,9 +896,9 @@ declare const bulmaJS: BulmaJS; bulmaJS.toggleHtmlClipped(); } }); - }; + } - const moveFeeUp = (clickEvent: MouseEvent) => { + function moveFeeUp(clickEvent: MouseEvent): void { const feeContainerElement = (clickEvent.currentTarget as HTMLElement).closest( ".container--fee" ) as HTMLElement; @@ -928,9 +928,9 @@ declare const bulmaJS: BulmaJS; } } ); - }; + } - const moveFeeDown = (clickEvent: MouseEvent) => { + function moveFeeDown(clickEvent: MouseEvent): void { const feeContainerElement = (clickEvent.currentTarget as HTMLElement).closest( ".container--fee" ) as HTMLElement; @@ -960,7 +960,7 @@ declare const bulmaJS: BulmaJS; } } ); - }; + } /* * Initialize diff --git a/public/javascripts/adminFees.min.js b/public/javascripts/adminFees.min.js index a9539f96..6cfe249f 100644 --- a/public/javascripts/adminFees.min.js +++ b/public/javascripts/adminFees.min.js @@ -1 +1 @@ -"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{const e=exports.los,t=document.querySelector("#container--feeCategories");let s=exports.feeCategories;delete exports.feeCategories;const o=()=>{if(0!==s.length){t.innerHTML="";for(const e of s){const s=document.createElement("section");if(s.className="panel container--feeCategory",s.dataset.feeCategoryId=e.feeCategoryId.toString(),s.innerHTML='

'+cityssm.escapeHTML(e.feeCategory||"")+'

'+(0===e.fees.length?'
':"")+'
',0===e.fees.length)s.insertAdjacentHTML("beforeend",'

There are no fees in the "'+cityssm.escapeHTML(e.feeCategory||"")+'" category.

');else for(const t of e.fees){const e=document.createElement("div");e.className="panel-block is-block container--fee",e.dataset.feeId=t.feeId.toString();const o=t.isRequired||t.occupancyTypeId||t.lotTypeId;e.innerHTML='

'+cityssm.escapeHTML(t.feeName||"")+"
"+cityssm.escapeHTML(t.feeDescription||"").replace(/\n/g,"
")+"

"+(o?'

'+(t.isRequired?'Required':"")+(t.occupancyTypeId?' '+cityssm.escapeHTML(t.occupancyType||"")+"":"")+(t.lotTypeId?' '+cityssm.escapeHTML(t.lotType||"")+"":"")+"

":"")+'
'+(t.feeFunction?cityssm.escapeHTML(t.feeFunction)+"
Fee Function":"$"+t.feeAmount.toFixed(2)+"
Fee")+'
'+(t.taxPercentage?t.taxPercentage+"%":"$"+t.taxAmount.toFixed(2))+'
Tax
'+(t.includeQuantity?cityssm.escapeHTML(t.quantityUnit||"")+"
Quantity":"")+'
',e.querySelector("a").addEventListener("click",i),e.querySelector(".button--moveFeeUp").addEventListener("click",d),e.querySelector(".button--moveFeeDown").addEventListener("click",u),s.append(e)}0===e.fees.length&&s.querySelector(".button--deleteFeeCategory").addEventListener("click",r),s.querySelector(".button--editFeeCategory").addEventListener("click",a),s.querySelector(".button--addFee").addEventListener("click",l),s.querySelector(".button--moveFeeCategoryUp").addEventListener("click",n),s.querySelector(".button--moveFeeCategoryDown").addEventListener("click",c),t.append(s)}}else t.innerHTML='

There are no available fees.

'};document.querySelector("#button--addFeeCategory").addEventListener("click",()=>{let t;const a=a=>{a.preventDefault(),cityssm.postJSON(e.urlPrefix+"/admin/doAddFeeCategory",a.currentTarget,e=>{e.success?(s=e.feeCategories,t(),o()):bulmaJS.alert({title:"Error Creating Fee Category",message:e.errorMessage||"",contextualColorName:"danger"})})};cityssm.openHtmlModal("adminFees-addFeeCategory",{onshown:(e,s)=>{bulmaJS.toggleHtmlClipped(),e.querySelector("#feeCategoryAdd--feeCategory").focus(),t=s,e.querySelector("form").addEventListener("submit",a)},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})});const a=t=>{const a=Number.parseInt(t.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId,10),r=s.find(e=>e.feeCategoryId===a);let n;const c=t=>{t.preventDefault(),cityssm.postJSON(e.urlPrefix+"/admin/doUpdateFeeCategory",t.currentTarget,e=>{e.success?(s=e.feeCategories,n(),o()):bulmaJS.alert({title:"Error Updating Fee Category",message:e.errorMessage||"",contextualColorName:"danger"})})};cityssm.openHtmlModal("adminFees-editFeeCategory",{onshow:e=>{e.querySelector("#feeCategoryEdit--feeCategoryId").value=r.feeCategoryId.toString(),e.querySelector("#feeCategoryEdit--feeCategory").value=r.feeCategory},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),n=t,e.querySelector("form").addEventListener("submit",c),e.querySelector("#feeCategoryEdit--feeCategory").focus()},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})},r=t=>{const a=Number.parseInt(t.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId,10);bulmaJS.confirm({title:"Delete Fee Category?",message:"Are you sure you want to delete this fee category?",contextualColorName:"warning",okButton:{text:"Yes, Delete the Fee Category",callbackFunction:()=>{cityssm.postJSON(e.urlPrefix+"/admin/doDeleteFeeCategory",{feeCategoryId:a},e=>{e.success?(s=e.feeCategories,o()):bulmaJS.alert({title:"Error Updating Fee Category",message:e.errorMessage||"",contextualColorName:"danger"})})}}})},n=t=>{const a=Number.parseInt(t.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId,10);cityssm.postJSON(e.urlPrefix+"/admin/doMoveFeeCategoryUp",{feeCategoryId:a,moveToTop:t.shiftKey?"1":"0"},e=>{e.success?(s=e.feeCategories,o()):bulmaJS.alert({title:"Error Moving Fee Category",message:e.errorMessage||"",contextualColorName:"danger"})})},c=t=>{const a=Number.parseInt(t.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId,10);cityssm.postJSON(e.urlPrefix+"/admin/doMoveFeeCategoryDown",{feeCategoryId:a,moveToBottom:t.shiftKey?"1":"0"},e=>{e.success?(s=e.feeCategories,o()):bulmaJS.alert({title:"Error Moving Fee Category",message:e.errorMessage||"",contextualColorName:"danger"})})},l=t=>{const a=Number.parseInt(t.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId,10);let r;const n=t=>{t.preventDefault(),cityssm.postJSON(e.urlPrefix+"/admin/doAddFee",t.currentTarget,e=>{e.success?(s=e.feeCategories,r(),o()):bulmaJS.alert({title:"Error Adding Fee",message:e.errorMessage||"",contextualColorName:"danger"})})};cityssm.openHtmlModal("adminFees-addFee",{onshow:t=>{const o=t.querySelector("#feeAdd--feeCategoryId");for(const e of s){const t=document.createElement("option");t.value=e.feeCategoryId.toString(),t.textContent=e.feeCategory,e.feeCategoryId===a&&(t.selected=!0),o.append(t)}const r=t.querySelector("#feeAdd--occupancyTypeId");for(const e of exports.occupancyTypes){const t=document.createElement("option");t.value=e.occupancyTypeId.toString(),t.textContent=e.occupancyType,r.append(t)}const n=t.querySelector("#feeAdd--lotTypeId");for(const e of exports.lotTypes){const t=document.createElement("option");t.value=e.lotTypeId.toString(),t.textContent=e.lotType,n.append(t)}t.querySelector("#feeAdd--taxPercentage").value=exports.taxPercentageDefault.toString(),e.populateAliases(t)},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),r=t,e.querySelector("form").addEventListener("submit",n),e.querySelector("#feeAdd--feeName").focus(),e.querySelector("#feeAdd--feeFunction").addEventListener("change",()=>{const t=e.querySelector("#feeAdd--feeAmount"),s=e.querySelector("#feeAdd--feeFunction");""===s.value?(s.closest(".select").classList.remove("is-success"),t.classList.add("is-success"),t.disabled=!1):(s.closest(".select").classList.add("is-success"),t.classList.remove("is-success"),t.disabled=!0)}),e.querySelector("#feeAdd--taxPercentage").addEventListener("keyup",()=>{const t=e.querySelector("#feeAdd--taxAmount"),s=e.querySelector("#feeAdd--taxPercentage");""===s.value?(s.classList.remove("is-success"),t.classList.add("is-success"),t.disabled=!1):(s.classList.add("is-success"),t.classList.remove("is-success"),t.disabled=!0)}),e.querySelector("#feeAdd--includeQuantity").addEventListener("change",()=>{e.querySelector("#feeAdd--quantityUnit").disabled=""===e.querySelector("#feeAdd--includeQuantity").value})},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})},i=t=>{t.preventDefault();const a=t.currentTarget.closest(".container--fee"),r=Number.parseInt(a.dataset.feeId,10),n=Number.parseInt(a.closest(".container--feeCategory").dataset.feeCategoryId),c=s.find(e=>e.feeCategoryId===n).fees.find(e=>e.feeId===r);let l,i;const d=t=>{t.preventDefault(),cityssm.postJSON(e.urlPrefix+"/admin/doUpdateFee",t.currentTarget,e=>{e.success?(s=e.feeCategories,l(),o()):bulmaJS.alert({title:"Error Updating Fee",message:e.errorMessage||"",contextualColorName:"danger"})})},u=t=>{t.preventDefault();bulmaJS.confirm({title:"Delete Fee?",message:"Are you sure you want to delete this fee?",contextualColorName:"warning",okButton:{text:"Yes, Delete the Fee",callbackFunction:()=>{cityssm.postJSON(e.urlPrefix+"/admin/doDeleteFee",{feeId:r},e=>{e.success?(s=e.feeCategories,l(),o()):bulmaJS.alert({title:"Error Deleting Fee",message:e.errorMessage||"",contextualColorName:"danger"})})}}})},y=()=>{const e=i.querySelector("#feeEdit--feeAmount"),t=i.querySelector("#feeEdit--feeFunction");""===t.value?(t.closest(".select").classList.remove("is-success"),e.classList.add("is-success"),e.disabled=!1):(t.closest(".select").classList.add("is-success"),e.classList.remove("is-success"),e.disabled=!0)},m=()=>{const e=i.querySelector("#feeEdit--taxAmount"),t=i.querySelector("#feeEdit--taxPercentage");""===t.value?(t.classList.remove("is-success"),e.classList.add("is-success"),e.disabled=!1):(t.classList.add("is-success"),e.classList.remove("is-success"),e.disabled=!0)},p=()=>{i.querySelector("#feeEdit--quantityUnit").disabled=""===i.querySelector("#feeEdit--includeQuantity").value};cityssm.openHtmlModal("adminFees-editFee",{onshow:t=>{i=t,t.querySelector("#feeEdit--feeId").value=c.feeId.toString();const o=t.querySelector("#feeEdit--feeCategoryId");for(const e of s){const t=document.createElement("option");t.value=e.feeCategoryId.toString(),t.textContent=e.feeCategory,e.feeCategoryId===n&&(t.selected=!0),o.append(t)}t.querySelector("#feeEdit--feeName").value=c.feeName,t.querySelector("#feeEdit--feeDescription").value=c.feeDescription;const a=t.querySelector("#feeEdit--occupancyTypeId");for(const e of exports.occupancyTypes){const t=document.createElement("option");t.value=e.occupancyTypeId.toString(),t.textContent=e.occupancyType,e.occupancyTypeId===c.occupancyTypeId&&(t.selected=!0),a.append(t)}const r=t.querySelector("#feeEdit--lotTypeId");for(const e of exports.lotTypes){const t=document.createElement("option");t.value=e.lotTypeId.toString(),t.textContent=e.lotType,e.lotTypeId===c.lotTypeId&&(t.selected=!0),r.append(t)}t.querySelector("#feeEdit--feeAmount").value=c.feeAmount?c.feeAmount.toFixed(2):"",t.querySelector("#feeEdit--feeFunction").addEventListener("change",y),y(),t.querySelector("#feeEdit--taxAmount").value=c.taxAmount?c.taxAmount.toFixed(2):"";const l=t.querySelector("#feeEdit--taxPercentage");l.value=c.taxPercentage?c.taxPercentage.toString():"",l.addEventListener("keyup",m),m();const d=t.querySelector("#feeEdit--includeQuantity");c.includeQuantity&&(d.value="1"),d.addEventListener("change",p),t.querySelector("#feeEdit--quantityUnit").value=c.quantityUnit||"",p(),c.isRequired&&(t.querySelector("#feeEdit--isRequired").value="1"),e.populateAliases(t)},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),l=t,e.querySelector("form").addEventListener("submit",d),bulmaJS.init(e),e.querySelector(".button--deleteFee").addEventListener("click",u)},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})},d=t=>{const a=t.currentTarget.closest(".container--fee"),r=Number.parseInt(a.dataset.feeId,10);cityssm.postJSON(e.urlPrefix+"/admin/doMoveFeeUp",{feeId:r,moveToTop:t.shiftKey?"1":"0"},e=>{e.success?(s=e.feeCategories,o()):bulmaJS.alert({title:"Error Moving Fee",message:e.errorMessage||"",contextualColorName:"danger"})})},u=t=>{const a=t.currentTarget.closest(".container--fee"),r=Number.parseInt(a.dataset.feeId,10);cityssm.postJSON(e.urlPrefix+"/admin/doMoveFeeDown",{feeId:r,moveToBottom:t.shiftKey?"1":"0"},e=>{e.success?(s=e.feeCategories,o()):bulmaJS.alert({title:"Error Moving Fee",message:e.errorMessage||"",contextualColorName:"danger"})})};o()})(); \ No newline at end of file +"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{const e=exports.los,t=document.querySelector("#container--feeCategories");let s=exports.feeCategories;function o(){if(0!==s.length){t.innerHTML="";for(const e of s){const s=document.createElement("section");if(s.className="panel container--feeCategory",s.dataset.feeCategoryId=e.feeCategoryId.toString(),s.innerHTML='

'+cityssm.escapeHTML(e.feeCategory||"")+'

'+(0===e.fees.length?'
':"")+'
',0===e.fees.length)s.insertAdjacentHTML("beforeend",'

There are no fees in the "'+cityssm.escapeHTML(e.feeCategory||"")+'" category.

');else for(const t of e.fees){const e=document.createElement("div");e.className="panel-block is-block container--fee",e.dataset.feeId=t.feeId.toString();const o=t.isRequired||t.occupancyTypeId||t.lotTypeId;e.innerHTML='

'+cityssm.escapeHTML(t.feeName||"")+"
"+cityssm.escapeHTML(t.feeDescription||"").replace(/\n/g,"
")+"

"+(o?'

'+(t.isRequired?'Required':"")+(t.occupancyTypeId?' '+cityssm.escapeHTML(t.occupancyType||"")+"":"")+(t.lotTypeId?' '+cityssm.escapeHTML(t.lotType||"")+"":"")+"

":"")+'
'+(t.feeFunction?cityssm.escapeHTML(t.feeFunction)+"
Fee Function":"$"+t.feeAmount.toFixed(2)+"
Fee")+'
'+(t.taxPercentage?t.taxPercentage+"%":"$"+t.taxAmount.toFixed(2))+'
Tax
'+(t.includeQuantity?cityssm.escapeHTML(t.quantityUnit||"")+"
Quantity":"")+'
',e.querySelector("a").addEventListener("click",i),e.querySelector(".button--moveFeeUp").addEventListener("click",d),e.querySelector(".button--moveFeeDown").addEventListener("click",u),s.append(e)}0===e.fees.length&&s.querySelector(".button--deleteFeeCategory").addEventListener("click",r),s.querySelector(".button--editFeeCategory").addEventListener("click",a),s.querySelector(".button--addFee").addEventListener("click",l),s.querySelector(".button--moveFeeCategoryUp").addEventListener("click",n),s.querySelector(".button--moveFeeCategoryDown").addEventListener("click",c),t.append(s)}}else t.innerHTML='

There are no available fees.

'}function a(t){const a=Number.parseInt(t.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId,10),r=s.find(e=>e.feeCategoryId===a);let n;const c=t=>{t.preventDefault(),cityssm.postJSON(e.urlPrefix+"/admin/doUpdateFeeCategory",t.currentTarget,e=>{e.success?(s=e.feeCategories,n(),o()):bulmaJS.alert({title:"Error Updating Fee Category",message:e.errorMessage||"",contextualColorName:"danger"})})};cityssm.openHtmlModal("adminFees-editFeeCategory",{onshow:e=>{e.querySelector("#feeCategoryEdit--feeCategoryId").value=r.feeCategoryId.toString(),e.querySelector("#feeCategoryEdit--feeCategory").value=r.feeCategory},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),n=t,e.querySelector("form").addEventListener("submit",c),e.querySelector("#feeCategoryEdit--feeCategory").focus()},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})}function r(t){const a=Number.parseInt(t.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId,10);bulmaJS.confirm({title:"Delete Fee Category?",message:"Are you sure you want to delete this fee category?",contextualColorName:"warning",okButton:{text:"Yes, Delete the Fee Category",callbackFunction:()=>{cityssm.postJSON(e.urlPrefix+"/admin/doDeleteFeeCategory",{feeCategoryId:a},e=>{e.success?(s=e.feeCategories,o()):bulmaJS.alert({title:"Error Updating Fee Category",message:e.errorMessage||"",contextualColorName:"danger"})})}}})}function n(t){const a=Number.parseInt(t.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId,10);cityssm.postJSON(e.urlPrefix+"/admin/doMoveFeeCategoryUp",{feeCategoryId:a,moveToTop:t.shiftKey?"1":"0"},e=>{e.success?(s=e.feeCategories,o()):bulmaJS.alert({title:"Error Moving Fee Category",message:e.errorMessage||"",contextualColorName:"danger"})})}function c(t){const a=Number.parseInt(t.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId,10);cityssm.postJSON(e.urlPrefix+"/admin/doMoveFeeCategoryDown",{feeCategoryId:a,moveToBottom:t.shiftKey?"1":"0"},e=>{e.success?(s=e.feeCategories,o()):bulmaJS.alert({title:"Error Moving Fee Category",message:e.errorMessage||"",contextualColorName:"danger"})})}function l(t){const a=Number.parseInt(t.currentTarget.closest(".container--feeCategory").dataset.feeCategoryId,10);let r;const n=t=>{t.preventDefault(),cityssm.postJSON(e.urlPrefix+"/admin/doAddFee",t.currentTarget,e=>{e.success?(s=e.feeCategories,r(),o()):bulmaJS.alert({title:"Error Adding Fee",message:e.errorMessage||"",contextualColorName:"danger"})})};cityssm.openHtmlModal("adminFees-addFee",{onshow:t=>{const o=t.querySelector("#feeAdd--feeCategoryId");for(const e of s){const t=document.createElement("option");t.value=e.feeCategoryId.toString(),t.textContent=e.feeCategory,e.feeCategoryId===a&&(t.selected=!0),o.append(t)}const r=t.querySelector("#feeAdd--occupancyTypeId");for(const e of exports.occupancyTypes){const t=document.createElement("option");t.value=e.occupancyTypeId.toString(),t.textContent=e.occupancyType,r.append(t)}const n=t.querySelector("#feeAdd--lotTypeId");for(const e of exports.lotTypes){const t=document.createElement("option");t.value=e.lotTypeId.toString(),t.textContent=e.lotType,n.append(t)}t.querySelector("#feeAdd--taxPercentage").value=exports.taxPercentageDefault.toString(),e.populateAliases(t)},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),r=t,e.querySelector("form").addEventListener("submit",n),e.querySelector("#feeAdd--feeName").focus(),e.querySelector("#feeAdd--feeFunction").addEventListener("change",()=>{const t=e.querySelector("#feeAdd--feeAmount"),s=e.querySelector("#feeAdd--feeFunction");""===s.value?(s.closest(".select").classList.remove("is-success"),t.classList.add("is-success"),t.disabled=!1):(s.closest(".select").classList.add("is-success"),t.classList.remove("is-success"),t.disabled=!0)}),e.querySelector("#feeAdd--taxPercentage").addEventListener("keyup",()=>{const t=e.querySelector("#feeAdd--taxAmount"),s=e.querySelector("#feeAdd--taxPercentage");""===s.value?(s.classList.remove("is-success"),t.classList.add("is-success"),t.disabled=!1):(s.classList.add("is-success"),t.classList.remove("is-success"),t.disabled=!0)}),e.querySelector("#feeAdd--includeQuantity").addEventListener("change",()=>{e.querySelector("#feeAdd--quantityUnit").disabled=""===e.querySelector("#feeAdd--includeQuantity").value})},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})}function i(t){t.preventDefault();const a=t.currentTarget.closest(".container--fee"),r=Number.parseInt(a.dataset.feeId,10),n=Number.parseInt(a.closest(".container--feeCategory").dataset.feeCategoryId),c=s.find(e=>e.feeCategoryId===n).fees.find(e=>e.feeId===r);let l,i;const d=t=>{t.preventDefault(),cityssm.postJSON(e.urlPrefix+"/admin/doUpdateFee",t.currentTarget,e=>{e.success?(s=e.feeCategories,l(),o()):bulmaJS.alert({title:"Error Updating Fee",message:e.errorMessage||"",contextualColorName:"danger"})})},u=t=>{t.preventDefault();bulmaJS.confirm({title:"Delete Fee?",message:"Are you sure you want to delete this fee?",contextualColorName:"warning",okButton:{text:"Yes, Delete the Fee",callbackFunction:()=>{cityssm.postJSON(e.urlPrefix+"/admin/doDeleteFee",{feeId:r},e=>{e.success?(s=e.feeCategories,l(),o()):bulmaJS.alert({title:"Error Deleting Fee",message:e.errorMessage||"",contextualColorName:"danger"})})}}})},y=()=>{const e=i.querySelector("#feeEdit--feeAmount"),t=i.querySelector("#feeEdit--feeFunction");""===t.value?(t.closest(".select").classList.remove("is-success"),e.classList.add("is-success"),e.disabled=!1):(t.closest(".select").classList.add("is-success"),e.classList.remove("is-success"),e.disabled=!0)},m=()=>{const e=i.querySelector("#feeEdit--taxAmount"),t=i.querySelector("#feeEdit--taxPercentage");""===t.value?(t.classList.remove("is-success"),e.classList.add("is-success"),e.disabled=!1):(t.classList.add("is-success"),e.classList.remove("is-success"),e.disabled=!0)},f=()=>{i.querySelector("#feeEdit--quantityUnit").disabled=""===i.querySelector("#feeEdit--includeQuantity").value};cityssm.openHtmlModal("adminFees-editFee",{onshow:t=>{i=t,t.querySelector("#feeEdit--feeId").value=c.feeId.toString();const o=t.querySelector("#feeEdit--feeCategoryId");for(const e of s){const t=document.createElement("option");t.value=e.feeCategoryId.toString(),t.textContent=e.feeCategory,e.feeCategoryId===n&&(t.selected=!0),o.append(t)}t.querySelector("#feeEdit--feeName").value=c.feeName,t.querySelector("#feeEdit--feeDescription").value=c.feeDescription;const a=t.querySelector("#feeEdit--occupancyTypeId");for(const e of exports.occupancyTypes){const t=document.createElement("option");t.value=e.occupancyTypeId.toString(),t.textContent=e.occupancyType,e.occupancyTypeId===c.occupancyTypeId&&(t.selected=!0),a.append(t)}const r=t.querySelector("#feeEdit--lotTypeId");for(const e of exports.lotTypes){const t=document.createElement("option");t.value=e.lotTypeId.toString(),t.textContent=e.lotType,e.lotTypeId===c.lotTypeId&&(t.selected=!0),r.append(t)}t.querySelector("#feeEdit--feeAmount").value=c.feeAmount?c.feeAmount.toFixed(2):"",t.querySelector("#feeEdit--feeFunction").addEventListener("change",y),y(),t.querySelector("#feeEdit--taxAmount").value=c.taxAmount?c.taxAmount.toFixed(2):"";const l=t.querySelector("#feeEdit--taxPercentage");l.value=c.taxPercentage?c.taxPercentage.toString():"",l.addEventListener("keyup",m),m();const d=t.querySelector("#feeEdit--includeQuantity");c.includeQuantity&&(d.value="1"),d.addEventListener("change",f),t.querySelector("#feeEdit--quantityUnit").value=c.quantityUnit||"",f(),c.isRequired&&(t.querySelector("#feeEdit--isRequired").value="1"),e.populateAliases(t)},onshown:(e,t)=>{bulmaJS.toggleHtmlClipped(),l=t,e.querySelector("form").addEventListener("submit",d),bulmaJS.init(e),e.querySelector(".button--deleteFee").addEventListener("click",u)},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})}function d(t){const a=t.currentTarget.closest(".container--fee"),r=Number.parseInt(a.dataset.feeId,10);cityssm.postJSON(e.urlPrefix+"/admin/doMoveFeeUp",{feeId:r,moveToTop:t.shiftKey?"1":"0"},e=>{e.success?(s=e.feeCategories,o()):bulmaJS.alert({title:"Error Moving Fee",message:e.errorMessage||"",contextualColorName:"danger"})})}function u(t){const a=t.currentTarget.closest(".container--fee"),r=Number.parseInt(a.dataset.feeId,10);cityssm.postJSON(e.urlPrefix+"/admin/doMoveFeeDown",{feeId:r,moveToBottom:t.shiftKey?"1":"0"},e=>{e.success?(s=e.feeCategories,o()):bulmaJS.alert({title:"Error Moving Fee",message:e.errorMessage||"",contextualColorName:"danger"})})}delete exports.feeCategories,document.querySelector("#button--addFeeCategory").addEventListener("click",()=>{let t;const a=a=>{a.preventDefault(),cityssm.postJSON(e.urlPrefix+"/admin/doAddFeeCategory",a.currentTarget,e=>{e.success?(s=e.feeCategories,t(),o()):bulmaJS.alert({title:"Error Creating Fee Category",message:e.errorMessage||"",contextualColorName:"danger"})})};cityssm.openHtmlModal("adminFees-addFeeCategory",{onshown:(e,s)=>{bulmaJS.toggleHtmlClipped(),e.querySelector("#feeCategoryAdd--feeCategory").focus(),t=s,e.querySelector("form").addEventListener("submit",a)},onremoved:()=>{bulmaJS.toggleHtmlClipped()}})}),o()})(); \ No newline at end of file diff --git a/types/globalTypes.ts b/types/globalTypes.ts index c09caf3d..b878403a 100644 --- a/types/globalTypes.ts +++ b/types/globalTypes.ts @@ -14,11 +14,12 @@ export interface LOS { initializeUnlockFieldButtons: (containerElement: HTMLElement) => void; populateAliases: (containerElement: HTMLElement) => void; + escapedAliases: { Map: string; map: string; Lot: string; - lot: string; + lot: string; Lots: string; lots: string; Occupancy: string;