From fb4e4cb202ecb84a0c5c55822f20a85f517ff690 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Tue, 28 Feb 2023 09:58:37 -0500 Subject: [PATCH] fix inactivated typo --- handlers/admin-post/doCleanupDatabase.js | 2 +- handlers/admin-post/doCleanupDatabase.ts | 2 +- helpers/lotOccupancyDB/cleanupDatabase.d.ts | 2 +- helpers/lotOccupancyDB/cleanupDatabase.js | 32 ++++++++--------- helpers/lotOccupancyDB/cleanupDatabase.ts | 34 +++++++++--------- public-typescript/adminDatabase.js | 10 +++--- public-typescript/adminDatabase.ts | 40 +++++++++++++-------- public/javascripts/adminDatabase.min.js | 2 +- 8 files changed, 69 insertions(+), 55 deletions(-) diff --git a/handlers/admin-post/doCleanupDatabase.js b/handlers/admin-post/doCleanupDatabase.js index dfc30601..66e3a78b 100644 --- a/handlers/admin-post/doCleanupDatabase.js +++ b/handlers/admin-post/doCleanupDatabase.js @@ -3,7 +3,7 @@ export async function handler(request, response) { const recordCounts = await cleanupDatabase(request.session); response.json({ success: true, - inactivedRecordCount: recordCounts.inactivedRecordCount, + inactivatedRecordCount: recordCounts.inactivatedRecordCount, purgedRecordCount: recordCounts.purgedRecordCount }); } diff --git a/handlers/admin-post/doCleanupDatabase.ts b/handlers/admin-post/doCleanupDatabase.ts index 566a1ecb..b316c479 100644 --- a/handlers/admin-post/doCleanupDatabase.ts +++ b/handlers/admin-post/doCleanupDatabase.ts @@ -10,7 +10,7 @@ export async function handler( response.json({ success: true, - inactivedRecordCount: recordCounts.inactivedRecordCount, + inactivatedRecordCount: recordCounts.inactivatedRecordCount, purgedRecordCount: recordCounts.purgedRecordCount }) } diff --git a/helpers/lotOccupancyDB/cleanupDatabase.d.ts b/helpers/lotOccupancyDB/cleanupDatabase.d.ts index 062d9e5d..b937a415 100644 --- a/helpers/lotOccupancyDB/cleanupDatabase.d.ts +++ b/helpers/lotOccupancyDB/cleanupDatabase.d.ts @@ -1,6 +1,6 @@ import type * as recordTypes from '../../types/recordTypes'; export declare function cleanupDatabase(requestSession: recordTypes.PartialSession): Promise<{ - inactivedRecordCount: number; + inactivatedRecordCount: number; purgedRecordCount: number; }>; export default cleanupDatabase; diff --git a/helpers/lotOccupancyDB/cleanupDatabase.js b/helpers/lotOccupancyDB/cleanupDatabase.js index cb250706..27c9b2bc 100644 --- a/helpers/lotOccupancyDB/cleanupDatabase.js +++ b/helpers/lotOccupancyDB/cleanupDatabase.js @@ -7,9 +7,9 @@ export async function cleanupDatabase(requestSession) { configFunctions.getProperty('settings.adminCleanup.recordDeleteAgeDays') * 86400 * 1000; - let inactivedRecordCount = 0; + let inactivatedRecordCount = 0; let purgedRecordCount = 0; - inactivedRecordCount += database + inactivatedRecordCount += database .prepare(`update WorkOrderComments set recordDelete_userName = ?, recordDelete_timeMillis = ? @@ -20,7 +20,7 @@ export async function cleanupDatabase(requestSession) { purgedRecordCount += database .prepare('delete from WorkOrderComments where recordDelete_timeMillis <= ?') .run(recordDeleteTimeMillisMin).changes; - inactivedRecordCount += database + inactivatedRecordCount += database .prepare(`update WorkOrderLotOccupancies set recordDelete_userName = ?, recordDelete_timeMillis = ? @@ -31,7 +31,7 @@ export async function cleanupDatabase(requestSession) { purgedRecordCount += database .prepare('delete from WorkOrderLotOccupancies where recordDelete_timeMillis <= ?') .run(recordDeleteTimeMillisMin).changes; - inactivedRecordCount += database + inactivatedRecordCount += database .prepare(`update WorkOrderLots set recordDelete_userName = ?, recordDelete_timeMillis = ? @@ -42,7 +42,7 @@ export async function cleanupDatabase(requestSession) { purgedRecordCount += database .prepare('delete from WorkOrderLots where recordDelete_timeMillis <= ?') .run(recordDeleteTimeMillisMin).changes; - inactivedRecordCount += database + inactivatedRecordCount += database .prepare(`update WorkOrderMilestones set recordDelete_userName = ?, recordDelete_timeMillis = ? @@ -72,7 +72,7 @@ export async function cleanupDatabase(requestSession) { where recordDelete_timeMillis <= ? and workOrderTypeId not in (select workOrderTypeId from WorkOrders)`) .run(recordDeleteTimeMillisMin).changes; - inactivedRecordCount += database + inactivatedRecordCount += database .prepare(`update LotOccupancyComments set recordDelete_userName = ?, recordDelete_timeMillis = ? @@ -83,7 +83,7 @@ export async function cleanupDatabase(requestSession) { purgedRecordCount += database .prepare('delete from LotOccupancyComments where recordDelete_timeMillis <= ?') .run(recordDeleteTimeMillisMin).changes; - inactivedRecordCount += database + inactivatedRecordCount += database .prepare(`update LotOccupancyFields set recordDelete_userName = ?, recordDelete_timeMillis = ? @@ -93,7 +93,7 @@ export async function cleanupDatabase(requestSession) { purgedRecordCount += database .prepare('delete from LotOccupancyFields where recordDelete_timeMillis <= ?') .run(recordDeleteTimeMillisMin).changes; - inactivedRecordCount += database + inactivatedRecordCount += database .prepare(`update LotOccupancyOccupants set recordDelete_userName = ?, 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 WorkOrderLotOccupancies)`) .run(recordDeleteTimeMillisMin).changes; - inactivedRecordCount += database + inactivatedRecordCount += database .prepare(`update Fees set recordDelete_userName = ?, recordDelete_timeMillis = ? @@ -136,7 +136,7 @@ export async function cleanupDatabase(requestSession) { where recordDelete_timeMillis <= ? and feeCategoryId not in (select feeCategoryId from Fees)`) .run(recordDeleteTimeMillisMin).changes; - inactivedRecordCount += database + inactivatedRecordCount += database .prepare(`update OccupancyTypeFields set recordDelete_userName = ?, recordDelete_timeMillis = ? @@ -148,7 +148,7 @@ export async function cleanupDatabase(requestSession) { where recordDelete_timeMillis <= ? and occupancyTypeFieldId not in (select occupancyTypeFieldId from LotOccupancyFields)`) .run(recordDeleteTimeMillisMin).changes; - inactivedRecordCount += database + inactivatedRecordCount += database .prepare(`update OccupancyTypePrints set recordDelete_userName = ?, recordDelete_timeMillis = ? @@ -171,7 +171,7 @@ export async function cleanupDatabase(requestSession) { where recordDelete_timeMillis <= ? and lotOccupantTypeId not in (select lotOccupantTypeId from LotOccupancyOccupants)`) .run(recordDeleteTimeMillisMin).changes; - inactivedRecordCount += database + inactivatedRecordCount += database .prepare(`update LotComments set recordDelete_userName = ?, recordDelete_timeMillis = ? @@ -181,7 +181,7 @@ export async function cleanupDatabase(requestSession) { purgedRecordCount += database .prepare('delete from LotComments where recordDelete_timeMillis <= ?') .run(recordDeleteTimeMillisMin).changes; - inactivedRecordCount += database + inactivatedRecordCount += database .prepare(`update LotFields set recordDelete_userName = ?, recordDelete_timeMillis = ? @@ -191,7 +191,7 @@ export async function cleanupDatabase(requestSession) { purgedRecordCount += database .prepare('delete from LotFields where recordDelete_timeMillis <= ?') .run(recordDeleteTimeMillisMin).changes; - inactivedRecordCount += database + inactivatedRecordCount += database .prepare(`update Lots set recordDelete_userName = ?, recordDelete_timeMillis = ? @@ -211,7 +211,7 @@ export async function cleanupDatabase(requestSession) { where recordDelete_timeMillis <= ? and lotStatusId not in (select lotStatusId from Lots)`) .run(recordDeleteTimeMillisMin).changes; - inactivedRecordCount += database + inactivatedRecordCount += database .prepare(`update LotTypeFields set recordDelete_userName = ?, recordDelete_timeMillis = ? @@ -230,7 +230,7 @@ export async function cleanupDatabase(requestSession) { .run(recordDeleteTimeMillisMin).changes; database.release(); return { - inactivedRecordCount, + inactivatedRecordCount, purgedRecordCount }; } diff --git a/helpers/lotOccupancyDB/cleanupDatabase.ts b/helpers/lotOccupancyDB/cleanupDatabase.ts index 12f8fc3d..8f960160 100644 --- a/helpers/lotOccupancyDB/cleanupDatabase.ts +++ b/helpers/lotOccupancyDB/cleanupDatabase.ts @@ -6,7 +6,7 @@ import type * as recordTypes from '../../types/recordTypes' export async function cleanupDatabase( requestSession: recordTypes.PartialSession -): Promise<{ inactivedRecordCount: number; purgedRecordCount: number }> { +): Promise<{ inactivatedRecordCount: number; purgedRecordCount: number }> { const database = await acquireConnection() const rightNowMillis = Date.now() @@ -16,14 +16,14 @@ export async function cleanupDatabase( 86_400 * 1000 - let inactivedRecordCount = 0 + let inactivatedRecordCount = 0 let purgedRecordCount = 0 /* * Work Order Comments */ - inactivedRecordCount += database + inactivatedRecordCount += database .prepare( `update WorkOrderComments set recordDelete_userName = ?, @@ -42,7 +42,7 @@ export async function cleanupDatabase( * Work Order Lot Occupancies */ - inactivedRecordCount += database + inactivatedRecordCount += database .prepare( `update WorkOrderLotOccupancies set recordDelete_userName = ?, @@ -63,7 +63,7 @@ export async function cleanupDatabase( * Work Order Lots */ - inactivedRecordCount += database + inactivatedRecordCount += database .prepare( `update WorkOrderLots set recordDelete_userName = ?, @@ -82,7 +82,7 @@ export async function cleanupDatabase( * Work Order Milestones */ - inactivedRecordCount += database + inactivatedRecordCount += database .prepare( `update WorkOrderMilestones set recordDelete_userName = ?, @@ -143,7 +143,7 @@ export async function cleanupDatabase( * Lot Occupancy Comments */ - inactivedRecordCount += database + inactivatedRecordCount += database .prepare( `update LotOccupancyComments set recordDelete_userName = ?, @@ -164,7 +164,7 @@ export async function cleanupDatabase( * Lot Occupancy Fields */ - inactivedRecordCount += database + inactivatedRecordCount += database .prepare( `update LotOccupancyFields set recordDelete_userName = ?, @@ -184,7 +184,7 @@ export async function cleanupDatabase( * Lot Occupancy Occupants */ - inactivedRecordCount += database + inactivatedRecordCount += database .prepare( `update LotOccupancyOccupants set recordDelete_userName = ?, @@ -236,7 +236,7 @@ export async function cleanupDatabase( * Fees */ - inactivedRecordCount += database + inactivatedRecordCount += database .prepare( `update Fees set recordDelete_userName = ?, @@ -270,7 +270,7 @@ export async function cleanupDatabase( * Occupancy Type Fields */ - inactivedRecordCount += database + inactivatedRecordCount += database .prepare( `update OccupancyTypeFields set recordDelete_userName = ?, @@ -292,7 +292,7 @@ export async function cleanupDatabase( * Occupancy Type Prints */ - inactivedRecordCount += database + inactivatedRecordCount += database .prepare( `update OccupancyTypePrints set recordDelete_userName = ?, @@ -339,7 +339,7 @@ export async function cleanupDatabase( * Lot Comments */ - inactivedRecordCount += database + inactivatedRecordCount += database .prepare( `update LotComments set recordDelete_userName = ?, @@ -357,7 +357,7 @@ export async function cleanupDatabase( * Lot Fields */ - inactivedRecordCount += database + inactivatedRecordCount += database .prepare( `update LotFields set recordDelete_userName = ?, @@ -375,7 +375,7 @@ export async function cleanupDatabase( * Lots */ - inactivedRecordCount += database + inactivatedRecordCount += database .prepare( `update Lots set recordDelete_userName = ?, @@ -412,7 +412,7 @@ export async function cleanupDatabase( * Lot Type Fields */ - inactivedRecordCount += database + inactivatedRecordCount += database .prepare( `update LotTypeFields set recordDelete_userName = ?, @@ -445,7 +445,7 @@ export async function cleanupDatabase( database.release() return { - inactivedRecordCount, + inactivatedRecordCount, purgedRecordCount } } diff --git a/public-typescript/adminDatabase.js b/public-typescript/adminDatabase.js index 12ea2d24..82520407 100644 --- a/public-typescript/adminDatabase.js +++ b/public-typescript/adminDatabase.js @@ -1,12 +1,13 @@ "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 }); (() => { var _a, _b; const los = exports.los; function doBackup() { - cityssm.postJSON(los.urlPrefix + '/admin/doBackupDatabase', {}, (responseJSON) => { + cityssm.postJSON(los.urlPrefix + '/admin/doBackupDatabase', {}, (rawResponseJSON) => { var _a; + const responseJSON = rawResponseJSON; if (responseJSON.success) { bulmaJS.alert({ title: 'Database Backed Up Successfully', @@ -24,12 +25,13 @@ Object.defineProperty(exports, "__esModule", { value: true }); }); } function doCleanup() { - cityssm.postJSON(los.urlPrefix + '/admin/doCleanupDatabase', {}, (responseJSON) => { + cityssm.postJSON(los.urlPrefix + '/admin/doCleanupDatabase', {}, (rawResponseJSON) => { var _a; + const responseJSON = rawResponseJSON; if (responseJSON.success) { bulmaJS.alert({ title: 'Database Cleaned Up Successfully', - message: `${responseJSON.inactivedRecordCount} records inactivated, + message: `${responseJSON.inactivatedRecordCount} records inactivated, ${responseJSON.purgedRecordCount} permanently deleted.`, contextualColorName: 'success' }); diff --git a/public-typescript/adminDatabase.ts b/public-typescript/adminDatabase.ts index b7194b3a..34432044 100644 --- a/public-typescript/adminDatabase.ts +++ b/public-typescript/adminDatabase.ts @@ -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' @@ -15,15 +15,21 @@ declare const bulmaJS: BulmaJS cityssm.postJSON( los.urlPrefix + '/admin/doBackupDatabase', {}, - (responseJSON: { - success: boolean - errorMessage?: string - fileName?: string - }) => { + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as + | { + success: true + fileName: string + } + | { + success: false + errorMessage: string + } + if (responseJSON.success) { bulmaJS.alert({ title: 'Database Backed Up Successfully', - message: `Backed up to ${responseJSON.fileName!}`, + message: `Backed up to ${responseJSON.fileName}`, contextualColorName: 'success' }) } else { @@ -41,16 +47,22 @@ declare const bulmaJS: BulmaJS cityssm.postJSON( los.urlPrefix + '/admin/doCleanupDatabase', {}, - (responseJSON: { - success: boolean - errorMessage?: string - inactivedRecordCount: number - purgedRecordCount: number - }) => { + (rawResponseJSON) => { + const responseJSON = rawResponseJSON as + | { + success: true + inactivatedRecordCount: number + purgedRecordCount: number + } + | { + success: false + errorMessage: string + } + if (responseJSON.success) { bulmaJS.alert({ title: 'Database Cleaned Up Successfully', - message: `${responseJSON.inactivedRecordCount} records inactivated, + message: `${responseJSON.inactivatedRecordCount} records inactivated, ${responseJSON.purgedRecordCount} permanently deleted.`, contextualColorName: 'success' }) diff --git a/public/javascripts/adminDatabase.min.js b/public/javascripts/adminDatabase.min.js index 20466482..59957f65 100644 --- a/public/javascripts/adminDatabase.min.js +++ b/public/javascripts/adminDatabase.min.js @@ -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}})})})(); \ No newline at end of file +"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}})})})(); \ No newline at end of file