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

reduce ordernumber update code

deepsource-autofix-76c6eb20
Dan Gowans 2023-01-06 11:28:46 -05:00
parent e9b86a86e1
commit 19e3ecc0be
29 changed files with 145 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
helpers/lotOccupancyDB/getFeeCategories.js
View File

@ -1,7 +1,7 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { getFees } from "./getFees.js";
import { updateFeeCategoryOrderNumber } from "./updateFeeCategory.js";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
export function getFeeCategories(filters, options) {
const updateOrderNumbers = !(filters.lotTypeId || filters.occupancyTypeId) && options.includeFees;
const database = sqlite(databasePath, {
@ -36,7 +36,7 @@ export function getFeeCategories(filters, options) {
for (const feeCategory of feeCategories) {
expectedFeeCategoryOrderNumber += 1;
if (updateOrderNumbers && feeCategory.orderNumber !== expectedFeeCategoryOrderNumber) {
updateFeeCategoryOrderNumber(feeCategory.feeCategoryId, expectedFeeCategoryOrderNumber, database);
updateRecordOrderNumber("FeeCategories", feeCategory.feeCategoryId, expectedFeeCategoryOrderNumber, database);
feeCategory.orderNumber = expectedFeeCategoryOrderNumber;
}
feeCategory.fees = getFees(feeCategory.feeCategoryId, filters, database);

8
helpers/lotOccupancyDB/getFeeCategories.ts
View File

@ -3,7 +3,7 @@ import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { getFees } from "./getFees.js";
import { updateFeeCategoryOrderNumber } from "./updateFeeCategory.js";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
import type * as recordTypes from "../../types/recordTypes";
@ -20,8 +20,7 @@ export function getFeeCategories(
filters: GetFeeCategoriesFilters,
options: GetFeeCategoriesOptions
): recordTypes.FeeCategory[] {
const updateOrderNumbers =
!(filters.lotTypeId || filters.occupancyTypeId) && options.includeFees;
const updateOrderNumbers = !(filters.lotTypeId || filters.occupancyTypeId) && options.includeFees;
const database = sqlite(databasePath, {
readonly: !updateOrderNumbers
@ -67,7 +66,8 @@ export function getFeeCategories(
expectedFeeCategoryOrderNumber += 1;
if (updateOrderNumbers && feeCategory.orderNumber !== expectedFeeCategoryOrderNumber) {
updateFeeCategoryOrderNumber(
updateRecordOrderNumber(
"FeeCategories",
feeCategory.feeCategoryId,
expectedFeeCategoryOrderNumber,
database

6
helpers/lotOccupancyDB/getFees.js
View File

@ -1,13 +1,13 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { updateFeeOrderNumber } from "./updateFee.js";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
export function getFees(feeCategoryId, additionalFilters, connectedDatabase) {
const updateOrderNumbers = !(additionalFilters.lotTypeId || additionalFilters.occupancyTypeId);
const database = connectedDatabase ||
sqlite(databasePath, {
readonly: !updateOrderNumbers
});
let sqlWhereClause = " where f.recordDelete_timeMillis is null" + " and f.feeCategoryId = ?";
let sqlWhereClause = " where f.recordDelete_timeMillis is null and f.feeCategoryId = ?";
const sqlParameters = [feeCategoryId];
if (additionalFilters.occupancyTypeId) {
sqlWhereClause += " and (f.occupancyTypeId is null or f.occupancyTypeId = ?)";
@ -36,7 +36,7 @@ export function getFees(feeCategoryId, additionalFilters, connectedDatabase) {
for (const fee of fees) {
expectedFeeOrderNumber += 1;
if (fee.orderNumber !== expectedFeeOrderNumber) {
updateFeeOrderNumber(fee.feeId, expectedFeeOrderNumber, database);
updateRecordOrderNumber("Fees", fee.feeId, expectedFeeOrderNumber, database);
fee.orderNumber = expectedFeeOrderNumber;
}
}

7
helpers/lotOccupancyDB/getFees.ts
View File

@ -2,7 +2,7 @@ import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { updateFeeOrderNumber } from "./updateFee.js";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
import type * as recordTypes from "../../types/recordTypes";
@ -24,7 +24,7 @@ export function getFees(
readonly: !updateOrderNumbers
});
let sqlWhereClause = " where f.recordDelete_timeMillis is null" + " and f.feeCategoryId = ?";
let sqlWhereClause = " where f.recordDelete_timeMillis is null and f.feeCategoryId = ?";
const sqlParameters: unknown[] = [feeCategoryId];
@ -64,8 +64,7 @@ export function getFees(
expectedFeeOrderNumber += 1;
if (fee.orderNumber !== expectedFeeOrderNumber) {
updateFeeOrderNumber(fee.feeId, expectedFeeOrderNumber, database);
updateRecordOrderNumber("Fees", fee.feeId, expectedFeeOrderNumber, database);
fee.orderNumber = expectedFeeOrderNumber;
}
}

7
helpers/lotOccupancyDB/getLotOccupantTypes.js
View File

@ -1,5 +1,6 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
export function getLotOccupantTypes() {
const database = sqlite(databasePath);
const lotOccupantTypes = database
@ -11,11 +12,7 @@ export function getLotOccupantTypes() {
let expectedOrderNumber = 0;
for (const lotOccupantType of lotOccupantTypes) {
if (lotOccupantType.orderNumber !== expectedOrderNumber) {
database
.prepare(`update LotOccupantTypes
set orderNumber = ?
where lotOccupantTypeId = ?`)
.run(expectedOrderNumber, lotOccupantType.lotOccupantTypeId);
updateRecordOrderNumber("LotOccupantTypes", lotOccupantType.lotOccupantTypeId, expectedOrderNumber, database);
lotOccupantType.orderNumber = expectedOrderNumber;
}
expectedOrderNumber += 1;

12
helpers/lotOccupancyDB/getLotOccupantTypes.ts
View File

@ -3,6 +3,7 @@ import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import type * as recordTypes from "../../types/recordTypes";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
export function getLotOccupantTypes(): recordTypes.LotOccupantType[] {
const database = sqlite(databasePath);
@ -20,13 +21,12 @@ export function getLotOccupantTypes(): recordTypes.LotOccupantType[] {
for (const lotOccupantType of lotOccupantTypes) {
if (lotOccupantType.orderNumber !== expectedOrderNumber) {
updateRecordOrderNumber(
"LotOccupantTypes",
lotOccupantType.lotOccupantTypeId,
expectedOrderNumber,
database
.prepare(
`update LotOccupantTypes
set orderNumber = ?
where lotOccupantTypeId = ?`
)
.run(expectedOrderNumber, lotOccupantType.lotOccupantTypeId);
);
lotOccupantType.orderNumber = expectedOrderNumber;
}

7
helpers/lotOccupancyDB/getLotStatuses.js
View File

@ -1,5 +1,6 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
export function getLotStatuses() {
const database = sqlite(databasePath);
const lotStatuses = database
@ -11,11 +12,7 @@ export function getLotStatuses() {
let expectedOrderNumber = 0;
for (const lotStatus of lotStatuses) {
if (lotStatus.orderNumber !== expectedOrderNumber) {
database
.prepare(`update LotStatuses
set orderNumber = ?
where lotStatusId = ?`)
.run(expectedOrderNumber, lotStatus.lotStatusId);
updateRecordOrderNumber("LotStatuses", lotStatus.lotStatusId, expectedOrderNumber, database);
lotStatus.orderNumber = expectedOrderNumber;
}
expectedOrderNumber += 1;

10
helpers/lotOccupancyDB/getLotStatuses.ts
View File

@ -3,6 +3,7 @@ import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import type * as recordTypes from "../../types/recordTypes";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
export function getLotStatuses(): recordTypes.LotStatus[] {
const database = sqlite(databasePath);
@ -20,14 +21,7 @@ export function getLotStatuses(): recordTypes.LotStatus[] {
for (const lotStatus of lotStatuses) {
if (lotStatus.orderNumber !== expectedOrderNumber) {
database
.prepare(
`update LotStatuses
set orderNumber = ?
where lotStatusId = ?`
)
.run(expectedOrderNumber, lotStatus.lotStatusId);
updateRecordOrderNumber("LotStatuses", lotStatus.lotStatusId, expectedOrderNumber, database);
lotStatus.orderNumber = expectedOrderNumber;
}

5
helpers/lotOccupancyDB/getLotTypeFields.js
View File

@ -1,5 +1,6 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
export function getLotTypeFields(lotTypeId, connectedDatabase) {
const database = connectedDatabase || sqlite(databasePath);
const lotTypeFields = database
@ -15,9 +16,7 @@ export function getLotTypeFields(lotTypeId, connectedDatabase) {
for (const lotTypeField of lotTypeFields) {
expectedFieldOrderNumber += 1;
if (lotTypeField.orderNumber !== expectedFieldOrderNumber) {
database
.prepare("update LotTypeFields set orderNumber = ? where lotTypeFieldId = ?")
.run(expectedFieldOrderNumber, lotTypeField.lotTypeFieldId);
updateRecordOrderNumber("LotTypeFields", lotTypeField.lotTypeFieldId, expectedFieldOrderNumber, database);
lotTypeField.orderNumber = expectedFieldOrderNumber;
}
}

8
helpers/lotOccupancyDB/getLotTypeFields.ts
View File

@ -3,6 +3,7 @@ import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import type * as recordTypes from "../../types/recordTypes";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
export function getLotTypeFields(
lotTypeId: number,
@ -28,9 +29,12 @@ export function getLotTypeFields(
expectedFieldOrderNumber += 1;
if (lotTypeField.orderNumber !== expectedFieldOrderNumber) {
updateRecordOrderNumber(
"LotTypeFields",
lotTypeField.lotTypeFieldId,
expectedFieldOrderNumber,
database
.prepare("update LotTypeFields set orderNumber = ? where lotTypeFieldId = ?")
.run(expectedFieldOrderNumber, lotTypeField.lotTypeFieldId);
);
lotTypeField.orderNumber = expectedFieldOrderNumber;
}

15
helpers/lotOccupancyDB/getLotTypes.js
View File

@ -1,6 +1,7 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { getLotTypeFields } from "./getLotTypeFields.js";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
export function getLotTypes() {
const database = sqlite(databasePath);
const lotTypes = database
@ -13,22 +14,10 @@ export function getLotTypes() {
for (const lotType of lotTypes) {
expectedTypeOrderNumber += 1;
if (lotType.orderNumber !== expectedTypeOrderNumber) {
database
.prepare("update LotTypes set orderNumber = ? where lotTypeId = ?")
.run(expectedTypeOrderNumber, lotType.lotTypeId);
updateRecordOrderNumber("LotTypes", lotType.lotTypeId, expectedTypeOrderNumber, database);
lotType.orderNumber = expectedTypeOrderNumber;
}
lotType.lotTypeFields = getLotTypeFields(lotType.lotTypeId, database);
let expectedFieldOrderNumber = -1;
for (const lotTypeField of lotType.lotTypeFields) {
expectedFieldOrderNumber += 1;
if (lotTypeField.orderNumber !== expectedFieldOrderNumber) {
database
.prepare(`update LotTypeFields set orderNumber = ? where lotTypeFieldId = ?`)
.run(expectedFieldOrderNumber, lotTypeField.lotTypeFieldId);
lotTypeField.orderNumber = expectedFieldOrderNumber;
}
}
}
database.close();
return lotTypes;

19
helpers/lotOccupancyDB/getLotTypes.ts
View File

@ -5,6 +5,7 @@ import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { getLotTypeFields } from "./getLotTypeFields.js";
import type * as recordTypes from "../../types/recordTypes";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
export function getLotTypes(): recordTypes.LotType[] {
const database = sqlite(databasePath);
@ -24,28 +25,12 @@ export function getLotTypes(): recordTypes.LotType[] {
expectedTypeOrderNumber += 1;
if (lotType.orderNumber !== expectedTypeOrderNumber) {
database
.prepare("update LotTypes set orderNumber = ? where lotTypeId = ?")
.run(expectedTypeOrderNumber, lotType.lotTypeId);
updateRecordOrderNumber("LotTypes", lotType.lotTypeId, expectedTypeOrderNumber, database);
lotType.orderNumber = expectedTypeOrderNumber;
}
lotType.lotTypeFields = getLotTypeFields(lotType.lotTypeId as number, database);
let expectedFieldOrderNumber = -1;
for (const lotTypeField of lotType.lotTypeFields) {
expectedFieldOrderNumber += 1;
if (lotTypeField.orderNumber !== expectedFieldOrderNumber) {
database
.prepare(`update LotTypeFields set orderNumber = ? where lotTypeFieldId = ?`)
.run(expectedFieldOrderNumber, lotTypeField.lotTypeFieldId);
lotTypeField.orderNumber = expectedFieldOrderNumber;
}
}
}
database.close();

5
helpers/lotOccupancyDB/getOccupancyTypeFields.js
View File

@ -1,5 +1,6 @@
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 sqlParameters = [];
@ -20,9 +21,7 @@ export function getOccupancyTypeFields(occupancyTypeId, connectedDatabase) {
for (const occupancyTypeField of occupancyTypeFields) {
expectedFieldOrderNumber += 1;
if (occupancyTypeField.orderNumber !== expectedFieldOrderNumber) {
database
.prepare(`update OccupancyTypeFields set orderNumber = ? where occupancyTypeFieldId = ?`)
.run(expectedFieldOrderNumber, occupancyTypeField.occupancyTypeFieldId);
updateRecordOrderNumber("OccupancyTypeFields", occupancyTypeField.occupancyTypeFieldId, expectedFieldOrderNumber, database);
occupancyTypeField.orderNumber = expectedFieldOrderNumber;
}
}

10
helpers/lotOccupancyDB/getOccupancyTypeFields.ts
View File

@ -3,6 +3,7 @@ import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import type * as recordTypes from "../../types/recordTypes";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
export function getOccupancyTypeFields(
occupancyTypeId?: number,
@ -35,11 +36,12 @@ export function getOccupancyTypeFields(
expectedFieldOrderNumber += 1;
if (occupancyTypeField.orderNumber !== expectedFieldOrderNumber) {
updateRecordOrderNumber(
"OccupancyTypeFields",
occupancyTypeField.occupancyTypeFieldId,
expectedFieldOrderNumber,
database
.prepare(
`update OccupancyTypeFields set orderNumber = ? where occupancyTypeFieldId = ?`
)
.run(expectedFieldOrderNumber, occupancyTypeField.occupancyTypeFieldId);
);
occupancyTypeField.orderNumber = expectedFieldOrderNumber;
}

15
helpers/lotOccupancyDB/getOccupancyTypes.js
View File

@ -2,6 +2,7 @@ import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { getOccupancyTypeFields } from "./getOccupancyTypeFields.js";
import { getOccupancyTypePrints } from "./getOccupancyTypePrints.js";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
export function getOccupancyTypes() {
const database = sqlite(databasePath);
const occupancyTypes = database
@ -14,23 +15,11 @@ export function getOccupancyTypes() {
for (const occupancyType of occupancyTypes) {
expectedTypeOrderNumber += 1;
if (occupancyType.orderNumber !== expectedTypeOrderNumber) {
database
.prepare("update OccupancyTypes set orderNumber = ? where occupancyTypeId = ?")
.run(expectedTypeOrderNumber, occupancyType.occupancyTypeId);
updateRecordOrderNumber("OccupancyTypes", occupancyType.occupancyTypeId, expectedTypeOrderNumber, database);
occupancyType.orderNumber = expectedTypeOrderNumber;
}
occupancyType.occupancyTypeFields = getOccupancyTypeFields(occupancyType.occupancyTypeId, database);
occupancyType.occupancyTypePrints = getOccupancyTypePrints(occupancyType.occupancyTypeId, database);
let expectedFieldOrderNumber = -1;
for (const occupancyTypeField of occupancyType.occupancyTypeFields) {
expectedFieldOrderNumber += 1;
if (occupancyTypeField.orderNumber !== expectedFieldOrderNumber) {
database
.prepare(`update OccupancyTypeFields set orderNumber = ? where occupancyTypeFieldId = ?`)
.run(expectedFieldOrderNumber, occupancyTypeField.occupancyTypeFieldId);
occupancyTypeField.orderNumber = expectedFieldOrderNumber;
}
}
}
database.close();
return occupancyTypes;

34
helpers/lotOccupancyDB/getOccupancyTypes.ts
View File

@ -6,6 +6,7 @@ import { getOccupancyTypeFields } from "./getOccupancyTypeFields.js";
import { getOccupancyTypePrints } from "./getOccupancyTypePrints.js";
import type * as recordTypes from "../../types/recordTypes";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
export function getOccupancyTypes(): recordTypes.OccupancyType[] {
const database = sqlite(databasePath);
@ -25,38 +26,19 @@ export function getOccupancyTypes(): recordTypes.OccupancyType[] {
expectedTypeOrderNumber += 1;
if (occupancyType.orderNumber !== expectedTypeOrderNumber) {
updateRecordOrderNumber(
"OccupancyTypes",
occupancyType.occupancyTypeId,
expectedTypeOrderNumber,
database
.prepare("update OccupancyTypes set orderNumber = ? where occupancyTypeId = ?")
.run(expectedTypeOrderNumber, occupancyType.occupancyTypeId);
);
occupancyType.orderNumber = expectedTypeOrderNumber;
}
occupancyType.occupancyTypeFields = getOccupancyTypeFields(
occupancyType.occupancyTypeId,
database
);
occupancyType.occupancyTypeFields = getOccupancyTypeFields(occupancyType.occupancyTypeId, database);
occupancyType.occupancyTypePrints = getOccupancyTypePrints(
occupancyType.occupancyTypeId,
database
);
let expectedFieldOrderNumber = -1;
for (const occupancyTypeField of occupancyType.occupancyTypeFields) {
expectedFieldOrderNumber += 1;
if (occupancyTypeField.orderNumber !== expectedFieldOrderNumber) {
database
.prepare(
`update OccupancyTypeFields set orderNumber = ? where occupancyTypeFieldId = ?`
)
.run(expectedFieldOrderNumber, occupancyTypeField.occupancyTypeFieldId);
occupancyTypeField.orderNumber = expectedFieldOrderNumber;
}
}
occupancyType.occupancyTypePrints = getOccupancyTypePrints(occupancyType.occupancyTypeId, database);
}
database.close();

7
helpers/lotOccupancyDB/getWorkOrderMilestoneTypes.js
View File

@ -1,5 +1,6 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
export function getWorkOrderMilestoneTypes() {
const database = sqlite(databasePath);
const workOrderMilestoneTypes = database
@ -11,11 +12,7 @@ export function getWorkOrderMilestoneTypes() {
let expectedOrderNumber = 0;
for (const workOrderMilestoneType of workOrderMilestoneTypes) {
if (workOrderMilestoneType.orderNumber !== expectedOrderNumber) {
database
.prepare(`update WorkOrderMilestoneTypes
set orderNumber = ?
where workOrderMilestoneTypeId = ?`)
.run(expectedOrderNumber, workOrderMilestoneType.workOrderMilestoneTypeId);
updateRecordOrderNumber("WorkOrderMilestoneTypes", workOrderMilestoneType.workOrderMilestoneTypeId, expectedOrderNumber, database);
workOrderMilestoneType.orderNumber = expectedOrderNumber;
}
expectedOrderNumber += 1;

13
helpers/lotOccupancyDB/getWorkOrderMilestoneTypes.ts
View File

@ -2,6 +2,8 @@ import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
import type * as recordTypes from "../../types/recordTypes";
export function getWorkOrderMilestoneTypes(): recordTypes.WorkOrderMilestoneType[] {
@ -20,13 +22,12 @@ export function getWorkOrderMilestoneTypes(): recordTypes.WorkOrderMilestoneType
for (const workOrderMilestoneType of workOrderMilestoneTypes) {
if (workOrderMilestoneType.orderNumber !== expectedOrderNumber) {
updateRecordOrderNumber(
"WorkOrderMilestoneTypes",
workOrderMilestoneType.workOrderMilestoneTypeId,
expectedOrderNumber,
database
.prepare(
`update WorkOrderMilestoneTypes
set orderNumber = ?
where workOrderMilestoneTypeId = ?`
)
.run(expectedOrderNumber, workOrderMilestoneType.workOrderMilestoneTypeId);
);
workOrderMilestoneType.orderNumber = expectedOrderNumber;
}

5
helpers/lotOccupancyDB/getWorkOrderTypes.js
View File

@ -1,5 +1,6 @@
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
@ -11,9 +12,7 @@ export function getWorkOrderTypes() {
let expectedOrderNumber = 0;
for (const workOrderType of workOrderTypes) {
if (workOrderType.orderNumber !== expectedOrderNumber) {
database
.prepare(`update WorkOrderTypes set orderNumber = ? where workOrderTypeId = ?`)
.run(expectedOrderNumber, workOrderType.workOrderTypeId);
updateRecordOrderNumber("WorkOrderTypes", workOrderType.workOrderTypeId, expectedOrderNumber, database);
workOrderType.orderNumber = expectedOrderNumber;
}
expectedOrderNumber += 1;

8
helpers/lotOccupancyDB/getWorkOrderTypes.ts
View File

@ -3,6 +3,7 @@ import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import type * as recordTypes from "../../types/recordTypes";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
export function getWorkOrderTypes(): recordTypes.WorkOrderType[] {
const database = sqlite(databasePath);
@ -20,9 +21,12 @@ export function getWorkOrderTypes(): recordTypes.WorkOrderType[] {
for (const workOrderType of workOrderTypes) {
if (workOrderType.orderNumber !== expectedOrderNumber) {
updateRecordOrderNumber(
"WorkOrderTypes",
workOrderType.workOrderTypeId,
expectedOrderNumber,
database
.prepare(`update WorkOrderTypes set orderNumber = ? where workOrderTypeId = ?`)
.run(expectedOrderNumber, workOrderType.workOrderTypeId);
);
workOrderType.orderNumber = expectedOrderNumber;
}

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

@ -1,4 +1,3 @@
import sqlite from "better-sqlite3";
import type * as recordTypes from "../../types/recordTypes";
interface UpdateFeeForm {
feeId: string;
@ -16,5 +15,4 @@ interface UpdateFeeForm {
isRequired: "" | "1";
}
export declare function updateFee(feeForm: UpdateFeeForm, requestSession: recordTypes.PartialSession): boolean;
export declare function updateFeeOrderNumber(feeId: number, orderNumber: number, connectedDatabase?: sqlite.Database): boolean;
export default updateFee;

13
helpers/lotOccupancyDB/updateFee.js
View File

@ -25,17 +25,4 @@ export function updateFee(feeForm, requestSession) {
database.close();
return result.changes > 0;
}
export function updateFeeOrderNumber(feeId, orderNumber, connectedDatabase) {
const database = connectedDatabase ||
sqlite(databasePath, {
readonly: true
});
const result = database
.prepare("update Fees set orderNumber = ? where feeId = ?")
.run(orderNumber, feeId);
if (!connectedDatabase) {
database.close();
}
return result.changes > 0;
}
export default updateFee;

27
helpers/lotOccupancyDB/updateFee.ts
View File

@ -20,10 +20,7 @@ interface UpdateFeeForm {
isRequired: "" | "1";
}
export function updateFee(
feeForm: UpdateFeeForm,
requestSession: recordTypes.PartialSession
): boolean {
export function updateFee(feeForm: UpdateFeeForm, requestSession: recordTypes.PartialSession): boolean {
const database = sqlite(databasePath);
const rightNowMillis = Date.now();
@ -71,26 +68,4 @@ export function updateFee(
return result.changes > 0;
}
export function updateFeeOrderNumber(
feeId: number,
orderNumber: number,
connectedDatabase?: sqlite.Database
) {
const database =
connectedDatabase ||
sqlite(databasePath, {
readonly: true
});
const result = database
.prepare("update Fees set orderNumber = ? where feeId = ?")
.run(orderNumber, feeId);
if (!connectedDatabase) {
database.close();
}
return result.changes > 0;
}
export default updateFee;

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

@ -1,9 +1,7 @@
import sqlite from "better-sqlite3";
import type * as recordTypes from "../../types/recordTypes";
interface UpdateFeeCategoryForm {
feeCategoryId: number | string;
feeCategory: string;
}
export declare function updateFeeCategory(feeCategoryForm: UpdateFeeCategoryForm, requestSession: recordTypes.PartialSession): boolean;
export declare function updateFeeCategoryOrderNumber(feeCategoryId: number, orderNumber: number, connectedDatabase?: sqlite.Database): boolean;
export default updateFeeCategory;

15
helpers/lotOccupancyDB/updateFeeCategory.js
View File

@ -1,21 +1,6 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { updateRecord } from "./updateRecord.js";
export function updateFeeCategory(feeCategoryForm, requestSession) {
const success = updateRecord("FeeCategories", feeCategoryForm.feeCategoryId, feeCategoryForm.feeCategory, requestSession);
return success;
}
export function updateFeeCategoryOrderNumber(feeCategoryId, orderNumber, connectedDatabase) {
const database = connectedDatabase ||
sqlite(databasePath, {
readonly: true
});
const result = database
.prepare("update FeeCategories set orderNumber = ? where feeCategoryId = ?")
.run(orderNumber, feeCategoryId);
if (!connectedDatabase) {
database.close();
}
return result.changes > 0;
}
export default updateFeeCategory;

25
helpers/lotOccupancyDB/updateFeeCategory.ts
View File

@ -1,6 +1,3 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { updateRecord } from "./updateRecord.js";
import type * as recordTypes from "../../types/recordTypes";
@ -23,26 +20,4 @@ export function updateFeeCategory(
return success;
}
export function updateFeeCategoryOrderNumber(
feeCategoryId: number,
orderNumber: number,
connectedDatabase?: sqlite.Database
) {
const database =
connectedDatabase ||
sqlite(databasePath, {
readonly: true
});
const result = database
.prepare("update FeeCategories set orderNumber = ? where feeCategoryId = ?")
.run(orderNumber, feeCategoryId);
if (!connectedDatabase) {
database.close();
}
return result.changes > 0;
}
export default updateFeeCategory;

4
helpers/lotOccupancyDB/updateRecordOrderNumber.d.ts vendored 100644
View File

@ -0,0 +1,4 @@
import sqlite from "better-sqlite3";
declare type RecordTable = "FeeCategories" | "Fees" | "LotOccupantTypes" | "LotStatuses" | "LotTypes" | "LotTypeFields" | "OccupancyTypes" | "OccupancyTypeFields" | "WorkOrderMilestoneTypes" | "WorkOrderTypes";
export declare function updateRecordOrderNumber(recordTable: RecordTable, recordId: number, orderNumber: number, connectedDatabase: sqlite.Database): boolean;
export {};

20
helpers/lotOccupancyDB/updateRecordOrderNumber.js 100644
View File

@ -0,0 +1,20 @@
const recordIdColumns = new Map();
recordIdColumns.set("FeeCategories", "feeCategoryId");
recordIdColumns.set("Fees", "feeId");
recordIdColumns.set("LotOccupantTypes", "lotOccupantTypeId");
recordIdColumns.set("LotStatuses", "lotStatusId");
recordIdColumns.set("LotTypes", "lotTypeId");
recordIdColumns.set("LotTypeFields", "lotTypeFieldId");
recordIdColumns.set("OccupancyTypes", "occupancyTypeId");
recordIdColumns.set("OccupancyTypeFields", "occupancyTypeFieldId");
recordIdColumns.set("WorkOrderMilestoneTypes", "workOrderMilestoneTypeId");
recordIdColumns.set("WorkOrderTypes", "workOrderTypeId");
export function updateRecordOrderNumber(recordTable, recordId, orderNumber, connectedDatabase) {
const result = connectedDatabase
.prepare(`update ${recordTable}
set orderNumber = ?
where recordDelete_timeMillis is null
and ${recordIdColumns.get(recordTable)} = ?`)
.run(orderNumber, recordId);
return result.changes > 0;
}

43
helpers/lotOccupancyDB/updateRecordOrderNumber.ts 100644
View File

@ -0,0 +1,43 @@
import sqlite from "better-sqlite3";
type RecordTable =
| "FeeCategories"
| "Fees"
| "LotOccupantTypes"
| "LotStatuses"
| "LotTypes"
| "LotTypeFields"
| "OccupancyTypes"
| "OccupancyTypeFields"
| "WorkOrderMilestoneTypes"
| "WorkOrderTypes";
const recordIdColumns: Map<RecordTable, string> = new Map();
recordIdColumns.set("FeeCategories", "feeCategoryId");
recordIdColumns.set("Fees", "feeId");
recordIdColumns.set("LotOccupantTypes", "lotOccupantTypeId");
recordIdColumns.set("LotStatuses", "lotStatusId");
recordIdColumns.set("LotTypes", "lotTypeId");
recordIdColumns.set("LotTypeFields", "lotTypeFieldId");
recordIdColumns.set("OccupancyTypes", "occupancyTypeId");
recordIdColumns.set("OccupancyTypeFields", "occupancyTypeFieldId");
recordIdColumns.set("WorkOrderMilestoneTypes", "workOrderMilestoneTypeId");
recordIdColumns.set("WorkOrderTypes", "workOrderTypeId");
export function updateRecordOrderNumber(
recordTable: RecordTable,
recordId: number,
orderNumber: number,
connectedDatabase: sqlite.Database
): boolean {
const result = connectedDatabase
.prepare(
`update ${recordTable}
set orderNumber = ?
where recordDelete_timeMillis is null
and ${recordIdColumns.get(recordTable)} = ?`
)
.run(orderNumber, recordId);
return result.changes > 0;
}