Merge branch 'group-chat' into 'master'

Group chat

See merge request !19

.password

+b5bb4cb9

.ssh

+ssh student@129.241.99.33

src/main/java/dao/GroupChatDAO.java

@@ -4,6 +4,7 @@ import data.GroupChat;
 import data.Message;
 import data.User;
 
+import javax.swing.*;
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;
@@ -104,8 +105,7 @@ public class GroupChatDAO {
 
 
 
-    public void addGroupChat(GroupChat groupChat) {
-
+    public GroupChat addGroupChat(GroupChat groupChat) {
         Connection connection = null;
         PreparedStatement preparedStatement = null;
         ResultSet resultSet = null;
@@ -123,12 +123,15 @@ public class GroupChatDAO {
                 if (resultSet.next()) groupChat.setGroupChatId(resultSet.getInt(1));
             }
         }catch (SQLIntegrityConstraintViolationException e){
-            e.printStackTrace();
+            groupChat = new GroupChat();
+            return groupChat;
         } catch (SQLException e) {
+            groupChat = null;
             e.printStackTrace();
         }finally{
             close(connection, preparedStatement, resultSet);
         }
+        return groupChat;
     }
 
 
@@ -196,7 +199,7 @@ public class GroupChatDAO {
 
 
 
-    public void addMessage(Message message) {
+    public Message addMessage(Message message) {
         Connection connection = null;
         PreparedStatement preparedStatement = null;
         ResultSet resultSet = null;
@@ -218,10 +221,12 @@ public class GroupChatDAO {
             }
         }catch (SQLIntegrityConstraintViolationException e){
             message = new Message();
+            return message;
         } catch (SQLException e) {
             e.printStackTrace();
         }finally{
             close(connection, preparedStatement, resultSet);
         }
+        return message;
     }
 }

src/main/java/resources/GroupChatResource.java

 package resources;
 
+import dao.GroupChatDAO;
 import data.GroupChat;
+import data.Message;
+import data.User;
 
+import javax.print.attribute.standard.Media;
+import javax.swing.*;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
 
 /**
  * GroupChat resource exposed at "/groupchat" path
@@ -20,7 +26,44 @@ public class GroupChatResource {
     @Path ("{groupChatId}")
     @Produces (MediaType.APPLICATION_JSON)
     public GroupChat getGroupChat(@PathParam("groupChatId") int groupChatId){
-        return null;
+        GroupChatDAO dao = new GroupChatDAO();
+        return dao.getGroupChat(groupChatId);
     }
 
+    @GET
+    @Path ("user/{userId}")
+    @Consumes (MediaType.APPLICATION_JSON)
+    @Produces (MediaType.APPLICATION_JSON)
+    public ArrayList<GroupChat> getGroupChatByUser(@PathParam("userId") int userId) {
+        GroupChatDAO dao = new GroupChatDAO();
+        return dao.getGroupChatByUserId(userId);
+    }
+
+    @POST
+    @Consumes (MediaType.APPLICATION_JSON)
+    @Produces (MediaType.APPLICATION_JSON)
+    public GroupChat postGroupChat(GroupChat groupChat){
+        GroupChatDAO dao = new GroupChatDAO();
+        groupChat = dao.addGroupChat(groupChat);
+        return groupChat;
+    }
+
+    @GET
+    @Produces (MediaType.APPLICATION_JSON)
+    @Path ("{groupChatId}/message")
+    public ArrayList<Message> getGroupChatMessages(@PathParam("groupChatId") int groupChatId) {
+        GroupChatDAO dao = new GroupChatDAO();
+        return dao.getGroupChatMessages(groupChatId);
+    }
+
+    @POST
+    @Produces (MediaType.APPLICATION_JSON)
+    @Consumes (MediaType.APPLICATION_JSON)
+    @Path ("{groupChatId}/message")
+    public Message postGroupChatMessage(@PathParam("groupChatId") int groupChatId, Message message) {
+        GroupChatDAO dao = new GroupChatDAO();
+        return dao.addMessage(message);
+    }
+
+
 }

src/main/webapp/app.html

@@ -31,7 +31,7 @@
 
             <ul id="userList">
                 <li onclick="openCalculator(); toggleUserList();"><i class="fas fa-user userIcon"></i>Kalkulator</li>
-                <li onclick="openNewGroupChatForm();"><i class="fas fa-plus userIcon">Gruppesamtale</i></li>
+                <li onclick="openNewGroupChatForm();"><i class="fas fa-plus userIcon"></i>Gruppesamtale</li>
             </ul>
 
             <ul id="groupChatList">