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

move code cleanup

deepsource-autofix-76c6eb20
Dan Gowans 2023-01-06 14:57:59 -05:00
parent 5e335c7926
commit 6d05ef2c9d
10 changed files with 93 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
handlers/admin-post/doMoveFeeDown.js
View File

@ -1,4 +1,4 @@
import { moveFeeDown, moveFeeDownToBottom } from "../../helpers/lotOccupancyDB/moveFeeDown.js";
import { moveFeeDown, moveFeeDownToBottom } from "../../helpers/lotOccupancyDB/moveFee.js";
import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js";
export const handler = async (request, response) => {
const success = request.body.moveToEnd === "1"

2
handlers/admin-post/doMoveFeeDown.ts
View File

@ -1,6 +1,6 @@
import type { RequestHandler } from "express";
import { moveFeeDown, moveFeeDownToBottom } from "../../helpers/lotOccupancyDB/moveFeeDown.js";
import { moveFeeDown, moveFeeDownToBottom } from "../../helpers/lotOccupancyDB/moveFee.js";
import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js";

2
handlers/admin-post/doMoveFeeUp.js
View File

@ -1,4 +1,4 @@
import { moveFeeUp, moveFeeUpToTop } from "../../helpers/lotOccupancyDB/moveFeeUp.js";
import { moveFeeUp, moveFeeUpToTop } from "../../helpers/lotOccupancyDB/moveFee.js";
import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js";
export const handler = async (request, response) => {
const success = request.body.moveToEnd === "1"

2
handlers/admin-post/doMoveFeeUp.ts
View File

@ -1,6 +1,6 @@
import type { RequestHandler } from "express";
import { moveFeeUp, moveFeeUpToTop } from "../../helpers/lotOccupancyDB/moveFeeUp.js";
import { moveFeeUp, moveFeeUpToTop } from "../../helpers/lotOccupancyDB/moveFee.js";
import { getFeeCategories } from "../../helpers/lotOccupancyDB/getFeeCategories.js";

2
helpers/lotOccupancyDB/moveFeeUp.d.ts → helpers/lotOccupancyDB/moveFee.d.ts vendored
View File

@ -1,3 +1,5 @@
export declare function moveFeeDown(feeId: number | string): boolean;
export declare function moveFeeDownToBottom(feeId: number | string): boolean;
export declare function moveFeeUp(feeId: number): boolean;
export declare function moveFeeUpToTop(feeId: number | string): boolean;
export default moveFeeUp;

36
helpers/lotOccupancyDB/moveFeeDown.js → helpers/lotOccupancyDB/moveFee.js
View File

@ -37,4 +37,38 @@ export function moveFeeDownToBottom(feeId) {
database.close();
return true;
}
export default moveFeeDown;
export function moveFeeUp(feeId) {
const database = sqlite(databasePath);
const currentFee = getFee(feeId, database);
if (currentFee.orderNumber <= 0) {
database.close();
return true;
}
database
.prepare(`update Fees
set orderNumber = orderNumber + 1
where recordDelete_timeMillis is null
and feeCategoryId = ?
and orderNumber = ? - 1`)
.run(currentFee.feeCategoryId, currentFee.orderNumber);
const success = updateRecordOrderNumber("Fees", feeId, currentFee.orderNumber - 1, database);
database.close();
return success;
}
export function moveFeeUpToTop(feeId) {
const database = sqlite(databasePath);
const currentFee = getFee(feeId, database);
if (currentFee.orderNumber > 0) {
updateRecordOrderNumber("Fees", feeId, -1, database);
database
.prepare(`update Fees
set orderNumber = orderNumber + 1
where recordDelete_timeMillis is null
and feeCategoryId = ?
and orderNumber < ?`)
.run(currentFee.feeCategoryId, currentFee.orderNumber);
}
database.close();
return true;
}
export default moveFeeUp;

53
helpers/lotOccupancyDB/moveFeeDown.ts → helpers/lotOccupancyDB/moveFee.ts
View File

@ -59,4 +59,55 @@ export function moveFeeDownToBottom(feeId: number | string): boolean {
return true;
}
export default moveFeeDown;
export function moveFeeUp(feeId: number): boolean {
const database = sqlite(databasePath);
const currentFee = getFee(feeId, database);
if (currentFee.orderNumber <= 0) {
database.close();
return true;
}
database
.prepare(
`update Fees
set orderNumber = orderNumber + 1
where recordDelete_timeMillis is null
and feeCategoryId = ?
and orderNumber = ? - 1`
)
.run(currentFee.feeCategoryId, currentFee.orderNumber);
const success = updateRecordOrderNumber("Fees", feeId, currentFee.orderNumber - 1, database);
database.close();
return success;
}
export function moveFeeUpToTop(feeId: number | string): boolean {
const database = sqlite(databasePath);
const currentFee = getFee(feeId, database);
if (currentFee.orderNumber > 0) {
updateRecordOrderNumber("Fees", feeId, -1, database);
database
.prepare(
`update Fees
set orderNumber = orderNumber + 1
where recordDelete_timeMillis is null
and feeCategoryId = ?
and orderNumber < ?`
)
.run(currentFee.feeCategoryId, currentFee.orderNumber);
}
database.close();
return true;
}
export default moveFeeUp;

3
helpers/lotOccupancyDB/moveFeeDown.d.ts vendored
View File

@ -1,3 +0,0 @@
export declare function moveFeeDown(feeId: number | string): boolean;
export declare function moveFeeDownToBottom(feeId: number | string): boolean;
export default moveFeeDown;

39
helpers/lotOccupancyDB/moveFeeUp.js
View File

@ -1,39 +0,0 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { getFee } from "./getFee.js";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
export function moveFeeUp(feeId) {
const database = sqlite(databasePath);
const currentFee = getFee(feeId, database);
if (currentFee.orderNumber <= 0) {
database.close();
return true;
}
database
.prepare(`update Fees
set orderNumber = orderNumber + 1
where recordDelete_timeMillis is null
and feeCategoryId = ?
and orderNumber = ? - 1`)
.run(currentFee.feeCategoryId, currentFee.orderNumber);
const success = updateRecordOrderNumber("Fees", feeId, currentFee.orderNumber - 1, database);
database.close();
return success;
}
export function moveFeeUpToTop(feeId) {
const database = sqlite(databasePath);
const currentFee = getFee(feeId, database);
if (currentFee.orderNumber > 0) {
updateRecordOrderNumber("Fees", feeId, -1, database);
database
.prepare(`update Fees
set orderNumber = orderNumber + 1
where recordDelete_timeMillis is null
and feeCategoryId = ?
and orderNumber < ?`)
.run(currentFee.feeCategoryId, currentFee.orderNumber);
}
database.close();
return true;
}
export default moveFeeUp;

59
helpers/lotOccupancyDB/moveFeeUp.ts
View File

@ -1,59 +0,0 @@
import sqlite from "better-sqlite3";
import { lotOccupancyDB as databasePath } from "../../data/databasePaths.js";
import { getFee } from "./getFee.js";
import { updateRecordOrderNumber } from "./updateRecordOrderNumber.js";
export function moveFeeUp(feeId: number): boolean {
const database = sqlite(databasePath);
const currentFee = getFee(feeId, database);
if (currentFee.orderNumber <= 0) {
database.close();
return true;
}
database
.prepare(
`update Fees
set orderNumber = orderNumber + 1
where recordDelete_timeMillis is null
and feeCategoryId = ?
and orderNumber = ? - 1`
)
.run(currentFee.feeCategoryId, currentFee.orderNumber);
const success = updateRecordOrderNumber("Fees", feeId, currentFee.orderNumber - 1, database);
database.close();
return success;
}
export function moveFeeUpToTop(feeId: number | string): boolean {
const database = sqlite(databasePath);
const currentFee = getFee(feeId, database);
if (currentFee.orderNumber > 0) {
updateRecordOrderNumber("Fees", feeId, -1, database);
database
.prepare(
`update Fees
set orderNumber = orderNumber + 1
where recordDelete_timeMillis is null
and feeCategoryId = ?
and orderNumber < ?`
)
.run(currentFee.feeCategoryId, currentFee.orderNumber);
}
database.close();
return true;
}
export default moveFeeUp;