From 62419a83fbfdbb6653ab22b7b47f041d265361ac Mon Sep 17 00:00:00 2001
From: Dan Gowans <d.gowans@cityssm.on.ca>
Date: Fri, 6 Jan 2023 15:02:55 -0500
Subject: [PATCH] reduce duplication

---
 helpers/lotOccupancyDB/moveRecord.js | 16 ++++------------
 helpers/lotOccupancyDB/moveRecord.ts | 23 ++++-------------------
 2 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/helpers/lotOccupancyDB/moveRecord.js b/helpers/lotOccupancyDB/moveRecord.js
index 4159fb8f..65d3921a 100644
--- a/helpers/lotOccupancyDB/moveRecord.js
+++ b/helpers/lotOccupancyDB/moveRecord.js
@@ -27,14 +27,10 @@ export function moveRecordDown(recordTable, recordId) {
                 where recordDelete_timeMillis is null
                 and orderNumber = ? + 1`)
         .run(currentOrderNumber);
-    const result = database
-        .prepare(`update ${recordTable}
-                set orderNumber = ? + 1
-                where ${recordIdColumns.get(recordTable)} = ?`)
-        .run(currentOrderNumber, recordId);
+    const success = updateRecordOrderNumber(recordTable, recordId, currentOrderNumber + 1, database);
     database.close();
     clearCacheByTableName(recordTable);
-    return result.changes > 0;
+    return success;
 }
 export function moveRecordDownToBottom(recordTable, recordId) {
     const database = sqlite(databasePath);
@@ -45,9 +41,7 @@ export function moveRecordDownToBottom(recordTable, recordId) {
                 where recordDelete_timeMillis is null`)
         .get().maxOrderNumber;
     if (currentOrderNumber !== maxOrderNumber) {
-        database
-            .prepare(`update ${recordTable} set orderNumber = ? + 1 where ${recordIdColumns.get(recordTable)} = ?`)
-            .run(maxOrderNumber, recordId);
+        updateRecordOrderNumber(recordTable, recordId, maxOrderNumber + 1, database);
         database
             .prepare(`update ${recordTable}
                     set orderNumber = orderNumber - 1
@@ -81,9 +75,7 @@ export function moveRecordUpToTop(recordTable, recordId) {
     const database = sqlite(databasePath);
     const currentOrderNumber = getCurrentOrderNumber(recordTable, recordId, database);
     if (currentOrderNumber > 0) {
-        database
-            .prepare(`update ${recordTable} set orderNumber = -1 where ${recordIdColumns.get(recordTable)} = ?`)
-            .run(recordId);
+        updateRecordOrderNumber(recordTable, recordId, -1, database);
         database
             .prepare(`update ${recordTable}
                     set orderNumber = orderNumber + 1
diff --git a/helpers/lotOccupancyDB/moveRecord.ts b/helpers/lotOccupancyDB/moveRecord.ts
index 517def71..d649e575 100644
--- a/helpers/lotOccupancyDB/moveRecord.ts
+++ b/helpers/lotOccupancyDB/moveRecord.ts
@@ -52,19 +52,13 @@ export function moveRecordDown(recordTable: RecordTable, recordId: number): bool
         )
         .run(currentOrderNumber);
 
-    const result = database
-        .prepare(
-            `update ${recordTable}
-                set orderNumber = ? + 1
-                where ${recordIdColumns.get(recordTable)} = ?`
-        )
-        .run(currentOrderNumber, recordId);
+    const success = updateRecordOrderNumber(recordTable, recordId, currentOrderNumber + 1, database);
 
     database.close();
 
     clearCacheByTableName(recordTable);
 
-    return result.changes > 0;
+    return success;
 }
 
 export function moveRecordDownToBottom(recordTable: RecordTable, recordId: number): boolean {
@@ -81,11 +75,7 @@ export function moveRecordDownToBottom(recordTable: RecordTable, recordId: numbe
         .get().maxOrderNumber;
 
     if (currentOrderNumber !== maxOrderNumber) {
-        database
-            .prepare(
-                `update ${recordTable} set orderNumber = ? + 1 where ${recordIdColumns.get(recordTable)} = ?`
-            )
-            .run(maxOrderNumber, recordId);
+        updateRecordOrderNumber(recordTable, recordId, maxOrderNumber + 1, database);
 
         database
             .prepare(
@@ -123,7 +113,6 @@ export function moveRecordUp(recordTable: RecordTable, recordId: number): boolea
         )
         .run(currentOrderNumber);
 
-
     const success = updateRecordOrderNumber(recordTable, recordId, currentOrderNumber - 1, database);
 
     database.close();
@@ -139,11 +128,7 @@ export function moveRecordUpToTop(recordTable: RecordTable, recordId: number): b
     const currentOrderNumber = getCurrentOrderNumber(recordTable, recordId, database);
 
     if (currentOrderNumber > 0) {
-        database
-            .prepare(
-                `update ${recordTable} set orderNumber = -1 where ${recordIdColumns.get(recordTable)} = ?`
-            )
-            .run(recordId);
+        updateRecordOrderNumber(recordTable, recordId, -1, database);
 
         database
             .prepare(