Conversations

packages/insea-connect-backend/src/main/java/ma/insea/connect/chat/common/chatMessage/ChatMessageDTO.java

@@ -2,8 +2,12 @@
 
 import java.util.Date;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class ChatMessageDTO {
     private Long senderId;
     private Long recipientId;

packages/insea-connect-backend/src/main/java/ma/insea/connect/chat/conversation/ConversatonController.java → packages/insea-connect-backend/src/main/java/ma/insea/connect/chat/conversation/ConversationController.java

@@ -14,7 +14,7 @@
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/v1")
-public class ConversatonController {
+public class ConversationController {
     private final ConversationService conversationService;
 
     @GetMapping("/conversations/{conversationId}/messages")

packages/insea-connect-backend/src/main/java/ma/insea/connect/chat/conversation/ConversationService.java

@@ -1,7 +1,10 @@
 package ma.insea.connect.chat.conversation;
 
 import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
+import java.util.Collections;
 
 import org.springframework.stereotype.Service;
 
@@ -60,6 +63,9 @@ public List<ConversationDTO> findConversationsByEmail() {
 
             conversationDTOs.add(conversationDTO);
         }
+        Collections.reverse(conversationDTOs);
+        conversationDTOs.sort(Comparator.comparing(
+        conversationDTO -> ((ConversationDTO) conversationDTO).getLastMessage() != null ? ((ConversationDTO) conversationDTO).getLastMessage().getTimestamp() : new Date(0)).reversed());
         return conversationDTOs;
 
 

packages/insea-connect-backend/src/main/java/ma/insea/connect/chat/group/GroupDTO2.java

@@ -1,9 +1,13 @@
 package ma.insea.connect.chat.group;
 
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import ma.insea.connect.chat.common.chatMessage.GroupMessageDTO;
 @Data
+@AllArgsConstructor
+@NoArgsConstructor
 public class GroupDTO2 {
     private Long id;
     private String name;

packages/insea-connect-backend/src/main/java/ma/insea/connect/chat/group/GroupService.java

@@ -3,6 +3,9 @@
 import lombok.RequiredArgsConstructor;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.stereotype.Service;
@@ -70,6 +73,11 @@ public List<GroupDTO2> findallgroupsofemail() {
             groupDTO.setLastMessage(chatMessage);
             groupDTOs.add(groupDTO);
         }
+        Collections.reverse(groupDTOs);
+        groupDTOs.sort(Comparator.comparing(
+        groupDTO2 -> ((GroupDTO2) groupDTO2).getLastMessage() != null ? ((GroupDTO2) groupDTO2).getLastMessage().getTimestamp() : new Date(0)).reversed());
+
+
         return groupDTOs;
     }
     public String deleteGroup(Long groupId) {

packages/insea-connect-backend/src/main/java/ma/insea/connect/user/UserController.java

@@ -1,8 +1,10 @@
 package ma.insea.connect.user;
 
 import lombok.RequiredArgsConstructor;
+import ma.insea.connect.chat.common.chatMessage.ChatMessageService;
 import ma.insea.connect.chat.conversation.Conversation;
 import ma.insea.connect.chat.conversation.ConversationDTO;
+import ma.insea.connect.chat.conversation.ConversationRepository;
 import ma.insea.connect.chat.conversation.ConversationService;
 import ma.insea.connect.chat.group.GroupDTO2;
 import ma.insea.connect.chat.group.GroupService;
@@ -11,6 +13,8 @@
 import ma.insea.connect.keycloak.service.KeyCloakService;
 import ma.insea.connect.user.DTO.AddUserDTO;
 import ma.insea.connect.user.DTO.UserInfoResponseDTO;
+import ma.insea.connect.utils.Functions;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.messaging.handler.annotation.MessageMapping;
@@ -36,6 +40,9 @@ public class UserController {
     private final UserRepository userRepository;
     private final ConversationService conversationService;
     private  final KeyCloakController keyCloakController;
+    private final Functions functions;
+    private final ChatMessageService chatMessageService;
+    private final ConversationRepository conversationRepository;
 
     @MessageMapping("/users.addUser")
     @SendTo("/user/public")
@@ -112,13 +119,20 @@ public ResponseEntity<UserInfoResponseDTO> getUserById(@AuthenticationPrincipal
 
     @GetMapping("/users/me/conversations")
     public ResponseEntity<List<ConversationDTO>> getUserConversations() {
-        List<ConversationDTO> conversations = conversationService.findConversationsByEmail();
-        return ResponseEntity.ok(conversations);
+        return ResponseEntity.ok(conversationService.findConversationsByEmail());
     }
 
-    @PostMapping("/user/me/conversations")
+    @PostMapping("/users/me/conversations")
     public ResponseEntity<Conversation> createConversation(@RequestBody Map<String,Long> recipientId) {
-        return ResponseEntity.ok(conversationService.createConversation(recipientId.get("recipientId")));
+        User connectedUser = functions.getConnectedUser();
+        String chatId=chatMessageService.getChatRoomId(Long.toString(connectedUser.getId()),Long.toString(recipientId.get("recipientId")),true);
+        if(conversationRepository.existsById(chatId))
+        {return ResponseEntity.status(HttpStatus.CONFLICT).build();
+        }
+        else{
+            conversationService.createConversation(recipientId.get("recipientId"));
+            return ResponseEntity.created(null).build();
+        }
 
     }
 }

packages/insea-connect-backend/src/main/java/ma/insea/connect/utils/DummyUserLoader.java

@@ -228,7 +228,7 @@ private void loadDummyUsers(UserRepository userRepository,GroupRepository groupR
             GroupMessage groupMessage3=new GroupMessage();
             groupMessage3.setGroupId(group.getId());
             groupMessage3.setContent("this is a nce group");
-            groupMessage3.setTimestamp(new java.sql.Date(System.currentTimeMillis()));
+            groupMessage3.setTimestamp(new java.sql.Date(System.currentTimeMillis()-1000000));
             groupMessage3.setSender(anas);
             groupMessageRepository.save(groupMessage3);
 
@@ -264,7 +264,7 @@ private void loadDummyUsers(UserRepository userRepository,GroupRepository groupR
             chatMessage3.setSender(anas);
             chatMessage3.setRecipient(soulayman);
             chatMessage3.setContent("nice to meet you too soulayman");
-            chatMessage3.setTimestamp(new java.sql.Date(System.currentTimeMillis()));
+            chatMessage3.setTimestamp(new java.sql.Date(System.currentTimeMillis()+1000000));
             chatMessageRepository.save(chatMessage3);
 
 
@@ -300,6 +300,13 @@ private void loadDummyUsers(UserRepository userRepository,GroupRepository groupR
             chatMessage33.setContent("nice to meet you too ahmed");
             chatMessage33.setTimestamp(new java.sql.Date(System.currentTimeMillis()));
             chatMessageRepository.save(chatMessage33);
+
+            var chatId4 = getChatRoomId(Long.toString(anas.getId()),Long.toString(saad.getId()), true);
+                Conversation conversation4 = new Conversation();
+                conversation4.setChatId(chatId4);
+                conversation4.setMember1(anas);
+                conversation4.setMember2(saad);
+                conversationRepository.save(conversation4);
 
     }
     public String getChatRoomId(String senderId,String recipientId,boolean createNewRoomIfNotExists)