deepsource-autofix-76c6eb20
Dan Gowans 2024-06-24 14:53:20 -04:00
parent 7268922f9b
commit 71e2d0d9e8
10 changed files with 39 additions and 21 deletions

View File

@ -1,10 +1,9 @@
export function filterOccupantsByLotOccupantType(lotOccupancy, lotOccupantType) {
const lotOccupantTypeLowerCase = lotOccupantType.toLowerCase();
const occupants = (lotOccupancy.lotOccupancyOccupants ?? []).filter((possibleOccupant) => {
return (lotOccupancy.lotOccupancyOccupants ?? []).filter((possibleOccupant) => {
return (possibleOccupant.lotOccupantType.toLowerCase() ===
lotOccupantTypeLowerCase);
});
return occupants;
}
export function getFieldValueByOccupancyTypeField(lotOccupancy, occupancyTypeField) {
const occupancyTypeFieldLowerCase = occupancyTypeField.toLowerCase();
@ -19,7 +18,7 @@ export function getFieldValueByOccupancyTypeField(lotOccupancy, occupancyTypeFie
}
export function getFeesByFeeCategory(lotOccupancy, feeCategory, feeCategoryContains = false) {
const feeCategoryLowerCase = feeCategory.toLowerCase();
const fees = (lotOccupancy.lotOccupancyFees ?? []).filter((possibleFee) => {
return (lotOccupancy.lotOccupancyFees ?? []).filter((possibleFee) => {
return feeCategoryContains
? possibleFee.feeCategory
.toLowerCase()
@ -27,7 +26,6 @@ export function getFeesByFeeCategory(lotOccupancy, feeCategory, feeCategoryConta
: possibleFee.feeCategory.toLowerCase() ===
feeCategoryLowerCase;
});
return fees;
}
export function getTransactionTotal(lotOccupancy) {
let transactionTotal = 0;

View File

@ -6,7 +6,7 @@ export function filterOccupantsByLotOccupantType(
): recordTypes.LotOccupancyOccupant[] {
const lotOccupantTypeLowerCase = lotOccupantType.toLowerCase()
const occupants = (lotOccupancy.lotOccupancyOccupants ?? []).filter(
return (lotOccupancy.lotOccupancyOccupants ?? []).filter(
(possibleOccupant) => {
return (
(possibleOccupant.lotOccupantType as string).toLowerCase() ===
@ -14,8 +14,6 @@ export function filterOccupantsByLotOccupantType(
)
}
)
return occupants
}
export function getFieldValueByOccupancyTypeField(
@ -47,7 +45,7 @@ export function getFeesByFeeCategory(
): recordTypes.LotOccupancyFee[] {
const feeCategoryLowerCase = feeCategory.toLowerCase()
const fees = (lotOccupancy.lotOccupancyFees ?? []).filter((possibleFee) => {
return (lotOccupancy.lotOccupancyFees ?? []).filter((possibleFee) => {
return feeCategoryContains
? (possibleFee.feeCategory as string)
.toLowerCase()
@ -55,8 +53,6 @@ export function getFeesByFeeCategory(
: (possibleFee.feeCategory as string).toLowerCase() ===
feeCategoryLowerCase
})
return fees
}
export function getTransactionTotal(

View File

@ -13,27 +13,40 @@ const recordColumns = `recordCreate_userName varchar(30) not null,
recordDelete_timeMillis integer`
const createStatements = [
// Lot Types
/*
* Lot Types
*/
`create table if not exists LotTypes (lotTypeId integer not null primary key autoincrement, lotType varchar(100) not null, orderNumber smallint not null default 0, ${recordColumns})`,
'create index if not exists idx_lottypes_ordernumber on LotTypes (orderNumber, lotType)',
`create table if not exists LotTypeFields (lotTypeFieldId integer not null primary key autoincrement, lotTypeId integer not null, lotTypeField varchar(100) not null, lotTypeFieldValues text, isRequired bit not null default 0, pattern varchar(100), minimumLength smallint not null default 1 check (minimumLength >= 0), maximumLength smallint not null default 100 check (maximumLength >= 0), orderNumber smallint not null default 0, ${recordColumns}, foreign key (lotTypeId) references LotTypes (lotTypeId))`,
'create index if not exists idx_lottypefields_ordernumber on LotTypeFields (lotTypeId, orderNumber, lotTypeField)',
// Lot Statuses
/*
* Lot Statuses
*/
`create table if not exists LotStatuses (lotStatusId integer not null primary key autoincrement, lotStatus varchar(100) not null, orderNumber smallint not null default 0, ${recordColumns})`,
'create index if not exists idx_lotstatuses_ordernumber on LotStatuses (orderNumber, lotStatus)',
// Maps and Lots
/*
* Maps and Lots
*/
`create table if not exists Maps (mapId integer not null primary key autoincrement, mapName varchar(200) not null, mapDescription text, mapLatitude decimal(10, 8) check (mapLatitude between -90 and 90), mapLongitude decimal(11, 8) check (mapLongitude between -180 and 180), mapSVG varchar(50), mapAddress1 varchar(50), mapAddress2 varchar(50), mapCity varchar(20), mapProvince varchar(2), mapPostalCode varchar(7), mapPhoneNumber varchar(30), ${recordColumns})`,
`create table if not exists Lots (lotId integer not null primary key autoincrement, lotTypeId integer not null, lotName varchar(100), mapId integer, mapKey varchar(100), lotLatitude decimal(10, 8) check (lotLatitude between -90 and 90), lotLongitude decimal(11, 8) check (lotLongitude between -180 and 180), lotStatusId integer, ${recordColumns}, foreign key (lotTypeId) references LotTypes (lotTypeId), foreign key (mapId) references Maps (mapId), foreign key (lotStatusId) references LotStatuses (lotStatusId))`,
`create table if not exists LotFields (lotId integer not null, lotTypeFieldId integer not null, lotFieldValue text not null, ${recordColumns}, primary key (lotId, lotTypeFieldId), foreign key (lotId) references Lots (lotId), foreign key (lotTypeFieldId) references LotTypeFields (lotTypeFieldId)) without rowid`,
`create table if not exists LotComments (lotCommentId integer not null primary key autoincrement, lotId integer not null, lotCommentDate integer not null check (lotCommentDate > 0), lotCommentTime integer not null check (lotCommentTime >= 0), lotComment text not null, ${recordColumns}, foreign key (lotId) references Lots (lotId))`,
'create index if not exists idx_lotcomments_datetime on LotComments (lotId, lotCommentDate, lotCommentTime)',
// Occupancies
/*
* Occupancies
*/
`create table if not exists OccupancyTypes (occupancyTypeId integer not null primary key autoincrement, occupancyType varchar(100) not null, orderNumber smallint not null default 0, ${recordColumns})`,
'create index if not exists idx_occupancytypes_ordernumber on OccupancyTypes (orderNumber, occupancyType)',
`create table if not exists OccupancyTypeFields (occupancyTypeFieldId integer not null primary key autoincrement, occupancyTypeId integer, occupancyTypeField varchar(100) not null, occupancyTypeFieldValues text, isRequired bit not null default 0, pattern varchar(100), minimumLength smallint not null default 1 check (minimumLength >= 0), maximumLength smallint not null default 100 check (maximumLength >= 0), orderNumber smallint not null default 0, ${recordColumns}, foreign key (occupancyTypeId) references OccupancyTypes (occupancyTypeId))`,
// eslint-disable-next-line no-secrets/no-secrets
'create index if not exists idx_occupancytypefields_ordernumber on OccupancyTypeFields (occupancyTypeId, orderNumber, occupancyTypeField)',
`create table if not exists OccupancyTypePrints (occupancyTypeId integer not null, printEJS varchar(100) not null, orderNumber smallint not null default 0, ${recordColumns}, primary key (occupancyTypeId, printEJS), foreign key (occupancyTypeId) references OccupancyTypes (occupancyTypeId))`,
'create index if not exists idx_occupancytypeprints_ordernumber on OccupancyTypePrints (occupancyTypeId, orderNumber, printEJS)',
@ -44,6 +57,7 @@ const createStatements = [
occupantCommentTitle varchar(50) not null default '',
orderNumber smallint not null default 0,
${recordColumns})`,
// eslint-disable-next-line no-secrets/no-secrets
'create index if not exists idx_lotoccupanttypes_ordernumber on LotOccupantTypes (orderNumber, lotOccupantType)',
`create table if not exists LotOccupancies (lotOccupancyId integer not null primary key autoincrement, occupancyTypeId integer not null, lotId integer, occupancyStartDate integer not null check (occupancyStartDate > 0), occupancyEndDate integer check (occupancyEndDate > 0), ${recordColumns}, foreign key (lotId) references Lots (lotId), foreign key (occupancyTypeId) references OccupancyTypes (occupancyTypeId))`,
`create table if not exists LotOccupancyOccupants (lotOccupancyId integer not null, lotOccupantIndex integer not null, occupantName varchar(200) not null, occupantAddress1 varchar(50), occupantAddress2 varchar(50), occupantCity varchar(20), occupantProvince varchar(2), occupantPostalCode varchar(7), occupantPhoneNumber varchar(30), occupantEmailAddress varchar(200), lotOccupantTypeId integer not null, occupantComment text not null default '', ${recordColumns}, primary key (lotOccupancyId, lotOccupantIndex), foreign key (lotOccupancyId) references LotOccupancies (lotOccupancyId), foreign key (lotOccupantTypeId) references LotOccupantTypes (lotOccupantTypeId)) without rowid`,
@ -51,7 +65,10 @@ const createStatements = [
`create table if not exists LotOccupancyComments (lotOccupancyCommentId integer not null primary key autoincrement, lotOccupancyId integer not null, lotOccupancyCommentDate integer not null check (lotOccupancyCommentDate > 0), lotOccupancyCommentTime integer not null check (lotOccupancyCommentTime >= 0), lotOccupancyComment text not null, ${recordColumns}, foreign key (lotOccupancyId) references LotOccupancies (lotOccupancyId))`,
'create index if not exists idx_lotoccupancycomments_datetime on LotOccupancyComments (lotOccupancyId, lotOccupancyCommentDate, lotOccupancyCommentTime)',
// Fees and Transactions
/*
* Fees and Transactions
*/
`create table if not exists FeeCategories (feeCategoryId integer not null primary key autoincrement, feeCategory varchar(100) not null, orderNumber smallint not null default 0, ${recordColumns})`,
`create table if not exists Fees (
feeId integer not null primary key autoincrement,
@ -78,7 +95,10 @@ const createStatements = [
`create table if not exists LotOccupancyTransactions (lotOccupancyId integer not null, transactionIndex integer not null, transactionDate integer not null check (transactionDate > 0), transactionTime integer not null check (transactionTime >= 0), transactionAmount decimal(8, 2) not null, externalReceiptNumber varchar(100), transactionNote text, ${recordColumns}, primary key (lotOccupancyId, transactionIndex), foreign key (lotOccupancyId) references LotOccupancies (lotOccupancyId)) without rowid`,
'create index if not exists idx_lotoccupancytransactions_ordernumber on LotOccupancyTransactions (lotOccupancyId, transactionDate, transactionTime)',
// Work Orders
/*
* Work Orders
*/
`create table if not exists WorkOrderTypes (workOrderTypeId integer not null primary key autoincrement, workOrderType varchar(100) not null, orderNumber smallint not null default 0, ${recordColumns})`,
'create index if not exists idx_workordertypes_ordernumber on WorkOrderTypes (orderNumber, workOrderType)',
`create table if not exists WorkOrders (workOrderId integer not null primary key autoincrement, workOrderTypeId integer not null, workOrderNumber varchar(50) not null, workOrderDescription text, workOrderOpenDate integer check (workOrderOpenDate > 0), workOrderCloseDate integer check (workOrderCloseDate > 0), ${recordColumns}, foreign key (workOrderTypeId) references WorkOrderTypes (workOrderTypeId))`,

View File

@ -1,4 +1,4 @@
import { Router, type RequestHandler } from 'express'
import { type RequestHandler, Router } from 'express'
import handler_dashboard from '../handlers/dashboard-get/dashboard.js'

View File

@ -32,7 +32,7 @@ async function postHandler(request, response) {
if (useTestDatabases && userName === passwordPlain) {
isAuthenticated = getConfigProperty('users.testing').includes(userName);
if (isAuthenticated) {
debug('Authenticated testing user: ' + userName);
debug(`Authenticated testing user: ${userName}`);
}
}
}

View File

@ -62,7 +62,7 @@ async function postHandler(
isAuthenticated = getConfigProperty('users.testing').includes(userName)
if (isAuthenticated) {
debug('Authenticated testing user: ' + userName)
debug(`Authenticated testing user: ${userName}`)
}
}
} else if (userName !== '' && passwordPlain !== '') {

View File

@ -9,7 +9,7 @@ export interface Config {
};
activeDirectory?: ConfigActiveDirectory;
users: {
testing?: string[];
testing?: Array<`*${string}`>;
canLogin?: string[];
canUpdate?: string[];
isAdmin?: string[];

View File

@ -11,7 +11,7 @@ export interface Config {
}
activeDirectory?: ConfigActiveDirectory
users: {
testing?: string[]
testing?: Array<`*${string}`>
canLogin?: string[]
canUpdate?: string[]
isAdmin?: string[]

View File

@ -1,3 +1,5 @@
/* eslint-disable unicorn/filename-case, @eslint-community/eslint-comments/disable-enable-pair */
import { Service } from 'node-windows'
import { serviceConfig } from './windowsService.js'

View File

@ -1,3 +1,5 @@
/* eslint-disable unicorn/filename-case, @eslint-community/eslint-comments/disable-enable-pair */
import { Service } from 'node-windows'
import { serviceConfig } from './windowsService.js'