Updated Chat class

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Model/Chat.java

@@ -1,30 +1,38 @@
 package ZipTeamOrange.model;
 
+import ZipTeamOrange.model.Audit.UserDateAudit;
 import ZipTeamOrange.model.Message;
 import ZipTeamOrange.model.User;
 import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
 import java.util.Set;
 
 @Entity
-public class Chat {
+@Table(name = "chats")
+public class Chat extends UserDateAudit {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
-    private String name;
 
-    @OneToMany(mappedBy = "chat")
+    @NotBlank
+    private String topic;
+
+    @OneToMany(mappedBy = "chat",
+    cascade = CascadeType.ALL,
+    fetch = FetchType.EAGER,
+    orphanRemoval = true)
     private Set<Message> messages;
 
-    @ManyToMany(mappedBy = "chat")
-    private Set<User> users;
+//    @ManyToMany(mappedBy = "chat")
+//    private Set<User> users;
 
-    public Chat(String name, Set<User> users) {
-        this.name = name;
-        this.users = users;
+    public Chat(String topic, Set<Message> messages) {
+        this.topic = topic;
+        this.messages = messages;
     }
 
-    public Chat(){}
+    public Chat() { }
 
     public Long getId() {
         return id;
@@ -34,19 +42,27 @@ public class Chat {
         this.id = id;
     }
 
-    public String getName() {
-        return name;
+    public String getTopic() {
+        return topic;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setTopic(String topic) {
+        this.topic = topic;
     }
 
-    public Set<User> getUsers() {
-        return users;
+    public Set<Message> getMessages() {
+        return messages;
     }
 
-    public void setUsers(Set<User> users) {
-        this.users = users;
+    public void setMessages(Set<Message> messages) {
+        this.messages = messages;
     }
+
+    //    public Set<User> getUsers() {
+//        return users;
+//    }
+//
+//    public void setUsers(Set<User> users) {
+//        this.users = users;
+//    }
 }

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Model/Message.java

@@ -1,52 +1,54 @@
-//package ZipTeamOrange.model;
-//
-//import javax.persistence.*;
-//
-//@Entity
-//public class Message {
-//
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.IDENTITY)
-//    private long id;
-//    String message;
-//    @ManyToOne
-//    @JoinColumn(name="user_id")
-//    User user;
-//
-//    @ManyToOne
-//    @JoinColumn(name = "chat_id")
-//    private Chat chat;
-//
-//
-//    public Message(String message) {
-//        this.message = message;
-//        //this.user = user;
-//    }
-//
-//
-//    public Message(){}
-//
-//    public long getId() {
-//        return id;
-//    }
-//
-//    public void setId(long id) {
-//        this.id = id;
-//    }
-//
-//    public String getMessage() {
-//        return message;
-//    }
-//
-//    public void setMessage(String message) {
-//        this.message = message;
-//    }
-//
-//    public User getUser() {
-//        return user;
-//    }
-//
-//    public void setUser(User user) {
-//        this.user = user;
-//    }
-//}
+package ZipTeamOrange.model;
+
+import javax.persistence.*;
+
+@Entity
+public class Message {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    String message;
+
+    @ManyToOne
+    @JoinColumn(name="user_id")
+    User user;
+
+    @ManyToOne
+    @JoinColumn(name = "chat_id")
+    private Chat chat;
+
+
+    public Message(String message) {
+        this.message = message;
+        //this.user = user;
+    }
+
+
+    public Message(){}
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+}