From 059917f43d6d7f29b3839a693eddb677c22ee709 Mon Sep 17 00:00:00 2001
From: Dan Gowans <d.gowans@cityssm.on.ca>
Date: Fri, 31 Mar 2023 09:27:35 -0400
Subject: [PATCH] preload caches

---
 app.js                       |  2 ++
 app.ts                       |  2 +-
 helpers/functions.cache.d.ts |  2 +-
 helpers/functions.cache.js   | 14 +++++++-------
 helpers/functions.cache.ts   | 14 +++++++-------
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app.js b/app.js
index 54b294c9..76f31caf 100644
--- a/app.js
+++ b/app.js
@@ -19,6 +19,7 @@ import routerLotOccupancies from './routes/lotOccupancies.js';
 import routerWorkOrders from './routes/workOrders.js';
 import routerReports from './routes/reports.js';
 import routerAdmin from './routes/admin.js';
+import { preloadCaches } from './helpers/functions.cache.js';
 import * as configFunctions from './helpers/functions.config.js';
 import * as printFunctions from './helpers/functions.print.js';
 import * as dateTimeFns from '@cityssm/utils-datetime';
@@ -32,6 +33,7 @@ import { useTestDatabases } from './data/databasePaths.js';
 import Debug from 'debug';
 const debug = Debug(`lot-occupancy-system:app:${process.pid}`);
 databaseInitializer.initializeDatabase();
+await preloadCaches();
 const _dirname = '.';
 export const app = express();
 app.disable('X-Powered-By');
diff --git a/app.ts b/app.ts
index 87f01d7e..d0adadd3 100644
--- a/app.ts
+++ b/app.ts
@@ -54,7 +54,7 @@ databaseInitializer.initializeDatabase()
  * PRELOAD CACHES
  */
 
-// preloadCaches()
+await preloadCaches()
 
 /*
  * INITIALIZE APP
diff --git a/helpers/functions.cache.d.ts b/helpers/functions.cache.d.ts
index a153ac1d..fd037a8d 100644
--- a/helpers/functions.cache.d.ts
+++ b/helpers/functions.cache.d.ts
@@ -18,5 +18,5 @@ export declare function getWorkOrderTypeById(workOrderTypeId: number): Promise<r
 export declare function getWorkOrderMilestoneTypes(): Promise<recordTypes.WorkOrderMilestoneType[]>;
 export declare function getWorkOrderMilestoneTypeById(workOrderMilestoneTypeId: number): Promise<recordTypes.WorkOrderMilestoneType | undefined>;
 export declare function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrderMilestoneTypeString: string): Promise<recordTypes.WorkOrderMilestoneType | undefined>;
-export declare function preloadCaches(): void;
+export declare function preloadCaches(): Promise<void>;
 export declare function clearCacheByTableName(tableName: string, relayMessage?: boolean): void;
diff --git a/helpers/functions.cache.js b/helpers/functions.cache.js
index aa1b12b8..585cc1b5 100644
--- a/helpers/functions.cache.js
+++ b/helpers/functions.cache.js
@@ -160,14 +160,14 @@ export async function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(workOrde
             workOrderMilestoneTypeLowerCase);
     });
 }
-export function preloadCaches() {
+export async function preloadCaches() {
     debug('Preloading caches');
-    void getLotOccupantTypes();
-    void getLotStatuses();
-    void getLotTypes();
-    void getOccupancyTypes();
-    void getWorkOrderTypes();
-    void getWorkOrderMilestoneTypes();
+    await getLotOccupantTypes();
+    await getLotStatuses();
+    await getLotTypes();
+    await getOccupancyTypes();
+    await getWorkOrderTypes();
+    await getWorkOrderMilestoneTypes();
 }
 function clearWorkOrderMilestoneTypesCache() {
     workOrderMilestoneTypes = undefined;
diff --git a/helpers/functions.cache.ts b/helpers/functions.cache.ts
index 08b0ccc9..7f339d37 100644
--- a/helpers/functions.cache.ts
+++ b/helpers/functions.cache.ts
@@ -298,14 +298,14 @@ export async function getWorkOrderMilestoneTypeByWorkOrderMilestoneType(
   })
 }
 
-export function preloadCaches(): void {
+export async function preloadCaches(): Promise<void> {
   debug('Preloading caches')
-  void getLotOccupantTypes()
-  void getLotStatuses()
-  void getLotTypes()
-  void getOccupancyTypes()
-  void getWorkOrderTypes()
-  void getWorkOrderMilestoneTypes()
+  await getLotOccupantTypes()
+  await getLotStatuses()
+  await getLotTypes()
+  await getOccupancyTypes()
+  await getWorkOrderTypes()
+  await getWorkOrderMilestoneTypes()
 }
 
 function clearWorkOrderMilestoneTypesCache(): void {