[feat] FCM 기반 푸쉬알림 기능 구현

.github/workflows/cd-workflow-dev.yml

@@ -11,6 +11,7 @@ permissions:
 env:
   RESOURCE_PATH: src/main/resources
   COMPOSE_PATH: /home/ec2-user/compose
+  FIREBASE_KEY_PATH: ${{ secrets.FIREBASE_KEY_PATH }}
   APP_PORT: 8000
 
 jobs:
@@ -33,6 +34,12 @@ jobs:
           echo "${{ secrets.APPLICATION_YML_DEV }}" | base64 --decode > ${{ env.RESOURCE_PATH }}/application.yml
         shell: bash
 
+      - name: 🔐 Create Firebase Key from secret (base64)
+        run: |
+          mkdir -p ${{ env.FIREBASE_KEY_PATH }}
+          echo "${{ secrets.FIREBASE_KEY }}" | base64 --decode > ${{ env.FIREBASE_KEY_PATH }}/serviceAccountKey.json
+        shell: bash
+
       - name: 🐘 Cache Gradle dependencies
         uses: actions/cache@v3
         with:

.github/workflows/cd-workflow-prod.yml

@@ -11,6 +11,7 @@ permissions:
 env:
   RESOURCE_PATH: src/main/resources
   COMPOSE_PATH: /home/ec2-user/compose
+  FIREBASE_KEY_PATH: ${{ secrets.FIREBASE_KEY_PATH }}
   APP_PORT: 8000
 
 jobs:
@@ -33,6 +34,12 @@ jobs:
           echo "${{ secrets.APPLICATION_YML_PROD }}" | base64 --decode > ${{ env.RESOURCE_PATH }}/application.yml
         shell: bash
 
+      - name: 🔐 Create Firebase Key from secret (base64)
+        run: |
+          mkdir -p ${{ env.FIREBASE_KEY_PATH }}
+          echo "${{ secrets.FIREBASE_KEY }}" | base64 --decode > ${{ env.FIREBASE_KEY_PATH }}/serviceAccountKey.json
+        shell: bash
+
       - name: 🐘 Cache Gradle dependencies
         uses: actions/cache@v3
         with:

.github/workflows/ci-workflow.yml

@@ -14,6 +14,7 @@ permissions:
 env:
   RESOURCE_PATH: src/main/resources
   TEST_RESOURCE_PATH: src/test/resources
+  FIREBASE_KEY_PATH: ${{ secrets.FIREBASE_KEY_PATH }}
 
 jobs:
   build:
@@ -36,6 +37,12 @@ jobs:
           echo "${{ secrets.APPLICATION_YML_DEV }}" | base64 --decode > ${{ env.RESOURCE_PATH }}/application.yml
           echo "${{ secrets.APPLICATION_YML_TEST }}" | base64 --decode > ${{ env.TEST_RESOURCE_PATH }}/application-test.yml
 
+      - name: 🔐 Create Firebase Key from secret (base64)
+        run: |
+          mkdir -p ${{ env.FIREBASE_KEY_PATH }}
+          echo "${{ secrets.FIREBASE_KEY }}" | base64 --decode > ${{ env.FIREBASE_KEY_PATH }}/serviceAccountKey.json
+        shell: bash
+
       - name: 👏🏻 grant execute permission for gradlew
         run: chmod +x gradlew
 

.gitignore

@@ -5,6 +5,7 @@ build/
 !**/src/test/**/build/
 *.yml
 deploy.sh
+serviceAccountKey.json
 
 ### STS ###
 .apt_generated

build.gradle

@@ -89,6 +89,8 @@ dependencies {
 	implementation "org.flywaydb:flyway-core"
 	implementation "org.flywaydb:flyway-mysql"
 
+	// Firebase
+	implementation 'com.google.firebase:firebase-admin:9.3.0'
 }
 
 def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile

src/main/java/konkuk/thip/ThipServerApplication.java

@@ -4,12 +4,10 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
-import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @EnableJpaAuditing
 @EnableScheduling
-@EnableAsync
 @ConfigurationPropertiesScan
 @SpringBootApplication
 public class ThipServerApplication {

src/main/java/konkuk/thip/book/application/service/BookCleanUpService.java

@@ -19,7 +19,7 @@ public class BookCleanUpService implements BookCleanUpUseCase {
     private final BookCommandPort bookCommandPort;
     private final BookQueryPort bookQueryPort;
 
-    @Async
+    @Async("schedulerAsyncExecutor")
     @Override
     @Transactional
     public void deleteUnusedBooks() {

src/main/java/konkuk/thip/book/application/service/BookMostSearchRankService.java

@@ -28,7 +28,7 @@ public class BookMostSearchRankService {
     private final BookCommandPort bookCommandPort;
 
     // 매일 0시 실행
-    @Async
+    @Async("schedulerAsyncExecutor")
     @Scheduled(cron = "0 0 0 * * *")
     public void updateDailySearchRank() {
 

src/main/java/konkuk/thip/book/application/service/BookSearchService.java

@@ -27,7 +27,7 @@
 
 import static konkuk.thip.book.adapter.out.api.naver.NaverApiUtil.PAGE_SIZE;
 import static konkuk.thip.common.exception.code.ErrorCode.*;
-import static konkuk.thip.recentSearch.adapter.out.jpa.RecentSearchType.BOOK_SEARCH;
+import static konkuk.thip.recentSearch.domain.value.RecentSearchType.BOOK_SEARCH;
 
 @Service
 @RequiredArgsConstructor

src/main/java/konkuk/thip/comment/application/service/CommentCreateService.java

@@ -11,14 +11,20 @@
 import konkuk.thip.comment.application.service.validator.CommentAuthorizationValidator;
 import konkuk.thip.comment.domain.Comment;
 import konkuk.thip.common.exception.InvalidStateException;
+import konkuk.thip.message.application.port.out.FeedEventCommandPort;
+import konkuk.thip.message.application.port.out.RoomEventCommandPort;
+import konkuk.thip.post.application.port.out.dto.PostQueryDto;
 import konkuk.thip.post.domain.CountUpdatable;
 import konkuk.thip.post.application.service.handler.PostHandler;
 import konkuk.thip.post.domain.PostType;
+import konkuk.thip.user.application.port.out.UserCommandPort;
+import konkuk.thip.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import static konkuk.thip.common.exception.code.ErrorCode.INVALID_COMMENT_CREATE;
+import static konkuk.thip.post.domain.PostType.*;
 
 
 @Service
@@ -29,26 +35,31 @@ public class CommentCreateService implements CommentCreateUseCase {
     private final CommentQueryPort commentQueryPort;
     private final CommentLikeQueryPort commentLikeQueryPort;
     private final CommentQueryMapper commentQueryMapper;
-
+    private final UserCommandPort userCommandPort;
 
     private final PostHandler postHandler;
     private final CommentAuthorizationValidator commentAuthorizationValidator;
 
+    private final FeedEventCommandPort feedEventCommandPort;
+    private final RoomEventCommandPort roomEventCommandPort;
+
     @Override
     @Transactional
     public CommentCreateResponse createComment(CommentCreateCommand command) {
 
         // 1. 댓글/답글 생성 선행검증 및 작성하려는 게시글 타입 검증
         Comment.validateCommentCreate(command.isReplyRequest(), command.parentId());
-        PostType type = PostType.from(command.postType());
+        PostType type = from(command.postType());
 
         // 2. 게시물 타입에 맞게 조회
         CountUpdatable post = postHandler.findPost(type, command.postId());
         // 2-1. 게시글 타입에 따른 댓글 생성 권한 검증
         commentAuthorizationValidator.validateUserCanAccessPostForComment(type, post, command.userId());
 
-        // TODO 피드: 내 게시글의 댓글, 내 댓글에 대한 답글 알림 전송
-        // TODO 기록 및 투표: 모임방의 내 게시글에 대한 댓글, 내 댓글에 대한 답글 알림 전송
+        // 2-2. 댓글 생성 푸쉬 알림 전송 (게시글 작성자에게)
+        PostQueryDto postQueryDto = postHandler.getPostQueryDto(type, post.getId());
+        User actorUser = userCommandPort.findById(command.userId());
+        sendNotificationsToPostWriter(postQueryDto, actorUser);
 
         // 3. 댓글 생성
         Long savedCommentId = createCommentDomain(command);
@@ -65,6 +76,10 @@ public CommentCreateResponse createComment(CommentCreateCommand command) {
         if (command.isReplyRequest()) {
             // 부모 댓글 조회
             CommentQueryDto parentCommentDto = commentQueryPort.findRootCommentById(command.parentId());
+
+            // 답글 생성 푸쉬 알림 전송 (부모 댓글 작성자에게)
+            sendNotificationsToParentCommentWriter(postQueryDto, parentCommentDto, actorUser);
+
             // 사용자 부모 댓글 좋아요 여부 조회
             boolean isLikedParentComment = commentLikeQueryPort.isLikedCommentByUser(command.userId(),parentCommentDto.commentId());
 
@@ -74,7 +89,30 @@ public CommentCreateResponse createComment(CommentCreateCommand command) {
             CommentQueryDto savedCommentDto = commentQueryPort.findRootCommentById(savedCommentId);
             return commentQueryMapper.toRoot(savedCommentDto, false, command.userId());
         }
+    }
+
+    private void sendNotificationsToPostWriter(PostQueryDto postQueryDto, User actorUser) {
+        if (postQueryDto.creatorId().equals(actorUser.getId())) return; // 자신이 작성한 게시글 제외
 
+        if (postQueryDto.postType().equals(FEED.getType())) {
+            // 피드 댓글 알림 이벤트 발행
+            feedEventCommandPort.publishFeedCommentedEvent(postQueryDto.creatorId(), actorUser.getId(), actorUser.getNickname(), postQueryDto.postId());
+        } else if (postQueryDto.postType().equals(RECORD.getType()) || postQueryDto.postType().equals(VOTE.getType())) {
+            // 모임방 게시글 댓글 알림 이벤트 발행
+            roomEventCommandPort.publishRoomPostCommentedEvent(postQueryDto.creatorId(), actorUser.getId(), actorUser.getNickname(), postQueryDto.roomId(), postQueryDto.page(), postQueryDto.postId(), postQueryDto.postType());
+        }
+    }
+
+    private void sendNotificationsToParentCommentWriter(PostQueryDto postQueryDto, CommentQueryDto parentCommentDto, User actorUser) {
+        if (parentCommentDto.creatorId().equals(actorUser.getId())) return; // 자신이 작성한 댓글 제외
+
+        if (postQueryDto.postType().equals(FEED.getType())) {
+            // 피드 답글 알림 이벤트 발행
+            feedEventCommandPort.publishFeedRepliedEvent(parentCommentDto.creatorId(), actorUser.getId(), actorUser.getNickname(), postQueryDto.postId());
+        } else if (postQueryDto.postType().equals(RECORD.getType()) || postQueryDto.postType().equals(VOTE.getType())) {
+            // 모임방 게시글 답글 알림 이벤트 발행
+            roomEventCommandPort.publishRoomPostCommentRepliedEvent(parentCommentDto.creatorId(), actorUser.getId(), actorUser.getNickname(), postQueryDto.roomId(), postQueryDto.page(), postQueryDto.postId(), postQueryDto.postType());
+        }
     }
 
     private Long createCommentDomain(CommentCreateCommand command) {

src/main/java/konkuk/thip/comment/application/service/CommentLikeService.java

@@ -8,8 +8,14 @@
 import konkuk.thip.comment.application.port.out.CommentLikeQueryPort;
 import konkuk.thip.comment.application.service.validator.CommentAuthorizationValidator;
 import konkuk.thip.comment.domain.Comment;
-import konkuk.thip.post.domain.CountUpdatable;
+import konkuk.thip.message.application.port.out.FeedEventCommandPort;
+import konkuk.thip.message.application.port.out.RoomEventCommandPort;
+import konkuk.thip.post.application.port.out.dto.PostQueryDto;
 import konkuk.thip.post.application.service.handler.PostHandler;
+import konkuk.thip.post.domain.CountUpdatable;
+import konkuk.thip.post.domain.PostType;
+import konkuk.thip.user.application.port.out.UserCommandPort;
+import konkuk.thip.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,10 +27,14 @@ public class CommentLikeService implements CommentLikeUseCase {
     private final CommentCommandPort commentCommandPort;
     private final CommentLikeQueryPort commentLikeQueryPort;
     private final CommentLikeCommandPort commentLikeCommandPort;
+    private final UserCommandPort userCommandPort;
 
     private final PostHandler postHandler;
     private final CommentAuthorizationValidator commentAuthorizationValidator;
 
+    private final FeedEventCommandPort feedEventCommandPort;
+    private final RoomEventCommandPort roomEventCommandPort;
+
     @Override
     @Transactional
     public CommentIsLikeResult changeLikeStatusComment(CommentIsLikeCommand command) {
@@ -42,6 +52,9 @@ public CommentIsLikeResult changeLikeStatusComment(CommentIsLikeCommand command)
         if (command.isLike()) {
             comment.validateCanLike(alreadyLiked); // 좋아요 가능 여부 검증
             commentLikeCommandPort.save(command.userId(), command.commentId());
+
+            // 댓글 좋아요 푸쉬알림 전송
+            sendNotifications(command, comment);
         } else {
             comment.validateCanUnlike(alreadyLiked); // 좋아요 취소 가능 여부 검증
             commentLikeCommandPort.delete(command.userId(), command.commentId());
@@ -53,4 +66,18 @@ public CommentIsLikeResult changeLikeStatusComment(CommentIsLikeCommand command)
 
         return CommentIsLikeResult.of(comment.getId(), command.isLike());
     }
+
+    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) {
+            feedEventCommandPort.publishFeedCommentLikedEvent(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());
+            roomEventCommandPort.publishRoomCommentLikedEvent(comment.getCreatorId(), actorUser.getId(), actorUser.getNickname(), postQueryDto.roomId(), postQueryDto.page(), postQueryDto.postId(), postQueryDto.postType());
+        }
+    }
 }

src/main/java/konkuk/thip/common/exception/FirebaseException.java

@@ -0,0 +1,21 @@
+package konkuk.thip.common.exception;
+
+import konkuk.thip.common.exception.code.ErrorCode;
+
+public class FirebaseException extends BusinessException {
+    public FirebaseException(ErrorCode errorCode) {
+        super(errorCode);
+    }
+
+    public FirebaseException(ErrorCode errorCode, Exception e) {
+        super(errorCode, e);
+    }
+
+    public FirebaseException(Exception e) {
+        super(ErrorCode.FIREBASE_SEND_ERROR, e);
+    }
+
+    public FirebaseException() {
+        super(ErrorCode.FIREBASE_SEND_ERROR);
+    }
+}

src/main/java/konkuk/thip/common/exception/code/ErrorCode.java

@@ -215,6 +215,13 @@ public enum ErrorCode implements ResponseCode {
     ATTENDANCE_CHECK_NOT_FOUND(HttpStatus.NOT_FOUND, 195001, "존재하지 않는 ATTENDANCE CHECK 입니다."),
     ATTENDANCE_CHECK_CAN_NOT_DELETE(HttpStatus.FORBIDDEN, 195002, "오늘의 한마디는 본인만 삭제할 수 있습니다."),
 
+    /**
+     * 200000 : Fcm error
+     */
+    FCM_TOKEN_NOT_FOUND(HttpStatus.NOT_FOUND, 200000, "존재하지 않는 FCM TOKEN 입니다."),
+    FCM_TOKEN_ENABLED_STATE_ALREADY(HttpStatus.BAD_REQUEST, 200001, "요청한 상태로 이미 푸쉬 알림 여부가 설정되어 있습니다."),
+    FCM_TOKEN_ACCESS_FORBIDDEN(HttpStatus.FORBIDDEN, 200002, "토큰을 소유하고 있는 계정이 아닙니다."),
+    FIREBASE_SEND_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, 200003, "FCM 푸쉬 알림 전송에 실패했습니다.")
 
     ;
 

src/main/java/konkuk/thip/common/scheduler/RoomStateScheduler.java

@@ -0,0 +1,24 @@
+package konkuk.thip.common.scheduler;
+
+import konkuk.thip.room.application.port.in.RoomStateChangeUseCase;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class RoomStateScheduler {
+
+    private final RoomStateChangeUseCase roomStateChangeUseCase;
+
+    // 매일 자정 실행
+    @Scheduled(cron = "0 0 0 * * *", zone = "Asia/Seoul")
+    public void changeRoomState() {
+        log.info("[스케줄러] 방 상태 변경 시작");
+        roomStateChangeUseCase.changeRoomStateToExpired();
+        roomStateChangeUseCase.changeRoomStateToProgress();
+        log.info("[스케줄러] 방 상태 변경 완료");
+    }
+}

src/main/java/konkuk/thip/common/security/util/JwtUtil.java

@@ -1,5 +1,10 @@
 package konkuk.thip.common.security.util;
 
+import io.jsonwebtoken.ExpiredJwtException;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.MalformedJwtException;
+import io.jsonwebtoken.UnsupportedJwtException;
+import io.jsonwebtoken.security.SignatureException;
 import io.jsonwebtoken.*;
 import konkuk.thip.common.security.oauth2.LoginUser;
 import lombok.extern.slf4j.Slf4j;
@@ -50,6 +55,8 @@ public boolean validateToken(String token) {
         try {
             Jwts.parser().verifyWith(secretKey).build().parseSignedClaims(token);
             return true;
+        } catch (SignatureException e) {
+            log.info("Invalid JWT Signature", e);
         } catch (MalformedJwtException e) {
             log.info("Invalid JWT Token", e);
         } catch (ExpiredJwtException e) {

src/main/java/konkuk/thip/common/swagger/SwaggerResponseDescription.java

@@ -334,6 +334,22 @@ public enum SwaggerResponseDescription {
             ATTENDANCE_CHECK_CAN_NOT_DELETE
     ))),
 
+    // Notiification
+    FCM_TOKEN_REGISTER(new LinkedHashSet<>(Set.of(
+            USER_NOT_FOUND,
+            FCM_TOKEN_NOT_FOUND
+    ))),
+    FCM_TOKEN_ENABLE_STATE_CHANGE(new LinkedHashSet<>(Set.of(
+            USER_NOT_FOUND,
+            FCM_TOKEN_NOT_FOUND,
+            FCM_TOKEN_ENABLED_STATE_ALREADY,
+            FCM_TOKEN_ACCESS_FORBIDDEN
+    ))),
+    FCM_TOKEN_DELETE(new LinkedHashSet<>(Set.of(
+            FCM_TOKEN_NOT_FOUND,
+            FCM_TOKEN_ACCESS_FORBIDDEN
+    )))
+
   ;
     private final Set<ErrorCode> errorCodeList;
     SwaggerResponseDescription(Set<ErrorCode> errorCodeList) {