THIP-TextHip · seongjunnoh · Sep 26, 2025 · Sep 22, 2025 · Sep 22, 2025 · Sep 22, 2025
diff --git a/build.gradle b/build.gradle
@@ -81,6 +81,7 @@ dependencies {
 
 	// Spring Boot Actuator
 	implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    implementation 'io.micrometer:micrometer-registry-prometheus'
 
     // AOP
     implementation 'org.springframework.boot:spring-boot-starter-aop'

diff --git a/src/main/java/konkuk/thip/comment/application/service/CommentCreateService.java b/src/main/java/konkuk/thip/comment/application/service/CommentCreateService.java
@@ -93,24 +93,34 @@ public CommentCreateResponse createComment(CommentCreateCommand command) {
     private void sendNotificationsToPostWriter(PostQueryDto postQueryDto, User actorUser) {
         if (postQueryDto.creatorId().equals(actorUser.getId())) return; // 자신이 작성한 게시글 제외
 
-        if (postQueryDto.postType().equals(FEED.getType())) {
-            // 피드 댓글 알림 이벤트 발행
-            feedNotificationOrchestrator.notifyFeedCommented(postQueryDto.creatorId(), actorUser.getId(), actorUser.getNickname(), postQueryDto.postId());
-        } else if (postQueryDto.postType().equals(RECORD.getType()) || postQueryDto.postType().equals(VOTE.getType())) {
-            // 모임방 게시글 댓글 알림 이벤트 발행
-            roomNotificationOrchestrator.notifyRoomPostCommented(postQueryDto.creatorId(), actorUser.getId(), actorUser.getNickname(), postQueryDto.roomId(), postQueryDto.page(), postQueryDto.postId(), postQueryDto.postType());
+        PostType postType = PostType.from(postQueryDto.postType());
+        switch (postType) {
+            case FEED ->    // 피드 댓글 알림 이벤트 발행
+                    feedNotificationOrchestrator.notifyFeedCommented(
+                            postQueryDto.creatorId(), actorUser.getId(), actorUser.getNickname(), postQueryDto.postId()
+                    );
+            case RECORD, VOTE ->    // 모임방 게시글 댓글 알림 이벤트 발행
+                    roomNotificationOrchestrator.notifyRoomPostCommented(
+                            postQueryDto.creatorId(), actorUser.getId(), actorUser.getNickname(),
+                            postQueryDto.roomId(), postQueryDto.page(), postQueryDto.postId(), postType
+                    );
         }
     }
 
     private void sendNotificationsToParentCommentWriter(PostQueryDto postQueryDto, CommentQueryDto parentCommentDto, User actorUser) {
         if (parentCommentDto.creatorId().equals(actorUser.getId())) return; // 자신이 작성한 댓글 제외
 
-        if (postQueryDto.postType().equals(FEED.getType())) {
-            // 피드 답글 알림 이벤트 발행
-            feedNotificationOrchestrator.notifyFeedReplied(parentCommentDto.creatorId(), actorUser.getId(), actorUser.getNickname(), postQueryDto.postId());
-        } else if (postQueryDto.postType().equals(RECORD.getType()) || postQueryDto.postType().equals(VOTE.getType())) {
-            // 모임방 게시글 답글 알림 이벤트 발행
-            roomNotificationOrchestrator.notifyRoomPostCommentReplied(parentCommentDto.creatorId(), actorUser.getId(), actorUser.getNickname(), postQueryDto.roomId(), postQueryDto.page(), postQueryDto.postId(), postQueryDto.postType());
+        PostType postType = PostType.from(postQueryDto.postType());
+        switch (postType) {
+            case FEED ->    // 피드 답글 알림 이벤트 발행
+                    feedNotificationOrchestrator.notifyFeedReplied(
+                            parentCommentDto.creatorId(), actorUser.getId(), actorUser.getNickname(), postQueryDto.postId()
+                    );
+            case RECORD, VOTE ->    // 모임방 게시글 답글 알림 이벤트 발행
+                    roomNotificationOrchestrator.notifyRoomPostCommentReplied(
+                            parentCommentDto.creatorId(), actorUser.getId(), actorUser.getNickname(),
+                            postQueryDto.roomId(), postQueryDto.page(), postQueryDto.postId(), postType
+                    );
         }
     }
 

diff --git a/src/main/java/konkuk/thip/comment/application/service/CommentLikeService.java b/src/main/java/konkuk/thip/comment/application/service/CommentLikeService.java
@@ -71,13 +71,19 @@ private void sendNotifications(CommentIsLikeCommand command, Comment comment) {
         if (command.userId().equals(comment.getCreatorId())) return; // 자신의 댓글에 좋아요 누르는 경우 제외
 
         User actorUser = userCommandPort.findById(command.userId());
-        // 좋아요 푸쉬알림 전송
-        if (comment.getPostType() == PostType.FEED) {
-            feedNotificationOrchestrator.notifyFeedCommentLiked(comment.getCreatorId(), actorUser.getId(), actorUser.getNickname(), comment.getTargetPostId());
-        }
-        if (comment.getPostType() == PostType.RECORD || comment.getPostType() == PostType.VOTE) {
-            PostQueryDto postQueryDto = postHandler.getPostQueryDto(comment.getPostType(), comment.getTargetPostId());
-            roomNotificationOrchestrator.notifyRoomCommentLiked(comment.getCreatorId(), actorUser.getId(), actorUser.getNickname(), postQueryDto.roomId(), postQueryDto.page(), postQueryDto.postId(), postQueryDto.postType());
+        PostType postType = comment.getPostType();
+
+        switch (postType) {
+            case FEED ->
+                    feedNotificationOrchestrator.notifyFeedCommentLiked(
+                            comment.getCreatorId(), actorUser.getId(), actorUser.getNickname(),comment.getTargetPostId()
+                    );
+            case RECORD, VOTE -> {
+                    PostQueryDto postQueryDto = postHandler.getPostQueryDto(comment.getPostType(), comment.getTargetPostId());
+                    roomNotificationOrchestrator.notifyRoomCommentLiked(
+                            comment.getCreatorId(), actorUser.getId(), actorUser.getNickname(), postQueryDto.roomId(), postQueryDto.page(), postQueryDto.postId(), postType
+                    );
+            }
         }
     }
 }
diff --git a/src/main/java/konkuk/thip/common/exception/code/ErrorCode.java b/src/main/java/konkuk/thip/common/exception/code/ErrorCode.java
@@ -231,6 +231,17 @@ public enum ErrorCode implements ResponseCode {
      * 205000 : notification error
      */
     INVALID_NOTIFICATION_TYPE(HttpStatus.BAD_REQUEST, 205000, "유효하지 않은 알림 타입입니다."),
+    NOTIFICATION_REDIRECT_DATA_SERIALIZE_FAILED(HttpStatus.INTERNAL_SERVER_ERROR, 205001, "알림 리다이렉트 데이터 직렬화에 실패했습니다."),
+    NOTIFICATION_REDIRECT_DATA_DESERIALIZE_FAILED(HttpStatus.INTERNAL_SERVER_ERROR, 205002, "알림 리다이렉트 데이터 역직렬화에 실패했습니다."),
+    NOTIFICATION_NOT_FOUND(HttpStatus.NOT_FOUND, 205003, "존재하지 않는 NOTIFICATION 입니다."),
+    NOTIFICATION_ACCESS_FORBIDDEN(HttpStatus.FORBIDDEN, 205004, "알림 접근 권한이 없습니다."),
+    NOTIFICATION_ALREADY_CHECKED(HttpStatus.BAD_REQUEST, 205005, "이미 읽음 처리된 알림입니다."),
+
+
+    /**
+     * 300000 : util error
+     */
+    INVALID_FE_PLATFORM(HttpStatus.BAD_REQUEST, 300000, "유효하지 않은 FE 플랫폼입니다."),
 
     ;
 

diff --git a/src/main/java/konkuk/thip/common/security/constant/SecurityWhitelist.java b/src/main/java/konkuk/thip/common/security/constant/SecurityWhitelist.java
@@ -17,6 +17,7 @@ public enum SecurityWhitelist {
     OAUTH2_AUTHORIZATION("/oauth2/authorization/**"),
     LOGIN_OAUTH2_CODE("/login/oauth2/code/**"),
     ACTUATOR_HEALTH("/actuator/health"),
+    ACTUATOR_PROMETHEUS("/actuator/prometheus"),
     AUTH_USERS("/auth/users"),
     AUTH_TOKEN("/auth/token"),
     API_TEST("/api/test/**"),

diff --git a/src/main/java/konkuk/thip/common/swagger/SwaggerResponseDescription.java b/src/main/java/konkuk/thip/common/swagger/SwaggerResponseDescription.java
@@ -358,7 +358,8 @@ public enum SwaggerResponseDescription {
     // Notiification
     FCM_TOKEN_REGISTER(new LinkedHashSet<>(Set.of(
             USER_NOT_FOUND,
-            FCM_TOKEN_NOT_FOUND
+            FCM_TOKEN_NOT_FOUND,
+            INVALID_FE_PLATFORM
     ))),
     FCM_TOKEN_ENABLE_STATE_CHANGE(new LinkedHashSet<>(Set.of(
             USER_NOT_FOUND,
@@ -376,6 +377,10 @@ public enum SwaggerResponseDescription {
     NOTIFICATION_SHOW(new LinkedHashSet<>(Set.of(
             INVALID_NOTIFICATION_TYPE
     ))),
+    NOTIFICATION_MARK_TO_CHECKED(new LinkedHashSet<>(Set.of(
+            NOTIFICATION_NOT_FOUND,
+            NOTIFICATION_ACCESS_FORBIDDEN
+    ))),
 
   ;
     private final Set<ErrorCode> errorCodeList;

diff --git a/src/main/java/konkuk/thip/feed/application/service/FeedCreateService.java b/src/main/java/konkuk/thip/feed/application/service/FeedCreateService.java
@@ -71,7 +71,7 @@ private void sendNotifications(FeedCreateCommand command, Long savedFeedId) {
         List<User> targetUsers = userQueryPort.getAllFollowersByUserId(command.userId());
         User actorUser = userCommandPort.findById(command.userId());
         for (User targetUser : targetUsers) {
-            feedNotificationOrchestrator.notifyFolloweeNewPost(targetUser.getId(), actorUser.getId(), actorUser.getNickname(), savedFeedId);
+            feedNotificationOrchestrator.notifyFolloweeNewFeed(targetUser.getId(), actorUser.getId(), actorUser.getNickname(), savedFeedId);
         }
     }
 

diff --git a/src/main/java/konkuk/thip/message/adapter/in/event/MessageFeedEventListener.java b/src/main/java/konkuk/thip/message/adapter/in/event/MessageFeedEventListener.java
@@ -34,8 +34,8 @@ public void onFeedCommentReplied(FeedEvents.FeedCommentRepliedEvent e) {
 
     @Async
     @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
-    public void onFolloweeNewPost(FeedEvents.FolloweeNewPostEvent e) {
-        feedUseCase.handleFolloweeNewPost(e);
+    public void onFolloweeNewFeed(FeedEvents.FolloweeNewFeedEvent e) {
+        feedUseCase.handleFolloweeNewFeed(e);
     }
 
     @Async

diff --git a/src/main/java/konkuk/thip/message/adapter/out/event/FeedEventPublisherAdapter.java b/src/main/java/konkuk/thip/message/adapter/out/event/FeedEventPublisherAdapter.java
@@ -14,89 +14,73 @@ public class FeedEventPublisherAdapter implements FeedEventCommandPort {
 
     @Override
     public void publishFollowEvent(
-            String title, String content,
-            Long targetUserId, Long actorUserId, String actorUsername) {
+            String title, String content, Long notificationId,
+            Long targetUserId) {
         publisher.publishEvent(FeedEvents.FollowerEvent.builder()
                 .title(title)
                 .content(content)
+                .notificationId(notificationId)
                 .targetUserId(targetUserId)
-                .actorUserId(actorUserId)
-                .actorUsername(actorUsername)
                 .build());
     }
 
     @Override
     public void publishFeedCommentedEvent(
-            String title, String content,
-            Long targetUserId, Long actorUserId, String actorUsername,
-            Long feedId) {
+            String title, String content, Long notificationId,
+            Long targetUserId) {
         publisher.publishEvent(FeedEvents.FeedCommentedEvent.builder()
                 .title(title)
                 .content(content)
+                .notificationId(notificationId)
                 .targetUserId(targetUserId)
-                .actorUserId(actorUserId)
-                .actorUsername(actorUsername)
-                .feedId(feedId)
                 .build());
     }
 
     @Override
     public void publishFeedRepliedEvent(
-            String title, String content,
-            Long targetUserId, Long actorUserId, String actorUsername,
-            Long feedId) {
+            String title, String content, Long notificationId,
+            Long targetUserId) {
         publisher.publishEvent(FeedEvents.FeedCommentRepliedEvent.builder()
                 .title(title)
                 .content(content)
+                .notificationId(notificationId)
                 .targetUserId(targetUserId)
-                .actorUserId(actorUserId)
-                .actorUsername(actorUsername)
-                .feedId(feedId)
                 .build());
     }
 
     @Override
-    public void publishFolloweeNewPostEvent(
-            String title, String content,
-            Long targetUserId, Long actorUserId, String actorUsername,
-            Long feedId) {
-        publisher.publishEvent(FeedEvents.FolloweeNewPostEvent.builder()
+    public void publishFolloweeNewFeedEvent(
+            String title, String content, Long notificationId,
+            Long targetUserId) {
+        publisher.publishEvent(FeedEvents.FolloweeNewFeedEvent.builder()
                 .title(title)
                 .content(content)
+                .notificationId(notificationId)
                 .targetUserId(targetUserId)
-                .actorUserId(actorUserId)
-                .actorUsername(actorUsername)
-                .feedId(feedId)
                 .build());
     }
 
     @Override
     public void publishFeedLikedEvent(
-            String title, String content,
-            Long targetUserId, Long actorUserId, String actorUsername,
-            Long feedId) {
+            String title, String content, Long notificationId,
+            Long targetUserId) {
         publisher.publishEvent(FeedEvents.FeedLikedEvent.builder()
                 .title(title)
                 .content(content)
+                .notificationId(notificationId)
                 .targetUserId(targetUserId)
-                .actorUserId(actorUserId)
-                .actorUsername(actorUsername)
-                .feedId(feedId)
                 .build());
     }
 
     @Override
     public void publishFeedCommentLikedEvent(
-            String title, String content,
-            Long targetUserId, Long actorUserId, String actorUsername,
-            Long feedId) {
+            String title, String content, Long notificationId,
+            Long targetUserId) {
         publisher.publishEvent(FeedEvents.FeedCommentLikedEvent.builder()
                 .title(title)
                 .content(content)
+                .notificationId(notificationId)
                 .targetUserId(targetUserId)
-                .actorUserId(actorUserId)
-                .actorUsername(actorUsername)
-                .feedId(feedId)
                 .build());
     }
-}
+}