ZipTeamOrange-server/src/main/java/ZipTeamOrange/Config/AuditingConfig.java

@@ -20,7 +20,7 @@ public class AuditingConfig {
     public AuditorAware<Long> auditorProvider() {
         return new SpringSecurityAuditAwareImpl();
     }
-
+}
 
     class SpringSecurityAuditAwareImpl implements AuditorAware<Long> {
 
@@ -39,4 +39,4 @@ public class AuditingConfig {
             return Optional.ofNullable(userPrincipal.getId());
         }
     }
-}
+

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Controller/ChatController.java

@@ -1,30 +1,41 @@
-//package ZipTeamOrange.controller;
-//
-//import ZipTeamOrange.model.Chat;
-//import ZipTeamOrange.repository.ChatRepository;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.controller;
-//import org.springframework.web.bind.annotation.*;
-//
-//@controller
-//@RequestMapping(path = "/chat")
-//@CrossOrigin(origins = {"http://localhost:8103"})
-//public class ChatController {
-//
-//    @Autowired
-//    private ChatRepository chatRepository;
-//
-//    @PostMapping(path="/add")
-//    public @ResponseBody
-//    Chat addNewChat(@RequestBody Chat chat){
-//        chatRepository.save(chat);
-//        return  chat;
-//    }
-//
-//    @GetMapping(path="/all")
-//    public @ResponseBody Iterable<Chat> getAllChat() {
-//        //this returns a JSON or XML with chats
-//        return chatRepository.findAll();
-//
-//    }
-//}
+package ZipTeamOrange.controller;
+
+import ZipTeamOrange.model.Chat;
+import ZipTeamOrange.repository.ChatRepository;
+import ZipTeamOrange.repository.MessageRepository;
+import ZipTeamOrange.repository.UserRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/chat")
+@CrossOrigin(origins = {"http://localhost:8103"})
+public class ChatController {
+
+    @Autowired
+    private ChatRepository chatRepository;
+
+    @Autowired
+    private MessageRepository messageRepository;
+
+    @Autowired
+    private UserRepository userRepository;
+
+    private static final Logger logger = LoggerFactory.getLogger(ChatController.class);
+
+    @PostMapping(path="/add")
+    public @ResponseBody
+    Chat addNewChat(@RequestBody Chat chat){
+        chatRepository.save(chat);
+        return  chat;
+    }
+
+    @GetMapping(path="/all")
+    public @ResponseBody Iterable<Chat> getAllChat() {
+        //this returns a JSON or XML with chats
+        return chatRepository.findAll();
+
+    }
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Controller/MessageController.java

@@ -1,33 +1,38 @@
-//package ZipTeamOrange.controller;
-//
-//import ZipTeamOrange.model.Message;
-//import ZipTeamOrange.repository.MessageRepository;
-//import com.fasterxml.jackson.core.JsonProcessingException;
-//import com.fasterxml.jackson.databind.ObjectMapper;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.*;
-//
-//@RestController
-//@RequestMapping(path = "/message")
-//@CrossOrigin("http://localhost:8100")
-//public class MessageController {
-//    ObjectMapper ob = new ObjectMapper();
-//
-//    @Autowired
-//    private MessageRepository messageRepository;
-//    @PostMapping(path = "/add")
-//    public String postMessage(@RequestBody Message message) throws JsonProcessingException {
-//
-//        messageRepository.save(message);
-//
-//        return ob.writeValueAsString(message);
-//
-//    }
-//
-//    @GetMapping(path = "/all")
-//    public @ResponseBody Iterable<Message> getAllMessages(){
-//        return messageRepository.findAll();
-//    }
-//
-//
-//}
+package ZipTeamOrange.controller;
+
+import ZipTeamOrange.model.Message;
+import ZipTeamOrange.repository.MessageRepository;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.security.RolesAllowed;
+
+@RestController
+@RequestMapping(path = "/message")
+@CrossOrigin("http://localhost:8100")
+public class MessageController {
+    ObjectMapper ob = new ObjectMapper();
+
+    @Autowired
+    private MessageRepository messageRepository;
+
+    @PostMapping(path = "/add")
+    @RolesAllowed("ROLE_USER")
+    public String postMessage(@RequestBody Message message) throws JsonProcessingException {
+
+        messageRepository.save(message);
+
+        return ob.writeValueAsString(message);
+
+    }
+
+    @GetMapping(path = "/all")
+    public @ResponseBody Iterable<Message> getAllMessages(){
+        return messageRepository.findAll();
+    }
+
+
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Controller/UserController.java

@@ -7,6 +7,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Optional;
+
 @RestController
 @RequestMapping(path = "/user")
 public class UserController {
@@ -23,10 +25,14 @@ public class UserController {
         return ob.writeValueAsString(user);
     }
 
-    @GetMapping(path="/all")
-    public @ResponseBody Iterable<User> getAllUser(){
-        //this returns a JSON or XML with users
-        return userRepository.findAll();
+    @GetMapping(path="/userName")
+    public Optional<User> findByUserName(@RequestParam("name") String userName) {
+        return userRepository.findByUsername(userName);
+    }
+
+    @GetMapping(path="/email")
+    public Optional<User> findByEmail(@RequestParam("email") String email) {
+        return userRepository.findByEmail(email);
     }
 
 }

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

@@ -3,6 +3,11 @@ package ZipTeamOrange.model;
 import ZipTeamOrange.model.Audit.UserDateAudit;
 import ZipTeamOrange.model.Message;
 import ZipTeamOrange.model.User;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
+
 import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
 import java.util.Set;
@@ -24,12 +29,33 @@ public class Chat extends UserDateAudit {
     orphanRemoval = true)
     private Set<Message> messages;
 
-//    @ManyToMany(mappedBy = "chat")
-//    private Set<User> users;
+    @ManyToMany(fetch = FetchType.EAGER,
+    cascade = CascadeType.ALL)
+    @JoinTable(name = "chat_users",
+            joinColumns = @JoinColumn(name = "chat_id"),
+            inverseJoinColumns = @JoinColumn(name = "user_id"))
+    private Set<User> users;
+
+    @Column(name = "created_date", nullable = false, updatable = false)
+    @CreatedDate
+    private long createdDate;
+
+    @Column(name = "modified_date")
+    @LastModifiedDate
+    private long modifiedDate;
+
+    @Column(name = "created_by")
+    @CreatedBy
+    private String createdBy;
 
-    public Chat(String topic, Set<Message> messages) {
+    @Column(name = "modified_by")
+    @LastModifiedBy
+    private String modifiedBy;
+
+    public Chat(String topic, Set<Message> messages, Set<User> user) {
         this.topic = topic;
         this.messages = messages;
+        this.users = user;
     }
 
     public Chat() { }
@@ -58,11 +84,29 @@ public class Chat extends UserDateAudit {
         this.messages = messages;
     }
 
-    //    public Set<User> getUsers() {
-//        return users;
-//    }
-//
-//    public void setUsers(Set<User> users) {
-//        this.users = users;
-//    }
+        public Set<User> getUsers() {
+        return users;
+    }
+
+    public void setUsers(Set<User> users) {
+        this.users = users;
+    }
+
+    public void addMessage(Message message) {
+        messages.add(message);
+        message.setChat(this);
+    }
+
+    public void removeMessage(Message message) {
+        messages.remove(message);
+        message.setChat(null);
+    }
+
+    public void addUser(User user) {
+        users.add(user);
+    }
+
+    public void removeUser(User user) {
+        users.remove(user);
+    }
 }

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

@@ -2,6 +2,10 @@ package ZipTeamOrange.model;
 
 import ZipTeamOrange.model.Audit.DateAudit;
 import ZipTeamOrange.model.Audit.UserDateAudit;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
 
 import javax.persistence.*;
@@ -15,19 +19,34 @@ public class Message extends UserDateAudit {
 
     String text;
 
-//    @ManyToOne
-//    @JoinColumn(name="user_id")
-//    User user;
-
     @ManyToOne(fetch = FetchType.LAZY, optional = false)
     @JoinColumn(name = "chat_id", nullable = false)
     private Chat chat;
 
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
+
+    @Column(name = "created_date", nullable = false, updatable = false)
+    @CreatedDate
+    private long createdDate;
+
+    @Column(name = "modified_date")
+    @LastModifiedDate
+    private long modifiedDate;
+
+    @Column(name = "created_by")
+    @CreatedBy
+    private String createdBy;
+
+    @Column(name = "modified_by")
+    @LastModifiedBy
+    private String modifiedBy;
+
     public Message() { }
 
     public Message(String text) {
         this.text = text;
-        //this.user = user;
     }
 
     public long getId() {
@@ -46,11 +65,11 @@ public class Message extends UserDateAudit {
         this.text = text;
     }
 
-//    public User getUser() {
-//        return user;
-//    }
-//
-//    public void setUser(User user) {
-//        this.user = user;
-//    }
+    public Chat getChat() {
+        return chat;
+    }
+
+    public void setChat(Chat chat) {
+        this.chat = chat;
+    }
 }

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

@@ -1,27 +1,27 @@
-//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 org.springframework.stereotype.Repository;
-//
-//import java.util.List;
-//import java.util.Optional;
-//
-//@Repository
-//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);
-//
-//}
-//
+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 org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Optional;
+
+@Repository
+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,34 +1,34 @@
-//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 org.springframework.data.rest.core.annotation.RepositoryRestResource;
-//import org.springframework.stereotype.Repository;
-//
-//import java.util.List;
-//import java.util.Optional;
-//
-//@Repository
-//@RepositoryRestResource(collectionResourceRel = "message", path = "message")
-//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);
-//
-//}
+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 org.springframework.data.rest.core.annotation.RepositoryRestResource;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Optional;
+
+@Repository
+@RepositoryRestResource(collectionResourceRel = "message", path = "message")
+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/controller/AuthController.java

@@ -1,13 +1,12 @@
 package ZipTeamOrange.controller;
 
-import ZipTeamOrange.exception.AppException;
 import ZipTeamOrange.model.Role;
 import ZipTeamOrange.model.RoleName;
 import ZipTeamOrange.model.User;
-import ZipTeamOrange.payload.ApiResponse;
-import ZipTeamOrange.payload.JwtAuthenticationResponse;
-import ZipTeamOrange.payload.LoginRequest;
-import ZipTeamOrange.payload.SignUpRequest;
+import ZipTeamOrange.payload.response.ApiResponse;
+import ZipTeamOrange.payload.response.JwtAuthenticationResponse;
+import ZipTeamOrange.payload.request.LoginRequest;
+import ZipTeamOrange.payload.request.SignUpRequest;
 import ZipTeamOrange.repository.RoleRepository;
 import ZipTeamOrange.repository.UserRepository;
 import ZipTeamOrange.security.JwtTokenProvider;

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

@@ -1,46 +0,0 @@
-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/UserProfile.java

@@ -0,0 +1,50 @@
+package ZipTeamOrange.payload;
+
+import java.time.Instant;
+
+public class UserProfile {
+
+    private Long id;
+    private String username;
+    private Instant joinedAt;
+    private long messageCount;
+
+    public UserProfile(Long id, String username, Instant joinedAt, long messageCount) {
+        this.id = id;
+        this.username = username;
+        this.joinedAt = joinedAt;
+        this.messageCount = messageCount;
+    }
+
+    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;
+    }
+
+    public Instant getJoinedAt() {
+        return joinedAt;
+    }
+
+    public void setJoinedAt(Instant joinedAt) {
+        this.joinedAt = joinedAt;
+    }
+
+    public long getMessageCount() {
+        return messageCount;
+    }
+
+    public void setMessageCount(long messageCount) {
+        this.messageCount = messageCount;
+    }
+}

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

@@ -0,0 +1,49 @@
+package ZipTeamOrange.payload.request;
+
+import ZipTeamOrange.model.User;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.util.List;
+import java.util.Set;
+
+public class ChatRequest {
+    @NotBlank
+    @Size(max = 140)
+    private String topic;
+
+    @NotNull
+    @Valid
+    private List<MessageRequest> messages;
+
+    @NotNull
+    @Valid
+    private Set<User> users;
+
+    public String getTopic() {
+        return topic;
+    }
+
+    public void setTopic(String topic) {
+        this.topic = topic;
+    }
+
+    public List<MessageRequest> getMessages() {
+        return messages;
+    }
+
+    public void setMessages(List<MessageRequest> 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/Payload/LoginRequest.java → ZipTeamOrange-server/src/main/java/ZipTeamOrange/payload/request/LoginRequest.java

@@ -1,4 +1,4 @@
-package ZipTeamOrange.payload;
+package ZipTeamOrange.payload.request;
 
 import javax.validation.constraints.NotBlank;
 

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

@@ -1,4 +1,6 @@
-package ZipTeamOrange.payload;
+package ZipTeamOrange.payload.request;
+
+import ZipTeamOrange.model.User;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
@@ -8,6 +10,17 @@ public class MessageRequest {
     @Size(max = 40)
     private String text;
 
+    @NotBlank
+    private User user;
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
     public String getText() {
         return text;
     }

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Payload/SignUpRequest.java → ZipTeamOrange-server/src/main/java/ZipTeamOrange/payload/request/SignUpRequest.java

@@ -1,4 +1,4 @@
-package ZipTeamOrange.payload;
+package ZipTeamOrange.payload.request;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Payload/ApiResponse.java → ZipTeamOrange-server/src/main/java/ZipTeamOrange/payload/response/ApiResponse.java

@@ -1,4 +1,4 @@
-package ZipTeamOrange.payload;
+package ZipTeamOrange.payload.response;
 
 public class ApiResponse {
     private Boolean success;

ZipTeamOrange-server/src/main/java/ZipTeamOrange/payload/response/ChatResonse.java

@@ -0,0 +1,4 @@
+package ZipTeamOrange.payload.response;
+
+public class ChatResonse {
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/payload/response/ChatResponse.java

@@ -0,0 +1,6 @@
+package ZipTeamOrange.payload.response;
+
+public class ChatResponse {
+
+
+}

ZipTeamOrange-server/src/main/java/ZipTeamOrange/Payload/JwtAuthenticationResponse.java → ZipTeamOrange-server/src/main/java/ZipTeamOrange/payload/response/JwtAuthenticationResponse.java

@@ -1,4 +1,4 @@
-package ZipTeamOrange.payload;
+package ZipTeamOrange.payload.response;
 
 public class JwtAuthenticationResponse {
     private String accessToken;