Use mongodb URI

blockcoders · Dec 9, 2022 · 2ae51a8 · 2ae51a8
1 parent 5552fbd
commit 2ae51a8
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 25 deletions.
diff --git a/.env.sample b/.env.sample
@@ -13,9 +13,9 @@ DATABASE_NAME=ink
 DATABASE_USERNAME=mongodb
 DATABASE_PASSWORD=mongodb
 DATABASE_PORT=27017
-DATABASE_SSL_CA=""
 DATABASE_RETRY_ATTEMPTS=5
 DATABASE_RETRY_DELAY=3000
+DATABASE_URI=
 
 WS_PROVIDER=wss://rococo-contracts-rpc.polkadot.io
 LOAD_ALL_BLOCKS=false

diff --git a/.env.test b/.env.test
@@ -11,7 +11,7 @@ DATABASE_NAME=ink
 DATABASE_USERNAME=root
 DATABASE_PASSWORD=password
 DATABASE_PORT=5432
-DATABASE_SSL_CA=""
+DATABASE_URI=""
 DATABASE_RETRY_ATTEMPTS=5
 DATABASE_RETRY_DELAY=3000
 WS_PROVIDER=ws://127.0.0.1:9944

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.1.1
+Published by **[blockcoders](https://github.com/blockcoders)** on **2022/12/09**
+- [#15](https://github.com/blockcoders/nestjs-ethers/pull/15) Migrate to mongodb
+
 ## 1.1.0
 Published by **[blockcoders](https://github.com/blockcoders)** on **2022/12/09**
 - [#15](https://github.com/blockcoders/nestjs-ethers/pull/15) Migrate to mongodb

diff --git a/README-es.md b/README-es.md
@@ -229,7 +229,7 @@ query {
 ```graphql
 {
   "data": {
-    "version": "v1.1.0"
+    "version": "v1.1.1"
   }
 }
 ```

diff --git a/README.md b/README.md
@@ -229,7 +229,7 @@ query {
 ```graphql
 {
   "data": {
-    "version": "v1.1.0"
+    "version": "v1.1.1"
   }
 }
 ```

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ink-substrate-explorer-api",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Ink Explorer is an application that provides Ink contracts related information on Substrate based blockchains.",
   "author": "Blockcoders <engineering@blockcoders.io>",
   "license": "MIT",

diff --git a/src/app.resolver.spec.ts b/src/app.resolver.spec.ts
@@ -24,7 +24,7 @@ describe('AppResolver', () => {
 
   describe('version', () => {
     it('should return the current version', () => {
-      expect(resolver.version()).toEqual('v1.1.0')
+      expect(resolver.version()).toEqual('v1.1.1')
     })
   })
 })
diff --git a/src/app.resolver.ts b/src/app.resolver.ts
@@ -9,6 +9,6 @@ export class AppResolver {
 
   @Query(/* istanbul ignore next */ () => String)
   version(): string {
-    return 'v1.1.0'
+    return 'v1.1.1'
   }
 }
diff --git a/src/db/db.module.ts b/src/db/db.module.ts
@@ -18,25 +18,27 @@ import { DbService } from './db.service'
       useFactory: async (env: EnvService) => {
         const config: TypeOrmModuleOptions = {
           type: 'mongodb',
-          host: env.DATABASE_HOST,
-          port: env.DATABASE_PORT,
-          username: env.DATABASE_USERNAME,
-          password: env.DATABASE_PASSWORD,
-          database: env.DATABASE_NAME,
           retryAttempts: env.DATABASE_RETRY_ATTEMPTS,
           retryDelay: env.DATABASE_RETRY_DELAY,
           synchronize: true,
           autoLoadEntities: true,
           keepConnectionAlive: false,
         }
 
-        if (!env.DATABASE_SSL_CA) {
-          return config
+        if (env.DATABASE_URI) {
+          return {
+            ...config,
+            url: env.DATABASE_URI,
+          }
         }
 
         return {
           ...config,
-          sslCA: env.DATABASE_SSL_CA,
+          host: env.DATABASE_HOST,
+          port: env.DATABASE_PORT,
+          username: env.DATABASE_USERNAME,
+          password: env.DATABASE_PASSWORD,
+          database: env.DATABASE_NAME,
         }
       },
     }),

diff --git a/src/db/db.service.ts b/src/db/db.service.ts
@@ -12,13 +12,19 @@ export class DbService {
   ) {}
 
   async addIndexes() {
-    const host = this.env.DATABASE_HOST
-    const port = this.env.DATABASE_PORT
-    const username = this.env.DATABASE_USERNAME
-    const password = this.env.DATABASE_PASSWORD
-    const database = this.env.DATABASE_NAME
-
-    const con = await mongoose.connect(`mongodb://${username}:${password}@${host}:${port}/${database}`)
+    let con: typeof mongoose
+
+    if (this.env.DATABASE_URI) {
+      con = await mongoose.connect(this.env.DATABASE_URI)
+    } else {
+      const host = this.env.DATABASE_HOST
+      const port = this.env.DATABASE_PORT
+      const username = this.env.DATABASE_USERNAME
+      const password = this.env.DATABASE_PASSWORD
+      const database = this.env.DATABASE_NAME
+
+      con = await mongoose.connect(`mongodb://${username}:${password}@${host}:${port}/${database}`)
+    }
 
     // block indexes
     const blocks = con.connection.collection('blocks')

diff --git a/src/env/env.service.ts b/src/env/env.service.ts
@@ -21,7 +21,7 @@ export class EnvService {
   public readonly DATABASE_NAME: string
   public readonly DATABASE_USERNAME: string
   public readonly DATABASE_PASSWORD: string
-  public readonly DATABASE_SSL_CA: string
+  public readonly DATABASE_URI: string
   public readonly DATABASE_RETRY_ATTEMPTS: number
   public readonly DATABASE_RETRY_DELAY: number
   public readonly WS_PROVIDER: string
@@ -45,7 +45,7 @@ export class EnvService {
     this.DATABASE_NAME = this.config.get<string>('DATABASE_NAME', '')
     this.DATABASE_USERNAME = this.config.get<string>('DATABASE_USERNAME', '')
     this.DATABASE_PASSWORD = this.config.get<string>('DATABASE_PASSWORD', 'password')
-    this.DATABASE_SSL_CA = this.config.get<string>('DATABASE_SSL_CA', '')
+    this.DATABASE_URI = this.config.get<string>('DATABASE_URI', '')
     this.DATABASE_RETRY_ATTEMPTS = parseInt(this.config.get<string>('DATABASE_RETRY_ATTEMPTS', '20'), 10)
     this.DATABASE_RETRY_DELAY = parseInt(this.config.get<string>('DATABASE_RETRY_DELAY', '6000'), 10)
     this.WS_PROVIDER = this.config.get<string>('WS_PROVIDER', '')

diff --git a/src/env/env.validation.ts b/src/env/env.validation.ts
@@ -50,7 +50,7 @@ export class EnvironmentVariables {
   DATABASE_PASSWORD: string | undefined
 
   @IsString()
-  DATABASE_SSL_CA: string | undefined
+  DATABASE_URI: string | undefined
 
   @IsNumberString()
   DATABASE_RETRY_ATTEMPTS: string | undefined