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

reduce duplication

deepsource-autofix-76c6eb20
Dan Gowans 2023-01-06 15:02:55 -05:00
parent 6d05ef2c9d
commit 62419a83fb
2 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
helpers/lotOccupancyDB/moveRecord.js
View File

@ -27,14 +27,10 @@ export function moveRecordDown(recordTable, recordId) {
where recordDelete_timeMillis is null where recordDelete_timeMillis is null
and orderNumber = ? + 1`) and orderNumber = ? + 1`)
.run(currentOrderNumber); .run(currentOrderNumber);
const result = database const success = updateRecordOrderNumber(recordTable, recordId, currentOrderNumber + 1, database);
.prepare(`update ${recordTable}
set orderNumber = ? + 1
where ${recordIdColumns.get(recordTable)} = ?`)
.run(currentOrderNumber, recordId);
database.close(); database.close();
clearCacheByTableName(recordTable); clearCacheByTableName(recordTable);
return result.changes > 0; return success;
} }
export function moveRecordDownToBottom(recordTable, recordId) { export function moveRecordDownToBottom(recordTable, recordId) {
const database = sqlite(databasePath); const database = sqlite(databasePath);
@ -45,9 +41,7 @@ export function moveRecordDownToBottom(recordTable, recordId) {
where recordDelete_timeMillis is null`) where recordDelete_timeMillis is null`)
.get().maxOrderNumber; .get().maxOrderNumber;
if (currentOrderNumber !== maxOrderNumber) { if (currentOrderNumber !== maxOrderNumber) {
database updateRecordOrderNumber(recordTable, recordId, maxOrderNumber + 1, database);
.prepare(`update ${recordTable} set orderNumber = ? + 1 where ${recordIdColumns.get(recordTable)} = ?`)
.run(maxOrderNumber, recordId);
database database
.prepare(`update ${recordTable} .prepare(`update ${recordTable}
set orderNumber = orderNumber - 1 set orderNumber = orderNumber - 1
@ -81,9 +75,7 @@ export function moveRecordUpToTop(recordTable, recordId) {
const database = sqlite(databasePath); const database = sqlite(databasePath);
const currentOrderNumber = getCurrentOrderNumber(recordTable, recordId, database); const currentOrderNumber = getCurrentOrderNumber(recordTable, recordId, database);
if (currentOrderNumber > 0) { if (currentOrderNumber > 0) {
database updateRecordOrderNumber(recordTable, recordId, -1, database);
.prepare(`update ${recordTable} set orderNumber = -1 where ${recordIdColumns.get(recordTable)} = ?`)
.run(recordId);
database database
.prepare(`update ${recordTable} .prepare(`update ${recordTable}
set orderNumber = orderNumber + 1 set orderNumber = orderNumber + 1

23
helpers/lotOccupancyDB/moveRecord.ts
View File

@ -52,19 +52,13 @@ export function moveRecordDown(recordTable: RecordTable, recordId: number): bool
) )
.run(currentOrderNumber); .run(currentOrderNumber);
const result = database const success = updateRecordOrderNumber(recordTable, recordId, currentOrderNumber + 1, database);
.prepare(
`update ${recordTable}
set orderNumber = ? + 1
where ${recordIdColumns.get(recordTable)} = ?`
)
.run(currentOrderNumber, recordId);
database.close(); database.close();
clearCacheByTableName(recordTable); clearCacheByTableName(recordTable);
return result.changes > 0; return success;
} }
export function moveRecordDownToBottom(recordTable: RecordTable, recordId: number): boolean { export function moveRecordDownToBottom(recordTable: RecordTable, recordId: number): boolean {
@ -81,11 +75,7 @@ export function moveRecordDownToBottom(recordTable: RecordTable, recordId: numbe
.get().maxOrderNumber; .get().maxOrderNumber;
if (currentOrderNumber !== maxOrderNumber) { if (currentOrderNumber !== maxOrderNumber) {
database updateRecordOrderNumber(recordTable, recordId, maxOrderNumber + 1, database);
.prepare(
`update ${recordTable} set orderNumber = ? + 1 where ${recordIdColumns.get(recordTable)} = ?`
)
.run(maxOrderNumber, recordId);
database database
.prepare( .prepare(
@ -123,7 +113,6 @@ export function moveRecordUp(recordTable: RecordTable, recordId: number): boolea
) )
.run(currentOrderNumber); .run(currentOrderNumber);
const success = updateRecordOrderNumber(recordTable, recordId, currentOrderNumber - 1, database); const success = updateRecordOrderNumber(recordTable, recordId, currentOrderNumber - 1, database);
database.close(); database.close();
@ -139,11 +128,7 @@ export function moveRecordUpToTop(recordTable: RecordTable, recordId: number): b
const currentOrderNumber = getCurrentOrderNumber(recordTable, recordId, database); const currentOrderNumber = getCurrentOrderNumber(recordTable, recordId, database);
if (currentOrderNumber > 0) { if (currentOrderNumber > 0) {
database updateRecordOrderNumber(recordTable, recordId, -1, database);
.prepare(
`update ${recordTable} set orderNumber = -1 where ${recordIdColumns.get(recordTable)} = ?`
)
.run(recordId);
database database
.prepare( .prepare(