Use mongodb URI (#16)

* Use mongodb URI

* CHANGELOG.md

Author: 0xslipk

.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

.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

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.1.1
+Published by **[blockcoders](https://github.com/blockcoders)** on **2022/12/09**
+- [#16](https://github.com/blockcoders/nestjs-ethers/pull/16) Use mongodb URI
+
 ## 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

README-es.md

@@ -229,7 +229,7 @@ query {
 ```graphql
 {
   "data": {
-    "version": "v1.1.0"
+    "version": "v1.1.1"
   }
 }
 ```

README.md

@@ -229,7 +229,7 @@ query {
 ```graphql
 {
   "data": {
-    "version": "v1.1.0"
+    "version": "v1.1.1"
   }
 }
 ```

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",

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')
     })
   })
 })

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'
   }
 }

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,
         }
       },
     }),

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')