steve
/
sunrise-cms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linting

deepsource-autofix-76c6eb20
Dan Gowans 2023-01-12 09:36:08 -05:00
parent 263c316573
commit 10fe9a612e
84 changed files with 2429 additions and 2298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.eslintrc.json
View File

@ -21,6 +21,17 @@
"plugin:@typescript-eslint/recommended"
],
"rules": {
"@typescript-eslint/member-delimiter-style": [
"error",
{
"multiline": {
"delimiter": "none"
},
"singleline": {
"delimiter": "semi"
}
}
],
"@typescript-eslint/no-extra-semi": "off",
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/restrict-plus-operands": "warn",

2
handlers/lotOccupancies-get/new.d.ts vendored
View File

@ -1,3 +1,3 @@
import type { RequestHandler } from "express";
import type { RequestHandler } from 'express';
export declare const handler: RequestHandler;
export default handler;

16
handlers/lotOccupancies-get/new.js
View File

@ -1,8 +1,8 @@
import { dateToInteger, dateToString } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import { getLotOccupantTypes, getLotStatuses, getLotTypes, getOccupancyTypes } from "../../helpers/functions.cache.js";
import { getLot } from "../../helpers/lotOccupancyDB/getLot.js";
import { getMaps } from "../../helpers/lotOccupancyDB/getMaps.js";
import * as configFunctions from "../../helpers/functions.config.js";
import { dateToInteger, dateToString } from '@cityssm/expressjs-server-js/dateTimeFns.js';
import { getLotOccupantTypes, getLotStatuses, getLotTypes, getOccupancyTypes } from '../../helpers/functions.cache.js';
import { getLot } from '../../helpers/lotOccupancyDB/getLot.js';
import { getMaps } from '../../helpers/lotOccupancyDB/getMaps.js';
import * as configFunctions from '../../helpers/functions.config.js';
export const handler = (request, response) => {
const startDate = new Date();
const lotOccupancy = {
@ -11,18 +11,20 @@ export const handler = (request, response) => {
};
if (request.query.lotId) {
const lot = getLot(request.query.lotId);
if (lot) {
lotOccupancy.lotId = lot.lotId;
lotOccupancy.lotName = lot.lotName;
lotOccupancy.mapId = lot.mapId;
lotOccupancy.mapName = lot.mapName;
}
}
const occupancyTypes = getOccupancyTypes();
const lotOccupantTypes = getLotOccupantTypes();
const lotTypes = getLotTypes();
const lotStatuses = getLotStatuses();
const maps = getMaps();
return response.render("lotOccupancy-edit", {
headTitle: `Create a New ${configFunctions.getProperty("aliases.occupancy")} Record`,
response.render('lotOccupancy-edit', {
headTitle: `Create a New ${configFunctions.getProperty('aliases.occupancy')} Record`,
lotOccupancy,
occupancyTypes,
lotOccupantTypes,

60
handlers/lotOccupancies-get/new.ts
View File

@ -1,45 +1,53 @@
import type { RequestHandler } from "express";
import type { RequestHandler } from 'express'
import { dateToInteger, dateToString } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import {
dateToInteger,
dateToString
} from '@cityssm/expressjs-server-js/dateTimeFns.js'
import {
getLotOccupantTypes,
getLotStatuses,
getLotTypes,
getOccupancyTypes
} from "../../helpers/functions.cache.js";
} from '../../helpers/functions.cache.js'
import { getLot } from "../../helpers/lotOccupancyDB/getLot.js";
import { getMaps } from "../../helpers/lotOccupancyDB/getMaps.js";
import { getLot } from '../../helpers/lotOccupancyDB/getLot.js'
import { getMaps } from '../../helpers/lotOccupancyDB/getMaps.js'
import * as configFunctions from "../../helpers/functions.config.js";
import * as configFunctions from '../../helpers/functions.config.js'
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes'
export const handler: RequestHandler = (request, response) => {
const startDate = new Date();
const startDate = new Date()
const lotOccupancy: recordTypes.LotOccupancy = {
occupancyStartDate: dateToInteger(startDate),
occupancyStartDateString: dateToString(startDate)
};
if (request.query.lotId) {
const lot = getLot(request.query.lotId as string);
lotOccupancy.lotId = lot.lotId;
lotOccupancy.lotName = lot.lotName;
lotOccupancy.mapId = lot.mapId;
lotOccupancy.mapName = lot.mapName;
}
const occupancyTypes = getOccupancyTypes();
const lotOccupantTypes = getLotOccupantTypes();
const lotTypes = getLotTypes();
const lotStatuses = getLotStatuses();
const maps = getMaps();
if (request.query.lotId) {
const lot = getLot(request.query.lotId as string)
return response.render("lotOccupancy-edit", {
headTitle: `Create a New ${configFunctions.getProperty("aliases.occupancy")} Record`,
if (lot) {
lotOccupancy.lotId = lot.lotId
lotOccupancy.lotName = lot.lotName
lotOccupancy.mapId = lot.mapId
lotOccupancy.mapName = lot.mapName
}
}
const occupancyTypes = getOccupancyTypes()
const lotOccupantTypes = getLotOccupantTypes()
const lotTypes = getLotTypes()
const lotStatuses = getLotStatuses()
const maps = getMaps()
response.render('lotOccupancy-edit', {
headTitle: `Create a New ${configFunctions.getProperty(
'aliases.occupancy'
)} Record`,
lotOccupancy,
occupancyTypes,
@ -49,7 +57,7 @@ export const handler: RequestHandler = (request, response) => {
maps,
isCreate: true
});
};
})
}
export default handler;
export default handler

4
helpers/functions.sqlFilters.d.ts vendored
View File

@ -3,8 +3,8 @@ interface WhereClauseReturn {
sqlWhereClause: string;
sqlParameters: unknown[];
}
export declare function getLotNameWhereClause(lotName: string | undefined, lotNameSearchType: LotNameSearchType, lotsTableAlias?: string): WhereClauseReturn;
export declare function getLotNameWhereClause(lotName: string | undefined, lotNameSearchType: LotNameSearchType | undefined, lotsTableAlias?: string): WhereClauseReturn;
declare type OccupancyTime = '' | 'current' | 'past' | 'future';
export declare function getOccupancyTimeWhereClause(occupancyTime: OccupancyTime, lotOccupanciesTableAlias?: string): WhereClauseReturn;
export declare function getOccupancyTimeWhereClause(occupancyTime: OccupancyTime | undefined, lotOccupanciesTableAlias?: string): WhereClauseReturn;
export declare function getOccupantNameWhereClause(occupantName?: string, tableAlias?: string): WhereClauseReturn;
export {};

2
helpers/functions.sqlFilters.js
View File

@ -32,7 +32,7 @@ export function getLotNameWhereClause(lotName = '', lotNameSearchType, lotsTable
export function getOccupancyTimeWhereClause(occupancyTime, lotOccupanciesTableAlias = 'o') {
let sqlWhereClause = '';
const sqlParameters = [];
if (occupancyTime !== '') {
if (occupancyTime) {
const currentDateString = dateToInteger(new Date());
switch (occupancyTime) {
case 'current': {

6
helpers/functions.sqlFilters.ts
View File

@ -9,7 +9,7 @@ interface WhereClauseReturn {
export function getLotNameWhereClause(
lotName = '',
lotNameSearchType: LotNameSearchType,
lotNameSearchType: LotNameSearchType | undefined,
lotsTableAlias = 'l'
): WhereClauseReturn {
let sqlWhereClause = ''
@ -47,13 +47,13 @@ export function getLotNameWhereClause(
type OccupancyTime = '' | 'current' | 'past' | 'future'
export function getOccupancyTimeWhereClause(
occupancyTime: OccupancyTime,
occupancyTime: OccupancyTime | undefined,
lotOccupanciesTableAlias = 'o'
): WhereClauseReturn {
let sqlWhereClause = ''
const sqlParameters: unknown[] = []
if (occupancyTime !== '') {
if (occupancyTime) {
const currentDateString = dateToInteger(new Date())
switch (occupancyTime) {

6
helpers/lotOccupancyDB/addFee.d.ts vendored
View File

@ -3,10 +3,10 @@ interface AddFeeForm {
feeCategoryId: string;
feeName: string;
feeDescription: string;
occupancyTypeId?: string;
lotTypeId?: string;
occupancyTypeId: string;
lotTypeId: string;
feeAmount?: string;
feeFunction?: string;
feeFunction: string;
taxAmount?: string;
taxPercentage?: string;
includeQuantity: '' | '1';

2
helpers/lotOccupancyDB/addFee.js
View File

@ -15,7 +15,7 @@ export function addFee(feeForm, requestSession) {
recordCreate_userName, recordCreate_timeMillis,
recordUpdate_userName, recordUpdate_timeMillis)
values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
.run(feeForm.feeCategoryId, feeForm.feeName, feeForm.feeDescription, feeForm.occupancyTypeId ?? undefined, feeForm.lotTypeId ?? undefined, feeForm.feeAmount ?? undefined, feeForm.feeFunction ?? undefined, feeForm.taxAmount ?? undefined, feeForm.taxPercentage ?? undefined, (feeForm.includeQuantity ?? '') === '' ? 0 : 1, feeForm.quantityUnit, (feeForm.isRequired ?? '') === '' ? 0 : 1, feeForm.orderNumber ?? -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
.run(feeForm.feeCategoryId, feeForm.feeName, feeForm.feeDescription, feeForm.occupancyTypeId === '' ? undefined : feeForm.occupancyTypeId, feeForm.lotTypeId === '' ? undefined : feeForm.lotTypeId, feeForm.feeAmount ?? undefined, feeForm.feeFunction ?? undefined, feeForm.taxAmount ?? undefined, feeForm.taxPercentage ?? undefined, (feeForm.includeQuantity ?? '') === '' ? 0 : 1, feeForm.quantityUnit, (feeForm.isRequired ?? '') === '' ? 0 : 1, feeForm.orderNumber ?? -1, requestSession.user.userName, rightNowMillis, requestSession.user.userName, rightNowMillis);
database.close();
return result.lastInsertRowid;
}

10
helpers/lotOccupancyDB/addFee.ts
View File

@ -9,10 +9,10 @@ interface AddFeeForm {
feeCategoryId: string
feeName: string
feeDescription: string
occupancyTypeId?: string
lotTypeId?: string
occupancyTypeId: string
lotTypeId: string
feeAmount?: string
feeFunction?: string
feeFunction: string
taxAmount?: string
taxPercentage?: string
includeQuantity: '' | '1'
@ -47,8 +47,8 @@ export function addFee(
feeForm.feeCategoryId,
feeForm.feeName,
feeForm.feeDescription,
feeForm.occupancyTypeId ?? undefined,
feeForm.lotTypeId ?? undefined,
feeForm.occupancyTypeId === '' ? undefined : feeForm.occupancyTypeId,
feeForm.lotTypeId === '' ? undefined : feeForm.lotTypeId,
feeForm.feeAmount ?? undefined,
feeForm.feeFunction ?? undefined,
feeForm.taxAmount ?? undefined,

4
helpers/lotOccupancyDB/getLot.d.ts vendored
View File

@ -1,4 +1,4 @@
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes';
export declare function getLotByLotName(lotName: string): recordTypes.Lot | undefined;
export declare function getLot(lotId: number | string): recordTypes.Lot;
export declare function getLot(lotId: number | string): recordTypes.Lot | undefined;
export default getLot;

18
helpers/lotOccupancyDB/getLot.js
View File

@ -1,8 +1,8 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { getLotFields } from "./getLotFields.js";
import { getLotComments } from "./getLotComments.js";
import { getLotOccupancies } from "./getLotOccupancies.js";
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
import { getLotFields } from './getLotFields.js';
import { getLotComments } from './getLotComments.js';
import { getLotOccupancies } from './getLotOccupancies.js';
const baseSQL = `select l.lotId, l.lotTypeId, t.lotType, l.lotName, l.lotStatusId, s.lotStatus,
l.mapId, m.mapName, m.mapSVG, l.mapKey,
l.lotLatitude, l.lotLongitude
@ -11,11 +11,11 @@ const baseSQL = `select l.lotId, l.lotTypeId, t.lotType, l.lotName, l.lotStatusI
left join LotStatuses s on l.lotStatusId = s.lotStatusId
left join Maps m on l.mapId = m.mapId
where l.recordDelete_timeMillis is null`;
function _getLot(sql, lotId_or_lotName) {
function _getLot(sql, lotIdOrLotName) {
const database = sqlite(databasePath, {
readonly: true
});
const lot = database.prepare(sql).get(lotId_or_lotName);
const lot = database.prepare(sql).get(lotIdOrLotName);
if (lot) {
lot.lotOccupancies = getLotOccupancies({
lotId: lot.lotId
@ -31,9 +31,9 @@ function _getLot(sql, lotId_or_lotName) {
return lot;
}
export function getLotByLotName(lotName) {
return _getLot(baseSQL + " and l.lotName = ?", lotName);
return _getLot(baseSQL + ' and l.lotName = ?', lotName);
}
export function getLot(lotId) {
return _getLot(baseSQL + " and l.lotId = ?", lotId);
return _getLot(baseSQL + ' and l.lotId = ?', lotId);
}
export default getLot;

41
helpers/lotOccupancyDB/getLot.ts
View File

@ -1,14 +1,14 @@
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 { getLotFields } from "./getLotFields.js";
import { getLotFields } from './getLotFields.js'
import { getLotComments } from "./getLotComments.js";
import { getLotComments } from './getLotComments.js'
import { getLotOccupancies } from "./getLotOccupancies.js";
import { getLotOccupancies } from './getLotOccupancies.js'
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes'
const baseSQL = `select l.lotId, l.lotTypeId, t.lotType, l.lotName, l.lotStatusId, s.lotStatus,
l.mapId, m.mapName, m.mapSVG, l.mapKey,
@ -17,14 +17,17 @@ const baseSQL = `select l.lotId, l.lotTypeId, t.lotType, l.lotName, l.lotStatusI
left join LotTypes t on l.lotTypeId = t.lotTypeId
left join LotStatuses s on l.lotStatusId = s.lotStatusId
left join Maps m on l.mapId = m.mapId
where l.recordDelete_timeMillis is null`;
where l.recordDelete_timeMillis is null`
function _getLot(sql: string, lotId_or_lotName: number | string): recordTypes.Lot | undefined {
function _getLot(
sql: string,
lotIdOrLotName: number | string
): recordTypes.Lot | undefined {
const database = sqlite(databasePath, {
readonly: true
});
})
const lot: recordTypes.Lot = database.prepare(sql).get(lotId_or_lotName);
const lot: recordTypes.Lot = database.prepare(sql).get(lotIdOrLotName)
if (lot) {
lot.lotOccupancies = getLotOccupancies(
@ -37,24 +40,24 @@ function _getLot(sql: string, lotId_or_lotName: number | string): recordTypes.Lo
offset: 0
},
database
).lotOccupancies;
).lotOccupancies
lot.lotFields = getLotFields(lot.lotId, database);
lot.lotFields = getLotFields(lot.lotId, database)
lot.lotComments = getLotComments(lot.lotId, database);
lot.lotComments = getLotComments(lot.lotId, database)
}
database.close();
database.close()
return lot;
return lot
}
export function getLotByLotName(lotName: string): recordTypes.Lot | undefined {
return _getLot(baseSQL + " and l.lotName = ?", lotName);
return _getLot(baseSQL + ' and l.lotName = ?', lotName)
}
export function getLot(lotId: number | string): recordTypes.Lot {
return _getLot(baseSQL + " and l.lotId = ?", lotId);
export function getLot(lotId: number | string): recordTypes.Lot | undefined {
return _getLot(baseSQL + ' and l.lotId = ?', lotId)
}
export default getLot;
export default getLot

8
helpers/lotOccupancyDB/getLots.d.ts vendored
View File

@ -1,12 +1,12 @@
import sqlite from "better-sqlite3";
import type * as recordTypes from "../../types/recordTypes";
import sqlite from 'better-sqlite3';
import type * as recordTypes from '../../types/recordTypes';
interface GetLotsFilters {
lotNameSearchType?: "" | "startsWith" | "endsWith";
lotNameSearchType?: '' | 'startsWith' | 'endsWith';
lotName?: string;
mapId?: number | string;
lotTypeId?: number | string;
lotStatusId?: number | string;
occupancyStatus?: "" | "occupied" | "unoccupied";
occupancyStatus?: '' | 'occupied' | 'unoccupied';
workOrderId?: number | string;
}
interface GetLotsOptions {

95
helpers/lotOccupancyDB/getLots.js
View File

@ -1,37 +1,38 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { dateToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import * as configFunctions from "../functions.config.js";
import { getLotNameWhereClause } from "../functions.sqlFilters.js";
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
import { dateToInteger } from '@cityssm/expressjs-server-js/dateTimeFns.js';
import * as configFunctions from '../functions.config.js';
import { getLotNameWhereClause } from '../functions.sqlFilters.js';
function buildWhereClause(filters) {
let sqlWhereClause = " where l.recordDelete_timeMillis is null";
let sqlWhereClause = ' where l.recordDelete_timeMillis is null';
const sqlParameters = [];
const lotNameFilters = getLotNameWhereClause(filters.lotName, filters.lotNameSearchType, "l");
const lotNameFilters = getLotNameWhereClause(filters.lotName, filters.lotNameSearchType ?? '', 'l');
sqlWhereClause += lotNameFilters.sqlWhereClause;
sqlParameters.push(...lotNameFilters.sqlParameters);
if (filters.mapId) {
sqlWhereClause += " and l.mapId = ?";
sqlWhereClause += ' and l.mapId = ?';
sqlParameters.push(filters.mapId);
}
if (filters.lotTypeId) {
sqlWhereClause += " and l.lotTypeId = ?";
sqlWhereClause += ' and l.lotTypeId = ?';
sqlParameters.push(filters.lotTypeId);
}
if (filters.lotStatusId) {
sqlWhereClause += " and l.lotStatusId = ?";
sqlWhereClause += ' and l.lotStatusId = ?';
sqlParameters.push(filters.lotStatusId);
}
if (filters.occupancyStatus) {
if (filters.occupancyStatus === "occupied") {
sqlWhereClause += " and lotOccupancyCount > 0";
if (filters.occupancyStatus === 'occupied') {
sqlWhereClause += ' and lotOccupancyCount > 0';
}
else if (filters.occupancyStatus === "unoccupied") {
sqlWhereClause += " and (lotOccupancyCount is null or lotOccupancyCount = 0)";
else if (filters.occupancyStatus === 'unoccupied') {
sqlWhereClause +=
' and (lotOccupancyCount is null or lotOccupancyCount = 0)';
}
}
if (filters.workOrderId) {
sqlWhereClause +=
" and l.lotId in (select lotId from WorkOrderLots where recordDelete_timeMillis is null and workOrderId = ?)";
' and l.lotId in (select lotId from WorkOrderLots where recordDelete_timeMillis is null and workOrderId = ?)';
sqlParameters.push(filters.workOrderId);
}
return {
@ -40,7 +41,7 @@ function buildWhereClause(filters) {
};
}
export function getLots(filters, options, connectedDatabase) {
const database = connectedDatabase ||
const database = connectedDatabase ??
sqlite(databasePath, {
readonly: true
});
@ -49,47 +50,47 @@ export function getLots(filters, options, connectedDatabase) {
let count = 0;
if (options.limit !== -1) {
count = database
.prepare("select count(*) as recordCount" +
" from Lots l" +
(" left join (" +
"select lotId, count(lotOccupancyId) as lotOccupancyCount" +
" from LotOccupancies" +
" where recordDelete_timeMillis is null" +
" and occupancyStartDate <= " +
.prepare('select count(*) as recordCount' +
' from Lots l' +
(' left join (' +
'select lotId, count(lotOccupancyId) as lotOccupancyCount' +
' from LotOccupancies' +
' where recordDelete_timeMillis is null' +
' and occupancyStartDate <= ' +
currentDate +
" and (occupancyEndDate is null or occupancyEndDate >= " +
' and (occupancyEndDate is null or occupancyEndDate >= ' +
currentDate +
")" +
" group by lotId" +
") o on l.lotId = o.lotId") +
')' +
' group by lotId' +
') o on l.lotId = o.lotId') +
sqlWhereClause)
.get(sqlParameters).recordCount;
}
let lots = [];
if (options.limit === -1 || count > 0) {
database.function("userFn_lotNameSortName", configFunctions.getProperty("settings.lot.lotNameSortNameFunction"));
database.function('userFn_lotNameSortName', configFunctions.getProperty('settings.lot.lotNameSortNameFunction'));
sqlParameters.unshift(currentDate, currentDate);
lots = database
.prepare("select l.lotId, l.lotName," +
" t.lotType," +
" l.mapId, m.mapName, l.mapKey," +
" l.lotStatusId, s.lotStatus," +
" ifnull(o.lotOccupancyCount, 0) as lotOccupancyCount" +
" from Lots l" +
" left join LotTypes t on l.lotTypeId = t.lotTypeId" +
" left join LotStatuses s on l.lotStatusId = s.lotStatusId" +
" left join Maps m on l.mapId = m.mapId" +
(" left join (" +
"select lotId, count(lotOccupancyId) as lotOccupancyCount" +
" from LotOccupancies" +
" where recordDelete_timeMillis is null" +
" and occupancyStartDate <= ?" +
" and (occupancyEndDate is null or occupancyEndDate >= ?)" +
" group by lotId" +
") o on l.lotId = o.lotId") +
.prepare('select l.lotId, l.lotName,' +
' t.lotType,' +
' l.mapId, m.mapName, l.mapKey,' +
' l.lotStatusId, s.lotStatus,' +
' ifnull(o.lotOccupancyCount, 0) as lotOccupancyCount' +
' from Lots l' +
' left join LotTypes t on l.lotTypeId = t.lotTypeId' +
' left join LotStatuses s on l.lotStatusId = s.lotStatusId' +
' left join Maps m on l.mapId = m.mapId' +
(' left join (' +
'select lotId, count(lotOccupancyId) as lotOccupancyCount' +
' from LotOccupancies' +
' where recordDelete_timeMillis is null' +
' and occupancyStartDate <= ?' +
' and (occupancyEndDate is null or occupancyEndDate >= ?)' +
' group by lotId' +
') o on l.lotId = o.lotId') +
sqlWhereClause +
" order by userFn_lotNameSortName(l.lotName), l.lotId" +
(options ? ` limit ${options.limit} offset ${options.offset}` : ""))
' order by userFn_lotNameSortName(l.lotName), l.lotId' +
(options ? ` limit ${options.limit} offset ${options.offset}` : ''))
.all(sqlParameters);
if (options.limit === -1) {
count = lots.length;

173
helpers/lotOccupancyDB/getLots.ts
View File

@ -1,73 +1,80 @@
import sqlite from "better-sqlite3";
/* eslint-disable @typescript-eslint/indent */
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import sqlite from 'better-sqlite3'
import { dateToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js'
import * as configFunctions from "../functions.config.js";
import { dateToInteger } from '@cityssm/expressjs-server-js/dateTimeFns.js'
import type * as recordTypes from "../../types/recordTypes";
import { getLotNameWhereClause } from "../functions.sqlFilters.js";
import * as configFunctions from '../functions.config.js'
import type * as recordTypes from '../../types/recordTypes'
import { getLotNameWhereClause } from '../functions.sqlFilters.js'
interface GetLotsFilters {
lotNameSearchType?: "" | "startsWith" | "endsWith";
lotName?: string;
mapId?: number | string;
lotTypeId?: number | string;
lotStatusId?: number | string;
occupancyStatus?: "" | "occupied" | "unoccupied";
workOrderId?: number | string;
lotNameSearchType?: '' | 'startsWith' | 'endsWith'
lotName?: string
mapId?: number | string
lotTypeId?: number | string
lotStatusId?: number | string
occupancyStatus?: '' | 'occupied' | 'unoccupied'
workOrderId?: number | string
}
interface GetLotsOptions {
limit: -1 | number;
offset: number;
limit: -1 | number
offset: number
}
function buildWhereClause(filters: GetLotsFilters): {
sqlWhereClause: string;
sqlParameters: unknown[];
sqlWhereClause: string
sqlParameters: unknown[]
} {
let sqlWhereClause = " where l.recordDelete_timeMillis is null";
const sqlParameters: unknown[] = [];
let sqlWhereClause = ' where l.recordDelete_timeMillis is null'
const sqlParameters: unknown[] = []
const lotNameFilters = getLotNameWhereClause(filters.lotName, filters.lotNameSearchType, "l");
sqlWhereClause += lotNameFilters.sqlWhereClause;
sqlParameters.push(...lotNameFilters.sqlParameters);
const lotNameFilters = getLotNameWhereClause(
filters.lotName,
filters.lotNameSearchType ?? '',
'l'
)
sqlWhereClause += lotNameFilters.sqlWhereClause
sqlParameters.push(...lotNameFilters.sqlParameters)
if (filters.mapId) {
sqlWhereClause += " and l.mapId = ?";
sqlParameters.push(filters.mapId);
sqlWhereClause += ' and l.mapId = ?'
sqlParameters.push(filters.mapId)
}
if (filters.lotTypeId) {
sqlWhereClause += " and l.lotTypeId = ?";
sqlParameters.push(filters.lotTypeId);
sqlWhereClause += ' and l.lotTypeId = ?'
sqlParameters.push(filters.lotTypeId)
}
if (filters.lotStatusId) {
sqlWhereClause += " and l.lotStatusId = ?";
sqlParameters.push(filters.lotStatusId);
sqlWhereClause += ' and l.lotStatusId = ?'
sqlParameters.push(filters.lotStatusId)
}
if (filters.occupancyStatus) {
if (filters.occupancyStatus === "occupied") {
sqlWhereClause += " and lotOccupancyCount > 0";
} else if (filters.occupancyStatus === "unoccupied") {
sqlWhereClause += " and (lotOccupancyCount is null or lotOccupancyCount = 0)";
if (filters.occupancyStatus === 'occupied') {
sqlWhereClause += ' and lotOccupancyCount > 0'
} else if (filters.occupancyStatus === 'unoccupied') {
sqlWhereClause +=
' and (lotOccupancyCount is null or lotOccupancyCount = 0)'
}
}
if (filters.workOrderId) {
sqlWhereClause +=
" and l.lotId in (select lotId from WorkOrderLots where recordDelete_timeMillis is null and workOrderId = ?)";
sqlParameters.push(filters.workOrderId);
' and l.lotId in (select lotId from WorkOrderLots where recordDelete_timeMillis is null and workOrderId = ?)'
sqlParameters.push(filters.workOrderId)
}
return {
sqlWhereClause,
sqlParameters
};
}
}
export function getLots(
@ -75,90 +82,90 @@ export function getLots(
options: GetLotsOptions,
connectedDatabase?: sqlite.Database
): {
count: number;
lots: recordTypes.Lot[];
count: number
lots: recordTypes.Lot[]
} {
const database =
connectedDatabase ||
connectedDatabase ??
sqlite(databasePath, {
readonly: true
});
})
const { sqlWhereClause, sqlParameters } = buildWhereClause(filters);
const { sqlWhereClause, sqlParameters } = buildWhereClause(filters)
const currentDate = dateToInteger(new Date());
const currentDate = dateToInteger(new Date())
let count = 0;
let count = 0
if (options.limit !== -1) {
count = database
.prepare(
"select count(*) as recordCount" +
" from Lots l" +
(" left join (" +
"select lotId, count(lotOccupancyId) as lotOccupancyCount" +
" from LotOccupancies" +
" where recordDelete_timeMillis is null" +
" and occupancyStartDate <= " +
'select count(*) as recordCount' +
' from Lots l' +
(' left join (' +
'select lotId, count(lotOccupancyId) as lotOccupancyCount' +
' from LotOccupancies' +
' where recordDelete_timeMillis is null' +
' and occupancyStartDate <= ' +
currentDate +
" and (occupancyEndDate is null or occupancyEndDate >= " +
' and (occupancyEndDate is null or occupancyEndDate >= ' +
currentDate +
")" +
" group by lotId" +
") o on l.lotId = o.lotId") +
')' +
' group by lotId' +
') o on l.lotId = o.lotId') +
sqlWhereClause
)
.get(sqlParameters).recordCount;
.get(sqlParameters).recordCount
}
let lots: recordTypes.Lot[] = [];
let lots: recordTypes.Lot[] = []
if (options.limit === -1 || count > 0) {
database.function(
"userFn_lotNameSortName",
configFunctions.getProperty("settings.lot.lotNameSortNameFunction")
);
'userFn_lotNameSortName',
configFunctions.getProperty('settings.lot.lotNameSortNameFunction')
)
sqlParameters.unshift(currentDate, currentDate);
sqlParameters.unshift(currentDate, currentDate)
lots = database
.prepare(
"select l.lotId, l.lotName," +
" t.lotType," +
" l.mapId, m.mapName, l.mapKey," +
" l.lotStatusId, s.lotStatus," +
" ifnull(o.lotOccupancyCount, 0) as lotOccupancyCount" +
" from Lots l" +
" left join LotTypes t on l.lotTypeId = t.lotTypeId" +
" left join LotStatuses s on l.lotStatusId = s.lotStatusId" +
" left join Maps m on l.mapId = m.mapId" +
(" left join (" +
"select lotId, count(lotOccupancyId) as lotOccupancyCount" +
" from LotOccupancies" +
" where recordDelete_timeMillis is null" +
" and occupancyStartDate <= ?" +
" and (occupancyEndDate is null or occupancyEndDate >= ?)" +
" group by lotId" +
") o on l.lotId = o.lotId") +
'select l.lotId, l.lotName,' +
' t.lotType,' +
' l.mapId, m.mapName, l.mapKey,' +
' l.lotStatusId, s.lotStatus,' +
' ifnull(o.lotOccupancyCount, 0) as lotOccupancyCount' +
' from Lots l' +
' left join LotTypes t on l.lotTypeId = t.lotTypeId' +
' left join LotStatuses s on l.lotStatusId = s.lotStatusId' +
' left join Maps m on l.mapId = m.mapId' +
(' left join (' +
'select lotId, count(lotOccupancyId) as lotOccupancyCount' +
' from LotOccupancies' +
' where recordDelete_timeMillis is null' +
' and occupancyStartDate <= ?' +
' and (occupancyEndDate is null or occupancyEndDate >= ?)' +
' group by lotId' +
') o on l.lotId = o.lotId') +
sqlWhereClause +
" order by userFn_lotNameSortName(l.lotName), l.lotId" +
(options ? ` limit ${options.limit} offset ${options.offset}` : "")
' order by userFn_lotNameSortName(l.lotName), l.lotId' +
(options ? ` limit ${options.limit} offset ${options.offset}` : '')
)
.all(sqlParameters);
.all(sqlParameters)
if (options.limit === -1) {
count = lots.length;
count = lots.length
}
}
if (!connectedDatabase) {
database.close();
database.close()
}
return {
count,
lots
};
}
}
export default getLots;
export default getLots

4
helpers/lotOccupancyDB/getOccupancyTypeFields.d.ts vendored
View File

@ -1,4 +1,4 @@
import sqlite from "better-sqlite3";
import type * as recordTypes from "../../types/recordTypes";
import sqlite from 'better-sqlite3';
import type * as recordTypes from '../../types/recordTypes';
export declare function getOccupancyTypeFields(occupancyTypeId?: number, connectedDatabase?: sqlite.Database): recordTypes.OccupancyTypeField[];
export default getOccupancyTypeFields;

28
helpers/lotOccupancyDB/getOccupancyTypeFields.js
View File

@ -1,26 +1,28 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
import { updateRecordOrderNumber } from './updateRecordOrderNumber.js';
export function getOccupancyTypeFields(occupancyTypeId, connectedDatabase) {
const database = connectedDatabase || sqlite(databasePath);
const database = connectedDatabase ?? sqlite(databasePath);
const sqlParameters = [];
if (occupancyTypeId) {
sqlParameters.push(occupancyTypeId);
}
const occupancyTypeFields = database
.prepare("select occupancyTypeFieldId," +
" occupancyTypeField, occupancyTypeFieldValues, isRequired, pattern," +
" minimumLength, maximumLength," +
" orderNumber" +
" from OccupancyTypeFields" +
" where recordDelete_timeMillis is null" +
(occupancyTypeId ? " and occupancyTypeId = ?" : " and occupancyTypeId is null") +
" order by orderNumber, occupancyTypeField")
.prepare('select occupancyTypeFieldId,' +
' occupancyTypeField, occupancyTypeFieldValues, isRequired, pattern,' +
' minimumLength, maximumLength,' +
' orderNumber' +
' from OccupancyTypeFields' +
' where recordDelete_timeMillis is null' +
(occupancyTypeId
? ' and occupancyTypeId = ?'
: ' and occupancyTypeId is null') +
' order by orderNumber, occupancyTypeField')
.all(sqlParameters);
let expectedOrderNumber = 0;
for (const occupancyTypeField of occupancyTypeFields) {
if (occupancyTypeField.orderNumber !== expectedOrderNumber) {
updateRecordOrderNumber("OccupancyTypeFields", occupancyTypeField.occupancyTypeFieldId, expectedOrderNumber, database);
updateRecordOrderNumber('OccupancyTypeFields', occupancyTypeField.occupancyTypeFieldId, expectedOrderNumber, database);
occupancyTypeField.orderNumber = expectedOrderNumber;
}
expectedOrderNumber += 1;

52
helpers/lotOccupancyDB/getOccupancyTypeFields.ts
View File

@ -1,57 +1,59 @@
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 { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
import type * as recordTypes from '../../types/recordTypes'
import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'
export function getOccupancyTypeFields(
occupancyTypeId?: number,
connectedDatabase?: sqlite.Database
): recordTypes.OccupancyTypeField[] {
const database = connectedDatabase || sqlite(databasePath);
const database = connectedDatabase ?? sqlite(databasePath)
const sqlParameters: unknown[] = [];
const sqlParameters: unknown[] = []
if (occupancyTypeId) {
sqlParameters.push(occupancyTypeId);
sqlParameters.push(occupancyTypeId)
}
const occupancyTypeFields: recordTypes.OccupancyTypeField[] = database
.prepare(
"select occupancyTypeFieldId," +
" occupancyTypeField, occupancyTypeFieldValues, isRequired, pattern," +
" minimumLength, maximumLength," +
" orderNumber" +
" from OccupancyTypeFields" +
" where recordDelete_timeMillis is null" +
(occupancyTypeId ? " and occupancyTypeId = ?" : " and occupancyTypeId is null") +
" order by orderNumber, occupancyTypeField"
'select occupancyTypeFieldId,' +
' occupancyTypeField, occupancyTypeFieldValues, isRequired, pattern,' +
' minimumLength, maximumLength,' +
' orderNumber' +
' from OccupancyTypeFields' +
' where recordDelete_timeMillis is null' +
(occupancyTypeId
? ' and occupancyTypeId = ?'
: ' and occupancyTypeId is null') +
' order by orderNumber, occupancyTypeField'
)
.all(sqlParameters);
.all(sqlParameters)
let expectedOrderNumber = 0;
let expectedOrderNumber = 0
for (const occupancyTypeField of occupancyTypeFields) {
if (occupancyTypeField.orderNumber !== expectedOrderNumber) {
updateRecordOrderNumber(
"OccupancyTypeFields",
occupancyTypeField.occupancyTypeFieldId,
'OccupancyTypeFields',
occupancyTypeField.occupancyTypeFieldId!,
expectedOrderNumber,
database
);
)
occupancyTypeField.orderNumber = expectedOrderNumber;
occupancyTypeField.orderNumber = expectedOrderNumber
}
expectedOrderNumber += 1;
expectedOrderNumber += 1
}
if (!connectedDatabase) {
database.close();
database.close()
}
return occupancyTypeFields;
return occupancyTypeFields
}
export default getOccupancyTypeFields;
export default getOccupancyTypeFields

2
helpers/lotOccupancyDB/getOccupancyTypePrints.d.ts vendored
View File

@ -1,3 +1,3 @@
import sqlite from "better-sqlite3";
import sqlite from 'better-sqlite3';
export declare function getOccupancyTypePrints(occupancyTypeId: number, connectedDatabase?: sqlite.Database): string[];
export default getOccupancyTypePrints;

14
helpers/lotOccupancyDB/getOccupancyTypePrints.js
View File

@ -1,16 +1,16 @@
import sqlite from "better-sqlite3";
import * as configFunctions from "../functions.config.js";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
const availablePrints = configFunctions.getProperty("settings.lotOccupancy.prints");
import sqlite from 'better-sqlite3';
import * as configFunctions from '../functions.config.js';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
const availablePrints = configFunctions.getProperty('settings.lotOccupancy.prints');
const userFunction_configContainsPrintEJS = (printEJS) => {
if (printEJS === "*" || availablePrints.includes(printEJS)) {
if (printEJS === '*' || availablePrints.includes(printEJS)) {
return 1;
}
return 0;
};
export function getOccupancyTypePrints(occupancyTypeId, connectedDatabase) {
const database = connectedDatabase || sqlite(databasePath);
database.function("userFn_configContainsPrintEJS", userFunction_configContainsPrintEJS);
const database = connectedDatabase ?? sqlite(databasePath);
database.function('userFn_configContainsPrintEJS', userFunction_configContainsPrintEJS);
const results = database
.prepare(`select printEJS, orderNumber
from OccupancyTypePrints

46
helpers/lotOccupancyDB/getOccupancyTypePrints.ts
View File

@ -1,27 +1,33 @@
import sqlite from "better-sqlite3";
import sqlite from 'better-sqlite3'
import * as configFunctions from "../functions.config.js";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import * as configFunctions from '../functions.config.js'
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js'
const availablePrints = configFunctions.getProperty("settings.lotOccupancy.prints");
const availablePrints = configFunctions.getProperty(
'settings.lotOccupancy.prints'
)
// eslint-disable-next-line @typescript-eslint/naming-convention
const userFunction_configContainsPrintEJS = (printEJS: string): number => {
if (printEJS === "*" || availablePrints.includes(printEJS)) {
return 1;
if (printEJS === '*' || availablePrints.includes(printEJS)) {
return 1
}
return 0;
};
return 0
}
export function getOccupancyTypePrints(
occupancyTypeId: number,
connectedDatabase?: sqlite.Database
): string[] {
const database = connectedDatabase || sqlite(databasePath);
const database = connectedDatabase ?? sqlite(databasePath)
database.function("userFn_configContainsPrintEJS", userFunction_configContainsPrintEJS);
database.function(
'userFn_configContainsPrintEJS',
userFunction_configContainsPrintEJS
)
const results: { printEJS: string; orderNumber: number }[] = database
const results: Array<{ printEJS: string; orderNumber: number }> = database
.prepare(
`select printEJS, orderNumber
from OccupancyTypePrints
@ -30,14 +36,14 @@ export function getOccupancyTypePrints(
and userFn_configContainsPrintEJS(printEJS) = 1
order by orderNumber, printEJS`
)
.all(occupancyTypeId);
.all(occupancyTypeId)
let expectedOrderNumber = -1;
let expectedOrderNumber = -1
const prints = [];
const prints: string[] = []
for (const result of results) {
expectedOrderNumber += 1;
expectedOrderNumber += 1
if (result.orderNumber !== expectedOrderNumber) {
database
@ -47,17 +53,17 @@ export function getOccupancyTypePrints(
where occupancyTypeId = ?
and printEJS = ?`
)
.run(expectedOrderNumber, occupancyTypeId, result.printEJS);
.run(expectedOrderNumber, occupancyTypeId, result.printEJS)
}
prints.push(result.printEJS);
prints.push(result.printEJS)
}
if (!connectedDatabase) {
database.close();
database.close()
}
return prints;
return prints
}
export default getOccupancyTypePrints;
export default getOccupancyTypePrints

4
helpers/lotOccupancyDB/getReportData.d.ts vendored
View File

@ -1,5 +1,3 @@
export interface ReportParameters {
[parameterName: string]: string | number;
}
export declare type ReportParameters = Record<string, string | number>;
export declare function getReportData(reportName: string, reportParameters?: ReportParameters): unknown[] | undefined;
export default getReportData;

164
helpers/lotOccupancyDB/getReportData.js
View File

@ -1,36 +1,36 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import * as configFunctions from "../functions.config.js";
import * as dateTimeFunctions from "@cityssm/expressjs-server-js/dateTimeFns.js";
import camelCase from "camelcase";
const mapCamelCase = camelCase(configFunctions.getProperty("aliases.map"));
const mapNameAlias = mapCamelCase + "Name";
const mapDescriptionAlias = mapCamelCase + "Description";
const mapAddress1Alias = mapCamelCase + "Address1";
const mapAddress2Alias = mapCamelCase + "Address2";
const mapCityAlias = mapCamelCase + "City";
const mapProvinceAlias = mapCamelCase + "Province";
const mapPostalCodeAlias = mapCamelCase + "PostalCode";
const mapPhoneNumberAlias = mapCamelCase + "PhoneNumber";
const lotCamelCase = camelCase(configFunctions.getProperty("aliases.lot"));
const lotIdAlias = lotCamelCase + "Id";
const lotNameAlias = lotCamelCase + "Name";
const lotTypeAlias = lotCamelCase + "Type";
const lotStatusAlias = lotCamelCase + "Status";
const occupancyCamelCase = camelCase(configFunctions.getProperty("aliases.occupancy"));
const lotOccupancyIdAlias = occupancyCamelCase + "Id";
const occupancyTypeAlias = occupancyCamelCase + "Type";
const occupancyStartDateAlias = occupancyCamelCase + "StartDate";
const occupancyEndDateAlias = occupancyCamelCase + "EndDate";
export function getReportData(reportName, reportParameters) {
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
import * as configFunctions from '../functions.config.js';
import * as dateTimeFunctions from '@cityssm/expressjs-server-js/dateTimeFns.js';
import camelCase from 'camelcase';
const mapCamelCase = camelCase(configFunctions.getProperty('aliases.map'));
const mapNameAlias = mapCamelCase + 'Name';
const mapDescriptionAlias = mapCamelCase + 'Description';
const mapAddress1Alias = mapCamelCase + 'Address1';
const mapAddress2Alias = mapCamelCase + 'Address2';
const mapCityAlias = mapCamelCase + 'City';
const mapProvinceAlias = mapCamelCase + 'Province';
const mapPostalCodeAlias = mapCamelCase + 'PostalCode';
const mapPhoneNumberAlias = mapCamelCase + 'PhoneNumber';
const lotCamelCase = camelCase(configFunctions.getProperty('aliases.lot'));
const lotIdAlias = lotCamelCase + 'Id';
const lotNameAlias = lotCamelCase + 'Name';
const lotTypeAlias = lotCamelCase + 'Type';
const lotStatusAlias = lotCamelCase + 'Status';
const occupancyCamelCase = camelCase(configFunctions.getProperty('aliases.occupancy'));
const lotOccupancyIdAlias = occupancyCamelCase + 'Id';
const occupancyTypeAlias = occupancyCamelCase + 'Type';
const occupancyStartDateAlias = occupancyCamelCase + 'StartDate';
const occupancyEndDateAlias = occupancyCamelCase + 'EndDate';
export function getReportData(reportName, reportParameters = {}) {
let sql;
const sqlParameters = [];
switch (reportName) {
case "maps-all": {
sql = "select * from Maps";
case 'maps-all': {
sql = 'select * from Maps';
break;
}
case "maps-formatted": {
case 'maps-formatted': {
sql = `select mapName as ${mapNameAlias},
mapDescription as ${mapDescriptionAlias},
mapAddress1 as ${mapAddress1Alias},
@ -44,11 +44,11 @@ export function getReportData(reportName, reportParameters) {
order by mapName`;
break;
}
case "lots-all": {
sql = "select * from Lots";
case 'lots-all': {
sql = 'select * from Lots';
break;
}
case "lots-byLotTypeId": {
case 'lots-byLotTypeId': {
sql = `select l.lotId as ${lotIdAlias},
m.mapName as ${mapNameAlias},
l.lotName as ${lotNameAlias},
@ -63,7 +63,7 @@ export function getReportData(reportName, reportParameters) {
sqlParameters.push(reportParameters.lotTypeId);
break;
}
case "lots-byLotStatusId": {
case 'lots-byLotStatusId': {
sql = `select l.lotId as ${lotIdAlias},
m.mapName as ${mapNameAlias},
l.lotName as ${lotNameAlias},
@ -78,7 +78,7 @@ export function getReportData(reportName, reportParameters) {
sqlParameters.push(reportParameters.lotStatusId);
break;
}
case "lots-byMapId": {
case 'lots-byMapId': {
sql = `select l.lotId as ${lotIdAlias},
m.mapName as ${mapNameAlias},
l.lotName as ${lotNameAlias},
@ -93,19 +93,19 @@ export function getReportData(reportName, reportParameters) {
sqlParameters.push(reportParameters.mapId);
break;
}
case "lotComments-all": {
sql = "select * from LotComments";
case 'lotComments-all': {
sql = 'select * from LotComments';
break;
}
case "lotFields-all": {
sql = "select * from LotFields";
case 'lotFields-all': {
sql = 'select * from LotFields';
break;
}
case "lotOccupancies-all": {
sql = "select * from LotOccupancies";
case 'lotOccupancies-all': {
sql = 'select * from LotOccupancies';
break;
}
case "lotOccupancies-current-byMapId": {
case 'lotOccupancies-current-byMapId': {
sql = `select o.lotOccupancyId as ${lotOccupancyIdAlias},
l.lotName as ${lotNameAlias},
m.mapName as ${mapNameAlias},
@ -122,27 +122,27 @@ export function getReportData(reportName, reportParameters) {
sqlParameters.push(dateTimeFunctions.dateToInteger(new Date()), reportParameters.mapId);
break;
}
case "lotOccupancyComments-all": {
sql = "select * from LotOccupancyComments";
case 'lotOccupancyComments-all': {
sql = 'select * from LotOccupancyComments';
break;
}
case "lotOccupancyFees-all": {
sql = "select * from LotOccupancyFees";
case 'lotOccupancyFees-all': {
sql = 'select * from LotOccupancyFees';
break;
}
case "lotOccupancyFields-all": {
sql = "select * from LotOccupancyFields";
case 'lotOccupancyFields-all': {
sql = 'select * from LotOccupancyFields';
break;
}
case "lotOccupancyOccupants-all": {
sql = "select * from LotOccupancyOccupants";
case 'lotOccupancyOccupants-all': {
sql = 'select * from LotOccupancyOccupants';
break;
}
case "lotOccupancyTransactions-all": {
sql = "select * from LotOccupancyTransactions";
case 'lotOccupancyTransactions-all': {
sql = 'select * from LotOccupancyTransactions';
break;
}
case "lotOccupancyTransactions-byTransactionDateString": {
case 'lotOccupancyTransactions-byTransactionDateString': {
sql = `select t.lotOccupancyId, t.transactionIndex,
t.transactionDate, t.transactionTime,
t.transactionAmount,
@ -153,11 +153,11 @@ export function getReportData(reportName, reportParameters) {
sqlParameters.push(dateTimeFunctions.dateStringToInteger(reportParameters.transactionDateString));
break;
}
case "workOrders-all": {
sql = "select * from WorkOrders";
case 'workOrders-all': {
sql = 'select * from WorkOrders';
break;
}
case "workOrders-open": {
case 'workOrders-open': {
sql = `select w.workOrderId, w.workOrderNumber,
t.workOrderType, w.workOrderDescription,
w.workOrderOpenDate,
@ -176,56 +176,56 @@ export function getReportData(reportName, reportParameters) {
and w.workOrderCloseDate is null`;
break;
}
case "workOrderComments-all": {
sql = "select * from WorkOrderComments";
case 'workOrderComments-all': {
sql = 'select * from WorkOrderComments';
break;
}
case "workOrderLots-all": {
sql = "select * from WorkOrderLots";
case 'workOrderLots-all': {
sql = 'select * from WorkOrderLots';
break;
}
case "workOrderMilestones-all": {
sql = "select * from WorkOrderMilestones";
case 'workOrderMilestones-all': {
sql = 'select * from WorkOrderMilestones';
break;
}
case "fees-all": {
sql = "select * from Fees";
case 'fees-all': {
sql = 'select * from Fees';
break;
}
case "feeCategories-all": {
sql = "select * from FeeCategories";
case 'feeCategories-all': {
sql = 'select * from FeeCategories';
break;
}
case "lotTypes-all": {
sql = "select * from LotTypes";
case 'lotTypes-all': {
sql = 'select * from LotTypes';
break;
}
case "lotTypeFields-all": {
sql = "select * from LotTypeFields";
case 'lotTypeFields-all': {
sql = 'select * from LotTypeFields';
break;
}
case "lotStatuses-all": {
sql = "select * from LotStatuses";
case 'lotStatuses-all': {
sql = 'select * from LotStatuses';
break;
}
case "occupancyTypes-all": {
sql = "select * from OccupancyTypes";
case 'occupancyTypes-all': {
sql = 'select * from OccupancyTypes';
break;
}
case "occupancyTypeFields-all": {
sql = "select * from OccupancyTypeFields";
case 'occupancyTypeFields-all': {
sql = 'select * from OccupancyTypeFields';
break;
}
case "lotOccupantTypes-all": {
sql = "select * from LotOccupantTypes";
case 'lotOccupantTypes-all': {
sql = 'select * from LotOccupantTypes';
break;
}
case "workOrderTypes-all": {
sql = "select * from WorkOrderTypes";
case 'workOrderTypes-all': {
sql = 'select * from WorkOrderTypes';
break;
}
case "workOrderMilestoneTypes-all": {
sql = "select * from WorkOrderMilestoneTypes";
case 'workOrderMilestoneTypes-all': {
sql = 'select * from WorkOrderMilestoneTypes';
break;
}
default: {
@ -235,8 +235,8 @@ export function getReportData(reportName, reportParameters) {
const database = sqlite(databasePath, {
readonly: true
});
database.function("userFn_dateIntegerToString", dateTimeFunctions.dateIntegerToString);
database.function("userFn_timeIntegerToString", dateTimeFunctions.timeIntegerToString);
database.function('userFn_dateIntegerToString', dateTimeFunctions.dateIntegerToString);
database.function('userFn_timeIntegerToString', dateTimeFunctions.timeIntegerToString);
const rows = database.prepare(sql).all(sqlParameters);
database.close();
return rows;

285
helpers/lotOccupancyDB/getReportData.ts
View File

@ -1,54 +1,54 @@
/* eslint-disable no-case-declarations */
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 configFunctions from "../functions.config.js";
import * as dateTimeFunctions from "@cityssm/expressjs-server-js/dateTimeFns.js";
import * as configFunctions from '../functions.config.js'
import * as dateTimeFunctions from '@cityssm/expressjs-server-js/dateTimeFns.js'
import camelCase from "camelcase";
import camelCase from 'camelcase'
export interface ReportParameters {
[parameterName: string]: string | number;
}
export type ReportParameters = Record<string, string | number>
const mapCamelCase = camelCase(configFunctions.getProperty("aliases.map"));
const mapNameAlias = mapCamelCase + "Name";
const mapDescriptionAlias = mapCamelCase + "Description";
const mapAddress1Alias = mapCamelCase + "Address1";
const mapAddress2Alias = mapCamelCase + "Address2";
const mapCityAlias = mapCamelCase + "City";
const mapProvinceAlias = mapCamelCase + "Province";
const mapPostalCodeAlias = mapCamelCase + "PostalCode";
const mapPhoneNumberAlias = mapCamelCase + "PhoneNumber";
const mapCamelCase = camelCase(configFunctions.getProperty('aliases.map'))
const mapNameAlias = mapCamelCase + 'Name'
const mapDescriptionAlias = mapCamelCase + 'Description'
const mapAddress1Alias = mapCamelCase + 'Address1'
const mapAddress2Alias = mapCamelCase + 'Address2'
const mapCityAlias = mapCamelCase + 'City'
const mapProvinceAlias = mapCamelCase + 'Province'
const mapPostalCodeAlias = mapCamelCase + 'PostalCode'
const mapPhoneNumberAlias = mapCamelCase + 'PhoneNumber'
const lotCamelCase = camelCase(configFunctions.getProperty("aliases.lot"));
const lotIdAlias = lotCamelCase + "Id";
const lotNameAlias = lotCamelCase + "Name";
const lotTypeAlias = lotCamelCase + "Type";
const lotStatusAlias = lotCamelCase + "Status";
const lotCamelCase = camelCase(configFunctions.getProperty('aliases.lot'))
const lotIdAlias = lotCamelCase + 'Id'
const lotNameAlias = lotCamelCase + 'Name'
const lotTypeAlias = lotCamelCase + 'Type'
const lotStatusAlias = lotCamelCase + 'Status'
const occupancyCamelCase = camelCase(configFunctions.getProperty("aliases.occupancy"));
const lotOccupancyIdAlias = occupancyCamelCase + "Id";
const occupancyTypeAlias = occupancyCamelCase + "Type";
const occupancyStartDateAlias = occupancyCamelCase + "StartDate";
const occupancyEndDateAlias = occupancyCamelCase + "EndDate";
const occupancyCamelCase = camelCase(
configFunctions.getProperty('aliases.occupancy')
)
const lotOccupancyIdAlias = occupancyCamelCase + 'Id'
const occupancyTypeAlias = occupancyCamelCase + 'Type'
const occupancyStartDateAlias = occupancyCamelCase + 'StartDate'
const occupancyEndDateAlias = occupancyCamelCase + 'EndDate'
export function getReportData(
reportName: string,
reportParameters?: ReportParameters
reportParameters: ReportParameters = {}
): unknown[] | undefined {
let sql: string;
const sqlParameters: unknown[] = [];
let sql: string
const sqlParameters: unknown[] = []
switch (reportName) {
case "maps-all": {
sql = "select * from Maps";
break;
case 'maps-all': {
sql = 'select * from Maps'
break
}
case "maps-formatted": {
case 'maps-formatted': {
sql = `select mapName as ${mapNameAlias},
mapDescription as ${mapDescriptionAlias},
mapAddress1 as ${mapAddress1Alias},
@ -59,17 +59,17 @@ export function getReportData(
mapPhoneNumber as ${mapPhoneNumberAlias}
from Maps
where recordDelete_timeMillis is null
order by mapName`;
order by mapName`
break;
break
}
case "lots-all": {
sql = "select * from Lots";
break;
case 'lots-all': {
sql = 'select * from Lots'
break
}
case "lots-byLotTypeId": {
case 'lots-byLotTypeId': {
sql = `select l.lotId as ${lotIdAlias},
m.mapName as ${mapNameAlias},
l.lotName as ${lotNameAlias},
@ -80,14 +80,14 @@ export function getReportData(
left join LotStatuses s on l.lotStatusId = s.lotStatusId
left join Maps m on l.mapId = m.mapId
where l.recordDelete_timeMillis is null
and l.lotTypeId = ?`;
and l.lotTypeId = ?`
sqlParameters.push(reportParameters.lotTypeId);
sqlParameters.push(reportParameters.lotTypeId)
break;
break
}
case "lots-byLotStatusId": {
case 'lots-byLotStatusId': {
sql = `select l.lotId as ${lotIdAlias},
m.mapName as ${mapNameAlias},
l.lotName as ${lotNameAlias},
@ -98,14 +98,14 @@ export function getReportData(
left join LotStatuses s on l.lotStatusId = s.lotStatusId
left join Maps m on l.mapId = m.mapId
where l.recordDelete_timeMillis is null
and l.lotStatusId = ?`;
and l.lotStatusId = ?`
sqlParameters.push(reportParameters.lotStatusId);
sqlParameters.push(reportParameters.lotStatusId)
break;
break
}
case "lots-byMapId": {
case 'lots-byMapId': {
sql = `select l.lotId as ${lotIdAlias},
m.mapName as ${mapNameAlias},
l.lotName as ${lotNameAlias},
@ -116,29 +116,29 @@ export function getReportData(
left join LotStatuses s on l.lotStatusId = s.lotStatusId
left join Maps m on l.mapId = m.mapId
where l.recordDelete_timeMillis is null
and l.mapId = ?`;
and l.mapId = ?`
sqlParameters.push(reportParameters.mapId);
sqlParameters.push(reportParameters.mapId)
break;
break
}
case "lotComments-all": {
sql = "select * from LotComments";
break;
case 'lotComments-all': {
sql = 'select * from LotComments'
break
}
case "lotFields-all": {
sql = "select * from LotFields";
break;
case 'lotFields-all': {
sql = 'select * from LotFields'
break
}
case "lotOccupancies-all": {
sql = "select * from LotOccupancies";
break;
case 'lotOccupancies-all': {
sql = 'select * from LotOccupancies'
break
}
case "lotOccupancies-current-byMapId": {
case 'lotOccupancies-current-byMapId': {
sql = `select o.lotOccupancyId as ${lotOccupancyIdAlias},
l.lotName as ${lotNameAlias},
m.mapName as ${mapNameAlias},
@ -151,59 +151,64 @@ export function getReportData(
left join Maps m on l.mapId = m.mapId
where o.recordDelete_timeMillis is null
and (o.occupancyEndDate is null or o.occupancyEndDate >= ?)
and l.mapId = ?`;
and l.mapId = ?`
sqlParameters.push(dateTimeFunctions.dateToInteger(new Date()), reportParameters.mapId);
sqlParameters.push(
dateTimeFunctions.dateToInteger(new Date()),
reportParameters.mapId
)
break;
break
}
case "lotOccupancyComments-all": {
sql = "select * from LotOccupancyComments";
break;
case 'lotOccupancyComments-all': {
sql = 'select * from LotOccupancyComments'
break
}
case "lotOccupancyFees-all": {
sql = "select * from LotOccupancyFees";
break;
case 'lotOccupancyFees-all': {
sql = 'select * from LotOccupancyFees'
break
}
case "lotOccupancyFields-all": {
sql = "select * from LotOccupancyFields";
break;
case 'lotOccupancyFields-all': {
sql = 'select * from LotOccupancyFields'
break
}
case "lotOccupancyOccupants-all": {
sql = "select * from LotOccupancyOccupants";
break;
case 'lotOccupancyOccupants-all': {
sql = 'select * from LotOccupancyOccupants'
break
}
case "lotOccupancyTransactions-all": {
sql = "select * from LotOccupancyTransactions";
break;
case 'lotOccupancyTransactions-all': {
sql = 'select * from LotOccupancyTransactions'
break
}
case "lotOccupancyTransactions-byTransactionDateString": {
case 'lotOccupancyTransactions-byTransactionDateString': {
sql = `select t.lotOccupancyId, t.transactionIndex,
t.transactionDate, t.transactionTime,
t.transactionAmount,
t.externalReceiptNumber, t.transactionNote
from LotOccupancyTransactions t
where t.recordDelete_timeMillis is null
and t.transactionDate = ?`;
and t.transactionDate = ?`
sqlParameters.push(
dateTimeFunctions.dateStringToInteger(reportParameters.transactionDateString as string)
);
break;
dateTimeFunctions.dateStringToInteger(
reportParameters.transactionDateString as string
)
)
break
}
case "workOrders-all": {
sql = "select * from WorkOrders";
break;
case 'workOrders-all': {
sql = 'select * from WorkOrders'
break
}
case "workOrders-open": {
case 'workOrders-open': {
sql = `select w.workOrderId, w.workOrderNumber,
t.workOrderType, w.workOrderDescription,
w.workOrderOpenDate,
@ -219,92 +224,98 @@ export function getReportData(
group by m.workOrderId
) m on w.workOrderId = m.workOrderId
where w.recordDelete_timeMillis is null
and w.workOrderCloseDate is null`;
break;
and w.workOrderCloseDate is null`
break
}
case "workOrderComments-all": {
sql = "select * from WorkOrderComments";
break;
case 'workOrderComments-all': {
sql = 'select * from WorkOrderComments'
break
}
case "workOrderLots-all": {
sql = "select * from WorkOrderLots";
break;
case 'workOrderLots-all': {
sql = 'select * from WorkOrderLots'
break
}
case "workOrderMilestones-all": {
sql = "select * from WorkOrderMilestones";
break;
case 'workOrderMilestones-all': {
sql = 'select * from WorkOrderMilestones'
break
}
case "fees-all": {
sql = "select * from Fees";
break;
case 'fees-all': {
sql = 'select * from Fees'
break
}
case "feeCategories-all": {
sql = "select * from FeeCategories";
break;
case 'feeCategories-all': {
sql = 'select * from FeeCategories'
break
}
case "lotTypes-all": {
sql = "select * from LotTypes";
break;
case 'lotTypes-all': {
sql = 'select * from LotTypes'
break
}
case "lotTypeFields-all": {
sql = "select * from LotTypeFields";
break;
case 'lotTypeFields-all': {
sql = 'select * from LotTypeFields'
break
}
case "lotStatuses-all": {
sql = "select * from LotStatuses";
break;
case 'lotStatuses-all': {
sql = 'select * from LotStatuses'
break
}
case "occupancyTypes-all": {
sql = "select * from OccupancyTypes";
break;
case 'occupancyTypes-all': {
sql = 'select * from OccupancyTypes'
break
}
case "occupancyTypeFields-all": {
sql = "select * from OccupancyTypeFields";
break;
case 'occupancyTypeFields-all': {
sql = 'select * from OccupancyTypeFields'
break
}
case "lotOccupantTypes-all": {
sql = "select * from LotOccupantTypes";
break;
case 'lotOccupantTypes-all': {
sql = 'select * from LotOccupantTypes'
break
}
case "workOrderTypes-all": {
sql = "select * from WorkOrderTypes";
break;
case 'workOrderTypes-all': {
sql = 'select * from WorkOrderTypes'
break
}
case "workOrderMilestoneTypes-all": {
sql = "select * from WorkOrderMilestoneTypes";
break;
case 'workOrderMilestoneTypes-all': {
sql = 'select * from WorkOrderMilestoneTypes'
break
}
default: {
return undefined;
return undefined
}
}
const database = sqlite(databasePath, {
readonly: true
});
})
database.function("userFn_dateIntegerToString", dateTimeFunctions.dateIntegerToString);
database.function("userFn_timeIntegerToString", dateTimeFunctions.timeIntegerToString);
database.function(
'userFn_dateIntegerToString',
dateTimeFunctions.dateIntegerToString
)
database.function(
'userFn_timeIntegerToString',
dateTimeFunctions.timeIntegerToString
)
const rows = database.prepare(sql).all(sqlParameters);
const rows = database.prepare(sql).all(sqlParameters)
database.close();
database.close()
return rows;
return rows
}
export default getReportData;
export default getReportData

2
helpers/lotOccupancyDB/getWorkOrderTypes.d.ts vendored
View File

@ -1,3 +1,3 @@
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes';
export declare function getWorkOrderTypes(): recordTypes.WorkOrderType[];
export default getWorkOrderTypes;

8
helpers/lotOccupancyDB/getWorkOrderTypes.js
View File

@ -1,6 +1,6 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
import { updateRecordOrderNumber } from './updateRecordOrderNumber.js';
export function getWorkOrderTypes() {
const database = sqlite(databasePath);
const workOrderTypes = database
@ -12,7 +12,7 @@ export function getWorkOrderTypes() {
let expectedOrderNumber = 0;
for (const workOrderType of workOrderTypes) {
if (workOrderType.orderNumber !== expectedOrderNumber) {
updateRecordOrderNumber("WorkOrderTypes", workOrderType.workOrderTypeId, expectedOrderNumber, database);
updateRecordOrderNumber('WorkOrderTypes', workOrderType.workOrderTypeId, expectedOrderNumber, database);
workOrderType.orderNumber = expectedOrderNumber;
}
expectedOrderNumber += 1;

30
helpers/lotOccupancyDB/getWorkOrderTypes.ts
View File

@ -1,13 +1,13 @@
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 { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes'
export function getWorkOrderTypes(): recordTypes.WorkOrderType[] {
const database = sqlite(databasePath);
const database = sqlite(databasePath)
const workOrderTypes: recordTypes.WorkOrderType[] = database
.prepare(
@ -16,28 +16,28 @@ export function getWorkOrderTypes(): recordTypes.WorkOrderType[] {
where recordDelete_timeMillis is null
order by orderNumber, workOrderType`
)
.all();
.all()
let expectedOrderNumber = 0;
let expectedOrderNumber = 0
for (const workOrderType of workOrderTypes) {
if (workOrderType.orderNumber !== expectedOrderNumber) {
updateRecordOrderNumber(
"WorkOrderTypes",
workOrderType.workOrderTypeId,
'WorkOrderTypes',
workOrderType.workOrderTypeId!,
expectedOrderNumber,
database
);
)
workOrderType.orderNumber = expectedOrderNumber;
workOrderType.orderNumber = expectedOrderNumber
}
expectedOrderNumber += 1;
expectedOrderNumber += 1
}
database.close();
database.close()
return workOrderTypes;
return workOrderTypes
}
export default getWorkOrderTypes;
export default getWorkOrderTypes

16
helpers/lotOccupancyDB/moveFee.js
View File

@ -1,7 +1,7 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { getFee } from "./getFee.js";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
import { getFee } from './getFee.js';
import { updateRecordOrderNumber } from './updateRecordOrderNumber.js';
export function moveFeeDown(feeId) {
const database = sqlite(databasePath);
const currentFee = getFee(feeId, database);
@ -12,7 +12,7 @@ export function moveFeeDown(feeId) {
and feeCategoryId = ?
and orderNumber = ? + 1`)
.run(currentFee.feeCategoryId, currentFee.orderNumber);
const success = updateRecordOrderNumber("Fees", feeId, currentFee.orderNumber + 1, database);
const success = updateRecordOrderNumber('Fees', feeId, currentFee.orderNumber + 1, database);
database.close();
return success;
}
@ -26,7 +26,7 @@ export function moveFeeDownToBottom(feeId) {
and feeCategoryId = ?`)
.get(currentFee.feeCategoryId).maxOrderNumber;
if (currentFee.orderNumber !== maxOrderNumber) {
updateRecordOrderNumber("Fees", feeId, maxOrderNumber + 1, database);
updateRecordOrderNumber('Fees', feeId, maxOrderNumber + 1, database);
database
.prepare(`update Fees
set orderNumber = orderNumber - 1
@ -51,7 +51,7 @@ export function moveFeeUp(feeId) {
and feeCategoryId = ?
and orderNumber = ? - 1`)
.run(currentFee.feeCategoryId, currentFee.orderNumber);
const success = updateRecordOrderNumber("Fees", feeId, currentFee.orderNumber - 1, database);
const success = updateRecordOrderNumber('Fees', feeId, currentFee.orderNumber - 1, database);
database.close();
return success;
}
@ -59,7 +59,7 @@ export function moveFeeUpToTop(feeId) {
const database = sqlite(databasePath);
const currentFee = getFee(feeId, database);
if (currentFee.orderNumber > 0) {
updateRecordOrderNumber("Fees", feeId, -1, database);
updateRecordOrderNumber('Fees', feeId, -1, database);
database
.prepare(`update Fees
set orderNumber = orderNumber + 1

78
helpers/lotOccupancyDB/moveFee.ts
View File

@ -1,14 +1,14 @@
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 { getFee } from "./getFee.js";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
import { getFee } from './getFee.js'
import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'
export function moveFeeDown(feeId: number | string): boolean {
const database = sqlite(databasePath);
const database = sqlite(databasePath)
const currentFee = getFee(feeId, database);
const currentFee = getFee(feeId, database)
database
.prepare(
@ -18,19 +18,24 @@ export function moveFeeDown(feeId: number | string): boolean {
and feeCategoryId = ?
and orderNumber = ? + 1`
)
.run(currentFee.feeCategoryId, currentFee.orderNumber);
.run(currentFee.feeCategoryId, currentFee.orderNumber)
const success = updateRecordOrderNumber("Fees", feeId, currentFee.orderNumber + 1, database);
const success = updateRecordOrderNumber(
'Fees',
feeId,
currentFee.orderNumber! + 1,
database
)
database.close();
database.close()
return success;
return success
}
export function moveFeeDownToBottom(feeId: number | string): boolean {
const database = sqlite(databasePath);
const database = sqlite(databasePath)
const currentFee = getFee(feeId, database);
const currentFee = getFee(feeId, database)
const maxOrderNumber: number = database
.prepare(
@ -39,10 +44,10 @@ export function moveFeeDownToBottom(feeId: number | string): boolean {
where recordDelete_timeMillis is null
and feeCategoryId = ?`
)
.get(currentFee.feeCategoryId).maxOrderNumber;
.get(currentFee.feeCategoryId).maxOrderNumber
if (currentFee.orderNumber !== maxOrderNumber) {
updateRecordOrderNumber("Fees", feeId, maxOrderNumber + 1, database);
updateRecordOrderNumber('Fees', feeId, maxOrderNumber + 1, database)
database
.prepare(
@ -51,22 +56,22 @@ export function moveFeeDownToBottom(feeId: number | string): boolean {
where recordDelete_timeMillis is null
and feeCategoryId = ? and orderNumber > ?`
)
.run(currentFee.feeCategoryId, currentFee.orderNumber);
.run(currentFee.feeCategoryId, currentFee.orderNumber)
}
database.close();
database.close()
return true;
return true
}
export function moveFeeUp(feeId: number): boolean {
const database = sqlite(databasePath);
const database = sqlite(databasePath)
const currentFee = getFee(feeId, database);
const currentFee = getFee(feeId, database)
if (currentFee.orderNumber <= 0) {
database.close();
return true;
if (currentFee.orderNumber! <= 0) {
database.close()
return true
}
database
@ -77,22 +82,27 @@ export function moveFeeUp(feeId: number): boolean {
and feeCategoryId = ?
and orderNumber = ? - 1`
)
.run(currentFee.feeCategoryId, currentFee.orderNumber);
.run(currentFee.feeCategoryId, currentFee.orderNumber)
const success = updateRecordOrderNumber("Fees", feeId, currentFee.orderNumber - 1, database);
const success = updateRecordOrderNumber(
'Fees',
feeId,
currentFee.orderNumber! - 1,
database
)
database.close();
database.close()
return success;
return success
}
export function moveFeeUpToTop(feeId: number | string): boolean {
const database = sqlite(databasePath);
const database = sqlite(databasePath)
const currentFee = getFee(feeId, database);
const currentFee = getFee(feeId, database)
if (currentFee.orderNumber > 0) {
updateRecordOrderNumber("Fees", feeId, -1, database);
if (currentFee.orderNumber! > 0) {
updateRecordOrderNumber('Fees', feeId, -1, database)
database
.prepare(
@ -102,12 +112,12 @@ export function moveFeeUpToTop(feeId: number | string): boolean {
and feeCategoryId = ?
and orderNumber < ?`
)
.run(currentFee.feeCategoryId, currentFee.orderNumber);
.run(currentFee.feeCategoryId, currentFee.orderNumber)
}
database.close();
database.close()
return true;
return true
}
export default moveFeeUp;
export default moveFeeUp

82
helpers/lotOccupancyDB/moveOccupancyTypeField.js
View File

@ -1,10 +1,12 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { clearCacheByTableName } from "../functions.cache.js";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
import { clearCacheByTableName } from '../functions.cache.js';
import { updateRecordOrderNumber } from './updateRecordOrderNumber.js';
function getCurrentField(occupancyTypeFieldId, connectedDatabase) {
const currentField = connectedDatabase
.prepare(`select occupancyTypeId, orderNumber from OccupancyTypeFields where occupancyTypeFieldId = ?`)
.prepare(`select occupancyTypeId, orderNumber
from OccupancyTypeFields
where occupancyTypeFieldId = ?`)
.get(occupancyTypeFieldId);
return currentField;
}
@ -12,17 +14,17 @@ export function moveOccupancyTypeFieldDown(occupancyTypeFieldId) {
const database = sqlite(databasePath);
const currentField = getCurrentField(occupancyTypeFieldId, database);
database
.prepare("update OccupancyTypeFields" +
" set orderNumber = orderNumber - 1" +
" where recordDelete_timeMillis is null" +
.prepare('update OccupancyTypeFields' +
' set orderNumber = orderNumber - 1' +
' where recordDelete_timeMillis is null' +
(currentField.occupancyTypeId
? " and occupancyTypeId = '" + currentField.occupancyTypeId + "'"
: " and occupancyTypeId is null") +
" and orderNumber = ? + 1")
: ' and occupancyTypeId is null') +
' and orderNumber = ? + 1')
.run(currentField.orderNumber);
const success = updateRecordOrderNumber("OccupancyTypeFields", occupancyTypeFieldId, currentField.orderNumber + 1, database);
const success = updateRecordOrderNumber('OccupancyTypeFields', occupancyTypeFieldId, currentField.orderNumber + 1, database);
database.close();
clearCacheByTableName("OccupancyTypeFields");
clearCacheByTableName('OccupancyTypeFields');
return success;
}
export function moveOccupancyTypeFieldDownToBottom(occupancyTypeFieldId) {
@ -33,26 +35,28 @@ export function moveOccupancyTypeFieldDownToBottom(occupancyTypeFieldId) {
occupancyTypeParameters.push(currentField.occupancyTypeId);
}
const maxOrderNumber = database
.prepare("select max(orderNumber) as maxOrderNumber" +
" from OccupancyTypeFields" +
" where recordDelete_timeMillis is null" +
(currentField.occupancyTypeId ? " and occupancyTypeId = ?" : " and occupancyTypeId is null"))
.prepare('select max(orderNumber) as maxOrderNumber' +
' from OccupancyTypeFields' +
' where recordDelete_timeMillis is null' +
(currentField.occupancyTypeId
? ' and occupancyTypeId = ?'
: ' and occupancyTypeId is null'))
.get(occupancyTypeParameters).maxOrderNumber;
if (currentField.orderNumber !== maxOrderNumber) {
updateRecordOrderNumber("OccupancyTypeFields", occupancyTypeFieldId, maxOrderNumber + 1, database);
updateRecordOrderNumber('OccupancyTypeFields', occupancyTypeFieldId, maxOrderNumber + 1, database);
occupancyTypeParameters.push(currentField.orderNumber);
database
.prepare("update OccupancyTypeFields" +
" set orderNumber = orderNumber - 1" +
" where recordDelete_timeMillis is null" +
.prepare('update OccupancyTypeFields' +
' set orderNumber = orderNumber - 1' +
' where recordDelete_timeMillis is null' +
(currentField.occupancyTypeId
? " and occupancyTypeId = ?"
: " and occupancyTypeId is null") +
" and orderNumber > ?")
? ' and occupancyTypeId = ?'
: ' and occupancyTypeId is null') +
' and orderNumber > ?')
.run(occupancyTypeParameters);
}
database.close();
clearCacheByTableName("OccupancyTypeFields");
clearCacheByTableName('OccupancyTypeFields');
return true;
}
export function moveOccupancyTypeFieldUp(occupancyTypeFieldId) {
@ -63,40 +67,40 @@ export function moveOccupancyTypeFieldUp(occupancyTypeFieldId) {
return true;
}
database
.prepare("update OccupancyTypeFields" +
" set orderNumber = orderNumber + 1" +
" where recordDelete_timeMillis is null" +
.prepare('update OccupancyTypeFields' +
' set orderNumber = orderNumber + 1' +
' where recordDelete_timeMillis is null' +
(currentField.occupancyTypeId
? " and occupancyTypeId = '" + currentField.occupancyTypeId + "'"
: " and occupancyTypeId is null") +
" and orderNumber = ? - 1")
: ' and occupancyTypeId is null') +
' and orderNumber = ? - 1')
.run(currentField.orderNumber);
const success = updateRecordOrderNumber("OccupancyTypeFields", occupancyTypeFieldId, currentField.orderNumber - 1, database);
const success = updateRecordOrderNumber('OccupancyTypeFields', occupancyTypeFieldId, currentField.orderNumber - 1, database);
database.close();
clearCacheByTableName("OccupancyTypeFields");
clearCacheByTableName('OccupancyTypeFields');
return success;
}
export function moveOccupancyTypeFieldUpToTop(occupancyTypeFieldId) {
const database = sqlite(databasePath);
const currentField = getCurrentField(occupancyTypeFieldId, database);
if (currentField.orderNumber > 0) {
updateRecordOrderNumber("OccupancyTypeFields", occupancyTypeFieldId, -1, database);
updateRecordOrderNumber('OccupancyTypeFields', occupancyTypeFieldId, -1, database);
const occupancyTypeParameters = [];
if (currentField.occupancyTypeId) {
occupancyTypeParameters.push(currentField.occupancyTypeId);
}
occupancyTypeParameters.push(currentField.orderNumber);
database
.prepare("update OccupancyTypeFields" +
" set orderNumber = orderNumber + 1" +
" where recordDelete_timeMillis is null" +
.prepare('update OccupancyTypeFields' +
' set orderNumber = orderNumber + 1' +
' where recordDelete_timeMillis is null' +
(currentField.occupancyTypeId
? " and occupancyTypeId = ?"
: " and occupancyTypeId is null") +
" and orderNumber < ?")
? ' and occupancyTypeId = ?'
: ' and occupancyTypeId is null') +
' and orderNumber < ?')
.run(occupancyTypeParameters);
}
database.close();
clearCacheByTableName("OccupancyTypeFields");
clearCacheByTableName('OccupancyTypeFields');
return true;
}

177
helpers/lotOccupancyDB/moveOccupancyTypeField.ts
View File

@ -1,167 +1,190 @@
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 { clearCacheByTableName } from "../functions.cache.js";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
import { clearCacheByTableName } from '../functions.cache.js'
import { updateRecordOrderNumber } from './updateRecordOrderNumber.js'
function getCurrentField(
occupancyTypeFieldId: number,
connectedDatabase: sqlite.Database
): { occupancyTypeId?: number; orderNumber: number } {
const currentField: { occupancyTypeId?: number; orderNumber: number } = connectedDatabase
const currentField: { occupancyTypeId?: number; orderNumber: number } =
connectedDatabase
.prepare(
`select occupancyTypeId, orderNumber from OccupancyTypeFields where occupancyTypeFieldId = ?`
`select occupancyTypeId, orderNumber
from OccupancyTypeFields
where occupancyTypeFieldId = ?`
)
.get(occupancyTypeFieldId);
.get(occupancyTypeFieldId)
return currentField;
return currentField
}
export function moveOccupancyTypeFieldDown(occupancyTypeFieldId: number): boolean {
const database = sqlite(databasePath);
export function moveOccupancyTypeFieldDown(
occupancyTypeFieldId: number
): boolean {
const database = sqlite(databasePath)
const currentField = getCurrentField(occupancyTypeFieldId, database);
const currentField = getCurrentField(occupancyTypeFieldId, database)
database
.prepare(
"update OccupancyTypeFields" +
" set orderNumber = orderNumber - 1" +
" where recordDelete_timeMillis is null" +
'update OccupancyTypeFields' +
' set orderNumber = orderNumber - 1' +
' where recordDelete_timeMillis is null' +
(currentField.occupancyTypeId
? " and occupancyTypeId = '" + currentField.occupancyTypeId + "'"
: " and occupancyTypeId is null") +
" and orderNumber = ? + 1"
: ' and occupancyTypeId is null') +
' and orderNumber = ? + 1'
)
.run(currentField.orderNumber);
.run(currentField.orderNumber)
const success = updateRecordOrderNumber(
"OccupancyTypeFields",
'OccupancyTypeFields',
occupancyTypeFieldId,
currentField.orderNumber + 1,
database
);
)
database.close();
database.close()
clearCacheByTableName("OccupancyTypeFields");
clearCacheByTableName('OccupancyTypeFields')
return success;
return success
}
export function moveOccupancyTypeFieldDownToBottom(occupancyTypeFieldId: number): boolean {
const database = sqlite(databasePath);
export function moveOccupancyTypeFieldDownToBottom(
occupancyTypeFieldId: number
): boolean {
const database = sqlite(databasePath)
const currentField = getCurrentField(occupancyTypeFieldId, database);
const currentField = getCurrentField(occupancyTypeFieldId, database)
const occupancyTypeParameters = [];
const occupancyTypeParameters: unknown[] = []
if (currentField.occupancyTypeId) {
occupancyTypeParameters.push(currentField.occupancyTypeId);
occupancyTypeParameters.push(currentField.occupancyTypeId)
}
const maxOrderNumber: number = database
.prepare(
"select max(orderNumber) as maxOrderNumber" +
" from OccupancyTypeFields" +
" where recordDelete_timeMillis is null" +
(currentField.occupancyTypeId ? " and occupancyTypeId = ?" : " and occupancyTypeId is null")
'select max(orderNumber) as maxOrderNumber' +
' from OccupancyTypeFields' +
' where recordDelete_timeMillis is null' +
(currentField.occupancyTypeId
? ' and occupancyTypeId = ?'
: ' and occupancyTypeId is null')
)
.get(occupancyTypeParameters).maxOrderNumber;
.get(occupancyTypeParameters).maxOrderNumber
if (currentField.orderNumber !== maxOrderNumber) {
updateRecordOrderNumber("OccupancyTypeFields", occupancyTypeFieldId, maxOrderNumber + 1, database);
updateRecordOrderNumber(
'OccupancyTypeFields',
occupancyTypeFieldId,
maxOrderNumber + 1,
database
)
occupancyTypeParameters.push(currentField.orderNumber);
occupancyTypeParameters.push(currentField.orderNumber)
database
.prepare(
"update OccupancyTypeFields" +
" set orderNumber = orderNumber - 1" +
" where recordDelete_timeMillis is null" +
'update OccupancyTypeFields' +
' set orderNumber = orderNumber - 1' +
' where recordDelete_timeMillis is null' +
(currentField.occupancyTypeId
? " and occupancyTypeId = ?"
: " and occupancyTypeId is null") +
" and orderNumber > ?"
? ' and occupancyTypeId = ?'
: ' and occupancyTypeId is null') +
' and orderNumber > ?'
)
.run(occupancyTypeParameters);
.run(occupancyTypeParameters)
}
database.close();
database.close()
clearCacheByTableName("OccupancyTypeFields");
clearCacheByTableName('OccupancyTypeFields')
return true;
return true
}
export function moveOccupancyTypeFieldUp(occupancyTypeFieldId: number): boolean {
const database = sqlite(databasePath);
export function moveOccupancyTypeFieldUp(
occupancyTypeFieldId: number
): boolean {
const database = sqlite(databasePath)
const currentField = getCurrentField(occupancyTypeFieldId, database);
const currentField = getCurrentField(occupancyTypeFieldId, database)
if (currentField.orderNumber <= 0) {
database.close();
return true;
database.close()
return true
}
database
.prepare(
"update OccupancyTypeFields" +
" set orderNumber = orderNumber + 1" +
" where recordDelete_timeMillis is null" +
'update OccupancyTypeFields' +
' set orderNumber = orderNumber + 1' +
' where recordDelete_timeMillis is null' +
(currentField.occupancyTypeId
? " and occupancyTypeId = '" + currentField.occupancyTypeId + "'"
: " and occupancyTypeId is null") +
" and orderNumber = ? - 1"
: ' and occupancyTypeId is null') +
' and orderNumber = ? - 1'
)
.run(currentField.orderNumber);
.run(currentField.orderNumber)
const success = updateRecordOrderNumber(
"OccupancyTypeFields",
'OccupancyTypeFields',
occupancyTypeFieldId,
currentField.orderNumber - 1,
database
);
)
database.close();
database.close()
clearCacheByTableName("OccupancyTypeFields");
clearCacheByTableName('OccupancyTypeFields')
return success;
return success
}
export function moveOccupancyTypeFieldUpToTop(occupancyTypeFieldId: number): boolean {
const database = sqlite(databasePath);
export function moveOccupancyTypeFieldUpToTop(
occupancyTypeFieldId: number
): boolean {
const database = sqlite(databasePath)
const currentField = getCurrentField(occupancyTypeFieldId, database);
const currentField = getCurrentField(occupancyTypeFieldId, database)
if (currentField.orderNumber > 0) {
updateRecordOrderNumber("OccupancyTypeFields", occupancyTypeFieldId, -1, database);
updateRecordOrderNumber(
'OccupancyTypeFields',
occupancyTypeFieldId,
-1,
database
)
const occupancyTypeParameters = [];
const occupancyTypeParameters: unknown[] = []
if (currentField.occupancyTypeId) {
occupancyTypeParameters.push(currentField.occupancyTypeId);
occupancyTypeParameters.push(currentField.occupancyTypeId)
}
occupancyTypeParameters.push(currentField.orderNumber);
occupancyTypeParameters.push(currentField.orderNumber)
database
.prepare(
"update OccupancyTypeFields" +
" set orderNumber = orderNumber + 1" +
" where recordDelete_timeMillis is null" +
'update OccupancyTypeFields' +
' set orderNumber = orderNumber + 1' +
' where recordDelete_timeMillis is null' +
(currentField.occupancyTypeId
? " and occupancyTypeId = ?"
: " and occupancyTypeId is null") +
" and orderNumber < ?"
? ' and occupancyTypeId = ?'
: ' and occupancyTypeId is null') +
' and orderNumber < ?'
)
.run(occupancyTypeParameters);
.run(occupancyTypeParameters)
}
database.close();
database.close()
clearCacheByTableName("OccupancyTypeFields");
clearCacheByTableName('OccupancyTypeFields')
return true;
return true
}

2
helpers/lotOccupancyDB/reopenWorkOrder.d.ts vendored
View File

@ -1,3 +1,3 @@
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes';
export declare function reopenWorkOrder(workOrderId: number | string, requestSession: recordTypes.PartialSession): boolean;
export default reopenWorkOrder;

4
helpers/lotOccupancyDB/reopenWorkOrder.js
View File

@ -1,5 +1,5 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
export function reopenWorkOrder(workOrderId, requestSession) {
const database = sqlite(databasePath);
const rightNowMillis = Date.now();

18
helpers/lotOccupancyDB/reopenWorkOrder.ts
View File

@ -1,16 +1,16 @@
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'
export function reopenWorkOrder(
workOrderId: number | string,
requestSession: recordTypes.PartialSession
): boolean {
const database = sqlite(databasePath);
const database = sqlite(databasePath)
const rightNowMillis = Date.now();
const rightNowMillis = Date.now()
const result = database
.prepare(
@ -21,11 +21,11 @@ export function reopenWorkOrder(
where workOrderId = ?
and workOrderCloseDate is not null`
)
.run(requestSession.user.userName, rightNowMillis, workOrderId);
.run(requestSession.user!.userName, rightNowMillis, workOrderId)
database.close();
database.close()
return result.changes > 0;
return result.changes > 0
}
export default reopenWorkOrder;
export default reopenWorkOrder

2
helpers/lotOccupancyDB/reopenWorkOrderMilestone.d.ts vendored
View File

@ -1,3 +1,3 @@
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes';
export declare function reopenWorkOrderMilestone(workOrderMilestoneId: number | string, requestSession: recordTypes.PartialSession): boolean;
export default reopenWorkOrderMilestone;

4
helpers/lotOccupancyDB/reopenWorkOrderMilestone.js
View File

@ -1,5 +1,5 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
export function reopenWorkOrderMilestone(workOrderMilestoneId, requestSession) {
const database = sqlite(databasePath);
const rightNowMillis = Date.now();

18
helpers/lotOccupancyDB/reopenWorkOrderMilestone.ts
View File

@ -1,16 +1,16 @@
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'
export function reopenWorkOrderMilestone(
workOrderMilestoneId: number | string,
requestSession: recordTypes.PartialSession
): boolean {
const database = sqlite(databasePath);
const database = sqlite(databasePath)
const rightNowMillis = Date.now();
const rightNowMillis = Date.now()
const result = database
.prepare(
@ -22,11 +22,11 @@ export function reopenWorkOrderMilestone(
where workOrderMilestoneId = ?
and workOrderMilestoneCompletionDate is not null`
)
.run(requestSession.user.userName, rightNowMillis, workOrderMilestoneId);
.run(requestSession.user!.userName, rightNowMillis, workOrderMilestoneId)
database.close();
database.close()
return result.changes > 0;
return result.changes > 0
}
export default reopenWorkOrderMilestone;
export default reopenWorkOrderMilestone

10
helpers/lotOccupancyDB/updateFee.d.ts vendored
View File

@ -1,18 +1,18 @@
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes';
interface UpdateFeeForm {
feeId: string;
feeCategoryId: string;
feeName: string;
feeDescription: string;
occupancyTypeId?: string;
lotTypeId?: string;
occupancyTypeId: string;
lotTypeId: string;
feeAmount?: string;
feeFunction?: string;
taxAmount?: string;
taxPercentage?: string;
includeQuantity: "" | "1";
includeQuantity: '' | '1';
quantityUnit?: string;
isRequired: "" | "1";
isRequired: '' | '1';
}
export declare function updateFee(feeForm: UpdateFeeForm, requestSession: recordTypes.PartialSession): boolean;
export default updateFee;

6
helpers/lotOccupancyDB/updateFee.js
View File

@ -1,5 +1,5 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
export function updateFee(feeForm, requestSession) {
const database = sqlite(databasePath);
const rightNowMillis = Date.now();
@ -21,7 +21,7 @@ export function updateFee(feeForm, requestSession) {
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);
.run(feeForm.feeCategoryId, feeForm.feeName, feeForm.feeDescription, feeForm.occupancyTypeId === '' ? undefined : feeForm.occupancyTypeId, feeForm.lotTypeId === '' ? undefined : feeForm.lotTypeId, feeForm.feeAmount ?? undefined, feeForm.feeFunction ?? undefined, feeForm.taxAmount ?? undefined, feeForm.taxPercentage ?? undefined, feeForm.includeQuantity === '' ? 0 : 1, feeForm.quantityUnit, feeForm.isRequired === '' ? 0 : 1, requestSession.user.userName, rightNowMillis, feeForm.feeId);
database.close();
return result.changes > 0;
}

67
helpers/lotOccupancyDB/updateFee.ts
View File

@ -1,29 +1,32 @@
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'
interface UpdateFeeForm {
feeId: string;
feeCategoryId: string;
feeName: string;
feeDescription: string;
occupancyTypeId?: string;
lotTypeId?: string;
feeAmount?: string;
feeFunction?: string;
taxAmount?: string;
taxPercentage?: string;
includeQuantity: "" | "1";
quantityUnit?: string;
isRequired: "" | "1";
feeId: string
feeCategoryId: string
feeName: string
feeDescription: string
occupancyTypeId: string
lotTypeId: string
feeAmount?: string
feeFunction?: string
taxAmount?: string
taxPercentage?: string
includeQuantity: '' | '1'
quantityUnit?: string
isRequired: '' | '1'
}
export function updateFee(feeForm: UpdateFeeForm, requestSession: recordTypes.PartialSession): boolean {
const database = sqlite(databasePath);
export function updateFee(
feeForm: UpdateFeeForm,
requestSession: recordTypes.PartialSession
): boolean {
const database = sqlite(databasePath)
const rightNowMillis = Date.now();
const rightNowMillis = Date.now()
const result = database
.prepare(
@ -49,23 +52,23 @@ export function updateFee(feeForm: UpdateFeeForm, requestSession: recordTypes.Pa
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.occupancyTypeId === '' ? undefined : feeForm.occupancyTypeId,
feeForm.lotTypeId === '' ? undefined : feeForm.lotTypeId,
feeForm.feeAmount ?? undefined,
feeForm.feeFunction ?? undefined,
feeForm.taxAmount ?? undefined,
feeForm.taxPercentage ?? undefined,
feeForm.includeQuantity === '' ? 0 : 1,
feeForm.quantityUnit,
feeForm.isRequired ? 1 : 0,
requestSession.user.userName,
feeForm.isRequired === '' ? 0 : 1,
requestSession.user!.userName,
rightNowMillis,
feeForm.feeId
);
)
database.close();
database.close()
return result.changes > 0;
return result.changes > 0
}
export default updateFee;
export default updateFee

2
helpers/lotOccupancyDB/updateLot.d.ts vendored
View File

@ -1,4 +1,4 @@
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes';
interface UpdateLotForm {
lotId: string | number;
lotName: string;

18
helpers/lotOccupancyDB/updateLot.js
View File

@ -1,7 +1,7 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { addOrUpdateLotField } from "./addOrUpdateLotField.js";
import { deleteLotField } from "./deleteLotField.js";
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
import { addOrUpdateLotField } from './addOrUpdateLotField.js';
import { deleteLotField } from './deleteLotField.js';
export function updateLot(lotForm, requestSession) {
const database = sqlite(databasePath);
const rightNowMillis = Date.now();
@ -18,12 +18,12 @@ export function updateLot(lotForm, requestSession) {
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);
.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(",");
const lotTypeFieldIds = (lotForm.lotTypeFieldIds ?? '').split(',');
for (const lotTypeFieldId of lotTypeFieldIds) {
const lotFieldValue = lotForm["lotFieldValue_" + lotTypeFieldId];
if (lotFieldValue && lotFieldValue !== "") {
const lotFieldValue = lotForm['lotFieldValue_' + lotTypeFieldId];
if (lotFieldValue && lotFieldValue !== '') {
addOrUpdateLotField({
lotId: lotForm.lotId,
lotTypeFieldId,
@ -48,7 +48,7 @@ export function updateLotStatus(lotId, lotStatusId, requestSession) {
recordUpdate_timeMillis = ?
where lotId = ?
and recordDelete_timeMillis is null`)
.run(lotStatusId === "" ? undefined : lotStatusId, requestSession.user.userName, rightNowMillis, lotId);
.run(lotStatusId === '' ? undefined : lotStatusId, requestSession.user.userName, rightNowMillis, lotId);
database.close();
return result.changes > 0;
}

76
helpers/lotOccupancyDB/updateLot.ts
View File

@ -1,35 +1,35 @@
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 { addOrUpdateLotField } from "./addOrUpdateLotField.js";
import { deleteLotField } from "./deleteLotField.js";
import { addOrUpdateLotField } from './addOrUpdateLotField.js'
import { deleteLotField } from './deleteLotField.js'
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes'
interface UpdateLotForm {
lotId: string | number;
lotName: string;
lotTypeId: string | number;
lotStatusId: string | number;
lotId: string | number
lotName: string
lotTypeId: string | number
lotStatusId: string | number
mapId: string | number;
mapKey: string;
mapId: string | number
mapKey: string
lotLatitude: string;
lotLongitude: string;
lotLatitude: string
lotLongitude: string
lotTypeFieldIds?: string;
[lotFieldValue_lotTypeFieldId: string]: unknown;
lotTypeFieldIds?: string
[lotFieldValue_lotTypeFieldId: string]: unknown
}
export function updateLot(
lotForm: UpdateLotForm,
requestSession: recordTypes.PartialSession
): boolean {
const database = sqlite(databasePath);
const database = sqlite(databasePath)
const rightNowMillis = Date.now();
const rightNowMillis = Date.now()
const result = database
.prepare(
@ -49,23 +49,23 @@ export function updateLot(
.run(
lotForm.lotName,
lotForm.lotTypeId,
lotForm.lotStatusId === "" ? undefined : lotForm.lotStatusId,
lotForm.mapId === "" ? undefined : lotForm.mapId,
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,
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(",");
const lotTypeFieldIds = (lotForm.lotTypeFieldIds ?? '').split(',')
for (const lotTypeFieldId of lotTypeFieldIds) {
const lotFieldValue = lotForm["lotFieldValue_" + lotTypeFieldId] as string;
const lotFieldValue = lotForm['lotFieldValue_' + lotTypeFieldId] as string
if (lotFieldValue && lotFieldValue !== "") {
if (lotFieldValue && lotFieldValue !== '') {
addOrUpdateLotField(
{
lotId: lotForm.lotId,
@ -74,16 +74,16 @@ export function updateLot(
},
requestSession,
database
);
)
} else {
deleteLotField(lotForm.lotId, lotTypeFieldId, requestSession, database);
deleteLotField(lotForm.lotId, lotTypeFieldId, requestSession, database)
}
}
}
database.close();
database.close()
return result.changes > 0;
return result.changes > 0
}
export function updateLotStatus(
@ -91,9 +91,9 @@ export function updateLotStatus(
lotStatusId: number | string,
requestSession: recordTypes.PartialSession
): boolean {
const database = sqlite(databasePath);
const database = sqlite(databasePath)
const rightNowMillis = Date.now();
const rightNowMillis = Date.now()
const result = database
.prepare(
@ -105,15 +105,15 @@ export function updateLotStatus(
and recordDelete_timeMillis is null`
)
.run(
lotStatusId === "" ? undefined : lotStatusId,
requestSession.user.userName,
lotStatusId === '' ? undefined : lotStatusId,
requestSession.user!.userName,
rightNowMillis,
lotId
);
)
database.close();
database.close()
return result.changes > 0;
return result.changes > 0
}
export default updateLot;
export default updateLot

2
helpers/lotOccupancyDB/updateLotComment.d.ts vendored
View File

@ -1,4 +1,4 @@
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes';
interface UpdateLotCommentForm {
lotCommentId: string | number;
lotCommentDateString: string;

6
helpers/lotOccupancyDB/updateLotComment.js
View File

@ -1,6 +1,6 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { dateStringToInteger, timeStringToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
import { dateStringToInteger, timeStringToInteger } from '@cityssm/expressjs-server-js/dateTimeFns.js';
export function updateLotComment(commentForm, requestSession) {
const rightNowMillis = Date.now();
const database = sqlite(databasePath);

30
helpers/lotOccupancyDB/updateLotComment.ts
View File

@ -1,28 +1,28 @@
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,
timeStringToInteger
} from "@cityssm/expressjs-server-js/dateTimeFns.js";
} from '@cityssm/expressjs-server-js/dateTimeFns.js'
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes'
interface UpdateLotCommentForm {
lotCommentId: string | number;
lotCommentDateString: string;
lotCommentTimeString: string;
lotComment: string;
lotCommentId: string | number
lotCommentDateString: string
lotCommentTimeString: string
lotComment: string
}
export function updateLotComment(
commentForm: UpdateLotCommentForm,
requestSession: recordTypes.PartialSession
): boolean {
const rightNowMillis = Date.now();
const rightNowMillis = Date.now()
const database = sqlite(databasePath);
const database = sqlite(databasePath)
const result = database
.prepare(
@ -39,14 +39,14 @@ export function updateLotComment(
dateStringToInteger(commentForm.lotCommentDateString),
timeStringToInteger(commentForm.lotCommentTimeString),
commentForm.lotComment,
requestSession.user.userName,
requestSession.user!.userName,
rightNowMillis,
commentForm.lotCommentId
);
)
database.close();
database.close()
return result.changes > 0;
return result.changes > 0
}
export default updateLotComment;
export default updateLotComment

2
helpers/lotOccupancyDB/updateLotOccupancy.d.ts vendored
View File

@ -1,4 +1,4 @@
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes';
interface UpdateLotOccupancyForm {
lotOccupancyId: string | number;
occupancyTypeId: string | number;

18
helpers/lotOccupancyDB/updateLotOccupancy.js
View File

@ -1,8 +1,8 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { dateStringToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import { addOrUpdateLotOccupancyField } from "./addOrUpdateLotOccupancyField.js";
import { deleteLotOccupancyField } from "./deleteLotOccupancyField.js";
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
import { dateStringToInteger } from '@cityssm/expressjs-server-js/dateTimeFns.js';
import { addOrUpdateLotOccupancyField } from './addOrUpdateLotOccupancyField.js';
import { deleteLotOccupancyField } from './deleteLotOccupancyField.js';
export function updateLotOccupancy(lotOccupancyForm, requestSession) {
const database = sqlite(databasePath);
const rightNowMillis = Date.now();
@ -16,14 +16,14 @@ export function updateLotOccupancy(lotOccupancyForm, requestSession) {
recordUpdate_timeMillis = ?
where lotOccupancyId = ?
and recordDelete_timeMillis is null`)
.run(lotOccupancyForm.occupancyTypeId, lotOccupancyForm.lotId === "" ? undefined : lotOccupancyForm.lotId, dateStringToInteger(lotOccupancyForm.occupancyStartDateString), lotOccupancyForm.occupancyEndDateString === ""
.run(lotOccupancyForm.occupancyTypeId, lotOccupancyForm.lotId === '' ? undefined : lotOccupancyForm.lotId, dateStringToInteger(lotOccupancyForm.occupancyStartDateString), lotOccupancyForm.occupancyEndDateString === ''
? undefined
: dateStringToInteger(lotOccupancyForm.occupancyEndDateString), requestSession.user.userName, rightNowMillis, lotOccupancyForm.lotOccupancyId);
if (result.changes > 0) {
const occupancyTypeFieldIds = (lotOccupancyForm.occupancyTypeFieldIds || "").split(",");
const occupancyTypeFieldIds = (lotOccupancyForm.occupancyTypeFieldIds ?? '').split(',');
for (const occupancyTypeFieldId of occupancyTypeFieldIds) {
const lotOccupancyFieldValue = lotOccupancyForm["lotOccupancyFieldValue_" + occupancyTypeFieldId];
if (lotOccupancyFieldValue && lotOccupancyFieldValue !== "") {
const lotOccupancyFieldValue = lotOccupancyForm['lotOccupancyFieldValue_' + occupancyTypeFieldId];
if (lotOccupancyFieldValue && lotOccupancyFieldValue !== '') {
addOrUpdateLotOccupancyField({
lotOccupancyId: lotOccupancyForm.lotOccupancyId,
occupancyTypeFieldId,

58
helpers/lotOccupancyDB/updateLotOccupancy.ts
View File

@ -1,34 +1,34 @@
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 { 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'
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes'
interface UpdateLotOccupancyForm {
lotOccupancyId: string | number;
occupancyTypeId: string | number;
lotId: string | number;
lotOccupancyId: string | number
occupancyTypeId: string | number
lotId: string | number
occupancyStartDateString: string;
occupancyEndDateString: string;
occupancyStartDateString: string
occupancyEndDateString: string
occupancyTypeFieldIds?: string;
[lotOccupancyFieldValue_occupancyTypeFieldId: string]: unknown;
occupancyTypeFieldIds?: string
[lotOccupancyFieldValue_occupancyTypeFieldId: string]: unknown
}
export function updateLotOccupancy(
lotOccupancyForm: UpdateLotOccupancyForm,
requestSession: recordTypes.PartialSession
): boolean {
const database = sqlite(databasePath);
const database = sqlite(databasePath)
const rightNowMillis = Date.now();
const rightNowMillis = Date.now()
const result = database
.prepare(
@ -44,25 +44,27 @@ export function updateLotOccupancy(
)
.run(
lotOccupancyForm.occupancyTypeId,
lotOccupancyForm.lotId === "" ? undefined : lotOccupancyForm.lotId,
lotOccupancyForm.lotId === '' ? undefined : lotOccupancyForm.lotId,
dateStringToInteger(lotOccupancyForm.occupancyStartDateString),
lotOccupancyForm.occupancyEndDateString === ""
lotOccupancyForm.occupancyEndDateString === ''
? undefined
: dateStringToInteger(lotOccupancyForm.occupancyEndDateString),
requestSession.user.userName,
requestSession.user!.userName,
rightNowMillis,
lotOccupancyForm.lotOccupancyId
);
)
if (result.changes > 0) {
const occupancyTypeFieldIds = (lotOccupancyForm.occupancyTypeFieldIds || "").split(",");
const occupancyTypeFieldIds = (
lotOccupancyForm.occupancyTypeFieldIds ?? ''
).split(',')
for (const occupancyTypeFieldId of occupancyTypeFieldIds) {
const lotOccupancyFieldValue = lotOccupancyForm[
"lotOccupancyFieldValue_" + occupancyTypeFieldId
] as string;
'lotOccupancyFieldValue_' + occupancyTypeFieldId
] as string
if (lotOccupancyFieldValue && lotOccupancyFieldValue !== "") {
if (lotOccupancyFieldValue && lotOccupancyFieldValue !== '') {
addOrUpdateLotOccupancyField(
{
lotOccupancyId: lotOccupancyForm.lotOccupancyId,
@ -71,21 +73,21 @@ export function updateLotOccupancy(
},
requestSession,
database
);
)
} else {
deleteLotOccupancyField(
lotOccupancyForm.lotOccupancyId,
occupancyTypeFieldId,
requestSession,
database
);
)
}
}
}
database.close();
database.close()
return result.changes > 0;
return result.changes > 0
}
export default updateLotOccupancy;
export default updateLotOccupancy

2
helpers/lotOccupancyDB/updateLotOccupancyComment.d.ts vendored
View File

@ -1,4 +1,4 @@
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes';
interface UpdateLotOccupancyCommentForm {
lotOccupancyCommentId: string | number;
lotOccupancyCommentDateString: string;

6
helpers/lotOccupancyDB/updateLotOccupancyComment.js
View File

@ -1,6 +1,6 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { dateStringToInteger, timeStringToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
import { dateStringToInteger, timeStringToInteger } from '@cityssm/expressjs-server-js/dateTimeFns.js';
export function updateLotOccupancyComment(commentForm, requestSession) {
const rightNowMillis = Date.now();
const database = sqlite(databasePath);

30
helpers/lotOccupancyDB/updateLotOccupancyComment.ts
View File

@ -1,28 +1,28 @@
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,
timeStringToInteger
} from "@cityssm/expressjs-server-js/dateTimeFns.js";
} from '@cityssm/expressjs-server-js/dateTimeFns.js'
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes'
interface UpdateLotOccupancyCommentForm {
lotOccupancyCommentId: string | number;
lotOccupancyCommentDateString: string;
lotOccupancyCommentTimeString: string;
lotOccupancyComment: string;
lotOccupancyCommentId: string | number
lotOccupancyCommentDateString: string
lotOccupancyCommentTimeString: string
lotOccupancyComment: string
}
export function updateLotOccupancyComment(
commentForm: UpdateLotOccupancyCommentForm,
requestSession: recordTypes.PartialSession
): boolean {
const rightNowMillis = Date.now();
const rightNowMillis = Date.now()
const database = sqlite(databasePath);
const database = sqlite(databasePath)
const result = database
.prepare(
@ -39,14 +39,14 @@ export function updateLotOccupancyComment(
dateStringToInteger(commentForm.lotOccupancyCommentDateString),
timeStringToInteger(commentForm.lotOccupancyCommentTimeString),
commentForm.lotOccupancyComment,
requestSession.user.userName,
requestSession.user!.userName,
rightNowMillis,
commentForm.lotOccupancyCommentId
);
)
database.close();
database.close()
return result.changes > 0;
return result.changes > 0
}
export default updateLotOccupancyComment;
export default updateLotOccupancyComment

2
helpers/lotOccupancyDB/updateLotOccupancyOccupant.d.ts vendored
View File

@ -1,4 +1,4 @@
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes';
interface UpdateLotOccupancyOccupantForm {
lotOccupancyId: string | number;
lotOccupantIndex: string | number;

4
helpers/lotOccupancyDB/updateLotOccupancyOccupant.js
View File

@ -1,5 +1,5 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
export function updateLotOccupancyOccupant(lotOccupancyOccupantForm, requestSession) {
const database = sqlite(databasePath);
const rightNowMillis = Date.now();

44
helpers/lotOccupancyDB/updateLotOccupancyOccupant.ts
View File

@ -1,31 +1,31 @@
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'
interface UpdateLotOccupancyOccupantForm {
lotOccupancyId: string | number;
lotOccupantIndex: string | number;
lotOccupantTypeId: string | number;
occupantName: string;
occupantAddress1: string;
occupantAddress2: string;
occupantCity: string;
occupantProvince: string;
occupantPostalCode: string;
occupantPhoneNumber: string;
occupantEmailAddress: string;
occupantComment: string;
lotOccupancyId: string | number
lotOccupantIndex: string | number
lotOccupantTypeId: string | number
occupantName: string
occupantAddress1: string
occupantAddress2: string
occupantCity: string
occupantProvince: string
occupantPostalCode: string
occupantPhoneNumber: string
occupantEmailAddress: string
occupantComment: string
}
export function updateLotOccupancyOccupant(
lotOccupancyOccupantForm: UpdateLotOccupancyOccupantForm,
requestSession: recordTypes.PartialSession
): boolean {
const database = sqlite(databasePath);
const database = sqlite(databasePath)
const rightNowMillis = Date.now();
const rightNowMillis = Date.now()
const results = database
.prepare(
@ -57,15 +57,15 @@ export function updateLotOccupancyOccupant(
lotOccupancyOccupantForm.occupantEmailAddress,
lotOccupancyOccupantForm.occupantComment,
lotOccupancyOccupantForm.lotOccupantTypeId,
requestSession.user.userName,
requestSession.user!.userName,
rightNowMillis,
lotOccupancyOccupantForm.lotOccupancyId,
lotOccupancyOccupantForm.lotOccupantIndex
);
)
database.close();
database.close()
return results.changes > 0;
return results.changes > 0
}
export default updateLotOccupancyOccupant;
export default updateLotOccupancyOccupant

2
helpers/lotOccupancyDB/updateLotOccupantType.d.ts vendored
View File

@ -1,4 +1,4 @@
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes';
interface UpdateLotOccupantTypeForm {
lotOccupantTypeId: number | string;
lotOccupantType: string;

10
helpers/lotOccupancyDB/updateLotOccupantType.js
View File

@ -1,6 +1,6 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { clearCacheByTableName } from "../functions.cache.js";
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
import { clearCacheByTableName } from '../functions.cache.js';
export function updateLotOccupantType(lotOccupantTypeForm, requestSession) {
const database = sqlite(databasePath);
const rightNowMillis = Date.now();
@ -12,9 +12,9 @@ export function updateLotOccupantType(lotOccupantTypeForm, requestSession) {
recordUpdate_timeMillis = ?
where lotOccupantTypeId = ?
and recordDelete_timeMillis is null`)
.run(lotOccupantTypeForm.lotOccupantType, lotOccupantTypeForm.fontAwesomeIconClass || "", requestSession.user.userName, rightNowMillis, lotOccupantTypeForm.lotOccupantTypeId);
.run(lotOccupantTypeForm.lotOccupantType, lotOccupantTypeForm.fontAwesomeIconClass ?? '', requestSession.user.userName, rightNowMillis, lotOccupantTypeForm.lotOccupantTypeId);
database.close();
clearCacheByTableName("LotOccupantTypes");
clearCacheByTableName('LotOccupantTypes');
return result.changes > 0;
}
export default updateLotOccupantType;

32
helpers/lotOccupancyDB/updateLotOccupantType.ts
View File

@ -1,24 +1,24 @@
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 { clearCacheByTableName } from "../functions.cache.js";
import { clearCacheByTableName } from '../functions.cache.js'
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes'
interface UpdateLotOccupantTypeForm {
lotOccupantTypeId: number | string;
lotOccupantType: string;
fontAwesomeIconClass?: string;
lotOccupantTypeId: number | string
lotOccupantType: string
fontAwesomeIconClass?: string
}
export function updateLotOccupantType(
lotOccupantTypeForm: UpdateLotOccupantTypeForm,
requestSession: recordTypes.PartialSession
): boolean {
const database = sqlite(databasePath);
const database = sqlite(databasePath)
const rightNowMillis = Date.now();
const rightNowMillis = Date.now()
const result = database
.prepare(
@ -32,17 +32,17 @@ export function updateLotOccupantType(
)
.run(
lotOccupantTypeForm.lotOccupantType,
lotOccupantTypeForm.fontAwesomeIconClass || "",
requestSession.user.userName,
lotOccupantTypeForm.fontAwesomeIconClass ?? '',
requestSession.user!.userName,
rightNowMillis,
lotOccupantTypeForm.lotOccupantTypeId
);
)
database.close();
database.close()
clearCacheByTableName("LotOccupantTypes");
clearCacheByTableName('LotOccupantTypes')
return result.changes > 0;
return result.changes > 0
}
export default updateLotOccupantType;
export default updateLotOccupantType

4
helpers/lotOccupancyDB/updateLotTypeField.d.ts vendored
View File

@ -1,8 +1,8 @@
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes';
interface UpdateLotTypeFieldForm {
lotTypeFieldId: number | string;
lotTypeField: string;
isRequired: "0" | "1";
isRequired: '0' | '1';
minimumLength?: string;
maximumLength?: string;
pattern?: string;

10
helpers/lotOccupancyDB/updateLotTypeField.js
View File

@ -1,6 +1,6 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { clearCacheByTableName } from "../functions.cache.js";
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
import { clearCacheByTableName } from '../functions.cache.js';
export function updateLotTypeField(lotTypeFieldForm, requestSession) {
const database = sqlite(databasePath);
const rightNowMillis = Date.now();
@ -16,9 +16,9 @@ export function updateLotTypeField(lotTypeFieldForm, requestSession) {
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);
.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();
clearCacheByTableName("LotTypeFields");
clearCacheByTableName('LotTypeFields');
return result.changes > 0;
}
export default updateLotTypeField;

44
helpers/lotOccupancyDB/updateLotTypeField.ts
View File

@ -1,28 +1,28 @@
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 { clearCacheByTableName } from "../functions.cache.js";
import { clearCacheByTableName } from '../functions.cache.js'
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes'
interface UpdateLotTypeFieldForm {
lotTypeFieldId: number | string;
lotTypeField: string;
isRequired: "0" | "1";
minimumLength?: string;
maximumLength?: string;
pattern?: string;
lotTypeFieldValues: string;
lotTypeFieldId: number | string
lotTypeField: string
isRequired: '0' | '1'
minimumLength?: string
maximumLength?: string
pattern?: string
lotTypeFieldValues: string
}
export function updateLotTypeField(
lotTypeFieldForm: UpdateLotTypeFieldForm,
requestSession: recordTypes.PartialSession
): boolean {
const database = sqlite(databasePath);
const database = sqlite(databasePath)
const rightNowMillis = Date.now();
const rightNowMillis = Date.now()
const result = database
.prepare(
@ -41,20 +41,20 @@ export function updateLotTypeField(
.run(
lotTypeFieldForm.lotTypeField,
Number.parseInt(lotTypeFieldForm.isRequired, 10),
lotTypeFieldForm.minimumLength || 0,
lotTypeFieldForm.maximumLength || 100,
lotTypeFieldForm.pattern || "",
lotTypeFieldForm.minimumLength ?? 0,
lotTypeFieldForm.maximumLength ?? 100,
lotTypeFieldForm.pattern ?? '',
lotTypeFieldForm.lotTypeFieldValues,
requestSession.user.userName,
requestSession.user!.userName,
rightNowMillis,
lotTypeFieldForm.lotTypeFieldId
);
)
database.close();
database.close()
clearCacheByTableName("LotTypeFields");
clearCacheByTableName('LotTypeFields')
return result.changes > 0;
return result.changes > 0
}
export default updateLotTypeField;
export default updateLotTypeField

2
helpers/lotOccupancyDB/updateMap.d.ts vendored
View File

@ -1,4 +1,4 @@
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes';
interface UpdateMapForm {
mapId: string;
mapName: string;

6
helpers/lotOccupancyDB/updateMap.js
View File

@ -1,5 +1,5 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
export function updateMap(mapForm, requestSession) {
const database = sqlite(databasePath);
const rightNowMillis = Date.now();
@ -20,7 +20,7 @@ export function updateMap(mapForm, requestSession) {
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);
.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;
}

48
helpers/lotOccupancyDB/updateMap.ts
View File

@ -1,31 +1,31 @@
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'
interface UpdateMapForm {
mapId: string;
mapName: string;
mapDescription: string;
mapSVG: string;
mapLatitude: string;
mapLongitude: string;
mapAddress1: string;
mapAddress2: string;
mapCity: string;
mapProvince: string;
mapPostalCode: string;
mapPhoneNumber: string;
mapId: string
mapName: string
mapDescription: string
mapSVG: string
mapLatitude: string
mapLongitude: string
mapAddress1: string
mapAddress2: string
mapCity: string
mapProvince: string
mapPostalCode: string
mapPhoneNumber: string
}
export function updateMap(
mapForm: UpdateMapForm,
requestSession: recordTypes.PartialSession
): boolean {
const database = sqlite(databasePath);
const database = sqlite(databasePath)
const rightNowMillis = Date.now();
const rightNowMillis = Date.now()
const result = database
.prepare(
@ -50,22 +50,22 @@ export function updateMap(
mapForm.mapName,
mapForm.mapDescription,
mapForm.mapSVG,
mapForm.mapLatitude === "" ? undefined : mapForm.mapLatitude,
mapForm.mapLongitude === "" ? undefined : mapForm.mapLongitude,
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,
requestSession.user!.userName,
rightNowMillis,
mapForm.mapId
);
)
database.close();
database.close()
return result.changes > 0;
return result.changes > 0
}
export default updateMap;
export default updateMap

4
helpers/lotOccupancyDB/updateOccupancyTypeField.d.ts vendored
View File

@ -1,8 +1,8 @@
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes';
interface UpdateOccupancyTypeFieldForm {
occupancyTypeFieldId: number | string;
occupancyTypeField: string;
isRequired: "0" | "1";
isRequired: '0' | '1';
minimumLength?: string;
maximumLength?: string;
pattern?: string;

10
helpers/lotOccupancyDB/updateOccupancyTypeField.js
View File

@ -1,6 +1,6 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { clearCacheByTableName } from "../functions.cache.js";
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
import { clearCacheByTableName } from '../functions.cache.js';
export function updateOccupancyTypeField(occupancyTypeFieldForm, requestSession) {
const database = sqlite(databasePath);
const rightNowMillis = Date.now();
@ -16,9 +16,9 @@ export function updateOccupancyTypeField(occupancyTypeFieldForm, requestSession)
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);
.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();
clearCacheByTableName("OccupancyTypeFields");
clearCacheByTableName('OccupancyTypeFields');
return result.changes > 0;
}
export default updateOccupancyTypeField;

44
helpers/lotOccupancyDB/updateOccupancyTypeField.ts
View File

@ -1,28 +1,28 @@
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 { clearCacheByTableName } from "../functions.cache.js";
import { clearCacheByTableName } from '../functions.cache.js'
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes'
interface UpdateOccupancyTypeFieldForm {
occupancyTypeFieldId: number | string;
occupancyTypeField: string;
isRequired: "0" | "1";
minimumLength?: string;
maximumLength?: string;
pattern?: string;
occupancyTypeFieldValues: string;
occupancyTypeFieldId: number | string
occupancyTypeField: string
isRequired: '0' | '1'
minimumLength?: string
maximumLength?: string
pattern?: string
occupancyTypeFieldValues: string
}
export function updateOccupancyTypeField(
occupancyTypeFieldForm: UpdateOccupancyTypeFieldForm,
requestSession: recordTypes.PartialSession
): boolean {
const database = sqlite(databasePath);
const database = sqlite(databasePath)
const rightNowMillis = Date.now();
const rightNowMillis = Date.now()
const result = database
.prepare(
@ -41,20 +41,20 @@ export function updateOccupancyTypeField(
.run(
occupancyTypeFieldForm.occupancyTypeField,
Number.parseInt(occupancyTypeFieldForm.isRequired, 10),
occupancyTypeFieldForm.minimumLength || 0,
occupancyTypeFieldForm.maximumLength || 100,
occupancyTypeFieldForm.pattern || "",
occupancyTypeFieldForm.minimumLength ?? 0,
occupancyTypeFieldForm.maximumLength ?? 100,
occupancyTypeFieldForm.pattern ?? '',
occupancyTypeFieldForm.occupancyTypeFieldValues,
requestSession.user.userName,
requestSession.user!.userName,
rightNowMillis,
occupancyTypeFieldForm.occupancyTypeFieldId
);
)
database.close();
database.close()
clearCacheByTableName("OccupancyTypeFields");
clearCacheByTableName('OccupancyTypeFields')
return result.changes > 0;
return result.changes > 0
}
export default updateOccupancyTypeField;
export default updateOccupancyTypeField

4
helpers/lotOccupancyDB/updateRecord.d.ts vendored
View File

@ -1,4 +1,4 @@
import type * as recordTypes from "../../types/recordTypes";
declare type RecordTable = "FeeCategories" | "LotStatuses" | "LotTypes" | "OccupancyTypes" | "WorkOrderMilestoneTypes" | "WorkOrderTypes";
import type * as recordTypes from '../../types/recordTypes';
declare type RecordTable = 'FeeCategories' | 'LotStatuses' | 'LotTypes' | 'OccupancyTypes' | 'WorkOrderMilestoneTypes' | 'WorkOrderTypes';
export declare function updateRecord(recordTable: RecordTable, recordId: number | string, recordName: string, requestSession: recordTypes.PartialSession): boolean;
export {};

21
helpers/lotOccupancyDB/updateRecord.js
View File

@ -1,13 +1,16 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { clearCacheByTableName } from "../functions.cache.js";
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
import { clearCacheByTableName } from '../functions.cache.js';
const recordNameIdColumns = new Map();
recordNameIdColumns.set("FeeCategories", ["feeCategory", "feeCategoryId"]);
recordNameIdColumns.set("LotStatuses", ["lotStatus", "lotStatusId"]);
recordNameIdColumns.set("LotTypes", ["lotType", "lotTypeId"]);
recordNameIdColumns.set("OccupancyTypes", ["occupancyType", "occupancyTypeId"]);
recordNameIdColumns.set("WorkOrderMilestoneTypes", ["workOrderMilestoneType", "workOrderMilestoneTypeId"]);
recordNameIdColumns.set("WorkOrderTypes", ["workOrderType", "workOrderTypeId"]);
recordNameIdColumns.set('FeeCategories', ['feeCategory', 'feeCategoryId']);
recordNameIdColumns.set('LotStatuses', ['lotStatus', 'lotStatusId']);
recordNameIdColumns.set('LotTypes', ['lotType', 'lotTypeId']);
recordNameIdColumns.set('OccupancyTypes', ['occupancyType', 'occupancyTypeId']);
recordNameIdColumns.set('WorkOrderMilestoneTypes', [
'workOrderMilestoneType',
'workOrderMilestoneTypeId'
]);
recordNameIdColumns.set('WorkOrderTypes', ['workOrderType', 'workOrderTypeId']);
export function updateRecord(recordTable, recordId, recordName, requestSession) {
const database = sqlite(databasePath);
const rightNowMillis = Date.now();

53
helpers/lotOccupancyDB/updateRecord.ts
View File

@ -1,26 +1,29 @@
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 { clearCacheByTableName } from "../functions.cache.js";
import { clearCacheByTableName } from '../functions.cache.js'
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes'
type RecordTable =
| "FeeCategories"
| "LotStatuses"
| "LotTypes"
| "OccupancyTypes"
| "WorkOrderMilestoneTypes"
| "WorkOrderTypes";
| 'FeeCategories'
| 'LotStatuses'
| 'LotTypes'
| 'OccupancyTypes'
| 'WorkOrderMilestoneTypes'
| 'WorkOrderTypes'
const recordNameIdColumns: Map<RecordTable, string[]> = new Map();
recordNameIdColumns.set("FeeCategories", ["feeCategory", "feeCategoryId"]);
recordNameIdColumns.set("LotStatuses", ["lotStatus", "lotStatusId"]);
recordNameIdColumns.set("LotTypes", ["lotType", "lotTypeId"]);
recordNameIdColumns.set("OccupancyTypes", ["occupancyType", "occupancyTypeId"]);
recordNameIdColumns.set("WorkOrderMilestoneTypes", ["workOrderMilestoneType", "workOrderMilestoneTypeId"]);
recordNameIdColumns.set("WorkOrderTypes", ["workOrderType", "workOrderTypeId"]);
const recordNameIdColumns: Map<RecordTable, string[]> = new Map()
recordNameIdColumns.set('FeeCategories', ['feeCategory', 'feeCategoryId'])
recordNameIdColumns.set('LotStatuses', ['lotStatus', 'lotStatusId'])
recordNameIdColumns.set('LotTypes', ['lotType', 'lotTypeId'])
recordNameIdColumns.set('OccupancyTypes', ['occupancyType', 'occupancyTypeId'])
recordNameIdColumns.set('WorkOrderMilestoneTypes', [
'workOrderMilestoneType',
'workOrderMilestoneTypeId'
])
recordNameIdColumns.set('WorkOrderTypes', ['workOrderType', 'workOrderTypeId'])
export function updateRecord(
recordTable: RecordTable,
@ -28,24 +31,24 @@ export function updateRecord(
recordName: string,
requestSession: recordTypes.PartialSession
): boolean {
const database = sqlite(databasePath);
const database = sqlite(databasePath)
const rightNowMillis = Date.now();
const rightNowMillis = Date.now()
const result = database
.prepare(
`update ${recordTable}
set ${recordNameIdColumns.get(recordTable)[0]} = ?,
set ${recordNameIdColumns.get(recordTable)![0]} = ?,
recordUpdate_userName = ?,
recordUpdate_timeMillis = ?
where recordDelete_timeMillis is null
and ${recordNameIdColumns.get(recordTable)[1]} = ?`
and ${recordNameIdColumns.get(recordTable)![1]} = ?`
)
.run(recordName, requestSession.user.userName, rightNowMillis, recordId);
.run(recordName, requestSession.user!.userName, rightNowMillis, recordId)
database.close();
database.close()
clearCacheByTableName(recordTable);
clearCacheByTableName(recordTable)
return result.changes > 0;
return result.changes > 0
}

2
helpers/lotOccupancyDB/updateWorkOrder.d.ts vendored
View File

@ -1,4 +1,4 @@
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes';
interface UpdateWorkOrderForm {
workOrderId: string;
workOrderNumber: string;

6
helpers/lotOccupancyDB/updateWorkOrder.js
View File

@ -1,6 +1,6 @@
import { dateStringToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { dateStringToInteger } from '@cityssm/expressjs-server-js/dateTimeFns.js';
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
export function updateWorkOrder(workOrderForm, requestSession) {
const database = sqlite(databasePath);
const rightNowMillis = Date.now();

32
helpers/lotOccupancyDB/updateWorkOrder.ts
View File

@ -1,25 +1,25 @@
import { dateStringToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import sqlite from "better-sqlite3";
import { dateStringToInteger } from '@cityssm/expressjs-server-js/dateTimeFns.js'
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'
interface UpdateWorkOrderForm {
workOrderId: string;
workOrderNumber: string;
workOrderTypeId: string;
workOrderDescription: string;
workOrderOpenDateString: string;
workOrderId: string
workOrderNumber: string
workOrderTypeId: string
workOrderDescription: string
workOrderOpenDateString: string
}
export function updateWorkOrder(
workOrderForm: UpdateWorkOrderForm,
requestSession: recordTypes.PartialSession
): boolean {
const database = sqlite(databasePath);
const database = sqlite(databasePath)
const rightNowMillis = Date.now();
const rightNowMillis = Date.now()
const result = database
.prepare(
@ -38,14 +38,14 @@ export function updateWorkOrder(
workOrderForm.workOrderTypeId,
workOrderForm.workOrderDescription,
dateStringToInteger(workOrderForm.workOrderOpenDateString),
requestSession.user.userName,
requestSession.user!.userName,
rightNowMillis,
workOrderForm.workOrderId
);
)
database.close();
database.close()
return result.changes > 0;
return result.changes > 0
}
export default updateWorkOrder;
export default updateWorkOrder

2
helpers/lotOccupancyDB/updateWorkOrderComment.d.ts vendored
View File

@ -1,4 +1,4 @@
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes';
interface UpdateWorkOrderCommentForm {
workOrderCommentId: string | number;
workOrderCommentDateString: string;

6
helpers/lotOccupancyDB/updateWorkOrderComment.js
View File

@ -1,6 +1,6 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { dateStringToInteger, timeStringToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
import { dateStringToInteger, timeStringToInteger } from '@cityssm/expressjs-server-js/dateTimeFns.js';
export function updateWorkOrderComment(commentForm, requestSession) {
const rightNowMillis = Date.now();
const database = sqlite(databasePath);

30
helpers/lotOccupancyDB/updateWorkOrderComment.ts
View File

@ -1,28 +1,28 @@
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,
timeStringToInteger
} from "@cityssm/expressjs-server-js/dateTimeFns.js";
} from '@cityssm/expressjs-server-js/dateTimeFns.js'
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes'
interface UpdateWorkOrderCommentForm {
workOrderCommentId: string | number;
workOrderCommentDateString: string;
workOrderCommentTimeString: string;
workOrderComment: string;
workOrderCommentId: string | number
workOrderCommentDateString: string
workOrderCommentTimeString: string
workOrderComment: string
}
export function updateWorkOrderComment(
commentForm: UpdateWorkOrderCommentForm,
requestSession: recordTypes.PartialSession
): boolean {
const rightNowMillis = Date.now();
const rightNowMillis = Date.now()
const database = sqlite(databasePath);
const database = sqlite(databasePath)
const result = database
.prepare(
@ -39,14 +39,14 @@ export function updateWorkOrderComment(
dateStringToInteger(commentForm.workOrderCommentDateString),
timeStringToInteger(commentForm.workOrderCommentTimeString),
commentForm.workOrderComment,
requestSession.user.userName,
requestSession.user!.userName,
rightNowMillis,
commentForm.workOrderCommentId
);
)
database.close();
database.close()
return result.changes > 0;
return result.changes > 0
}
export default updateWorkOrderComment;
export default updateWorkOrderComment

4
helpers/lotOccupancyDB/updateWorkOrderMilestone.d.ts vendored
View File

@ -1,7 +1,7 @@
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes';
interface UpdateWorkOrderMilestoneForm {
workOrderMilestoneId: string | number;
workOrderMilestoneTypeId?: number | string;
workOrderMilestoneTypeId: number | string;
workOrderMilestoneDateString: string;
workOrderMilestoneTimeString?: string;
workOrderMilestoneDescription: string;

8
helpers/lotOccupancyDB/updateWorkOrderMilestone.js
View File

@ -1,6 +1,6 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { dateStringToInteger, timeStringToInteger } from "@cityssm/expressjs-server-js/dateTimeFns.js";
import sqlite from 'better-sqlite3';
import { lotOccupancyDB as databasePath } from '../../data/databasePaths.js';
import { dateStringToInteger, timeStringToInteger } from '@cityssm/expressjs-server-js/dateTimeFns.js';
export function updateWorkOrderMilestone(milestoneForm, requestSession) {
const rightNow = new Date();
const database = sqlite(databasePath);
@ -13,7 +13,7 @@ export function updateWorkOrderMilestone(milestoneForm, requestSession) {
recordUpdate_userName = ?,
recordUpdate_timeMillis = ?
where workOrderMilestoneId = ?`)
.run(milestoneForm.workOrderMilestoneTypeId || undefined, dateStringToInteger(milestoneForm.workOrderMilestoneDateString), milestoneForm.workOrderMilestoneTimeString
.run(milestoneForm.workOrderMilestoneTypeId === '' ? undefined : milestoneForm.workOrderMilestoneTypeId, dateStringToInteger(milestoneForm.workOrderMilestoneDateString), milestoneForm.workOrderMilestoneTimeString
? timeStringToInteger(milestoneForm.workOrderMilestoneTimeString)
: 0, milestoneForm.workOrderMilestoneDescription, requestSession.user.userName, rightNow.getTime(), milestoneForm.workOrderMilestoneId);
database.close();

34
helpers/lotOccupancyDB/updateWorkOrderMilestone.ts
View File

@ -1,29 +1,29 @@
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,
timeStringToInteger
} from "@cityssm/expressjs-server-js/dateTimeFns.js";
} from '@cityssm/expressjs-server-js/dateTimeFns.js'
import type * as recordTypes from "../../types/recordTypes";
import type * as recordTypes from '../../types/recordTypes'
interface UpdateWorkOrderMilestoneForm {
workOrderMilestoneId: string | number;
workOrderMilestoneTypeId?: number | string;
workOrderMilestoneDateString: string;
workOrderMilestoneTimeString?: string;
workOrderMilestoneDescription: string;
workOrderMilestoneId: string | number
workOrderMilestoneTypeId: number | string
workOrderMilestoneDateString: string
workOrderMilestoneTimeString?: string
workOrderMilestoneDescription: string
}
export function updateWorkOrderMilestone(
milestoneForm: UpdateWorkOrderMilestoneForm,
requestSession: recordTypes.PartialSession
): boolean {
const rightNow = new Date();
const rightNow = new Date()
const database = sqlite(databasePath);
const database = sqlite(databasePath)
const result = database
.prepare(
@ -37,21 +37,21 @@ export function updateWorkOrderMilestone(
where workOrderMilestoneId = ?`
)
.run(
milestoneForm.workOrderMilestoneTypeId || undefined,
milestoneForm.workOrderMilestoneTypeId === '' ? undefined : milestoneForm.workOrderMilestoneTypeId,
dateStringToInteger(milestoneForm.workOrderMilestoneDateString),
milestoneForm.workOrderMilestoneTimeString
? timeStringToInteger(milestoneForm.workOrderMilestoneTimeString)
: 0,
milestoneForm.workOrderMilestoneDescription,
requestSession.user.userName,
requestSession.user!.userName,
rightNow.getTime(),
milestoneForm.workOrderMilestoneId
);
)
database.close();
database.close()
return result.changes > 0;
return result.changes > 0
}
export default updateWorkOrderMilestone;
export default updateWorkOrderMilestone

32
test/1_serverCypress.js
View File

@ -1,14 +1,14 @@
import * as assert from "assert";
import { portNumber } from "./_globals.js";
import { exec } from "node:child_process";
import * as http from "node:http";
import { app } from "../app.js";
describe("lot-occupancy-system", () => {
import * as assert from 'node:assert';
import { portNumber } from './_globals.js';
import { exec } from 'node:child_process';
import * as http from 'node:http';
import { app } from '../app.js';
describe('lot-occupancy-system', () => {
const httpServer = http.createServer(app);
let serverStarted = false;
before(() => {
httpServer.listen(portNumber);
httpServer.on("listening", () => {
httpServer.on('listening', () => {
serverStarted = true;
});
});
@ -19,24 +19,24 @@ describe("lot-occupancy-system", () => {
catch {
}
});
it("Ensure server starts on port " + portNumber.toString(), () => {
it('Ensure server starts on port ' + portNumber.toString(), () => {
assert.ok(serverStarted);
});
describe("Cypress tests", () => {
it("should run Cypress tests", (done) => {
let cypressCommand = "cypress run --config-file cypress.config.ts --browser chrome";
describe('Cypress tests', () => {
it('should run Cypress tests', (done) => {
let cypressCommand = 'cypress run --config-file cypress.config.ts --browser chrome';
if (process.env.CYPRESS_RECORD_KEY &&
process.env.CYPRESS_RECORD_KEY !== "") {
cypressCommand += " --record";
process.env.CYPRESS_RECORD_KEY !== '') {
cypressCommand += ' --record';
}
const childProcess = exec(cypressCommand);
childProcess.stdout.on("data", (data) => {
childProcess.stdout.on('data', (data) => {
console.log(data);
});
childProcess.stderr.on("data", (data) => {
childProcess.stderr.on('data', (data) => {
console.error(data);
});
childProcess.on("exit", (code) => {
childProcess.on('exit', (code) => {
assert.ok(code === 0);
done();
});

74
test/1_serverCypress.ts
View File

@ -1,65 +1,65 @@
/* eslint-disable unicorn/filename-case */
import * as assert from "assert";
import * as assert from 'node:assert'
import { portNumber } from "./_globals.js";
import { portNumber } from './_globals.js'
import { exec } from "node:child_process";
import { exec } from 'node:child_process'
import * as http from "node:http";
import { app } from "../app.js";
import * as http from 'node:http'
import { app } from '../app.js'
describe("lot-occupancy-system", () => {
const httpServer = http.createServer(app);
describe('lot-occupancy-system', () => {
const httpServer = http.createServer(app)
let serverStarted = false;
let serverStarted = false
before(() => {
httpServer.listen(portNumber);
httpServer.listen(portNumber)
httpServer.on("listening", () => {
serverStarted = true;
});
});
httpServer.on('listening', () => {
serverStarted = true
})
})
after(() => {
try {
httpServer.close();
httpServer.close()
} catch {
// ignore
}
});
})
it("Ensure server starts on port " + portNumber.toString(), () => {
assert.ok(serverStarted);
});
it('Ensure server starts on port ' + portNumber.toString(), () => {
assert.ok(serverStarted)
})
describe("Cypress tests", () => {
it("should run Cypress tests", (done) => {
describe('Cypress tests', () => {
it('should run Cypress tests', (done) => {
let cypressCommand =
"cypress run --config-file cypress.config.ts --browser chrome";
'cypress run --config-file cypress.config.ts --browser chrome'
if (
process.env.CYPRESS_RECORD_KEY &&
process.env.CYPRESS_RECORD_KEY !== ""
process.env.CYPRESS_RECORD_KEY !== ''
) {
cypressCommand += " --record";
cypressCommand += ' --record'
}
const childProcess = exec(cypressCommand);
const childProcess = exec(cypressCommand)
childProcess.stdout.on("data", (data) => {
console.log(data);
});
childProcess.stdout.on('data', (data) => {
console.log(data)
})
childProcess.stderr.on("data", (data) => {
console.error(data);
});
childProcess.stderr.on('data', (data) => {
console.error(data)
})
childProcess.on("exit", (code) => {
assert.ok(code === 0);
done();
});
}).timeout(30 * 60 * 60 * 1000);
});
});
childProcess.on('exit', (code) => {
assert.ok(code === 0)
done()
})
}).timeout(30 * 60 * 60 * 1000)
})
})

158
test/functions.js
View File

@ -1,102 +1,102 @@
import * as assert from "assert";
import fs from "node:fs";
import * as userFunctions from "../helpers/functions.user.js";
import * as sqlFilterFunctions from "../helpers/functions.sqlFilters.js";
describe("functions.user", () => {
describe("unauthenticated, no user in session", () => {
import * as assert from 'node:assert';
import fs from 'node:fs';
import * as userFunctions from '../helpers/functions.user.js';
import * as sqlFilterFunctions from '../helpers/functions.sqlFilters.js';
describe('functions.user', () => {
describe('unauthenticated, no user in session', () => {
const noUserRequest = {
session: {}
};
it("can not update", () => {
it('can not update', () => {
assert.strictEqual(userFunctions.userCanUpdate(noUserRequest), false);
});
it("is not admin", () => {
it('is not admin', () => {
assert.strictEqual(userFunctions.userIsAdmin(noUserRequest), false);
});
});
describe("read only user, no update, no admin", () => {
describe('read only user, no update, no admin', () => {
const readOnlyRequest = {
session: {
user: {
userName: "*test",
userName: '*test',
userProperties: {
canUpdate: false,
isAdmin: false,
apiKey: ""
apiKey: ''
}
}
}
};
it("can not update", () => {
it('can not update', () => {
assert.strictEqual(userFunctions.userCanUpdate(readOnlyRequest), false);
});
it("is not admin", () => {
it('is not admin', () => {
assert.strictEqual(userFunctions.userIsAdmin(readOnlyRequest), false);
});
});
describe("update only user, no admin", () => {
describe('update only user, no admin', () => {
const updateOnlyRequest = {
session: {
user: {
userName: "*test",
userName: '*test',
userProperties: {
canUpdate: true,
isAdmin: false,
apiKey: ""
apiKey: ''
}
}
}
};
it("can update", () => {
it('can update', () => {
assert.strictEqual(userFunctions.userCanUpdate(updateOnlyRequest), true);
});
it("is not admin", () => {
it('is not admin', () => {
assert.strictEqual(userFunctions.userIsAdmin(updateOnlyRequest), false);
});
});
describe("admin only user, no update", () => {
describe('admin only user, no update', () => {
const adminOnlyRequest = {
session: {
user: {
userName: "*test",
userName: '*test',
userProperties: {
canUpdate: false,
isAdmin: true,
apiKey: ""
apiKey: ''
}
}
}
};
it("can not update", () => {
it('can not update', () => {
assert.strictEqual(userFunctions.userCanUpdate(adminOnlyRequest), false);
});
it("is admin", () => {
it('is admin', () => {
assert.strictEqual(userFunctions.userIsAdmin(adminOnlyRequest), true);
});
});
describe("update admin user", () => {
describe('update admin user', () => {
const updateAdminRequest = {
session: {
user: {
userName: "*test",
userName: '*test',
userProperties: {
canUpdate: true,
isAdmin: true,
apiKey: ""
apiKey: ''
}
}
}
};
it("can update", () => {
it('can update', () => {
assert.strictEqual(userFunctions.userCanUpdate(updateAdminRequest), true);
});
it("is admin", () => {
it('is admin', () => {
assert.strictEqual(userFunctions.userIsAdmin(updateAdminRequest), true);
});
});
describe("API key check", () => {
it("authenticates with a valid API key", async () => {
const apiKeysJSON = JSON.parse(fs.readFileSync("data/apiKeys.json", "utf8"));
describe('API key check', () => {
it('authenticates with a valid API key', async () => {
const apiKeysJSON = JSON.parse(fs.readFileSync('data/apiKeys.json', 'utf8'));
const apiKey = Object.values(apiKeysJSON)[0];
const apiRequest = {
params: {
@ -105,15 +105,15 @@ describe("functions.user", () => {
};
assert.strictEqual(await userFunctions.apiKeyIsValid(apiRequest), true);
});
it("fails to authenticate with an invalid API key", async () => {
it('fails to authenticate with an invalid API key', async () => {
const apiRequest = {
params: {
apiKey: "badKey"
apiKey: 'badKey'
}
};
assert.strictEqual(await userFunctions.apiKeyIsValid(apiRequest), false);
});
it("fails to authenticate with no API key", async () => {
it('fails to authenticate with no API key', async () => {
const apiRequest = {
params: {}
};
@ -121,75 +121,75 @@ describe("functions.user", () => {
});
});
});
describe("functions.sqlFilters", () => {
describe("LotName filter", () => {
it("returns startsWith filter", () => {
const filter = sqlFilterFunctions.getLotNameWhereClause("TEST1 TEST2", "startsWith", "l");
describe('functions.sqlFilters', () => {
describe('LotName filter', () => {
it('returns startsWith filter', () => {
const filter = sqlFilterFunctions.getLotNameWhereClause('TEST1 TEST2', 'startsWith', 'l');
assert.strictEqual(filter.sqlWhereClause, " and l.lotName like ? || '%'");
assert.strictEqual(filter.sqlParameters.length, 1);
assert.ok(filter.sqlParameters.includes("TEST1 TEST2"));
assert.ok(filter.sqlParameters.includes('TEST1 TEST2'));
});
it("returns endsWith filter", () => {
const filter = sqlFilterFunctions.getLotNameWhereClause("TEST1 TEST2", "endsWith", "l");
it('returns endsWith filter', () => {
const filter = sqlFilterFunctions.getLotNameWhereClause('TEST1 TEST2', 'endsWith', 'l');
assert.strictEqual(filter.sqlWhereClause, " and l.lotName like '%' || ?");
assert.strictEqual(filter.sqlParameters.length, 1);
assert.strictEqual(filter.sqlParameters[0], "TEST1 TEST2");
assert.strictEqual(filter.sqlParameters[0], 'TEST1 TEST2');
});
it("returns contains filter", () => {
const filter = sqlFilterFunctions.getLotNameWhereClause("TEST1 TEST2", "", "l");
assert.strictEqual(filter.sqlWhereClause, " and instr(lower(l.lotName), ?) and instr(lower(l.lotName), ?)");
assert.ok(filter.sqlParameters.includes("test1"));
assert.ok(filter.sqlParameters.includes("test2"));
it('returns contains filter', () => {
const filter = sqlFilterFunctions.getLotNameWhereClause('TEST1 TEST2', '', 'l');
assert.strictEqual(filter.sqlWhereClause, ' and instr(lower(l.lotName), ?) and instr(lower(l.lotName), ?)');
assert.ok(filter.sqlParameters.includes('test1'));
assert.ok(filter.sqlParameters.includes('test2'));
});
it("handles empty filter", () => {
const filter = sqlFilterFunctions.getLotNameWhereClause("", "");
assert.strictEqual(filter.sqlWhereClause, "");
it('handles empty filter', () => {
const filter = sqlFilterFunctions.getLotNameWhereClause('', '');
assert.strictEqual(filter.sqlWhereClause, '');
assert.strictEqual(filter.sqlParameters.length, 0);
});
it("handles undefined filter", () => {
const filter = sqlFilterFunctions.getLotNameWhereClause(undefined, undefined, "l");
assert.strictEqual(filter.sqlWhereClause, "");
it('handles undefined filter', () => {
const filter = sqlFilterFunctions.getLotNameWhereClause(undefined, undefined, 'l');
assert.strictEqual(filter.sqlWhereClause, '');
assert.strictEqual(filter.sqlParameters.length, 0);
});
});
describe("OccupancyTime filter", () => {
it("creates three different filters", () => {
const currentFilter = sqlFilterFunctions.getOccupancyTimeWhereClause("current");
assert.notStrictEqual(currentFilter.sqlWhereClause, "");
const pastFilter = sqlFilterFunctions.getOccupancyTimeWhereClause("past");
assert.notStrictEqual(pastFilter.sqlWhereClause, "");
const futureFilter = sqlFilterFunctions.getOccupancyTimeWhereClause("future");
assert.notStrictEqual(futureFilter, "");
describe('OccupancyTime filter', () => {
it('creates three different filters', () => {
const currentFilter = sqlFilterFunctions.getOccupancyTimeWhereClause('current');
assert.notStrictEqual(currentFilter.sqlWhereClause, '');
const pastFilter = sqlFilterFunctions.getOccupancyTimeWhereClause('past');
assert.notStrictEqual(pastFilter.sqlWhereClause, '');
const futureFilter = sqlFilterFunctions.getOccupancyTimeWhereClause('future');
assert.notStrictEqual(futureFilter, '');
assert.notStrictEqual(currentFilter.sqlWhereClause, pastFilter.sqlWhereClause);
assert.notStrictEqual(currentFilter.sqlWhereClause, futureFilter.sqlWhereClause);
assert.notStrictEqual(pastFilter.sqlWhereClause, futureFilter.sqlWhereClause);
});
it("handles empty filter", () => {
const filter = sqlFilterFunctions.getOccupancyTimeWhereClause("");
assert.strictEqual(filter.sqlWhereClause, "");
it('handles empty filter', () => {
const filter = sqlFilterFunctions.getOccupancyTimeWhereClause('');
assert.strictEqual(filter.sqlWhereClause, '');
assert.strictEqual(filter.sqlParameters.length, 0);
});
it("handles undefined filter", () => {
const filter = sqlFilterFunctions.getOccupancyTimeWhereClause(undefined, "o");
assert.strictEqual(filter.sqlWhereClause, "");
it('handles undefined filter', () => {
const filter = sqlFilterFunctions.getOccupancyTimeWhereClause(undefined, 'o');
assert.strictEqual(filter.sqlWhereClause, '');
assert.strictEqual(filter.sqlParameters.length, 0);
});
});
describe("OccupantName filter", () => {
it("returns filter", () => {
const filter = sqlFilterFunctions.getOccupantNameWhereClause("TEST1 TEST2", "o");
assert.strictEqual(filter.sqlWhereClause, " and instr(lower(o.occupantName), ?) and instr(lower(o.occupantName), ?)");
assert.ok(filter.sqlParameters.includes("test1"));
assert.ok(filter.sqlParameters.includes("test2"));
describe('OccupantName filter', () => {
it('returns filter', () => {
const filter = sqlFilterFunctions.getOccupantNameWhereClause('TEST1 TEST2', 'o');
assert.strictEqual(filter.sqlWhereClause, ' and instr(lower(o.occupantName), ?) and instr(lower(o.occupantName), ?)');
assert.ok(filter.sqlParameters.includes('test1'));
assert.ok(filter.sqlParameters.includes('test2'));
});
it("handles empty filter", () => {
const filter = sqlFilterFunctions.getOccupantNameWhereClause("");
assert.strictEqual(filter.sqlWhereClause, "");
it('handles empty filter', () => {
const filter = sqlFilterFunctions.getOccupantNameWhereClause('');
assert.strictEqual(filter.sqlWhereClause, '');
assert.strictEqual(filter.sqlParameters.length, 0);
});
it("handles undefined filter", () => {
const filter = sqlFilterFunctions.getOccupantNameWhereClause(undefined, "o");
assert.strictEqual(filter.sqlWhereClause, "");
it('handles undefined filter', () => {
const filter = sqlFilterFunctions.getOccupantNameWhereClause(undefined, 'o');
assert.strictEqual(filter.sqlWhereClause, '');
assert.strictEqual(filter.sqlParameters.length, 0);
});
});

344
test/functions.ts
View File

@ -1,256 +1,288 @@
import * as assert from "assert";
import * as assert from 'node:assert'
import fs from "node:fs";
import fs from 'node:fs'
import * as userFunctions from "../helpers/functions.user.js";
import * as sqlFilterFunctions from "../helpers/functions.sqlFilters.js";
import * as userFunctions from '../helpers/functions.user.js'
import * as sqlFilterFunctions from '../helpers/functions.sqlFilters.js'
describe("functions.user", () => {
describe("unauthenticated, no user in session", () => {
describe('functions.user', () => {
describe('unauthenticated, no user in session', () => {
const noUserRequest = {
session: {}
};
}
it("can not update", () => {
assert.strictEqual(userFunctions.userCanUpdate(noUserRequest), false);
});
it('can not update', () => {
assert.strictEqual(userFunctions.userCanUpdate(noUserRequest), false)
})
it("is not admin", () => {
assert.strictEqual(userFunctions.userIsAdmin(noUserRequest), false);
});
});
it('is not admin', () => {
assert.strictEqual(userFunctions.userIsAdmin(noUserRequest), false)
})
})
describe("read only user, no update, no admin", () => {
describe('read only user, no update, no admin', () => {
const readOnlyRequest: userFunctions.UserRequest = {
session: {
user: {
userName: "*test",
userName: '*test',
userProperties: {
canUpdate: false,
isAdmin: false,
apiKey: ""
apiKey: ''
}
}
}
}
};
it("can not update", () => {
assert.strictEqual(userFunctions.userCanUpdate(readOnlyRequest), false);
});
it('can not update', () => {
assert.strictEqual(userFunctions.userCanUpdate(readOnlyRequest), false)
})
it("is not admin", () => {
assert.strictEqual(userFunctions.userIsAdmin(readOnlyRequest), false);
});
});
it('is not admin', () => {
assert.strictEqual(userFunctions.userIsAdmin(readOnlyRequest), false)
})
})
describe("update only user, no admin", () => {
describe('update only user, no admin', () => {
const updateOnlyRequest: userFunctions.UserRequest = {
session: {
user: {
userName: "*test",
userName: '*test',
userProperties: {
canUpdate: true,
isAdmin: false,
apiKey: ""
apiKey: ''
}
}
}
}
};
it("can update", () => {
assert.strictEqual(userFunctions.userCanUpdate(updateOnlyRequest), true);
});
it('can update', () => {
assert.strictEqual(userFunctions.userCanUpdate(updateOnlyRequest), true)
})
it("is not admin", () => {
assert.strictEqual(userFunctions.userIsAdmin(updateOnlyRequest), false);
});
});
it('is not admin', () => {
assert.strictEqual(userFunctions.userIsAdmin(updateOnlyRequest), false)
})
})
describe("admin only user, no update", () => {
describe('admin only user, no update', () => {
const adminOnlyRequest: userFunctions.UserRequest = {
session: {
user: {
userName: "*test",
userName: '*test',
userProperties: {
canUpdate: false,
isAdmin: true,
apiKey: ""
apiKey: ''
}
}
}
}
};
it("can not update", () => {
assert.strictEqual(userFunctions.userCanUpdate(adminOnlyRequest), false);
});
it('can not update', () => {
assert.strictEqual(userFunctions.userCanUpdate(adminOnlyRequest), false)
})
it("is admin", () => {
assert.strictEqual(userFunctions.userIsAdmin(adminOnlyRequest), true);
});
});
it('is admin', () => {
assert.strictEqual(userFunctions.userIsAdmin(adminOnlyRequest), true)
})
})
describe("update admin user", () => {
describe('update admin user', () => {
const updateAdminRequest: userFunctions.UserRequest = {
session: {
user: {
userName: "*test",
userName: '*test',
userProperties: {
canUpdate: true,
isAdmin: true,
apiKey: ""
apiKey: ''
}
}
}
}
};
it("can update", () => {
assert.strictEqual(userFunctions.userCanUpdate(updateAdminRequest), true);
});
it('can update', () => {
assert.strictEqual(userFunctions.userCanUpdate(updateAdminRequest), true)
})
it("is admin", () => {
assert.strictEqual(userFunctions.userIsAdmin(updateAdminRequest), true);
});
});
it('is admin', () => {
assert.strictEqual(userFunctions.userIsAdmin(updateAdminRequest), true)
})
})
describe("API key check", () => {
it("authenticates with a valid API key", async () => {
const apiKeysJSON: { [userName: string]: string } = JSON.parse(
fs.readFileSync("data/apiKeys.json", "utf8")
);
describe('API key check', () => {
it('authenticates with a valid API key', async () => {
const apiKeysJSON: Record<string, string> = JSON.parse(
fs.readFileSync('data/apiKeys.json', 'utf8')
)
const apiKey = Object.values(apiKeysJSON)[0];
const apiKey = Object.values(apiKeysJSON)[0]
const apiRequest: userFunctions.APIRequest = {
params: {
apiKey
}
};
}
assert.strictEqual(await userFunctions.apiKeyIsValid(apiRequest), true);
});
assert.strictEqual(await userFunctions.apiKeyIsValid(apiRequest), true)
})
it("fails to authenticate with an invalid API key", async () => {
it('fails to authenticate with an invalid API key', async () => {
const apiRequest: userFunctions.APIRequest = {
params: {
apiKey: "badKey"
apiKey: 'badKey'
}
}
};
assert.strictEqual(await userFunctions.apiKeyIsValid(apiRequest), false);
});
assert.strictEqual(await userFunctions.apiKeyIsValid(apiRequest), false)
})
it("fails to authenticate with no API key", async () => {
it('fails to authenticate with no API key', async () => {
const apiRequest: userFunctions.APIRequest = {
params: {}
};
}
assert.strictEqual(await userFunctions.apiKeyIsValid(apiRequest), false);
});
});
});
assert.strictEqual(await userFunctions.apiKeyIsValid(apiRequest), false)
})
})
})
describe("functions.sqlFilters", () => {
describe("LotName filter", () => {
it("returns startsWith filter", () => {
describe('functions.sqlFilters', () => {
describe('LotName filter', () => {
it('returns startsWith filter', () => {
const filter = sqlFilterFunctions.getLotNameWhereClause(
"TEST1 TEST2",
"startsWith",
"l"
);
'TEST1 TEST2',
'startsWith',
'l'
)
assert.strictEqual(filter.sqlWhereClause, " and l.lotName like ? || '%'");
assert.strictEqual(filter.sqlParameters.length, 1);
assert.ok(filter.sqlParameters.includes("TEST1 TEST2"));
});
assert.strictEqual(filter.sqlWhereClause, " and l.lotName like ? || '%'")
assert.strictEqual(filter.sqlParameters.length, 1)
assert.ok(filter.sqlParameters.includes('TEST1 TEST2'))
})
it("returns endsWith filter", () => {
const filter = sqlFilterFunctions.getLotNameWhereClause("TEST1 TEST2", "endsWith", "l");
it('returns endsWith filter', () => {
const filter = sqlFilterFunctions.getLotNameWhereClause(
'TEST1 TEST2',
'endsWith',
'l'
)
assert.strictEqual(filter.sqlWhereClause, " and l.lotName like '%' || ?");
assert.strictEqual(filter.sqlParameters.length, 1);
assert.strictEqual(filter.sqlParameters[0], "TEST1 TEST2");
});
assert.strictEqual(filter.sqlWhereClause, " and l.lotName like '%' || ?")
assert.strictEqual(filter.sqlParameters.length, 1)
assert.strictEqual(filter.sqlParameters[0], 'TEST1 TEST2')
})
it("returns contains filter", () => {
const filter = sqlFilterFunctions.getLotNameWhereClause("TEST1 TEST2", "", "l");
it('returns contains filter', () => {
const filter = sqlFilterFunctions.getLotNameWhereClause(
'TEST1 TEST2',
'',
'l'
)
assert.strictEqual(
filter.sqlWhereClause,
" and instr(lower(l.lotName), ?) and instr(lower(l.lotName), ?)"
);
' and instr(lower(l.lotName), ?) and instr(lower(l.lotName), ?)'
)
assert.ok(filter.sqlParameters.includes("test1"));
assert.ok(filter.sqlParameters.includes("test2"));
});
assert.ok(filter.sqlParameters.includes('test1'))
assert.ok(filter.sqlParameters.includes('test2'))
})
it("handles empty filter", () => {
const filter = sqlFilterFunctions.getLotNameWhereClause("", "");
it('handles empty filter', () => {
const filter = sqlFilterFunctions.getLotNameWhereClause('', '')
assert.strictEqual(filter.sqlWhereClause, "");
assert.strictEqual(filter.sqlParameters.length, 0);
});
assert.strictEqual(filter.sqlWhereClause, '')
assert.strictEqual(filter.sqlParameters.length, 0)
})
it("handles undefined filter", () => {
const filter = sqlFilterFunctions.getLotNameWhereClause(undefined, undefined, "l");
it('handles undefined filter', () => {
const filter = sqlFilterFunctions.getLotNameWhereClause(
undefined,
undefined,
'l'
)
assert.strictEqual(filter.sqlWhereClause, "");
assert.strictEqual(filter.sqlParameters.length, 0);
});
});
assert.strictEqual(filter.sqlWhereClause, '')
assert.strictEqual(filter.sqlParameters.length, 0)
})
})
describe("OccupancyTime filter", () => {
it("creates three different filters", () => {
const currentFilter = sqlFilterFunctions.getOccupancyTimeWhereClause("current");
assert.notStrictEqual(currentFilter.sqlWhereClause, "");
describe('OccupancyTime filter', () => {
it('creates three different filters', () => {
const currentFilter =
sqlFilterFunctions.getOccupancyTimeWhereClause('current')
assert.notStrictEqual(currentFilter.sqlWhereClause, '')
const pastFilter = sqlFilterFunctions.getOccupancyTimeWhereClause("past");
assert.notStrictEqual(pastFilter.sqlWhereClause, "");
const pastFilter = sqlFilterFunctions.getOccupancyTimeWhereClause('past')
assert.notStrictEqual(pastFilter.sqlWhereClause, '')
const futureFilter = sqlFilterFunctions.getOccupancyTimeWhereClause("future");
assert.notStrictEqual(futureFilter, "");
const futureFilter =
sqlFilterFunctions.getOccupancyTimeWhereClause('future')
assert.notStrictEqual(futureFilter, '')
assert.notStrictEqual(currentFilter.sqlWhereClause, pastFilter.sqlWhereClause);
assert.notStrictEqual(currentFilter.sqlWhereClause, futureFilter.sqlWhereClause);
assert.notStrictEqual(pastFilter.sqlWhereClause, futureFilter.sqlWhereClause);
});
assert.notStrictEqual(
currentFilter.sqlWhereClause,
pastFilter.sqlWhereClause
)
assert.notStrictEqual(
currentFilter.sqlWhereClause,
futureFilter.sqlWhereClause
)
assert.notStrictEqual(
pastFilter.sqlWhereClause,
futureFilter.sqlWhereClause
)
})
it("handles empty filter", () => {
const filter = sqlFilterFunctions.getOccupancyTimeWhereClause("");
assert.strictEqual(filter.sqlWhereClause, "");
assert.strictEqual(filter.sqlParameters.length, 0);
});
it('handles empty filter', () => {
const filter = sqlFilterFunctions.getOccupancyTimeWhereClause('')
assert.strictEqual(filter.sqlWhereClause, '')
assert.strictEqual(filter.sqlParameters.length, 0)
})
it("handles undefined filter", () => {
const filter = sqlFilterFunctions.getOccupancyTimeWhereClause(undefined, "o");
assert.strictEqual(filter.sqlWhereClause, "");
assert.strictEqual(filter.sqlParameters.length, 0);
});
});
it('handles undefined filter', () => {
const filter = sqlFilterFunctions.getOccupancyTimeWhereClause(
undefined,
'o'
)
assert.strictEqual(filter.sqlWhereClause, '')
assert.strictEqual(filter.sqlParameters.length, 0)
})
})
describe("OccupantName filter", () => {
it("returns filter", () => {
const filter = sqlFilterFunctions.getOccupantNameWhereClause("TEST1 TEST2", "o");
describe('OccupantName filter', () => {
it('returns filter', () => {
const filter = sqlFilterFunctions.getOccupantNameWhereClause(
'TEST1 TEST2',
'o'
)
assert.strictEqual(
filter.sqlWhereClause,
" and instr(lower(o.occupantName), ?) and instr(lower(o.occupantName), ?)"
);
' and instr(lower(o.occupantName), ?) and instr(lower(o.occupantName), ?)'
)
assert.ok(filter.sqlParameters.includes("test1"));
assert.ok(filter.sqlParameters.includes("test2"));
});
assert.ok(filter.sqlParameters.includes('test1'))
assert.ok(filter.sqlParameters.includes('test2'))
})
it("handles empty filter", () => {
const filter = sqlFilterFunctions.getOccupantNameWhereClause("");
it('handles empty filter', () => {
const filter = sqlFilterFunctions.getOccupantNameWhereClause('')
assert.strictEqual(filter.sqlWhereClause, "");
assert.strictEqual(filter.sqlParameters.length, 0);
});
assert.strictEqual(filter.sqlWhereClause, '')
assert.strictEqual(filter.sqlParameters.length, 0)
})
it("handles undefined filter", () => {
const filter = sqlFilterFunctions.getOccupantNameWhereClause(undefined, "o");
it('handles undefined filter', () => {
const filter = sqlFilterFunctions.getOccupantNameWhereClause(
undefined,
'o'
)
assert.strictEqual(filter.sqlWhereClause, "");
assert.strictEqual(filter.sqlParameters.length, 0);
});
});
});
assert.strictEqual(filter.sqlWhereClause, '')
assert.strictEqual(filter.sqlParameters.length, 0)
})
})
})