From 81fe120873a0dd1ce89f43f3e907c490ff41b04f Mon Sep 17 00:00:00 2001 From: tjdtn0219 Date: Wed, 24 Jan 2024 18:01:22 +0900 Subject: [PATCH] =?UTF-8?q?refacor:=20NotificationDTO=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/notification/dto/ChatNotificationDto.java | 9 ++------- .../domain/notification/service/NotificationService.java | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main/java/kr/co/fastcampus/yanabada/domain/notification/dto/ChatNotificationDto.java b/src/main/java/kr/co/fastcampus/yanabada/domain/notification/dto/ChatNotificationDto.java index 5860867e..bdb11cdf 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/notification/dto/ChatNotificationDto.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/notification/dto/ChatNotificationDto.java @@ -13,10 +13,7 @@ public record ChatNotificationDto( Member sender, Member receiver, - String accommodationName, - String chatRoomCode, - String senderNickname, - String image + String accommodationName ) { public static ChatNotificationDto from( @@ -30,15 +27,13 @@ public static ChatNotificationDto from( .accommodationName( chatRoom.getProduct().getOrder().getRoom().getAccommodation().getName() ) - .image(sender.getImage()) .build(); } public String convertMapToJsonStr(ObjectMapper objectMapper) { Map contentMap = new HashMap<>(); - contentMap.put("senderNickname", senderNickname); + contentMap.put("senderNickname", sender().getNickName()); contentMap.put("accommodationName", accommodationName); - contentMap.put("chatRoomCode", chatRoomCode); try { return objectMapper.writeValueAsString(contentMap); } catch (JsonProcessingException e) { diff --git a/src/main/java/kr/co/fastcampus/yanabada/domain/notification/service/NotificationService.java b/src/main/java/kr/co/fastcampus/yanabada/domain/notification/service/NotificationService.java index fb6d8add..85e4e170 100644 --- a/src/main/java/kr/co/fastcampus/yanabada/domain/notification/service/NotificationService.java +++ b/src/main/java/kr/co/fastcampus/yanabada/domain/notification/service/NotificationService.java @@ -85,7 +85,7 @@ public void sendChatCreated(ChatNotificationDto chatDto, String content) { .receiver(chatDto.receiver()) .notificationType(CHAT) .content(chatDto.convertMapToJsonStr(objectMapper)) - .image(chatDto.image()) + .image(chatDto.sender().getImage()) .build(); notificationHistoryRepository.save(notificationHistory);