added docker support for node

Jaime Salas Zancada · Jaime Salas Zancada · commit 2d8b9d2ada8d · 2019-07-26T21:45:06.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -60,3 +60,5 @@ typings/
 # Build folders parcel
 dist/
 .cache
+
+.DS_store
diff --git a/11 Axios/03_callbacks/README.md b/11 Axios/03_callbacks/README.md
@@ -2,7 +2,7 @@
 
 ## 3 Using callbacks
 
-### 1. Currently our bookService is doing several things, it is calling the server for data and then hndling the response, and displaying data. Lets start to honor SRP, and start by passing callbacks that could be passed from outsite of service. 
+### 1. Currently our bookService is doing several things, it is calling the server for data handling the response, and displaying data. Lets start to honor SRP, and start by passing callbacks that could be passed from outsite of our service to segregate responsabilities. 
 
 ```diff bookAPI.js
 import axios from 'axios';
diff --git a/11 Axios/05_all/README.md b/11 Axios/05_all/README.md
@@ -5,10 +5,10 @@
 ```javascript
 import axios from 'axios';
 
-const BASE_URL = 'http://localhost:8000';
+const baseUrl = 'http://localhost:8000';
 
 export const getAuthors = () => (
-    axios.get(`${BASE_URL}/api/authors`)
+    axios.get(`${baseUrl}/api/authors`)
 );
 ```
 
diff --git a/11 Axios/06_multiple_params/README.md b/11 Axios/06_multiple_params/README.md
@@ -1,6 +1,6 @@
 ## 6 Get Multiple Params
 
-### 1. Now we are going to perform a get operation with multiple params. For that in mind lets add a new page `src/pages/booksearch.html`
+### 1. Now we are going to perform a get operation with multiple params. With that on mind lets add a new page `src/pages/booksearch.html`
 
 ```html
 <!doctype html>
@@ -49,13 +49,13 @@
 ```diff
 import axios from 'axios';
 
-const BASE_URL = 'http://localhost:8000';
+const baseUrl = 'http://localhost:8000';
 
-export const getBooks = () => axios.get(`${BASE_URL}/api/books/`);
+export const getBooks = () => axios.get(`${baseUrl}/api/books/`);
 +
-+export const getBooksByParams = (params) => axios.get(`${BASE_URL}/api/books/`, params);
++export const getBooksByParams = (params) => axios.get(`${baseUrl}/api/books/`, params);
 +
-export const postBook = (book) => axios.post(`${BASE_URL}/api/books/`, book);
+export const postBook = (book) => axios.post(`${baseUrl}/api/books/`, book);
 ```
 
 ### 4. Create a new file pages/booksearch/main.js. This file will handle the retrieving params for our new operation.
diff --git a/13 Fetch/00_createRequestFactory/README.md b/13 Fetch/00_createRequestFactory/README.md
@@ -141,7 +141,7 @@ export const retrieveBook = (bookId) => {
     });
 }
 ```
-* Notice that fetch is prepared to always a promise, even the success result.
+* Notice that fetch is prepared to always return a promise, even the success result.
 
 ### 5. Now let's define the src/js/main.js and check that is working on happy path
 
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,5 +1,14 @@
 version: '3.7'
 services: 
+  app:
+    container_name: book-server
+    environment:
+    - ENVIRONMENT=mongodb:27017
+    build: ./server-mongo
+    ports: 
+    - "8000:8000"
+    depends_on:
+    - mongodb
   mongodb:
     image: mongo:3.2
     container_name: 'mongodb'
diff --git a/server-mongo/.dockerignore b/server-mongo/.dockerignore
@@ -0,0 +1,2 @@
+node_modules/
+Tests/
diff --git a/server-mongo/Dockerfile b/server-mongo/Dockerfile
@@ -0,0 +1,9 @@
+FROM node:10.16.0
+WORKDIR /usr/src/app
+
+COPY . .
+
+RUN npm install
+
+EXPOSE 8000
+CMD ["npm", "start"]
diff --git a/server-mongo/README.md b/server-mongo/README.md
@@ -1,6 +1,8 @@
 ## To start mongo with docker:
 
 > Reference: https://www.thepolyglotdeveloper.com/2019/01/getting-started-mongodb-docker-container-deployment/
+> Reference: https://dev.to/jay97/docker-compose-an-express-and-mongo-app-aai
+> Refereence: https://nodejs.org/de/docs/guides/nodejs-docker-webapp/
 
 ```bash
 docker-compose up -d
diff --git a/server-mongo/app.js b/server-mongo/app.js
@@ -3,7 +3,9 @@ const express = require('express'),
       app = express(),
       port = process.env.PORT || 3000,
       mongoose = require('mongoose'),
-      bodyParser = require('body-parser');
+      bodyParser = require('body-parser')
+      dotenv = require('dotenv');
+      dotenv.config();
 
    // mongoose.connect('mongodb://localhost/bookAPI')
 
@@ -34,9 +36,11 @@ let db;
 mongoose.Promise = global.Promise;
 
 if(process.env.ENV === 'Test') {
-  db = mongoose.connect('mongodb://localhost/bookAPI_test'); // Our database is going to connect here in tests environment
+  // db = mongoose.connect('mongodb://localhost/bookAPI_test'); // Our database is going to connect here in tests environment
+  db = mongoose.connect(`mongodb://${process.env.ENVIRONMENT}/bookAPI_test`); // Our database is going to connect here in tests environment
 } else {
-  db = mongoose.connect('mongodb://localhost/bookAPI');
+  // db = mongoose.connect('mongodb://localhost/bookAPI'); // Local
+  db = mongoose.connect(`mongodb://${process.env.ENVIRONMENT}/bookAPI`); // docker
 }
 
 const Book =  require('./models/bookModel'); // We get the mongoose schema to work with it.
diff --git a/server-mongo/package-lock.json b/server-mongo/package-lock.json
diff --git a/server-mongo/package.json b/server-mongo/package.json
@@ -12,6 +12,7 @@
   "dependencies": {
     "body-parser": "^1.15.2",
     "cors": "^2.8.1",
+    "dotenv": "^8.0.0",
     "express": "^4.14.0",
     "gulp": "~3.9.1",
     "gulp-mocha": "~3.0.1",

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ export const retrieveBook = (bookId) => {`
`141`	`141`	`});`
`142`	`142`	`}`
`143`	`143`	```
`144`		`-* Notice that fetch is prepared to always a promise, even the success result.`
	`144`	`+* Notice that fetch is prepared to always return a promise, even the success result.`
`145`	`145`
`146`	`146`	`### 5. Now let's define the src/js/main.js and check that is working on happy path`
`147`	`147`