diff --git a/bin/www.js b/bin/www.js index 3aa7d8fe..2ff7b5d0 100644 --- a/bin/www.js +++ b/bin/www.js @@ -5,7 +5,7 @@ import exitHook from "exit-hook"; import ntfyPublish from "@cityssm/ntfy-publish"; import Debug from "debug"; const debug = Debug("lot-occupancy-system:www"); -const onError = (error) => { +function onError(error) { if (error.syscall !== "listen") { throw error; } @@ -22,14 +22,14 @@ const onError = (error) => { throw error; } } -}; -const onListening = (server) => { +} +function onListening(server) { const addr = server.address(); if (addr) { const bind = typeof addr === "string" ? "pipe " + addr : "port " + addr.port.toString(); debug("Listening on " + bind); } -}; +} const ntfyStartupConfig = configFunctions.getProperty("application.ntfyStartup"); const httpPort = configFunctions.getProperty("application.httpPort"); const httpServer = http.createServer(app); diff --git a/bin/www.ts b/bin/www.ts index 2e0a1a04..d7790630 100644 --- a/bin/www.ts +++ b/bin/www.ts @@ -19,7 +19,7 @@ interface ServerError extends Error { code: string; } -const onError = (error: ServerError) => { +function onError(error: ServerError) { if (error.syscall !== "listen") { throw error; } @@ -45,16 +45,16 @@ const onError = (error: ServerError) => { throw error; } } -}; +} -const onListening = (server: http.Server) => { +function onListening(server: http.Server) { const addr = server.address(); if (addr) { const bind = typeof addr === "string" ? "pipe " + addr : "port " + addr.port.toString(); debug("Listening on " + bind); } -}; +} /* * Initialize HTTP diff --git a/helpers/functions.api.d.ts b/helpers/functions.api.d.ts index fef50de3..7a142974 100644 --- a/helpers/functions.api.d.ts +++ b/helpers/functions.api.d.ts @@ -1,5 +1,5 @@ import * as recordTypes from "../types/recordTypes"; -export declare const regenerateApiKey: (userName: string) => Promise; -export declare const getApiKey: (userName: string) => Promise; -export declare const getApiKeyFromSession: (session: recordTypes.PartialSession) => Promise; -export declare const getUserNameFromApiKey: (apiKey: string) => Promise; +export declare function regenerateApiKey(userName: string): Promise; +export declare function getApiKey(userName: string): Promise; +export declare function getApiKeyFromSession(session: recordTypes.PartialSession): Promise; +export declare function getUserNameFromApiKey(apiKey: string): Promise; diff --git a/helpers/functions.api.js b/helpers/functions.api.js index 875aa14f..77b77fcc 100644 --- a/helpers/functions.api.js +++ b/helpers/functions.api.js @@ -4,7 +4,7 @@ import Debug from "debug"; const debug = Debug("lot-occupancy-system:functions.api"); const apiKeyPath = "data/apiKeys.json"; let apiKeys; -const loadApiKeys = async () => { +async function loadApiKeys() { try { const fileData = await fs.readFile(apiKeyPath, "utf8"); apiKeys = JSON.parse(fileData); @@ -13,23 +13,23 @@ const loadApiKeys = async () => { debug(error); apiKeys = {}; } -}; -const saveApiKeys = async () => { +} +async function saveApiKeys() { try { await fs.writeFile(apiKeyPath, JSON.stringify(apiKeys), "utf8"); } catch (error) { debug(error); } -}; -const generateApiKey = (apiKeyPrefix) => { +} +function generateApiKey(apiKeyPrefix) { return apiKeyPrefix + "-" + uuidv4() + "-" + Date.now(); -}; -export const regenerateApiKey = async (userName) => { +} +export async function regenerateApiKey(userName) { apiKeys[userName] = generateApiKey(userName); await saveApiKeys(); -}; -export const getApiKey = async (userName) => { +} +export async function getApiKey(userName) { if (!apiKeys) { await loadApiKeys(); } @@ -37,11 +37,11 @@ export const getApiKey = async (userName) => { await regenerateApiKey(userName); } return apiKeys[userName]; -}; -export const getApiKeyFromSession = async (session) => { +} +export async function getApiKeyFromSession(session) { return await getApiKey(session.user.userName); -}; -export const getUserNameFromApiKey = async (apiKey) => { +} +export async function getUserNameFromApiKey(apiKey) { if (!apiKeys) { await loadApiKeys(); } @@ -50,4 +50,4 @@ export const getUserNameFromApiKey = async (apiKey) => { return userName; } } -}; +} diff --git a/helpers/functions.api.ts b/helpers/functions.api.ts index 771f26b8..f3b8df77 100644 --- a/helpers/functions.api.ts +++ b/helpers/functions.api.ts @@ -10,7 +10,7 @@ const debug = Debug("lot-occupancy-system:functions.api"); const apiKeyPath = "data/apiKeys.json"; let apiKeys: { [userName: string]: string }; -const loadApiKeys = async () => { +async function loadApiKeys() { try { const fileData = await fs.readFile(apiKeyPath, "utf8"); apiKeys = JSON.parse(fileData); @@ -18,26 +18,26 @@ const loadApiKeys = async () => { debug(error); apiKeys = {}; } -}; +} -const saveApiKeys = async () => { +async function saveApiKeys() { try { await fs.writeFile(apiKeyPath, JSON.stringify(apiKeys), "utf8"); } catch (error) { debug(error); } -}; +} -const generateApiKey = (apiKeyPrefix: string) => { +function generateApiKey(apiKeyPrefix: string) { return apiKeyPrefix + "-" + uuidv4() + "-" + Date.now(); -}; +} -export const regenerateApiKey = async (userName: string) => { +export async function regenerateApiKey(userName: string) { apiKeys[userName] = generateApiKey(userName); await saveApiKeys(); -}; +} -export const getApiKey = async (userName: string) => { +export async function getApiKey(userName: string) { if (!apiKeys) { await loadApiKeys(); } @@ -47,13 +47,13 @@ export const getApiKey = async (userName: string) => { } return apiKeys[userName]; -}; +} -export const getApiKeyFromSession = async (session: recordTypes.PartialSession) => { +export async function getApiKeyFromSession(session: recordTypes.PartialSession) { return await getApiKey(session.user.userName); -}; +} -export const getUserNameFromApiKey = async (apiKey: string) => { +export async function getUserNameFromApiKey(apiKey: string) { if (!apiKeys) { await loadApiKeys(); } @@ -63,4 +63,4 @@ export const getUserNameFromApiKey = async (apiKey: string) => { return userName; } } -}; +} diff --git a/helpers/functions.authentication.d.ts b/helpers/functions.authentication.d.ts index 4ac59785..a281d539 100644 --- a/helpers/functions.authentication.d.ts +++ b/helpers/functions.authentication.d.ts @@ -1,2 +1,2 @@ -export declare const authenticate: (userName: string, password: string) => Promise; -export declare const getSafeRedirectURL: (possibleRedirectURL?: string) => string; +export declare function authenticate(userName: string, password: string): Promise; +export declare function getSafeRedirectURL(possibleRedirectURL?: string): string; diff --git a/helpers/functions.authentication.js b/helpers/functions.authentication.js index 21370fb0..aa2af776 100644 --- a/helpers/functions.authentication.js +++ b/helpers/functions.authentication.js @@ -2,7 +2,7 @@ import * as configFunctions from "./functions.config.js"; import ActiveDirectory from "activedirectory2"; const userDomain = configFunctions.getProperty("application.userDomain"); const activeDirectoryConfig = configFunctions.getProperty("activeDirectory"); -const authenticateViaActiveDirectory = async (userName, password) => { +async function authenticateViaActiveDirectory(userName, password) { return new Promise((resolve) => { try { const ad = new ActiveDirectory(activeDirectoryConfig); @@ -17,13 +17,13 @@ const authenticateViaActiveDirectory = async (userName, password) => { resolve(false); } }); -}; -export const authenticate = async (userName, password) => { +} +export async function authenticate(userName, password) { if (!userName || userName === "" || !password || password === "") { return false; } return await authenticateViaActiveDirectory(userName, password); -}; +} const safeRedirects = new Set([ "/admin/cleanup", "/admin/fees", @@ -42,7 +42,7 @@ const safeRedirects = new Set([ "/workorders/outlook", "/reports" ]); -export const getSafeRedirectURL = (possibleRedirectURL = "") => { +export function getSafeRedirectURL(possibleRedirectURL = "") { const urlPrefix = configFunctions.getProperty("reverseProxy.urlPrefix"); if (typeof possibleRedirectURL === "string") { const urlToCheck = possibleRedirectURL.startsWith(urlPrefix) @@ -59,4 +59,4 @@ export const getSafeRedirectURL = (possibleRedirectURL = "") => { } } return urlPrefix + "/dashboard"; -}; +} diff --git a/helpers/functions.authentication.ts b/helpers/functions.authentication.ts index fef6465e..811fbc23 100644 --- a/helpers/functions.authentication.ts +++ b/helpers/functions.authentication.ts @@ -6,10 +6,10 @@ const userDomain = configFunctions.getProperty("application.userDomain"); const activeDirectoryConfig = configFunctions.getProperty("activeDirectory"); -const authenticateViaActiveDirectory = async ( +async function authenticateViaActiveDirectory( userName: string, password: string -): Promise => { +): Promise { return new Promise((resolve) => { try { const ad = new ActiveDirectory(activeDirectoryConfig); @@ -25,15 +25,15 @@ const authenticateViaActiveDirectory = async ( resolve(false); } }); -}; +} -export const authenticate = async (userName: string, password: string): Promise => { +export async function authenticate(userName: string, password: string): Promise { if (!userName || userName === "" || !password || password === "") { return false; } return await authenticateViaActiveDirectory(userName, password); -}; +} const safeRedirects = new Set([ "/admin/cleanup", @@ -54,7 +54,7 @@ const safeRedirects = new Set([ "/reports" ]); -export const getSafeRedirectURL = (possibleRedirectURL = "") => { +export function getSafeRedirectURL(possibleRedirectURL = "") { const urlPrefix = configFunctions.getProperty("reverseProxy.urlPrefix"); if (typeof possibleRedirectURL === "string") { @@ -77,4 +77,4 @@ export const getSafeRedirectURL = (possibleRedirectURL = "") => { } return urlPrefix + "/dashboard"; -}; +} diff --git a/helpers/functions.cache.ts b/helpers/functions.cache.ts index 4e37c266..95dd3cbd 100644 --- a/helpers/functions.cache.ts +++ b/helpers/functions.cache.ts @@ -164,7 +164,6 @@ export function getOccupancyTypeByOccupancyType(occupancyTypeString: string) { } export function getOccupancyTypePrintsById(occupancyTypeId: number): string[] { - const occupancyType = getOccupancyTypeById(occupancyTypeId); if (!occupancyType || occupancyType.occupancyTypePrints.length === 0) { diff --git a/helpers/functions.fee.d.ts b/helpers/functions.fee.d.ts index 26c4e8ab..a44409da 100644 --- a/helpers/functions.fee.d.ts +++ b/helpers/functions.fee.d.ts @@ -1,3 +1,3 @@ import * as recordTypes from "../types/recordTypes"; export declare const calculateFeeAmount: (fee: recordTypes.Fee, lotOccupancy: recordTypes.LotOccupancy) => number; -export declare const calculateTaxAmount: (fee: recordTypes.Fee, feeAmount: number) => number; +export declare function calculateTaxAmount(fee: recordTypes.Fee, feeAmount: number): number; diff --git a/helpers/functions.fee.js b/helpers/functions.fee.js index d7b31ac8..88f6426d 100644 --- a/helpers/functions.fee.js +++ b/helpers/functions.fee.js @@ -1,8 +1,6 @@ export const calculateFeeAmount = (fee, lotOccupancy) => { return fee.feeFunction ? 0 : fee.feeAmount || 0; }; -export const calculateTaxAmount = (fee, feeAmount) => { - return fee.taxPercentage - ? feeAmount * (fee.taxPercentage / 100) - : fee.taxAmount || 0; -}; +export function calculateTaxAmount(fee, feeAmount) { + return fee.taxPercentage ? feeAmount * (fee.taxPercentage / 100) : fee.taxAmount || 0; +} diff --git a/helpers/functions.fee.ts b/helpers/functions.fee.ts index 140ddfed..c866521d 100644 --- a/helpers/functions.fee.ts +++ b/helpers/functions.fee.ts @@ -7,8 +7,6 @@ export const calculateFeeAmount = ( return fee.feeFunction ? 0 : fee.feeAmount || 0; }; -export const calculateTaxAmount = (fee: recordTypes.Fee, feeAmount: number) => { - return fee.taxPercentage - ? feeAmount * (fee.taxPercentage / 100) - : fee.taxAmount || 0; -}; +export function calculateTaxAmount(fee: recordTypes.Fee, feeAmount: number) { + return fee.taxPercentage ? feeAmount * (fee.taxPercentage / 100) : fee.taxAmount || 0; +} diff --git a/helpers/functions.icons.d.ts b/helpers/functions.icons.d.ts index c890b9d8..dd42519a 100644 --- a/helpers/functions.icons.d.ts +++ b/helpers/functions.icons.d.ts @@ -1 +1 @@ -export declare const getSolidIconClasses: () => Promise; +export declare function getSolidIconClasses(): Promise; diff --git a/helpers/functions.icons.js b/helpers/functions.icons.js index b8728aa2..708d040c 100644 --- a/helpers/functions.icons.js +++ b/helpers/functions.icons.js @@ -1,6 +1,6 @@ import faIcons from "font-awesome-v5-icons"; let solidIcons = []; -export const getSolidIconClasses = async () => { +export async function getSolidIconClasses() { if (solidIcons.length === 0) { const allIcons = await faIcons.getListByKeys(["name", "styles"]); const list = []; @@ -12,4 +12,4 @@ export const getSolidIconClasses = async () => { solidIcons = list; } return solidIcons; -}; +} diff --git a/helpers/functions.icons.ts b/helpers/functions.icons.ts index 657e7671..017cebc6 100644 --- a/helpers/functions.icons.ts +++ b/helpers/functions.icons.ts @@ -2,7 +2,7 @@ import faIcons from "font-awesome-v5-icons"; let solidIcons: string[] = []; -export const getSolidIconClasses = async () => { +export async function getSolidIconClasses() { if (solidIcons.length === 0) { const allIcons = await faIcons.getListByKeys(["name", "styles"]); @@ -18,4 +18,4 @@ export const getSolidIconClasses = async () => { } return solidIcons; -}; +} diff --git a/helpers/functions.lotOccupancy.d.ts b/helpers/functions.lotOccupancy.d.ts index 41758bb8..bc1ee5e7 100644 --- a/helpers/functions.lotOccupancy.d.ts +++ b/helpers/functions.lotOccupancy.d.ts @@ -1,5 +1,5 @@ import type * as recordTypes from "../types/recordTypes"; -export declare const filterOccupantsByLotOccupantType: (lotOccupancy: recordTypes.LotOccupancy, lotOccupantType: string) => recordTypes.LotOccupancyOccupant[]; -export declare const getFieldValueByOccupancyTypeField: (lotOccupancy: recordTypes.LotOccupancy, occupancyTypeField: string) => string | undefined; -export declare const getFeesByFeeCategory: (lotOccupancy: recordTypes.LotOccupancy, feeCategory: string, feeCategoryContains?: boolean) => recordTypes.LotOccupancyFee[]; -export declare const getTransactionTotal: (lotOccupancy: recordTypes.LotOccupancy) => number; +export declare function filterOccupantsByLotOccupantType(lotOccupancy: recordTypes.LotOccupancy, lotOccupantType: string): recordTypes.LotOccupancyOccupant[]; +export declare function getFieldValueByOccupancyTypeField(lotOccupancy: recordTypes.LotOccupancy, occupancyTypeField: string): string | undefined; +export declare function getFeesByFeeCategory(lotOccupancy: recordTypes.LotOccupancy, feeCategory: string, feeCategoryContains?: boolean): recordTypes.LotOccupancyFee[]; +export declare function getTransactionTotal(lotOccupancy: recordTypes.LotOccupancy): number; diff --git a/helpers/functions.lotOccupancy.js b/helpers/functions.lotOccupancy.js index dedcc65a..1ad93e17 100644 --- a/helpers/functions.lotOccupancy.js +++ b/helpers/functions.lotOccupancy.js @@ -1,21 +1,22 @@ -export const filterOccupantsByLotOccupantType = (lotOccupancy, lotOccupantType) => { +export function filterOccupantsByLotOccupantType(lotOccupancy, lotOccupantType) { const lotOccupantTypeLowerCase = lotOccupantType.toLowerCase(); const occupants = (lotOccupancy.lotOccupancyOccupants || []).filter((possibleOccupant) => { return (possibleOccupant.lotOccupantType.toLowerCase() === lotOccupantTypeLowerCase); }); return occupants; -}; -export const getFieldValueByOccupancyTypeField = (lotOccupancy, occupancyTypeField) => { +} +export function getFieldValueByOccupancyTypeField(lotOccupancy, occupancyTypeField) { const occupancyTypeFieldLowerCase = occupancyTypeField.toLowerCase(); const field = (lotOccupancy.lotOccupancyFields || []).find((possibleField) => { - return possibleField.occupancyTypeField.toLowerCase() === occupancyTypeFieldLowerCase; + return (possibleField.occupancyTypeField.toLowerCase() === + occupancyTypeFieldLowerCase); }); if (field) { return field.lotOccupancyFieldValue; } return undefined; -}; -export const getFeesByFeeCategory = (lotOccupancy, feeCategory, feeCategoryContains = false) => { +} +export function getFeesByFeeCategory(lotOccupancy, feeCategory, feeCategoryContains = false) { const feeCategoryLowerCase = feeCategory.toLowerCase(); const fees = (lotOccupancy.lotOccupancyFees || []).filter((possibleFee) => { return feeCategoryContains @@ -23,11 +24,11 @@ export const getFeesByFeeCategory = (lotOccupancy, feeCategory, feeCategoryConta : possibleFee.feeCategory.toLowerCase() === feeCategoryLowerCase; }); return fees; -}; -export const getTransactionTotal = (lotOccupancy) => { +} +export function getTransactionTotal(lotOccupancy) { let transactionTotal = 0; - for (const transaction of (lotOccupancy.lotOccupancyTransactions || [])) { + for (const transaction of lotOccupancy.lotOccupancyTransactions || []) { transactionTotal += transaction.transactionAmount; } return transactionTotal; -}; +} diff --git a/helpers/functions.lotOccupancy.ts b/helpers/functions.lotOccupancy.ts index 2b7e82ff..ecc34a81 100644 --- a/helpers/functions.lotOccupancy.ts +++ b/helpers/functions.lotOccupancy.ts @@ -1,9 +1,9 @@ import type * as recordTypes from "../types/recordTypes"; -export const filterOccupantsByLotOccupantType = ( +export function filterOccupantsByLotOccupantType( lotOccupancy: recordTypes.LotOccupancy, lotOccupantType: string -): recordTypes.LotOccupancyOccupant[] => { +): recordTypes.LotOccupancyOccupant[] { const lotOccupantTypeLowerCase = lotOccupantType.toLowerCase(); const occupants = (lotOccupancy.lotOccupancyOccupants || []).filter((possibleOccupant) => { @@ -13,16 +13,19 @@ export const filterOccupantsByLotOccupantType = ( }); return occupants; -}; +} -export const getFieldValueByOccupancyTypeField = ( +export function getFieldValueByOccupancyTypeField( lotOccupancy: recordTypes.LotOccupancy, occupancyTypeField: string -): string | undefined => { +): string | undefined { const occupancyTypeFieldLowerCase = occupancyTypeField.toLowerCase(); const field = (lotOccupancy.lotOccupancyFields || []).find((possibleField) => { - return (possibleField.occupancyTypeField as string).toLowerCase() === occupancyTypeFieldLowerCase; + return ( + (possibleField.occupancyTypeField as string).toLowerCase() === + occupancyTypeFieldLowerCase + ); }); if (field) { @@ -30,13 +33,13 @@ export const getFieldValueByOccupancyTypeField = ( } return undefined; -}; +} -export const getFeesByFeeCategory = ( +export function getFeesByFeeCategory( lotOccupancy: recordTypes.LotOccupancy, feeCategory: string, feeCategoryContains = false -) => { +) { const feeCategoryLowerCase = feeCategory.toLowerCase(); const fees = (lotOccupancy.lotOccupancyFees || []).filter((possibleFee) => { @@ -46,14 +49,14 @@ export const getFeesByFeeCategory = ( }); return fees; -}; +} -export const getTransactionTotal = (lotOccupancy: recordTypes.LotOccupancy) => { +export function getTransactionTotal(lotOccupancy: recordTypes.LotOccupancy) { let transactionTotal = 0; - for (const transaction of (lotOccupancy.lotOccupancyTransactions || [])) { + for (const transaction of lotOccupancy.lotOccupancyTransactions || []) { transactionTotal += transaction.transactionAmount; } return transactionTotal; -}; +} diff --git a/helpers/functions.map.ts b/helpers/functions.map.ts index 2b10d021..da93b56b 100644 --- a/helpers/functions.map.ts +++ b/helpers/functions.map.ts @@ -2,7 +2,7 @@ import fs from "node:fs/promises"; let mapSVGs: string[]; -export async function getMapSVGs() { +export async function getMapSVGs(): Promise { if (!mapSVGs) { const files = await fs.readdir("./public/images/maps/"); diff --git a/helpers/functions.print.d.ts b/helpers/functions.print.d.ts index 83bf333d..0825d394 100644 --- a/helpers/functions.print.d.ts +++ b/helpers/functions.print.d.ts @@ -2,12 +2,12 @@ interface PrintConfig { title: string; params: string[]; } -export declare const getScreenPrintConfig: (printName: string) => PrintConfig; -export declare const getPdfPrintConfig: (printName: string) => PrintConfig; -export declare const getPrintConfig: (screenOrPdf_printName: string) => PrintConfig | undefined; -export declare const getReportData: (printConfig: PrintConfig, requestQuery: { +export declare function getScreenPrintConfig(printName: string): PrintConfig; +export declare function getPdfPrintConfig(printName: string): PrintConfig; +export declare function getPrintConfig(screenOrPdf_printName: string): PrintConfig | undefined; +export declare function getReportData(printConfig: PrintConfig, requestQuery: { [paramName: string]: unknown; -}) => { +}): { [dataName: string]: unknown; }; export {}; diff --git a/helpers/functions.print.js b/helpers/functions.print.js index 3968c1b1..30032eff 100644 --- a/helpers/functions.print.js +++ b/helpers/functions.print.js @@ -11,9 +11,9 @@ const screenPrintConfigs = { params: ["lotOccupancyId"] } }; -export const getScreenPrintConfig = (printName) => { +export function getScreenPrintConfig(printName) { return screenPrintConfigs[printName]; -}; +} const pdfPrintConfigs = { workOrder: { title: "Work Order Field Sheet", @@ -32,10 +32,10 @@ const pdfPrintConfigs = { params: ["lotOccupancyId"] } }; -export const getPdfPrintConfig = (printName) => { +export function getPdfPrintConfig(printName) { return pdfPrintConfigs[printName]; -}; -export const getPrintConfig = (screenOrPdf_printName) => { +} +export function getPrintConfig(screenOrPdf_printName) { const printNameSplit = screenOrPdf_printName.split("/"); switch (printNameSplit[0]) { case "screen": { @@ -46,8 +46,8 @@ export const getPrintConfig = (screenOrPdf_printName) => { } } return undefined; -}; -export const getReportData = (printConfig, requestQuery) => { +} +export function getReportData(printConfig, requestQuery) { const reportData = { headTitle: printConfig.title }; @@ -68,4 +68,4 @@ export const getReportData = (printConfig, requestQuery) => { }); } return reportData; -}; +} diff --git a/helpers/functions.print.ts b/helpers/functions.print.ts index f0378b77..79169315 100644 --- a/helpers/functions.print.ts +++ b/helpers/functions.print.ts @@ -20,9 +20,9 @@ const screenPrintConfigs: { [printName: string]: PrintConfig } = { } }; -export const getScreenPrintConfig = (printName: string): PrintConfig => { +export function getScreenPrintConfig(printName: string): PrintConfig { return screenPrintConfigs[printName]; -}; +} const pdfPrintConfigs: { [printName: string]: PrintConfig } = { workOrder: { @@ -45,11 +45,11 @@ const pdfPrintConfigs: { [printName: string]: PrintConfig } = { } }; -export const getPdfPrintConfig = (printName: string): PrintConfig => { +export function getPdfPrintConfig(printName: string): PrintConfig { return pdfPrintConfigs[printName]; -}; +} -export const getPrintConfig = (screenOrPdf_printName: string): PrintConfig | undefined => { +export function getPrintConfig(screenOrPdf_printName: string): PrintConfig | undefined { const printNameSplit = screenOrPdf_printName.split("/"); switch (printNameSplit[0]) { @@ -62,12 +62,12 @@ export const getPrintConfig = (screenOrPdf_printName: string): PrintConfig | und } return undefined; -}; +} -export const getReportData = ( +export function getReportData( printConfig: PrintConfig, requestQuery: { [paramName: string]: unknown } -) => { +) { const reportData: { [dataName: string]: unknown } = { headTitle: printConfig.title }; @@ -97,4 +97,4 @@ export const getReportData = ( } return reportData; -}; +} diff --git a/helpers/functions.sqlFilters.d.ts b/helpers/functions.sqlFilters.d.ts index e65e0c3a..eb20c8eb 100644 --- a/helpers/functions.sqlFilters.d.ts +++ b/helpers/functions.sqlFilters.d.ts @@ -1,14 +1,14 @@ declare type LotNameSearchType = "startsWith" | "endsWith" | ""; -export declare const getLotNameWhereClause: (lotName: string, lotNameSearchType: LotNameSearchType, lotsTableAlias?: string) => { +export declare function getLotNameWhereClause(lotName: string, lotNameSearchType: LotNameSearchType, lotsTableAlias?: string): { sqlWhereClause: string; sqlParameters: any[]; }; declare type OccupancyTime = "" | "current" | "past" | "future"; -export declare const getOccupancyTimeWhereClause: (occupancyTime: OccupancyTime, lotOccupanciesTableAlias?: string) => { +export declare function getOccupancyTimeWhereClause(occupancyTime: OccupancyTime, lotOccupanciesTableAlias?: string): { sqlWhereClause: string; sqlParameters: any[]; }; -export declare const getOccupantNameWhereClause: (occupantName: string, tableAlias?: string) => { +export declare function getOccupantNameWhereClause(occupantName: string, tableAlias?: string): { sqlWhereClause: string; sqlParameters: any[]; }; diff --git a/helpers/functions.sqlFilters.js b/helpers/functions.sqlFilters.js index 3e73a39f..461fdfe7 100644 --- a/helpers/functions.sqlFilters.js +++ b/helpers/functions.sqlFilters.js @@ -1,5 +1,5 @@ import { dateToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js"; -export const getLotNameWhereClause = (lotName, lotNameSearchType, lotsTableAlias = "l") => { +export function getLotNameWhereClause(lotName, lotNameSearchType, lotsTableAlias = "l") { let sqlWhereClause = ""; const sqlParameters = []; if (lotName) { @@ -27,8 +27,8 @@ export const getLotNameWhereClause = (lotName, lotNameSearchType, lotsTableAlias sqlWhereClause, sqlParameters }; -}; -export const getOccupancyTimeWhereClause = (occupancyTime, lotOccupanciesTableAlias = "o") => { +} +export function getOccupancyTimeWhereClause(occupancyTime, lotOccupanciesTableAlias = "o") { let sqlWhereClause = ""; const sqlParameters = []; if (occupancyTime) { @@ -62,8 +62,8 @@ export const getOccupancyTimeWhereClause = (occupancyTime, lotOccupanciesTableAl sqlWhereClause, sqlParameters }; -}; -export const getOccupantNameWhereClause = (occupantName, tableAlias = "o") => { +} +export function getOccupantNameWhereClause(occupantName, tableAlias = "o") { let sqlWhereClause = ""; const sqlParameters = []; if (occupantName) { @@ -77,4 +77,4 @@ export const getOccupantNameWhereClause = (occupantName, tableAlias = "o") => { sqlWhereClause, sqlParameters }; -}; +} diff --git a/helpers/functions.sqlFilters.ts b/helpers/functions.sqlFilters.ts index 0dd535ec..1d3cbf7a 100644 --- a/helpers/functions.sqlFilters.ts +++ b/helpers/functions.sqlFilters.ts @@ -2,11 +2,11 @@ import { dateToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js"; type LotNameSearchType = "startsWith" | "endsWith" | ""; -export const getLotNameWhereClause = ( +export function getLotNameWhereClause( lotName: string, lotNameSearchType: LotNameSearchType, lotsTableAlias = "l" -) => { +) { let sqlWhereClause = ""; const sqlParameters = []; @@ -36,14 +36,14 @@ export const getLotNameWhereClause = ( sqlWhereClause, sqlParameters }; -}; +} type OccupancyTime = "" | "current" | "past" | "future"; -export const getOccupancyTimeWhereClause = ( +export function getOccupancyTimeWhereClause( occupancyTime: OccupancyTime, lotOccupanciesTableAlias = "o" -) => { +) { let sqlWhereClause = ""; const sqlParameters = []; @@ -82,9 +82,9 @@ export const getOccupancyTimeWhereClause = ( sqlWhereClause, sqlParameters }; -}; +} -export const getOccupantNameWhereClause = (occupantName: string, tableAlias = "o") => { +export function getOccupantNameWhereClause(occupantName: string, tableAlias = "o") { let sqlWhereClause = ""; const sqlParameters = []; @@ -100,4 +100,4 @@ export const getOccupantNameWhereClause = (occupantName: string, tableAlias = "o sqlWhereClause, sqlParameters }; -}; +} diff --git a/helpers/functions.user.d.ts b/helpers/functions.user.d.ts index 0a39fb1b..5c246853 100644 --- a/helpers/functions.user.d.ts +++ b/helpers/functions.user.d.ts @@ -9,6 +9,6 @@ export interface APIRequest { apiKey?: string; }; } -export declare const userIsAdmin: (request: UserRequest) => boolean; -export declare const userCanUpdate: (request: UserRequest) => boolean; -export declare const apiKeyIsValid: (request: APIRequest) => Promise; +export declare function userIsAdmin(request: UserRequest): boolean; +export declare function userCanUpdate(request: UserRequest): boolean; +export declare function apiKeyIsValid(request: APIRequest): Promise; diff --git a/helpers/functions.user.js b/helpers/functions.user.js index 20675d27..81fcdf90 100644 --- a/helpers/functions.user.js +++ b/helpers/functions.user.js @@ -1,22 +1,22 @@ import { getUserNameFromApiKey } from "./functions.api.js"; import * as configFunctions from "./functions.config.js"; -export const userIsAdmin = (request) => { +export function userIsAdmin(request) { var _a; const user = (_a = request.session) === null || _a === void 0 ? void 0 : _a.user; if (!user || !user.userProperties) { return false; } return user.userProperties.isAdmin; -}; -export const userCanUpdate = (request) => { +} +export function userCanUpdate(request) { var _a; const user = (_a = request.session) === null || _a === void 0 ? void 0 : _a.user; if (!user || !user.userProperties) { return false; } return user.userProperties.canUpdate; -}; -export const apiKeyIsValid = async (request) => { +} +export async function apiKeyIsValid(request) { var _a; const apiKey = (_a = request.params) === null || _a === void 0 ? void 0 : _a.apiKey; if (!apiKey) { @@ -26,10 +26,8 @@ export const apiKeyIsValid = async (request) => { if (!userName) { return false; } - const canLogin = configFunctions - .getProperty("users.canLogin") - .some((currentUserName) => { + const canLogin = configFunctions.getProperty("users.canLogin").some((currentUserName) => { return userName === currentUserName.toLowerCase(); }); return canLogin; -}; +} diff --git a/helpers/functions.user.ts b/helpers/functions.user.ts index 975ebf9a..aaf7d7dd 100644 --- a/helpers/functions.user.ts +++ b/helpers/functions.user.ts @@ -6,16 +6,16 @@ import type { User } from "../types/recordTypes"; export interface UserRequest { session?: { user?: User; - } + }; } export interface APIRequest { params?: { apiKey?: string; - } + }; } -export const userIsAdmin = (request: UserRequest): boolean => { +export function userIsAdmin(request: UserRequest): boolean { const user = request.session?.user; if (!user || !user.userProperties) { @@ -23,9 +23,9 @@ export const userIsAdmin = (request: UserRequest): boolean => { } return user.userProperties.isAdmin; -}; +} -export const userCanUpdate = (request: UserRequest): boolean => { +export function userCanUpdate(request: UserRequest): boolean { const user = request.session?.user; if (!user || !user.userProperties) { @@ -33,9 +33,9 @@ export const userCanUpdate = (request: UserRequest): boolean => { } return user.userProperties.canUpdate; -}; +} -export const apiKeyIsValid = async (request: APIRequest): Promise => { +export async function apiKeyIsValid(request: APIRequest): Promise { const apiKey = request.params?.apiKey; if (!apiKey) { @@ -48,11 +48,9 @@ export const apiKeyIsValid = async (request: APIRequest): Promise => { return false; } - const canLogin = configFunctions - .getProperty("users.canLogin") - .some((currentUserName) => { - return userName === currentUserName.toLowerCase(); - }); + const canLogin = configFunctions.getProperty("users.canLogin").some((currentUserName) => { + return userName === currentUserName.toLowerCase(); + }); return canLogin; -}; +} diff --git a/helpers/initializer.database.cemetery.js b/helpers/initializer.database.cemetery.js index 20684876..2e7490f7 100644 --- a/helpers/initializer.database.cemetery.js +++ b/helpers/initializer.database.cemetery.js @@ -18,7 +18,7 @@ const session = { } } }; -const initializeCemeteryDatabase = () => { +function initializeCemeteryDatabase() { debug("Checking for " + databasePath + "..."); const databaseInitialized = initializeDatabase(); if (!databaseInitialized) { @@ -207,5 +207,5 @@ const initializeCemeteryDatabase = () => { feeCategory: "Additional Services", orderNumber: 5 }, session); -}; +} initializeCemeteryDatabase(); diff --git a/helpers/initializer.database.cemetery.ts b/helpers/initializer.database.cemetery.ts index afd27750..1abfb874 100644 --- a/helpers/initializer.database.cemetery.ts +++ b/helpers/initializer.database.cemetery.ts @@ -30,11 +30,10 @@ const session: PartialSession = { } }; -const initializeCemeteryDatabase = () => { +function initializeCemeteryDatabase() { /* * Ensure database does not already exist */ - debug("Checking for " + databasePath + "..."); const databaseInitialized = initializeDatabase(); @@ -52,7 +51,6 @@ const initializeCemeteryDatabase = () => { /* * Lot Types */ - addLotType( { lotType: "Casket Grave", @@ -104,7 +102,6 @@ const initializeCemeteryDatabase = () => { /* * Lot Statuses */ - addLotStatus( { lotStatus: "Available", @@ -132,7 +129,6 @@ const initializeCemeteryDatabase = () => { /* * Lot Occupant Types */ - addLotOccupantType( { lotOccupantType: "Deceased", @@ -168,7 +164,6 @@ const initializeCemeteryDatabase = () => { /* * Occupancy Types */ - addOccupancyType( { occupancyType: "Preneed", @@ -194,7 +189,6 @@ const initializeCemeteryDatabase = () => { ); // Death Date - const deathDateField = { occupancyTypeId: intermentOccupancyTypeId, occupancyTypeField: "Death Date", @@ -214,7 +208,6 @@ const initializeCemeteryDatabase = () => { ); // Death Age - const deathAgeField = { occupancyTypeId: intermentOccupancyTypeId, occupancyTypeField: "Death Age", @@ -234,7 +227,6 @@ const initializeCemeteryDatabase = () => { ); // Death Age Period - const deathAgePeriod = { occupancyTypeId: intermentOccupancyTypeId, occupancyTypeField: "Death Age Period", @@ -254,7 +246,6 @@ const initializeCemeteryDatabase = () => { ); // Death Place - const deathPlace = { occupancyTypeId: intermentOccupancyTypeId, occupancyTypeField: "Death Place", @@ -274,7 +265,6 @@ const initializeCemeteryDatabase = () => { ); // Funeral Home - const funeralHome = { occupancyTypeId: intermentOccupancyTypeId, occupancyTypeField: "Funeral Home", @@ -294,7 +284,6 @@ const initializeCemeteryDatabase = () => { ); // Funeral Date - const funeralDate = { occupancyTypeId: intermentOccupancyTypeId, occupancyTypeField: "Funeral Date", @@ -314,7 +303,6 @@ const initializeCemeteryDatabase = () => { ); // Container Type - const containerType = { occupancyTypeId: intermentOccupancyTypeId, occupancyTypeField: "Container Type", @@ -334,7 +322,6 @@ const initializeCemeteryDatabase = () => { ); // Committal Type - const committalType = { occupancyTypeId: intermentOccupancyTypeId, occupancyTypeField: "Committal Type", @@ -356,7 +343,6 @@ const initializeCemeteryDatabase = () => { /* * Fee Categories */ - addFeeCategory( { feeCategory: "Interment Rights", @@ -396,6 +382,6 @@ const initializeCemeteryDatabase = () => { }, session ); -}; +} initializeCemeteryDatabase(); diff --git a/helpers/initializer.database.d.ts b/helpers/initializer.database.d.ts index 3ca99bdf..cab8f5f1 100644 --- a/helpers/initializer.database.d.ts +++ b/helpers/initializer.database.d.ts @@ -1 +1 @@ -export declare const initializeDatabase: () => boolean; +export declare function initializeDatabase(): boolean; diff --git a/helpers/initializer.database.js b/helpers/initializer.database.js index 56150436..dcf7f3ed 100644 --- a/helpers/initializer.database.js +++ b/helpers/initializer.database.js @@ -2,13 +2,13 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../data/databasePaths.js"; import debug from "debug"; const debugSQL = debug("lot-occupancy-system:databaseInitializer"); -const recordColumns = " recordCreate_userName varchar(30) not null," + - " recordCreate_timeMillis integer not null," + - " recordUpdate_userName varchar(30) not null," + - " recordUpdate_timeMillis integer not null," + - " recordDelete_userName varchar(30)," + - " recordDelete_timeMillis integer"; -export const initializeDatabase = () => { +const recordColumns = ` recordCreate_userName varchar(30) not null, + recordCreate_timeMillis integer not null, + recordUpdate_userName varchar(30) not null, + recordUpdate_timeMillis integer not null, + recordDelete_userName varchar(30), + recordDelete_timeMillis integer`; +export function initializeDatabase() { const lotOccupancyDB = sqlite(databasePath); const row = lotOccupancyDB .prepare("select name from sqlite_master where type = 'table' and name = 'WorkOrderMilestones'") @@ -402,4 +402,4 @@ export const initializeDatabase = () => { return true; } return false; -}; +} diff --git a/helpers/initializer.database.ts b/helpers/initializer.database.ts index 8a49e1cb..8ab09d73 100644 --- a/helpers/initializer.database.ts +++ b/helpers/initializer.database.ts @@ -5,15 +5,14 @@ import { lotOccupancyDB as databasePath } from "../data/databasePaths.js"; import debug from "debug"; const debugSQL = debug("lot-occupancy-system:databaseInitializer"); -const recordColumns = - " recordCreate_userName varchar(30) not null," + - " recordCreate_timeMillis integer not null," + - " recordUpdate_userName varchar(30) not null," + - " recordUpdate_timeMillis integer not null," + - " recordDelete_userName varchar(30)," + - " recordDelete_timeMillis integer"; +const recordColumns = ` recordCreate_userName varchar(30) not null, + recordCreate_timeMillis integer not null, + recordUpdate_userName varchar(30) not null, + recordUpdate_timeMillis integer not null, + recordDelete_userName varchar(30), + recordDelete_timeMillis integer`; -export const initializeDatabase = (): boolean => { +export function initializeDatabase(): boolean { const lotOccupancyDB = sqlite(databasePath); const row = lotOccupancyDB @@ -26,7 +25,6 @@ export const initializeDatabase = (): boolean => { debugSQL("Creating " + databasePath); // Lot Types - lotOccupancyDB .prepare( "create table if not exists LotTypes (" + @@ -90,7 +88,6 @@ export const initializeDatabase = (): boolean => { .run(); // Maps and Lots - lotOccupancyDB .prepare( "create table if not exists Maps (" + @@ -169,7 +166,6 @@ export const initializeDatabase = (): boolean => { .run(); // Occupancies - lotOccupancyDB .prepare( "create table if not exists OccupancyTypes (" + @@ -332,7 +328,6 @@ export const initializeDatabase = (): boolean => { .run(); // Occupancy Fees and Transactions - lotOccupancyDB .prepare( "create table if not exists FeeCategories (" + @@ -420,7 +415,6 @@ export const initializeDatabase = (): boolean => { .run(); // Work Orders - lotOccupancyDB .prepare( "create table if not exists WorkOrderTypes (" + @@ -541,4 +535,4 @@ export const initializeDatabase = (): boolean => { } return false; -}; +} diff --git a/helpers/lotOccupancyDB/getOccupancyTypePrints.d.ts b/helpers/lotOccupancyDB/getOccupancyTypePrints.d.ts index f329b610..87ff8649 100644 --- a/helpers/lotOccupancyDB/getOccupancyTypePrints.d.ts +++ b/helpers/lotOccupancyDB/getOccupancyTypePrints.d.ts @@ -1,3 +1,3 @@ import sqlite from "better-sqlite3"; -export declare const getOccupancyTypePrints: (occupancyTypeId: number, connectedDatabase?: sqlite.Database) => string[]; +export declare function getOccupancyTypePrints(occupancyTypeId: number, connectedDatabase?: sqlite.Database): string[]; export default getOccupancyTypePrints; diff --git a/helpers/lotOccupancyDB/getOccupancyTypePrints.js b/helpers/lotOccupancyDB/getOccupancyTypePrints.js index a036c3fb..c34d56de 100644 --- a/helpers/lotOccupancyDB/getOccupancyTypePrints.js +++ b/helpers/lotOccupancyDB/getOccupancyTypePrints.js @@ -8,16 +8,16 @@ const userFunction_configContainsPrintEJS = (printEJS) => { } return 0; }; -export const getOccupancyTypePrints = (occupancyTypeId, connectedDatabase) => { +export function getOccupancyTypePrints(occupancyTypeId, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath); database.function("userFn_configContainsPrintEJS", userFunction_configContainsPrintEJS); const results = database - .prepare("select printEJS, orderNumber" + - " from OccupancyTypePrints" + - " where recordDelete_timeMillis is null" + - " and occupancyTypeId = ?" + - " and userFn_configContainsPrintEJS(printEJS) = 1" + - " order by orderNumber, printEJS") + .prepare(`select printEJS, orderNumber + from OccupancyTypePrints + where recordDelete_timeMillis is null + and occupancyTypeId = ? + and userFn_configContainsPrintEJS(printEJS) = 1 + order by orderNumber, printEJS`) .all(occupancyTypeId); let expectedOrderNumber = -1; const prints = []; @@ -25,10 +25,10 @@ export const getOccupancyTypePrints = (occupancyTypeId, connectedDatabase) => { expectedOrderNumber += 1; if (result.orderNumber !== expectedOrderNumber) { database - .prepare("update OccupancyTypePrints" + - " set orderNumber = ?" + - " where occupancyTypeId = ?" + - " and printEJS = ?") + .prepare(`update OccupancyTypePrints + set orderNumber = ? + where occupancyTypeId = ? + and printEJS = ?`) .run(expectedOrderNumber, occupancyTypeId, result.printEJS); } prints.push(result.printEJS); @@ -37,5 +37,5 @@ export const getOccupancyTypePrints = (occupancyTypeId, connectedDatabase) => { database.close(); } return prints; -}; +} export default getOccupancyTypePrints; diff --git a/helpers/lotOccupancyDB/getOccupancyTypePrints.ts b/helpers/lotOccupancyDB/getOccupancyTypePrints.ts index 4989802a..6e3e5d37 100644 --- a/helpers/lotOccupancyDB/getOccupancyTypePrints.ts +++ b/helpers/lotOccupancyDB/getOccupancyTypePrints.ts @@ -13,22 +13,22 @@ const userFunction_configContainsPrintEJS = (printEJS: string): number => { return 0; }; -export const getOccupancyTypePrints = ( +export function getOccupancyTypePrints( occupancyTypeId: number, connectedDatabase?: sqlite.Database -): string[] => { +): string[] { const database = connectedDatabase || sqlite(databasePath); database.function("userFn_configContainsPrintEJS", userFunction_configContainsPrintEJS); const results: { printEJS: string; orderNumber: number }[] = database .prepare( - "select printEJS, orderNumber" + - " from OccupancyTypePrints" + - " where recordDelete_timeMillis is null" + - " and occupancyTypeId = ?" + - " and userFn_configContainsPrintEJS(printEJS) = 1" + - " order by orderNumber, printEJS" + `select printEJS, orderNumber + from OccupancyTypePrints + where recordDelete_timeMillis is null + and occupancyTypeId = ? + and userFn_configContainsPrintEJS(printEJS) = 1 + order by orderNumber, printEJS` ) .all(occupancyTypeId); @@ -42,10 +42,10 @@ export const getOccupancyTypePrints = ( if (result.orderNumber !== expectedOrderNumber) { database .prepare( - "update OccupancyTypePrints" + - " set orderNumber = ?" + - " where occupancyTypeId = ?" + - " and printEJS = ?" + `update OccupancyTypePrints + set orderNumber = ? + where occupancyTypeId = ? + and printEJS = ?` ) .run(expectedOrderNumber, occupancyTypeId, result.printEJS); } @@ -58,6 +58,6 @@ export const getOccupancyTypePrints = ( } return prints; -}; +} export default getOccupancyTypePrints; diff --git a/helpers/lotOccupancyDB/getOccupancyTypes.d.ts b/helpers/lotOccupancyDB/getOccupancyTypes.d.ts index 80bec04a..2cc82d2d 100644 --- a/helpers/lotOccupancyDB/getOccupancyTypes.d.ts +++ b/helpers/lotOccupancyDB/getOccupancyTypes.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const getOccupancyTypes: () => recordTypes.OccupancyType[]; +export declare function getOccupancyTypes(): recordTypes.OccupancyType[]; export default getOccupancyTypes; diff --git a/helpers/lotOccupancyDB/getOccupancyTypes.js b/helpers/lotOccupancyDB/getOccupancyTypes.js index 35761c61..ce0631fe 100644 --- a/helpers/lotOccupancyDB/getOccupancyTypes.js +++ b/helpers/lotOccupancyDB/getOccupancyTypes.js @@ -2,20 +2,20 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { getOccupancyTypeFields } from "./getOccupancyTypeFields.js"; import { getOccupancyTypePrints } from "./getOccupancyTypePrints.js"; -export const getOccupancyTypes = () => { +export function getOccupancyTypes() { const database = sqlite(databasePath); const occupancyTypes = database - .prepare("select occupancyTypeId, occupancyType, orderNumber" + - " from OccupancyTypes" + - " where recordDelete_timeMillis is null" + - " order by orderNumber, occupancyType") + .prepare(`select occupancyTypeId, occupancyType, orderNumber + from OccupancyTypes + where recordDelete_timeMillis is null + order by orderNumber, occupancyType`) .all(); let expectedTypeOrderNumber = -1; for (const occupancyType of occupancyTypes) { expectedTypeOrderNumber += 1; if (occupancyType.orderNumber !== expectedTypeOrderNumber) { database - .prepare("update OccupancyTypes" + " set orderNumber = ?" + " where occupancyTypeId = ?") + .prepare("update OccupancyTypes set orderNumber = ? where occupancyTypeId = ?") .run(expectedTypeOrderNumber, occupancyType.occupancyTypeId); occupancyType.orderNumber = expectedTypeOrderNumber; } @@ -26,9 +26,7 @@ export const getOccupancyTypes = () => { 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; } @@ -36,5 +34,5 @@ export const getOccupancyTypes = () => { } database.close(); return occupancyTypes; -}; +} export default getOccupancyTypes; diff --git a/helpers/lotOccupancyDB/getOccupancyTypes.ts b/helpers/lotOccupancyDB/getOccupancyTypes.ts index bc2e8a67..53bcd1de 100644 --- a/helpers/lotOccupancyDB/getOccupancyTypes.ts +++ b/helpers/lotOccupancyDB/getOccupancyTypes.ts @@ -7,15 +7,15 @@ import { getOccupancyTypePrints } from "./getOccupancyTypePrints.js"; import type * as recordTypes from "../../types/recordTypes"; -export const getOccupancyTypes = (): recordTypes.OccupancyType[] => { +export function getOccupancyTypes(): recordTypes.OccupancyType[] { const database = sqlite(databasePath); const occupancyTypes: recordTypes.OccupancyType[] = database .prepare( - "select occupancyTypeId, occupancyType, orderNumber" + - " from OccupancyTypes" + - " where recordDelete_timeMillis is null" + - " order by orderNumber, occupancyType" + `select occupancyTypeId, occupancyType, orderNumber + from OccupancyTypes + where recordDelete_timeMillis is null + order by orderNumber, occupancyType` ) .all(); @@ -26,9 +26,7 @@ export const getOccupancyTypes = (): recordTypes.OccupancyType[] => { if (occupancyType.orderNumber !== expectedTypeOrderNumber) { database - .prepare( - "update OccupancyTypes" + " set orderNumber = ?" + " where occupancyTypeId = ?" - ) + .prepare("update OccupancyTypes set orderNumber = ? where occupancyTypeId = ?") .run(expectedTypeOrderNumber, occupancyType.occupancyTypeId); occupancyType.orderNumber = expectedTypeOrderNumber; @@ -38,7 +36,7 @@ export const getOccupancyTypes = (): recordTypes.OccupancyType[] => { occupancyType.occupancyTypeId, database ); - + occupancyType.occupancyTypePrints = getOccupancyTypePrints( occupancyType.occupancyTypeId, database @@ -52,9 +50,7 @@ export const getOccupancyTypes = (): recordTypes.OccupancyType[] => { if (occupancyTypeField.orderNumber !== expectedFieldOrderNumber) { database .prepare( - "update OccupancyTypeFields" + - " set orderNumber = ?" + - " where occupancyTypeFieldId = ?" + `update OccupancyTypeFields set orderNumber = ? where occupancyTypeFieldId = ?` ) .run(expectedFieldOrderNumber, occupancyTypeField.occupancyTypeFieldId); @@ -66,6 +62,6 @@ export const getOccupancyTypes = (): recordTypes.OccupancyType[] => { database.close(); return occupancyTypes; -}; +} export default getOccupancyTypes; diff --git a/helpers/lotOccupancyDB/getPastLotOccupancyOccupants.d.ts b/helpers/lotOccupancyDB/getPastLotOccupancyOccupants.d.ts index be605efa..1810f838 100644 --- a/helpers/lotOccupancyDB/getPastLotOccupancyOccupants.d.ts +++ b/helpers/lotOccupancyDB/getPastLotOccupancyOccupants.d.ts @@ -5,5 +5,5 @@ interface GetPastLotOccupancyOccupantsFilters { interface GetPastLotOccupancyOccupantsOptions { limit: number; } -export declare const getPastLotOccupancyOccupants: (filters: GetPastLotOccupancyOccupantsFilters, options: GetPastLotOccupancyOccupantsOptions) => recordTypes.LotOccupancyOccupant[]; +export declare function getPastLotOccupancyOccupants(filters: GetPastLotOccupancyOccupantsFilters, options: GetPastLotOccupancyOccupantsOptions): recordTypes.LotOccupancyOccupant[]; export default getPastLotOccupancyOccupants; diff --git a/helpers/lotOccupancyDB/getPastLotOccupancyOccupants.js b/helpers/lotOccupancyDB/getPastLotOccupancyOccupants.js index 1161a15f..12c1831b 100644 --- a/helpers/lotOccupancyDB/getPastLotOccupancyOccupants.js +++ b/helpers/lotOccupancyDB/getPastLotOccupancyOccupants.js @@ -1,6 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const getPastLotOccupancyOccupants = (filters, options) => { +export function getPastLotOccupancyOccupants(filters, options) { const database = sqlite(databasePath, { readonly: true }); @@ -36,5 +36,5 @@ export const getPastLotOccupancyOccupants = (filters, options) => { .all(sqlParameters); database.close(); return lotOccupancyOccupants; -}; +} export default getPastLotOccupancyOccupants; diff --git a/helpers/lotOccupancyDB/getPastLotOccupancyOccupants.ts b/helpers/lotOccupancyDB/getPastLotOccupancyOccupants.ts index b1fdbd0c..1cca988f 100644 --- a/helpers/lotOccupancyDB/getPastLotOccupancyOccupants.ts +++ b/helpers/lotOccupancyDB/getPastLotOccupancyOccupants.ts @@ -12,10 +12,10 @@ interface GetPastLotOccupancyOccupantsOptions { limit: number; } -export const getPastLotOccupancyOccupants = ( +export function getPastLotOccupancyOccupants( filters: GetPastLotOccupancyOccupantsFilters, options: GetPastLotOccupancyOccupantsOptions -): recordTypes.LotOccupancyOccupant[] => { +): recordTypes.LotOccupancyOccupant[] { const database = sqlite(databasePath, { readonly: true }); @@ -67,6 +67,6 @@ export const getPastLotOccupancyOccupants = ( database.close(); return lotOccupancyOccupants; -}; +} export default getPastLotOccupancyOccupants; diff --git a/helpers/lotOccupancyDB/getPreviousLotId.d.ts b/helpers/lotOccupancyDB/getPreviousLotId.d.ts index 5eaeab8c..4b423d0f 100644 --- a/helpers/lotOccupancyDB/getPreviousLotId.d.ts +++ b/helpers/lotOccupancyDB/getPreviousLotId.d.ts @@ -1,2 +1,2 @@ -export declare const getPreviousLotId: (lotId: number | string) => number | undefined; +export declare function getPreviousLotId(lotId: number | string): number | undefined; export default getPreviousLotId; diff --git a/helpers/lotOccupancyDB/getPreviousLotId.js b/helpers/lotOccupancyDB/getPreviousLotId.js index 7f243a21..52dd1657 100644 --- a/helpers/lotOccupancyDB/getPreviousLotId.js +++ b/helpers/lotOccupancyDB/getPreviousLotId.js @@ -1,22 +1,22 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import * as configFunctions from "../functions.config.js"; -export const getPreviousLotId = (lotId) => { +export function getPreviousLotId(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) desc" + - " 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) desc + limit 1`) .get(lotId); database.close(); if (result) { return result.lotId; } return undefined; -}; +} export default getPreviousLotId; diff --git a/helpers/lotOccupancyDB/getPreviousLotId.ts b/helpers/lotOccupancyDB/getPreviousLotId.ts index d0fff517..3d8d079d 100644 --- a/helpers/lotOccupancyDB/getPreviousLotId.ts +++ b/helpers/lotOccupancyDB/getPreviousLotId.ts @@ -4,7 +4,7 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import * as configFunctions from "../functions.config.js"; -export const getPreviousLotId = (lotId: number | string): number | undefined => { +export function getPreviousLotId(lotId: number | string): number | undefined { const database = sqlite(databasePath, { readonly: true }); @@ -18,11 +18,11 @@ export const getPreviousLotId = (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) desc" + - " 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) desc + limit 1` ) .get(lotId); @@ -33,6 +33,6 @@ export const getPreviousLotId = (lotId: number | string): number | undefined => } return undefined; -}; +} export default getPreviousLotId; diff --git a/helpers/lotOccupancyDB/getReportData.d.ts b/helpers/lotOccupancyDB/getReportData.d.ts index b9d7ae7f..a9aabfaa 100644 --- a/helpers/lotOccupancyDB/getReportData.d.ts +++ b/helpers/lotOccupancyDB/getReportData.d.ts @@ -1,5 +1,5 @@ export interface ReportParameters { [parameterName: string]: string | number; } -export declare const getReportData: (reportName: string, reportParameters?: ReportParameters) => unknown[] | undefined; +export declare function getReportData(reportName: string, reportParameters?: ReportParameters): unknown[] | undefined; export default getReportData; diff --git a/helpers/lotOccupancyDB/getReportData.js b/helpers/lotOccupancyDB/getReportData.js index 2c9bf058..cb3b4943 100644 --- a/helpers/lotOccupancyDB/getReportData.js +++ b/helpers/lotOccupancyDB/getReportData.js @@ -22,7 +22,7 @@ const lotOccupancyIdAlias = occupancyCamelCase + "Id"; const occupancyTypeAlias = occupancyCamelCase + "Type"; const occupancyStartDateAlias = occupancyCamelCase + "StartDate"; const occupancyEndDateAlias = occupancyCamelCase + "EndDate"; -export const getReportData = (reportName, reportParameters) => { +export function getReportData(reportName, reportParameters) { let sql; const sqlParameters = []; switch (reportName) { @@ -276,5 +276,5 @@ export const getReportData = (reportName, reportParameters) => { const rows = database.prepare(sql).all(sqlParameters); database.close(); return rows; -}; +} export default getReportData; diff --git a/helpers/lotOccupancyDB/getReportData.ts b/helpers/lotOccupancyDB/getReportData.ts index 4a04357a..598ecb81 100644 --- a/helpers/lotOccupancyDB/getReportData.ts +++ b/helpers/lotOccupancyDB/getReportData.ts @@ -35,10 +35,10 @@ const occupancyTypeAlias = occupancyCamelCase + "Type"; const occupancyStartDateAlias = occupancyCamelCase + "StartDate"; const occupancyEndDateAlias = occupancyCamelCase + "EndDate"; -export const getReportData = ( +export function getReportData( reportName: string, reportParameters?: ReportParameters -): unknown[] | undefined => { +): unknown[] | undefined { let sql: string; const sqlParameters: unknown[] = []; @@ -343,6 +343,6 @@ export const getReportData = ( database.close(); return rows; -}; +} export default getReportData; diff --git a/helpers/lotOccupancyDB/getWorkOrder.d.ts b/helpers/lotOccupancyDB/getWorkOrder.d.ts index 072c87e8..8f5b3020 100644 --- a/helpers/lotOccupancyDB/getWorkOrder.d.ts +++ b/helpers/lotOccupancyDB/getWorkOrder.d.ts @@ -5,6 +5,6 @@ interface WorkOrderOptions { includeComments: boolean; includeMilestones: boolean; } -export declare const getWorkOrderByWorkOrderNumber: (workOrderNumber: string) => recordTypes.WorkOrder; -export declare const getWorkOrder: (workOrderId: number | string, options: WorkOrderOptions, connectedDatabase?: sqlite.Database) => recordTypes.WorkOrder; +export declare function getWorkOrderByWorkOrderNumber(workOrderNumber: string): recordTypes.WorkOrder; +export declare function getWorkOrder(workOrderId: number | string, options: WorkOrderOptions, connectedDatabase?: sqlite.Database): recordTypes.WorkOrder; export default getWorkOrder; diff --git a/helpers/lotOccupancyDB/getWorkOrder.js b/helpers/lotOccupancyDB/getWorkOrder.js index 601966f8..f8d54777 100644 --- a/helpers/lotOccupancyDB/getWorkOrder.js +++ b/helpers/lotOccupancyDB/getWorkOrder.js @@ -5,16 +5,16 @@ import { getLots } from "./getLots.js"; import { getLotOccupancies } from "./getLotOccupancies.js"; import { getWorkOrderComments } from "./getWorkOrderComments.js"; import { getWorkOrderMilestones } from "./getWorkOrderMilestones.js"; -const baseSQL = "select w.workOrderId," + - " w.workOrderTypeId, t.workOrderType," + - " w.workOrderNumber, w.workOrderDescription," + - " w.workOrderOpenDate, userFn_dateIntegerToString(w.workOrderOpenDate) as workOrderOpenDateString," + - " w.workOrderCloseDate, userFn_dateIntegerToString(w.workOrderCloseDate) as workOrderCloseDateString," + - " w.recordCreate_timeMillis, w.recordUpdate_timeMillis" + - " from WorkOrders w" + - " left join WorkOrderTypes t on w.workOrderTypeId = t.workOrderTypeId" + - " where w.recordDelete_timeMillis is null"; -const _getWorkOrder = (sql, workOrderId_or_workOrderNumber, options, connectedDatabase) => { +const baseSQL = `select w.workOrderId, + w.workOrderTypeId, t.workOrderType, + w.workOrderNumber, w.workOrderDescription, + w.workOrderOpenDate, userFn_dateIntegerToString(w.workOrderOpenDate) as workOrderOpenDateString, + w.workOrderCloseDate, userFn_dateIntegerToString(w.workOrderCloseDate) as workOrderCloseDateString, + w.recordCreate_timeMillis, w.recordUpdate_timeMillis + from WorkOrders w + left join WorkOrderTypes t on w.workOrderTypeId = t.workOrderTypeId + where w.recordDelete_timeMillis is null`; +function _getWorkOrder(sql, workOrderId_or_workOrderNumber, options, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath, { readonly: true @@ -55,15 +55,15 @@ const _getWorkOrder = (sql, workOrderId_or_workOrderNumber, options, connectedDa database.close(); } return workOrder; -}; -export const getWorkOrderByWorkOrderNumber = (workOrderNumber) => { +} +export function getWorkOrderByWorkOrderNumber(workOrderNumber) { return _getWorkOrder(baseSQL + " and w.workOrderNumber = ?", workOrderNumber, { includeLotsAndLotOccupancies: true, includeComments: true, includeMilestones: true }); -}; -export const getWorkOrder = (workOrderId, options, connectedDatabase) => { +} +export function getWorkOrder(workOrderId, options, connectedDatabase) { return _getWorkOrder(baseSQL + " and w.workOrderId = ?", workOrderId, options, connectedDatabase); -}; +} export default getWorkOrder; diff --git a/helpers/lotOccupancyDB/getWorkOrder.ts b/helpers/lotOccupancyDB/getWorkOrder.ts index 01dc780f..656d6544 100644 --- a/helpers/lotOccupancyDB/getWorkOrder.ts +++ b/helpers/lotOccupancyDB/getWorkOrder.ts @@ -20,23 +20,22 @@ interface WorkOrderOptions { includeMilestones: boolean; } -const baseSQL = - "select w.workOrderId," + - " w.workOrderTypeId, t.workOrderType," + - " w.workOrderNumber, w.workOrderDescription," + - " w.workOrderOpenDate, userFn_dateIntegerToString(w.workOrderOpenDate) as workOrderOpenDateString," + - " w.workOrderCloseDate, userFn_dateIntegerToString(w.workOrderCloseDate) as workOrderCloseDateString," + - " w.recordCreate_timeMillis, w.recordUpdate_timeMillis" + - " from WorkOrders w" + - " left join WorkOrderTypes t on w.workOrderTypeId = t.workOrderTypeId" + - " where w.recordDelete_timeMillis is null"; +const baseSQL = `select w.workOrderId, + w.workOrderTypeId, t.workOrderType, + w.workOrderNumber, w.workOrderDescription, + w.workOrderOpenDate, userFn_dateIntegerToString(w.workOrderOpenDate) as workOrderOpenDateString, + w.workOrderCloseDate, userFn_dateIntegerToString(w.workOrderCloseDate) as workOrderCloseDateString, + w.recordCreate_timeMillis, w.recordUpdate_timeMillis + from WorkOrders w + left join WorkOrderTypes t on w.workOrderTypeId = t.workOrderTypeId + where w.recordDelete_timeMillis is null`; -const _getWorkOrder = ( +function _getWorkOrder( sql: string, workOrderId_or_workOrderNumber: number | string, options: WorkOrderOptions, connectedDatabase?: sqlite.Database -): recordTypes.WorkOrder => { +): recordTypes.WorkOrder { const database = connectedDatabase || sqlite(databasePath, { @@ -101,33 +100,27 @@ const _getWorkOrder = ( } return workOrder; -}; +} -export const getWorkOrderByWorkOrderNumber = ( - workOrderNumber: string -): recordTypes.WorkOrder => { - return _getWorkOrder( - baseSQL + " and w.workOrderNumber = ?", - workOrderNumber, - { - includeLotsAndLotOccupancies: true, - includeComments: true, - includeMilestones: true - } - ); -}; +export function getWorkOrderByWorkOrderNumber(workOrderNumber: string): recordTypes.WorkOrder { + return _getWorkOrder(baseSQL + " and w.workOrderNumber = ?", workOrderNumber, { + includeLotsAndLotOccupancies: true, + includeComments: true, + includeMilestones: true + }); +} -export const getWorkOrder = ( +export function getWorkOrder( workOrderId: number | string, options: WorkOrderOptions, connectedDatabase?: sqlite.Database -): recordTypes.WorkOrder => { +): recordTypes.WorkOrder { return _getWorkOrder( baseSQL + " and w.workOrderId = ?", workOrderId, options, connectedDatabase ); -}; +} export default getWorkOrder; diff --git a/helpers/lotOccupancyDB/getWorkOrderComments.d.ts b/helpers/lotOccupancyDB/getWorkOrderComments.d.ts index 4caea636..03a3e6d7 100644 --- a/helpers/lotOccupancyDB/getWorkOrderComments.d.ts +++ b/helpers/lotOccupancyDB/getWorkOrderComments.d.ts @@ -1,4 +1,4 @@ import sqlite from "better-sqlite3"; import type * as recordTypes from "../../types/recordTypes"; -export declare const getWorkOrderComments: (workOrderId: number | string, connectedDatabase?: sqlite.Database) => recordTypes.WorkOrderComment[]; +export declare function getWorkOrderComments(workOrderId: number | string, connectedDatabase?: sqlite.Database): recordTypes.WorkOrderComment[]; export default getWorkOrderComments; diff --git a/helpers/lotOccupancyDB/getWorkOrderComments.js b/helpers/lotOccupancyDB/getWorkOrderComments.js index aea1dfb8..0daa1fd3 100644 --- a/helpers/lotOccupancyDB/getWorkOrderComments.js +++ b/helpers/lotOccupancyDB/getWorkOrderComments.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 getWorkOrderComments = (workOrderId, connectedDatabase) => { +export function getWorkOrderComments(workOrderId, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath, { readonly: true @@ -9,19 +9,19 @@ export const getWorkOrderComments = (workOrderId, connectedDatabase) => { database.function("userFn_dateIntegerToString", dateIntegerToString); database.function("userFn_timeIntegerToString", timeIntegerToString); const workOrderComments = database - .prepare("select workOrderCommentId," + - " workOrderCommentDate, userFn_dateIntegerToString(workOrderCommentDate) as workOrderCommentDateString," + - " workOrderCommentTime, userFn_timeIntegerToString(workOrderCommentTime) as workOrderCommentTimeString," + - " workOrderComment," + - " recordCreate_userName, recordUpdate_userName" + - " from WorkOrderComments" + - " where recordDelete_timeMillis is null" + - " and workOrderId = ?" + - " order by workOrderCommentDate desc, workOrderCommentTime desc, workOrderCommentId desc") + .prepare(`select workOrderCommentId, + workOrderCommentDate, userFn_dateIntegerToString(workOrderCommentDate) as workOrderCommentDateString, + workOrderCommentTime, userFn_timeIntegerToString(workOrderCommentTime) as workOrderCommentTimeString, + workOrderComment, + recordCreate_userName, recordUpdate_userName + from WorkOrderComments + where recordDelete_timeMillis is null + and workOrderId = ? + order by workOrderCommentDate desc, workOrderCommentTime desc, workOrderCommentId desc`) .all(workOrderId); if (!connectedDatabase) { database.close(); } return workOrderComments; -}; +} export default getWorkOrderComments; diff --git a/helpers/lotOccupancyDB/getWorkOrderComments.ts b/helpers/lotOccupancyDB/getWorkOrderComments.ts index a05f85ef..ea063ff4 100644 --- a/helpers/lotOccupancyDB/getWorkOrderComments.ts +++ b/helpers/lotOccupancyDB/getWorkOrderComments.ts @@ -9,10 +9,10 @@ import { import type * as recordTypes from "../../types/recordTypes"; -export const getWorkOrderComments = ( +export function getWorkOrderComments( workOrderId: number | string, connectedDatabase?: sqlite.Database -): recordTypes.WorkOrderComment[] => { +): recordTypes.WorkOrderComment[] { const database = connectedDatabase || sqlite(databasePath, { @@ -24,15 +24,15 @@ export const getWorkOrderComments = ( const workOrderComments = database .prepare( - "select workOrderCommentId," + - " workOrderCommentDate, userFn_dateIntegerToString(workOrderCommentDate) as workOrderCommentDateString," + - " workOrderCommentTime, userFn_timeIntegerToString(workOrderCommentTime) as workOrderCommentTimeString," + - " workOrderComment," + - " recordCreate_userName, recordUpdate_userName" + - " from WorkOrderComments" + - " where recordDelete_timeMillis is null" + - " and workOrderId = ?" + - " order by workOrderCommentDate desc, workOrderCommentTime desc, workOrderCommentId desc" + `select workOrderCommentId, + workOrderCommentDate, userFn_dateIntegerToString(workOrderCommentDate) as workOrderCommentDateString, + workOrderCommentTime, userFn_timeIntegerToString(workOrderCommentTime) as workOrderCommentTimeString, + workOrderComment, + recordCreate_userName, recordUpdate_userName + from WorkOrderComments + where recordDelete_timeMillis is null + and workOrderId = ? + order by workOrderCommentDate desc, workOrderCommentTime desc, workOrderCommentId desc` ) .all(workOrderId); @@ -41,6 +41,6 @@ export const getWorkOrderComments = ( } return workOrderComments; -}; +} export default getWorkOrderComments; diff --git a/helpers/lotOccupancyDB/getWorkOrderMilestoneTypes.d.ts b/helpers/lotOccupancyDB/getWorkOrderMilestoneTypes.d.ts index a2f64995..f83bf17a 100644 --- a/helpers/lotOccupancyDB/getWorkOrderMilestoneTypes.d.ts +++ b/helpers/lotOccupancyDB/getWorkOrderMilestoneTypes.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const getWorkOrderMilestoneTypes: () => recordTypes.WorkOrderMilestoneType[]; +export declare function getWorkOrderMilestoneTypes(): recordTypes.WorkOrderMilestoneType[]; export default getWorkOrderMilestoneTypes; diff --git a/helpers/lotOccupancyDB/getWorkOrderMilestoneTypes.js b/helpers/lotOccupancyDB/getWorkOrderMilestoneTypes.js index e98da0b3..748ae893 100644 --- a/helpers/lotOccupancyDB/getWorkOrderMilestoneTypes.js +++ b/helpers/lotOccupancyDB/getWorkOrderMilestoneTypes.js @@ -1,20 +1,20 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const getWorkOrderMilestoneTypes = () => { +export function getWorkOrderMilestoneTypes() { const database = sqlite(databasePath); const workOrderMilestoneTypes = database - .prepare("select workOrderMilestoneTypeId, workOrderMilestoneType, orderNumber" + - " from WorkOrderMilestoneTypes" + - " where recordDelete_timeMillis is null" + - " order by orderNumber, workOrderMilestoneType") + .prepare(`select workOrderMilestoneTypeId, workOrderMilestoneType, orderNumber + from WorkOrderMilestoneTypes + where recordDelete_timeMillis is null + order by orderNumber, workOrderMilestoneType`) .all(); let expectedOrderNumber = 0; for (const workOrderMilestoneType of workOrderMilestoneTypes) { if (workOrderMilestoneType.orderNumber !== expectedOrderNumber) { database - .prepare("update WorkOrderMilestoneTypes" + - " set orderNumber = ?" + - " where workOrderMilestoneTypeId = ?") + .prepare(`update WorkOrderMilestoneTypes + set orderNumber = ? + where workOrderMilestoneTypeId = ?`) .run(expectedOrderNumber, workOrderMilestoneType.workOrderMilestoneTypeId); workOrderMilestoneType.orderNumber = expectedOrderNumber; } @@ -22,5 +22,5 @@ export const getWorkOrderMilestoneTypes = () => { } database.close(); return workOrderMilestoneTypes; -}; +} export default getWorkOrderMilestoneTypes; diff --git a/helpers/lotOccupancyDB/getWorkOrderMilestoneTypes.ts b/helpers/lotOccupancyDB/getWorkOrderMilestoneTypes.ts index 24d3c0e8..bcc295a3 100644 --- a/helpers/lotOccupancyDB/getWorkOrderMilestoneTypes.ts +++ b/helpers/lotOccupancyDB/getWorkOrderMilestoneTypes.ts @@ -4,15 +4,15 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const getWorkOrderMilestoneTypes = (): recordTypes.WorkOrderMilestoneType[] => { +export function getWorkOrderMilestoneTypes(): recordTypes.WorkOrderMilestoneType[] { const database = sqlite(databasePath); const workOrderMilestoneTypes: recordTypes.WorkOrderMilestoneType[] = database .prepare( - "select workOrderMilestoneTypeId, workOrderMilestoneType, orderNumber" + - " from WorkOrderMilestoneTypes" + - " where recordDelete_timeMillis is null" + - " order by orderNumber, workOrderMilestoneType" + `select workOrderMilestoneTypeId, workOrderMilestoneType, orderNumber + from WorkOrderMilestoneTypes + where recordDelete_timeMillis is null + order by orderNumber, workOrderMilestoneType` ) .all(); @@ -22,9 +22,9 @@ export const getWorkOrderMilestoneTypes = (): recordTypes.WorkOrderMilestoneType if (workOrderMilestoneType.orderNumber !== expectedOrderNumber) { database .prepare( - "update WorkOrderMilestoneTypes" + - " set orderNumber = ?" + - " where workOrderMilestoneTypeId = ?" + `update WorkOrderMilestoneTypes + set orderNumber = ? + where workOrderMilestoneTypeId = ?` ) .run(expectedOrderNumber, workOrderMilestoneType.workOrderMilestoneTypeId); @@ -37,6 +37,6 @@ export const getWorkOrderMilestoneTypes = (): recordTypes.WorkOrderMilestoneType database.close(); return workOrderMilestoneTypes; -}; +} export default getWorkOrderMilestoneTypes; diff --git a/helpers/lotOccupancyDB/getWorkOrderMilestones.d.ts b/helpers/lotOccupancyDB/getWorkOrderMilestones.d.ts index ae85bfea..c138f23a 100644 --- a/helpers/lotOccupancyDB/getWorkOrderMilestones.d.ts +++ b/helpers/lotOccupancyDB/getWorkOrderMilestones.d.ts @@ -11,5 +11,5 @@ interface WorkOrderMilestoneOptions { includeWorkOrders?: boolean; orderBy: "completion" | "date"; } -export declare const getWorkOrderMilestones: (filters: WorkOrderMilestoneFilters, options: WorkOrderMilestoneOptions, connectedDatabase?: sqlite.Database) => recordTypes.WorkOrderMilestone[]; +export declare function getWorkOrderMilestones(filters: WorkOrderMilestoneFilters, options: WorkOrderMilestoneOptions, connectedDatabase?: sqlite.Database): recordTypes.WorkOrderMilestone[]; export default getWorkOrderMilestones; diff --git a/helpers/lotOccupancyDB/getWorkOrderMilestones.js b/helpers/lotOccupancyDB/getWorkOrderMilestones.js index bb71ac4e..9569d3c0 100644 --- a/helpers/lotOccupancyDB/getWorkOrderMilestones.js +++ b/helpers/lotOccupancyDB/getWorkOrderMilestones.js @@ -5,7 +5,7 @@ import * as configFunctions from "../functions.config.js"; import { getLots } from "./getLots.js"; import { getLotOccupancies } from "./getLotOccupancies.js"; const commaSeparatedNumbersRegex = /^\d+(,\d+)*$/; -const buildWhereClause = (filters) => { +function buildWhereClause(filters) { let sqlWhereClause = " where m.recordDelete_timeMillis is null and w.recordDelete_timeMillis is null"; const sqlParameters = []; if (filters.workOrderId) { @@ -51,8 +51,8 @@ const buildWhereClause = (filters) => { sqlWhereClause, sqlParameters }; -}; -export const getWorkOrderMilestones = (filters, options, connectedDatabase) => { +} +export function getWorkOrderMilestones(filters, options, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath, { readonly: true @@ -122,5 +122,5 @@ export const getWorkOrderMilestones = (filters, options, connectedDatabase) => { database.close(); } return workOrderMilestones; -}; +} export default getWorkOrderMilestones; diff --git a/helpers/lotOccupancyDB/getWorkOrderMilestones.ts b/helpers/lotOccupancyDB/getWorkOrderMilestones.ts index 4e809e2c..e0f4489c 100644 --- a/helpers/lotOccupancyDB/getWorkOrderMilestones.ts +++ b/helpers/lotOccupancyDB/getWorkOrderMilestones.ts @@ -31,9 +31,10 @@ interface WorkOrderMilestoneOptions { const commaSeparatedNumbersRegex = /^\d+(,\d+)*$/; -const buildWhereClause = ( - filters: WorkOrderMilestoneFilters -): { sqlWhereClause: string; sqlParameters: unknown[] } => { +function buildWhereClause(filters: WorkOrderMilestoneFilters): { + sqlWhereClause: string; + sqlParameters: unknown[]; +} { let sqlWhereClause = " where m.recordDelete_timeMillis is null and w.recordDelete_timeMillis is null"; const sqlParameters: unknown[] = []; @@ -102,13 +103,13 @@ const buildWhereClause = ( sqlWhereClause, sqlParameters }; -}; +} -export const getWorkOrderMilestones = ( +export function getWorkOrderMilestones( filters: WorkOrderMilestoneFilters, options: WorkOrderMilestoneOptions, connectedDatabase?: sqlite.Database -): recordTypes.WorkOrderMilestone[] => { +): recordTypes.WorkOrderMilestone[] { const database = connectedDatabase || sqlite(databasePath, { @@ -119,11 +120,9 @@ export const getWorkOrderMilestones = ( database.function("userFn_timeIntegerToString", timeIntegerToString); // Filters - const { sqlWhereClause, sqlParameters } = buildWhereClause(filters); // Order By - let orderByClause = ""; switch (options.orderBy) { @@ -145,7 +144,6 @@ export const getWorkOrderMilestones = ( } // Query - const sql = "select m.workOrderMilestoneId," + " m.workOrderMilestoneTypeId, t.workOrderMilestoneType," + @@ -205,6 +203,6 @@ export const getWorkOrderMilestones = ( } return workOrderMilestones; -}; +} export default getWorkOrderMilestones; diff --git a/helpers/lotOccupancyDB/getWorkOrderTypes.d.ts b/helpers/lotOccupancyDB/getWorkOrderTypes.d.ts index 23e17a3d..5ba8fb73 100644 --- a/helpers/lotOccupancyDB/getWorkOrderTypes.d.ts +++ b/helpers/lotOccupancyDB/getWorkOrderTypes.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const getWorkOrderTypes: () => recordTypes.WorkOrderType[]; +export declare function getWorkOrderTypes(): recordTypes.WorkOrderType[]; export default getWorkOrderTypes; diff --git a/helpers/lotOccupancyDB/getWorkOrderTypes.js b/helpers/lotOccupancyDB/getWorkOrderTypes.js index fda6b98f..de78ae04 100644 --- a/helpers/lotOccupancyDB/getWorkOrderTypes.js +++ b/helpers/lotOccupancyDB/getWorkOrderTypes.js @@ -1,20 +1,18 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const getWorkOrderTypes = () => { +export function getWorkOrderTypes() { const database = sqlite(databasePath); const workOrderTypes = database - .prepare("select workOrderTypeId, workOrderType, orderNumber" + - " from WorkOrderTypes" + - " where recordDelete_timeMillis is null" + - " order by orderNumber, workOrderType") + .prepare(`select workOrderTypeId, workOrderType, orderNumber + from WorkOrderTypes + where recordDelete_timeMillis is null + order by orderNumber, workOrderType`) .all(); let expectedOrderNumber = 0; for (const workOrderType of workOrderTypes) { if (workOrderType.orderNumber !== expectedOrderNumber) { database - .prepare("update WorkOrderTypes" + - " set orderNumber = ?" + - " where workOrderTypeId = ?") + .prepare(`update WorkOrderTypes set orderNumber = ? where workOrderTypeId = ?`) .run(expectedOrderNumber, workOrderType.workOrderTypeId); workOrderType.orderNumber = expectedOrderNumber; } @@ -22,5 +20,5 @@ export const getWorkOrderTypes = () => { } database.close(); return workOrderTypes; -}; +} export default getWorkOrderTypes; diff --git a/helpers/lotOccupancyDB/getWorkOrderTypes.ts b/helpers/lotOccupancyDB/getWorkOrderTypes.ts index e28bdfee..b3bc5246 100644 --- a/helpers/lotOccupancyDB/getWorkOrderTypes.ts +++ b/helpers/lotOccupancyDB/getWorkOrderTypes.ts @@ -4,15 +4,15 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const getWorkOrderTypes = (): recordTypes.WorkOrderType[] => { +export function getWorkOrderTypes(): recordTypes.WorkOrderType[] { const database = sqlite(databasePath); const workOrderTypes: recordTypes.WorkOrderType[] = database .prepare( - "select workOrderTypeId, workOrderType, orderNumber" + - " from WorkOrderTypes" + - " where recordDelete_timeMillis is null" + - " order by orderNumber, workOrderType" + `select workOrderTypeId, workOrderType, orderNumber + from WorkOrderTypes + where recordDelete_timeMillis is null + order by orderNumber, workOrderType` ) .all(); @@ -21,11 +21,7 @@ export const getWorkOrderTypes = (): recordTypes.WorkOrderType[] => { for (const workOrderType of workOrderTypes) { if (workOrderType.orderNumber !== expectedOrderNumber) { database - .prepare( - "update WorkOrderTypes" + - " set orderNumber = ?" + - " where workOrderTypeId = ?" - ) + .prepare(`update WorkOrderTypes set orderNumber = ? where workOrderTypeId = ?`) .run(expectedOrderNumber, workOrderType.workOrderTypeId); workOrderType.orderNumber = expectedOrderNumber; @@ -37,6 +33,6 @@ export const getWorkOrderTypes = (): recordTypes.WorkOrderType[] => { database.close(); return workOrderTypes; -}; +} export default getWorkOrderTypes; diff --git a/helpers/lotOccupancyDB/getWorkOrders.d.ts b/helpers/lotOccupancyDB/getWorkOrders.d.ts index c2076e91..d34da4be 100644 --- a/helpers/lotOccupancyDB/getWorkOrders.d.ts +++ b/helpers/lotOccupancyDB/getWorkOrders.d.ts @@ -15,7 +15,7 @@ interface GetWorkOrdersOptions { includeComments?: boolean; includeMilestones?: boolean; } -export declare const getWorkOrders: (filters: GetWorkOrdersFilters, options?: GetWorkOrdersOptions, connectedDatabase?: sqlite.Database) => { +export declare function getWorkOrders(filters: GetWorkOrdersFilters, options?: GetWorkOrdersOptions, connectedDatabase?: sqlite.Database): { count: number; workOrders: recordTypes.WorkOrder[]; }; diff --git a/helpers/lotOccupancyDB/getWorkOrders.js b/helpers/lotOccupancyDB/getWorkOrders.js index 0b1bb5ea..f075691f 100644 --- a/helpers/lotOccupancyDB/getWorkOrders.js +++ b/helpers/lotOccupancyDB/getWorkOrders.js @@ -6,7 +6,7 @@ import { getLots } from "./getLots.js"; import { getLotOccupancies } from "./getLotOccupancies.js"; import { getWorkOrderMilestones } from "./getWorkOrderMilestones.js"; import { getLotNameWhereClause, getOccupantNameWhereClause } from "../functions.sqlFilters.js"; -const buildWhereClause = (filters) => { +function buildWhereClause(filters) { let sqlWhereClause = " where w.recordDelete_timeMillis is null"; const sqlParameters = []; if (filters.workOrderTypeId) { @@ -55,8 +55,8 @@ const buildWhereClause = (filters) => { sqlWhereClause, sqlParameters }; -}; -export const getWorkOrders = (filters, options, connectedDatabase) => { +} +export function getWorkOrders(filters, options, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath, { readonly: true @@ -128,5 +128,5 @@ export const getWorkOrders = (filters, options, connectedDatabase) => { count, workOrders }; -}; +} export default getWorkOrders; diff --git a/helpers/lotOccupancyDB/getWorkOrders.ts b/helpers/lotOccupancyDB/getWorkOrders.ts index b1c2b5a6..0ee0f23c 100644 --- a/helpers/lotOccupancyDB/getWorkOrders.ts +++ b/helpers/lotOccupancyDB/getWorkOrders.ts @@ -32,9 +32,10 @@ interface GetWorkOrdersOptions { includeMilestones?: boolean; } -const buildWhereClause = ( - filters: GetWorkOrdersFilters -): { sqlWhereClause: string; sqlParameters: unknown[] } => { +function buildWhereClause(filters: GetWorkOrdersFilters): { + sqlWhereClause: string; + sqlParameters: unknown[]; +} { let sqlWhereClause = " where w.recordDelete_timeMillis is null"; const sqlParameters: unknown[] = []; @@ -89,16 +90,16 @@ const buildWhereClause = ( sqlWhereClause, sqlParameters }; -}; +} -export const getWorkOrders = ( +export function getWorkOrders( filters: GetWorkOrdersFilters, options?: GetWorkOrdersOptions, connectedDatabase?: sqlite.Database ): { count: number; workOrders: recordTypes.WorkOrder[]; -} => { +} { const database = connectedDatabase || sqlite(databasePath, { @@ -201,6 +202,6 @@ export const getWorkOrders = ( count, workOrders }; -}; +} export default getWorkOrders; diff --git a/helpers/lotOccupancyDB/moveFeeCategoryDown.d.ts b/helpers/lotOccupancyDB/moveFeeCategoryDown.d.ts index ad106d73..b5011983 100644 --- a/helpers/lotOccupancyDB/moveFeeCategoryDown.d.ts +++ b/helpers/lotOccupancyDB/moveFeeCategoryDown.d.ts @@ -1,3 +1,3 @@ -export declare const moveFeeCategoryDown: (feeCategoryId: number | string) => boolean; -export declare const moveFeeCategoryDownToBottom: (feeCategoryId: number | string) => boolean; +export declare function moveFeeCategoryDown(feeCategoryId: number | string): boolean; +export declare function moveFeeCategoryDownToBottom(feeCategoryId: number | string): boolean; export default moveFeeCategoryDown; diff --git a/helpers/lotOccupancyDB/moveFeeCategoryDown.js b/helpers/lotOccupancyDB/moveFeeCategoryDown.js index a8cdd809..133819d7 100644 --- a/helpers/lotOccupancyDB/moveFeeCategoryDown.js +++ b/helpers/lotOccupancyDB/moveFeeCategoryDown.js @@ -1,44 +1,44 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const moveFeeCategoryDown = (feeCategoryId) => { +export function moveFeeCategoryDown(feeCategoryId) { const database = sqlite(databasePath); const currentOrderNumber = database .prepare("select orderNumber from FeeCategories where feeCategoryId = ?") .get(feeCategoryId).orderNumber; database - .prepare("update FeeCategories" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? + 1") + .prepare(`update FeeCategories + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber = ? + 1`) .run(currentOrderNumber); const result = database .prepare("update FeeCategories set orderNumber = ? + 1 where feeCategoryId = ?") .run(currentOrderNumber, feeCategoryId); database.close(); return result.changes > 0; -}; -export const moveFeeCategoryDownToBottom = (feeCategoryId) => { +} +export function moveFeeCategoryDownToBottom(feeCategoryId) { const database = sqlite(databasePath); const currentOrderNumber = database .prepare("select orderNumber from FeeCategories where feeCategoryId = ?") .get(feeCategoryId).orderNumber; const maxOrderNumber = database - .prepare("select max(orderNumber) as maxOrderNumber" + - " from FeeCategories" + - " where recordDelete_timeMillis is null") + .prepare(`select max(orderNumber) as maxOrderNumber + from FeeCategories + where recordDelete_timeMillis is null`) .get().maxOrderNumber; if (currentOrderNumber !== maxOrderNumber) { database .prepare("update FeeCategories set orderNumber = ? + 1 where feeCategoryId = ?") .run(maxOrderNumber, feeCategoryId); database - .prepare("update FeeCategories" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber > ?") + .prepare(`update FeeCategories + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null and + orderNumber > ?`) .run(currentOrderNumber); } database.close(); return true; -}; +} export default moveFeeCategoryDown; diff --git a/helpers/lotOccupancyDB/moveFeeCategoryDown.ts b/helpers/lotOccupancyDB/moveFeeCategoryDown.ts index d1a1548f..2e250949 100644 --- a/helpers/lotOccupancyDB/moveFeeCategoryDown.ts +++ b/helpers/lotOccupancyDB/moveFeeCategoryDown.ts @@ -2,7 +2,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const moveFeeCategoryDown = (feeCategoryId: number | string): boolean => { +export function moveFeeCategoryDown(feeCategoryId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database @@ -11,10 +11,10 @@ export const moveFeeCategoryDown = (feeCategoryId: number | string): boolean => database .prepare( - "update FeeCategories" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? + 1" + `update FeeCategories + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber = ? + 1` ) .run(currentOrderNumber); @@ -25,9 +25,9 @@ export const moveFeeCategoryDown = (feeCategoryId: number | string): boolean => database.close(); return result.changes > 0; -}; +} -export const moveFeeCategoryDownToBottom = (feeCategoryId: number | string): boolean => { +export function moveFeeCategoryDownToBottom(feeCategoryId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database @@ -36,9 +36,9 @@ export const moveFeeCategoryDownToBottom = (feeCategoryId: number | string): boo const maxOrderNumber: number = database .prepare( - "select max(orderNumber) as maxOrderNumber" + - " from FeeCategories" + - " where recordDelete_timeMillis is null" + `select max(orderNumber) as maxOrderNumber + from FeeCategories + where recordDelete_timeMillis is null` ) .get().maxOrderNumber; @@ -49,10 +49,10 @@ export const moveFeeCategoryDownToBottom = (feeCategoryId: number | string): boo database .prepare( - "update FeeCategories" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber > ?" + `update FeeCategories + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null and + orderNumber > ?` ) .run(currentOrderNumber); } @@ -60,6 +60,6 @@ export const moveFeeCategoryDownToBottom = (feeCategoryId: number | string): boo database.close(); return true; -}; +} export default moveFeeCategoryDown; diff --git a/helpers/lotOccupancyDB/moveFeeCategoryUp.d.ts b/helpers/lotOccupancyDB/moveFeeCategoryUp.d.ts index d1389eca..61ab8dc5 100644 --- a/helpers/lotOccupancyDB/moveFeeCategoryUp.d.ts +++ b/helpers/lotOccupancyDB/moveFeeCategoryUp.d.ts @@ -1,3 +1,3 @@ -export declare const moveFeeCategoryUp: (feeCategoryId: number | string) => boolean; -export declare const moveFeeCategoryUpToTop: (feeCategoryId: number | string) => boolean; +export declare function moveFeeCategoryUp(feeCategoryId: number | string): boolean; +export declare function moveFeeCategoryUpToTop(feeCategoryId: number | string): boolean; export default moveFeeCategoryUp; diff --git a/helpers/lotOccupancyDB/moveFeeCategoryUp.js b/helpers/lotOccupancyDB/moveFeeCategoryUp.js index 9012f7b0..1e9bdcb2 100644 --- a/helpers/lotOccupancyDB/moveFeeCategoryUp.js +++ b/helpers/lotOccupancyDB/moveFeeCategoryUp.js @@ -1,6 +1,6 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const moveFeeCategoryUp = (feeCategoryId) => { +export function moveFeeCategoryUp(feeCategoryId) { const database = sqlite(databasePath); const currentOrderNumber = database .prepare("select orderNumber from FeeCategories where feeCategoryId = ?") @@ -10,18 +10,18 @@ export const moveFeeCategoryUp = (feeCategoryId) => { return true; } database - .prepare("update FeeCategories" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? - 1") + .prepare(`update FeeCategories + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber = ? - 1`) .run(currentOrderNumber); const result = database .prepare("update FeeCategories set orderNumber = ? - 1 where feeCategoryId = ?") .run(currentOrderNumber, feeCategoryId); database.close(); return result.changes > 0; -}; -export const moveFeeCategoryUpToTop = (feeCategoryId) => { +} +export function moveFeeCategoryUpToTop(feeCategoryId) { const database = sqlite(databasePath); const currentOrderNumber = database .prepare("select orderNumber from FeeCategories where feeCategoryId = ?") @@ -31,13 +31,13 @@ export const moveFeeCategoryUpToTop = (feeCategoryId) => { .prepare("update FeeCategories set orderNumber = -1 where feeCategoryId = ?") .run(feeCategoryId); database - .prepare("update FeeCategories" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber < ?") + .prepare(`update FeeCategories + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber < ?`) .run(currentOrderNumber); } database.close(); return true; -}; +} export default moveFeeCategoryUp; diff --git a/helpers/lotOccupancyDB/moveFeeCategoryUp.ts b/helpers/lotOccupancyDB/moveFeeCategoryUp.ts index 1ca0df6d..76410fe7 100644 --- a/helpers/lotOccupancyDB/moveFeeCategoryUp.ts +++ b/helpers/lotOccupancyDB/moveFeeCategoryUp.ts @@ -2,7 +2,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const moveFeeCategoryUp = (feeCategoryId: number | string): boolean => { +export function moveFeeCategoryUp(feeCategoryId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database @@ -16,10 +16,10 @@ export const moveFeeCategoryUp = (feeCategoryId: number | string): boolean => { database .prepare( - "update FeeCategories" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? - 1" + `update FeeCategories + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber = ? - 1` ) .run(currentOrderNumber); @@ -30,9 +30,9 @@ export const moveFeeCategoryUp = (feeCategoryId: number | string): boolean => { database.close(); return result.changes > 0; -}; +} -export const moveFeeCategoryUpToTop = (feeCategoryId: number | string): boolean => { +export function moveFeeCategoryUpToTop(feeCategoryId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database @@ -46,10 +46,10 @@ export const moveFeeCategoryUpToTop = (feeCategoryId: number | string): boolean database .prepare( - "update FeeCategories" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber < ?" + `update FeeCategories + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber < ?` ) .run(currentOrderNumber); } @@ -57,6 +57,6 @@ export const moveFeeCategoryUpToTop = (feeCategoryId: number | string): boolean database.close(); return true; -}; +} export default moveFeeCategoryUp; diff --git a/helpers/lotOccupancyDB/moveFeeDown.d.ts b/helpers/lotOccupancyDB/moveFeeDown.d.ts index 8743aed8..3ffbe432 100644 --- a/helpers/lotOccupancyDB/moveFeeDown.d.ts +++ b/helpers/lotOccupancyDB/moveFeeDown.d.ts @@ -1,3 +1,3 @@ -export declare const moveFeeDown: (feeId: number | string) => boolean; -export declare const moveFeeDownToBottom: (feeId: number | string) => boolean; +export declare function moveFeeDown(feeId: number | string): boolean; +export declare function moveFeeDownToBottom(feeId: number | string): boolean; export default moveFeeDown; diff --git a/helpers/lotOccupancyDB/moveFeeDown.js b/helpers/lotOccupancyDB/moveFeeDown.js index ff09a095..f2500c06 100644 --- a/helpers/lotOccupancyDB/moveFeeDown.js +++ b/helpers/lotOccupancyDB/moveFeeDown.js @@ -1,44 +1,43 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { getFee } from "./getFee.js"; -export const moveFeeDown = (feeId) => { +export function moveFeeDown(feeId) { const database = sqlite(databasePath); const currentFee = getFee(feeId, database); database - .prepare("update Fees" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and feeCategoryId = ?" + - " and orderNumber = ? + 1") + .prepare(`update Fees + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and feeCategoryId = ? + and orderNumber = ? + 1`) .run(currentFee.feeCategoryId, currentFee.orderNumber); const result = database .prepare("update Fees set orderNumber = ? + 1 where feeId = ?") .run(currentFee.orderNumber, feeId); database.close(); return result.changes > 0; -}; -export const moveFeeDownToBottom = (feeId) => { +} +export function moveFeeDownToBottom(feeId) { const database = sqlite(databasePath); const currentFee = getFee(feeId, database); const maxOrderNumber = database - .prepare("select max(orderNumber) as maxOrderNumber" + - " from Fees" + - " where recordDelete_timeMillis is null" + - " and feeCategoryId = ?") + .prepare(`select max(orderNumber) as maxOrderNumber + from Fees + where recordDelete_timeMillis is null + and feeCategoryId = ?`) .get(currentFee.feeCategoryId).maxOrderNumber; if (currentFee.orderNumber !== maxOrderNumber) { database .prepare("update Fees set orderNumber = ? + 1 where feeId = ?") .run(maxOrderNumber, feeId); database - .prepare("update Fees" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and feeCategoryId = ?" + - " and orderNumber > ?") + .prepare(`update Fees + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and feeCategoryId = ? and orderNumber > ?`) .run(currentFee.feeCategoryId, currentFee.orderNumber); } database.close(); return true; -}; +} export default moveFeeDown; diff --git a/helpers/lotOccupancyDB/moveFeeDown.ts b/helpers/lotOccupancyDB/moveFeeDown.ts index 19544477..6f7af4f1 100644 --- a/helpers/lotOccupancyDB/moveFeeDown.ts +++ b/helpers/lotOccupancyDB/moveFeeDown.ts @@ -4,18 +4,18 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { getFee } from "./getFee.js"; -export const moveFeeDown = (feeId: number | string): boolean => { +export function moveFeeDown(feeId: number | string): boolean { const database = sqlite(databasePath); const currentFee = getFee(feeId, database); database .prepare( - "update Fees" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and feeCategoryId = ?" + - " and orderNumber = ? + 1" + `update Fees + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and feeCategoryId = ? + and orderNumber = ? + 1` ) .run(currentFee.feeCategoryId, currentFee.orderNumber); @@ -26,19 +26,19 @@ export const moveFeeDown = (feeId: number | string): boolean => { database.close(); return result.changes > 0; -}; +} -export const moveFeeDownToBottom = (feeId: number | string): boolean => { +export function moveFeeDownToBottom(feeId: number | string): boolean { const database = sqlite(databasePath); const currentFee = getFee(feeId, database); const maxOrderNumber: number = database .prepare( - "select max(orderNumber) as maxOrderNumber" + - " from Fees" + - " where recordDelete_timeMillis is null" + - " and feeCategoryId = ?" + `select max(orderNumber) as maxOrderNumber + from Fees + where recordDelete_timeMillis is null + and feeCategoryId = ?` ) .get(currentFee.feeCategoryId).maxOrderNumber; @@ -49,11 +49,10 @@ export const moveFeeDownToBottom = (feeId: number | string): boolean => { database .prepare( - "update Fees" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and feeCategoryId = ?" + - " and orderNumber > ?" + `update Fees + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and feeCategoryId = ? and orderNumber > ?` ) .run(currentFee.feeCategoryId, currentFee.orderNumber); } @@ -61,6 +60,6 @@ export const moveFeeDownToBottom = (feeId: number | string): boolean => { database.close(); return true; -}; +} export default moveFeeDown; diff --git a/helpers/lotOccupancyDB/moveFeeUp.d.ts b/helpers/lotOccupancyDB/moveFeeUp.d.ts index 9d14c129..18d0ec1e 100644 --- a/helpers/lotOccupancyDB/moveFeeUp.d.ts +++ b/helpers/lotOccupancyDB/moveFeeUp.d.ts @@ -1,3 +1,3 @@ -export declare const moveFeeUp: (feeId: number | string) => boolean; -export declare const moveFeeUpToTop: (feeId: number | string) => boolean; +export declare function moveFeeUp(feeId: number | string): boolean; +export declare function moveFeeUpToTop(feeId: number | string): boolean; export default moveFeeUp; diff --git a/helpers/lotOccupancyDB/moveFeeUp.js b/helpers/lotOccupancyDB/moveFeeUp.js index fe11c013..c9b778d5 100644 --- a/helpers/lotOccupancyDB/moveFeeUp.js +++ b/helpers/lotOccupancyDB/moveFeeUp.js @@ -1,7 +1,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { getFee } from "./getFee.js"; -export const moveFeeUp = (feeId) => { +export function moveFeeUp(feeId) { const database = sqlite(databasePath); const currentFee = getFee(feeId, database); if (currentFee.orderNumber <= 0) { @@ -9,32 +9,32 @@ export const moveFeeUp = (feeId) => { return true; } database - .prepare("update Fees" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and feeCategoryId = ?" + - " and orderNumber = ? - 1") + .prepare(`update Fees + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and feeCategoryId = ? + and orderNumber = ? - 1`) .run(currentFee.feeCategoryId, currentFee.orderNumber); const result = database .prepare("update Fees set orderNumber = ? - 1 where feeId = ?") .run(currentFee.orderNumber, feeId); database.close(); return result.changes > 0; -}; -export const moveFeeUpToTop = (feeId) => { +} +export function moveFeeUpToTop(feeId) { const database = sqlite(databasePath); const currentFee = getFee(feeId, database); if (currentFee.orderNumber > 0) { database.prepare("update Fees set orderNumber = -1 where feeId = ?").run(feeId); database - .prepare("update Fees" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and feeCategoryId = ?" + - " and orderNumber < ?") + .prepare(`update Fees + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and feeCategoryId = ? + and orderNumber < ?`) .run(currentFee.feeCategoryId, currentFee.orderNumber); } database.close(); return true; -}; +} export default moveFeeUp; diff --git a/helpers/lotOccupancyDB/moveFeeUp.ts b/helpers/lotOccupancyDB/moveFeeUp.ts index 19229d7b..fe7c06f8 100644 --- a/helpers/lotOccupancyDB/moveFeeUp.ts +++ b/helpers/lotOccupancyDB/moveFeeUp.ts @@ -4,7 +4,7 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { getFee } from "./getFee.js"; -export const moveFeeUp = (feeId: number | string): boolean => { +export function moveFeeUp(feeId: number | string): boolean { const database = sqlite(databasePath); const currentFee = getFee(feeId, database); @@ -16,11 +16,11 @@ export const moveFeeUp = (feeId: number | string): boolean => { database .prepare( - "update Fees" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and feeCategoryId = ?" + - " and orderNumber = ? - 1" + `update Fees + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and feeCategoryId = ? + and orderNumber = ? - 1` ) .run(currentFee.feeCategoryId, currentFee.orderNumber); @@ -31,9 +31,9 @@ export const moveFeeUp = (feeId: number | string): boolean => { database.close(); return result.changes > 0; -}; +} -export const moveFeeUpToTop = (feeId: number | string): boolean => { +export function moveFeeUpToTop(feeId: number | string): boolean { const database = sqlite(databasePath); const currentFee = getFee(feeId, database); @@ -43,11 +43,11 @@ export const moveFeeUpToTop = (feeId: number | string): boolean => { database .prepare( - "update Fees" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and feeCategoryId = ?" + - " and orderNumber < ?" + `update Fees + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and feeCategoryId = ? + and orderNumber < ?` ) .run(currentFee.feeCategoryId, currentFee.orderNumber); } @@ -55,6 +55,6 @@ export const moveFeeUpToTop = (feeId: number | string): boolean => { database.close(); return true; -}; +} export default moveFeeUp; diff --git a/helpers/lotOccupancyDB/moveLotOccupantTypeDown.d.ts b/helpers/lotOccupancyDB/moveLotOccupantTypeDown.d.ts index aa18aad1..15ebbd42 100644 --- a/helpers/lotOccupancyDB/moveLotOccupantTypeDown.d.ts +++ b/helpers/lotOccupancyDB/moveLotOccupantTypeDown.d.ts @@ -1,3 +1,3 @@ -export declare const moveLotOccupantTypeDown: (lotOccupantTypeId: number | string) => boolean; -export declare const moveLotOccupantTypeDownToBottom: (lotOccupantTypeId: number | string) => boolean; +export declare function moveLotOccupantTypeDown(lotOccupantTypeId: number | string): boolean; +export declare function moveLotOccupantTypeDownToBottom(lotOccupantTypeId: number | string): boolean; export default moveLotOccupantTypeDown; diff --git a/helpers/lotOccupancyDB/moveLotOccupantTypeDown.js b/helpers/lotOccupancyDB/moveLotOccupantTypeDown.js index 80768bdb..603ac71f 100644 --- a/helpers/lotOccupancyDB/moveLotOccupantTypeDown.js +++ b/helpers/lotOccupancyDB/moveLotOccupantTypeDown.js @@ -1,51 +1,47 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotOccupantTypesCache } from "../functions.cache.js"; -export const moveLotOccupantTypeDown = (lotOccupantTypeId) => { +export function moveLotOccupantTypeDown(lotOccupantTypeId) { const database = sqlite(databasePath); const currentOrderNumber = database - .prepare("select orderNumber" + - " from LotOccupantTypes" + - " where lotOccupantTypeId = ?") + .prepare(`select orderNumber from LotOccupantTypes where lotOccupantTypeId = ?`) .get(lotOccupantTypeId).orderNumber; database - .prepare("update LotOccupantTypes" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? + 1") + .prepare(`update LotOccupantTypes + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber = ? + 1`) .run(currentOrderNumber); const result = database - .prepare("update LotOccupantTypes" + - " set orderNumber = ? + 1" + - " where lotOccupantTypeId = ?") + .prepare(`update LotOccupantTypes set orderNumber = ? + 1 where lotOccupantTypeId = ?`) .run(currentOrderNumber, lotOccupantTypeId); database.close(); clearLotOccupantTypesCache(); return result.changes > 0; -}; -export const moveLotOccupantTypeDownToBottom = (lotOccupantTypeId) => { +} +export function moveLotOccupantTypeDownToBottom(lotOccupantTypeId) { const database = sqlite(databasePath); const currentOrderNumber = database .prepare("select orderNumber from LotOccupantTypes where lotOccupantTypeId = ?") .get(lotOccupantTypeId).orderNumber; const maxOrderNumber = database - .prepare("select max(orderNumber) as maxOrderNumber" + - " from LotOccupantTypes" + - " where recordDelete_timeMillis is null") + .prepare(`select max(orderNumber) as maxOrderNumber + from LotOccupantTypes + where recordDelete_timeMillis is null`) .get().maxOrderNumber; if (currentOrderNumber !== maxOrderNumber) { database .prepare("update LotOccupantTypes set orderNumber = ? + 1 where lotOccupantTypeId = ?") .run(maxOrderNumber, lotOccupantTypeId); database - .prepare("update LotOccupantTypes" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber > ?") + .prepare(`update LotOccupantTypes + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber > ?`) .run(currentOrderNumber); } database.close(); clearLotOccupantTypesCache(); return true; -}; +} export default moveLotOccupantTypeDown; diff --git a/helpers/lotOccupancyDB/moveLotOccupantTypeDown.ts b/helpers/lotOccupancyDB/moveLotOccupantTypeDown.ts index 3014b079..f3056558 100644 --- a/helpers/lotOccupancyDB/moveLotOccupantTypeDown.ts +++ b/helpers/lotOccupancyDB/moveLotOccupantTypeDown.ts @@ -4,34 +4,24 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotOccupantTypesCache } from "../functions.cache.js"; -export const moveLotOccupantTypeDown = ( - lotOccupantTypeId: number | string -): boolean => { +export function moveLotOccupantTypeDown(lotOccupantTypeId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database - .prepare( - "select orderNumber" + - " from LotOccupantTypes" + - " where lotOccupantTypeId = ?" - ) + .prepare(`select orderNumber from LotOccupantTypes where lotOccupantTypeId = ?`) .get(lotOccupantTypeId).orderNumber; database .prepare( - "update LotOccupantTypes" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? + 1" + `update LotOccupantTypes + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber = ? + 1` ) .run(currentOrderNumber); const result = database - .prepare( - "update LotOccupantTypes" + - " set orderNumber = ? + 1" + - " where lotOccupantTypeId = ?" - ) + .prepare(`update LotOccupantTypes set orderNumber = ? + 1 where lotOccupantTypeId = ?`) .run(currentOrderNumber, lotOccupantTypeId); database.close(); @@ -39,10 +29,9 @@ export const moveLotOccupantTypeDown = ( clearLotOccupantTypesCache(); return result.changes > 0; -}; +} - -export const moveLotOccupantTypeDownToBottom = (lotOccupantTypeId: number | string): boolean => { +export function moveLotOccupantTypeDownToBottom(lotOccupantTypeId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database @@ -51,9 +40,9 @@ export const moveLotOccupantTypeDownToBottom = (lotOccupantTypeId: number | stri const maxOrderNumber: number = database .prepare( - "select max(orderNumber) as maxOrderNumber" + - " from LotOccupantTypes" + - " where recordDelete_timeMillis is null" + `select max(orderNumber) as maxOrderNumber + from LotOccupantTypes + where recordDelete_timeMillis is null` ) .get().maxOrderNumber; @@ -64,10 +53,10 @@ export const moveLotOccupantTypeDownToBottom = (lotOccupantTypeId: number | stri database .prepare( - "update LotOccupantTypes" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber > ?" + `update LotOccupantTypes + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber > ?` ) .run(currentOrderNumber); } @@ -77,5 +66,6 @@ export const moveLotOccupantTypeDownToBottom = (lotOccupantTypeId: number | stri clearLotOccupantTypesCache(); return true; -}; +} + export default moveLotOccupantTypeDown; diff --git a/helpers/lotOccupancyDB/moveLotOccupantTypeUp.d.ts b/helpers/lotOccupancyDB/moveLotOccupantTypeUp.d.ts index fdfc9fce..222f3550 100644 --- a/helpers/lotOccupancyDB/moveLotOccupantTypeUp.d.ts +++ b/helpers/lotOccupancyDB/moveLotOccupantTypeUp.d.ts @@ -1,3 +1,3 @@ -export declare const moveLotOccupantTypeUp: (lotOccupantTypeId: number | string) => boolean; -export declare const moveLotOccupantTypeUpToTop: (lotOccupantTypeId: number | string) => boolean; +export declare function moveLotOccupantTypeUp(lotOccupantTypeId: number | string): boolean; +export declare function moveLotOccupantTypeUpToTop(lotOccupantTypeId: number | string): boolean; export default moveLotOccupantTypeUp; diff --git a/helpers/lotOccupancyDB/moveLotOccupantTypeUp.js b/helpers/lotOccupancyDB/moveLotOccupantTypeUp.js index c79641e7..049fca7b 100644 --- a/helpers/lotOccupancyDB/moveLotOccupantTypeUp.js +++ b/helpers/lotOccupancyDB/moveLotOccupantTypeUp.js @@ -1,33 +1,31 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotOccupantTypesCache } from "../functions.cache.js"; -export const moveLotOccupantTypeUp = (lotOccupantTypeId) => { +export function moveLotOccupantTypeUp(lotOccupantTypeId) { const database = sqlite(databasePath); const currentOrderNumber = database - .prepare("select orderNumber" + - " from LotOccupantTypes" + - " where lotOccupantTypeId = ?") + .prepare(`select orderNumber from LotOccupantTypes where lotOccupantTypeId = ?`) .get(lotOccupantTypeId).orderNumber; if (currentOrderNumber <= 0) { database.close(); return true; } database - .prepare("update LotOccupantTypes" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? - 1") + .prepare(`update LotOccupantTypes + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber = ? - 1`) .run(currentOrderNumber); const result = database - .prepare("update LotOccupantTypes" + - " set orderNumber = ? - 1" + - " where lotOccupantTypeId = ?") + .prepare(`update LotOccupantTypes + set orderNumber = ? - 1 + where lotOccupantTypeId = ?`) .run(currentOrderNumber, lotOccupantTypeId); database.close(); clearLotOccupantTypesCache(); return result.changes > 0; -}; -export const moveLotOccupantTypeUpToTop = (lotOccupantTypeId) => { +} +export function moveLotOccupantTypeUpToTop(lotOccupantTypeId) { const database = sqlite(databasePath); const currentOrderNumber = database .prepare("select orderNumber from LotOccupantTypes where lotOccupantTypeId = ?") @@ -37,14 +35,14 @@ export const moveLotOccupantTypeUpToTop = (lotOccupantTypeId) => { .prepare("update LotOccupantTypes set orderNumber = -1 where lotOccupantTypeId = ?") .run(lotOccupantTypeId); database - .prepare("update LotOccupantTypes" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber < ?") + .prepare(`update LotOccupantTypes + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber < ?`) .run(currentOrderNumber); } database.close(); clearLotOccupantTypesCache(); return true; -}; +} export default moveLotOccupantTypeUp; diff --git a/helpers/lotOccupancyDB/moveLotOccupantTypeUp.ts b/helpers/lotOccupancyDB/moveLotOccupantTypeUp.ts index e92591cc..bec46909 100644 --- a/helpers/lotOccupancyDB/moveLotOccupantTypeUp.ts +++ b/helpers/lotOccupancyDB/moveLotOccupantTypeUp.ts @@ -4,17 +4,11 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotOccupantTypesCache } from "../functions.cache.js"; -export const moveLotOccupantTypeUp = ( - lotOccupantTypeId: number | string -): boolean => { +export function moveLotOccupantTypeUp(lotOccupantTypeId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database - .prepare( - "select orderNumber" + - " from LotOccupantTypes" + - " where lotOccupantTypeId = ?" - ) + .prepare(`select orderNumber from LotOccupantTypes where lotOccupantTypeId = ?`) .get(lotOccupantTypeId).orderNumber; if (currentOrderNumber <= 0) { @@ -24,18 +18,18 @@ export const moveLotOccupantTypeUp = ( database .prepare( - "update LotOccupantTypes" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? - 1" + `update LotOccupantTypes + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber = ? - 1` ) .run(currentOrderNumber); const result = database .prepare( - "update LotOccupantTypes" + - " set orderNumber = ? - 1" + - " where lotOccupantTypeId = ?" + `update LotOccupantTypes + set orderNumber = ? - 1 + where lotOccupantTypeId = ?` ) .run(currentOrderNumber, lotOccupantTypeId); @@ -44,9 +38,9 @@ export const moveLotOccupantTypeUp = ( clearLotOccupantTypesCache(); return result.changes > 0; -}; +} -export const moveLotOccupantTypeUpToTop = (lotOccupantTypeId: number | string): boolean => { +export function moveLotOccupantTypeUpToTop(lotOccupantTypeId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database @@ -60,10 +54,10 @@ export const moveLotOccupantTypeUpToTop = (lotOccupantTypeId: number | string): database .prepare( - "update LotOccupantTypes" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber < ?" + `update LotOccupantTypes + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber < ?` ) .run(currentOrderNumber); } @@ -73,6 +67,6 @@ export const moveLotOccupantTypeUpToTop = (lotOccupantTypeId: number | string): clearLotOccupantTypesCache(); return true; -}; +} export default moveLotOccupantTypeUp; diff --git a/helpers/lotOccupancyDB/moveLotStatusDown.d.ts b/helpers/lotOccupancyDB/moveLotStatusDown.d.ts index 87d4c7ae..3c4ba0b9 100644 --- a/helpers/lotOccupancyDB/moveLotStatusDown.d.ts +++ b/helpers/lotOccupancyDB/moveLotStatusDown.d.ts @@ -1,3 +1,3 @@ -export declare const moveLotStatusDown: (lotStatusId: number | string) => boolean; -export declare const moveLotStatusDownToBottom: (lotStatusId: number | string) => boolean; +export declare function moveLotStatusDown(lotStatusId: number | string): boolean; +export declare function moveLotStatusDownToBottom(lotStatusId: number | string): boolean; export default moveLotStatusDown; diff --git a/helpers/lotOccupancyDB/moveLotStatusDown.js b/helpers/lotOccupancyDB/moveLotStatusDown.js index 5b739c03..aa1ceb88 100644 --- a/helpers/lotOccupancyDB/moveLotStatusDown.js +++ b/helpers/lotOccupancyDB/moveLotStatusDown.js @@ -1,51 +1,47 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotStatusesCache } from "../functions.cache.js"; -export const moveLotStatusDown = (lotStatusId) => { +export function moveLotStatusDown(lotStatusId) { const database = sqlite(databasePath); const currentOrderNumber = database - .prepare("select orderNumber" + - " from LotStatuses" + - " where lotStatusId = ?") + .prepare(`select orderNumber from LotStatuses where lotStatusId = ?`) .get(lotStatusId).orderNumber; database - .prepare("update LotStatuses" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? + 1") + .prepare(`update LotStatuses + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber = ? + 1`) .run(currentOrderNumber); const result = database - .prepare("update LotStatuses" + - " set orderNumber = ? + 1" + - " where lotStatusId = ?") + .prepare(`update LotStatuses set orderNumber = ? + 1 where lotStatusId = ?`) .run(currentOrderNumber, lotStatusId); database.close(); clearLotStatusesCache(); return result.changes > 0; -}; -export const moveLotStatusDownToBottom = (lotStatusId) => { +} +export function moveLotStatusDownToBottom(lotStatusId) { const database = sqlite(databasePath); const currentOrderNumber = database .prepare("select orderNumber from LotStatuses where lotStatusId = ?") .get(lotStatusId).orderNumber; const maxOrderNumber = database - .prepare("select max(orderNumber) as maxOrderNumber" + - " from LotStatuses" + - " where recordDelete_timeMillis is null") + .prepare(`select max(orderNumber) as maxOrderNumber + from LotStatuses + where recordDelete_timeMillis is null`) .get().maxOrderNumber; if (currentOrderNumber !== maxOrderNumber) { database .prepare("update LotStatuses set orderNumber = ? + 1 where lotStatusId = ?") .run(maxOrderNumber, lotStatusId); database - .prepare("update LotStatuses" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber > ?") + .prepare(`update LotStatuses + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber > ?`) .run(currentOrderNumber); } database.close(); clearLotStatusesCache(); return true; -}; +} export default moveLotStatusDown; diff --git a/helpers/lotOccupancyDB/moveLotStatusDown.ts b/helpers/lotOccupancyDB/moveLotStatusDown.ts index c9c18db8..df155f07 100644 --- a/helpers/lotOccupancyDB/moveLotStatusDown.ts +++ b/helpers/lotOccupancyDB/moveLotStatusDown.ts @@ -4,32 +4,24 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotStatusesCache } from "../functions.cache.js"; -export const moveLotStatusDown = (lotStatusId: number | string): boolean => { +export function moveLotStatusDown(lotStatusId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database - .prepare( - "select orderNumber" + - " from LotStatuses" + - " where lotStatusId = ?" - ) + .prepare(`select orderNumber from LotStatuses where lotStatusId = ?`) .get(lotStatusId).orderNumber; database .prepare( - "update LotStatuses" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? + 1" + `update LotStatuses + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber = ? + 1` ) .run(currentOrderNumber); const result = database - .prepare( - "update LotStatuses" + - " set orderNumber = ? + 1" + - " where lotStatusId = ?" - ) + .prepare(`update LotStatuses set orderNumber = ? + 1 where lotStatusId = ?`) .run(currentOrderNumber, lotStatusId); database.close(); @@ -37,9 +29,9 @@ export const moveLotStatusDown = (lotStatusId: number | string): boolean => { clearLotStatusesCache(); return result.changes > 0; -}; +} -export const moveLotStatusDownToBottom = (lotStatusId: number | string): boolean => { +export function moveLotStatusDownToBottom(lotStatusId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database @@ -48,9 +40,9 @@ export const moveLotStatusDownToBottom = (lotStatusId: number | string): boolean const maxOrderNumber: number = database .prepare( - "select max(orderNumber) as maxOrderNumber" + - " from LotStatuses" + - " where recordDelete_timeMillis is null" + `select max(orderNumber) as maxOrderNumber + from LotStatuses + where recordDelete_timeMillis is null` ) .get().maxOrderNumber; @@ -61,10 +53,10 @@ export const moveLotStatusDownToBottom = (lotStatusId: number | string): boolean database .prepare( - "update LotStatuses" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber > ?" + `update LotStatuses + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber > ?` ) .run(currentOrderNumber); } @@ -74,6 +66,6 @@ export const moveLotStatusDownToBottom = (lotStatusId: number | string): boolean clearLotStatusesCache(); return true; -}; +} export default moveLotStatusDown; diff --git a/helpers/lotOccupancyDB/moveLotStatusUp.d.ts b/helpers/lotOccupancyDB/moveLotStatusUp.d.ts index efe8af01..11002af0 100644 --- a/helpers/lotOccupancyDB/moveLotStatusUp.d.ts +++ b/helpers/lotOccupancyDB/moveLotStatusUp.d.ts @@ -1,3 +1,3 @@ -export declare const moveLotStatusUp: (lotStatusId: number | string) => boolean; -export declare const moveLotStatusUpToTop: (lotStatusId: number | string) => boolean; +export declare function moveLotStatusUp(lotStatusId: number | string): boolean; +export declare function moveLotStatusUpToTop(lotStatusId: number | string): boolean; export default moveLotStatusUp; diff --git a/helpers/lotOccupancyDB/moveLotStatusUp.js b/helpers/lotOccupancyDB/moveLotStatusUp.js index 79a4814d..9b2726f4 100644 --- a/helpers/lotOccupancyDB/moveLotStatusUp.js +++ b/helpers/lotOccupancyDB/moveLotStatusUp.js @@ -1,7 +1,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotStatusesCache } from "../functions.cache.js"; -export const moveLotStatusUp = (lotStatusId) => { +export function moveLotStatusUp(lotStatusId) { const database = sqlite(databasePath); const currentOrderNumber = database .prepare("select orderNumber from LotStatuses where lotStatusId = ?") @@ -11,10 +11,10 @@ export const moveLotStatusUp = (lotStatusId) => { return true; } database - .prepare("update LotStatuses" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? - 1") + .prepare(`update LotStatuses + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber = ? - 1`) .run(currentOrderNumber); const result = database .prepare("update LotStatuses set orderNumber = ? - 1 where lotStatusId = ?") @@ -22,8 +22,8 @@ export const moveLotStatusUp = (lotStatusId) => { database.close(); clearLotStatusesCache(); return result.changes > 0; -}; -export const moveLotStatusUpToTop = (lotStatusId) => { +} +export function moveLotStatusUpToTop(lotStatusId) { const database = sqlite(databasePath); const currentOrderNumber = database .prepare("select orderNumber from LotStatuses where lotStatusId = ?") @@ -33,14 +33,14 @@ export const moveLotStatusUpToTop = (lotStatusId) => { .prepare("update LotStatuses set orderNumber = -1 where lotStatusId = ?") .run(lotStatusId); database - .prepare("update LotStatuses" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber < ?") + .prepare(`update LotStatuses + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber < ?`) .run(currentOrderNumber); } database.close(); clearLotStatusesCache(); return true; -}; +} export default moveLotStatusUp; diff --git a/helpers/lotOccupancyDB/moveLotStatusUp.ts b/helpers/lotOccupancyDB/moveLotStatusUp.ts index bd4701ca..c433ff3e 100644 --- a/helpers/lotOccupancyDB/moveLotStatusUp.ts +++ b/helpers/lotOccupancyDB/moveLotStatusUp.ts @@ -4,7 +4,7 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotStatusesCache } from "../functions.cache.js"; -export const moveLotStatusUp = (lotStatusId: number | string): boolean => { +export function moveLotStatusUp(lotStatusId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database @@ -18,10 +18,10 @@ export const moveLotStatusUp = (lotStatusId: number | string): boolean => { database .prepare( - "update LotStatuses" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? - 1" + `update LotStatuses + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber = ? - 1` ) .run(currentOrderNumber); @@ -34,9 +34,9 @@ export const moveLotStatusUp = (lotStatusId: number | string): boolean => { clearLotStatusesCache(); return result.changes > 0; -}; +} -export const moveLotStatusUpToTop = (lotStatusId: number | string): boolean => { +export function moveLotStatusUpToTop(lotStatusId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database @@ -50,10 +50,10 @@ export const moveLotStatusUpToTop = (lotStatusId: number | string): boolean => { database .prepare( - "update LotStatuses" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber < ?" + `update LotStatuses + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber < ?` ) .run(currentOrderNumber); } @@ -63,6 +63,6 @@ export const moveLotStatusUpToTop = (lotStatusId: number | string): boolean => { clearLotStatusesCache(); return true; -}; +} export default moveLotStatusUp; diff --git a/helpers/lotOccupancyDB/moveLotTypeDown.d.ts b/helpers/lotOccupancyDB/moveLotTypeDown.d.ts index a00edbab..40870c09 100644 --- a/helpers/lotOccupancyDB/moveLotTypeDown.d.ts +++ b/helpers/lotOccupancyDB/moveLotTypeDown.d.ts @@ -1,3 +1,3 @@ -export declare const moveLotTypeDown: (lotTypeId: number | string) => boolean; -export declare const moveLotTypeDownToBottom: (lotTypeId: number | string) => boolean; +export declare function moveLotTypeDown(lotTypeId: number | string): boolean; +export declare function moveLotTypeDownToBottom(lotTypeId: number | string): boolean; export default moveLotTypeDown; diff --git a/helpers/lotOccupancyDB/moveLotTypeDown.js b/helpers/lotOccupancyDB/moveLotTypeDown.js index c8d9ef44..656cfc36 100644 --- a/helpers/lotOccupancyDB/moveLotTypeDown.js +++ b/helpers/lotOccupancyDB/moveLotTypeDown.js @@ -1,16 +1,16 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotTypesCache } from "../functions.cache.js"; -export const moveLotTypeDown = (lotTypeId) => { +export function moveLotTypeDown(lotTypeId) { const database = sqlite(databasePath); const currentOrderNumber = database .prepare("select orderNumber from LotTypes where lotTypeId = ?") .get(lotTypeId).orderNumber; database - .prepare("update LotTypes" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? + 1") + .prepare(`update LotTypes + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber = ? + 1`) .run(currentOrderNumber); const result = database .prepare("update LotTypes set orderNumber = ? + 1 where lotTypeId = ?") @@ -18,30 +18,30 @@ export const moveLotTypeDown = (lotTypeId) => { database.close(); clearLotTypesCache(); return result.changes > 0; -}; -export const moveLotTypeDownToBottom = (lotTypeId) => { +} +export function moveLotTypeDownToBottom(lotTypeId) { const database = sqlite(databasePath); const currentOrderNumber = database .prepare("select orderNumber from LotTypes where lotTypeId = ?") .get(lotTypeId).orderNumber; const maxOrderNumber = database - .prepare("select max(orderNumber) as maxOrderNumber" + - " from LotTypes" + - " where recordDelete_timeMillis is null") + .prepare(`select max(orderNumber) as maxOrderNumber + from LotTypes + where recordDelete_timeMillis is null`) .get().maxOrderNumber; if (currentOrderNumber !== maxOrderNumber) { database .prepare("update LotTypes set orderNumber = ? + 1 where lotTypeId = ?") .run(maxOrderNumber, lotTypeId); database - .prepare("update LotTypes" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber > ?") + .prepare(`update LotTypes + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber > ?`) .run(currentOrderNumber); } database.close(); clearLotTypesCache(); return true; -}; +} export default moveLotTypeDown; diff --git a/helpers/lotOccupancyDB/moveLotTypeDown.ts b/helpers/lotOccupancyDB/moveLotTypeDown.ts index fe5d3efe..2c0e4b79 100644 --- a/helpers/lotOccupancyDB/moveLotTypeDown.ts +++ b/helpers/lotOccupancyDB/moveLotTypeDown.ts @@ -4,7 +4,7 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotTypesCache } from "../functions.cache.js"; -export const moveLotTypeDown = (lotTypeId: number | string): boolean => { +export function moveLotTypeDown(lotTypeId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database @@ -13,10 +13,10 @@ export const moveLotTypeDown = (lotTypeId: number | string): boolean => { database .prepare( - "update LotTypes" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? + 1" + `update LotTypes + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber = ? + 1` ) .run(currentOrderNumber); @@ -29,9 +29,9 @@ export const moveLotTypeDown = (lotTypeId: number | string): boolean => { clearLotTypesCache(); return result.changes > 0; -}; +} -export const moveLotTypeDownToBottom = (lotTypeId: number | string): boolean => { +export function moveLotTypeDownToBottom(lotTypeId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database @@ -40,9 +40,9 @@ export const moveLotTypeDownToBottom = (lotTypeId: number | string): boolean => const maxOrderNumber: number = database .prepare( - "select max(orderNumber) as maxOrderNumber" + - " from LotTypes" + - " where recordDelete_timeMillis is null" + `select max(orderNumber) as maxOrderNumber + from LotTypes + where recordDelete_timeMillis is null` ) .get().maxOrderNumber; @@ -53,10 +53,10 @@ export const moveLotTypeDownToBottom = (lotTypeId: number | string): boolean => database .prepare( - "update LotTypes" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber > ?" + `update LotTypes + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber > ?` ) .run(currentOrderNumber); } @@ -66,6 +66,6 @@ export const moveLotTypeDownToBottom = (lotTypeId: number | string): boolean => clearLotTypesCache(); return true; -}; +} export default moveLotTypeDown; diff --git a/helpers/lotOccupancyDB/moveLotTypeFieldDown.d.ts b/helpers/lotOccupancyDB/moveLotTypeFieldDown.d.ts index 52da4006..e7a3f36f 100644 --- a/helpers/lotOccupancyDB/moveLotTypeFieldDown.d.ts +++ b/helpers/lotOccupancyDB/moveLotTypeFieldDown.d.ts @@ -1,3 +1,3 @@ -export declare const moveLotTypeFieldDown: (lotTypeFieldId: number | string) => boolean; -export declare const moveLotTypeFieldDownToBottom: (lotTypeFieldId: number | string) => boolean; +export declare function moveLotTypeFieldDown(lotTypeFieldId: number | string): boolean; +export declare function moveLotTypeFieldDownToBottom(lotTypeFieldId: number | string): boolean; export default moveLotTypeFieldDown; diff --git a/helpers/lotOccupancyDB/moveLotTypeFieldDown.js b/helpers/lotOccupancyDB/moveLotTypeFieldDown.js index 9e70e8c0..976619a8 100644 --- a/helpers/lotOccupancyDB/moveLotTypeFieldDown.js +++ b/helpers/lotOccupancyDB/moveLotTypeFieldDown.js @@ -1,17 +1,16 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotTypesCache } from "../functions.cache.js"; -export const moveLotTypeFieldDown = (lotTypeFieldId) => { +export function moveLotTypeFieldDown(lotTypeFieldId) { const database = sqlite(databasePath); const currentField = database .prepare("select lotTypeId, orderNumber from LotTypeFields where lotTypeFieldId = ?") .get(lotTypeFieldId); database - .prepare("update LotTypeFields" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and lotTypeId = ?" + - " and orderNumber = ? + 1") + .prepare(`update LotTypeFields + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and lotTypeId = ? and orderNumber = ? + 1`) .run(currentField.lotTypeId, currentField.orderNumber); const result = database .prepare("update LotTypeFields set orderNumber = ? + 1 where lotTypeFieldId = ?") @@ -19,32 +18,32 @@ export const moveLotTypeFieldDown = (lotTypeFieldId) => { database.close(); clearLotTypesCache(); return result.changes > 0; -}; -export const moveLotTypeFieldDownToBottom = (lotTypeFieldId) => { +} +export function moveLotTypeFieldDownToBottom(lotTypeFieldId) { const database = sqlite(databasePath); const currentField = database .prepare("select lotTypeId, orderNumber from LotTypeFields where lotTypeFieldId = ?") .get(lotTypeFieldId); const maxOrderNumber = database - .prepare("select max(orderNumber) as maxOrderNumber" + - " from LotTypeFields" + - " where recordDelete_timeMillis is null" + - " and lotTypeId = ?") + .prepare(`select max(orderNumber) as maxOrderNumber + from LotTypeFields + where recordDelete_timeMillis is null + and lotTypeId = ?`) .get(currentField.lotTypeId).maxOrderNumber; if (currentField.orderNumber !== maxOrderNumber) { database .prepare("update LotTypeFields set orderNumber = ? + 1 where lotTypeFieldId = ?") .run(maxOrderNumber, lotTypeFieldId); database - .prepare("update LotTypeFields" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and lotTypeId = ?" + - " and orderNumber > ?") + .prepare(`update LotTypeFields + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and lotTypeId = ? + and orderNumber > ?`) .run(currentField.lotTypeId, currentField.orderNumber); } database.close(); clearLotTypesCache(); return true; -}; +} export default moveLotTypeFieldDown; diff --git a/helpers/lotOccupancyDB/moveLotTypeFieldDown.ts b/helpers/lotOccupancyDB/moveLotTypeFieldDown.ts index 90b622f9..1a852546 100644 --- a/helpers/lotOccupancyDB/moveLotTypeFieldDown.ts +++ b/helpers/lotOccupancyDB/moveLotTypeFieldDown.ts @@ -4,7 +4,7 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotTypesCache } from "../functions.cache.js"; -export const moveLotTypeFieldDown = (lotTypeFieldId: number | string): boolean => { +export function moveLotTypeFieldDown(lotTypeFieldId: number | string): boolean { const database = sqlite(databasePath); const currentField: { lotTypeId?: number; orderNumber: number } = database @@ -13,11 +13,10 @@ export const moveLotTypeFieldDown = (lotTypeFieldId: number | string): boolean = database .prepare( - "update LotTypeFields" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and lotTypeId = ?" + - " and orderNumber = ? + 1" + `update LotTypeFields + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and lotTypeId = ? and orderNumber = ? + 1` ) .run(currentField.lotTypeId, currentField.orderNumber); @@ -30,9 +29,9 @@ export const moveLotTypeFieldDown = (lotTypeFieldId: number | string): boolean = clearLotTypesCache(); return result.changes > 0; -}; +} -export const moveLotTypeFieldDownToBottom = (lotTypeFieldId: number | string): boolean => { +export function moveLotTypeFieldDownToBottom(lotTypeFieldId: number | string): boolean { const database = sqlite(databasePath); const currentField: { lotTypeId?: number; orderNumber: number } = database @@ -41,10 +40,10 @@ export const moveLotTypeFieldDownToBottom = (lotTypeFieldId: number | string): b const maxOrderNumber: number = database .prepare( - "select max(orderNumber) as maxOrderNumber" + - " from LotTypeFields" + - " where recordDelete_timeMillis is null" + - " and lotTypeId = ?" + `select max(orderNumber) as maxOrderNumber + from LotTypeFields + where recordDelete_timeMillis is null + and lotTypeId = ?` ) .get(currentField.lotTypeId).maxOrderNumber; @@ -55,11 +54,11 @@ export const moveLotTypeFieldDownToBottom = (lotTypeFieldId: number | string): b database .prepare( - "update LotTypeFields" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and lotTypeId = ?" + - " and orderNumber > ?" + `update LotTypeFields + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and lotTypeId = ? + and orderNumber > ?` ) .run(currentField.lotTypeId, currentField.orderNumber); } @@ -69,6 +68,6 @@ export const moveLotTypeFieldDownToBottom = (lotTypeFieldId: number | string): b clearLotTypesCache(); return true; -}; +} export default moveLotTypeFieldDown; diff --git a/helpers/lotOccupancyDB/moveLotTypeFieldUp.d.ts b/helpers/lotOccupancyDB/moveLotTypeFieldUp.d.ts index dd0b9295..e0b74789 100644 --- a/helpers/lotOccupancyDB/moveLotTypeFieldUp.d.ts +++ b/helpers/lotOccupancyDB/moveLotTypeFieldUp.d.ts @@ -1,3 +1,3 @@ -export declare const moveLotTypeFieldUp: (lotTypeFieldId: number | string) => boolean; -export declare const moveLotTypeFieldUpToTop: (lotTypeFieldId: number | string) => boolean; +export declare function moveLotTypeFieldUp(lotTypeFieldId: number | string): boolean; +export declare function moveLotTypeFieldUpToTop(lotTypeFieldId: number | string): boolean; export default moveLotTypeFieldUp; diff --git a/helpers/lotOccupancyDB/moveLotTypeFieldUp.js b/helpers/lotOccupancyDB/moveLotTypeFieldUp.js index 3da71e17..b04720e7 100644 --- a/helpers/lotOccupancyDB/moveLotTypeFieldUp.js +++ b/helpers/lotOccupancyDB/moveLotTypeFieldUp.js @@ -1,7 +1,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotTypesCache } from "../functions.cache.js"; -export const moveLotTypeFieldUp = (lotTypeFieldId) => { +export function moveLotTypeFieldUp(lotTypeFieldId) { const database = sqlite(databasePath); const currentField = database .prepare("select lotTypeId, orderNumber from LotTypeFields where lotTypeFieldId = ?") @@ -11,11 +11,11 @@ export const moveLotTypeFieldUp = (lotTypeFieldId) => { return true; } database - .prepare("update LotTypeFields" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and lotTypeId = ?" + - " and orderNumber = ? - 1") + .prepare(`update LotTypeFields + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and lotTypeId = ? + and orderNumber = ? - 1`) .run(currentField.lotTypeId, currentField.orderNumber); const result = database .prepare("update LotTypeFields set orderNumber = ? - 1 where lotTypeFieldId = ?") @@ -23,8 +23,8 @@ export const moveLotTypeFieldUp = (lotTypeFieldId) => { database.close(); clearLotTypesCache(); return result.changes > 0; -}; -export const moveLotTypeFieldUpToTop = (lotTypeFieldId) => { +} +export function moveLotTypeFieldUpToTop(lotTypeFieldId) { const database = sqlite(databasePath); const currentField = database .prepare("select lotTypeId, orderNumber from LotTypeFields where lotTypeFieldId = ?") @@ -34,15 +34,15 @@ export const moveLotTypeFieldUpToTop = (lotTypeFieldId) => { .prepare("update LotTypeFields set orderNumber = -1 where lotTypeFieldId = ?") .run(lotTypeFieldId); database - .prepare("update LotTypeFields" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and lotTypeId = ?" + - " and orderNumber < ?") + .prepare(`update LotTypeFields + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and lotTypeId = ? + and orderNumber < ?`) .run(currentField.lotTypeId, currentField.orderNumber); } database.close(); clearLotTypesCache(); return true; -}; +} export default moveLotTypeFieldUp; diff --git a/helpers/lotOccupancyDB/moveLotTypeFieldUp.ts b/helpers/lotOccupancyDB/moveLotTypeFieldUp.ts index 657b799d..39a353d1 100644 --- a/helpers/lotOccupancyDB/moveLotTypeFieldUp.ts +++ b/helpers/lotOccupancyDB/moveLotTypeFieldUp.ts @@ -4,7 +4,7 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotTypesCache } from "../functions.cache.js"; -export const moveLotTypeFieldUp = (lotTypeFieldId: number | string): boolean => { +export function moveLotTypeFieldUp(lotTypeFieldId: number | string): boolean { const database = sqlite(databasePath); const currentField: { lotTypeId: number; orderNumber: number } = database @@ -18,11 +18,11 @@ export const moveLotTypeFieldUp = (lotTypeFieldId: number | string): boolean => database .prepare( - "update LotTypeFields" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and lotTypeId = ?" + - " and orderNumber = ? - 1" + `update LotTypeFields + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and lotTypeId = ? + and orderNumber = ? - 1` ) .run(currentField.lotTypeId, currentField.orderNumber); @@ -35,9 +35,9 @@ export const moveLotTypeFieldUp = (lotTypeFieldId: number | string): boolean => clearLotTypesCache(); return result.changes > 0; -}; +} -export const moveLotTypeFieldUpToTop = (lotTypeFieldId: number | string): boolean => { +export function moveLotTypeFieldUpToTop(lotTypeFieldId: number | string): boolean { const database = sqlite(databasePath); const currentField: { lotTypeId: number; orderNumber: number } = database @@ -51,11 +51,11 @@ export const moveLotTypeFieldUpToTop = (lotTypeFieldId: number | string): boolea database .prepare( - "update LotTypeFields" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and lotTypeId = ?" + - " and orderNumber < ?" + `update LotTypeFields + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and lotTypeId = ? + and orderNumber < ?` ) .run(currentField.lotTypeId, currentField.orderNumber); } @@ -65,6 +65,6 @@ export const moveLotTypeFieldUpToTop = (lotTypeFieldId: number | string): boolea clearLotTypesCache(); return true; -}; +} export default moveLotTypeFieldUp; diff --git a/helpers/lotOccupancyDB/moveLotTypeUp.d.ts b/helpers/lotOccupancyDB/moveLotTypeUp.d.ts index a2a82d5c..fa8a27c3 100644 --- a/helpers/lotOccupancyDB/moveLotTypeUp.d.ts +++ b/helpers/lotOccupancyDB/moveLotTypeUp.d.ts @@ -1,3 +1,3 @@ -export declare const moveLotTypeUp: (lotTypeId: number | string) => boolean; -export declare const moveLotTypeUpToTop: (lotTypeId: number | string) => boolean; +export declare function moveLotTypeUp(lotTypeId: number | string): boolean; +export declare function moveLotTypeUpToTop(lotTypeId: number | string): boolean; export default moveLotTypeUp; diff --git a/helpers/lotOccupancyDB/moveLotTypeUp.js b/helpers/lotOccupancyDB/moveLotTypeUp.js index 22463503..65cde83e 100644 --- a/helpers/lotOccupancyDB/moveLotTypeUp.js +++ b/helpers/lotOccupancyDB/moveLotTypeUp.js @@ -1,7 +1,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotTypesCache } from "../functions.cache.js"; -export const moveLotTypeUp = (lotTypeId) => { +export function moveLotTypeUp(lotTypeId) { const database = sqlite(databasePath); const currentOrderNumber = database .prepare("select orderNumber from LotTypes where lotTypeId = ?") @@ -11,10 +11,10 @@ export const moveLotTypeUp = (lotTypeId) => { return true; } database - .prepare("update LotTypes" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? - 1") + .prepare(`update LotTypes + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber = ? - 1`) .run(currentOrderNumber); const result = database .prepare("update LotTypes set orderNumber = ? - 1 where lotTypeId = ?") @@ -22,8 +22,8 @@ export const moveLotTypeUp = (lotTypeId) => { database.close(); clearLotTypesCache(); return result.changes > 0; -}; -export const moveLotTypeUpToTop = (lotTypeId) => { +} +export function moveLotTypeUpToTop(lotTypeId) { const database = sqlite(databasePath); const currentOrderNumber = database .prepare("select orderNumber from LotTypes where lotTypeId = ?") @@ -31,14 +31,14 @@ export const moveLotTypeUpToTop = (lotTypeId) => { if (currentOrderNumber > 0) { database.prepare("update LotTypes set orderNumber = -1 where lotTypeId = ?").run(lotTypeId); database - .prepare("update LotTypes" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber < ?") + .prepare(`update LotTypes + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber < ?`) .run(currentOrderNumber); } database.close(); clearLotTypesCache(); return true; -}; +} export default moveLotTypeUp; diff --git a/helpers/lotOccupancyDB/moveLotTypeUp.ts b/helpers/lotOccupancyDB/moveLotTypeUp.ts index b77617b6..e8e05476 100644 --- a/helpers/lotOccupancyDB/moveLotTypeUp.ts +++ b/helpers/lotOccupancyDB/moveLotTypeUp.ts @@ -4,7 +4,7 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotTypesCache } from "../functions.cache.js"; -export const moveLotTypeUp = (lotTypeId: number | string): boolean => { +export function moveLotTypeUp(lotTypeId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database @@ -18,10 +18,10 @@ export const moveLotTypeUp = (lotTypeId: number | string): boolean => { database .prepare( - "update LotTypes" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? - 1" + `update LotTypes + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber = ? - 1` ) .run(currentOrderNumber); @@ -34,9 +34,9 @@ export const moveLotTypeUp = (lotTypeId: number | string): boolean => { clearLotTypesCache(); return result.changes > 0; -}; +} -export const moveLotTypeUpToTop = (lotTypeId: number | string): boolean => { +export function moveLotTypeUpToTop(lotTypeId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database @@ -48,10 +48,10 @@ export const moveLotTypeUpToTop = (lotTypeId: number | string): boolean => { database .prepare( - "update LotTypes" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber < ?" + `update LotTypes + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber < ?` ) .run(currentOrderNumber); } @@ -61,6 +61,6 @@ export const moveLotTypeUpToTop = (lotTypeId: number | string): boolean => { clearLotTypesCache(); return true; -}; +} export default moveLotTypeUp; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypeDown.d.ts b/helpers/lotOccupancyDB/moveOccupancyTypeDown.d.ts index 18eb852c..4fffd4f4 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypeDown.d.ts +++ b/helpers/lotOccupancyDB/moveOccupancyTypeDown.d.ts @@ -1,3 +1,3 @@ -export declare const moveOccupancyTypeDown: (occupancyTypeId: number | string) => boolean; -export declare const moveOccupancyTypeDownToBottom: (occupancyTypeId: number | string) => boolean; +export declare function moveOccupancyTypeDown(occupancyTypeId: number | string): boolean; +export declare function moveOccupancyTypeDownToBottom(occupancyTypeId: number | string): boolean; export default moveOccupancyTypeDown; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypeDown.js b/helpers/lotOccupancyDB/moveOccupancyTypeDown.js index 78b048ea..53fb8956 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypeDown.js +++ b/helpers/lotOccupancyDB/moveOccupancyTypeDown.js @@ -1,16 +1,16 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearOccupancyTypesCache } from "../functions.cache.js"; -export const moveOccupancyTypeDown = (occupancyTypeId) => { +export function moveOccupancyTypeDown(occupancyTypeId) { const database = sqlite(databasePath); const currentOrderNumber = database .prepare("select orderNumber from OccupancyTypes where occupancyTypeId = ?") .get(occupancyTypeId).orderNumber; database - .prepare("update OccupancyTypes" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? + 1") + .prepare(`update OccupancyTypes + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber = ? + 1`) .run(currentOrderNumber); const result = database .prepare("update OccupancyTypes set orderNumber = ? + 1 where occupancyTypeId = ?") @@ -18,30 +18,30 @@ export const moveOccupancyTypeDown = (occupancyTypeId) => { database.close(); clearOccupancyTypesCache(); return result.changes > 0; -}; -export const moveOccupancyTypeDownToBottom = (occupancyTypeId) => { +} +export function moveOccupancyTypeDownToBottom(occupancyTypeId) { const database = sqlite(databasePath); const currentOrderNumber = database .prepare("select orderNumber from OccupancyTypes where occupancyTypeId = ?") .get(occupancyTypeId).orderNumber; const maxOrderNumber = database - .prepare("select max(orderNumber) as maxOrderNumber" + - " from OccupancyTypes" + - " where recordDelete_timeMillis is null") + .prepare(`select max(orderNumber) as maxOrderNumber + from OccupancyTypes + where recordDelete_timeMillis is null`) .get().maxOrderNumber; if (currentOrderNumber !== maxOrderNumber) { database .prepare("update OccupancyTypes set orderNumber = ? + 1 where occupancyTypeId = ?") .run(maxOrderNumber, occupancyTypeId); database - .prepare("update OccupancyTypes" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber > ?") + .prepare(`update OccupancyTypes + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber > ?`) .run(currentOrderNumber); } database.close(); clearOccupancyTypesCache(); return true; -}; +} export default moveOccupancyTypeDown; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypeDown.ts b/helpers/lotOccupancyDB/moveOccupancyTypeDown.ts index 636241c5..72593bcc 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypeDown.ts +++ b/helpers/lotOccupancyDB/moveOccupancyTypeDown.ts @@ -4,7 +4,7 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearOccupancyTypesCache } from "../functions.cache.js"; -export const moveOccupancyTypeDown = (occupancyTypeId: number | string): boolean => { +export function moveOccupancyTypeDown(occupancyTypeId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database @@ -13,10 +13,10 @@ export const moveOccupancyTypeDown = (occupancyTypeId: number | string): boolean database .prepare( - "update OccupancyTypes" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? + 1" + `update OccupancyTypes + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber = ? + 1` ) .run(currentOrderNumber); @@ -29,9 +29,9 @@ export const moveOccupancyTypeDown = (occupancyTypeId: number | string): boolean clearOccupancyTypesCache(); return result.changes > 0; -}; +} -export const moveOccupancyTypeDownToBottom = (occupancyTypeId: number | string): boolean => { +export function moveOccupancyTypeDownToBottom(occupancyTypeId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database @@ -40,9 +40,9 @@ export const moveOccupancyTypeDownToBottom = (occupancyTypeId: number | string): const maxOrderNumber: number = database .prepare( - "select max(orderNumber) as maxOrderNumber" + - " from OccupancyTypes" + - " where recordDelete_timeMillis is null" + `select max(orderNumber) as maxOrderNumber + from OccupancyTypes + where recordDelete_timeMillis is null` ) .get().maxOrderNumber; @@ -53,10 +53,10 @@ export const moveOccupancyTypeDownToBottom = (occupancyTypeId: number | string): database .prepare( - "update OccupancyTypes" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber > ?" + `update OccupancyTypes + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber > ?` ) .run(currentOrderNumber); } @@ -66,6 +66,6 @@ export const moveOccupancyTypeDownToBottom = (occupancyTypeId: number | string): clearOccupancyTypesCache(); return true; -}; +} export default moveOccupancyTypeDown; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypeFieldDown.d.ts b/helpers/lotOccupancyDB/moveOccupancyTypeFieldDown.d.ts index 06d0a66e..fb8f077f 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypeFieldDown.d.ts +++ b/helpers/lotOccupancyDB/moveOccupancyTypeFieldDown.d.ts @@ -1,3 +1,3 @@ -export declare const moveOccupancyTypeFieldDown: (occupancyTypeFieldId: number | string) => boolean; -export declare const moveOccupancyTypeFieldDownToBottom: (occupancyTypeFieldId: number | string) => boolean; +export declare function moveOccupancyTypeFieldDown(occupancyTypeFieldId: number | string): boolean; +export declare function moveOccupancyTypeFieldDownToBottom(occupancyTypeFieldId: number | string): boolean; export default moveOccupancyTypeFieldDown; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypeFieldDown.js b/helpers/lotOccupancyDB/moveOccupancyTypeFieldDown.js index 68734145..91da9a1b 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypeFieldDown.js +++ b/helpers/lotOccupancyDB/moveOccupancyTypeFieldDown.js @@ -1,12 +1,10 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearOccupancyTypesCache } from "../functions.cache.js"; -export const moveOccupancyTypeFieldDown = (occupancyTypeFieldId) => { +export function moveOccupancyTypeFieldDown(occupancyTypeFieldId) { const database = sqlite(databasePath); const currentField = database - .prepare("select occupancyTypeId, orderNumber" + - " from OccupancyTypeFields" + - " where occupancyTypeFieldId = ?") + .prepare(`select occupancyTypeId, orderNumber from OccupancyTypeFields where occupancyTypeFieldId = ?`) .get(occupancyTypeFieldId); database .prepare("update OccupancyTypeFields" + @@ -18,20 +16,18 @@ export const moveOccupancyTypeFieldDown = (occupancyTypeFieldId) => { " and orderNumber = ? + 1") .run(currentField.orderNumber); const result = database - .prepare("update OccupancyTypeFields" + - " set orderNumber = ? + 1" + - " where occupancyTypeFieldId = ?") + .prepare(`update OccupancyTypeFields set orderNumber = ? + 1 where occupancyTypeFieldId = ?`) .run(currentField.orderNumber, occupancyTypeFieldId); database.close(); clearOccupancyTypesCache(); return result.changes > 0; -}; -export const moveOccupancyTypeFieldDownToBottom = (occupancyTypeFieldId) => { +} +export function moveOccupancyTypeFieldDownToBottom(occupancyTypeFieldId) { const database = sqlite(databasePath); const currentField = database - .prepare("select occupancyTypeId, orderNumber" + - " from OccupancyTypeFields" + - " where occupancyTypeFieldId = ?") + .prepare(`select occupancyTypeId, orderNumber + from OccupancyTypeFields + where occupancyTypeFieldId = ?`) .get(occupancyTypeFieldId); const occupancyTypeParameters = []; if (currentField.occupancyTypeId) { @@ -63,5 +59,5 @@ export const moveOccupancyTypeFieldDownToBottom = (occupancyTypeFieldId) => { database.close(); clearOccupancyTypesCache(); return true; -}; +} export default moveOccupancyTypeFieldDown; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypeFieldDown.ts b/helpers/lotOccupancyDB/moveOccupancyTypeFieldDown.ts index 63f33fc5..b4fd716d 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypeFieldDown.ts +++ b/helpers/lotOccupancyDB/moveOccupancyTypeFieldDown.ts @@ -4,14 +4,12 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearOccupancyTypesCache } from "../functions.cache.js"; -export const moveOccupancyTypeFieldDown = (occupancyTypeFieldId: number | string): boolean => { +export function moveOccupancyTypeFieldDown(occupancyTypeFieldId: number | string): boolean { const database = sqlite(databasePath); const currentField: { occupancyTypeId?: number; orderNumber: number } = database .prepare( - "select occupancyTypeId, orderNumber" + - " from OccupancyTypeFields" + - " where occupancyTypeFieldId = ?" + `select occupancyTypeId, orderNumber from OccupancyTypeFields where occupancyTypeFieldId = ?` ) .get(occupancyTypeFieldId); @@ -29,9 +27,7 @@ export const moveOccupancyTypeFieldDown = (occupancyTypeFieldId: number | string const result = database .prepare( - "update OccupancyTypeFields" + - " set orderNumber = ? + 1" + - " where occupancyTypeFieldId = ?" + `update OccupancyTypeFields set orderNumber = ? + 1 where occupancyTypeFieldId = ?` ) .run(currentField.orderNumber, occupancyTypeFieldId); @@ -40,18 +36,16 @@ export const moveOccupancyTypeFieldDown = (occupancyTypeFieldId: number | string clearOccupancyTypesCache(); return result.changes > 0; -}; +} -export const moveOccupancyTypeFieldDownToBottom = ( - occupancyTypeFieldId: number | string -): boolean => { +export function moveOccupancyTypeFieldDownToBottom(occupancyTypeFieldId: number | string): boolean { const database = sqlite(databasePath); const currentField: { occupancyTypeId?: number; orderNumber: number } = database .prepare( - "select occupancyTypeId, orderNumber" + - " from OccupancyTypeFields" + - " where occupancyTypeFieldId = ?" + `select occupancyTypeId, orderNumber + from OccupancyTypeFields + where occupancyTypeFieldId = ?` ) .get(occupancyTypeFieldId); @@ -99,6 +93,6 @@ export const moveOccupancyTypeFieldDownToBottom = ( clearOccupancyTypesCache(); return true; -}; +} export default moveOccupancyTypeFieldDown; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.d.ts b/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.d.ts index 21064c8f..19cdf66b 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.d.ts +++ b/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.d.ts @@ -1,3 +1,3 @@ -export declare const moveOccupancyTypeFieldUp: (occupancyTypeFieldId: number | string) => boolean; -export declare const moveOccupancyTypeFieldUpToTop: (occupancyTypeFieldId: number | string) => boolean; +export declare function moveOccupancyTypeFieldUp(occupancyTypeFieldId: number | string): boolean; +export declare function moveOccupancyTypeFieldUpToTop(occupancyTypeFieldId: number | string): boolean; export default moveOccupancyTypeFieldUp; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.js b/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.js index 6100266c..52642e39 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.js +++ b/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.js @@ -1,12 +1,10 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearOccupancyTypesCache } from "../functions.cache.js"; -export const moveOccupancyTypeFieldUp = (occupancyTypeFieldId) => { +export function moveOccupancyTypeFieldUp(occupancyTypeFieldId) { const database = sqlite(databasePath); const currentField = database - .prepare("select occupancyTypeId, orderNumber" + - " from OccupancyTypeFields" + - " where occupancyTypeFieldId = ?") + .prepare(`select occupancyTypeId, orderNumber from OccupancyTypeFields where occupancyTypeFieldId = ?`) .get(occupancyTypeFieldId); if (currentField.orderNumber <= 0) { database.close(); @@ -22,25 +20,20 @@ export const moveOccupancyTypeFieldUp = (occupancyTypeFieldId) => { " and orderNumber = ? - 1") .run(currentField.orderNumber); const result = database - .prepare("update OccupancyTypeFields" + - " set orderNumber = ? - 1" + - " where occupancyTypeFieldId = ?") + .prepare(`update OccupancyTypeFields set orderNumber = ? - 1 where occupancyTypeFieldId = ?`) .run(currentField.orderNumber, occupancyTypeFieldId); database.close(); clearOccupancyTypesCache(); return result.changes > 0; -}; -export const moveOccupancyTypeFieldUpToTop = (occupancyTypeFieldId) => { +} +export function moveOccupancyTypeFieldUpToTop(occupancyTypeFieldId) { const database = sqlite(databasePath); const currentField = database - .prepare("select occupancyTypeId, orderNumber" + - " from OccupancyTypeFields" + - " where occupancyTypeFieldId = ?") + .prepare(`select occupancyTypeId, orderNumber from OccupancyTypeFields where occupancyTypeFieldId = ?`) .get(occupancyTypeFieldId); if (currentField.orderNumber > 0) { database - .prepare("update OccupancyTypeFields set orderNumber = -1" + - " where occupancyTypeFieldId = ?") + .prepare(`update OccupancyTypeFields set orderNumber = -1 where occupancyTypeFieldId = ?`) .run(occupancyTypeFieldId); const occupancyTypeParameters = []; if (currentField.occupancyTypeId) { @@ -60,5 +53,5 @@ export const moveOccupancyTypeFieldUpToTop = (occupancyTypeFieldId) => { database.close(); clearOccupancyTypesCache(); return true; -}; +} export default moveOccupancyTypeFieldUp; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.ts b/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.ts index f9ca7270..54b0f691 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.ts +++ b/helpers/lotOccupancyDB/moveOccupancyTypeFieldUp.ts @@ -4,14 +4,12 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearOccupancyTypesCache } from "../functions.cache.js"; -export const moveOccupancyTypeFieldUp = (occupancyTypeFieldId: number | string): boolean => { +export function moveOccupancyTypeFieldUp(occupancyTypeFieldId: number | string): boolean { const database = sqlite(databasePath); const currentField: { occupancyTypeId?: number; orderNumber: number } = database .prepare( - "select occupancyTypeId, orderNumber" + - " from OccupancyTypeFields" + - " where occupancyTypeFieldId = ?" + `select occupancyTypeId, orderNumber from OccupancyTypeFields where occupancyTypeFieldId = ?` ) .get(occupancyTypeFieldId); @@ -34,9 +32,7 @@ export const moveOccupancyTypeFieldUp = (occupancyTypeFieldId: number | string): const result = database .prepare( - "update OccupancyTypeFields" + - " set orderNumber = ? - 1" + - " where occupancyTypeFieldId = ?" + `update OccupancyTypeFields set orderNumber = ? - 1 where occupancyTypeFieldId = ?` ) .run(currentField.orderNumber, occupancyTypeFieldId); @@ -45,24 +41,21 @@ export const moveOccupancyTypeFieldUp = (occupancyTypeFieldId: number | string): clearOccupancyTypesCache(); return result.changes > 0; -}; +} -export const moveOccupancyTypeFieldUpToTop = (occupancyTypeFieldId: number | string): boolean => { +export function moveOccupancyTypeFieldUpToTop(occupancyTypeFieldId: number | string): boolean { const database = sqlite(databasePath); const currentField: { occupancyTypeId?: number; orderNumber: number } = database .prepare( - "select occupancyTypeId, orderNumber" + - " from OccupancyTypeFields" + - " where occupancyTypeFieldId = ?" + `select occupancyTypeId, orderNumber from OccupancyTypeFields where occupancyTypeFieldId = ?` ) .get(occupancyTypeFieldId); if (currentField.orderNumber > 0) { database .prepare( - "update OccupancyTypeFields set orderNumber = -1" + - " where occupancyTypeFieldId = ?" + `update OccupancyTypeFields set orderNumber = -1 where occupancyTypeFieldId = ?` ) .run(occupancyTypeFieldId); @@ -92,6 +85,6 @@ export const moveOccupancyTypeFieldUpToTop = (occupancyTypeFieldId: number | str clearOccupancyTypesCache(); return true; -}; +} export default moveOccupancyTypeFieldUp; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypePrintDown.d.ts b/helpers/lotOccupancyDB/moveOccupancyTypePrintDown.d.ts index 3dc50409..6472adb9 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypePrintDown.d.ts +++ b/helpers/lotOccupancyDB/moveOccupancyTypePrintDown.d.ts @@ -1,3 +1,3 @@ -export declare const moveOccupancyTypePrintDown: (occupancyTypeId: number | string, printEJS: string) => boolean; -export declare const moveOccupancyTypePrintDownToBottom: (occupancyTypeId: number | string, printEJS: string) => boolean; +export declare function moveOccupancyTypePrintDown(occupancyTypeId: number | string, printEJS: string): boolean; +export declare function moveOccupancyTypePrintDownToBottom(occupancyTypeId: number | string, printEJS: string): boolean; export default moveOccupancyTypePrintDown; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypePrintDown.js b/helpers/lotOccupancyDB/moveOccupancyTypePrintDown.js index 73580fe3..5e689957 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypePrintDown.js +++ b/helpers/lotOccupancyDB/moveOccupancyTypePrintDown.js @@ -1,61 +1,53 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearOccupancyTypesCache } from "../functions.cache.js"; -export const moveOccupancyTypePrintDown = (occupancyTypeId, printEJS) => { +export function moveOccupancyTypePrintDown(occupancyTypeId, printEJS) { const database = sqlite(databasePath); const currentOrderNumber = database - .prepare("select orderNumber" + - " from OccupancyTypePrints" + - " where occupancyTypeId = ?" + - " and printEJS = ?") + .prepare(`select orderNumber from OccupancyTypePrints where occupancyTypeId = ? and printEJS = ?`) .get(occupancyTypeId, printEJS).orderNumber; database - .prepare("update OccupancyTypePrints" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and occupancyTypeId = '" + occupancyTypeId + "'" + - " and orderNumber = ? + 1") - .run(currentOrderNumber); + .prepare(`update OccupancyTypePrints + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and occupancyTypeId = ? + and orderNumber = ? + 1`) + .run(occupancyTypeId, currentOrderNumber); const result = database - .prepare("update OccupancyTypePrints" + - " set orderNumber = ? + 1" + - " where occupancyTypeId = ?" + - " and printEJS = ?") + .prepare(`update OccupancyTypePrints set orderNumber = ? + 1 where occupancyTypeId = ? and printEJS = ?`) .run(currentOrderNumber, occupancyTypeId, printEJS); database.close(); clearOccupancyTypesCache(); return result.changes > 0; -}; -export const moveOccupancyTypePrintDownToBottom = (occupancyTypeId, printEJS) => { +} +export function moveOccupancyTypePrintDownToBottom(occupancyTypeId, printEJS) { const database = sqlite(databasePath); const currentOrderNumber = database - .prepare("select orderNumber" + - " from OccupancyTypePrints" + - " where occupancyTypeId = ?" + - " and printEJS = ?") + .prepare(`select orderNumber from OccupancyTypePrints where occupancyTypeId = ? and printEJS = ?`) .get(occupancyTypeId, printEJS).orderNumber; const maxOrderNumber = database - .prepare("select max(orderNumber) as maxOrderNumber" + - " from OccupancyTypePrints" + - " where recordDelete_timeMillis is null" + - " and occupancyTypeId = ?") + .prepare(`select max(orderNumber) as maxOrderNumber + from OccupancyTypePrints + where recordDelete_timeMillis is null + and occupancyTypeId = ?`) .get(occupancyTypeId).maxOrderNumber; if (currentOrderNumber !== maxOrderNumber) { database - .prepare("update OccupancyTypePrints set orderNumber = ? + 1" + - " where occupancyTypeId = ?" + - " and printEJS = ?") + .prepare(`update OccupancyTypePrints + set orderNumber = ? + 1 + where occupancyTypeId = ? + and printEJS = ?`) .run(maxOrderNumber, occupancyTypeId, printEJS); database - .prepare("update OccupancyTypeFields" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and occupancyTypeId = ?" + - " and orderNumber > ?") + .prepare(`update OccupancyTypeFields + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and occupancyTypeId = ? + and orderNumber > ?`) .run(occupancyTypeId, currentOrderNumber); } database.close(); clearOccupancyTypesCache(); return true; -}; +} export default moveOccupancyTypePrintDown; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypePrintDown.ts b/helpers/lotOccupancyDB/moveOccupancyTypePrintDown.ts index f9ffe87b..0f2ecb2c 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypePrintDown.ts +++ b/helpers/lotOccupancyDB/moveOccupancyTypePrintDown.ts @@ -4,34 +4,31 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearOccupancyTypesCache } from "../functions.cache.js"; -export const moveOccupancyTypePrintDown = (occupancyTypeId: number | string, printEJS: string): boolean => { +export function moveOccupancyTypePrintDown( + occupancyTypeId: number | string, + printEJS: string +): boolean { const database = sqlite(databasePath); const currentOrderNumber = database .prepare( - "select orderNumber" + - " from OccupancyTypePrints" + - " where occupancyTypeId = ?" + - " and printEJS = ?" + `select orderNumber from OccupancyTypePrints where occupancyTypeId = ? and printEJS = ?` ) .get(occupancyTypeId, printEJS).orderNumber; database .prepare( - "update OccupancyTypePrints" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and occupancyTypeId = '" + occupancyTypeId + "'" + - " and orderNumber = ? + 1" + `update OccupancyTypePrints + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and occupancyTypeId = ? + and orderNumber = ? + 1` ) - .run(currentOrderNumber); + .run(occupancyTypeId, currentOrderNumber); const result = database .prepare( - "update OccupancyTypePrints" + - " set orderNumber = ? + 1" + - " where occupancyTypeId = ?" + - " and printEJS = ?" + `update OccupancyTypePrints set orderNumber = ? + 1 where occupancyTypeId = ? and printEJS = ?` ) .run(currentOrderNumber, occupancyTypeId, printEJS); @@ -40,48 +37,46 @@ export const moveOccupancyTypePrintDown = (occupancyTypeId: number | string, pri clearOccupancyTypesCache(); return result.changes > 0; -}; +} -export const moveOccupancyTypePrintDownToBottom = ( +export function moveOccupancyTypePrintDownToBottom( occupancyTypeId: number | string, printEJS: string -): boolean => { +): boolean { const database = sqlite(databasePath); const currentOrderNumber = database .prepare( - "select orderNumber" + - " from OccupancyTypePrints" + - " where occupancyTypeId = ?" + - " and printEJS = ?" + `select orderNumber from OccupancyTypePrints where occupancyTypeId = ? and printEJS = ?` ) .get(occupancyTypeId, printEJS).orderNumber; const maxOrderNumber: number = database .prepare( - "select max(orderNumber) as maxOrderNumber" + - " from OccupancyTypePrints" + - " where recordDelete_timeMillis is null" + - " and occupancyTypeId = ?" + `select max(orderNumber) as maxOrderNumber + from OccupancyTypePrints + where recordDelete_timeMillis is null + and occupancyTypeId = ?` ) .get(occupancyTypeId).maxOrderNumber; if (currentOrderNumber !== maxOrderNumber) { database .prepare( - "update OccupancyTypePrints set orderNumber = ? + 1" + - " where occupancyTypeId = ?" + - " and printEJS = ?" + `update OccupancyTypePrints + set orderNumber = ? + 1 + where occupancyTypeId = ? + and printEJS = ?` ) .run(maxOrderNumber, occupancyTypeId, printEJS); - database + database .prepare( - "update OccupancyTypeFields" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and occupancyTypeId = ?" + - " and orderNumber > ?" + `update OccupancyTypeFields + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and occupancyTypeId = ? + and orderNumber > ?` ) .run(occupancyTypeId, currentOrderNumber); } @@ -91,6 +86,6 @@ export const moveOccupancyTypePrintDownToBottom = ( clearOccupancyTypesCache(); return true; -}; +} export default moveOccupancyTypePrintDown; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypePrintUp.d.ts b/helpers/lotOccupancyDB/moveOccupancyTypePrintUp.d.ts index 0208c49b..26022459 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypePrintUp.d.ts +++ b/helpers/lotOccupancyDB/moveOccupancyTypePrintUp.d.ts @@ -1,3 +1,3 @@ -export declare const moveOccupancyTypePrintUp: (occupancyTypeId: number | string, printEJS: string) => boolean; -export declare const moveOccupancyTypePrintUpToTop: (occupancyTypeId: number | string, printEJS: string) => boolean; +export declare function moveOccupancyTypePrintUp(occupancyTypeId: number | string, printEJS: string): boolean; +export declare function moveOccupancyTypePrintUpToTop(occupancyTypeId: number | string, printEJS: string): boolean; export default moveOccupancyTypePrintUp; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypePrintUp.js b/helpers/lotOccupancyDB/moveOccupancyTypePrintUp.js index 1c88fed8..b91714ce 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypePrintUp.js +++ b/helpers/lotOccupancyDB/moveOccupancyTypePrintUp.js @@ -1,59 +1,51 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearOccupancyTypesCache } from "../functions.cache.js"; -export const moveOccupancyTypePrintUp = (occupancyTypeId, printEJS) => { +export function moveOccupancyTypePrintUp(occupancyTypeId, printEJS) { const database = sqlite(databasePath); const currentOrderNumber = database - .prepare("select orderNumber" + - " from OccupancyTypePrints" + - " where occupancyTypeId = ?" + - " and printEJS = ?") + .prepare(`select orderNumber from OccupancyTypePrints where occupancyTypeId = ? and printEJS = ?`) .get(occupancyTypeId, printEJS).orderNumber; if (currentOrderNumber <= 0) { database.close(); return true; } database - .prepare("update OccupancyTypePrints" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and occupancyTypeId = '" + occupancyTypeId + "'" + - " and orderNumber = ? - 1") - .run(currentOrderNumber); + .prepare(`update OccupancyTypePrints + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and occupancyTypeId = ? + and orderNumber = ? - 1`) + .run(occupancyTypeId, currentOrderNumber); const result = database - .prepare("update OccupancyTypePrints" + - " set orderNumber = ? - 1" + - " where occupancyTypeId = ?" + - " and printEJS = ?") + .prepare(`update OccupancyTypePrints set orderNumber = ? - 1 where occupancyTypeId = ? and printEJS = ?`) .run(currentOrderNumber, occupancyTypeId, printEJS); database.close(); clearOccupancyTypesCache(); return result.changes > 0; -}; -export const moveOccupancyTypePrintUpToTop = (occupancyTypeId, printEJS) => { +} +export function moveOccupancyTypePrintUpToTop(occupancyTypeId, printEJS) { const database = sqlite(databasePath); const currentOrderNumber = database - .prepare("select orderNumber" + - " from OccupancyTypePrints" + - " where occupancyTypeId = ?" + - " and printEJS = ?") + .prepare(`select orderNumber from OccupancyTypePrints where occupancyTypeId = ? and printEJS = ?`) .get(occupancyTypeId, printEJS).orderNumber; if (currentOrderNumber > 0) { database - .prepare("update OccupancyTypePrints set orderNumber = -1" + - " where occupancyTypeId = ?" + - " and printEJS = ?") + .prepare(`update OccupancyTypePrints + set orderNumber = -1 + where occupancyTypeId = ? + and printEJS = ?`) .run(occupancyTypeId, printEJS); database - .prepare("update OccupancyTypePrints" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and occupancyTypeId = ?" + - " and orderNumber < ?") + .prepare(`update OccupancyTypePrints + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and occupancyTypeId = ? + and orderNumber < ?`) .run(occupancyTypeId, currentOrderNumber); } database.close(); clearOccupancyTypesCache(); return true; -}; +} export default moveOccupancyTypePrintUp; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypePrintUp.ts b/helpers/lotOccupancyDB/moveOccupancyTypePrintUp.ts index 6f89ee17..26fb64d2 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypePrintUp.ts +++ b/helpers/lotOccupancyDB/moveOccupancyTypePrintUp.ts @@ -4,15 +4,15 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearOccupancyTypesCache } from "../functions.cache.js"; -export const moveOccupancyTypePrintUp = (occupancyTypeId: number | string, printEJS: string): boolean => { +export function moveOccupancyTypePrintUp( + occupancyTypeId: number | string, + printEJS: string +): boolean { const database = sqlite(databasePath); const currentOrderNumber = database .prepare( - "select orderNumber" + - " from OccupancyTypePrints" + - " where occupancyTypeId = ?" + - " and printEJS = ?" + `select orderNumber from OccupancyTypePrints where occupancyTypeId = ? and printEJS = ?` ) .get(occupancyTypeId, printEJS).orderNumber; @@ -23,20 +23,17 @@ export const moveOccupancyTypePrintUp = (occupancyTypeId: number | string, print database .prepare( - "update OccupancyTypePrints" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and occupancyTypeId = '" + occupancyTypeId + "'" + - " and orderNumber = ? - 1" + `update OccupancyTypePrints + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and occupancyTypeId = ? + and orderNumber = ? - 1` ) - .run(currentOrderNumber); + .run(occupancyTypeId, currentOrderNumber); const result = database .prepare( - "update OccupancyTypePrints" + - " set orderNumber = ? - 1" + - " where occupancyTypeId = ?" + - " and printEJS = ?" + `update OccupancyTypePrints set orderNumber = ? - 1 where occupancyTypeId = ? and printEJS = ?` ) .run(currentOrderNumber, occupancyTypeId, printEJS); @@ -45,36 +42,37 @@ export const moveOccupancyTypePrintUp = (occupancyTypeId: number | string, print clearOccupancyTypesCache(); return result.changes > 0; -}; +} -export const moveOccupancyTypePrintUpToTop = (occupancyTypeId: number | string, printEJS: string): boolean => { +export function moveOccupancyTypePrintUpToTop( + occupancyTypeId: number | string, + printEJS: string +): boolean { const database = sqlite(databasePath); const currentOrderNumber = database .prepare( - "select orderNumber" + - " from OccupancyTypePrints" + - " where occupancyTypeId = ?" + - " and printEJS = ?" + `select orderNumber from OccupancyTypePrints where occupancyTypeId = ? and printEJS = ?` ) .get(occupancyTypeId, printEJS).orderNumber; if (currentOrderNumber > 0) { database .prepare( - "update OccupancyTypePrints set orderNumber = -1" + - " where occupancyTypeId = ?" + - " and printEJS = ?" + `update OccupancyTypePrints + set orderNumber = -1 + where occupancyTypeId = ? + and printEJS = ?` ) .run(occupancyTypeId, printEJS); database .prepare( - "update OccupancyTypePrints" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and occupancyTypeId = ?" + - " and orderNumber < ?" + `update OccupancyTypePrints + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and occupancyTypeId = ? + and orderNumber < ?` ) .run(occupancyTypeId, currentOrderNumber); } @@ -84,6 +82,6 @@ export const moveOccupancyTypePrintUpToTop = (occupancyTypeId: number | string, clearOccupancyTypesCache(); return true; -}; +} export default moveOccupancyTypePrintUp; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypeUp.d.ts b/helpers/lotOccupancyDB/moveOccupancyTypeUp.d.ts index 95f5df1c..d0f9c666 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypeUp.d.ts +++ b/helpers/lotOccupancyDB/moveOccupancyTypeUp.d.ts @@ -1,3 +1,3 @@ -export declare const moveOccupancyTypeUp: (occupancyTypeId: number | string) => boolean; -export declare const moveOccupancyTypeUpToTop: (occupancyTypeId: number | string) => boolean; +export declare function moveOccupancyTypeUp(occupancyTypeId: number | string): boolean; +export declare function moveOccupancyTypeUpToTop(occupancyTypeId: number | string): boolean; export default moveOccupancyTypeUp; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypeUp.js b/helpers/lotOccupancyDB/moveOccupancyTypeUp.js index 7f928b99..bf5a442d 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypeUp.js +++ b/helpers/lotOccupancyDB/moveOccupancyTypeUp.js @@ -1,7 +1,7 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearOccupancyTypesCache } from "../functions.cache.js"; -export const moveOccupancyTypeUp = (occupancyTypeId) => { +export function moveOccupancyTypeUp(occupancyTypeId) { const database = sqlite(databasePath); const currentOrderNumber = database .prepare("select orderNumber from OccupancyTypes where occupancyTypeId = ?") @@ -11,10 +11,10 @@ export const moveOccupancyTypeUp = (occupancyTypeId) => { return true; } database - .prepare("update OccupancyTypes" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? - 1") + .prepare(`update OccupancyTypes + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber = ? - 1`) .run(currentOrderNumber); const result = database .prepare("update OccupancyTypes set orderNumber = ? - 1 where occupancyTypeId = ?") @@ -22,8 +22,8 @@ export const moveOccupancyTypeUp = (occupancyTypeId) => { database.close(); clearOccupancyTypesCache(); return result.changes > 0; -}; -export const moveOccupancyTypeUpToTop = (occupancyTypeId) => { +} +export function moveOccupancyTypeUpToTop(occupancyTypeId) { const database = sqlite(databasePath); const currentOrderNumber = database .prepare("select orderNumber from OccupancyTypes where occupancyTypeId = ?") @@ -33,14 +33,14 @@ export const moveOccupancyTypeUpToTop = (occupancyTypeId) => { .prepare("update OccupancyTypes set orderNumber = -1 where occupancyTypeId = ?") .run(occupancyTypeId); database - .prepare("update OccupancyTypes" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber < ?") + .prepare(`update OccupancyTypes + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber < ?`) .run(currentOrderNumber); } database.close(); clearOccupancyTypesCache(); return true; -}; +} export default moveOccupancyTypeUp; diff --git a/helpers/lotOccupancyDB/moveOccupancyTypeUp.ts b/helpers/lotOccupancyDB/moveOccupancyTypeUp.ts index b76dea24..43da74b1 100644 --- a/helpers/lotOccupancyDB/moveOccupancyTypeUp.ts +++ b/helpers/lotOccupancyDB/moveOccupancyTypeUp.ts @@ -4,7 +4,7 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearOccupancyTypesCache } from "../functions.cache.js"; -export const moveOccupancyTypeUp = (occupancyTypeId: number | string): boolean => { +export function moveOccupancyTypeUp(occupancyTypeId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database @@ -18,10 +18,10 @@ export const moveOccupancyTypeUp = (occupancyTypeId: number | string): boolean = database .prepare( - "update OccupancyTypes" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? - 1" + `update OccupancyTypes + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber = ? - 1` ) .run(currentOrderNumber); @@ -34,9 +34,9 @@ export const moveOccupancyTypeUp = (occupancyTypeId: number | string): boolean = clearOccupancyTypesCache(); return result.changes > 0; -}; +} -export const moveOccupancyTypeUpToTop = (occupancyTypeId: number | string): boolean => { +export function moveOccupancyTypeUpToTop(occupancyTypeId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database @@ -50,10 +50,10 @@ export const moveOccupancyTypeUpToTop = (occupancyTypeId: number | string): bool database .prepare( - "update OccupancyTypes" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber < ?" + `update OccupancyTypes + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber < ?` ) .run(currentOrderNumber); } @@ -63,6 +63,6 @@ export const moveOccupancyTypeUpToTop = (occupancyTypeId: number | string): bool clearOccupancyTypesCache(); return true; -}; +} export default moveOccupancyTypeUp; diff --git a/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.d.ts b/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.d.ts index 7f4e2e78..1da7eecc 100644 --- a/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.d.ts +++ b/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.d.ts @@ -1,3 +1,3 @@ -export declare const moveWorkOrderMilestoneTypeDown: (workOrderMilestoneTypeId: number | string) => boolean; -export declare const moveWorkOrderMilestoneTypeDownToBottom: (workOrderMilestoneTypeId: number | string) => boolean; +export declare function moveWorkOrderMilestoneTypeDown(workOrderMilestoneTypeId: number | string): boolean; +export declare function moveWorkOrderMilestoneTypeDownToBottom(workOrderMilestoneTypeId: number | string): boolean; export default moveWorkOrderMilestoneTypeDown; diff --git a/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.js b/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.js index a3e318b3..fc353bd9 100644 --- a/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.js +++ b/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.js @@ -1,51 +1,49 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearWorkOrderMilestoneTypesCache } from "../functions.cache.js"; -export const moveWorkOrderMilestoneTypeDown = (workOrderMilestoneTypeId) => { +export function moveWorkOrderMilestoneTypeDown(workOrderMilestoneTypeId) { const database = sqlite(databasePath); const currentOrderNumber = database - .prepare("select orderNumber" + - " from WorkOrderMilestoneTypes" + - " where workOrderMilestoneTypeId = ?") + .prepare(`select orderNumber from WorkOrderMilestoneTypes where workOrderMilestoneTypeId = ?`) .get(workOrderMilestoneTypeId).orderNumber; database - .prepare("update WorkOrderMilestoneTypes" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? + 1") + .prepare(`update WorkOrderMilestoneTypes + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber = ? + 1`) .run(currentOrderNumber); const result = database - .prepare("update WorkOrderMilestoneTypes" + - " set orderNumber = ? + 1" + - " where workOrderMilestoneTypeId = ?") + .prepare(`update WorkOrderMilestoneTypes + set orderNumber = ? + 1 + where workOrderMilestoneTypeId = ?`) .run(currentOrderNumber, workOrderMilestoneTypeId); database.close(); clearWorkOrderMilestoneTypesCache(); return result.changes > 0; -}; -export const moveWorkOrderMilestoneTypeDownToBottom = (workOrderMilestoneTypeId) => { +} +export function moveWorkOrderMilestoneTypeDownToBottom(workOrderMilestoneTypeId) { const database = sqlite(databasePath); const currentOrderNumber = database .prepare("select orderNumber from WorkOrderMilestoneTypes where workOrderMilestoneTypeId = ?") .get(workOrderMilestoneTypeId).orderNumber; const maxOrderNumber = database - .prepare("select max(orderNumber) as maxOrderNumber" + - " from WorkOrderMilestoneTypes" + - " where recordDelete_timeMillis is null") + .prepare(`select max(orderNumber) as maxOrderNumber + from WorkOrderMilestoneTypes + where recordDelete_timeMillis is null`) .get().maxOrderNumber; if (currentOrderNumber !== maxOrderNumber) { database .prepare("update WorkOrderMilestoneTypes set orderNumber = ? + 1 where workOrderMilestoneTypeId = ?") .run(maxOrderNumber, workOrderMilestoneTypeId); database - .prepare("update WorkOrderMilestoneTypes" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber > ?") + .prepare(`update WorkOrderMilestoneTypes + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber > ?`) .run(currentOrderNumber); } database.close(); clearWorkOrderMilestoneTypesCache(); return true; -}; +} export default moveWorkOrderMilestoneTypeDown; diff --git a/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.ts b/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.ts index a2a93200..c5584994 100644 --- a/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.ts +++ b/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeDown.ts @@ -4,33 +4,29 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearWorkOrderMilestoneTypesCache } from "../functions.cache.js"; -export const moveWorkOrderMilestoneTypeDown = ( - workOrderMilestoneTypeId: number | string -): boolean => { +export function moveWorkOrderMilestoneTypeDown(workOrderMilestoneTypeId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database .prepare( - "select orderNumber" + - " from WorkOrderMilestoneTypes" + - " where workOrderMilestoneTypeId = ?" + `select orderNumber from WorkOrderMilestoneTypes where workOrderMilestoneTypeId = ?` ) .get(workOrderMilestoneTypeId).orderNumber; database .prepare( - "update WorkOrderMilestoneTypes" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? + 1" + `update WorkOrderMilestoneTypes + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber = ? + 1` ) .run(currentOrderNumber); const result = database .prepare( - "update WorkOrderMilestoneTypes" + - " set orderNumber = ? + 1" + - " where workOrderMilestoneTypeId = ?" + `update WorkOrderMilestoneTypes + set orderNumber = ? + 1 + where workOrderMilestoneTypeId = ?` ) .run(currentOrderNumber, workOrderMilestoneTypeId); @@ -39,11 +35,11 @@ export const moveWorkOrderMilestoneTypeDown = ( clearWorkOrderMilestoneTypesCache(); return result.changes > 0; -}; +} -export const moveWorkOrderMilestoneTypeDownToBottom = ( +export function moveWorkOrderMilestoneTypeDownToBottom( workOrderMilestoneTypeId: number | string -): boolean => { +): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database @@ -54,9 +50,9 @@ export const moveWorkOrderMilestoneTypeDownToBottom = ( const maxOrderNumber: number = database .prepare( - "select max(orderNumber) as maxOrderNumber" + - " from WorkOrderMilestoneTypes" + - " where recordDelete_timeMillis is null" + `select max(orderNumber) as maxOrderNumber + from WorkOrderMilestoneTypes + where recordDelete_timeMillis is null` ) .get().maxOrderNumber; @@ -69,10 +65,10 @@ export const moveWorkOrderMilestoneTypeDownToBottom = ( database .prepare( - "update WorkOrderMilestoneTypes" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber > ?" + `update WorkOrderMilestoneTypes + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber > ?` ) .run(currentOrderNumber); } @@ -82,6 +78,6 @@ export const moveWorkOrderMilestoneTypeDownToBottom = ( clearWorkOrderMilestoneTypesCache(); return true; -}; +} export default moveWorkOrderMilestoneTypeDown; diff --git a/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.d.ts b/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.d.ts index 8883e3fd..aa538e78 100644 --- a/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.d.ts +++ b/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.d.ts @@ -1,3 +1,3 @@ -export declare const moveWorkOrderMilestoneTypeUp: (workOrderMilestoneTypeId: number | string) => boolean; -export declare const moveWorkOrderMilestoneTypeUpToTop: (workOrderMilestoneTypeId: number | string) => boolean; +export declare function moveWorkOrderMilestoneTypeUp(workOrderMilestoneTypeId: number | string): boolean; +export declare function moveWorkOrderMilestoneTypeUpToTop(workOrderMilestoneTypeId: number | string): boolean; export default moveWorkOrderMilestoneTypeUp; diff --git a/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.js b/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.js index 358f8407..f448f267 100644 --- a/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.js +++ b/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.js @@ -1,33 +1,31 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearWorkOrderMilestoneTypesCache } from "../functions.cache.js"; -export const moveWorkOrderMilestoneTypeUp = (workOrderMilestoneTypeId) => { +export function moveWorkOrderMilestoneTypeUp(workOrderMilestoneTypeId) { const database = sqlite(databasePath); const currentOrderNumber = database - .prepare("select orderNumber" + - " from WorkOrderMilestoneTypes" + - " where workOrderMilestoneTypeId = ?") + .prepare(`select orderNumber from WorkOrderMilestoneTypes where workOrderMilestoneTypeId = ?`) .get(workOrderMilestoneTypeId).orderNumber; if (currentOrderNumber <= 0) { database.close(); return true; } database - .prepare("update WorkOrderMilestoneTypes" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? - 1") + .prepare(`update WorkOrderMilestoneTypes + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber = ? - 1`) .run(currentOrderNumber); const result = database - .prepare("update WorkOrderMilestoneTypes" + - " set orderNumber = ? - 1" + - " where workOrderMilestoneTypeId = ?") + .prepare(`update WorkOrderMilestoneTypes + set orderNumber = ? - 1 + where workOrderMilestoneTypeId = ?`) .run(currentOrderNumber, workOrderMilestoneTypeId); database.close(); clearWorkOrderMilestoneTypesCache(); return result.changes > 0; -}; -export const moveWorkOrderMilestoneTypeUpToTop = (workOrderMilestoneTypeId) => { +} +export function moveWorkOrderMilestoneTypeUpToTop(workOrderMilestoneTypeId) { const database = sqlite(databasePath); const currentOrderNumber = database .prepare("select orderNumber from WorkOrderMilestoneTypes where workOrderMilestoneTypeId = ?") @@ -37,14 +35,14 @@ export const moveWorkOrderMilestoneTypeUpToTop = (workOrderMilestoneTypeId) => { .prepare("update WorkOrderMilestoneTypes set orderNumber = -1 where workOrderMilestoneTypeId = ?") .run(workOrderMilestoneTypeId); database - .prepare("update WorkOrderMilestoneTypes" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber < ?") + .prepare(`update WorkOrderMilestoneTypes + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber < ?`) .run(currentOrderNumber); } database.close(); clearWorkOrderMilestoneTypesCache(); return true; -}; +} export default moveWorkOrderMilestoneTypeUp; diff --git a/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.ts b/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.ts index 603c39a1..95e528a8 100644 --- a/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.ts +++ b/helpers/lotOccupancyDB/moveWorkOrderMilestoneTypeUp.ts @@ -4,16 +4,12 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearWorkOrderMilestoneTypesCache } from "../functions.cache.js"; -export const moveWorkOrderMilestoneTypeUp = ( - workOrderMilestoneTypeId: number | string -): boolean => { +export function moveWorkOrderMilestoneTypeUp(workOrderMilestoneTypeId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database .prepare( - "select orderNumber" + - " from WorkOrderMilestoneTypes" + - " where workOrderMilestoneTypeId = ?" + `select orderNumber from WorkOrderMilestoneTypes where workOrderMilestoneTypeId = ?` ) .get(workOrderMilestoneTypeId).orderNumber; @@ -24,18 +20,18 @@ export const moveWorkOrderMilestoneTypeUp = ( database .prepare( - "update WorkOrderMilestoneTypes" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? - 1" + `update WorkOrderMilestoneTypes + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber = ? - 1` ) .run(currentOrderNumber); const result = database .prepare( - "update WorkOrderMilestoneTypes" + - " set orderNumber = ? - 1" + - " where workOrderMilestoneTypeId = ?" + `update WorkOrderMilestoneTypes + set orderNumber = ? - 1 + where workOrderMilestoneTypeId = ?` ) .run(currentOrderNumber, workOrderMilestoneTypeId); @@ -44,26 +40,32 @@ export const moveWorkOrderMilestoneTypeUp = ( clearWorkOrderMilestoneTypesCache(); return result.changes > 0; -}; +} -export const moveWorkOrderMilestoneTypeUpToTop = (workOrderMilestoneTypeId: number | string): boolean => { +export function moveWorkOrderMilestoneTypeUpToTop( + workOrderMilestoneTypeId: number | string +): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database - .prepare("select orderNumber from WorkOrderMilestoneTypes where workOrderMilestoneTypeId = ?") + .prepare( + "select orderNumber from WorkOrderMilestoneTypes where workOrderMilestoneTypeId = ?" + ) .get(workOrderMilestoneTypeId).orderNumber; if (currentOrderNumber > 0) { database - .prepare("update WorkOrderMilestoneTypes set orderNumber = -1 where workOrderMilestoneTypeId = ?") + .prepare( + "update WorkOrderMilestoneTypes set orderNumber = -1 where workOrderMilestoneTypeId = ?" + ) .run(workOrderMilestoneTypeId); database .prepare( - "update WorkOrderMilestoneTypes" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber < ?" + `update WorkOrderMilestoneTypes + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber < ?` ) .run(currentOrderNumber); } @@ -73,6 +75,6 @@ export const moveWorkOrderMilestoneTypeUpToTop = (workOrderMilestoneTypeId: numb clearWorkOrderMilestoneTypesCache(); return true; -}; +} export default moveWorkOrderMilestoneTypeUp; diff --git a/helpers/lotOccupancyDB/moveWorkOrderTypeDown.d.ts b/helpers/lotOccupancyDB/moveWorkOrderTypeDown.d.ts index d9ac2606..af849411 100644 --- a/helpers/lotOccupancyDB/moveWorkOrderTypeDown.d.ts +++ b/helpers/lotOccupancyDB/moveWorkOrderTypeDown.d.ts @@ -1,3 +1,3 @@ -export declare const moveWorkOrderTypeDown: (workOrderTypeId: number | string) => boolean; -export declare const moveWorkOrderTypeDownToBottom: (workOrderTypeId: number | string) => boolean; +export declare function moveWorkOrderTypeDown(workOrderTypeId: number | string): boolean; +export declare function moveWorkOrderTypeDownToBottom(workOrderTypeId: number | string): boolean; export default moveWorkOrderTypeDown; diff --git a/helpers/lotOccupancyDB/moveWorkOrderTypeDown.js b/helpers/lotOccupancyDB/moveWorkOrderTypeDown.js index 223f8282..6e2d54e7 100644 --- a/helpers/lotOccupancyDB/moveWorkOrderTypeDown.js +++ b/helpers/lotOccupancyDB/moveWorkOrderTypeDown.js @@ -1,16 +1,16 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearWorkOrderTypesCache } from "../functions.cache.js"; -export const moveWorkOrderTypeDown = (workOrderTypeId) => { +export function moveWorkOrderTypeDown(workOrderTypeId) { const database = sqlite(databasePath); const currentOrderNumber = database .prepare("select orderNumber from WorkOrderTypes where workOrderTypeId = ?") .get(workOrderTypeId).orderNumber; database - .prepare("update WorkOrderTypes" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? + 1") + .prepare(`update WorkOrderTypes + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber = ? + 1`) .run(currentOrderNumber); const result = database .prepare("update WorkOrderTypes set orderNumber = ? + 1 where workOrderTypeId = ?") @@ -18,30 +18,30 @@ export const moveWorkOrderTypeDown = (workOrderTypeId) => { database.close(); clearWorkOrderTypesCache(); return result.changes > 0; -}; -export const moveWorkOrderTypeDownToBottom = (workOrderTypeId) => { +} +export function moveWorkOrderTypeDownToBottom(workOrderTypeId) { const database = sqlite(databasePath); const currentOrderNumber = database .prepare("select orderNumber from WorkOrderTypes where workOrderTypeId = ?") .get(workOrderTypeId).orderNumber; const maxOrderNumber = database - .prepare("select max(orderNumber) as maxOrderNumber" + - " from WorkOrderTypes" + - " where recordDelete_timeMillis is null") + .prepare(`select max(orderNumber) as maxOrderNumber + from WorkOrderTypes + where recordDelete_timeMillis is null`) .get().maxOrderNumber; if (currentOrderNumber !== maxOrderNumber) { database .prepare("update WorkOrderTypes set orderNumber = ? + 1 where workOrderTypeId = ?") .run(maxOrderNumber, workOrderTypeId); database - .prepare("update WorkOrderTypes" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber > ?") + .prepare(`update WorkOrderTypes + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber > ?`) .run(currentOrderNumber); } database.close(); clearWorkOrderTypesCache(); return true; -}; +} export default moveWorkOrderTypeDown; diff --git a/helpers/lotOccupancyDB/moveWorkOrderTypeDown.ts b/helpers/lotOccupancyDB/moveWorkOrderTypeDown.ts index 4acc8434..9832e598 100644 --- a/helpers/lotOccupancyDB/moveWorkOrderTypeDown.ts +++ b/helpers/lotOccupancyDB/moveWorkOrderTypeDown.ts @@ -4,7 +4,7 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearWorkOrderTypesCache } from "../functions.cache.js"; -export const moveWorkOrderTypeDown = (workOrderTypeId: number | string): boolean => { +export function moveWorkOrderTypeDown(workOrderTypeId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database @@ -13,10 +13,10 @@ export const moveWorkOrderTypeDown = (workOrderTypeId: number | string): boolean database .prepare( - "update WorkOrderTypes" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? + 1" + `update WorkOrderTypes + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber = ? + 1` ) .run(currentOrderNumber); @@ -29,9 +29,9 @@ export const moveWorkOrderTypeDown = (workOrderTypeId: number | string): boolean clearWorkOrderTypesCache(); return result.changes > 0; -}; +} -export const moveWorkOrderTypeDownToBottom = (workOrderTypeId: number | string): boolean => { +export function moveWorkOrderTypeDownToBottom(workOrderTypeId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database @@ -40,9 +40,9 @@ export const moveWorkOrderTypeDownToBottom = (workOrderTypeId: number | string): const maxOrderNumber: number = database .prepare( - "select max(orderNumber) as maxOrderNumber" + - " from WorkOrderTypes" + - " where recordDelete_timeMillis is null" + `select max(orderNumber) as maxOrderNumber + from WorkOrderTypes + where recordDelete_timeMillis is null` ) .get().maxOrderNumber; @@ -53,10 +53,10 @@ export const moveWorkOrderTypeDownToBottom = (workOrderTypeId: number | string): database .prepare( - "update WorkOrderTypes" + - " set orderNumber = orderNumber - 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber > ?" + `update WorkOrderTypes + set orderNumber = orderNumber - 1 + where recordDelete_timeMillis is null + and orderNumber > ?` ) .run(currentOrderNumber); } @@ -66,6 +66,6 @@ export const moveWorkOrderTypeDownToBottom = (workOrderTypeId: number | string): clearWorkOrderTypesCache(); return true; -}; +} export default moveWorkOrderTypeDown; diff --git a/helpers/lotOccupancyDB/moveWorkOrderTypeUp.d.ts b/helpers/lotOccupancyDB/moveWorkOrderTypeUp.d.ts index 88690f08..40547492 100644 --- a/helpers/lotOccupancyDB/moveWorkOrderTypeUp.d.ts +++ b/helpers/lotOccupancyDB/moveWorkOrderTypeUp.d.ts @@ -1,3 +1,3 @@ -export declare const moveWorkOrderTypeUp: (workOrderTypeId: number | string) => boolean; -export declare const moveWorkOrderTypeUpToTop: (workOrderTypeId: number | string) => boolean; +export declare function moveWorkOrderTypeUp(workOrderTypeId: number | string): boolean; +export declare function moveWorkOrderTypeUpToTop(workOrderTypeId: number | string): boolean; export default moveWorkOrderTypeUp; diff --git a/helpers/lotOccupancyDB/moveWorkOrderTypeUp.js b/helpers/lotOccupancyDB/moveWorkOrderTypeUp.js index 251b76d9..ad7dd3a8 100644 --- a/helpers/lotOccupancyDB/moveWorkOrderTypeUp.js +++ b/helpers/lotOccupancyDB/moveWorkOrderTypeUp.js @@ -1,29 +1,29 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearWorkOrderTypesCache } from "../functions.cache.js"; -export const moveWorkOrderTypeUp = (workOrderTypeId) => { +export function moveWorkOrderTypeUp(workOrderTypeId) { const database = sqlite(databasePath); const currentOrderNumber = database - .prepare("select orderNumber" + " from WorkOrderTypes" + " where workOrderTypeId = ?") + .prepare(`select orderNumber from WorkOrderTypes where workOrderTypeId = ?`) .get(workOrderTypeId).orderNumber; if (currentOrderNumber <= 0) { database.close(); return true; } database - .prepare("update WorkOrderTypes" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? - 1") + .prepare(`update WorkOrderTypes + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber = ? - 1`) .run(currentOrderNumber); const result = database - .prepare("update WorkOrderTypes" + " set orderNumber = ? - 1" + " where workOrderTypeId = ?") + .prepare(`update WorkOrderTypes set orderNumber = ? - 1 where workOrderTypeId = ?`) .run(currentOrderNumber, workOrderTypeId); database.close(); clearWorkOrderTypesCache(); return result.changes > 0; -}; -export const moveWorkOrderTypeUpToTop = (workOrderTypeId) => { +} +export function moveWorkOrderTypeUpToTop(workOrderTypeId) { const database = sqlite(databasePath); const currentOrderNumber = database .prepare("select orderNumber from WorkOrderTypes where workOrderTypeId = ?") @@ -33,14 +33,14 @@ export const moveWorkOrderTypeUpToTop = (workOrderTypeId) => { .prepare("update WorkOrderTypes set orderNumber = -1 where workOrderTypeId = ?") .run(workOrderTypeId); database - .prepare("update WorkOrderTypes" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber < ?") + .prepare(`update WorkOrderTypes + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber < ?`) .run(currentOrderNumber); } database.close(); clearWorkOrderTypesCache(); return true; -}; +} export default moveWorkOrderTypeUp; diff --git a/helpers/lotOccupancyDB/moveWorkOrderTypeUp.ts b/helpers/lotOccupancyDB/moveWorkOrderTypeUp.ts index def8f588..fb1c01ba 100644 --- a/helpers/lotOccupancyDB/moveWorkOrderTypeUp.ts +++ b/helpers/lotOccupancyDB/moveWorkOrderTypeUp.ts @@ -4,11 +4,11 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearWorkOrderTypesCache } from "../functions.cache.js"; -export const moveWorkOrderTypeUp = (workOrderTypeId: number | string): boolean => { +export function moveWorkOrderTypeUp(workOrderTypeId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database - .prepare("select orderNumber" + " from WorkOrderTypes" + " where workOrderTypeId = ?") + .prepare(`select orderNumber from WorkOrderTypes where workOrderTypeId = ?`) .get(workOrderTypeId).orderNumber; if (currentOrderNumber <= 0) { @@ -18,17 +18,15 @@ export const moveWorkOrderTypeUp = (workOrderTypeId: number | string): boolean = database .prepare( - "update WorkOrderTypes" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber = ? - 1" + `update WorkOrderTypes + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber = ? - 1` ) .run(currentOrderNumber); const result = database - .prepare( - "update WorkOrderTypes" + " set orderNumber = ? - 1" + " where workOrderTypeId = ?" - ) + .prepare(`update WorkOrderTypes set orderNumber = ? - 1 where workOrderTypeId = ?`) .run(currentOrderNumber, workOrderTypeId); database.close(); @@ -36,9 +34,9 @@ export const moveWorkOrderTypeUp = (workOrderTypeId: number | string): boolean = clearWorkOrderTypesCache(); return result.changes > 0; -}; +} -export const moveWorkOrderTypeUpToTop = (workOrderTypeId: number | string): boolean => { +export function moveWorkOrderTypeUpToTop(workOrderTypeId: number | string): boolean { const database = sqlite(databasePath); const currentOrderNumber: number = database @@ -52,10 +50,10 @@ export const moveWorkOrderTypeUpToTop = (workOrderTypeId: number | string): bool database .prepare( - "update WorkOrderTypes" + - " set orderNumber = orderNumber + 1" + - " where recordDelete_timeMillis is null" + - " and orderNumber < ?" + `update WorkOrderTypes + set orderNumber = orderNumber + 1 + where recordDelete_timeMillis is null + and orderNumber < ?` ) .run(currentOrderNumber); } @@ -65,6 +63,6 @@ export const moveWorkOrderTypeUpToTop = (workOrderTypeId: number | string): bool clearWorkOrderTypesCache(); return true; -}; +} export default moveWorkOrderTypeUp; diff --git a/helpers/lotOccupancyDB/reopenWorkOrder.d.ts b/helpers/lotOccupancyDB/reopenWorkOrder.d.ts index 5ada07aa..51897656 100644 --- a/helpers/lotOccupancyDB/reopenWorkOrder.d.ts +++ b/helpers/lotOccupancyDB/reopenWorkOrder.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const reopenWorkOrder: (workOrderId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function reopenWorkOrder(workOrderId: number | string, requestSession: recordTypes.PartialSession): boolean; export default reopenWorkOrder; diff --git a/helpers/lotOccupancyDB/reopenWorkOrder.js b/helpers/lotOccupancyDB/reopenWorkOrder.js index 14e91c3d..b846bffb 100644 --- a/helpers/lotOccupancyDB/reopenWorkOrder.js +++ b/helpers/lotOccupancyDB/reopenWorkOrder.js @@ -1,17 +1,17 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const reopenWorkOrder = (workOrderId, requestSession) => { +export function reopenWorkOrder(workOrderId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update WorkOrders" + - " set workOrderCloseDate = null," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where workOrderId = ?" + - " and workOrderCloseDate is not null") + .prepare(`update WorkOrders + set workOrderCloseDate = null, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where workOrderId = ? + and workOrderCloseDate is not null`) .run(requestSession.user.userName, rightNowMillis, workOrderId); database.close(); return result.changes > 0; -}; +} export default reopenWorkOrder; diff --git a/helpers/lotOccupancyDB/reopenWorkOrder.ts b/helpers/lotOccupancyDB/reopenWorkOrder.ts index a599d342..f31dd6f4 100644 --- a/helpers/lotOccupancyDB/reopenWorkOrder.ts +++ b/helpers/lotOccupancyDB/reopenWorkOrder.ts @@ -4,28 +4,28 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const reopenWorkOrder = ( +export function reopenWorkOrder( workOrderId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update WorkOrders" + - " set workOrderCloseDate = null," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where workOrderId = ?" + - " and workOrderCloseDate is not null" + `update WorkOrders + set workOrderCloseDate = null, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where workOrderId = ? + and workOrderCloseDate is not null` ) .run(requestSession.user.userName, rightNowMillis, workOrderId); database.close(); return result.changes > 0; -}; +} export default reopenWorkOrder; diff --git a/helpers/lotOccupancyDB/reopenWorkOrderMilestone.d.ts b/helpers/lotOccupancyDB/reopenWorkOrderMilestone.d.ts index 3852c19c..5d2a6607 100644 --- a/helpers/lotOccupancyDB/reopenWorkOrderMilestone.d.ts +++ b/helpers/lotOccupancyDB/reopenWorkOrderMilestone.d.ts @@ -1,3 +1,3 @@ import type * as recordTypes from "../../types/recordTypes"; -export declare const reopenWorkOrderMilestone: (workOrderMilestoneId: number | string, requestSession: recordTypes.PartialSession) => boolean; +export declare function reopenWorkOrderMilestone(workOrderMilestoneId: number | string, requestSession: recordTypes.PartialSession): boolean; export default reopenWorkOrderMilestone; diff --git a/helpers/lotOccupancyDB/reopenWorkOrderMilestone.js b/helpers/lotOccupancyDB/reopenWorkOrderMilestone.js index 02a15ae5..8f893dd9 100644 --- a/helpers/lotOccupancyDB/reopenWorkOrderMilestone.js +++ b/helpers/lotOccupancyDB/reopenWorkOrderMilestone.js @@ -1,18 +1,18 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const reopenWorkOrderMilestone = (workOrderMilestoneId, requestSession) => { +export function reopenWorkOrderMilestone(workOrderMilestoneId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update WorkOrderMilestones" + - " set workOrderMilestoneCompletionDate = null," + - " workOrderMilestoneCompletionTime = null," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where workOrderMilestoneId = ?" + - " and workOrderMilestoneCompletionDate is not null") + .prepare(`update WorkOrderMilestones + set workOrderMilestoneCompletionDate = null, + workOrderMilestoneCompletionTime = null, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where workOrderMilestoneId = ? + and workOrderMilestoneCompletionDate is not null`) .run(requestSession.user.userName, rightNowMillis, workOrderMilestoneId); database.close(); return result.changes > 0; -}; +} export default reopenWorkOrderMilestone; diff --git a/helpers/lotOccupancyDB/reopenWorkOrderMilestone.ts b/helpers/lotOccupancyDB/reopenWorkOrderMilestone.ts index 1441a10a..3ab6aca2 100644 --- a/helpers/lotOccupancyDB/reopenWorkOrderMilestone.ts +++ b/helpers/lotOccupancyDB/reopenWorkOrderMilestone.ts @@ -4,33 +4,29 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import type * as recordTypes from "../../types/recordTypes"; -export const reopenWorkOrderMilestone = ( +export function reopenWorkOrderMilestone( workOrderMilestoneId: number | string, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update WorkOrderMilestones" + - " set workOrderMilestoneCompletionDate = null," + - " workOrderMilestoneCompletionTime = null," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where workOrderMilestoneId = ?" + - " and workOrderMilestoneCompletionDate is not null" + `update WorkOrderMilestones + set workOrderMilestoneCompletionDate = null, + workOrderMilestoneCompletionTime = null, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where workOrderMilestoneId = ? + and workOrderMilestoneCompletionDate is not null` ) - .run( - requestSession.user.userName, - rightNowMillis, - workOrderMilestoneId - ); + .run(requestSession.user.userName, rightNowMillis, workOrderMilestoneId); database.close(); return result.changes > 0; -}; +} export default reopenWorkOrderMilestone; diff --git a/helpers/lotOccupancyDB/updateFee.d.ts b/helpers/lotOccupancyDB/updateFee.d.ts index 04185847..4764c042 100644 --- a/helpers/lotOccupancyDB/updateFee.d.ts +++ b/helpers/lotOccupancyDB/updateFee.d.ts @@ -15,6 +15,6 @@ interface UpdateFeeForm { quantityUnit?: string; isRequired: "" | "1"; } -export declare const updateFee: (feeForm: UpdateFeeForm, requestSession: recordTypes.PartialSession) => boolean; -export declare const updateFeeOrderNumber: (feeId: number, orderNumber: number, connectedDatabase?: sqlite.Database) => boolean; +export declare function updateFee(feeForm: UpdateFeeForm, requestSession: recordTypes.PartialSession): boolean; +export declare function updateFeeOrderNumber(feeId: number, orderNumber: number, connectedDatabase?: sqlite.Database): boolean; export default updateFee; diff --git a/helpers/lotOccupancyDB/updateFee.js b/helpers/lotOccupancyDB/updateFee.js index f68155fb..46077896 100644 --- a/helpers/lotOccupancyDB/updateFee.js +++ b/helpers/lotOccupancyDB/updateFee.js @@ -1,31 +1,31 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const updateFee = (feeForm, requestSession) => { +export function updateFee(feeForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update Fees" + - " set feeCategoryId = ?," + - " feeName = ?," + - " feeDescription = ?," + - " occupancyTypeId = ?," + - " lotTypeId = ?," + - " feeAmount = ?," + - " feeFunction = ?," + - " taxAmount = ?," + - " taxPercentage = ?," + - " includeQuantity = ?," + - " quantityUnit = ?," + - " isRequired = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and feeId = ?") + .prepare(`update Fees + set feeCategoryId = ?, + feeName = ?, + feeDescription = ?, + occupancyTypeId = ?, + lotTypeId = ?, + feeAmount = ?, + feeFunction = ?, + taxAmount = ?, + taxPercentage = ?, + includeQuantity = ?, + quantityUnit = ?, + isRequired = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where recordDelete_timeMillis is null + and feeId = ?`) .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, requestSession.user.userName, rightNowMillis, feeForm.feeId); database.close(); return result.changes > 0; -}; -export const updateFeeOrderNumber = (feeId, orderNumber, connectedDatabase) => { +} +export function updateFeeOrderNumber(feeId, orderNumber, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath, { readonly: true @@ -37,5 +37,5 @@ export const updateFeeOrderNumber = (feeId, orderNumber, connectedDatabase) => { database.close(); } return result.changes > 0; -}; +} export default updateFee; diff --git a/helpers/lotOccupancyDB/updateFee.ts b/helpers/lotOccupancyDB/updateFee.ts index 2e7f322c..e6d6cdcd 100644 --- a/helpers/lotOccupancyDB/updateFee.ts +++ b/helpers/lotOccupancyDB/updateFee.ts @@ -20,33 +20,33 @@ interface UpdateFeeForm { isRequired: "" | "1"; } -export const updateFee = ( +export function updateFee( feeForm: UpdateFeeForm, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update Fees" + - " set feeCategoryId = ?," + - " feeName = ?," + - " feeDescription = ?," + - " occupancyTypeId = ?," + - " lotTypeId = ?," + - " feeAmount = ?," + - " feeFunction = ?," + - " taxAmount = ?," + - " taxPercentage = ?," + - " includeQuantity = ?," + - " quantityUnit = ?," + - " isRequired = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and feeId = ?" + `update Fees + set feeCategoryId = ?, + feeName = ?, + feeDescription = ?, + occupancyTypeId = ?, + lotTypeId = ?, + feeAmount = ?, + feeFunction = ?, + taxAmount = ?, + taxPercentage = ?, + includeQuantity = ?, + quantityUnit = ?, + isRequired = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where recordDelete_timeMillis is null + and feeId = ?` ) .run( feeForm.feeCategoryId, @@ -69,13 +69,13 @@ export const updateFee = ( database.close(); return result.changes > 0; -}; +} -export const updateFeeOrderNumber = ( +export function updateFeeOrderNumber( feeId: number, orderNumber: number, connectedDatabase?: sqlite.Database -) => { +) { const database = connectedDatabase || sqlite(databasePath, { @@ -91,6 +91,6 @@ export const updateFeeOrderNumber = ( } return result.changes > 0; -}; +} export default updateFee; diff --git a/helpers/lotOccupancyDB/updateFeeCategory.d.ts b/helpers/lotOccupancyDB/updateFeeCategory.d.ts index de9eb3ac..b8d9570f 100644 --- a/helpers/lotOccupancyDB/updateFeeCategory.d.ts +++ b/helpers/lotOccupancyDB/updateFeeCategory.d.ts @@ -4,6 +4,6 @@ interface UpdateFeeCategoryForm { feeCategoryId: number | string; feeCategory: string; } -export declare const updateFeeCategory: (feeCategoryForm: UpdateFeeCategoryForm, requestSession: recordTypes.PartialSession) => boolean; -export declare const updateFeeCategoryOrderNumber: (feeCategoryId: number, orderNumber: number, connectedDatabase?: sqlite.Database) => boolean; +export declare function updateFeeCategory(feeCategoryForm: UpdateFeeCategoryForm, requestSession: recordTypes.PartialSession): boolean; +export declare function updateFeeCategoryOrderNumber(feeCategoryId: number, orderNumber: number, connectedDatabase?: sqlite.Database): boolean; export default updateFeeCategory; diff --git a/helpers/lotOccupancyDB/updateFeeCategory.js b/helpers/lotOccupancyDB/updateFeeCategory.js index 69c526bc..47e4f146 100644 --- a/helpers/lotOccupancyDB/updateFeeCategory.js +++ b/helpers/lotOccupancyDB/updateFeeCategory.js @@ -1,20 +1,20 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const updateFeeCategory = (feeCategoryForm, requestSession) => { +export function updateFeeCategory(feeCategoryForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update FeeCategories" + - " set feeCategory = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and feeCategoryId = ?") + .prepare(`update FeeCategories + set feeCategory = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where recordDelete_timeMillis is null + and feeCategoryId = ?`) .run(feeCategoryForm.feeCategory, requestSession.user.userName, rightNowMillis, feeCategoryForm.feeCategoryId); database.close(); return result.changes > 0; -}; -export const updateFeeCategoryOrderNumber = (feeCategoryId, orderNumber, connectedDatabase) => { +} +export function updateFeeCategoryOrderNumber(feeCategoryId, orderNumber, connectedDatabase) { const database = connectedDatabase || sqlite(databasePath, { readonly: true @@ -26,5 +26,5 @@ export const updateFeeCategoryOrderNumber = (feeCategoryId, orderNumber, connect database.close(); } return result.changes > 0; -}; +} export default updateFeeCategory; diff --git a/helpers/lotOccupancyDB/updateFeeCategory.ts b/helpers/lotOccupancyDB/updateFeeCategory.ts index c683fb93..7bde76d9 100644 --- a/helpers/lotOccupancyDB/updateFeeCategory.ts +++ b/helpers/lotOccupancyDB/updateFeeCategory.ts @@ -9,22 +9,22 @@ interface UpdateFeeCategoryForm { feeCategory: string; } -export const updateFeeCategory = ( +export function updateFeeCategory( feeCategoryForm: UpdateFeeCategoryForm, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update FeeCategories" + - " set feeCategory = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and feeCategoryId = ?" + `update FeeCategories + set feeCategory = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where recordDelete_timeMillis is null + and feeCategoryId = ?` ) .run( feeCategoryForm.feeCategory, @@ -36,13 +36,13 @@ export const updateFeeCategory = ( database.close(); return result.changes > 0; -}; +} -export const updateFeeCategoryOrderNumber = ( +export function updateFeeCategoryOrderNumber( feeCategoryId: number, orderNumber: number, connectedDatabase?: sqlite.Database -) => { +) { const database = connectedDatabase || sqlite(databasePath, { @@ -58,6 +58,6 @@ export const updateFeeCategoryOrderNumber = ( } return result.changes > 0; -}; +} export default updateFeeCategory; diff --git a/helpers/lotOccupancyDB/updateLot.js b/helpers/lotOccupancyDB/updateLot.js index 892d6117..8972c907 100644 --- a/helpers/lotOccupancyDB/updateLot.js +++ b/helpers/lotOccupancyDB/updateLot.js @@ -6,18 +6,18 @@ export function updateLot(lotForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update Lots" + - " set lotName = ?," + - " lotTypeId = ?," + - " lotStatusId = ?," + - " mapId = ?," + - " mapKey = ?," + - " lotLatitude = ?," + - " lotLongitude = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where lotId = ?" + - " and recordDelete_timeMillis is null") + .prepare(`update Lots + set lotName = ?, + lotTypeId = ?, + lotStatusId = ?, + mapId = ?, + mapKey = ?, + lotLatitude = ?, + lotLongitude = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotId = ? + and recordDelete_timeMillis is null`) .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, lotForm.lotId); if (result.changes > 0) { const lotTypeFieldIds = (lotForm.lotTypeFieldIds || "").split(","); @@ -42,12 +42,12 @@ export function updateLotStatus(lotId, lotStatusId, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update Lots" + - " set lotStatusId = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where lotId = ?" + - " and recordDelete_timeMillis is null") + .prepare(`update Lots + set lotStatusId = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotId = ? + and recordDelete_timeMillis is null`) .run(lotStatusId === "" ? undefined : lotStatusId, requestSession.user.userName, rightNowMillis, lotId); database.close(); return result.changes > 0; diff --git a/helpers/lotOccupancyDB/updateLot.ts b/helpers/lotOccupancyDB/updateLot.ts index b2cd9cc3..7250707d 100644 --- a/helpers/lotOccupancyDB/updateLot.ts +++ b/helpers/lotOccupancyDB/updateLot.ts @@ -33,18 +33,18 @@ export function updateLot( const result = database .prepare( - "update Lots" + - " set lotName = ?," + - " lotTypeId = ?," + - " lotStatusId = ?," + - " mapId = ?," + - " mapKey = ?," + - " lotLatitude = ?," + - " lotLongitude = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where lotId = ?" + - " and recordDelete_timeMillis is null" + `update Lots + set lotName = ?, + lotTypeId = ?, + lotStatusId = ?, + mapId = ?, + mapKey = ?, + lotLatitude = ?, + lotLongitude = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotId = ? + and recordDelete_timeMillis is null` ) .run( lotForm.lotName, @@ -97,12 +97,12 @@ export function updateLotStatus( const result = database .prepare( - "update Lots" + - " set lotStatusId = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where lotId = ?" + - " and recordDelete_timeMillis is null" + `update Lots + set lotStatusId = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotId = ? + and recordDelete_timeMillis is null` ) .run( lotStatusId === "" ? undefined : lotStatusId, diff --git a/helpers/lotOccupancyDB/updateLotComment.d.ts b/helpers/lotOccupancyDB/updateLotComment.d.ts index 3b95fc34..a771b5fe 100644 --- a/helpers/lotOccupancyDB/updateLotComment.d.ts +++ b/helpers/lotOccupancyDB/updateLotComment.d.ts @@ -5,5 +5,5 @@ interface UpdateLotCommentForm { lotCommentTimeString: string; lotComment: string; } -export declare const updateLotComment: (commentForm: UpdateLotCommentForm, requestSession: recordTypes.PartialSession) => boolean; +export declare function updateLotComment(commentForm: UpdateLotCommentForm, requestSession: recordTypes.PartialSession): boolean; export default updateLotComment; diff --git a/helpers/lotOccupancyDB/updateLotComment.js b/helpers/lotOccupancyDB/updateLotComment.js index 8aee2af7..906f611e 100644 --- a/helpers/lotOccupancyDB/updateLotComment.js +++ b/helpers/lotOccupancyDB/updateLotComment.js @@ -1,20 +1,20 @@ 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 updateLotComment = (commentForm, requestSession) => { +export function updateLotComment(commentForm, requestSession) { const rightNowMillis = Date.now(); const database = sqlite(databasePath); const result = database - .prepare("update LotComments" + - " set lotCommentDate = ?," + - " lotCommentTime = ?," + - " lotComment = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and lotCommentId = ?") + .prepare(`update LotComments + set lotCommentDate = ?, + lotCommentTime = ?, + lotComment = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where recordDelete_timeMillis is null + and lotCommentId = ?`) .run(dateStringToInteger(commentForm.lotCommentDateString), timeStringToInteger(commentForm.lotCommentTimeString), commentForm.lotComment, requestSession.user.userName, rightNowMillis, commentForm.lotCommentId); database.close(); return result.changes > 0; -}; +} export default updateLotComment; diff --git a/helpers/lotOccupancyDB/updateLotComment.ts b/helpers/lotOccupancyDB/updateLotComment.ts index de09f1bd..956f04c1 100644 --- a/helpers/lotOccupancyDB/updateLotComment.ts +++ b/helpers/lotOccupancyDB/updateLotComment.ts @@ -2,7 +2,10 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { dateStringToInteger, timeStringToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js"; +import { + dateStringToInteger, + timeStringToInteger +} from "@cityssm/expressjs-server-js/dateTimeFns.js"; import type * as recordTypes from "../../types/recordTypes"; @@ -13,24 +16,24 @@ interface UpdateLotCommentForm { lotComment: string; } -export const updateLotComment = ( +export function updateLotComment( commentForm: UpdateLotCommentForm, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const rightNowMillis = Date.now(); const database = sqlite(databasePath); const result = database .prepare( - "update LotComments" + - " set lotCommentDate = ?," + - " lotCommentTime = ?," + - " lotComment = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and lotCommentId = ?" + `update LotComments + set lotCommentDate = ?, + lotCommentTime = ?, + lotComment = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where recordDelete_timeMillis is null + and lotCommentId = ?` ) .run( dateStringToInteger(commentForm.lotCommentDateString), @@ -44,6 +47,6 @@ export const updateLotComment = ( database.close(); return result.changes > 0; -}; +} export default updateLotComment; diff --git a/helpers/lotOccupancyDB/updateLotOccupancy.js b/helpers/lotOccupancyDB/updateLotOccupancy.js index cd35452b..d4860431 100644 --- a/helpers/lotOccupancyDB/updateLotOccupancy.js +++ b/helpers/lotOccupancyDB/updateLotOccupancy.js @@ -7,15 +7,15 @@ export function updateLotOccupancy(lotOccupancyForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update LotOccupancies" + - " set occupancyTypeId = ?," + - " lotId = ?," + - " occupancyStartDate = ?," + - " occupancyEndDate = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where lotOccupancyId = ?" + - " and recordDelete_timeMillis is null") + .prepare(`update LotOccupancies + set occupancyTypeId = ?, + lotId = ?, + occupancyStartDate = ?, + occupancyEndDate = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotOccupancyId = ? + and recordDelete_timeMillis is null`) .run(lotOccupancyForm.occupancyTypeId, lotOccupancyForm.lotId === "" ? undefined : lotOccupancyForm.lotId, dateStringToInteger(lotOccupancyForm.occupancyStartDateString), lotOccupancyForm.occupancyEndDateString === "" ? undefined : dateStringToInteger(lotOccupancyForm.occupancyEndDateString), requestSession.user.userName, rightNowMillis, lotOccupancyForm.lotOccupancyId); diff --git a/helpers/lotOccupancyDB/updateLotOccupancy.ts b/helpers/lotOccupancyDB/updateLotOccupancy.ts index 637f2e30..b95e1079 100644 --- a/helpers/lotOccupancyDB/updateLotOccupancy.ts +++ b/helpers/lotOccupancyDB/updateLotOccupancy.ts @@ -32,15 +32,15 @@ export function updateLotOccupancy( const result = database .prepare( - "update LotOccupancies" + - " set occupancyTypeId = ?," + - " lotId = ?," + - " occupancyStartDate = ?," + - " occupancyEndDate = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where lotOccupancyId = ?" + - " and recordDelete_timeMillis is null" + `update LotOccupancies + set occupancyTypeId = ?, + lotId = ?, + occupancyStartDate = ?, + occupancyEndDate = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotOccupancyId = ? + and recordDelete_timeMillis is null` ) .run( lotOccupancyForm.occupancyTypeId, @@ -55,9 +55,7 @@ export function updateLotOccupancy( ); if (result.changes > 0) { - const occupancyTypeFieldIds = ( - lotOccupancyForm.occupancyTypeFieldIds || "" - ).split(","); + const occupancyTypeFieldIds = (lotOccupancyForm.occupancyTypeFieldIds || "").split(","); for (const occupancyTypeFieldId of occupancyTypeFieldIds) { const lotOccupancyFieldValue = lotOccupancyForm[ diff --git a/helpers/lotOccupancyDB/updateLotOccupancyComment.d.ts b/helpers/lotOccupancyDB/updateLotOccupancyComment.d.ts index 04e21378..2bf7da62 100644 --- a/helpers/lotOccupancyDB/updateLotOccupancyComment.d.ts +++ b/helpers/lotOccupancyDB/updateLotOccupancyComment.d.ts @@ -5,5 +5,5 @@ interface UpdateLotOccupancyCommentForm { lotOccupancyCommentTimeString: string; lotOccupancyComment: string; } -export declare const updateLotOccupancyComment: (commentForm: UpdateLotOccupancyCommentForm, requestSession: recordTypes.PartialSession) => boolean; +export declare function updateLotOccupancyComment(commentForm: UpdateLotOccupancyCommentForm, requestSession: recordTypes.PartialSession): boolean; export default updateLotOccupancyComment; diff --git a/helpers/lotOccupancyDB/updateLotOccupancyComment.js b/helpers/lotOccupancyDB/updateLotOccupancyComment.js index 0d1cce81..b005809d 100644 --- a/helpers/lotOccupancyDB/updateLotOccupancyComment.js +++ b/helpers/lotOccupancyDB/updateLotOccupancyComment.js @@ -1,20 +1,20 @@ 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 updateLotOccupancyComment = (commentForm, requestSession) => { +export function updateLotOccupancyComment(commentForm, requestSession) { const rightNowMillis = Date.now(); const database = sqlite(databasePath); const result = database - .prepare("update LotOccupancyComments" + - " set lotOccupancyCommentDate = ?," + - " lotOccupancyCommentTime = ?," + - " lotOccupancyComment = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and lotOccupancyCommentId = ?") + .prepare(`update LotOccupancyComments + set lotOccupancyCommentDate = ?, + lotOccupancyCommentTime = ?, + lotOccupancyComment = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where recordDelete_timeMillis is null + and lotOccupancyCommentId = ?`) .run(dateStringToInteger(commentForm.lotOccupancyCommentDateString), timeStringToInteger(commentForm.lotOccupancyCommentTimeString), commentForm.lotOccupancyComment, requestSession.user.userName, rightNowMillis, commentForm.lotOccupancyCommentId); database.close(); return result.changes > 0; -}; +} export default updateLotOccupancyComment; diff --git a/helpers/lotOccupancyDB/updateLotOccupancyComment.ts b/helpers/lotOccupancyDB/updateLotOccupancyComment.ts index 76d48c34..da91b4d1 100644 --- a/helpers/lotOccupancyDB/updateLotOccupancyComment.ts +++ b/helpers/lotOccupancyDB/updateLotOccupancyComment.ts @@ -2,7 +2,10 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { dateStringToInteger, timeStringToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js"; +import { + dateStringToInteger, + timeStringToInteger +} from "@cityssm/expressjs-server-js/dateTimeFns.js"; import type * as recordTypes from "../../types/recordTypes"; @@ -13,24 +16,24 @@ interface UpdateLotOccupancyCommentForm { lotOccupancyComment: string; } -export const updateLotOccupancyComment = ( +export function updateLotOccupancyComment( commentForm: UpdateLotOccupancyCommentForm, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const rightNowMillis = Date.now(); const database = sqlite(databasePath); const result = database .prepare( - "update LotOccupancyComments" + - " set lotOccupancyCommentDate = ?," + - " lotOccupancyCommentTime = ?," + - " lotOccupancyComment = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and lotOccupancyCommentId = ?" + `update LotOccupancyComments + set lotOccupancyCommentDate = ?, + lotOccupancyCommentTime = ?, + lotOccupancyComment = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where recordDelete_timeMillis is null + and lotOccupancyCommentId = ?` ) .run( dateStringToInteger(commentForm.lotOccupancyCommentDateString), @@ -44,6 +47,6 @@ export const updateLotOccupancyComment = ( database.close(); return result.changes > 0; -}; +} export default updateLotOccupancyComment; diff --git a/helpers/lotOccupancyDB/updateLotOccupancyOccupant.d.ts b/helpers/lotOccupancyDB/updateLotOccupancyOccupant.d.ts index 77cdec4c..eb675ef2 100644 --- a/helpers/lotOccupancyDB/updateLotOccupancyOccupant.d.ts +++ b/helpers/lotOccupancyDB/updateLotOccupancyOccupant.d.ts @@ -13,5 +13,5 @@ interface UpdateLotOccupancyOccupantForm { occupantEmailAddress: string; occupantComment: string; } -export declare const updateLotOccupancyOccupant: (lotOccupancyOccupantForm: UpdateLotOccupancyOccupantForm, requestSession: recordTypes.PartialSession) => boolean; +export declare function updateLotOccupancyOccupant(lotOccupancyOccupantForm: UpdateLotOccupancyOccupantForm, requestSession: recordTypes.PartialSession): boolean; export default updateLotOccupancyOccupant; diff --git a/helpers/lotOccupancyDB/updateLotOccupancyOccupant.js b/helpers/lotOccupancyDB/updateLotOccupancyOccupant.js index e5bcb26e..d591e567 100644 --- a/helpers/lotOccupancyDB/updateLotOccupancyOccupant.js +++ b/helpers/lotOccupancyDB/updateLotOccupancyOccupant.js @@ -1,27 +1,27 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const updateLotOccupancyOccupant = (lotOccupancyOccupantForm, requestSession) => { +export function updateLotOccupancyOccupant(lotOccupancyOccupantForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const results = database - .prepare("update LotOccupancyOccupants" + - " set occupantName = ?," + - " occupantAddress1 = ?," + - " occupantAddress2 = ?," + - " occupantCity = ?," + - " occupantProvince = ?," + - " occupantPostalCode = ?," + - " occupantPhoneNumber = ?," + - " occupantEmailAddress = ?," + - " occupantComment = ?," + - " lotOccupantTypeId = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and lotOccupancyId = ?" + - " and lotOccupantIndex = ?") + .prepare(`update LotOccupancyOccupants + set occupantName = ?, + occupantAddress1 = ?, + occupantAddress2 = ?, + occupantCity = ?, + occupantProvince = ?, + occupantPostalCode = ?, + occupantPhoneNumber = ?, + occupantEmailAddress = ?, + occupantComment = ?, + lotOccupantTypeId = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where recordDelete_timeMillis is null + and lotOccupancyId = ? + and lotOccupantIndex = ?`) .run(lotOccupancyOccupantForm.occupantName, lotOccupancyOccupantForm.occupantAddress1, lotOccupancyOccupantForm.occupantAddress2, lotOccupancyOccupantForm.occupantCity, lotOccupancyOccupantForm.occupantProvince, lotOccupancyOccupantForm.occupantPostalCode, lotOccupancyOccupantForm.occupantPhoneNumber, lotOccupancyOccupantForm.occupantEmailAddress, lotOccupancyOccupantForm.occupantComment, lotOccupancyOccupantForm.lotOccupantTypeId, requestSession.user.userName, rightNowMillis, lotOccupancyOccupantForm.lotOccupancyId, lotOccupancyOccupantForm.lotOccupantIndex); database.close(); return results.changes > 0; -}; +} export default updateLotOccupancyOccupant; diff --git a/helpers/lotOccupancyDB/updateLotOccupancyOccupant.ts b/helpers/lotOccupancyDB/updateLotOccupancyOccupant.ts index ada87ef2..44a6fa99 100644 --- a/helpers/lotOccupancyDB/updateLotOccupancyOccupant.ts +++ b/helpers/lotOccupancyDB/updateLotOccupancyOccupant.ts @@ -19,32 +19,32 @@ interface UpdateLotOccupancyOccupantForm { occupantComment: string; } -export const updateLotOccupancyOccupant = ( +export function updateLotOccupancyOccupant( lotOccupancyOccupantForm: UpdateLotOccupancyOccupantForm, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const results = database .prepare( - "update LotOccupancyOccupants" + - " set occupantName = ?," + - " occupantAddress1 = ?," + - " occupantAddress2 = ?," + - " occupantCity = ?," + - " occupantProvince = ?," + - " occupantPostalCode = ?," + - " occupantPhoneNumber = ?," + - " occupantEmailAddress = ?," + - " occupantComment = ?," + - " lotOccupantTypeId = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and lotOccupancyId = ?" + - " and lotOccupantIndex = ?" + `update LotOccupancyOccupants + set occupantName = ?, + occupantAddress1 = ?, + occupantAddress2 = ?, + occupantCity = ?, + occupantProvince = ?, + occupantPostalCode = ?, + occupantPhoneNumber = ?, + occupantEmailAddress = ?, + occupantComment = ?, + lotOccupantTypeId = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where recordDelete_timeMillis is null + and lotOccupancyId = ? + and lotOccupantIndex = ?` ) .run( lotOccupancyOccupantForm.occupantName, @@ -66,6 +66,6 @@ export const updateLotOccupancyOccupant = ( database.close(); return results.changes > 0; -}; +} export default updateLotOccupancyOccupant; diff --git a/helpers/lotOccupancyDB/updateLotOccupantType.d.ts b/helpers/lotOccupancyDB/updateLotOccupantType.d.ts index 0c563f22..f61abc0f 100644 --- a/helpers/lotOccupancyDB/updateLotOccupantType.d.ts +++ b/helpers/lotOccupancyDB/updateLotOccupantType.d.ts @@ -4,5 +4,5 @@ interface UpdateLotOccupantTypeForm { lotOccupantType: string; fontAwesomeIconClass?: string; } -export declare const updateLotOccupantType: (lotOccupantTypeForm: UpdateLotOccupantTypeForm, requestSession: recordTypes.PartialSession) => boolean; +export declare function updateLotOccupantType(lotOccupantTypeForm: UpdateLotOccupantTypeForm, requestSession: recordTypes.PartialSession): boolean; export default updateLotOccupantType; diff --git a/helpers/lotOccupancyDB/updateLotOccupantType.js b/helpers/lotOccupancyDB/updateLotOccupantType.js index 17be432c..7891e885 100644 --- a/helpers/lotOccupancyDB/updateLotOccupantType.js +++ b/helpers/lotOccupancyDB/updateLotOccupantType.js @@ -1,20 +1,20 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotOccupantTypesCache } from "../functions.cache.js"; -export const updateLotOccupantType = (lotOccupantTypeForm, requestSession) => { +export function updateLotOccupantType(lotOccupantTypeForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update LotOccupantTypes" + - " set lotOccupantType = ?," + - " fontAwesomeIconClass = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where lotOccupantTypeId = ?" + - " and recordDelete_timeMillis is null") + .prepare(`update LotOccupantTypes + set lotOccupantType = ?, + fontAwesomeIconClass = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotOccupantTypeId = ? + and recordDelete_timeMillis is null`) .run(lotOccupantTypeForm.lotOccupantType, lotOccupantTypeForm.fontAwesomeIconClass || "", requestSession.user.userName, rightNowMillis, lotOccupantTypeForm.lotOccupantTypeId); database.close(); clearLotOccupantTypesCache(); return result.changes > 0; -}; +} export default updateLotOccupantType; diff --git a/helpers/lotOccupancyDB/updateLotOccupantType.ts b/helpers/lotOccupancyDB/updateLotOccupantType.ts index 0e1e7f5b..6a6c64c0 100644 --- a/helpers/lotOccupancyDB/updateLotOccupantType.ts +++ b/helpers/lotOccupancyDB/updateLotOccupantType.ts @@ -12,23 +12,23 @@ interface UpdateLotOccupantTypeForm { fontAwesomeIconClass?: string; } -export const updateLotOccupantType = ( +export function updateLotOccupantType( lotOccupantTypeForm: UpdateLotOccupantTypeForm, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update LotOccupantTypes" + - " set lotOccupantType = ?," + - " fontAwesomeIconClass = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where lotOccupantTypeId = ?" + - " and recordDelete_timeMillis is null" + `update LotOccupantTypes + set lotOccupantType = ?, + fontAwesomeIconClass = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotOccupantTypeId = ? + and recordDelete_timeMillis is null` ) .run( lotOccupantTypeForm.lotOccupantType, @@ -43,6 +43,6 @@ export const updateLotOccupantType = ( clearLotOccupantTypesCache(); return result.changes > 0; -}; +} export default updateLotOccupantType; diff --git a/helpers/lotOccupancyDB/updateLotStatus.d.ts b/helpers/lotOccupancyDB/updateLotStatus.d.ts index 671a77bd..4d20981c 100644 --- a/helpers/lotOccupancyDB/updateLotStatus.d.ts +++ b/helpers/lotOccupancyDB/updateLotStatus.d.ts @@ -3,5 +3,5 @@ interface UpdateLotStatusForm { lotStatusId: number | string; lotStatus: string; } -export declare const updateLotStatus: (lotStatusForm: UpdateLotStatusForm, requestSession: recordTypes.PartialSession) => boolean; +export declare function updateLotStatus(lotStatusForm: UpdateLotStatusForm, requestSession: recordTypes.PartialSession): boolean; export default updateLotStatus; diff --git a/helpers/lotOccupancyDB/updateLotStatus.js b/helpers/lotOccupancyDB/updateLotStatus.js index 15b9f948..85591af7 100644 --- a/helpers/lotOccupancyDB/updateLotStatus.js +++ b/helpers/lotOccupancyDB/updateLotStatus.js @@ -1,19 +1,19 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotStatusesCache } from "../functions.cache.js"; -export const updateLotStatus = (lotStatusForm, requestSession) => { +export function updateLotStatus(lotStatusForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update LotStatuses" + - " set lotStatus = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where lotStatusId = ?" + - " and recordDelete_timeMillis is null") + .prepare(`update LotStatuses + set lotStatus = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotStatusId = ? + and recordDelete_timeMillis is null`) .run(lotStatusForm.lotStatus, requestSession.user.userName, rightNowMillis, lotStatusForm.lotStatusId); database.close(); clearLotStatusesCache(); return result.changes > 0; -}; +} export default updateLotStatus; diff --git a/helpers/lotOccupancyDB/updateLotStatus.ts b/helpers/lotOccupancyDB/updateLotStatus.ts index 95226c78..5df60ef9 100644 --- a/helpers/lotOccupancyDB/updateLotStatus.ts +++ b/helpers/lotOccupancyDB/updateLotStatus.ts @@ -11,22 +11,22 @@ interface UpdateLotStatusForm { lotStatus: string; } -export const updateLotStatus = ( +export function updateLotStatus( lotStatusForm: UpdateLotStatusForm, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update LotStatuses" + - " set lotStatus = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where lotStatusId = ?" + - " and recordDelete_timeMillis is null" + `update LotStatuses + set lotStatus = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotStatusId = ? + and recordDelete_timeMillis is null` ) .run( lotStatusForm.lotStatus, @@ -40,6 +40,6 @@ export const updateLotStatus = ( clearLotStatusesCache(); return result.changes > 0; -}; +} export default updateLotStatus; diff --git a/helpers/lotOccupancyDB/updateLotType.d.ts b/helpers/lotOccupancyDB/updateLotType.d.ts index 5ca18eb9..05620960 100644 --- a/helpers/lotOccupancyDB/updateLotType.d.ts +++ b/helpers/lotOccupancyDB/updateLotType.d.ts @@ -3,5 +3,5 @@ interface UpdateLotTypeForm { lotTypeId: number | string; lotType: string; } -export declare const updateLotType: (lotTypeForm: UpdateLotTypeForm, requestSession: recordTypes.PartialSession) => boolean; +export declare function updateLotType(lotTypeForm: UpdateLotTypeForm, requestSession: recordTypes.PartialSession): boolean; export default updateLotType; diff --git a/helpers/lotOccupancyDB/updateLotType.js b/helpers/lotOccupancyDB/updateLotType.js index 8b4c50ff..d0055f42 100644 --- a/helpers/lotOccupancyDB/updateLotType.js +++ b/helpers/lotOccupancyDB/updateLotType.js @@ -1,19 +1,19 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotTypesCache } from "../functions.cache.js"; -export const updateLotType = (lotTypeForm, requestSession) => { +export function updateLotType(lotTypeForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update LotTypes" + - " set lotType = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where lotTypeId = ?" + - " and recordDelete_timeMillis is null") + .prepare(`update LotTypes + set lotType = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotTypeId = ? + and recordDelete_timeMillis is null`) .run(lotTypeForm.lotType, requestSession.user.userName, rightNowMillis, lotTypeForm.lotTypeId); database.close(); clearLotTypesCache(); return result.changes > 0; -}; +} export default updateLotType; diff --git a/helpers/lotOccupancyDB/updateLotType.ts b/helpers/lotOccupancyDB/updateLotType.ts index 7925f2d2..5293aa1f 100644 --- a/helpers/lotOccupancyDB/updateLotType.ts +++ b/helpers/lotOccupancyDB/updateLotType.ts @@ -11,22 +11,22 @@ interface UpdateLotTypeForm { lotType: string; } -export const updateLotType = ( +export function updateLotType( lotTypeForm: UpdateLotTypeForm, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update LotTypes" + - " set lotType = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where lotTypeId = ?" + - " and recordDelete_timeMillis is null" + `update LotTypes + set lotType = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotTypeId = ? + and recordDelete_timeMillis is null` ) .run( lotTypeForm.lotType, @@ -40,6 +40,6 @@ export const updateLotType = ( clearLotTypesCache(); return result.changes > 0; -}; +} export default updateLotType; diff --git a/helpers/lotOccupancyDB/updateLotTypeField.d.ts b/helpers/lotOccupancyDB/updateLotTypeField.d.ts index ca207c65..6956316e 100644 --- a/helpers/lotOccupancyDB/updateLotTypeField.d.ts +++ b/helpers/lotOccupancyDB/updateLotTypeField.d.ts @@ -8,5 +8,5 @@ interface UpdateLotTypeFieldForm { pattern?: string; lotTypeFieldValues: string; } -export declare const updateLotTypeField: (lotTypeFieldForm: UpdateLotTypeFieldForm, requestSession: recordTypes.PartialSession) => boolean; +export declare function updateLotTypeField(lotTypeFieldForm: UpdateLotTypeFieldForm, requestSession: recordTypes.PartialSession): boolean; export default updateLotTypeField; diff --git a/helpers/lotOccupancyDB/updateLotTypeField.js b/helpers/lotOccupancyDB/updateLotTypeField.js index 847e79a9..73e9bd4e 100644 --- a/helpers/lotOccupancyDB/updateLotTypeField.js +++ b/helpers/lotOccupancyDB/updateLotTypeField.js @@ -1,24 +1,24 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearLotTypesCache } from "../functions.cache.js"; -export const updateLotTypeField = (lotTypeFieldForm, requestSession) => { +export function updateLotTypeField(lotTypeFieldForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update LotTypeFields" + - " set lotTypeField = ?," + - " isRequired = ?," + - " minimumLength = ?," + - " maximumLength = ?," + - " pattern = ?," + - " lotTypeFieldValues = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where lotTypeFieldId = ?" + - " and recordDelete_timeMillis is null") + .prepare(`update LotTypeFields + set lotTypeField = ?, + isRequired = ?, + minimumLength = ?, + maximumLength = ?, + pattern = ?, + lotTypeFieldValues = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotTypeFieldId = ? + and recordDelete_timeMillis is null`) .run(lotTypeFieldForm.lotTypeField, Number.parseInt(lotTypeFieldForm.isRequired, 10), lotTypeFieldForm.minimumLength || 0, lotTypeFieldForm.maximumLength || 100, lotTypeFieldForm.pattern || "", lotTypeFieldForm.lotTypeFieldValues, requestSession.user.userName, rightNowMillis, lotTypeFieldForm.lotTypeFieldId); database.close(); clearLotTypesCache(); return result.changes > 0; -}; +} export default updateLotTypeField; diff --git a/helpers/lotOccupancyDB/updateLotTypeField.ts b/helpers/lotOccupancyDB/updateLotTypeField.ts index d8e162d6..95ca0054 100644 --- a/helpers/lotOccupancyDB/updateLotTypeField.ts +++ b/helpers/lotOccupancyDB/updateLotTypeField.ts @@ -16,27 +16,27 @@ interface UpdateLotTypeFieldForm { lotTypeFieldValues: string; } -export const updateLotTypeField = ( +export function updateLotTypeField( lotTypeFieldForm: UpdateLotTypeFieldForm, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update LotTypeFields" + - " set lotTypeField = ?," + - " isRequired = ?," + - " minimumLength = ?," + - " maximumLength = ?," + - " pattern = ?," + - " lotTypeFieldValues = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where lotTypeFieldId = ?" + - " and recordDelete_timeMillis is null" + `update LotTypeFields + set lotTypeField = ?, + isRequired = ?, + minimumLength = ?, + maximumLength = ?, + pattern = ?, + lotTypeFieldValues = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where lotTypeFieldId = ? + and recordDelete_timeMillis is null` ) .run( lotTypeFieldForm.lotTypeField, @@ -55,6 +55,6 @@ export const updateLotTypeField = ( clearLotTypesCache(); return result.changes > 0; -}; +} export default updateLotTypeField; diff --git a/helpers/lotOccupancyDB/updateMap.d.ts b/helpers/lotOccupancyDB/updateMap.d.ts index 91f92e17..34dbac8a 100644 --- a/helpers/lotOccupancyDB/updateMap.d.ts +++ b/helpers/lotOccupancyDB/updateMap.d.ts @@ -13,5 +13,5 @@ interface UpdateMapForm { mapPostalCode: string; mapPhoneNumber: string; } -export declare const updateMap: (mapForm: UpdateMapForm, requestSession: recordTypes.PartialSession) => boolean; +export declare function updateMap(mapForm: UpdateMapForm, requestSession: recordTypes.PartialSession): boolean; export default updateMap; diff --git a/helpers/lotOccupancyDB/updateMap.js b/helpers/lotOccupancyDB/updateMap.js index 1a42f272..6b333dd6 100644 --- a/helpers/lotOccupancyDB/updateMap.js +++ b/helpers/lotOccupancyDB/updateMap.js @@ -1,27 +1,27 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const updateMap = (mapForm, requestSession) => { +export function updateMap(mapForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update Maps" + - " set mapName = ?," + - " mapDescription = ?," + - " mapSVG = ?," + - " mapLatitude = ?," + - " mapLongitude = ?," + - " mapAddress1 = ?," + - " mapAddress2 = ?," + - " mapCity = ?," + - " mapProvince = ?," + - " mapPostalCode = ?," + - " mapPhoneNumber = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where mapId = ?" + - " and recordDelete_timeMillis is null") + .prepare(`update Maps + set mapName = ?, + mapDescription = ?, + mapSVG = ?, + mapLatitude = ?, + mapLongitude = ?, + mapAddress1 = ?, + mapAddress2 = ?, + mapCity = ?, + mapProvince = ?, + mapPostalCode = ?, + mapPhoneNumber = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where mapId = ? + and recordDelete_timeMillis is null`) .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, mapForm.mapId); database.close(); return result.changes > 0; -}; +} export default updateMap; diff --git a/helpers/lotOccupancyDB/updateMap.ts b/helpers/lotOccupancyDB/updateMap.ts index 6a825e64..e81d8b64 100644 --- a/helpers/lotOccupancyDB/updateMap.ts +++ b/helpers/lotOccupancyDB/updateMap.ts @@ -19,32 +19,32 @@ interface UpdateMapForm { mapPhoneNumber: string; } -export const updateMap = ( +export function updateMap( mapForm: UpdateMapForm, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update Maps" + - " set mapName = ?," + - " mapDescription = ?," + - " mapSVG = ?," + - " mapLatitude = ?," + - " mapLongitude = ?," + - " mapAddress1 = ?," + - " mapAddress2 = ?," + - " mapCity = ?," + - " mapProvince = ?," + - " mapPostalCode = ?," + - " mapPhoneNumber = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where mapId = ?" + - " and recordDelete_timeMillis is null" + `update Maps + set mapName = ?, + mapDescription = ?, + mapSVG = ?, + mapLatitude = ?, + mapLongitude = ?, + mapAddress1 = ?, + mapAddress2 = ?, + mapCity = ?, + mapProvince = ?, + mapPostalCode = ?, + mapPhoneNumber = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where mapId = ? + and recordDelete_timeMillis is null` ) .run( mapForm.mapName, @@ -66,6 +66,6 @@ export const updateMap = ( database.close(); return result.changes > 0; -}; +} export default updateMap; diff --git a/helpers/lotOccupancyDB/updateOccupancyType.d.ts b/helpers/lotOccupancyDB/updateOccupancyType.d.ts index eb2a313a..faf2c7e1 100644 --- a/helpers/lotOccupancyDB/updateOccupancyType.d.ts +++ b/helpers/lotOccupancyDB/updateOccupancyType.d.ts @@ -3,5 +3,5 @@ interface UpdateOccupancyTypeForm { occupancyTypeId: number | string; occupancyType: string; } -export declare const updateOccupancyType: (occupancyTypeForm: UpdateOccupancyTypeForm, requestSession: recordTypes.PartialSession) => boolean; +export declare function updateOccupancyType(occupancyTypeForm: UpdateOccupancyTypeForm, requestSession: recordTypes.PartialSession): boolean; export default updateOccupancyType; diff --git a/helpers/lotOccupancyDB/updateOccupancyType.js b/helpers/lotOccupancyDB/updateOccupancyType.js index 9b024797..792c555d 100644 --- a/helpers/lotOccupancyDB/updateOccupancyType.js +++ b/helpers/lotOccupancyDB/updateOccupancyType.js @@ -1,19 +1,19 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearOccupancyTypesCache } from "../functions.cache.js"; -export const updateOccupancyType = (occupancyTypeForm, requestSession) => { +export function updateOccupancyType(occupancyTypeForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update OccupancyTypes" + - " set occupancyType = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where occupancyTypeId = ?" + - " and recordDelete_timeMillis is null") + .prepare(`update OccupancyTypes + set occupancyType = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where occupancyTypeId = ? + and recordDelete_timeMillis is null`) .run(occupancyTypeForm.occupancyType, requestSession.user.userName, rightNowMillis, occupancyTypeForm.occupancyTypeId); database.close(); clearOccupancyTypesCache(); return result.changes > 0; -}; +} export default updateOccupancyType; diff --git a/helpers/lotOccupancyDB/updateOccupancyType.ts b/helpers/lotOccupancyDB/updateOccupancyType.ts index 8fe7a5e6..011c9741 100644 --- a/helpers/lotOccupancyDB/updateOccupancyType.ts +++ b/helpers/lotOccupancyDB/updateOccupancyType.ts @@ -11,22 +11,22 @@ interface UpdateOccupancyTypeForm { occupancyType: string; } -export const updateOccupancyType = ( +export function updateOccupancyType( occupancyTypeForm: UpdateOccupancyTypeForm, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update OccupancyTypes" + - " set occupancyType = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where occupancyTypeId = ?" + - " and recordDelete_timeMillis is null" + `update OccupancyTypes + set occupancyType = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where occupancyTypeId = ? + and recordDelete_timeMillis is null` ) .run( occupancyTypeForm.occupancyType, @@ -40,6 +40,6 @@ export const updateOccupancyType = ( clearOccupancyTypesCache(); return result.changes > 0; -}; +} export default updateOccupancyType; diff --git a/helpers/lotOccupancyDB/updateOccupancyTypeField.d.ts b/helpers/lotOccupancyDB/updateOccupancyTypeField.d.ts index eaba42c5..c5609c1e 100644 --- a/helpers/lotOccupancyDB/updateOccupancyTypeField.d.ts +++ b/helpers/lotOccupancyDB/updateOccupancyTypeField.d.ts @@ -8,5 +8,5 @@ interface UpdateOccupancyTypeFieldForm { pattern?: string; occupancyTypeFieldValues: string; } -export declare const updateOccupancyTypeField: (occupancyTypeFieldForm: UpdateOccupancyTypeFieldForm, requestSession: recordTypes.PartialSession) => boolean; +export declare function updateOccupancyTypeField(occupancyTypeFieldForm: UpdateOccupancyTypeFieldForm, requestSession: recordTypes.PartialSession): boolean; export default updateOccupancyTypeField; diff --git a/helpers/lotOccupancyDB/updateOccupancyTypeField.js b/helpers/lotOccupancyDB/updateOccupancyTypeField.js index bfb7dee2..30c0100e 100644 --- a/helpers/lotOccupancyDB/updateOccupancyTypeField.js +++ b/helpers/lotOccupancyDB/updateOccupancyTypeField.js @@ -1,24 +1,24 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearOccupancyTypesCache } from "../functions.cache.js"; -export const updateOccupancyTypeField = (occupancyTypeFieldForm, requestSession) => { +export function updateOccupancyTypeField(occupancyTypeFieldForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update OccupancyTypeFields" + - " set occupancyTypeField = ?," + - " isRequired = ?," + - " minimumLength = ?," + - " maximumLength = ?," + - " pattern = ?," + - " occupancyTypeFieldValues = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where occupancyTypeFieldId = ?" + - " and recordDelete_timeMillis is null") + .prepare(`update OccupancyTypeFields + set occupancyTypeField = ?, + isRequired = ?, + minimumLength = ?, + maximumLength = ?, + pattern = ?, + occupancyTypeFieldValues = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where occupancyTypeFieldId = ? + and recordDelete_timeMillis is null`) .run(occupancyTypeFieldForm.occupancyTypeField, Number.parseInt(occupancyTypeFieldForm.isRequired, 10), occupancyTypeFieldForm.minimumLength || 0, occupancyTypeFieldForm.maximumLength || 100, occupancyTypeFieldForm.pattern || "", occupancyTypeFieldForm.occupancyTypeFieldValues, requestSession.user.userName, rightNowMillis, occupancyTypeFieldForm.occupancyTypeFieldId); database.close(); clearOccupancyTypesCache(); return result.changes > 0; -}; +} export default updateOccupancyTypeField; diff --git a/helpers/lotOccupancyDB/updateOccupancyTypeField.ts b/helpers/lotOccupancyDB/updateOccupancyTypeField.ts index 8669f2d0..3633f7fd 100644 --- a/helpers/lotOccupancyDB/updateOccupancyTypeField.ts +++ b/helpers/lotOccupancyDB/updateOccupancyTypeField.ts @@ -16,27 +16,27 @@ interface UpdateOccupancyTypeFieldForm { occupancyTypeFieldValues: string; } -export const updateOccupancyTypeField = ( +export function updateOccupancyTypeField( occupancyTypeFieldForm: UpdateOccupancyTypeFieldForm, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update OccupancyTypeFields" + - " set occupancyTypeField = ?," + - " isRequired = ?," + - " minimumLength = ?," + - " maximumLength = ?," + - " pattern = ?," + - " occupancyTypeFieldValues = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where occupancyTypeFieldId = ?" + - " and recordDelete_timeMillis is null" + `update OccupancyTypeFields + set occupancyTypeField = ?, + isRequired = ?, + minimumLength = ?, + maximumLength = ?, + pattern = ?, + occupancyTypeFieldValues = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where occupancyTypeFieldId = ? + and recordDelete_timeMillis is null` ) .run( occupancyTypeFieldForm.occupancyTypeField, @@ -55,6 +55,6 @@ export const updateOccupancyTypeField = ( clearOccupancyTypesCache(); return result.changes > 0; -}; +} export default updateOccupancyTypeField; diff --git a/helpers/lotOccupancyDB/updateWorkOrder.d.ts b/helpers/lotOccupancyDB/updateWorkOrder.d.ts index f15f54b9..9c563d97 100644 --- a/helpers/lotOccupancyDB/updateWorkOrder.d.ts +++ b/helpers/lotOccupancyDB/updateWorkOrder.d.ts @@ -6,5 +6,5 @@ interface UpdateWorkOrderForm { workOrderDescription: string; workOrderOpenDateString: string; } -export declare const updateWorkOrder: (workOrderForm: UpdateWorkOrderForm, requestSession: recordTypes.PartialSession) => boolean; +export declare function updateWorkOrder(workOrderForm: UpdateWorkOrderForm, requestSession: recordTypes.PartialSession): boolean; export default updateWorkOrder; diff --git a/helpers/lotOccupancyDB/updateWorkOrder.js b/helpers/lotOccupancyDB/updateWorkOrder.js index 8a710e9c..e6ba3c4e 100644 --- a/helpers/lotOccupancyDB/updateWorkOrder.js +++ b/helpers/lotOccupancyDB/updateWorkOrder.js @@ -1,21 +1,21 @@ import { dateStringToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js"; import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -export const updateWorkOrder = (workOrderForm, requestSession) => { +export function updateWorkOrder(workOrderForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update WorkOrders" + - " set workOrderNumber = ?," + - " workOrderTypeId = ?," + - " workOrderDescription = ?," + - " workOrderOpenDate = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where workOrderId = ?" + - " and recordDelete_timeMillis is null") + .prepare(`update WorkOrders + set workOrderNumber = ?, + workOrderTypeId = ?, + workOrderDescription = ?, + workOrderOpenDate = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where workOrderId = ? + and recordDelete_timeMillis is null`) .run(workOrderForm.workOrderNumber, workOrderForm.workOrderTypeId, workOrderForm.workOrderDescription, dateStringToInteger(workOrderForm.workOrderOpenDateString), requestSession.user.userName, rightNowMillis, workOrderForm.workOrderId); database.close(); return result.changes > 0; -}; +} export default updateWorkOrder; diff --git a/helpers/lotOccupancyDB/updateWorkOrder.ts b/helpers/lotOccupancyDB/updateWorkOrder.ts index f2c47df1..0297bc04 100644 --- a/helpers/lotOccupancyDB/updateWorkOrder.ts +++ b/helpers/lotOccupancyDB/updateWorkOrder.ts @@ -13,25 +13,25 @@ interface UpdateWorkOrderForm { workOrderOpenDateString: string; } -export const updateWorkOrder = ( +export function updateWorkOrder( workOrderForm: UpdateWorkOrderForm, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update WorkOrders" + - " set workOrderNumber = ?," + - " workOrderTypeId = ?," + - " workOrderDescription = ?," + - " workOrderOpenDate = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where workOrderId = ?" + - " and recordDelete_timeMillis is null" + `update WorkOrders + set workOrderNumber = ?, + workOrderTypeId = ?, + workOrderDescription = ?, + workOrderOpenDate = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where workOrderId = ? + and recordDelete_timeMillis is null` ) .run( workOrderForm.workOrderNumber, @@ -46,6 +46,6 @@ export const updateWorkOrder = ( database.close(); return result.changes > 0; -}; +} export default updateWorkOrder; diff --git a/helpers/lotOccupancyDB/updateWorkOrderComment.d.ts b/helpers/lotOccupancyDB/updateWorkOrderComment.d.ts index 743edf8b..f3ba40af 100644 --- a/helpers/lotOccupancyDB/updateWorkOrderComment.d.ts +++ b/helpers/lotOccupancyDB/updateWorkOrderComment.d.ts @@ -5,5 +5,5 @@ interface UpdateWorkOrderCommentForm { workOrderCommentTimeString: string; workOrderComment: string; } -export declare const updateWorkOrderComment: (commentForm: UpdateWorkOrderCommentForm, requestSession: recordTypes.PartialSession) => boolean; +export declare function updateWorkOrderComment(commentForm: UpdateWorkOrderCommentForm, requestSession: recordTypes.PartialSession): boolean; export default updateWorkOrderComment; diff --git a/helpers/lotOccupancyDB/updateWorkOrderComment.js b/helpers/lotOccupancyDB/updateWorkOrderComment.js index 3c987eba..e31034e3 100644 --- a/helpers/lotOccupancyDB/updateWorkOrderComment.js +++ b/helpers/lotOccupancyDB/updateWorkOrderComment.js @@ -1,20 +1,20 @@ 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 updateWorkOrderComment = (commentForm, requestSession) => { +export function updateWorkOrderComment(commentForm, requestSession) { const rightNowMillis = Date.now(); const database = sqlite(databasePath); const result = database - .prepare("update WorkOrderComments" + - " set workOrderCommentDate = ?," + - " workOrderCommentTime = ?," + - " workOrderComment = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and workOrderCommentId = ?") + .prepare(`update WorkOrderComments + set workOrderCommentDate = ?, + workOrderCommentTime = ?, + workOrderComment = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where recordDelete_timeMillis is null + and workOrderCommentId = ?`) .run(dateStringToInteger(commentForm.workOrderCommentDateString), timeStringToInteger(commentForm.workOrderCommentTimeString), commentForm.workOrderComment, requestSession.user.userName, rightNowMillis, commentForm.workOrderCommentId); database.close(); return result.changes > 0; -}; +} export default updateWorkOrderComment; diff --git a/helpers/lotOccupancyDB/updateWorkOrderComment.ts b/helpers/lotOccupancyDB/updateWorkOrderComment.ts index 5545618c..ab6ebff8 100644 --- a/helpers/lotOccupancyDB/updateWorkOrderComment.ts +++ b/helpers/lotOccupancyDB/updateWorkOrderComment.ts @@ -2,7 +2,10 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; -import { dateStringToInteger, timeStringToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js"; +import { + dateStringToInteger, + timeStringToInteger +} from "@cityssm/expressjs-server-js/dateTimeFns.js"; import type * as recordTypes from "../../types/recordTypes"; @@ -13,24 +16,24 @@ interface UpdateWorkOrderCommentForm { workOrderComment: string; } -export const updateWorkOrderComment = ( +export function updateWorkOrderComment( commentForm: UpdateWorkOrderCommentForm, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const rightNowMillis = Date.now(); const database = sqlite(databasePath); const result = database .prepare( - "update WorkOrderComments" + - " set workOrderCommentDate = ?," + - " workOrderCommentTime = ?," + - " workOrderComment = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where recordDelete_timeMillis is null" + - " and workOrderCommentId = ?" + `update WorkOrderComments + set workOrderCommentDate = ?, + workOrderCommentTime = ?, + workOrderComment = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where recordDelete_timeMillis is null + and workOrderCommentId = ?` ) .run( dateStringToInteger(commentForm.workOrderCommentDateString), @@ -44,6 +47,6 @@ export const updateWorkOrderComment = ( database.close(); return result.changes > 0; -}; +} export default updateWorkOrderComment; diff --git a/helpers/lotOccupancyDB/updateWorkOrderMilestone.d.ts b/helpers/lotOccupancyDB/updateWorkOrderMilestone.d.ts index fbe65e96..26632ea9 100644 --- a/helpers/lotOccupancyDB/updateWorkOrderMilestone.d.ts +++ b/helpers/lotOccupancyDB/updateWorkOrderMilestone.d.ts @@ -6,5 +6,5 @@ interface UpdateWorkOrderMilestoneForm { workOrderMilestoneTimeString?: string; workOrderMilestoneDescription: string; } -export declare const updateWorkOrderMilestone: (milestoneForm: UpdateWorkOrderMilestoneForm, requestSession: recordTypes.PartialSession) => boolean; +export declare function updateWorkOrderMilestone(milestoneForm: UpdateWorkOrderMilestoneForm, requestSession: recordTypes.PartialSession): boolean; export default updateWorkOrderMilestone; diff --git a/helpers/lotOccupancyDB/updateWorkOrderMilestone.js b/helpers/lotOccupancyDB/updateWorkOrderMilestone.js index 2fe026ef..c7042511 100644 --- a/helpers/lotOccupancyDB/updateWorkOrderMilestone.js +++ b/helpers/lotOccupancyDB/updateWorkOrderMilestone.js @@ -1,22 +1,22 @@ 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 updateWorkOrderMilestone = (milestoneForm, requestSession) => { +export function updateWorkOrderMilestone(milestoneForm, requestSession) { const rightNow = new Date(); const database = sqlite(databasePath); const result = database - .prepare("update WorkOrderMilestones" + - " set workOrderMilestoneTypeId = ?," + - " workOrderMilestoneDate = ?," + - " workOrderMilestoneTime = ?," + - " workOrderMilestoneDescription = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where workOrderMilestoneId = ?") + .prepare(`update WorkOrderMilestones + set workOrderMilestoneTypeId = ?, + workOrderMilestoneDate = ?, + workOrderMilestoneTime = ?, + workOrderMilestoneDescription = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where workOrderMilestoneId = ?`) .run(milestoneForm.workOrderMilestoneTypeId || undefined, dateStringToInteger(milestoneForm.workOrderMilestoneDateString), milestoneForm.workOrderMilestoneTimeString ? timeStringToInteger(milestoneForm.workOrderMilestoneTimeString) : 0, milestoneForm.workOrderMilestoneDescription, requestSession.user.userName, rightNow.getTime(), milestoneForm.workOrderMilestoneId); database.close(); return result.changes > 0; -}; +} export default updateWorkOrderMilestone; diff --git a/helpers/lotOccupancyDB/updateWorkOrderMilestone.ts b/helpers/lotOccupancyDB/updateWorkOrderMilestone.ts index 18f333a8..3bf93485 100644 --- a/helpers/lotOccupancyDB/updateWorkOrderMilestone.ts +++ b/helpers/lotOccupancyDB/updateWorkOrderMilestone.ts @@ -17,32 +17,30 @@ interface UpdateWorkOrderMilestoneForm { workOrderMilestoneDescription: string; } -export const updateWorkOrderMilestone = ( +export function updateWorkOrderMilestone( milestoneForm: UpdateWorkOrderMilestoneForm, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const rightNow = new Date(); const database = sqlite(databasePath); const result = database .prepare( - "update WorkOrderMilestones" + - " set workOrderMilestoneTypeId = ?," + - " workOrderMilestoneDate = ?," + - " workOrderMilestoneTime = ?," + - " workOrderMilestoneDescription = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where workOrderMilestoneId = ?" + `update WorkOrderMilestones + set workOrderMilestoneTypeId = ?, + workOrderMilestoneDate = ?, + workOrderMilestoneTime = ?, + workOrderMilestoneDescription = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where workOrderMilestoneId = ?` ) .run( milestoneForm.workOrderMilestoneTypeId || undefined, dateStringToInteger(milestoneForm.workOrderMilestoneDateString), milestoneForm.workOrderMilestoneTimeString - ? timeStringToInteger( - milestoneForm.workOrderMilestoneTimeString - ) + ? timeStringToInteger(milestoneForm.workOrderMilestoneTimeString) : 0, milestoneForm.workOrderMilestoneDescription, @@ -54,6 +52,6 @@ export const updateWorkOrderMilestone = ( database.close(); return result.changes > 0; -}; +} export default updateWorkOrderMilestone; diff --git a/helpers/lotOccupancyDB/updateWorkOrderMilestoneType.d.ts b/helpers/lotOccupancyDB/updateWorkOrderMilestoneType.d.ts index 46216ddd..0641de4b 100644 --- a/helpers/lotOccupancyDB/updateWorkOrderMilestoneType.d.ts +++ b/helpers/lotOccupancyDB/updateWorkOrderMilestoneType.d.ts @@ -3,5 +3,5 @@ interface UpdateWorkOrderMilestoneTypeForm { workOrderMilestoneTypeId: number | string; workOrderMilestoneType: string; } -export declare const updateWorkOrderMilestoneType: (workOrderMilestoneTypeForm: UpdateWorkOrderMilestoneTypeForm, requestSession: recordTypes.PartialSession) => boolean; +export declare function updateWorkOrderMilestoneType(workOrderMilestoneTypeForm: UpdateWorkOrderMilestoneTypeForm, requestSession: recordTypes.PartialSession): boolean; export default updateWorkOrderMilestoneType; diff --git a/helpers/lotOccupancyDB/updateWorkOrderMilestoneType.js b/helpers/lotOccupancyDB/updateWorkOrderMilestoneType.js index 2440a432..6ae2e97d 100644 --- a/helpers/lotOccupancyDB/updateWorkOrderMilestoneType.js +++ b/helpers/lotOccupancyDB/updateWorkOrderMilestoneType.js @@ -1,19 +1,19 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearWorkOrderMilestoneTypesCache } from "../functions.cache.js"; -export const updateWorkOrderMilestoneType = (workOrderMilestoneTypeForm, requestSession) => { +export function updateWorkOrderMilestoneType(workOrderMilestoneTypeForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update WorkOrderMilestoneTypes" + - " set workOrderMilestoneType = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where workOrderMilestoneTypeId = ?" + - " and recordDelete_timeMillis is null") + .prepare(`update WorkOrderMilestoneTypes + set workOrderMilestoneType = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where workOrderMilestoneTypeId = ? + and recordDelete_timeMillis is null`) .run(workOrderMilestoneTypeForm.workOrderMilestoneType, requestSession.user.userName, rightNowMillis, workOrderMilestoneTypeForm.workOrderMilestoneTypeId); database.close(); clearWorkOrderMilestoneTypesCache(); return result.changes > 0; -}; +} export default updateWorkOrderMilestoneType; diff --git a/helpers/lotOccupancyDB/updateWorkOrderMilestoneType.ts b/helpers/lotOccupancyDB/updateWorkOrderMilestoneType.ts index 9ddde888..200a90cb 100644 --- a/helpers/lotOccupancyDB/updateWorkOrderMilestoneType.ts +++ b/helpers/lotOccupancyDB/updateWorkOrderMilestoneType.ts @@ -11,22 +11,22 @@ interface UpdateWorkOrderMilestoneTypeForm { workOrderMilestoneType: string; } -export const updateWorkOrderMilestoneType = ( +export function updateWorkOrderMilestoneType( workOrderMilestoneTypeForm: UpdateWorkOrderMilestoneTypeForm, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update WorkOrderMilestoneTypes" + - " set workOrderMilestoneType = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where workOrderMilestoneTypeId = ?" + - " and recordDelete_timeMillis is null" + `update WorkOrderMilestoneTypes + set workOrderMilestoneType = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where workOrderMilestoneTypeId = ? + and recordDelete_timeMillis is null` ) .run( workOrderMilestoneTypeForm.workOrderMilestoneType, @@ -40,6 +40,6 @@ export const updateWorkOrderMilestoneType = ( clearWorkOrderMilestoneTypesCache(); return result.changes > 0; -}; +} export default updateWorkOrderMilestoneType; diff --git a/helpers/lotOccupancyDB/updateWorkOrderType.d.ts b/helpers/lotOccupancyDB/updateWorkOrderType.d.ts index 370ccad0..90533781 100644 --- a/helpers/lotOccupancyDB/updateWorkOrderType.d.ts +++ b/helpers/lotOccupancyDB/updateWorkOrderType.d.ts @@ -3,5 +3,5 @@ interface UpdateWorkOrderTypeForm { workOrderTypeId: number | string; workOrderType: string; } -export declare const updateWorkOrderType: (workOrderTypeForm: UpdateWorkOrderTypeForm, requestSession: recordTypes.PartialSession) => boolean; +export declare function updateWorkOrderType(workOrderTypeForm: UpdateWorkOrderTypeForm, requestSession: recordTypes.PartialSession): boolean; export default updateWorkOrderType; diff --git a/helpers/lotOccupancyDB/updateWorkOrderType.js b/helpers/lotOccupancyDB/updateWorkOrderType.js index 419db684..960d67fc 100644 --- a/helpers/lotOccupancyDB/updateWorkOrderType.js +++ b/helpers/lotOccupancyDB/updateWorkOrderType.js @@ -1,19 +1,19 @@ import sqlite from "better-sqlite3"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { clearWorkOrderTypesCache } from "../functions.cache.js"; -export const updateWorkOrderType = (workOrderTypeForm, requestSession) => { +export function updateWorkOrderType(workOrderTypeForm, requestSession) { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database - .prepare("update WorkOrderTypes" + - " set workOrderType = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where workOrderTypeId = ?" + - " and recordDelete_timeMillis is null") + .prepare(`update WorkOrderTypes + set workOrderType = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where workOrderTypeId = ? + and recordDelete_timeMillis is null`) .run(workOrderTypeForm.workOrderType, requestSession.user.userName, rightNowMillis, workOrderTypeForm.workOrderTypeId); database.close(); clearWorkOrderTypesCache(); return result.changes > 0; -}; +} export default updateWorkOrderType; diff --git a/helpers/lotOccupancyDB/updateWorkOrderType.ts b/helpers/lotOccupancyDB/updateWorkOrderType.ts index 7f7cc6a0..cedd706d 100644 --- a/helpers/lotOccupancyDB/updateWorkOrderType.ts +++ b/helpers/lotOccupancyDB/updateWorkOrderType.ts @@ -11,22 +11,22 @@ interface UpdateWorkOrderTypeForm { workOrderType: string; } -export const updateWorkOrderType = ( +export function updateWorkOrderType( workOrderTypeForm: UpdateWorkOrderTypeForm, requestSession: recordTypes.PartialSession -): boolean => { +): boolean { const database = sqlite(databasePath); const rightNowMillis = Date.now(); const result = database .prepare( - "update WorkOrderTypes" + - " set workOrderType = ?," + - " recordUpdate_userName = ?," + - " recordUpdate_timeMillis = ?" + - " where workOrderTypeId = ?" + - " and recordDelete_timeMillis is null" + `update WorkOrderTypes + set workOrderType = ?, + recordUpdate_userName = ?, + recordUpdate_timeMillis = ? + where workOrderTypeId = ? + and recordDelete_timeMillis is null` ) .run( workOrderTypeForm.workOrderType, @@ -40,6 +40,6 @@ export const updateWorkOrderType = ( clearWorkOrderTypesCache(); return result.changes > 0; -}; +} export default updateWorkOrderType;