debug

Author: Marc Gorzala

src/main/java/net/dancier/dancer/chat/ChatController.java

@@ -41,24 +41,23 @@ public ResponseEntity<ChatsDto> getChats(@CurrentUser AuthenticatedUser authenti
 
     @PostMapping("")
     @Secured(ROLE_USER)
-    public ResponseEntity<ChatDto> postChat(
+    public ResponseEntity postChat(
             @CurrentUser AuthenticatedUser authenticatedUser,
             @RequestBody CreateChatDto createChatDto) {
         log.info("Creating a new chat for User {}.", authenticatedUser.getUserId());
 
-        ChatDto createdChat = chatService.createChat(authenticatedUser.getDancerIdOrThrow(), createChatDto);
-        log.info("this chat was created " + createdChat);
+        CreatedChatDto createdChatDto = chatService.createChat(authenticatedUser.getDancerIdOrThrow(), createChatDto);
+        log.info("Got this stuff: " + createdChatDto);
         URI location = ServletUriComponentsBuilder
                 .fromCurrentContextPath()
-                .path("/chats/" + createdChat.getChatId())
+                .path("/chats/" + createdChatDto.id)
                 .build()
                 .toUri();
 
         MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
         headers.set("Location", location.toString());
 
         return new ResponseEntity(
-                createdChat,
                 headers,
                 HttpStatus.CREATED
         );

src/main/java/net/dancier/dancer/chat/ChatService.java

@@ -7,6 +7,7 @@
 import net.dancier.dancer.core.exception.BusinessException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -26,7 +27,7 @@ public ChatsDto getChatsByUserId(UUID dancerId) {
         return chatServiceClient.getChats(dancerId);
     }
 
-    public ChatDto createChat(UUID dancerId, CreateChatDto createChatDto) {
+    public CreatedChatDto createChat(UUID dancerId, CreateChatDto createChatDto) {
         log.info("check if dancer is in chat.");
         throwIfDancerIsNotInChat(createChatDto.getParticipantIds(), dancerId);
         log.info("About to make the rest-call");

src/main/java/net/dancier/dancer/chat/client/ChatServiceClient.java

@@ -1,13 +1,12 @@
 package net.dancier.dancer.chat.client;
 
 import io.netty.handler.logging.LogLevel;
-import net.dancier.dancer.chat.dto.ChatDto;
-import net.dancier.dancer.chat.dto.CreateChatDto;
-import net.dancier.dancer.chat.dto.ChatsDto;
-import net.dancier.dancer.chat.dto.MessagesDto;
+import net.dancier.dancer.chat.dto.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.actuate.autoconfigure.metrics.MetricsProperties;
+import org.springframework.http.ResponseEntity;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;
 import org.springframework.stereotype.Service;
 import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
@@ -39,6 +38,7 @@ public void init() {
                 .create()
                 .wiretap("reactor.netty.http.client.HttpClient",
                         LogLevel.INFO, AdvancedByteBufFormat.TEXTUAL);
+
         this.webClient = WebClient.builder()
                 .baseUrl(host)
                 .clientConnector(new ReactorClientHttpConnector(httpClient))
@@ -58,7 +58,7 @@ public ChatsDto getChats(UUID dancerId) {
                 .block();
     }
 
-    public ChatDto createChat(CreateChatDto createChatDto) {
+    public CreatedChatDto createChat(CreateChatDto createChatDto) {
         log.info("now creating");
         return webClient.post()
                 .uri(uriBuilder -> uriBuilder
@@ -67,7 +67,7 @@ public ChatDto createChat(CreateChatDto createChatDto) {
                 )
                 .body(Mono.just(createChatDto), CreateChatDto.class)
                 .retrieve()
-                .bodyToMono(ChatDto.class)
+                .bodyToMono(CreatedChatDto.class)
                 .block();
     }
 

src/main/java/net/dancier/dancer/chat/dto/CreatedChatDto.java

@@ -0,0 +1,7 @@
+package net.dancier.dancer.chat.dto;
+
+import java.util.UUID;
+
+public class CreatedChatDto {
+    public UUID id;
+}

src/test/java/net/dancier/dancer/chat/ChatControllerTest.java

@@ -11,7 +11,10 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.test.context.support.WithUserDetails;
 import org.springframework.test.web.servlet.ResultActions;
 
@@ -84,16 +87,18 @@ void postChatShouldReturnTheChat() throws Exception {
             createdChat.setParticipantIds(dancerIds);
             createdChat.setChatId(UUID.randomUUID());
 
-            when(chatServiceClient.createChat(chat)).thenReturn(createdChat);
+            CreatedChatDto createdChatDto = new CreatedChatDto();
+            createdChatDto.id = UUID.randomUUID();
+
+            when(chatServiceClient.createChat(chat)).thenReturn(createdChatDto);
 
             ResultActions result = mockMvc.perform(post("/chats")
                             .contentType(MediaType.APPLICATION_JSON)
                             .content(objectMapper.writeValueAsBytes(chat)))
                     .andExpect(status().isCreated())
                     .andExpect(header().exists("Location"));
 
-            result.andExpect(jsonPath("$.participantIds").isNotEmpty());
-            result.andExpect(jsonPath("$.chatId").isNotEmpty());
+            result.andExpect(jsonPath("$").doesNotExist());
         }
 
         @Test