From 92e67341b4fddfc27abe4042d37cb9109a3cd640 Mon Sep 17 00:00:00 2001 From: Marcin Michalek Date: Tue, 10 Jun 2014 08:23:12 +0200 Subject: [PATCH 1/5] format --- NFCServer.iml | 19 +------------------ .../controllers/UserController.java | 2 ++ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/NFCServer.iml b/NFCServer.iml index 8a19ba5..a17aed6 100644 --- a/NFCServer.iml +++ b/NFCServer.iml @@ -1,5 +1,5 @@ - + @@ -12,23 +12,6 @@ - - - - file://$MODULE_DIR$/src/main/java/application/Config.java - file://$MODULE_DIR$/src/main/resources/Spring-Module.xml - - - - - - - - - - - - diff --git a/src/main/java/application/controllers/UserController.java b/src/main/java/application/controllers/UserController.java index caf5fba..1dcbdad 100644 --- a/src/main/java/application/controllers/UserController.java +++ b/src/main/java/application/controllers/UserController.java @@ -60,9 +60,11 @@ public class UserController { //access codes JSONArray accessCodes = new JSONArray(); + // array of obejcts {role:role, code:code} //message JSONObject message = new JSONObject(); + // {role:role, message:message} loginResponse.put("accessCodes", accessCodes); loginResponse.put("message", message); From aa974c89256dd47022f4803235aaacae91128f0b Mon Sep 17 00:00:00 2001 From: Marcin Michalek Date: Tue, 10 Jun 2014 09:06:52 +0200 Subject: [PATCH 2/5] return userId upon login --- NFCServer.iml | 4 ++-- src/main/java/application/controllers/UserController.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NFCServer.iml b/NFCServer.iml index b8be68a..d5fa6ee 100644 --- a/NFCServer.iml +++ b/NFCServer.iml @@ -1,5 +1,5 @@ - + @@ -24,8 +24,8 @@ - + diff --git a/src/main/java/application/controllers/UserController.java b/src/main/java/application/controllers/UserController.java index 4eed374..331ccc5 100644 --- a/src/main/java/application/controllers/UserController.java +++ b/src/main/java/application/controllers/UserController.java @@ -57,6 +57,7 @@ public class UserController { if(login.equals(user.getEmail()) && password.equals(user.getPassword())){ userFound = true; loginResponse.put("success", true); + loginResponse.put("userId", user.getUserId()); //access codes JSONArray accessCodes = new JSONArray(); From 6c66e369defc7eb34121313c1afb7677cd801a59 Mon Sep 17 00:00:00 2001 From: Marcin Michalek Date: Tue, 10 Jun 2014 09:19:17 +0200 Subject: [PATCH 3/5] return messageId --- src/main/java/application/controllers/UserController.java | 1 + src/main/java/application/model/Message.java | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/application/controllers/UserController.java b/src/main/java/application/controllers/UserController.java index 331ccc5..fd0952e 100644 --- a/src/main/java/application/controllers/UserController.java +++ b/src/main/java/application/controllers/UserController.java @@ -72,6 +72,7 @@ public class UserController { JSONArray messages = new JSONArray(); for( Message message : user.getMessages()){ JSONObject returnedMessage = new JSONObject(); + returnedMessage.put("messageId", message.getMessageId()); returnedMessage.put("dateTime", message.getDateTime()); returnedMessage.put("isRead", message.isRead()); returnedMessage.put("message", message.getMessage()); diff --git a/src/main/java/application/model/Message.java b/src/main/java/application/model/Message.java index d61f5ee..15b057c 100644 --- a/src/main/java/application/model/Message.java +++ b/src/main/java/application/model/Message.java @@ -56,4 +56,11 @@ public class Message { this.isRead = read; } + public Long getMessageId() { + return messageId; + } + + public void setMessageId(Long messageId) { + this.messageId = messageId; + } } From 104d7b3fc1c26ee006e74523e308e7b05948423c Mon Sep 17 00:00:00 2001 From: Marcin Michalek Date: Tue, 10 Jun 2014 11:27:42 +0200 Subject: [PATCH 4/5] mark message as read --- .../application/controllers/UserController.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/main/java/application/controllers/UserController.java b/src/main/java/application/controllers/UserController.java index fd0952e..60349ae 100644 --- a/src/main/java/application/controllers/UserController.java +++ b/src/main/java/application/controllers/UserController.java @@ -103,6 +103,22 @@ public class UserController { return loginResponse.toString(); } + @RequestMapping(value = "/markMessageAsRead/{userId}/{messageId}", method = RequestMethod.POST) + @ResponseBody + public String markMessageAsRead(@PathVariable("userId") long userId, @PathVariable("messageId") long messageId) throws JSONException{ + User user = userRepository.findOne(userId); + Set messages = user.getMessages(); + + for(Message message : messages){ + if(message.getMessageId() == messageId){ + message.setRead(true); + } + } + + userRepository.save(user); + return (new JSONObject()).put("success", true).toString(); + } + @RequestMapping("/addMe") @ResponseBody public String addMe() { From 62b94484cb5134d19a9c76dbc4affd3181083e62 Mon Sep 17 00:00:00 2001 From: Marcin Michalek Date: Tue, 10 Jun 2014 11:55:16 +0200 Subject: [PATCH 5/5] change from post to get on mark message as read --- src/main/java/application/controllers/UserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/application/controllers/UserController.java b/src/main/java/application/controllers/UserController.java index 60349ae..2e3ce93 100644 --- a/src/main/java/application/controllers/UserController.java +++ b/src/main/java/application/controllers/UserController.java @@ -103,7 +103,7 @@ public class UserController { return loginResponse.toString(); } - @RequestMapping(value = "/markMessageAsRead/{userId}/{messageId}", method = RequestMethod.POST) + @RequestMapping(value = "/markMessageAsRead/{userId}/{messageId}") @ResponseBody public String markMessageAsRead(@PathVariable("userId") long userId, @PathVariable("messageId") long messageId) throws JSONException{ User user = userRepository.findOne(userId);