Merge pull request #44 from e-ucm/json

JSON response innstead of TEXT/PLAIN: Added some json answers.
e-ucm · Feb 3, 2016 · 8598208 · 8598208
2 parents 0b1b215 + ffc7e01
commit 8598208
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 8 deletions.
diff --git a/lib/games.js b/lib/games.js
@@ -19,5 +19,25 @@ module.exports = (function() {
         });
     });
 
+    games.removeGame = function (gameId) {
+        return games.findById(gameId)
+            .then(function (game) {
+                if (!game) {
+                    throw {
+                        message: 'Game does not exist',
+                        status: 400
+                    };
+                }
+
+                return games.removeById(gameId).then(function (result, err) {
+                    if (!err) {
+                        return {
+                            message: 'Success.'
+                        };
+                    }
+                });
+            });
+    };
+
     return games;
 })();
diff --git a/lib/sessions.js b/lib/sessions.js
@@ -297,7 +297,13 @@ module.exports = (function () {
                 db.collection('sessions' + sesionIdentifier).drop();
                 db.collection('session_opaque_values_' + sesionIdentifier).drop();
 
-                return sessions.removeById(sessionId);
+                return sessions.removeById(sessionId).then(function (result, err) {
+                    if (!err) {
+                        return {
+                            message: 'Success.'
+                        };
+                    }
+                });
             });
     };
 

diff --git a/lib/traces.js b/lib/traces.js
@@ -168,7 +168,7 @@ module.exports = (function () {
          * @param versionId
          * @param gameplayId
          * @param data
-         * @returns true or an array of errors from the consumers that failed while consuming the data.
+         * @returns { message: 'Success.'} or an array of errors from the consumers that failed while consuming the data.
          */
         add: function (playerId, versionId, gameplayId, data) {
 
@@ -179,7 +179,9 @@ module.exports = (function () {
                 }
                 return Q.all(promises)
                     .then(function () {
-                        return true;
+                        return {
+                            message: 'Success.'
+                        };
                     }).fail(function (err) {
                         return err;
                     });

diff --git a/routes/collector.js b/routes/collector.js
@@ -50,7 +50,9 @@ router.post('/start/:trackingCode', function (req, res) {
  *
  * @apiSuccessExample Success-Response:
  *      HTTP/1.1 200 OK
- *      true
+ *      {
+ *         "message": "Success."
+ *      }
  *
  */
 router.post('/track', function (req, res) {

diff --git a/routes/games.js b/routes/games.js
@@ -131,10 +131,14 @@ router.post('/:id', restUtils.findAndModify(games));
  *
  * @apiSuccessExample Success-Response:
  *      HTTP/1.1 200 OK
- *      true
+ *      {
+ *         "message": "Success."
+ *      }
  *
  */
-router.delete('/:id', restUtils.deleteById(games));
+router.delete('/:id', function (req, res) {
+    restUtils.processResponse(games.removeGame(req.params.id), res);
+});
 
 /**
  * @api {get} /games/:gameId/versions Returns all the versions of a given game.

diff --git a/routes/sessions.js b/routes/sessions.js
@@ -119,7 +119,9 @@ router.put('/:sessionId/remove', function (req, res) {
  *
  * @apiSuccessExample Success-Response:
  *      HTTP/1.1 200 OK
- *      true
+ *      {
+ *         "message": "Success."
+ *      }
  */
 router.delete('/:sessionId', function (req, res) {
     var username = req.headers['x-gleaner-user'];

diff --git a/test/tests/collectorTest.js b/test/tests/collectorTest.js
@@ -157,7 +157,7 @@ module.exports = function(request, db, config) {
                 .set('Authorization', authToken)
                 .send([statement])
                 .end(function (err, res) {
-                    should.equal(res.body, true);
+                    should(res.body).eql({ message: 'Success.' });
                     done();
                 });
         });