From e58abc87600ddcd181057d4b881944a515567a72 Mon Sep 17 00:00:00 2001 From: hs12 Date: Sat, 16 Nov 2024 18:02:04 +0900 Subject: [PATCH 1/7] =?UTF-8?q?[feat]=20:=20=EC=B1=84=ED=8C=85=EB=B0=A9=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=20=EC=A1=B0=ED=9A=8C=20=ED=95=84=EB=93=9C?= =?UTF-8?q?=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dnd/gongmuin/chatroom/controller/ChatRoomController.java | 4 ++-- .../chatroom/dto/response/ChatRoomDetailResponse.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/dnd/gongmuin/chatroom/controller/ChatRoomController.java b/src/main/java/com/dnd/gongmuin/chatroom/controller/ChatRoomController.java index 79ab0a10..07cd73fe 100644 --- a/src/main/java/com/dnd/gongmuin/chatroom/controller/ChatRoomController.java +++ b/src/main/java/com/dnd/gongmuin/chatroom/controller/ChatRoomController.java @@ -36,7 +36,7 @@ public ResponseEntity> getChatMessages( return ResponseEntity.ok(response); } - @Operation(summary = "채팅방 활성화 목록 조회 API", description = "회원의 채팅방 목록을 조회한다.") + @Operation(summary = "채팅방 목록 조회 API", description = "회원의 채팅방 목록을 조회한다.") @GetMapping("/api/chat-rooms") public ResponseEntity> getChatRoomsByMember( @AuthenticationPrincipal Member member, @@ -47,7 +47,7 @@ public ResponseEntity> getChatRoomsByMember return ResponseEntity.ok(response); } - @Operation(summary = "채팅방 조회 API", description = "채팅방 아이디로 채팅방을 조회한다.") + @Operation(summary = "채팅방 상세조회 API", description = "채팅방 아이디로 채팅방을 조회한다.") @GetMapping("/api/chat-rooms/{chatRoomId}") public ResponseEntity createChatRoom( @PathVariable("chatRoomId") Long chatRoomId, diff --git a/src/main/java/com/dnd/gongmuin/chatroom/dto/response/ChatRoomDetailResponse.java b/src/main/java/com/dnd/gongmuin/chatroom/dto/response/ChatRoomDetailResponse.java index 52502c5d..86b3fb3e 100644 --- a/src/main/java/com/dnd/gongmuin/chatroom/dto/response/ChatRoomDetailResponse.java +++ b/src/main/java/com/dnd/gongmuin/chatroom/dto/response/ChatRoomDetailResponse.java @@ -6,7 +6,7 @@ public record ChatRoomDetailResponse( Long questionPostId, String targetJobGroup, String title, - MemberInfo receiverInfo, + MemberInfo chatPartner, boolean isInquirer ) { } From 6a13d25a8053685b8668d3b0b3c70b5d34a71bdb Mon Sep 17 00:00:00 2001 From: hs12 Date: Sat, 16 Nov 2024 18:02:18 +0900 Subject: [PATCH 2/7] =?UTF-8?q?[test]=20:=20=EC=B1=84=ED=8C=85=EB=B0=A9=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=20=EC=A1=B0=ED=9A=8C=20=ED=95=84=EB=93=9C?= =?UTF-8?q?=EB=AA=85=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gongmuin/chat/controller/ChatRoomControllerTest.java | 8 ++++---- .../dnd/gongmuin/chat/service/ChatRoomServiceTest.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/com/dnd/gongmuin/chat/controller/ChatRoomControllerTest.java b/src/test/java/com/dnd/gongmuin/chat/controller/ChatRoomControllerTest.java index 2a8bf2eb..b407ec4e 100644 --- a/src/test/java/com/dnd/gongmuin/chat/controller/ChatRoomControllerTest.java +++ b/src/test/java/com/dnd/gongmuin/chat/controller/ChatRoomControllerTest.java @@ -142,10 +142,10 @@ void getChatRoomById() throws Exception { .andExpect(jsonPath("$.questionPostId").value(questionPost.getId())) .andExpect(jsonPath("$.targetJobGroup").value(questionPost.getJobGroup().getLabel())) .andExpect(jsonPath("$.title").value(questionPost.getTitle())) - .andExpect(jsonPath("$.receiverInfo.memberId").value(inquirer.getId())) - .andExpect(jsonPath("$.receiverInfo.nickname").value(inquirer.getNickname())) - .andExpect(jsonPath("$.receiverInfo.memberJobGroup").value(inquirer.getJobGroup().getLabel())) - .andExpect(jsonPath("$.receiverInfo.profileImageNo").value(inquirer.getProfileImageNo())) + .andExpect(jsonPath("$.chatPartner.memberId").value(inquirer.getId())) + .andExpect(jsonPath("$.chatPartner.nickname").value(inquirer.getNickname())) + .andExpect(jsonPath("$.chatPartner.memberJobGroup").value(inquirer.getJobGroup().getLabel())) + .andExpect(jsonPath("$.chatPartner.profileImageNo").value(inquirer.getProfileImageNo())) .andExpect(jsonPath("$.isInquirer").value(false)); } } \ No newline at end of file diff --git a/src/test/java/com/dnd/gongmuin/chat/service/ChatRoomServiceTest.java b/src/test/java/com/dnd/gongmuin/chat/service/ChatRoomServiceTest.java index 7b84e5d6..67a03769 100644 --- a/src/test/java/com/dnd/gongmuin/chat/service/ChatRoomServiceTest.java +++ b/src/test/java/com/dnd/gongmuin/chat/service/ChatRoomServiceTest.java @@ -128,7 +128,7 @@ void getChatRoomById_Inquirer() { assertAll( () -> assertThat(response.questionPostId()) .isEqualTo(questionPost.getId()), - () -> assertThat(response.receiverInfo().memberId()) + () -> assertThat(response.chatPartner().memberId()) .isEqualTo(answerer.getId()) ); } @@ -154,7 +154,7 @@ void getChatRoomById_Answerer() { assertAll( () -> assertThat(response.questionPostId()) .isEqualTo(questionPost.getId()), - () -> assertThat(response.receiverInfo().memberId()) + () -> assertThat(response.chatPartner().memberId()) .isEqualTo(inquirer.getId()) ); } From 8b0fa331af565605f4fdb3dbcf66eb511602b12f Mon Sep 17 00:00:00 2001 From: hs12 Date: Sat, 16 Nov 2024 18:02:35 +0900 Subject: [PATCH 3/7] =?UTF-8?q?[feat]=20:=20=EC=B1=84=ED=8C=85=20=EC=9A=94?= =?UTF-8?q?=EC=B2=AD=EC=9D=98=20=EC=9D=91=EB=8B=B5=20=ED=95=84=EB=93=9C?= =?UTF-8?q?=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dnd/gongmuin/chat_inquiry/dto/ChatInquiryResponse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/dnd/gongmuin/chat_inquiry/dto/ChatInquiryResponse.java b/src/main/java/com/dnd/gongmuin/chat_inquiry/dto/ChatInquiryResponse.java index 6eaf7fdc..a79f9947 100644 --- a/src/main/java/com/dnd/gongmuin/chat_inquiry/dto/ChatInquiryResponse.java +++ b/src/main/java/com/dnd/gongmuin/chat_inquiry/dto/ChatInquiryResponse.java @@ -7,7 +7,7 @@ public record ChatInquiryResponse( Long chatInquiryId, - String message, + String inquiryMessage, String inquiryStatus, boolean isInquirer, MemberInfo partnerInfo From 24ea62eae29ab81f0ad0a335025452a67917371a Mon Sep 17 00:00:00 2001 From: hs12 Date: Sat, 16 Nov 2024 18:02:46 +0900 Subject: [PATCH 4/7] =?UTF-8?q?[test]=20:=20=EC=B1=84=ED=8C=85=20=EC=9A=94?= =?UTF-8?q?=EC=B2=AD=EC=9D=98=20=EC=9D=91=EB=8B=B5=20=ED=95=84=EB=93=9C?= =?UTF-8?q?=EB=AA=85=20=EC=88=98=EC=A0=95=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gongmuin/chat_inquiry/service/ChatInquiryServiceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/dnd/gongmuin/chat_inquiry/service/ChatInquiryServiceTest.java b/src/test/java/com/dnd/gongmuin/chat_inquiry/service/ChatInquiryServiceTest.java index b12c9e26..27816802 100644 --- a/src/test/java/com/dnd/gongmuin/chat_inquiry/service/ChatInquiryServiceTest.java +++ b/src/test/java/com/dnd/gongmuin/chat_inquiry/service/ChatInquiryServiceTest.java @@ -155,7 +155,7 @@ void getChatInquiresByMember() { .isEqualTo(chatInquiryId), () -> assertThat(response.get(0).partnerInfo().memberId()) .isEqualTo(partner.getId()), - () -> assertThat(response.get(0).message()) + () -> assertThat(response.get(0).inquiryMessage()) .isEqualTo(INQUIRY_MESSAGE) ); } From cc90a7efbfbdb73a3996a6bf0ba2bf9c0a9a1970 Mon Sep 17 00:00:00 2001 From: hs12 Date: Sat, 16 Nov 2024 18:18:58 +0900 Subject: [PATCH 5/7] =?UTF-8?q?[fix]=20:=20=EC=9E=98=EB=AA=BB=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=EB=90=9C=20=ED=95=84=EB=93=9C=EB=AA=85=20=EC=9B=90?= =?UTF-8?q?=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dnd/gongmuin/chat_inquiry/domain/ChatInquiry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/dnd/gongmuin/chat_inquiry/domain/ChatInquiry.java b/src/main/java/com/dnd/gongmuin/chat_inquiry/domain/ChatInquiry.java index 5bab80bb..86efde25 100644 --- a/src/main/java/com/dnd/gongmuin/chat_inquiry/domain/ChatInquiry.java +++ b/src/main/java/com/dnd/gongmuin/chat_inquiry/domain/ChatInquiry.java @@ -54,7 +54,7 @@ public class ChatInquiry extends TimeBaseEntity { @Column(name = "status", nullable = false) private InquiryStatus status; - @Column(name = "inquiryMessage", nullable = false) + @Column(name = "message", nullable = false) private String message; private ChatInquiry(QuestionPost questionPost, Member inquirer, Member answerer, String message) { From 2344f70aee71a4553cbba1af291635bf6fa7f846 Mon Sep 17 00:00:00 2001 From: hs12 Date: Sat, 16 Nov 2024 18:20:12 +0900 Subject: [PATCH 6/7] =?UTF-8?q?[feat]=20:=20=EC=B1=84=ED=8C=85=EC=9A=94?= =?UTF-8?q?=EC=B2=AD=20=EC=9D=91=EB=8B=B5=20=ED=95=84=EB=93=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dnd/gongmuin/chat_inquiry/dto/ChatInquiryResponse.java | 2 +- .../gongmuin/chat_inquiry/dto/CreateChatInquiryResponse.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/dnd/gongmuin/chat_inquiry/dto/ChatInquiryResponse.java b/src/main/java/com/dnd/gongmuin/chat_inquiry/dto/ChatInquiryResponse.java index a79f9947..87bdb0e9 100644 --- a/src/main/java/com/dnd/gongmuin/chat_inquiry/dto/ChatInquiryResponse.java +++ b/src/main/java/com/dnd/gongmuin/chat_inquiry/dto/ChatInquiryResponse.java @@ -10,7 +10,7 @@ public record ChatInquiryResponse( String inquiryMessage, String inquiryStatus, boolean isInquirer, - MemberInfo partnerInfo + MemberInfo chatPartner ) { @QueryProjection public ChatInquiryResponse( diff --git a/src/main/java/com/dnd/gongmuin/chat_inquiry/dto/CreateChatInquiryResponse.java b/src/main/java/com/dnd/gongmuin/chat_inquiry/dto/CreateChatInquiryResponse.java index 6986b83b..24080f16 100644 --- a/src/main/java/com/dnd/gongmuin/chat_inquiry/dto/CreateChatInquiryResponse.java +++ b/src/main/java/com/dnd/gongmuin/chat_inquiry/dto/CreateChatInquiryResponse.java @@ -6,6 +6,6 @@ public record CreateChatInquiryResponse( Long chatInquiryId, String inquiryMessage, String inquiryStatus, - MemberInfo partnerInfo + MemberInfo chatPartner ) { } From 92f1835e450b7a805a8ccc6f24f2e545c2dfd823 Mon Sep 17 00:00:00 2001 From: hs12 Date: Sat, 16 Nov 2024 18:20:44 +0900 Subject: [PATCH 7/7] =?UTF-8?q?[test]=20:=20=EC=B1=84=ED=8C=85=EC=9A=94?= =?UTF-8?q?=EC=B2=AD=20=EC=9D=91=EB=8B=B5=20=ED=95=84=EB=93=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chat_inquiry/controller/ChatInquiryControllerTest.java | 4 ++-- .../chat_inquiry/repository/ChatInquiryRepositoryTest.java | 4 ++-- .../gongmuin/chat_inquiry/service/ChatInquiryServiceTest.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/com/dnd/gongmuin/chat_inquiry/controller/ChatInquiryControllerTest.java b/src/test/java/com/dnd/gongmuin/chat_inquiry/controller/ChatInquiryControllerTest.java index 8d41caf9..992bffe2 100644 --- a/src/test/java/com/dnd/gongmuin/chat_inquiry/controller/ChatInquiryControllerTest.java +++ b/src/test/java/com/dnd/gongmuin/chat_inquiry/controller/ChatInquiryControllerTest.java @@ -105,12 +105,12 @@ void getChatInquiresByMember() throws Exception { .andExpect(status().isOk()) .andExpect(jsonPath("$.size").value(2)) .andExpect(jsonPath("$.content[0].chatInquiryId").value(chatInquiry2.getId())) // 내림차순 - .andExpect(jsonPath("$.content[0].partnerInfo.memberId").value(member2.getId())) + .andExpect(jsonPath("$.content[0].chatPartner.memberId").value(member2.getId())) .andExpect(jsonPath("$.content[0].isInquirer").value(true)) .andExpect(jsonPath("$.content[0].inquiryStatus").value(InquiryStatus.PENDING.getLabel())) .andExpect(jsonPath("$.content[1].chatInquiryId").value(chatInquiry1.getId())) - .andExpect(jsonPath("$.content[1].partnerInfo.memberId").value(member1.getId())) + .andExpect(jsonPath("$.content[1].chatPartner.memberId").value(member1.getId())) .andExpect(jsonPath("$.content[1].isInquirer").value(false)) .andExpect(jsonPath("$.content[1].inquiryStatus").value(InquiryStatus.PENDING.getLabel())) .andDo(MockMvcResultHandlers.print()); diff --git a/src/test/java/com/dnd/gongmuin/chat_inquiry/repository/ChatInquiryRepositoryTest.java b/src/test/java/com/dnd/gongmuin/chat_inquiry/repository/ChatInquiryRepositoryTest.java index 79ef7307..947de2c5 100644 --- a/src/test/java/com/dnd/gongmuin/chat_inquiry/repository/ChatInquiryRepositoryTest.java +++ b/src/test/java/com/dnd/gongmuin/chat_inquiry/repository/ChatInquiryRepositoryTest.java @@ -64,9 +64,9 @@ void getChatInquiresByMember() { Assertions.assertAll( () -> assertThat(responses).hasSize(2), () -> assertThat(responses.get(0).chatInquiryId()).isEqualTo(chatInquiries.get(1).getId()), - () -> assertThat(responses.get(0).partnerInfo().memberId()).isEqualTo(questioner.getId()), + () -> assertThat(responses.get(0).chatPartner().memberId()).isEqualTo(questioner.getId()), () -> assertThat(responses.get(1).chatInquiryId()).isEqualTo(chatInquiries.get(0).getId()), - () -> assertThat(responses.get(1).partnerInfo().memberId()).isEqualTo(answerer.getId()) + () -> assertThat(responses.get(1).chatPartner().memberId()).isEqualTo(answerer.getId()) ); } diff --git a/src/test/java/com/dnd/gongmuin/chat_inquiry/service/ChatInquiryServiceTest.java b/src/test/java/com/dnd/gongmuin/chat_inquiry/service/ChatInquiryServiceTest.java index 27816802..5048dec2 100644 --- a/src/test/java/com/dnd/gongmuin/chat_inquiry/service/ChatInquiryServiceTest.java +++ b/src/test/java/com/dnd/gongmuin/chat_inquiry/service/ChatInquiryServiceTest.java @@ -98,7 +98,7 @@ void createInquiry() { assertAll( () -> assertThat(response.chatInquiryId()) .isEqualTo(chatInquiryId), - () -> assertThat(response.partnerInfo().memberId()) + () -> assertThat(response.chatPartner().memberId()) .isEqualTo(answerer.getId()), () -> assertThat(response.inquiryMessage()) .isEqualTo(INQUIRY_MESSAGE) @@ -153,7 +153,7 @@ void getChatInquiresByMember() { () -> assertThat(response).hasSize(1), () -> assertThat(response.get(0).chatInquiryId()) .isEqualTo(chatInquiryId), - () -> assertThat(response.get(0).partnerInfo().memberId()) + () -> assertThat(response.get(0).chatPartner().memberId()) .isEqualTo(partner.getId()), () -> assertThat(response.get(0).inquiryMessage()) .isEqualTo(INQUIRY_MESSAGE)