docker-compose + atlas

Author: Erwan

README.md

@@ -1,8 +1,5 @@
 # formationNode
 
-
-create mongo database 'formationNode' 
-
-git clone
-npm install
-npm start
+```
+docker-compose up
+```

app.js

@@ -10,7 +10,6 @@ var users = require('./routes/users');
 
 var app = express();
 
-
 // view engine setup
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'ejs');
@@ -39,41 +38,39 @@ mongoose.set('debug', function (collectionName, method, query, doc) {
 });
 */
 
-
 var timeout = 3000000;
 
-mongoose.Promise = global.Promise;
-mongoose.connect('mongodb://127.0.0.1/formationNode', {
-    uri_decode_auth: true,
-    server: {socketOptions: {keepAlive: timeout, connectTimeoutMS: timeout}},
-    replset: {socketOptions: {keepAlive: timeout, connectTimeoutMS: timeout}}
-}, function (err, db) {
-    if(err){
+mongoose.connect(
+    'mongodb+srv://formationNodeUser:formationNodePassword@cluster0-kt0tr.mongodb.net/test?retryWrites=true&w=majority',
+    {
+      promiseLibrary: global.Promise,
+      useNewUrlParser: true
+    }, function(err, db) {
+      if (err) {
         console.error('Connection database : KO');
-        console.log(err);
-    } else{
+        console.error(err);
+      } else {
         console.log('Connection database : OK');
 
-    }
-});
-
+      }
+    });
 
 // catch 404 and forward to error handler
-app.use(function (req, res, next) {
-    var err = new Error('Not Found');
-    err.status = 404;
-    next(err);
+app.use(function(req, res, next) {
+  var err = new Error('Not Found');
+  err.status = 404;
+  next(err);
 });
 
 // error handler
-app.use(function (err, req, res, next) {
-    // set locals, only providing error in development
-    res.locals.message = err.message;
-    res.locals.error = req.app.get('env') === 'development' ? err : {};
-
-    // render the error page
-    res.status(err.status || 500);
-    res.render('error');
+app.use(function(err, req, res, next) {
+  // set locals, only providing error in development
+  res.locals.message = err.message;
+  res.locals.error = req.app.get('env') === 'development' ? err : {};
+
+  // render the error page
+  res.status(err.status || 500);
+  res.render('error');
 });
 
 module.exports = app;

docker-compose.yml

@@ -0,0 +1,13 @@
+version: '3'
+
+services:
+
+  node:
+    image: thecodingmachine/nodejs:10
+    volumes:
+      - ./:/usr/src/app
+    environment:
+      STARTUP_COMMAND_1: npm install
+      STARTUP_COMMAND_2: npm start
+    ports:
+      - "3000:3000"

model/gameModel.js

@@ -1,72 +1,65 @@
 var mongoose = require('mongoose');
 
-
 var schema = new mongoose.Schema(
     {
-        user0: mongoose.Schema.Types.Mixed,
-        user1: mongoose.Schema.Types.Mixed,
-        caseArray: [mongoose.Schema.Types.Mixed],
-        currentPlayer : String
+      user0: mongoose.Schema.Types.Mixed,
+      user1: mongoose.Schema.Types.Mixed,
+      caseArray: [mongoose.Schema.Types.Mixed],
+      currentPlayer: Number
 
     }
 );
 
-schema.methods.initGame = function (user0, user1) {
-    if(user0 && user1){
-        this.user0 = user0;
-        this.user1 = user1;
-        this.caseArray = [];
-        var rand = Math.floor(Math.random()*100);
-        if(rand % 2 == 0){
-            this.currentPlayer = this.user0.id;
-            this.user0.color = 'red';
-            this.user1.color = 'yellow';
-        } else {
-            this.currentPlayer = this.user1.id;
-            this.user0.color = 'yellow';
-            this.user1.color = 'red';
-        }
+schema.methods.initGame = function(user0, user1) {
+  if (user0 && user1) {
+    this.user0 = user0;
+    this.user1 = user1;
+    this.caseArray = [];
+    var rand = Math.floor(Math.random() * 100);
+    if (rand % 2 === 0) {
+      this.currentPlayer = this.user0.id;
+      this.user0.color = 'red';
+      this.user1.color = 'yellow';
+    } else {
+      this.currentPlayer = this.user1.id;
+      this.user0.color = 'yellow';
+      this.user1.color = 'red';
     }
+  }
 };
 
-
-
-
-schema.methods.gameAction = function (userId, caseName) {
-    if(userId == this.currentPlayer){
-        if(!this.caseArray){
-            this.caseArray = [];
-        }
-        if(this.caseArray.filter(function (item) {
-                return item.caseName == caseName
-            }).length != 0){
-            console.error('try to overwrite');
-        } else{
-            this.caseArray.push({
-                caseName : caseName,
-                userId : userId,
-            })
-            if(this.currentPlayer){
-                if(this.currentPlayer == this.user0.id){
-                    this.currentPlayer = this.user1.id
-                } else if(this.currentPlayer == this.user1.id){
-                    this.currentPlayer = this.user0.id
-                } else{
-                    console.error('the value of current player is incorrect');
-                }
-            } else{
-                console.error('currentPlayer must be init')
-            }
+schema.methods.gameAction = function(userId, caseName) {
+  if (userId === parseInt(this.currentPlayer)) {
+    if (!this.caseArray) {
+      this.caseArray = [];
+    }
+    if (this.caseArray.filter(function(item) {
+          return item.caseName === caseName;
+        }).length !== 0) {
+      console.error('try to overwrite');
+    } else {
+      this.caseArray.push({
+        caseName: caseName,
+        userId: userId
+      });
+      if (this.currentPlayer) {
+        if (parseInt(this.currentPlayer) === this.user0.id) {
+          this.currentPlayer = this.user1.id;
+        } else if (parseInt(this.currentPlayer) === this.user1.id) {
+          this.currentPlayer = this.user0.id;
+        } else {
+          console.error('the value of current player is incorrect');
         }
-    } else{
-        console.error('wrong current player')
+      } else {
+        console.error('currentPlayer must be init');
+      }
     }
-
-
+  } else {
+    console.error('wrong current player');
+  }
 
 };
 
-
 schema.set('versionKey', false);
 module.exports = mongoose.model('Game', schema);