Update databaseHelper.ts

api/src/common/databaseHelper.ts

@@ -21,7 +21,7 @@ import User from '../models/User'
  * @param {boolean} debug
  * @returns {Promise<boolean>}
  */
-export const Connect = async (uri: string, ssl: boolean, debug: boolean): Promise<boolean> => {
+export const connect = async (uri: string, ssl: boolean, debug: boolean): Promise<boolean> => {
   let options: ConnectOptions = {}
 
   if (ssl) {
@@ -53,7 +53,7 @@ export const Connect = async (uri: string, ssl: boolean, debug: boolean): Promis
  * @param {boolean} force
  * @returns {Promise<void>}
  */
-export const Close = async (force: boolean = false): Promise<void> => {
+export const close = async (force: boolean = false): Promise<void> => {
   await mongoose.connection.close(force)
 }
 

api/src/index.ts

@@ -8,7 +8,7 @@ import * as databaseHelper from './common/databaseHelper'
 import * as env from './config/env.config'
 import * as logger from './common/logger'
 
-if (await databaseHelper.Connect(env.DB_URI, env.DB_SSL, env.DB_DEBUG) && await databaseHelper.initialize()) {
+if (await databaseHelper.connect(env.DB_URI, env.DB_SSL, env.DB_DEBUG) && await databaseHelper.initialize()) {
     let server: http.Server | https.Server
 
     if (env.HTTPS) {
@@ -31,7 +31,7 @@ if (await databaseHelper.Connect(env.DB_URI, env.DB_SSL, env.DB_DEBUG) && await
         logger.info('Gracefully stopping...')
         server.close(async () => {
             logger.info(`HTTP${env.HTTPS ? 'S' : ''} server closed`)
-            await databaseHelper.Close(true)
+            await databaseHelper.close(true)
             logger.info('MongoDB connection closed')
             process.exit(0)
         })

api/tests/agency.test.ts

@@ -27,7 +27,7 @@ let AGENCY1_NAME: string
 beforeAll(async () => {
   testHelper.initializeLogger()
 
-  const res = await databaseHelper.Connect(env.DB_URI, false, false)
+  const res = await databaseHelper.connect(env.DB_URI, false, false)
   expect(res).toBeTruthy()
 
   await testHelper.initialize()
@@ -50,7 +50,7 @@ afterAll(async () => {
     await testHelper.deleteAgency(AGENCY1_ID)
     await testHelper.deleteAgency(AGENCY2_ID)
 
-    await databaseHelper.Close()
+    await databaseHelper.close()
   }
 })
 
@@ -187,11 +187,11 @@ describe('GET /api/all-agencies', () => {
     expect(res.statusCode).toBe(200)
     expect(res.body.length).toBeGreaterThan(1)
 
-    await databaseHelper.Close()
+    await databaseHelper.close()
     res = await request(app)
       .get('/api/all-agencies')
     expect(res.statusCode).toBe(400)
-    expect(await databaseHelper.Connect(env.DB_URI, false, false)).toBeTruthy()
+    expect(await databaseHelper.connect(env.DB_URI, false, false)).toBeTruthy()
   })
 })
 

api/tests/booking.test.ts

@@ -28,7 +28,7 @@ let BOOKING_ID: string
 beforeAll(async () => {
   testHelper.initializeLogger()
 
-  const res = await databaseHelper.Connect(env.DB_URI, false, false)
+  const res = await databaseHelper.connect(env.DB_URI, false, false)
   expect(res).toBeTruthy()
 
   await testHelper.initialize()
@@ -99,7 +99,7 @@ afterAll(async () => {
     // delete renters
     await User.deleteOne({ _id: { $in: [RENTER1_ID, RENTER2_ID] } })
 
-    await databaseHelper.Close()
+    await databaseHelper.close()
   }
 })
 
@@ -609,14 +609,14 @@ describe('DELETE /api/delete-temp-booking', () => {
     // Test failure
     //
     try {
-      await databaseHelper.Close()
+      await databaseHelper.close()
       res = await request(app)
         .delete(`/api/delete-temp-booking/${booking._id.toString()}/${sessionId}`)
       expect(res.statusCode).toBe(400)
     } catch (err) {
       console.error(err)
     } finally {
-      const connRes = await databaseHelper.Connect(env.DB_URI, false, false)
+      const connRes = await databaseHelper.connect(env.DB_URI, false, false)
       expect(connRes).toBeTruthy()
     }
   })

api/tests/database.test.ts

@@ -9,15 +9,15 @@ beforeAll(() => {
 
 describe('Test database connection', () => {
   it('should connect to database', async () => {
-    const res = await databaseHelper.Connect(env.DB_URI, false, false)
+    const res = await databaseHelper.connect(env.DB_URI, false, false)
     expect(res).toBeTruthy()
-    await databaseHelper.Close()
+    await databaseHelper.close()
   })
 })
 
 describe('Test database connection failure', () => {
   it('should fail connecting to database', async () => {
-    const res = await databaseHelper.Connect('wrong-uri', true, false)
+    const res = await databaseHelper.connect('wrong-uri', true, false)
     expect(res).toBeFalsy()
   })
 })

api/tests/index.test.ts

@@ -12,7 +12,7 @@ import Token, { TOKEN_EXPIRE_AT_INDEX_NAME } from '../src/models/Token'
 beforeAll(async () => {
   testHelper.initializeLogger()
 
-  const res = await databaseHelper.Connect(env.DB_URI, false, false)
+  const res = await databaseHelper.connect(env.DB_URI, false, false)
   expect(res).toBeTruthy()
 })
 
@@ -21,7 +21,7 @@ beforeAll(async () => {
 //
 afterAll(async () => {
   if (mongoose.connection.readyState) {
-    await databaseHelper.Close()
+    await databaseHelper.close()
   }
 })
 
@@ -80,13 +80,13 @@ describe('Test database initialization', () => {
     // Test failure
     //
     try {
-      await databaseHelper.Close()
+      await databaseHelper.close()
       res = await databaseHelper.initialize()
       expect(res).toBeFalsy()
     } catch (err) {
       console.error(err)
     } finally {
-      res = await databaseHelper.Connect(env.DB_URI, false, false)
+      res = await databaseHelper.connect(env.DB_URI, false, false)
       expect(res).toBeTruthy()
     }
   })

api/tests/location.test.ts

@@ -30,7 +30,7 @@ let LOCATION_NAMES: movininTypes.LocationName[] = [
 beforeAll(async () => {
   testHelper.initializeLogger()
 
-  const res = await databaseHelper.Connect(env.DB_URI, false, false)
+  const res = await databaseHelper.connect(env.DB_URI, false, false)
   expect(res).toBeTruthy()
   await testHelper.initialize()
 })
@@ -41,7 +41,7 @@ beforeAll(async () => {
 afterAll(async () => {
   if (mongoose.connection.readyState) {
     await testHelper.close()
-    await databaseHelper.Close()
+    await databaseHelper.close()
   }
 })
 

api/tests/middleware.test.ts

@@ -17,7 +17,7 @@ let USER_ID: string
 beforeAll(async () => {
   testHelper.initializeLogger()
 
-  const res = await databaseHelper.Connect(env.DB_URI, false, false)
+  const res = await databaseHelper.connect(env.DB_URI, false, false)
   expect(res).toBeTruthy()
   await testHelper.initialize()
   USER_ID = testHelper.getUserId()
@@ -29,7 +29,7 @@ beforeAll(async () => {
 afterAll(async () => {
   if (mongoose.connection.readyState) {
     await testHelper.close()
-    await databaseHelper.Close()
+    await databaseHelper.close()
   }
 })
 

api/tests/miscellaneous.test.ts

@@ -13,7 +13,7 @@ import User from '../src/models/User'
 beforeAll(async () => {
   testHelper.initializeLogger()
 
-  const res = await databaseHelper.Connect(env.DB_URI, false, false)
+  const res = await databaseHelper.connect(env.DB_URI, false, false)
   expect(res).toBeTruthy()
   testHelper.initializeLogger()
 })
@@ -23,13 +23,13 @@ beforeAll(async () => {
 //
 afterAll(async () => {
   if (mongoose.connection.readyState) {
-    await databaseHelper.Close()
+    await databaseHelper.close()
   }
 })
 
 describe('Test User phone validation', () => {
   it('should test User phone validation', async () => {
-    await databaseHelper.Connect(env.DB_URI, false, false)
+    await databaseHelper.connect(env.DB_URI, false, false)
     let res = true
     const USER: movininTypes.User = {
       email: testHelper.GetRandomEmail(),
@@ -52,14 +52,14 @@ describe('Test User phone validation', () => {
         await User.deleteOne({ _id: userId })
       }
     }
-    await databaseHelper.Close()
+    await databaseHelper.close()
     expect(res).toBeFalsy()
   })
 })
 
 describe('Test email sending error', () => {
   it('should test email sending error', async () => {
-    await databaseHelper.Connect(env.DB_URI, false, false)
+    await databaseHelper.connect(env.DB_URI, false, false)
     let res = true
     try {
       await mailHelper.sendMail({
@@ -71,7 +71,7 @@ describe('Test email sending error', () => {
     } catch (err) {
       res = false
     }
-    await databaseHelper.Close()
+    await databaseHelper.close()
     expect(res).toBeFalsy()
   })
 })

api/tests/notification.test.ts

@@ -19,7 +19,7 @@ let NOTIFICATION2_ID: string
 beforeAll(async () => {
   testHelper.initializeLogger()
 
-  const res = await databaseHelper.Connect(env.DB_URI, false, false)
+  const res = await databaseHelper.connect(env.DB_URI, false, false)
   expect(res).toBeTruthy()
 
   await testHelper.initialize()
@@ -51,7 +51,7 @@ afterAll(async () => {
     await Notification.deleteMany({ user: ADMIN_USER_ID })
     await NotificationCounter.deleteOne({ user: ADMIN_USER_ID })
 
-    await databaseHelper.Close()
+    await databaseHelper.close()
   }
 })
 

api/tests/property.test.ts

@@ -42,7 +42,7 @@ let PROPERTY_ID: string
 beforeAll(async () => {
   testHelper.initializeLogger()
 
-  const res = await databaseHelper.Connect(env.DB_URI, false, false)
+  const res = await databaseHelper.connect(env.DB_URI, false, false)
   expect(res).toBeTruthy()
   await testHelper.initialize()
 
@@ -72,7 +72,7 @@ afterAll(async () => {
     await testHelper.deleteLocation(LOCATION1_ID)
     await testHelper.deleteLocation(LOCATION2_ID)
 
-    await databaseHelper.Close()
+    await databaseHelper.close()
   }
 })
 

api/tests/stripe.test.ts

@@ -15,7 +15,7 @@ import Booking from '../src/models/Booking'
 beforeAll(async () => {
   testHelper.initializeLogger()
 
-  const res = await databaseHelper.Connect(env.DB_URI, false, false)
+  const res = await databaseHelper.connect(env.DB_URI, false, false)
   expect(res).toBeTruthy()
 })
 
@@ -24,7 +24,7 @@ beforeAll(async () => {
 //
 afterAll(async () => {
   if (mongoose.connection.readyState) {
-    await databaseHelper.Close()
+    await databaseHelper.close()
   }
 })
 
@@ -155,14 +155,14 @@ describe('POST /api/check-checkout-session/:sessionId', () => {
     // Test database failure
     //
     try {
-      databaseHelper.Close()
+      databaseHelper.close()
       res = await request(app)
         .post(`/api/check-checkout-session/${sessionId}`)
       expect(res.statusCode).toBe(400)
     } catch (err) {
       console.error(err)
     } finally {
-      const dbRes = await databaseHelper.Connect(env.DB_URI, false, false)
+      const dbRes = await databaseHelper.connect(env.DB_URI, false, false)
       expect(dbRes).toBeTruthy()
     }
   })

api/tests/user.test.ts

@@ -40,7 +40,7 @@ const ADMIN_EMAIL = `${testHelper.getName('admin')}@test.movinin.io`
 beforeAll(async () => {
   testHelper.initializeLogger()
 
-  const res = await databaseHelper.Connect(env.DB_URI, false, false)
+  const res = await databaseHelper.connect(env.DB_URI, false, false)
   expect(res).toBeTruthy()
   await testHelper.initialize()
 })
@@ -54,7 +54,7 @@ afterAll(async () => {
 
     await Token.deleteMany({ user: { $in: [ADMIN_ID] } })
 
-    await databaseHelper.Close()
+    await databaseHelper.close()
   }
 })