Make it better

shadowlik · Apr 8, 2019 · 42a9bdc · 42a9bdc
1 parent 93a7ee2
commit 42a9bdc
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/.env b/.env
@@ -1 +1,2 @@
-NODE_ENV=development
+NODE_ENV=development
+DATABASE_URI=mongodb://mongodb/muchas
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,13 +6,24 @@ services:
     environment:
     - NODE_ENV
     - DEBUG_PORT
+    - DATABASE_URI
     volumes:
       - ./:/app
     ports:
       - 6028:6028
     networks:
       - muchas
     command: npm run start:dev
+  mongodb:
+    image: mongo
+    logging:
+      driver: none
+    volumes:
+      - /data/db
+    ports:
+      - 27017:27017
+    networks:
+      - muchas
   elastic:
     image: docker.elastic.co/elasticsearch/elasticsearch:6.7.1
     logging:

diff --git a/src/database/index.ts b/src/database/index.ts
@@ -1,7 +1,5 @@
 import mongoose from 'mongoose';
 
-import { log } from '../index';
-
 interface DatabaseOptions {
     uri: string;
 };

diff --git a/src/index.ts b/src/index.ts
@@ -21,7 +21,8 @@ class Muchas {
     constructor() {
         const {
             LOGGER_ELASTIC_HOST,
-            LOGGER_ELASTIC_LEVEL
+            LOGGER_ELASTIC_LEVEL,
+            DATABASE_URI
         } = process.env;
 
         // Logger
@@ -35,11 +36,13 @@ class Muchas {
         log = this.Log;
 
         // Database
-        this.Database = new Database({
-            uri: '',
-        });
+        if (DATABASE_URI) {
+            this.Database = new Database({
+                uri: DATABASE_URI,
+            });
 
-        db = this.Database;
+            db = this.Database;
+        }
     };
 
     async init (): Promise<void> {