Feat/#499 알림메시지 변경하기

backend/src/docs/asciidoc/common/notification-api.adoc

@@ -0,0 +1,9 @@
+[[notification-api]]
+== 알림
+
+== 나에게 온 알림 조회
+operation::notification[snippets='http-request,response-fields,http-response']
+
+== 알림 메시지 수정(어드민용)
+operation::notification-updating-message[snippets='request-fields,http-request,http-response']
+

backend/src/main/java/edonymyeon/backend/global/exception/ExceptionInformation.java

@@ -83,7 +83,9 @@ public enum ExceptionInformation {
     LOGGING_TYPE_NOT_EXISTS(9001, "존재하지 않는 로그 타입입니다."),
     ABUSING_TYPE_NOT_FOUND(9100, "존재하지 않는 리포팅 카테고리 분류입니다."),
     REPORT_TYPE_NOT_FOUND(9101, "존재하지 않는 리포팅 타입 분류입니다."),
-    NOTIFICATION_REQUEST_FAILED(9200, "알림 발송 요청에 실패했습니다.");
+    NOTIFICATION_REQUEST_FAILED(9200, "알림 발송 요청에 실패했습니다."),
+    NOTIFICATION_MESSAGE_NOT_FOUND(9201, "알림 발송에 필요한 메시지를 찾지 못했습니다."),
+    NOTIFICATION_MESSAGE_INVALID_CONTENT(9203, "알림 메시지로 사용할 수 없는 메시지입니다.");
 
     private int code;
 

backend/src/main/java/edonymyeon/backend/member/repository/MemberRepository.java

@@ -14,4 +14,6 @@ public interface MemberRepository extends JpaRepository<Member, Long>, MemberCus
     boolean existsByEmail(String email);
 
     boolean existsByNickname(String nickname);
+
+    Optional<Member> findByNickname(String nickname);
 }

backend/src/main/java/edonymyeon/backend/notification/application/NotificationService.java

@@ -1,12 +1,14 @@
 package edonymyeon.backend.notification.application;
 
-import static edonymyeon.backend.notification.domain.NotificationMessage.COMMENT_NOTIFICATION_TITLE;
-import static edonymyeon.backend.notification.domain.NotificationMessage.THUMBS_NOTIFICATION_TITLE;
-import static edonymyeon.backend.notification.domain.NotificationMessage.THUMBS_PER_10_NOTIFICATION_TITLE;
+import static edonymyeon.backend.notification.domain.notification_content.domain.NotificationContentId.COMMENT_NOTIFICATION_TITLE;
+import static edonymyeon.backend.notification.domain.notification_content.domain.NotificationContentId.THUMBS_NOTIFICATION_TITLE;
+import static edonymyeon.backend.notification.domain.notification_content.domain.NotificationContentId.THUMBS_PER_10_NOTIFICATION_TITLE;
 
 import edonymyeon.backend.comment.domain.Comment;
 import edonymyeon.backend.consumption.application.ConsumptionService;
 import edonymyeon.backend.global.exception.BusinessLogicException;
+import edonymyeon.backend.global.exception.EdonymyeonException;
+import edonymyeon.backend.global.exception.ExceptionInformation;
 import edonymyeon.backend.member.application.dto.ActiveMemberId;
 import edonymyeon.backend.member.application.dto.MemberId;
 import edonymyeon.backend.member.domain.Member;
@@ -15,8 +17,10 @@
 import edonymyeon.backend.notification.application.dto.NotificationResponse;
 import edonymyeon.backend.notification.application.dto.Receiver;
 import edonymyeon.backend.notification.domain.Notification;
-import edonymyeon.backend.notification.domain.NotificationMessage;
+import edonymyeon.backend.notification.domain.notification_content.domain.NotificationContentId;
 import edonymyeon.backend.notification.domain.ScreenType;
+import edonymyeon.backend.notification.domain.notification_content.application.NotificationMessageRepository;
+import edonymyeon.backend.notification.domain.notification_content.domain.NotificationContent;
 import edonymyeon.backend.notification.repository.NotificationRepository;
 import edonymyeon.backend.post.application.GeneralFindingCondition;
 import edonymyeon.backend.post.application.PostSlice;
@@ -25,7 +29,9 @@
 import edonymyeon.backend.setting.domain.SettingType;
 import edonymyeon.backend.thumbs.application.ThumbsService;
 import jakarta.persistence.EntityManager;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -55,6 +61,8 @@ public class NotificationService {
 
     private final ConsumptionService consumptionService;
 
+    private final NotificationMessageRepository notificationMessageRepository;
+
     /**
      * 특정 회원이 받은 알림 내역을 조회합니다.
      * @param memberId 알림 내역을 조회할 회원의 식별자
@@ -80,14 +88,31 @@ public void sendThumbsNotificationToWriter(final Post post) {
             return;
         }
 
+        final Long reactionCount = thumbsService.countReactions(post.getId());
+        final Map<String, String> notificationContentParameters = new HashMap<>();
+        notificationContentParameters.put("count", reactionCount.toString());
+        notificationContentParameters.put("title", post.getTitle());
+
         if (settingService.isSettingActive(new ActiveMemberId(post.getWriterId()), SettingType.NOTIFICATION_PER_10_THUMBS)
-                && isDivisibleBy10(thumbsService.countReactions(post.getId()))) {
-            sendNotification(post.getMember(), ScreenType.POST, post.getId(), THUMBS_PER_10_NOTIFICATION_TITLE);
+                && isDivisibleBy10(reactionCount)) {
+            sendNotification(
+                    post.getMember(),
+                    ScreenType.POST,
+                    post.getId(),
+                    THUMBS_PER_10_NOTIFICATION_TITLE,
+                    notificationContentParameters
+            );
             return;
         }
 
         if (settingService.isSettingActive(new ActiveMemberId(post.getWriterId()), SettingType.NOTIFICATION_PER_THUMBS)) {
-            sendNotification(post.getMember(), ScreenType.POST, post.getId(), THUMBS_NOTIFICATION_TITLE);
+            sendNotification(
+                    post.getMember(),
+                    ScreenType.POST,
+                    post.getId(),
+                    THUMBS_NOTIFICATION_TITLE,
+                    notificationContentParameters
+            );
         }
     }
 
@@ -109,7 +134,17 @@ public void sendCommentNotificationToPostWriter(Comment comment) {
         if (settingService.isSettingActive(new ActiveMemberId(comment.getPost().getWriterId()), SettingType.NOTIFICATION_PER_COMMENT)) {
             comment = entityManager.merge(comment);
 
-            sendNotification(comment.getPostWriter(), ScreenType.POST, comment.findPostId(), COMMENT_NOTIFICATION_TITLE);
+            final Map<String, String> notificationContentParameters = new HashMap<>();
+            notificationContentParameters.put("title", comment.getPost().getTitle());
+            notificationContentParameters.put("comment", comment.getContent());
+
+            sendNotification(
+                    comment.getPostWriter(),
+                    ScreenType.POST,
+                    comment.findPostId(),
+                    COMMENT_NOTIFICATION_TITLE,
+                    notificationContentParameters
+            );
         }
     }
 
@@ -130,24 +165,46 @@ public void remindConfirmingConsumptions() {
     private void remindConfirmingConsumptions(final Member member) {
         if (settingService.isSettingActive(new ActiveMemberId(member.getId()),
                 SettingType.NOTIFICATION_CONSUMPTION_CONFIRMATION_REMINDING)) {
-            sendNotification(member, ScreenType.MYPOST, null, NotificationMessage.UNCONFIRMED_POST_REMINDER_TITLE);
+            sendNotification(
+                    member,
+                    ScreenType.MYPOST,
+                    null,
+                    NotificationContentId.UNCONFIRMED_POST_REMINDER_TITLE,
+                    Map.of()
+            );
         }
     }
 
     /**
      * 사용자에게 알림을 전송합니다.
-     * @param notifyingTarget 알림을 전송할 대상
-     * @param notifyingType 알림을 클릭했을 때 리다이렉트할 페이지의 종류
-     * @param redirectId 알림을 클릭했을 때 리다이렉트할 페이지의 id
-     * @param notificationMessage 알림에서 표시할 제목
+     *
+     * @param notifyingTarget              알림을 전송할 대상
+     * @param notifyingType                알림을 클릭했을 때 리다이렉트할 페이지의 종류
+     * @param redirectId                   알림을 클릭했을 때 리다이렉트할 페이지의 id
+     * @param notificationContentId        알림에서 표시할 제목
+     * @param notificationContentParameters 알림 메시지에 표시할 DSL 파라미터
      */
-    private void sendNotification(final Member notifyingTarget, final ScreenType notifyingType, final Long redirectId,
-                                  final NotificationMessage notificationMessage) {
+    private void sendNotification(
+            final Member notifyingTarget,
+            final ScreenType notifyingType,
+            final Long redirectId,
+            final NotificationContentId notificationContentId,
+            final Map<String, String> notificationContentParameters) {
         if (notifyingTarget.isDeleted()) {
             return;
         }
 
-        final Long notificationId = saveNotification(notifyingTarget, notifyingType, redirectId, notificationMessage);
+        final NotificationContent notificationContent
+                = notificationMessageRepository.findById(notificationContentId)
+                .orElseThrow(() -> new EdonymyeonException(ExceptionInformation.NOTIFICATION_MESSAGE_NOT_FOUND));
+
+        final Long notificationId = saveNotification(
+                notifyingTarget,
+                notifyingType,
+                redirectId,
+                notificationContent.getTitle(notificationContentParameters),
+                notificationContent.getBody(notificationContentParameters)
+        );
 
         final Optional<String> deviceToken = notifyingTarget.getActiveDeviceToken();
         if (deviceToken.isEmpty()) {
@@ -159,7 +216,7 @@ private void sendNotification(final Member notifyingTarget, final ScreenType not
         try {
             notificationSender.sendNotification(
                     receiver,
-                    notificationMessage.getMessage()
+                    notificationContent.getTitle(notificationContentParameters)
             );
         } catch (BusinessLogicException e) {
             log.error("알림 전송에 실패했습니다.", e);
@@ -168,17 +225,25 @@ private void sendNotification(final Member notifyingTarget, final ScreenType not
 
     /**
      * 알림 전송 전/후 해당 내용을 저장합니다.
-     * @param notifyingTarget 알림을 전송받은 대상
-     * @param notifyingType 알림을 클릭했을 때 리다이렉트한 페이지의 종류
-     * @param redirectId 알림을 클릭했을 때 리다이렉트한 페이지의 id
-     * @param notificationMessage 알림에서 표시한 제목
+     *
+     * @param notifyingTarget       알림을 전송받은 대상
+     * @param notifyingType         알림을 클릭했을 때 리다이렉트한 페이지의 종류
+     * @param redirectId            알림을 클릭했을 때 리다이렉트한 페이지의 id
+     * @param title                 알림 메시지에 사용할 제목
+     * @param body                  알림 메시지에 사용할 본문
      * @return 알림 식별자
      */
-    private Long saveNotification(final Member notifyingTarget, final ScreenType notifyingType, final Long redirectId,
-                          final NotificationMessage notificationMessage) {
+    private Long saveNotification(final Member notifyingTarget,
+                                  final ScreenType notifyingType,
+                                  final Long redirectId,
+                                  final String title,
+                                  final String body
+    ) {
+
         final Notification notification = new Notification(
                 notifyingTarget,
-                notificationMessage.getMessage(),
+                title,
+                body,
                 notifyingType,
                 redirectId
         );
@@ -205,4 +270,15 @@ public void markNotificationAsRead(final Long notificationId) {
     public void deleteNotificationByPost(final Long postId) {
         notificationRepository.deleteAllByPostId(postId);
     }
+
+    /**
+     * 알림 메시지로 보낼 제목과 본문 내용을 변경합니다.
+     * @param content 변경할 Notification 정보
+     */
+    @Transactional
+    public void updateContent(final NotificationContent content) {
+        final NotificationContent notificationContent = notificationMessageRepository.findById(content.getId())
+                .orElseThrow(() -> new EdonymyeonException(ExceptionInformation.NOTIFICATION_MESSAGE_NOT_FOUND));
+        notificationContent.update(content);
+    }
 }

backend/src/main/java/edonymyeon/backend/notification/domain/Notification.java

@@ -12,11 +12,9 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
-import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @NoArgsConstructor
-@Getter
 @Entity
 public class Notification extends TemporalRecord {
 
@@ -30,6 +28,8 @@ public class Notification extends TemporalRecord {
 
     private String title;
 
+    private String body;
+
     @Enumerated(EnumType.STRING)
     private ScreenType screenType;
 
@@ -38,9 +38,16 @@ public class Notification extends TemporalRecord {
     @Column(name = "is_read")
     private boolean read;
 
-    public Notification(final Member member, final String title, final ScreenType screenType, final Long postId) {
+    public Notification(
+            final Member member,
+            final String title,
+            final String body,
+            final ScreenType screenType,
+            final Long postId
+    ) {
         this.member = member;
         this.title = title;
+        this.body = body;
         this.screenType = screenType;
         this.postId = postId;
         this.read = false;
@@ -49,4 +56,32 @@ public Notification(final Member member, final String title, final ScreenType sc
     public void markAsRead() {
         this.read = true;
     }
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getTitle() {
+        return this.title;
+    }
+
+    public String getBody() {
+        return this.body;
+    }
+
+    public ScreenType getScreenType() {
+        return screenType;
+    }
+
+    public boolean isRead() {
+        return read;
+    }
+
+    public Long getPostId() {
+        return postId;
+    }
+
+    public Member getMember() {
+        return member;
+    }
 }

backend/src/main/java/edonymyeon/backend/notification/domain/notification_content/application/NotificationMessageRepository.java

@@ -0,0 +1,9 @@
+package edonymyeon.backend.notification.domain.notification_content.application;
+
+import edonymyeon.backend.notification.domain.notification_content.domain.NotificationContentId;
+import edonymyeon.backend.notification.domain.notification_content.domain.NotificationContent;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface NotificationMessageRepository extends JpaRepository<NotificationContent, NotificationContentId> {
+
+}

backend/src/main/java/edonymyeon/backend/notification/domain/notification_content/application/dto/NotificationContentRequest.java

@@ -0,0 +1,6 @@
+package edonymyeon.backend.notification.domain.notification_content.application.dto;
+
+import edonymyeon.backend.notification.domain.notification_content.domain.NotificationContentId;
+
+public record NotificationContentRequest(NotificationContentId id, String title, String body) {
+}