KIA -13515016 - Kevin Erdiza Yogatama

ChatService/app/routes.js

@@ -15,9 +15,10 @@ module.exports = function(app) {
                 var post_data = JSON.stringify({
                     "notification": {
                         "title": title,
-                        "body" : codestring
-                        // "icon" : "firebase-logo.png",
-                        // "click-action" : ""
+                        "body" : "You got a message"
+                   },
+                   "data" : {
+                       "message" : message
                    },
                    "to": to
                 });
@@ -191,6 +192,19 @@ module.exports = function(app) {
             })
     
             // CHAT SERVICE
+            // Get chat history
+            app.get('/chathistory', function(req, res){
+                var idUser = Number (req.query.idUser);
+                var idDriver = Number (req.query.idDriver);
+                Chat.findOne({"idUser" : idUser, "idDriver" : idDriver}, function(err, chat){
+                    if(err){
+                        res.json({"error" : "yes"});
+                    } else {
+                        res.json(chat.history);
+                    }
+                });
+            });
+
             // Send message from passangger
             app.post('/sendmessagefrompassangger', function(req, res){
                 var senderToken = req.body.token;
@@ -247,6 +261,7 @@ module.exports = function(app) {
     
             // Send message from driver
             app.post('/sendmessagefromdriver', function(req, res){
+                console.log(req.body);
                 var senderToken = req.body.token;
                 var receiverId = Number (req.body.id);
                 var message = req.body.message;
@@ -262,14 +277,14 @@ module.exports = function(app) {
                                 res.json(response);
                             }
                             else {
-                                Chat.findOne({'idUser' : receiverId.id, 'idDriver' : senderId}, function(err3, chat){
+                                Chat.findOne({'idUser' : receiverId, 'idDriver' : senderId.id}, function(err3, chat){
                                     if (err3){
                                         var response = {"status" : 503, "message" : "Database error detected 3"};
                                         res.json(response);
                                     }
                                     else {
                                         if (!chat){
-                                            Chat.create({'idUser' : receiverId.id, 'idDriver' : senderId}, function(err4, newChat){
+                                            Chat.create({'idUser' : receiverId, 'idDriver' : senderId.id}, function(err4, newChat){
                                                 if (err4){
                                                     var response = {"status" : 503, "message" : "Database error detected 4"};
                                                     res.json(response);