fix inactivated typo

deepsource-autofix-76c6eb20
Dan Gowans 2023-02-28 09:58:37 -05:00
parent 81a6c9de6b
commit fb4e4cb202
8 changed files with 69 additions and 55 deletions

View File

@ -3,7 +3,7 @@ export async function handler(request, response) {
const recordCounts = await cleanupDatabase(request.session); const recordCounts = await cleanupDatabase(request.session);
response.json({ response.json({
success: true, success: true,
inactivedRecordCount: recordCounts.inactivedRecordCount, inactivatedRecordCount: recordCounts.inactivatedRecordCount,
purgedRecordCount: recordCounts.purgedRecordCount purgedRecordCount: recordCounts.purgedRecordCount
}); });
} }

View File

@ -10,7 +10,7 @@ export async function handler(
response.json({ response.json({
success: true, success: true,
inactivedRecordCount: recordCounts.inactivedRecordCount, inactivatedRecordCount: recordCounts.inactivatedRecordCount,
purgedRecordCount: recordCounts.purgedRecordCount purgedRecordCount: recordCounts.purgedRecordCount
}) })
} }

View File

@ -1,6 +1,6 @@
import type * as recordTypes from '../../types/recordTypes'; import type * as recordTypes from '../../types/recordTypes';
export declare function cleanupDatabase(requestSession: recordTypes.PartialSession): Promise<{ export declare function cleanupDatabase(requestSession: recordTypes.PartialSession): Promise<{
inactivedRecordCount: number; inactivatedRecordCount: number;
purgedRecordCount: number; purgedRecordCount: number;
}>; }>;
export default cleanupDatabase; export default cleanupDatabase;

View File

@ -7,9 +7,9 @@ export async function cleanupDatabase(requestSession) {
configFunctions.getProperty('settings.adminCleanup.recordDeleteAgeDays') * configFunctions.getProperty('settings.adminCleanup.recordDeleteAgeDays') *
86400 * 86400 *
1000; 1000;
let inactivedRecordCount = 0; let inactivatedRecordCount = 0;
let purgedRecordCount = 0; let purgedRecordCount = 0;
inactivedRecordCount += database inactivatedRecordCount += database
.prepare(`update WorkOrderComments .prepare(`update WorkOrderComments
set recordDelete_userName = ?, set recordDelete_userName = ?,
recordDelete_timeMillis = ? recordDelete_timeMillis = ?
@ -20,7 +20,7 @@ export async function cleanupDatabase(requestSession) {
purgedRecordCount += database purgedRecordCount += database
.prepare('delete from WorkOrderComments where recordDelete_timeMillis <= ?') .prepare('delete from WorkOrderComments where recordDelete_timeMillis <= ?')
.run(recordDeleteTimeMillisMin).changes; .run(recordDeleteTimeMillisMin).changes;
inactivedRecordCount += database inactivatedRecordCount += database
.prepare(`update WorkOrderLotOccupancies .prepare(`update WorkOrderLotOccupancies
set recordDelete_userName = ?, set recordDelete_userName = ?,
recordDelete_timeMillis = ? recordDelete_timeMillis = ?
@ -31,7 +31,7 @@ export async function cleanupDatabase(requestSession) {
purgedRecordCount += database purgedRecordCount += database
.prepare('delete from WorkOrderLotOccupancies where recordDelete_timeMillis <= ?') .prepare('delete from WorkOrderLotOccupancies where recordDelete_timeMillis <= ?')
.run(recordDeleteTimeMillisMin).changes; .run(recordDeleteTimeMillisMin).changes;
inactivedRecordCount += database inactivatedRecordCount += database
.prepare(`update WorkOrderLots .prepare(`update WorkOrderLots
set recordDelete_userName = ?, set recordDelete_userName = ?,
recordDelete_timeMillis = ? recordDelete_timeMillis = ?
@ -42,7 +42,7 @@ export async function cleanupDatabase(requestSession) {
purgedRecordCount += database purgedRecordCount += database
.prepare('delete from WorkOrderLots where recordDelete_timeMillis <= ?') .prepare('delete from WorkOrderLots where recordDelete_timeMillis <= ?')
.run(recordDeleteTimeMillisMin).changes; .run(recordDeleteTimeMillisMin).changes;
inactivedRecordCount += database inactivatedRecordCount += database
.prepare(`update WorkOrderMilestones .prepare(`update WorkOrderMilestones
set recordDelete_userName = ?, set recordDelete_userName = ?,
recordDelete_timeMillis = ? recordDelete_timeMillis = ?
@ -72,7 +72,7 @@ export async function cleanupDatabase(requestSession) {
where recordDelete_timeMillis <= ? where recordDelete_timeMillis <= ?
and workOrderTypeId not in (select workOrderTypeId from WorkOrders)`) and workOrderTypeId not in (select workOrderTypeId from WorkOrders)`)
.run(recordDeleteTimeMillisMin).changes; .run(recordDeleteTimeMillisMin).changes;
inactivedRecordCount += database inactivatedRecordCount += database
.prepare(`update LotOccupancyComments .prepare(`update LotOccupancyComments
set recordDelete_userName = ?, set recordDelete_userName = ?,
recordDelete_timeMillis = ? recordDelete_timeMillis = ?
@ -83,7 +83,7 @@ export async function cleanupDatabase(requestSession) {
purgedRecordCount += database purgedRecordCount += database
.prepare('delete from LotOccupancyComments where recordDelete_timeMillis <= ?') .prepare('delete from LotOccupancyComments where recordDelete_timeMillis <= ?')
.run(recordDeleteTimeMillisMin).changes; .run(recordDeleteTimeMillisMin).changes;
inactivedRecordCount += database inactivatedRecordCount += database
.prepare(`update LotOccupancyFields .prepare(`update LotOccupancyFields
set recordDelete_userName = ?, set recordDelete_userName = ?,
recordDelete_timeMillis = ? recordDelete_timeMillis = ?
@ -93,7 +93,7 @@ export async function cleanupDatabase(requestSession) {
purgedRecordCount += database purgedRecordCount += database
.prepare('delete from LotOccupancyFields where recordDelete_timeMillis <= ?') .prepare('delete from LotOccupancyFields where recordDelete_timeMillis <= ?')
.run(recordDeleteTimeMillisMin).changes; .run(recordDeleteTimeMillisMin).changes;
inactivedRecordCount += database inactivatedRecordCount += database
.prepare(`update LotOccupancyOccupants .prepare(`update LotOccupancyOccupants
set recordDelete_userName = ?, set recordDelete_userName = ?,
recordDelete_timeMillis = ? recordDelete_timeMillis = ?
@ -119,7 +119,7 @@ export async function cleanupDatabase(requestSession) {
and lotOccupancyId not in (select lotOccupancyId from LotOccupancyTransactions) and lotOccupancyId not in (select lotOccupancyId from LotOccupancyTransactions)
and lotOccupancyId not in (select lotOccupancyId from WorkOrderLotOccupancies)`) and lotOccupancyId not in (select lotOccupancyId from WorkOrderLotOccupancies)`)
.run(recordDeleteTimeMillisMin).changes; .run(recordDeleteTimeMillisMin).changes;
inactivedRecordCount += database inactivatedRecordCount += database
.prepare(`update Fees .prepare(`update Fees
set recordDelete_userName = ?, set recordDelete_userName = ?,
recordDelete_timeMillis = ? recordDelete_timeMillis = ?
@ -136,7 +136,7 @@ export async function cleanupDatabase(requestSession) {
where recordDelete_timeMillis <= ? where recordDelete_timeMillis <= ?
and feeCategoryId not in (select feeCategoryId from Fees)`) and feeCategoryId not in (select feeCategoryId from Fees)`)
.run(recordDeleteTimeMillisMin).changes; .run(recordDeleteTimeMillisMin).changes;
inactivedRecordCount += database inactivatedRecordCount += database
.prepare(`update OccupancyTypeFields .prepare(`update OccupancyTypeFields
set recordDelete_userName = ?, set recordDelete_userName = ?,
recordDelete_timeMillis = ? recordDelete_timeMillis = ?
@ -148,7 +148,7 @@ export async function cleanupDatabase(requestSession) {
where recordDelete_timeMillis <= ? where recordDelete_timeMillis <= ?
and occupancyTypeFieldId not in (select occupancyTypeFieldId from LotOccupancyFields)`) and occupancyTypeFieldId not in (select occupancyTypeFieldId from LotOccupancyFields)`)
.run(recordDeleteTimeMillisMin).changes; .run(recordDeleteTimeMillisMin).changes;
inactivedRecordCount += database inactivatedRecordCount += database
.prepare(`update OccupancyTypePrints .prepare(`update OccupancyTypePrints
set recordDelete_userName = ?, set recordDelete_userName = ?,
recordDelete_timeMillis = ? recordDelete_timeMillis = ?
@ -171,7 +171,7 @@ export async function cleanupDatabase(requestSession) {
where recordDelete_timeMillis <= ? where recordDelete_timeMillis <= ?
and lotOccupantTypeId not in (select lotOccupantTypeId from LotOccupancyOccupants)`) and lotOccupantTypeId not in (select lotOccupantTypeId from LotOccupancyOccupants)`)
.run(recordDeleteTimeMillisMin).changes; .run(recordDeleteTimeMillisMin).changes;
inactivedRecordCount += database inactivatedRecordCount += database
.prepare(`update LotComments .prepare(`update LotComments
set recordDelete_userName = ?, set recordDelete_userName = ?,
recordDelete_timeMillis = ? recordDelete_timeMillis = ?
@ -181,7 +181,7 @@ export async function cleanupDatabase(requestSession) {
purgedRecordCount += database purgedRecordCount += database
.prepare('delete from LotComments where recordDelete_timeMillis <= ?') .prepare('delete from LotComments where recordDelete_timeMillis <= ?')
.run(recordDeleteTimeMillisMin).changes; .run(recordDeleteTimeMillisMin).changes;
inactivedRecordCount += database inactivatedRecordCount += database
.prepare(`update LotFields .prepare(`update LotFields
set recordDelete_userName = ?, set recordDelete_userName = ?,
recordDelete_timeMillis = ? recordDelete_timeMillis = ?
@ -191,7 +191,7 @@ export async function cleanupDatabase(requestSession) {
purgedRecordCount += database purgedRecordCount += database
.prepare('delete from LotFields where recordDelete_timeMillis <= ?') .prepare('delete from LotFields where recordDelete_timeMillis <= ?')
.run(recordDeleteTimeMillisMin).changes; .run(recordDeleteTimeMillisMin).changes;
inactivedRecordCount += database inactivatedRecordCount += database
.prepare(`update Lots .prepare(`update Lots
set recordDelete_userName = ?, set recordDelete_userName = ?,
recordDelete_timeMillis = ? recordDelete_timeMillis = ?
@ -211,7 +211,7 @@ export async function cleanupDatabase(requestSession) {
where recordDelete_timeMillis <= ? where recordDelete_timeMillis <= ?
and lotStatusId not in (select lotStatusId from Lots)`) and lotStatusId not in (select lotStatusId from Lots)`)
.run(recordDeleteTimeMillisMin).changes; .run(recordDeleteTimeMillisMin).changes;
inactivedRecordCount += database inactivatedRecordCount += database
.prepare(`update LotTypeFields .prepare(`update LotTypeFields
set recordDelete_userName = ?, set recordDelete_userName = ?,
recordDelete_timeMillis = ? recordDelete_timeMillis = ?
@ -230,7 +230,7 @@ export async function cleanupDatabase(requestSession) {
.run(recordDeleteTimeMillisMin).changes; .run(recordDeleteTimeMillisMin).changes;
database.release(); database.release();
return { return {
inactivedRecordCount, inactivatedRecordCount,
purgedRecordCount purgedRecordCount
}; };
} }

View File

@ -6,7 +6,7 @@ import type * as recordTypes from '../../types/recordTypes'
export async function cleanupDatabase( export async function cleanupDatabase(
requestSession: recordTypes.PartialSession requestSession: recordTypes.PartialSession
): Promise<{ inactivedRecordCount: number; purgedRecordCount: number }> { ): Promise<{ inactivatedRecordCount: number; purgedRecordCount: number }> {
const database = await acquireConnection() const database = await acquireConnection()
const rightNowMillis = Date.now() const rightNowMillis = Date.now()
@ -16,14 +16,14 @@ export async function cleanupDatabase(
86_400 * 86_400 *
1000 1000
let inactivedRecordCount = 0 let inactivatedRecordCount = 0
let purgedRecordCount = 0 let purgedRecordCount = 0
/* /*
* Work Order Comments * Work Order Comments
*/ */
inactivedRecordCount += database inactivatedRecordCount += database
.prepare( .prepare(
`update WorkOrderComments `update WorkOrderComments
set recordDelete_userName = ?, set recordDelete_userName = ?,
@ -42,7 +42,7 @@ export async function cleanupDatabase(
* Work Order Lot Occupancies * Work Order Lot Occupancies
*/ */
inactivedRecordCount += database inactivatedRecordCount += database
.prepare( .prepare(
`update WorkOrderLotOccupancies `update WorkOrderLotOccupancies
set recordDelete_userName = ?, set recordDelete_userName = ?,
@ -63,7 +63,7 @@ export async function cleanupDatabase(
* Work Order Lots * Work Order Lots
*/ */
inactivedRecordCount += database inactivatedRecordCount += database
.prepare( .prepare(
`update WorkOrderLots `update WorkOrderLots
set recordDelete_userName = ?, set recordDelete_userName = ?,
@ -82,7 +82,7 @@ export async function cleanupDatabase(
* Work Order Milestones * Work Order Milestones
*/ */
inactivedRecordCount += database inactivatedRecordCount += database
.prepare( .prepare(
`update WorkOrderMilestones `update WorkOrderMilestones
set recordDelete_userName = ?, set recordDelete_userName = ?,
@ -143,7 +143,7 @@ export async function cleanupDatabase(
* Lot Occupancy Comments * Lot Occupancy Comments
*/ */
inactivedRecordCount += database inactivatedRecordCount += database
.prepare( .prepare(
`update LotOccupancyComments `update LotOccupancyComments
set recordDelete_userName = ?, set recordDelete_userName = ?,
@ -164,7 +164,7 @@ export async function cleanupDatabase(
* Lot Occupancy Fields * Lot Occupancy Fields
*/ */
inactivedRecordCount += database inactivatedRecordCount += database
.prepare( .prepare(
`update LotOccupancyFields `update LotOccupancyFields
set recordDelete_userName = ?, set recordDelete_userName = ?,
@ -184,7 +184,7 @@ export async function cleanupDatabase(
* Lot Occupancy Occupants * Lot Occupancy Occupants
*/ */
inactivedRecordCount += database inactivatedRecordCount += database
.prepare( .prepare(
`update LotOccupancyOccupants `update LotOccupancyOccupants
set recordDelete_userName = ?, set recordDelete_userName = ?,
@ -236,7 +236,7 @@ export async function cleanupDatabase(
* Fees * Fees
*/ */
inactivedRecordCount += database inactivatedRecordCount += database
.prepare( .prepare(
`update Fees `update Fees
set recordDelete_userName = ?, set recordDelete_userName = ?,
@ -270,7 +270,7 @@ export async function cleanupDatabase(
* Occupancy Type Fields * Occupancy Type Fields
*/ */
inactivedRecordCount += database inactivatedRecordCount += database
.prepare( .prepare(
`update OccupancyTypeFields `update OccupancyTypeFields
set recordDelete_userName = ?, set recordDelete_userName = ?,
@ -292,7 +292,7 @@ export async function cleanupDatabase(
* Occupancy Type Prints * Occupancy Type Prints
*/ */
inactivedRecordCount += database inactivatedRecordCount += database
.prepare( .prepare(
`update OccupancyTypePrints `update OccupancyTypePrints
set recordDelete_userName = ?, set recordDelete_userName = ?,
@ -339,7 +339,7 @@ export async function cleanupDatabase(
* Lot Comments * Lot Comments
*/ */
inactivedRecordCount += database inactivatedRecordCount += database
.prepare( .prepare(
`update LotComments `update LotComments
set recordDelete_userName = ?, set recordDelete_userName = ?,
@ -357,7 +357,7 @@ export async function cleanupDatabase(
* Lot Fields * Lot Fields
*/ */
inactivedRecordCount += database inactivatedRecordCount += database
.prepare( .prepare(
`update LotFields `update LotFields
set recordDelete_userName = ?, set recordDelete_userName = ?,
@ -375,7 +375,7 @@ export async function cleanupDatabase(
* Lots * Lots
*/ */
inactivedRecordCount += database inactivatedRecordCount += database
.prepare( .prepare(
`update Lots `update Lots
set recordDelete_userName = ?, set recordDelete_userName = ?,
@ -412,7 +412,7 @@ export async function cleanupDatabase(
* Lot Type Fields * Lot Type Fields
*/ */
inactivedRecordCount += database inactivatedRecordCount += database
.prepare( .prepare(
`update LotTypeFields `update LotTypeFields
set recordDelete_userName = ?, set recordDelete_userName = ?,
@ -445,7 +445,7 @@ export async function cleanupDatabase(
database.release() database.release()
return { return {
inactivedRecordCount, inactivatedRecordCount,
purgedRecordCount purgedRecordCount
} }
} }

View File

@ -1,12 +1,13 @@
"use strict"; "use strict";
/* eslint-disable @typescript-eslint/no-non-null-assertion, unicorn/prefer-module */ /* eslint-disable @typescript-eslint/indent, @typescript-eslint/no-non-null-assertion, unicorn/prefer-module */
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
(() => { (() => {
var _a, _b; var _a, _b;
const los = exports.los; const los = exports.los;
function doBackup() { function doBackup() {
cityssm.postJSON(los.urlPrefix + '/admin/doBackupDatabase', {}, (responseJSON) => { cityssm.postJSON(los.urlPrefix + '/admin/doBackupDatabase', {}, (rawResponseJSON) => {
var _a; var _a;
const responseJSON = rawResponseJSON;
if (responseJSON.success) { if (responseJSON.success) {
bulmaJS.alert({ bulmaJS.alert({
title: 'Database Backed Up Successfully', title: 'Database Backed Up Successfully',
@ -24,12 +25,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
}); });
} }
function doCleanup() { function doCleanup() {
cityssm.postJSON(los.urlPrefix + '/admin/doCleanupDatabase', {}, (responseJSON) => { cityssm.postJSON(los.urlPrefix + '/admin/doCleanupDatabase', {}, (rawResponseJSON) => {
var _a; var _a;
const responseJSON = rawResponseJSON;
if (responseJSON.success) { if (responseJSON.success) {
bulmaJS.alert({ bulmaJS.alert({
title: 'Database Cleaned Up Successfully', title: 'Database Cleaned Up Successfully',
message: `${responseJSON.inactivedRecordCount} records inactivated, message: `${responseJSON.inactivatedRecordCount} records inactivated,
${responseJSON.purgedRecordCount} permanently deleted.`, ${responseJSON.purgedRecordCount} permanently deleted.`,
contextualColorName: 'success' contextualColorName: 'success'
}); });

View File

@ -1,4 +1,4 @@
/* eslint-disable @typescript-eslint/no-non-null-assertion, unicorn/prefer-module */ /* eslint-disable @typescript-eslint/indent, @typescript-eslint/no-non-null-assertion, unicorn/prefer-module */
import type * as globalTypes from '../types/globalTypes' import type * as globalTypes from '../types/globalTypes'
@ -15,15 +15,21 @@ declare const bulmaJS: BulmaJS
cityssm.postJSON( cityssm.postJSON(
los.urlPrefix + '/admin/doBackupDatabase', los.urlPrefix + '/admin/doBackupDatabase',
{}, {},
(responseJSON: { (rawResponseJSON) => {
success: boolean const responseJSON = rawResponseJSON as
errorMessage?: string | {
fileName?: string success: true
}) => { fileName: string
}
| {
success: false
errorMessage: string
}
if (responseJSON.success) { if (responseJSON.success) {
bulmaJS.alert({ bulmaJS.alert({
title: 'Database Backed Up Successfully', title: 'Database Backed Up Successfully',
message: `Backed up to ${responseJSON.fileName!}`, message: `Backed up to ${responseJSON.fileName}`,
contextualColorName: 'success' contextualColorName: 'success'
}) })
} else { } else {
@ -41,16 +47,22 @@ declare const bulmaJS: BulmaJS
cityssm.postJSON( cityssm.postJSON(
los.urlPrefix + '/admin/doCleanupDatabase', los.urlPrefix + '/admin/doCleanupDatabase',
{}, {},
(responseJSON: { (rawResponseJSON) => {
success: boolean const responseJSON = rawResponseJSON as
errorMessage?: string | {
inactivedRecordCount: number success: true
purgedRecordCount: number inactivatedRecordCount: number
}) => { purgedRecordCount: number
}
| {
success: false
errorMessage: string
}
if (responseJSON.success) { if (responseJSON.success) {
bulmaJS.alert({ bulmaJS.alert({
title: 'Database Cleaned Up Successfully', title: 'Database Cleaned Up Successfully',
message: `${responseJSON.inactivedRecordCount} records inactivated, message: `${responseJSON.inactivatedRecordCount} records inactivated,
${responseJSON.purgedRecordCount} permanently deleted.`, ${responseJSON.purgedRecordCount} permanently deleted.`,
contextualColorName: 'success' contextualColorName: 'success'
}) })

View File

@ -1 +1 @@
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{var e,a;const t=exports.los;function s(){cityssm.postJSON(t.urlPrefix+"/admin/doBackupDatabase",{},e=>{var a;e.success?bulmaJS.alert({title:"Database Backed Up Successfully",message:`Backed up to ${e.fileName}`,contextualColorName:"success"}):bulmaJS.alert({title:"Error Backing Up Database",message:null!==(a=e.errorMessage)&&void 0!==a?a:"",contextualColorName:"danger"})})}function u(){cityssm.postJSON(t.urlPrefix+"/admin/doCleanupDatabase",{},e=>{var a;e.success?bulmaJS.alert({title:"Database Cleaned Up Successfully",message:`${e.inactivedRecordCount} records inactivated,\n ${e.purgedRecordCount} permanently deleted.`,contextualColorName:"success"}):bulmaJS.alert({title:"Error Cleaning Database",message:null!==(a=e.errorMessage)&&void 0!==a?a:"",contextualColorName:"danger"})})}null===(e=document.querySelector("#button--cleanupDatabase"))||void 0===e||e.addEventListener("click",()=>{bulmaJS.confirm({title:"Cleanup Database",message:"Are you sure you want to cleanup up the database?",okButton:{text:"Yes, Cleanup Database",callbackFunction:u}})}),null===(a=document.querySelector("#button--backupDatabase"))||void 0===a||a.addEventListener("click",()=>{bulmaJS.confirm({title:"Backup Database",message:"Are you sure you want to backup up the database?",okButton:{text:"Yes, Backup Database",callbackFunction:s}})})})(); "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),(()=>{var e,a;const t=exports.los;function s(){cityssm.postJSON(t.urlPrefix+"/admin/doBackupDatabase",{},e=>{var a;const t=e;t.success?bulmaJS.alert({title:"Database Backed Up Successfully",message:`Backed up to ${t.fileName}`,contextualColorName:"success"}):bulmaJS.alert({title:"Error Backing Up Database",message:null!==(a=t.errorMessage)&&void 0!==a?a:"",contextualColorName:"danger"})})}function u(){cityssm.postJSON(t.urlPrefix+"/admin/doCleanupDatabase",{},e=>{var a;const t=e;t.success?bulmaJS.alert({title:"Database Cleaned Up Successfully",message:`${t.inactivatedRecordCount} records inactivated,\n ${t.purgedRecordCount} permanently deleted.`,contextualColorName:"success"}):bulmaJS.alert({title:"Error Cleaning Database",message:null!==(a=t.errorMessage)&&void 0!==a?a:"",contextualColorName:"danger"})})}null===(e=document.querySelector("#button--cleanupDatabase"))||void 0===e||e.addEventListener("click",()=>{bulmaJS.confirm({title:"Cleanup Database",message:"Are you sure you want to cleanup up the database?",okButton:{text:"Yes, Cleanup Database",callbackFunction:u}})}),null===(a=document.querySelector("#button--backupDatabase"))||void 0===a||a.addEventListener("click",()=>{bulmaJS.confirm({title:"Backup Database",message:"Are you sure you want to backup up the database?",okButton:{text:"Yes, Backup Database",callbackFunction:s}})})})();