deepsource-autofix-76c6eb20
Dan Gowans 2022-08-31 10:54:24 -04:00
parent f76f41ef63
commit 3e42fa5e78
26 changed files with 183 additions and 136 deletions

View File

@ -1,8 +1,12 @@
import type { RequestHandler } from "express"; import type {
RequestHandler
} from "express";
import * as configFunctions from "../../helpers/functions.config.js"; import * as configFunctions from "../../helpers/functions.config.js";
import { getMap } from "../../helpers/lotOccupancyDB/getMap.js"; import {
getMap
} from "../../helpers/lotOccupancyDB/getMap.js";
export const handler: RequestHandler = (request, response) => { export const handler: RequestHandler = (request, response) => {

View File

@ -1,5 +1,8 @@
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import {
lotOccupancyDB as databasePath
} from "../../data/databasePaths.js";
import type * as recordTypes from "../../types/recordTypes"; import type * as recordTypes from "../../types/recordTypes";

View File

@ -1,5 +1,8 @@
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import {
lotOccupancyDB as databasePath
} from "../../data/databasePaths.js";
import * as dateTimeFunctions from "@cityssm/expressjs-server-js/dateTimeFns.js"; import * as dateTimeFunctions from "@cityssm/expressjs-server-js/dateTimeFns.js";

View File

@ -1,6 +1,6 @@
import { dateStringToInteger, dateToInteger, dateToTimeInteger, timeStringToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { dateStringToInteger, dateToInteger, dateToTimeInteger, timeStringToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js";
export const addLotOccupancyTransaction = (lotOccupancyTransactionForm, requestSession) => { export const addLotOccupancyTransaction = (lotOccupancyTransactionForm, requestSession) => {
const database = sqlite(databasePath); const database = sqlite(databasePath);
let transactionIndex = 0; let transactionIndex = 0;

View File

@ -1,14 +1,15 @@
import sqlite from "better-sqlite3";
import {
lotOccupancyDB as databasePath
} from "../../data/databasePaths.js";
import { import {
dateStringToInteger, dateStringToInteger,
dateToInteger, dateToInteger,
dateToTimeInteger, dateToTimeInteger,
timeStringToInteger timeStringToInteger
} from "@cityssm/expressjs-server-js/dateTimeFns.js"; } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import sqlite from "better-sqlite3";
import {
lotOccupancyDB as databasePath
} from "../../data/databasePaths.js";
import type * as recordTypes from "../../types/recordTypes"; import type * as recordTypes from "../../types/recordTypes";

View File

@ -4,13 +4,16 @@ import {
lotOccupancyDB as databasePath lotOccupancyDB as databasePath
} from "../../data/databasePaths.js"; } from "../../data/databasePaths.js";
import {
clearOccupancyTypesCache
} from "../functions.cache.js";
import type * as recordTypes from "../../types/recordTypes"; import type * as recordTypes from "../../types/recordTypes";
import { clearOccupancyTypesCache } from "../functions.cache.js";
interface AddOccupancyTypeForm { interface AddOccupancyTypeForm {
occupancyType: string; occupancyType: string;
orderNumber?: number; orderNumber ? : number;
} }

View File

@ -1,6 +1,6 @@
import { dateStringToInteger, dateToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { dateStringToInteger, dateToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js";
export const addWorkOrder = (workOrderForm, requestSession) => { export const addWorkOrder = (workOrderForm, requestSession) => {
const database = sqlite(databasePath); const database = sqlite(databasePath);
const rightNow = new Date(); const rightNow = new Date();

View File

@ -1,10 +1,14 @@
import { dateStringToInteger, dateToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { import {
lotOccupancyDB as databasePath lotOccupancyDB as databasePath
} from "../../data/databasePaths.js"; } from "../../data/databasePaths.js";
import {
dateStringToInteger,
dateToInteger
} from "@cityssm/expressjs-server-js/dateTimeFns.js";
import type * as recordTypes from "../../types/recordTypes"; import type * as recordTypes from "../../types/recordTypes";
@ -12,8 +16,8 @@ interface AddWorkOrderForm {
workOrderTypeId: number | string; workOrderTypeId: number | string;
workOrderNumber: string; workOrderNumber: string;
workOrderDescription: string; workOrderDescription: string;
workOrderOpenDateString?: string; workOrderOpenDateString ? : string;
workOrderCloseDateString?: string; workOrderCloseDateString ? : string;
} }

View File

@ -1,6 +1,6 @@
import { dateIntegerToString, timeIntegerToString } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { dateIntegerToString, timeIntegerToString } from "@cityssm/expressjs-server-js/dateTimeFns.js";
export const getLotComments = (lotId, connectedDatabase) => { export const getLotComments = (lotId, connectedDatabase) => {
const database = connectedDatabase || sqlite(databasePath, { const database = connectedDatabase || sqlite(databasePath, {
readonly: true readonly: true

View File

@ -1,9 +1,14 @@
import { dateIntegerToString, timeIntegerToString } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { import {
lotOccupancyDB as databasePath lotOccupancyDB as databasePath
} from "../../data/databasePaths.js"; } from "../../data/databasePaths.js";
import {
dateIntegerToString,
timeIntegerToString
} from "@cityssm/expressjs-server-js/dateTimeFns.js";
import type * as recordTypes from "../../types/recordTypes"; import type * as recordTypes from "../../types/recordTypes";

View File

@ -1,6 +1,6 @@
import { dateIntegerToString, dateStringToInteger, dateToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { dateIntegerToString, dateStringToInteger, dateToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import { getLotOccupancyOccupants } from "./getLotOccupancyOccupants.js"; import { getLotOccupancyOccupants } from "./getLotOccupancyOccupants.js";
export const getLotOccupancies = (filters, options, connectedDatabase) => { export const getLotOccupancies = (filters, options, connectedDatabase) => {
const database = connectedDatabase || sqlite(databasePath, { const database = connectedDatabase || sqlite(databasePath, {

View File

@ -1,15 +1,15 @@
import {
dateIntegerToString,
dateStringToInteger,
dateToInteger
} from "@cityssm/expressjs-server-js/dateTimeFns.js";
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { import {
lotOccupancyDB as databasePath lotOccupancyDB as databasePath
} from "../../data/databasePaths.js"; } from "../../data/databasePaths.js";
import {
dateIntegerToString,
dateStringToInteger,
dateToInteger
} from "@cityssm/expressjs-server-js/dateTimeFns.js";
import { import {
getLotOccupancyOccupants getLotOccupancyOccupants
} from "./getLotOccupancyOccupants.js"; } from "./getLotOccupancyOccupants.js";

View File

@ -1,6 +1,6 @@
import { dateIntegerToString } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { dateIntegerToString } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import { getLotOccupancyOccupants } from "./getLotOccupancyOccupants.js"; import { getLotOccupancyOccupants } from "./getLotOccupancyOccupants.js";
import { getLotOccupancyComments } from "./getLotOccupancyComments.js"; import { getLotOccupancyComments } from "./getLotOccupancyComments.js";
import { getLotOccupancyFields } from "./getLotOccupancyFields.js"; import { getLotOccupancyFields } from "./getLotOccupancyFields.js";

View File

@ -1,13 +1,13 @@
import {
dateIntegerToString
} from "@cityssm/expressjs-server-js/dateTimeFns.js";
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { import {
lotOccupancyDB as databasePath lotOccupancyDB as databasePath
} from "../../data/databasePaths.js"; } from "../../data/databasePaths.js";
import {
dateIntegerToString
} from "@cityssm/expressjs-server-js/dateTimeFns.js";
import { import {
getLotOccupancyOccupants getLotOccupancyOccupants
} from "./getLotOccupancyOccupants.js"; } from "./getLotOccupancyOccupants.js";

View File

@ -1,6 +1,6 @@
import { dateIntegerToString, timeIntegerToString } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { dateIntegerToString, timeIntegerToString } from "@cityssm/expressjs-server-js/dateTimeFns.js";
export const getLotOccupancyComments = (lotOccupancyId, connectedDatabase) => { export const getLotOccupancyComments = (lotOccupancyId, connectedDatabase) => {
const database = connectedDatabase || sqlite(databasePath, { const database = connectedDatabase || sqlite(databasePath, {
readonly: true readonly: true

View File

@ -1,9 +1,14 @@
import { dateIntegerToString, timeIntegerToString } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { import {
lotOccupancyDB as databasePath lotOccupancyDB as databasePath
} from "../../data/databasePaths.js"; } from "../../data/databasePaths.js";
import {
dateIntegerToString,
timeIntegerToString
} from "@cityssm/expressjs-server-js/dateTimeFns.js";
import type * as recordTypes from "../../types/recordTypes"; import type * as recordTypes from "../../types/recordTypes";

View File

@ -1,6 +1,6 @@
import { dateIntegerToString, timeIntegerToString } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { dateIntegerToString, timeIntegerToString } from "@cityssm/expressjs-server-js/dateTimeFns.js";
export const getLotOccupancyTransactions = (lotOccupancyId, connectedDatabase) => { export const getLotOccupancyTransactions = (lotOccupancyId, connectedDatabase) => {
const database = connectedDatabase || sqlite(databasePath, { const database = connectedDatabase || sqlite(databasePath, {
readonly: true readonly: true

View File

@ -1,10 +1,14 @@
import { dateIntegerToString, timeIntegerToString } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { import {
lotOccupancyDB as databasePath lotOccupancyDB as databasePath
} from "../../data/databasePaths.js"; } from "../../data/databasePaths.js";
import {
dateIntegerToString,
timeIntegerToString
} from "@cityssm/expressjs-server-js/dateTimeFns.js";
import type * as recordTypes from "../../types/recordTypes"; import type * as recordTypes from "../../types/recordTypes";

View File

@ -1,5 +1,8 @@
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import {
lotOccupancyDB as databasePath
} from "../../data/databasePaths.js";
import type * as recordTypes from "../../types/recordTypes"; import type * as recordTypes from "../../types/recordTypes";
@ -32,7 +35,7 @@ export const getMap = (mapId: number | string): recordTypes.Map => {
database.close(); database.close();
return map; return map;
}; };
export default getMap; export default getMap;

View File

@ -1,4 +1,5 @@
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { import {
lotOccupancyDB as databasePath lotOccupancyDB as databasePath
} from "../../data/databasePaths.js"; } from "../../data/databasePaths.js";

View File

@ -1,4 +1,5 @@
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { import {
lotOccupancyDB as databasePath lotOccupancyDB as databasePath
} from "../../data/databasePaths.js"; } from "../../data/databasePaths.js";

View File

@ -1,5 +1,8 @@
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import {
lotOccupancyDB as databasePath
} from "../../data/databasePaths.js";
import type * as recordTypes from "../../types/recordTypes"; import type * as recordTypes from "../../types/recordTypes";
@ -9,14 +12,14 @@ interface UpdateFeeForm {
feeCategoryId: string; feeCategoryId: string;
feeName: string; feeName: string;
feeDescription: string; feeDescription: string;
occupancyTypeId?: string; occupancyTypeId ? : string;
lotTypeId?: string; lotTypeId ? : string;
feeAmount?: string; feeAmount ? : string;
feeFunction?: string; feeFunction ? : string;
taxAmount?: string; taxAmount ? : string;
taxPercentage?: string; taxPercentage ? : string;
includeQuantity: "" | "1"; includeQuantity: "" | "1";
quantityUnit?: string; quantityUnit ? : string;
isRequired: "" | "1"; isRequired: "" | "1";
} }

View File

@ -1,5 +1,8 @@
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import {
lotOccupancyDB as databasePath
} from "../../data/databasePaths.js";
import type * as recordTypes from "../../types/recordTypes"; import type * as recordTypes from "../../types/recordTypes";

View File

@ -1,5 +1,8 @@
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import {
lotOccupancyDB as databasePath
} from "../../data/databasePaths.js";
import type * as recordTypes from "../../types/recordTypes"; import type * as recordTypes from "../../types/recordTypes";

View File

@ -1,6 +1,6 @@
import { dateStringToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js"; import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { dateStringToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import { addOrUpdateLotOccupancyField } from "./addOrUpdateLotOccupancyField.js"; import { addOrUpdateLotOccupancyField } from "./addOrUpdateLotOccupancyField.js";
import { deleteLotOccupancyField } from "./deleteLotOccupancyField.js"; import { deleteLotOccupancyField } from "./deleteLotOccupancyField.js";
export function updateLotOccupancy(lotOccupancyForm, requestSession) { export function updateLotOccupancy(lotOccupancyForm, requestSession) {

View File

@ -1,13 +1,13 @@
import {
dateStringToInteger
} from "@cityssm/expressjs-server-js/dateTimeFns.js";
import sqlite from "better-sqlite3"; import sqlite from "better-sqlite3";
import { import {
lotOccupancyDB as databasePath lotOccupancyDB as databasePath
} from "../../data/databasePaths.js"; } from "../../data/databasePaths.js";
import {
dateStringToInteger
} from "@cityssm/expressjs-server-js/dateTimeFns.js";
import { import {
addOrUpdateLotOccupancyField addOrUpdateLotOccupancyField
} from "./addOrUpdateLotOccupancyField.js"; } from "./addOrUpdateLotOccupancyField.js";
@ -18,6 +18,7 @@ import {
import type * as recordTypes from "../../types/recordTypes"; import type * as recordTypes from "../../types/recordTypes";
interface UpdateLotOccupancyForm { interface UpdateLotOccupancyForm {
lotOccupancyId: string | number; lotOccupancyId: string | number;
occupancyTypeId: string | number; occupancyTypeId: string | number;