update create-app templates

cloud-carbon-footprint · Jun 9, 2023 · 8995b8a · 8995b8a
1 parent e640034
commit 8995b8a
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 6 deletions.
diff --git a/packages/create-app/templates/default-app/packages/api/src/api.ts b/packages/create-app/templates/default-app/packages/api/src/api.ts
@@ -22,7 +22,7 @@ import {
   RecommendationsRequestValidationError,
 } from '@cloud-carbon-footprint/common'
 
-const apiLogger = new Logger('api')
+const apiLogger = new Logger('API')
 
 /**
  * Returns the raw estimates

diff --git a/packages/create-app/templates/default-app/packages/api/src/server.ts b/packages/create-app/templates/default-app/packages/api/src/server.ts
@@ -12,18 +12,24 @@ import cors, { CorsOptions } from 'cors'
 
 import { createRouter } from './api'
 import auth from './auth'
-import { Logger } from '@cloud-carbon-footprint/common'
+import { Logger, configLoader } from '@cloud-carbon-footprint/common'
+import MongoDbCacheManager from '@cloud-carbon-footprint/app/src/MongoDbCacheManager'
 
 const port = process.env.PORT || 4000
 const httpApp = express()
-const serverLogger = new Logger('server')
+const serverLogger = new Logger('Server')
 
 if (process.env.NODE_ENV === 'production') {
   httpApp.use(auth)
 }
 
 httpApp.use(helmet())
 
+// Establish Mongo Connection if cache method selected
+if (configLoader()?.CACHE_MODE === 'MONGODB') {
+  MongoDbCacheManager.createDbConnection()
+}
+
 if (process.env.ENABLE_CORS) {
   const corsOptions: CorsOptions = {
     optionsSuccessStatus: 200,
@@ -46,3 +52,13 @@ httpApp.listen(port, () =>
     `Cloud Carbon Footprint Server listening at http://localhost:${port}`,
   ),
 )
+
+// Instructions for graceful shutdown
+process.on('SIGINT', async () => {
+  if (configLoader()?.CACHE_MODE === 'MONGODB') {
+    await MongoDbCacheManager.mongoClient.close()
+    serverLogger.info('\nMongoDB connection closed')
+  }
+  serverLogger.info('Cloud Carbon Footprint Server shutting down...')
+  process.exit()
+})
diff --git a/packages/create-app/templates/default-app/packages/cli/src/SeedCacheFile/seedCacheFile.ts b/packages/create-app/templates/default-app/packages/cli/src/SeedCacheFile/seedCacheFile.ts
@@ -4,7 +4,12 @@
 
 import moment, { Moment } from 'moment'
 import { inputPrompt, listPrompt } from '../common'
-import { App, createValidFootprintRequest } from '@cloud-carbon-footprint/app'
+import {
+  App,
+  createValidFootprintRequest,
+  MongoDbCacheManager,
+} from '@cloud-carbon-footprint/app'
+import { configLoader } from '@cloud-carbon-footprint/common'
 
 /**
  * Logs the progress of the estimate request based on the given date range
@@ -73,6 +78,10 @@ export default async function seedCacheFile(): Promise<void> {
     }...`,
   )
 
+  if (configLoader().CACHE_MODE === 'MONGODB') {
+    await MongoDbCacheManager.createDbConnection()
+  }
+
   // Makes getCostAndEstimates requests in chunks based on request method and day frequency
   while (currentDate.isSameOrBefore(endDate)) {
     // Use the current date window as the inclusive start/end date of the request
@@ -92,6 +101,11 @@ export default async function seedCacheFile(): Promise<void> {
     currentDate.add(daysPerRequest, 'day')
   }
 
+  if (configLoader().CACHE_MODE === 'MONGODB') {
+    await MongoDbCacheManager.mongoClient.close()
+    console.info('MongoDB connection closed')
+  }
+
   console.info(
     `Done! Estimates have been successfully seeded to the cache file!`,
   )

diff --git a/packages/create-app/templates/default-app/packages/cli/src/cli.ts b/packages/create-app/templates/default-app/packages/cli/src/cli.ts
@@ -7,8 +7,12 @@ import moment from 'moment'
 import path from 'path'
 import * as process from 'process'
 
-import { App, createValidFootprintRequest } from '@cloud-carbon-footprint/app'
-import { EstimationResult } from '@cloud-carbon-footprint/common'
+import {
+  App,
+  createValidFootprintRequest,
+  MongoDbCacheManager,
+} from '@cloud-carbon-footprint/app'
+import { EstimationResult, configLoader } from '@cloud-carbon-footprint/common'
 
 import EmissionsByDayAndServiceTable from './EmissionsByDayAndServiceTable'
 import EmissionsByServiceTable from './EmissionsByServiceTable'
@@ -64,6 +68,10 @@ export default async function cli(argv: string[] = process.argv) {
     groupBy: 'day', // So that estimates are cached the same regardless of table grouping method
   })
 
+  if (configLoader().CACHE_MODE === 'MONGODB') {
+    await MongoDbCacheManager.createDbConnection()
+  }
+
   const { table, colWidths } = await new App()
     .getCostAndEstimates(estimationRequest)
     .then((estimations: EstimationResult[]) => {
@@ -76,6 +84,11 @@ export default async function cli(argv: string[] = process.argv) {
       return EmissionsByDayAndServiceTable(estimations)
     })
 
+  if (configLoader().CACHE_MODE === 'MONGODB') {
+    await MongoDbCacheManager.mongoClient.close()
+    console.log('MongoDB connection closed')
+  }
+
   if (format === 'csv') {
     const filePath = path.join(
       process.cwd(),