From 75f1e6b1ab51fdb9d95c54586efc5c0e395594c4 Mon Sep 17 00:00:00 2001
From: lukasgol <lukasgol6900@gmail.com>
Date: Tue, 10 Jun 2014 09:41:15 +0200
Subject: [PATCH] funkcja przeczytania wiadomosci

---
 .../controllers/UserController.java           | 28 +++++++++++++++++++
 src/main/java/application/model/Message.java  |  4 +++
 2 files changed, 32 insertions(+)

diff --git a/src/main/java/application/controllers/UserController.java b/src/main/java/application/controllers/UserController.java
index 4eed374..8aba161 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();
@@ -71,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());
@@ -117,7 +119,19 @@ public class UserController {
         return "User created" + marcin.getUserId();
     }
 
+    @RequestMapping("/change")
+    @ResponseBody
+    public String change() {
+        User marcin = userRepository.findOne((long) 1);
+        Set set =marcin.getMessages();
+        set.add(new Message("lala"));
+        userRepository.save(marcin);
+
+        return "User changed" + marcin.getUserId();
+    }
+
     @RequestMapping("/{userId}")
+    @ResponseBody
     public String getUser(@PathVariable("userId") Long userId) throws JSONException{
         User user = userRepository.findOne(userId);
         JSONObject userJSON = new JSONObject();
@@ -130,6 +144,20 @@ public class UserController {
         return userArray.toString();
     }
 
+    @RequestMapping("/markRead/{userId}/{messageId}")
+    @ResponseBody
+    public String getUser(@PathVariable("userId") Long userId,@PathVariable("messageId") Long messageId) throws JSONException{
+        User user = userRepository.findOne(userId);
+        Set<Message> messages= user.getMessages();
+        for(Message m:messages){
+            if(m.getMessageId()==messageId) m.setRead(true);
+        }
+        JSONObject loginResponse = new JSONObject();
+        loginResponse.put("success", true);
+        userRepository.save(user);
+        return loginResponse.toString();
+    }
+
     @RequestMapping
     public
     @ResponseBody
diff --git a/src/main/java/application/model/Message.java b/src/main/java/application/model/Message.java
index d61f5ee..e33267b 100644
--- a/src/main/java/application/model/Message.java
+++ b/src/main/java/application/model/Message.java
@@ -9,6 +9,7 @@ import java.util.Date;
 @Entity (name = "messsage")
 public class Message {
 
+
     @Id
     @Column(name = "ID")
     @GeneratedValue(strategy = GenerationType.AUTO)
@@ -56,4 +57,7 @@ public class Message {
         this.isRead = read;
     }
 
+    public Long getMessageId() {
+        return messageId;
+    }
 }