new api

dancier · Dec 15, 2023 · 8efd185 · 8efd185
1 parent 1b9777f
commit 8efd185
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/src/main/java/net/dancier/dancer/chat/ChatService.java b/src/main/java/net/dancier/dancer/chat/ChatService.java
@@ -4,7 +4,6 @@
 import net.dancier.dancer.chat.client.ChatServiceClient;
 import net.dancier.dancer.chat.client.RemoteCreateMessageDto;
 import net.dancier.dancer.chat.dto.*;
-import net.dancier.dancer.core.DancerService;
 import net.dancier.dancer.core.exception.BusinessException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,7 +27,7 @@ public ChatsDto getChatsByUserId(UUID dancerId) {
     }
 
     public ChatDto createChat(UUID dancerId, CreateChatDto createChatDto) {
-        throwIfDancerIsNotInChat(createChatDto.getDancerIds(), dancerId);
+        throwIfDancerIsNotInChat(createChatDto.getParticipantIds(), dancerId);
 
         return chatServiceClient.createChat(createChatDto);
     }

diff --git a/src/main/java/net/dancier/dancer/chat/dto/CreateChatDto.java b/src/main/java/net/dancier/dancer/chat/dto/CreateChatDto.java
@@ -9,7 +9,5 @@
 
 @Data
 public class CreateChatDto {
-    private List<UUID> dancerIds;
-    @Enumerated(EnumType.STRING)
-    private ChatType type;
+    private List<UUID> participantIds;
 }
diff --git a/src/test/java/net/dancier/dancer/chat/ChatControllerTest.java b/src/test/java/net/dancier/dancer/chat/ChatControllerTest.java
@@ -78,12 +78,10 @@ public class PostChats {
         void postChatShouldReturnTheChat() throws Exception {
             List dancerIds = List.of(dancerId, UUID.randomUUID());
             CreateChatDto chat = new CreateChatDto();
-            chat.setDancerIds(dancerIds);
-            chat.setType(ChatType.DIRECT);
+            chat.setParticipantIds(dancerIds);
 
             ChatDto createdChat = new ChatDto();
             createdChat.setDancerIds(dancerIds);
-            createdChat.setType(ChatType.DIRECT);
             createdChat.setChatId(UUID.randomUUID());
 
             when(chatServiceClient.createChat(chat)).thenReturn(createdChat);
@@ -96,16 +94,14 @@ void postChatShouldReturnTheChat() throws Exception {
 
             result.andExpect(jsonPath("$.dancerIds").isNotEmpty());
             result.andExpect(jsonPath("$.chatId").isNotEmpty());
-            result.andExpect(jsonPath("$.type").value(ChatType.DIRECT.name()));
         }
 
         @Test
         @WithUserDetails("user-with-a-profile@dancier.net")
         void postChatShouldNotCreateTheChatIfUserIsNotPartOfIt() throws Exception {
             List dancerIds = List.of(UUID.randomUUID(), UUID.randomUUID());
             CreateChatDto chat = new CreateChatDto();
-            chat.setDancerIds(dancerIds);
-            chat.setType(ChatType.DIRECT);
+            chat.setParticipantIds(dancerIds);
 
             mockMvc.perform(post("/chats")
                             .contentType(MediaType.APPLICATION_JSON)