Feat/224

src/docs/asciidoc/notifications.adoc

@@ -4,4 +4,14 @@
 [[알림-조회]]
 === `GET` 알림 조회
 
-operation::notification-controller-test/find-notifications[snippets='http-request,curl-request,path-parameters,request-headers,query-parameters,http-response,response-fields']
+operation::notification-controller-test/find-notifications[snippets='http-request,curl-request,path-parameters,request-headers,query-parameters,http-response,response-fields']
+
+[[알림-읽기]]
+=== `PATCH` 알림 읽기
+
+operation::notification-controller-test/mark-read[snippets='http-request,curl-request,path-parameters,request-headers']
+
+[[알림-상태-확인]]
+=== `GET` 알림 상태 확인
+
+operation::notification-controller-test/find-notifications[snippets='http-request,curl-request,path-parameters,request-headers,http-response,response-fields']

src/main/java/com/chooz/commentLike/application/CommentLikeCommandService.java

@@ -6,7 +6,7 @@
 import com.chooz.common.event.EventPublisher;
 import com.chooz.common.exception.BadRequestException;
 import com.chooz.common.exception.ErrorCode;
-import com.chooz.notification.domain.event.CommentLikedEvent;
+import com.chooz.commentLike.domain.event.CommentLikedNotificationEvent;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -29,7 +29,7 @@ public CommentLikeIdResponse createCommentLike(Long commentId, Long userId) {
         }
         CommentLike commentLike = commentLikeRepository.save(CommentLike.create(commentId, userId));
 
-        eventPublisher.publish(new CommentLikedEvent(
+        eventPublisher.publish(new CommentLikedNotificationEvent(
                 commentId,
                 commentLike.getId(),
                 userId,

src/main/java/com/chooz/notification/domain/event/CommentLikedEvent.java → src/main/java/com/chooz/commentLike/domain/event/CommentLikedNotificationEvent.java

@@ -1,8 +1,8 @@
-package com.chooz.notification.domain.event;
+package com.chooz.commentLike.domain.event;
 
 import java.time.LocalDateTime;
 
-public record CommentLikedEvent(
+public record CommentLikedNotificationEvent(
         Long commentId,
         Long commentLikeId,
         Long likerId,

src/main/java/com/chooz/common/exception/ErrorCode.java

@@ -48,6 +48,7 @@ public enum ErrorCode {
     ONLY_SELF_CAN_CLOSE("작성자 마감의 경우, SELF 마감 방식만이 마감 가능합니다."),
     INVALID_ONBOARDING_STEP("유효하지 않은 온보딩 단계."),
     NICKNAME_LENGTH_EXCEEDED("닉네임 길이 초과"),
+    NOTIFICATION_NOT_FOUND("존재하지 않는 알림 입니다."),
 
     //401
     EXPIRED_TOKEN("토큰이 만료됐습니다."),

src/main/java/com/chooz/notification/application/NotificationContentAssembler.java

@@ -1,49 +1,96 @@
 package com.chooz.notification.application;
 
-import com.chooz.common.exception.BadRequestException;
-import com.chooz.common.exception.ErrorCode;
-import com.chooz.notification.application.dto.CommentLikedContent;
+import com.chooz.notification.application.dto.NotificationContent;
 import com.chooz.notification.application.dto.TargetPostDto;
 import com.chooz.notification.application.dto.TargetUserDto;
-import com.chooz.notification.domain.NotificationQueryRepository;
+import com.chooz.notification.domain.NotificationType;
+import com.chooz.notification.domain.Target;
+import com.chooz.notification.domain.TargetType;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 @Service
 @RequiredArgsConstructor
 public class NotificationContentAssembler {
 
-    private final NotificationQueryRepository notificationQueryDslRepository;
-
-    public CommentLikedContent forCommentLiked(Long commentId, Long likerId) {
-        TargetUserDto targetUserDto = notificationQueryDslRepository.getUser(likerId)
-                .orElseThrow(() -> new BadRequestException(ErrorCode.USER_NOT_FOUND));
-        TargetUserDto commentAuthorDto = notificationQueryDslRepository.getUserByCommentId(commentId)
-                .orElseThrow(() -> new BadRequestException(ErrorCode.USER_NOT_FOUND));
-        TargetPostDto targetPostDto = notificationQueryDslRepository.getPost(commentId)
-                .orElseThrow(() -> new BadRequestException(ErrorCode.POST_NOT_FOUND));
+    private final NotificationService notificationService;
+    private final NotificationMessageRenderer renderer;
 
-        return new CommentLikedContent(
-                targetUserDto.nickname(),
+    public NotificationContent forCommentLiked(Long commentId, Long likerId) {
+        TargetUserDto commentAuthorDto = notificationService.findUserByCommentId(commentId);
+        TargetUserDto targetUserDto = notificationService.findUserById(likerId);
+        TargetPostDto targetPostDto = notificationService.findPostByCommentId(commentId);
+        var vars = Map.<String, Object>of("actorName", targetUserDto.nickname());
+        var renderedMessage = renderer.render(NotificationType.COMMENT_LIKED.code(), vars);
+        return new NotificationContent(
+                commentAuthorDto.id(),
+                targetUserDto.id(),
+                renderedMessage.title(),
+                renderedMessage.content(),
                 targetUserDto.profileUrl(),
                 targetPostDto.imageUrl(),
-                commentAuthorDto.id(),
-                commentAuthorDto.nickname()
+                List.of(Target.of(targetPostDto.id(), TargetType.POST),
+                        Target.of(commentId, TargetType.COMMENT)
+                )
         );
     }
-
-//    public NotificationContent forVoteClosed(Long postId) {
-//        String title = postPort.getPostTitle(postId).orElse("투표 마감");
-//        String body = "참여한 투표가 마감되었어요.";
-//        String thumbnail = postPort.getPostThumbnailUrl(postId).orElse(null);
-//        return new NotificationContent(title, body, thumbnail);
-//    }
-//
-//    public NotificationContent forPostParticipated(Long postId, Long voterId) {
-//        String title = postPort.getPostTitle(postId).orElse("새로운 참여");
-//        String voter = userPort.getDisplayName(voterId).orElse("누군가");
-//        String body = voter + "님이 내 투표에 참여했어요.";
-//        String thumbnail = userPort.getAvatarUrl(voterId).orElse(null);
-//        return new NotificationContent(title, body, thumbnail);
-//    }
+    public NotificationContent forVoted(Long postId, Long voterId) {
+        TargetUserDto postAuthorDto = notificationService.findUserByPostId(postId);
+        TargetUserDto targetUserDto = notificationService.findUserById(voterId);
+        TargetPostDto targetPostDto = notificationService.findPostById(postId);
+        var vars = Map.<String, Object>of(
+                "actorName", targetUserDto.nickname(),
+                "postTitle", targetPostDto.title()
+                );
+        var renderedMessage = renderer.render(NotificationType.POST_VOTED.code(), vars);
+        return new NotificationContent(
+                postAuthorDto.id(),
+                targetUserDto.id(),
+                renderedMessage.title(),
+                renderedMessage.content(),
+                targetUserDto.profileUrl(),
+                targetPostDto.imageUrl(),
+                List.of(Target.of(targetPostDto.id(), TargetType.POST))
+        );
+    }
+    public NotificationContent forMyPostClosed(Long postId, Long userId) {
+        TargetUserDto postAuthorDto = notificationService.findUserById(userId);
+        TargetPostDto targetPostDto = notificationService.findPostById(postId);
+        var vars = Map.<String, Object>of(
+                "postTitle", targetPostDto.title()
+        );
+        var renderedMessage = renderer.render(NotificationType.MY_POST_CLOSED.code(), vars);
+        return new NotificationContent(
+                postAuthorDto.id(),
+                postAuthorDto.id(),
+                renderedMessage.title(),
+                renderedMessage.content(),
+                postAuthorDto.profileUrl(),
+                targetPostDto.imageUrl(),
+                List.of(Target.of(targetPostDto.id(), TargetType.POST))
+        );
+    }
+    public List<NotificationContent> forPostClosed(Long postId, Long userId) {
+        TargetUserDto postAuthorDto = notificationService.findUserById(userId);
+        List<TargetUserDto> receiverUserDtos = notificationService.findVoteUsersByPostId(postId);
+        TargetPostDto targetPostDto = notificationService.findPostById(postId);
+        var vars = Map.<String, Object>of(
+                "postTitle", targetPostDto.title()
+        );
+        var renderedMessage = renderer.render(NotificationType.POST_CLOSED.code(), vars);
+        return receiverUserDtos.stream().map(receiver ->
+                new NotificationContent(
+                        receiver.id(),
+                        postAuthorDto.id(),
+                        renderedMessage.title(),
+                        renderedMessage.content(),
+                        postAuthorDto.profileUrl(),
+                        targetPostDto.imageUrl(),
+                        List.of(Target.of(targetPostDto.id(), TargetType.POST))
+                )).collect(Collectors.toList());
+    }
 }

src/main/java/com/chooz/notification/application/NotificationMessageRenderer.java

@@ -0,0 +1,9 @@
+package com.chooz.notification.application;
+
+import com.chooz.notification.application.dto.RenderedMessage;
+
+import java.util.Map;
+
+public interface NotificationMessageRenderer {
+    RenderedMessage render(String type, Map<String, Object> vars);
+}

src/main/java/com/chooz/notification/application/NotificationService.java

@@ -0,0 +1,56 @@
+package com.chooz.notification.application;
+
+import com.chooz.common.dto.CursorBasePaginatedResponse;
+import com.chooz.notification.application.dto.TargetPostDto;
+import com.chooz.notification.application.dto.TargetUserDto;
+import com.chooz.notification.application.service.NotificationCommandService;
+import com.chooz.notification.application.service.NotificationQueryService;
+import com.chooz.notification.domain.Notification;
+import com.chooz.notification.presentation.dto.NotificationPresentResponse;
+import com.chooz.notification.presentation.dto.NotificationResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class NotificationService {
+
+    private final NotificationQueryService notificationQueryService;
+    private final NotificationCommandService notificationCommandService;
+
+    public CursorBasePaginatedResponse<NotificationResponse> findNotifications(Long userId, Long cursor, int size) {
+        return notificationQueryService.findNotifications(userId, cursor, size);
+    }
+    public TargetUserDto findUserByCommentId(Long commentId) {
+        return notificationQueryService.findUserByCommentId(commentId);
+    }
+    public TargetUserDto findUserById(Long userId) {
+        return notificationQueryService.findUserById(userId);
+    }
+    public TargetPostDto findPostByCommentId(Long commentId) {
+        return notificationQueryService.findPostByCommentId(commentId);
+    }
+    public TargetUserDto findUserByPostId(Long postId) {
+        return notificationQueryService.findUserByPostId(postId);
+    }
+    public TargetPostDto findPostById(Long postId) {
+        return notificationQueryService.findPostById(postId);
+    }
+    public Notification create(Notification notification) {
+        return notificationCommandService.create(notification);
+    }
+    public void createAll(List<Notification> notifications) {
+        notificationCommandService.createAll(notifications);
+    }
+    public List<TargetUserDto> findVoteUsersByPostId(Long postId) {
+        return notificationQueryService.findVoteUsersByPostId(postId);
+    }
+    public void markRead(Long notificationId) {
+        notificationCommandService.markRead(notificationId);
+    }
+    public NotificationPresentResponse present(Long userId) {
+        return notificationQueryService.present(userId);
+    }
+}