Merge branch 'main' of https://github.com/prgrms-web-devcourse-final-project/WEB1_1_Bongdari_BE into feature/137-add-search

ayoung-dev · ayoung-dev · commit be7a3a348429 · 2024-12-09T12:30:54.000+09:00
diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
@@ -34,6 +34,9 @@ jobs:
       S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
       DEFAULT_IMG_URL: ${{ secrets.DEFAULT_IMG_URL }}
       APP_DEVELOP_MODE: ${{ secrets.APP_DEVELOP_MODE }}
+      ELASTIC_URI=localhost: ${{ secrets.ELASTIC_URI }}
+      ELASTIC_USERNAME: ${{ secrets.ELASTIC_USERNAME }}
+      ELASTIC_PASSWORD: ${{ secrets.ELASTIC_PASSWORD }}
 
     steps:
       - name: Github Repository 파일 불러오기
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -42,6 +42,9 @@ jobs:
       S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
       DEFAULT_IMG_URL: ${{ secrets.DEFAULT_IMG_URL }}
       APP_DEVELOP_MODE: ${{ secrets.APP_DEVELOP_MODE }}
+      ELASTIC_URI=localhost: ${{ secrets.ELASTIC_URI }}
+      ELASTIC_USERNAME: ${{ secrets.ELASTIC_USERNAME }}
+      ELASTIC_PASSWORD: ${{ secrets.ELASTIC_PASSWORD }}
 
 
     steps:
diff --git a/src/main/java/com/somemore/community/event/CommentAddedEvent.java b/src/main/java/com/somemore/community/event/CommentAddedEvent.java
@@ -0,0 +1,30 @@
+package com.somemore.community.event;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.somemore.global.common.event.ServerEvent;
+import com.somemore.global.common.event.ServerEventType;
+import com.somemore.notification.domain.NotificationSubType;
+import lombok.Getter;
+import lombok.experimental.SuperBuilder;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+@Getter
+@SuperBuilder
+public class CommentAddedEvent extends ServerEvent<NotificationSubType> {
+
+    private final UUID volunteerId;
+    private final Long communityBoardId;
+
+    @JsonCreator
+    public CommentAddedEvent(
+            @JsonProperty(value = "volunteerId", required = true) UUID volunteerId,
+            @JsonProperty(value = "communityBoardId", required = true) Long communityBoardId
+    ) {
+        super(ServerEventType.NOTIFICATION, NotificationSubType.COMMENT_ADDED, LocalDateTime.now());
+        this.volunteerId = volunteerId;
+        this.communityBoardId = communityBoardId;
+    }
+}
diff --git a/src/main/java/com/somemore/community/service/comment/CreateCommunityCommentService.java b/src/main/java/com/somemore/community/service/comment/CreateCommunityCommentService.java
@@ -2,10 +2,15 @@
 
 import com.somemore.community.domain.CommunityComment;
 import com.somemore.community.dto.request.CommunityCommentCreateRequestDto;
+import com.somemore.community.event.CommentAddedEvent;
 import com.somemore.community.repository.board.CommunityBoardRepository;
 import com.somemore.community.repository.comment.CommunityCommentRepository;
 import com.somemore.community.usecase.comment.CreateCommunityCommentUseCase;
+import com.somemore.global.common.event.ServerEventPublisher;
+import com.somemore.global.common.event.ServerEventType;
 import com.somemore.global.exception.BadRequestException;
+import com.somemore.notification.domain.NotificationSubType;
+import jakarta.persistence.EntityNotFoundException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,6 +27,7 @@ public class CreateCommunityCommentService implements CreateCommunityCommentUseC
 
     private final CommunityBoardRepository communityBoardRepository;
     private final CommunityCommentRepository communityCommentRepository;
+    private final ServerEventPublisher serverEventPublisher;
 
     @Override
     public Long createCommunityComment(CommunityCommentCreateRequestDto requestDto, UUID writerId, Long communityBoardId) {
@@ -33,6 +39,7 @@ public Long createCommunityComment(CommunityCommentCreateRequestDto requestDto,
             validateParentCommentExists(communityComment.getParentCommentId());
         }
 
+        publishCommentAddedEvent(communityComment);
         return communityCommentRepository.save(communityComment).getId();
     }
 
@@ -47,4 +54,37 @@ private void validateParentCommentExists(Long parentCommentId) {
             throw new BadRequestException(NOT_EXISTS_COMMUNITY_COMMENT.getMessage());
         }
     }
+
+    private void publishCommentAddedEvent(CommunityComment communityComment) {
+        Long parentCommentId = communityComment.getParentCommentId();
+
+        UUID targetVolunteerId = getTargetVolunteerId(communityComment, parentCommentId);
+
+        CommentAddedEvent event = CommentAddedEvent.builder()
+                .type(ServerEventType.NOTIFICATION)
+                .subType(NotificationSubType.COMMENT_ADDED)
+                .volunteerId(targetVolunteerId)
+                .communityBoardId(communityComment.getCommunityBoardId())
+                .build();
+
+        serverEventPublisher.publish(event);
+    }
+
+    private UUID getTargetVolunteerId(CommunityComment communityComment, Long parentCommentId) {
+        UUID targetVolunteerId;
+
+        if (parentCommentId == null) {
+            targetVolunteerId = communityBoardRepository.findById(communityComment.getCommunityBoardId())
+                    .orElseThrow(EntityNotFoundException::new)
+                    .getWriterId();
+
+            return targetVolunteerId;
+        }
+
+        targetVolunteerId = communityCommentRepository.findById(parentCommentId)
+                .map(CommunityComment::getWriterId)
+                .orElse(null);
+
+        return targetVolunteerId;
+    }
 }
diff --git a/src/main/java/com/somemore/global/common/event/ServerEvent.java b/src/main/java/com/somemore/global/common/event/ServerEvent.java
@@ -24,8 +24,19 @@ protected ServerEvent(
             @JsonProperty(value = "subType", required = true) T subType,
             @JsonProperty(value = "createdAt", required = true) LocalDateTime createdAt
     ) {
+        validate(type, subType);
         this.type = type;
         this.subType = subType;
         this.createdAt = (createdAt == null) ? LocalDateTime.now() : createdAt;
     }
+
+    private void validate(ServerEventType type, T subType) {
+        if (!type.getSubtype().isInstance(subType)) {
+            throw new IllegalArgumentException(String.format(
+                    "잘못된 서브타입: %s는 %s와 일치하지 않습니다.",
+                    subType,
+                    type.getSubtype()
+            ));
+        }
+    }
 }
diff --git a/src/main/java/com/somemore/notification/converter/MessageConverter.java b/src/main/java/com/somemore/notification/converter/MessageConverter.java
@@ -1,13 +1,14 @@
 package com.somemore.notification.converter;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.somemore.community.event.CommentAddedEvent;
 import com.somemore.facade.event.VolunteerReviewRequestEvent;
 import com.somemore.notification.domain.Notification;
 import com.somemore.notification.domain.NotificationSubType;
 import com.somemore.volunteerapply.domain.ApplyStatus;
+import com.somemore.volunteerapply.event.VolunteerApplyEvent;
 import com.somemore.volunteerapply.event.VolunteerApplyStatusChangeEvent;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -29,6 +30,8 @@ public Notification from(String message) {
                 case NOTE_BLAH_BLAH -> throw new UnsupportedOperationException("NOTE 알림 타입 처리 로직 미구현");
                 case VOLUNTEER_REVIEW_REQUEST -> buildVolunteerReviewRequestNotification(message);
                 case VOLUNTEER_APPLY_STATUS_CHANGE -> buildVolunteerApplyStatusChangeNotification(message);
+                case COMMENT_ADDED -> buildCommentAddedNotification(message);
+                case VOLUNTEER_APPLY -> buildVolunteerApplyNotification(message);
             };
         } catch (Exception e) {
             log.error(e.getMessage());
@@ -58,6 +61,28 @@ private Notification buildVolunteerApplyStatusChangeNotification(String message)
                 .build();
     }
 
+    private Notification buildCommentAddedNotification(String message) throws JsonProcessingException {
+        CommentAddedEvent event = objectMapper.readValue(message, CommentAddedEvent.class);
+
+        return Notification.builder()
+                .receiverId(event.getVolunteerId())
+                .title(createCommentAddedNotificationTitle())
+                .type(NotificationSubType.COMMENT_ADDED)
+                .relatedId(event.getCommunityBoardId())
+                .build();
+    }
+
+    private Notification buildVolunteerApplyNotification(String message) throws JsonProcessingException {
+        VolunteerApplyEvent event = objectMapper.readValue(message, VolunteerApplyEvent.class);
+
+        return Notification.builder()
+                .receiverId(event.getCenterId())
+                .title(createVolunteerApplyNotificationTitle())
+                .type(NotificationSubType.VOLUNTEER_APPLY)
+                .relatedId(event.getRecruitBoardId())
+                .build();
+    }
+
     private String createVolunteerReviewRequestNotificationTitle() {
         return "최근 활동하신 활동의 후기를 작성해 주세요!";
     }
@@ -72,4 +97,12 @@ private String createVolunteerApplyStatusChangeNotificationTitle(ApplyStatus new
             }
         };
     }
+
+    private String createCommentAddedNotificationTitle() {
+        return "새로운 댓글이 작성되었습니다.";
+    }
+
+    private String createVolunteerApplyNotificationTitle() {
+        return "봉사 활동 모집에 새로운 신청이 있습니다.";
+    }
 }
diff --git a/src/main/java/com/somemore/notification/domain/NotificationSubType.java b/src/main/java/com/somemore/notification/domain/NotificationSubType.java
@@ -8,7 +8,9 @@
 public enum NotificationSubType {
     NOTE_BLAH_BLAH("쪽지"),
     VOLUNTEER_REVIEW_REQUEST("봉사 후기 요청"),
-    VOLUNTEER_APPLY_STATUS_CHANGE("신청 상태 변경")
+    VOLUNTEER_APPLY_STATUS_CHANGE("신청 상태 변경"),
+    COMMENT_ADDED("댓글 대댓글 추가"),
+    VOLUNTEER_APPLY("봉사 신청"),
     ;
 
     private final String description;
diff --git a/src/main/java/com/somemore/notification/dto/NotificationResponseDto.java b/src/main/java/com/somemore/notification/dto/NotificationResponseDto.java
@@ -9,8 +9,10 @@
 import java.time.LocalDateTime;
 
 @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
-@Schema(description = "알림 응답 전송 DTO")
+@Schema(description = "알림 응답 DTO")
 public record NotificationResponseDto(
+        @Schema(description = "알림 ID", example = "1")
+        Long id,
         @Schema(description = "알림 제목", example = "봉사 활동 신청이 승인되었습니다.")
         String title,
 
@@ -25,6 +27,7 @@ public record NotificationResponseDto(
 
     public static NotificationResponseDto from(Notification notification) {
         return new NotificationResponseDto(
+                notification.getId(),
                 notification.getTitle(),
                 notification.getType(),
                 notification.getRelatedId(),
diff --git a/src/main/java/com/somemore/volunteerapply/event/VolunteerApplyEvent.java b/src/main/java/com/somemore/volunteerapply/event/VolunteerApplyEvent.java
@@ -0,0 +1,35 @@
+package com.somemore.volunteerapply.event;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.somemore.global.common.event.ServerEvent;
+import com.somemore.global.common.event.ServerEventType;
+import com.somemore.notification.domain.NotificationSubType;
+import lombok.Getter;
+import lombok.experimental.SuperBuilder;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+@Getter
+@SuperBuilder
+public class VolunteerApplyEvent extends ServerEvent<NotificationSubType> {
+    private final UUID volunteerId;
+    private final Long volunteerApplyId;
+    private final UUID centerId;
+    private final Long recruitBoardId;
+
+    @JsonCreator
+    public VolunteerApplyEvent(
+            @JsonProperty(value = "volunteerId", required = true) UUID volunteerId,
+            @JsonProperty(value = "volunteerApplyId", required = true) Long volunteerApplyId,
+            @JsonProperty(value = "centerId", required = true) UUID centerId,
+            @JsonProperty(value = "recruitBoardId", required = true) Long recruitBoardId
+    ) {
+        super(ServerEventType.NOTIFICATION, NotificationSubType.VOLUNTEER_APPLY, LocalDateTime.now());
+        this.volunteerId = volunteerId;
+        this.volunteerApplyId = volunteerApplyId;
+        this.centerId = centerId;
+        this.recruitBoardId = recruitBoardId;
+    }
+}
diff --git a/src/main/java/com/somemore/volunteerapply/service/ApplyVolunteerApplyService.java b/src/main/java/com/somemore/volunteerapply/service/ApplyVolunteerApplyService.java
@@ -3,11 +3,15 @@
 import static com.somemore.global.exception.ExceptionMessage.DUPLICATE_APPLICATION;
 import static com.somemore.global.exception.ExceptionMessage.RECRUITMENT_NOT_OPEN;
 
+import com.somemore.global.common.event.ServerEventPublisher;
+import com.somemore.global.common.event.ServerEventType;
 import com.somemore.global.exception.BadRequestException;
+import com.somemore.notification.domain.NotificationSubType;
 import com.somemore.recruitboard.domain.RecruitBoard;
 import com.somemore.recruitboard.usecase.query.RecruitBoardQueryUseCase;
 import com.somemore.volunteerapply.domain.VolunteerApply;
 import com.somemore.volunteerapply.dto.request.VolunteerApplyCreateRequestDto;
+import com.somemore.volunteerapply.event.VolunteerApplyEvent;
 import com.somemore.volunteerapply.repository.VolunteerApplyRepository;
 import com.somemore.volunteerapply.usecase.ApplyVolunteerApplyUseCase;
 import java.util.UUID;
@@ -22,6 +26,7 @@ public class ApplyVolunteerApplyService implements ApplyVolunteerApplyUseCase {
 
     private final VolunteerApplyRepository volunteerApplyRepository;
     private final RecruitBoardQueryUseCase recruitBoardQueryUseCase;
+    private final ServerEventPublisher serverEventPublisher;
 
     @Override
     public Long apply(VolunteerApplyCreateRequestDto requestDto, UUID volunteerId) {
@@ -33,6 +38,8 @@ public Long apply(VolunteerApplyCreateRequestDto requestDto, UUID volunteerId) {
         VolunteerApply apply = requestDto.toEntity(volunteerId);
         volunteerApplyRepository.save(apply);
 
+        publishVolunteerApplyEvent(apply, board);
+
         return apply.getId();
     }
 
@@ -50,4 +57,17 @@ private void validateDuplicatedApply(UUID volunteerId, RecruitBoard board) {
             throw new BadRequestException(DUPLICATE_APPLICATION);
         }
     }
+
+    private void publishVolunteerApplyEvent(VolunteerApply apply, RecruitBoard board) {
+        VolunteerApplyEvent event = VolunteerApplyEvent.builder()
+                .type(ServerEventType.NOTIFICATION)
+                .subType(NotificationSubType.VOLUNTEER_APPLY)
+                .volunteerId(apply.getVolunteerId())
+                .volunteerApplyId(apply.getId())
+                .centerId(board.getCenterId())
+                .recruitBoardId(board.getId())
+                .build();
+
+        serverEventPublisher.publish(event);
+    }
 }
