Udated Message Class

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

@@ -1,33 +1,34 @@
 package ZipTeamOrange.model;
 
+import ZipTeamOrange.model.Audit.DateAudit;
+import ZipTeamOrange.model.Audit.UserDateAudit;
+
 import javax.persistence.*;
 
 @Entity
-public class Message {
+public class Message extends UserDateAudit {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private long id;
 
-    String message;
+    String text;
 
-    @ManyToOne
-    @JoinColumn(name="user_id")
-    User user;
+//    @ManyToOne
+//    @JoinColumn(name="user_id")
+//    User user;
 
-    @ManyToOne
-    @JoinColumn(name = "chat_id")
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "chat_id", nullable = false)
     private Chat chat;
 
+    public Message() { }
 
-    public Message(String message) {
-        this.message = message;
+    public Message(String text) {
+        this.text = text;
         //this.user = user;
     }
 
-
-    public Message(){}
-
     public long getId() {
         return id;
     }
@@ -36,19 +37,19 @@ public class Message {
         this.id = id;
     }
 
-    public String getMessage() {
-        return message;
+    public String getText() {
+        return text;
     }
 
-    public void setMessage(String message) {
-        this.message = message;
+    public void setText(String text) {
+        this.text = text;
     }
 
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
+//    public User getUser() {
+//        return user;
+//    }
+//
+//    public void setUser(User user) {
+//        this.user = user;
+//    }
 }

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Repository/ChatRepository.java

@@ -1,7 +1,25 @@
-//package ZipTeamOrange.repository;
-//
-//import ZipTeamOrange.model.Chat;
-//import org.springframework.data.jpa.repository.JpaRepository;
-//
-//public interface ChatRepository extends JpaRepository<Chat, Long> {
-//}
+package ZipTeamOrange.repository;
+
+import ZipTeamOrange.model.Chat;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface ChatRepository extends JpaRepository<Chat, Long> {
+
+    Optional<Chat> findById(Long chatId);
+
+    Page<Chat> findByCreatedBy(Long userId, Pageable pageable);
+
+    long countByCreatedBy(Long userId);
+
+    List<Chat> findByIdIn(List<Long> chatIds);
+
+    List<Chat> findByIdIn(List<Long> chatIds, Sort sort);
+
+}
+

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Repository/MessageRepository.java

@@ -1,9 +1,30 @@
-//package ZipTeamOrange.repository;
-//
-//import ZipTeamOrange.model.Message;
-//import org.springframework.data.jpa.repository.JpaRepository;
-//
-//public interface MessageRepository extends JpaRepository<Message, Long> {
-//
-//
-//}
+package ZipTeamOrange.repository;
+
+import ZipTeamOrange.model.Chat;
+import ZipTeamOrange.model.Message;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface MessageRepository extends JpaRepository<Message, Long> {
+
+    Optional<Message> findById(Long messageId);
+
+    Page<Message> findByCreatedBy(Long userId, Pageable pageable);
+
+    long countByCreatedBy(Long userId);
+
+//    @Query("SELECT COUNT(m.id) from Message v where v.user.id = :userId")
+//    long countByUserId(@Param("userId") Long userId);
+
+    List<Message> findByIdIn(List<Long> messageIds);
+
+    List<Message> findByIdIn(List<Long> messageIds, Sort sort);
+
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/payload/ChatRequest.java

@@ -0,0 +1,46 @@
+package ZipTeamOrange.payload;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.List;
+
+public class ChatRequest {
+    @NotBlank
+    @Size(max = 140)
+    private String topic;
+
+    @NotNull
+    @Size(min = 2, max = 6)
+    @Valid
+    private List<MessageRequest> choices;
+
+//    @NotNull
+//    @Valid
+//    private PollLength pollLength;
+
+    public String getTopic() {
+        return topic;
+    }
+
+    public void setTopic(String topic) {
+        this.topic = topic;
+    }
+
+    public List<MessageRequest> getChoices() {
+        return choices;
+    }
+
+    public void setChoices(List<MessageRequest> choices) {
+        this.choices = choices;
+    }
+
+//    public PollLength getPollLength() {
+//        return pollLength;
+//    }
+//
+//    public void setPollLength(PollLength pollLength) {
+//        this.pollLength = pollLength;
+//    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/payload/MessageRequest.java

@@ -0,0 +1,18 @@
+package ZipTeamOrange.payload;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+public class MessageRequest {
+    @NotBlank
+    @Size(max = 40)
+    private String text;
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/payload/UserIdentityAvailability.java

@@ -0,0 +1,17 @@
+package ZipTeamOrange.payload;
+
+public class UserIdentityAvailability {
+    private Boolean available;
+
+    public UserIdentityAvailability(Boolean available) {
+        this.available = available;
+    }
+
+    public Boolean getAvailable() {
+        return available;
+    }
+
+    public void setAvailable(Boolean available) {
+        this.available = available;
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/payload/UserSummary.java

@@ -0,0 +1,28 @@
+package ZipTeamOrange.payload;
+
+public class UserSummary {
+    private Long id;
+    private String username;
+
+    public UserSummary(Long id, String username, String name) {
+        this.id = id;
+        this.username = username;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+}

ZipTeamOrange-server/src/main/resources/data.sql

@@ -1,2 +1,3 @@
 insert into roles(name) values ('ROLE_ADMIN');
-insert into roles(name) values ('ROLE_USER');
+insert into roles(name) values ('ROLE_USER');
+--select count (m.id) from Messages where m.userId = userId;