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

improve consistency in order checking 

once consistent, may be able to clean up
deepsource-autofix-76c6eb20
Dan Gowans 2023-01-06 12:51:21 -05:00
parent 3af27e0739
commit 45cddb2264
11 changed files with 50 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
helpers/lotOccupancyDB/getFeeCategories.js
View File

@ -32,13 +32,13 @@ export function getFeeCategories(filters, options) {
" order by orderNumber, feeCategory") " order by orderNumber, feeCategory")
.all(sqlParameters); .all(sqlParameters);
if (options.includeFees) { if (options.includeFees) {
let expectedFeeCategoryOrderNumber = -1; let expectedOrderNumber = 0;
for (const feeCategory of feeCategories) { for (const feeCategory of feeCategories) {
expectedFeeCategoryOrderNumber += 1; if (updateOrderNumbers && feeCategory.orderNumber !== expectedOrderNumber) {
if (updateOrderNumbers && feeCategory.orderNumber !== expectedFeeCategoryOrderNumber) { updateRecordOrderNumber("FeeCategories", feeCategory.feeCategoryId, expectedOrderNumber, database);
updateRecordOrderNumber("FeeCategories", feeCategory.feeCategoryId, expectedFeeCategoryOrderNumber, database); feeCategory.orderNumber = expectedOrderNumber;
feeCategory.orderNumber = expectedFeeCategoryOrderNumber;
} }
expectedOrderNumber += 1;
feeCategory.fees = getFees(feeCategory.feeCategoryId, filters, database); feeCategory.fees = getFees(feeCategory.feeCategoryId, filters, database);
} }
} }

12
helpers/lotOccupancyDB/getFeeCategories.ts
View File

@ -60,22 +60,22 @@ export function getFeeCategories(
.all(sqlParameters); .all(sqlParameters);
if (options.includeFees) { if (options.includeFees) {
let expectedFeeCategoryOrderNumber = -1; let expectedOrderNumber = 0;
for (const feeCategory of feeCategories) { for (const feeCategory of feeCategories) {
expectedFeeCategoryOrderNumber += 1; if (updateOrderNumbers && feeCategory.orderNumber !== expectedOrderNumber) {
if (updateOrderNumbers && feeCategory.orderNumber !== expectedFeeCategoryOrderNumber) {
updateRecordOrderNumber( updateRecordOrderNumber(
"FeeCategories", "FeeCategories",
feeCategory.feeCategoryId, feeCategory.feeCategoryId,
expectedFeeCategoryOrderNumber, expectedOrderNumber,
database database
); );
feeCategory.orderNumber = expectedFeeCategoryOrderNumber; feeCategory.orderNumber = expectedOrderNumber;
} }
expectedOrderNumber += 1;
feeCategory.fees = getFees(feeCategory.feeCategoryId, filters, database); feeCategory.fees = getFees(feeCategory.feeCategoryId, filters, database);
} }
} }

10
helpers/lotOccupancyDB/getFees.js
View File

@ -32,13 +32,13 @@ export function getFees(feeCategoryId, additionalFilters, connectedDatabase) {
" order by f.orderNumber, f.feeName") " order by f.orderNumber, f.feeName")
.all(sqlParameters); .all(sqlParameters);
if (updateOrderNumbers) { if (updateOrderNumbers) {
let expectedFeeOrderNumber = -1; let expectedOrderNumber = 0;
for (const fee of fees) { for (const fee of fees) {
expectedFeeOrderNumber += 1; if (fee.orderNumber !== expectedOrderNumber) {
if (fee.orderNumber !== expectedFeeOrderNumber) { updateRecordOrderNumber("Fees", fee.feeId, expectedOrderNumber, database);
updateRecordOrderNumber("Fees", fee.feeId, expectedFeeOrderNumber, database); fee.orderNumber = expectedOrderNumber;
fee.orderNumber = expectedFeeOrderNumber;
} }
expectedOrderNumber += 1;
} }
} }
if (!connectedDatabase) { if (!connectedDatabase) {

12
helpers/lotOccupancyDB/getFees.ts
View File

@ -58,15 +58,15 @@ export function getFees(
.all(sqlParameters); .all(sqlParameters);
if (updateOrderNumbers) { if (updateOrderNumbers) {
let expectedFeeOrderNumber = -1; let expectedOrderNumber = 0;
for (const fee of fees) { for (const fee of fees) {
expectedFeeOrderNumber += 1; if (fee.orderNumber !== expectedOrderNumber) {
updateRecordOrderNumber("Fees", fee.feeId, expectedOrderNumber, database);
if (fee.orderNumber !== expectedFeeOrderNumber) { fee.orderNumber = expectedOrderNumber;
updateRecordOrderNumber("Fees", fee.feeId, expectedFeeOrderNumber, database);
fee.orderNumber = expectedFeeOrderNumber;
} }
expectedOrderNumber += 1;
} }
} }

3
helpers/lotOccupancyDB/getLotOccupantTypes.ts
View File

@ -2,9 +2,10 @@ 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 { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
import type * as recordTypes from "../../types/recordTypes";
export function getLotOccupantTypes(): recordTypes.LotOccupantType[] { export function getLotOccupantTypes(): recordTypes.LotOccupantType[] {
const database = sqlite(databasePath); const database = sqlite(databasePath);

3
helpers/lotOccupancyDB/getLotStatuses.ts
View File

@ -2,9 +2,10 @@ 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 { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
import type * as recordTypes from "../../types/recordTypes";
export function getLotStatuses(): recordTypes.LotStatus[] { export function getLotStatuses(): recordTypes.LotStatus[] {
const database = sqlite(databasePath); const database = sqlite(databasePath);

10
helpers/lotOccupancyDB/getLotTypeFields.js
View File

@ -12,13 +12,13 @@ export function getLotTypeFields(lotTypeId, connectedDatabase) {
and lotTypeId = ? and lotTypeId = ?
order by orderNumber, lotTypeField`) order by orderNumber, lotTypeField`)
.all(lotTypeId); .all(lotTypeId);
let expectedFieldOrderNumber = -1; let expectedOrderNumber = 0;
for (const lotTypeField of lotTypeFields) { for (const lotTypeField of lotTypeFields) {
expectedFieldOrderNumber += 1; if (lotTypeField.orderNumber !== expectedOrderNumber) {
if (lotTypeField.orderNumber !== expectedFieldOrderNumber) { updateRecordOrderNumber("LotTypeFields", lotTypeField.lotTypeFieldId, expectedOrderNumber, database);
updateRecordOrderNumber("LotTypeFields", lotTypeField.lotTypeFieldId, expectedFieldOrderNumber, database); lotTypeField.orderNumber = expectedOrderNumber;
lotTypeField.orderNumber = expectedFieldOrderNumber;
} }
expectedOrderNumber += 1;
} }
if (!connectedDatabase) { if (!connectedDatabase) {
database.close(); database.close();

12
helpers/lotOccupancyDB/getLotTypeFields.ts
View File

@ -23,21 +23,21 @@ export function getLotTypeFields(
) )
.all(lotTypeId); .all(lotTypeId);
let expectedFieldOrderNumber = -1; let expectedOrderNumber = 0;
for (const lotTypeField of lotTypeFields) { for (const lotTypeField of lotTypeFields) {
expectedFieldOrderNumber += 1; if (lotTypeField.orderNumber !== expectedOrderNumber) {
if (lotTypeField.orderNumber !== expectedFieldOrderNumber) {
updateRecordOrderNumber( updateRecordOrderNumber(
"LotTypeFields", "LotTypeFields",
lotTypeField.lotTypeFieldId, lotTypeField.lotTypeFieldId,
expectedFieldOrderNumber, expectedOrderNumber,
database database
); );
lotTypeField.orderNumber = expectedFieldOrderNumber; lotTypeField.orderNumber = expectedOrderNumber;
} }
expectedOrderNumber += 1;
} }
if (!connectedDatabase) { if (!connectedDatabase) {

10
helpers/lotOccupancyDB/getOccupancyTypeFields.js
View File

@ -17,13 +17,13 @@ export function getOccupancyTypeFields(occupancyTypeId, connectedDatabase) {
(occupancyTypeId ? " and occupancyTypeId = ?" : " and occupancyTypeId is null") + (occupancyTypeId ? " and occupancyTypeId = ?" : " and occupancyTypeId is null") +
" order by orderNumber, occupancyTypeField") " order by orderNumber, occupancyTypeField")
.all(sqlParameters); .all(sqlParameters);
let expectedFieldOrderNumber = -1; let expectedOrderNumber = 0;
for (const occupancyTypeField of occupancyTypeFields) { for (const occupancyTypeField of occupancyTypeFields) {
expectedFieldOrderNumber += 1; if (occupancyTypeField.orderNumber !== expectedOrderNumber) {
if (occupancyTypeField.orderNumber !== expectedFieldOrderNumber) { updateRecordOrderNumber("OccupancyTypeFields", occupancyTypeField.occupancyTypeFieldId, expectedOrderNumber, database);
updateRecordOrderNumber("OccupancyTypeFields", occupancyTypeField.occupancyTypeFieldId, expectedFieldOrderNumber, database); occupancyTypeField.orderNumber = expectedOrderNumber;
occupancyTypeField.orderNumber = expectedFieldOrderNumber;
} }
expectedOrderNumber += 1;
} }
if (!connectedDatabase) { if (!connectedDatabase) {
database.close(); database.close();

12
helpers/lotOccupancyDB/getOccupancyTypeFields.ts
View File

@ -30,21 +30,21 @@ export function getOccupancyTypeFields(
) )
.all(sqlParameters); .all(sqlParameters);
let expectedFieldOrderNumber = -1; let expectedOrderNumber = 0;
for (const occupancyTypeField of occupancyTypeFields) { for (const occupancyTypeField of occupancyTypeFields) {
expectedFieldOrderNumber += 1; if (occupancyTypeField.orderNumber !== expectedOrderNumber) {
if (occupancyTypeField.orderNumber !== expectedFieldOrderNumber) {
updateRecordOrderNumber( updateRecordOrderNumber(
"OccupancyTypeFields", "OccupancyTypeFields",
occupancyTypeField.occupancyTypeFieldId, occupancyTypeField.occupancyTypeFieldId,
expectedFieldOrderNumber, expectedOrderNumber,
database database
); );
occupancyTypeField.orderNumber = expectedFieldOrderNumber; occupancyTypeField.orderNumber = expectedOrderNumber;
} }
expectedOrderNumber += 1;
} }
if (!connectedDatabase) { if (!connectedDatabase) {

3
helpers/lotOccupancyDB/getWorkOrderTypes.ts
View File

@ -2,9 +2,10 @@ 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 { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
import type * as recordTypes from "../../types/recordTypes";
export function getWorkOrderTypes(): recordTypes.WorkOrderType[] { export function getWorkOrderTypes(): recordTypes.WorkOrderType[] {
const database = sqlite(databasePath); const database = sqlite(databasePath);