Merge pull request #175 from team-offonoff/nofification

알림 메시지 내용을 서버에서 제작한다.

src/main/java/life/offonoff/ab/application/event/topic/TopicEventHandler.java

@@ -1,6 +1,6 @@
 package life.offonoff.ab.application.event.topic;
 
-import life.offonoff.ab.application.notice.NoticeService;
+import life.offonoff.ab.application.notification.NotificationService;
 import life.offonoff.ab.application.service.vote.VotingTopicService;
 import life.offonoff.ab.application.service.vote.votingtopic.container.VotingTopic;
 import life.offonoff.ab.domain.topic.Topic;
@@ -23,7 +23,7 @@
 public class TopicEventHandler {
 
     private final VotingTopicService votingTopicService;
-    private final NoticeService noticeService;
+    private final NotificationService notificationService;
 
     /**
      * 투표 생성 이벤트 -> VotingTopicContainer에서 관리 추가
@@ -42,7 +42,7 @@ public void addTopic(TopicCreateEvent event) {
     public void voteClosed(VoteClosedEvent event) {
         log.info("# Topic Vote Closed / topic-id : {}, deadline : {}", event.topic().getId(), event.topic().getDeadline());
 
-        noticeService.noticeVoteResult(event.result());
+        notificationService.noticeVoteResult(event.result());
     }
 
     /**
@@ -53,8 +53,8 @@ public void voted(VotedEvent event) {
         Topic topic = event.getVote()
                            .getTopic();
 
-        if (noticeService.shouldNoticeVoteCountForTopic(topic)) {
-            noticeService.noticeVoteCountOnTopic(topic);
+        if (notificationService.shouldNoticeVoteCountForTopic(topic)) {
+            notificationService.noticeVoteCountOnTopic(topic);
         }
     }
 }

src/main/java/life/offonoff/ab/application/notice/NoticeService.java → src/main/java/life/offonoff/ab/application/notification/NotificationService.java

@@ -1,16 +1,16 @@
-package life.offonoff.ab.application.notice;
+package life.offonoff.ab.application.notification;
 
 import life.offonoff.ab.domain.member.Member;
-import life.offonoff.ab.domain.notice.VoteCountOnTopicNotification;
-import life.offonoff.ab.domain.notice.VoteResultNotification;
+import life.offonoff.ab.domain.notification.VoteCountOnTopicNotification;
+import life.offonoff.ab.domain.notification.VoteResultNotification;
 import life.offonoff.ab.domain.topic.Topic;
 import life.offonoff.ab.domain.vote.VoteResult;
 import life.offonoff.ab.repository.member.MemberRepository;
 import life.offonoff.ab.repository.notice.NotificationRepository;
-import life.offonoff.ab.web.response.notice.NoticeResponse;
-import life.offonoff.ab.web.response.notice.NoticeResponseFactory;
+import life.offonoff.ab.web.response.notification.NotificationResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -20,9 +20,10 @@
 @Slf4j
 @RequiredArgsConstructor
 @Service
-public class NoticeService {
+public class NotificationService {
 
-    public static final int VOTE_COUNT_MODULO = 100;
+    @Value("${ab.notification.vote_on_topic.count_unit}")
+    public int voteCountUnit;
 
     private final MemberRepository memberRepository;
     private final NotificationRepository notificationRepository;
@@ -77,17 +78,17 @@ public void noticeVoteCountOnTopic(Topic topic) {
         notificationRepository.save(notification);
     }
 
-    public List<NoticeResponse> findAllByReceiverId(Long memberId) {
+    public List<NotificationResponse> findAllByReceiverId(Long memberId) {
 
         return notificationRepository.findAllByReceiverIdOrderByCreatedAtDesc(memberId)
                                      .stream()
-                                     .map(NoticeResponseFactory::createNoticeResponse)
+                                     .map(NotificationResponse::new)
                                      .toList();
     }
 
     public boolean shouldNoticeVoteCountForTopic(Topic topic) {
         // TODO : 투표 취소 후 다시 100단위를 넘었을 때 중복 알림 처리 && 추상화
-        return topic.getVoteCount() % VOTE_COUNT_MODULO == 0;
+        return topic.getVoteCount() % voteCountUnit == 0;
     }
 }
 

src/main/java/life/offonoff/ab/application/service/TopicService.java

@@ -171,8 +171,8 @@ private void doHide(final Member member, final Topic topic) {
     private void cancelHide(final Member member, final Topic topic) {
         member.cancelHideIfExists(topic);
     }
-
     //== Vote ==//
+
     @Transactional
     public VoteResponse voteForTopicByMember(final Long topicId, final Long memberId, final VoteRequest request) {
         Member member = findMember(memberId);

src/main/java/life/offonoff/ab/domain/member/Member.java

@@ -5,7 +5,7 @@
 import life.offonoff.ab.domain.comment.Comment;
 import life.offonoff.ab.domain.comment.HatedComment;
 import life.offonoff.ab.domain.comment.LikedComment;
-import life.offonoff.ab.domain.notice.Notification;
+import life.offonoff.ab.domain.notification.Notification;
 import life.offonoff.ab.domain.topic.Topic;
 import life.offonoff.ab.domain.topic.choice.ChoiceOption;
 import life.offonoff.ab.domain.topic.hide.HiddenTopic;

src/main/java/life/offonoff/ab/domain/notice/CommentOnTopicNotification.java → src/main/java/life/offonoff/ab/domain/notification/CommentOnTopicNotification.java

@@ -1,20 +1,20 @@
-package life.offonoff.ab.domain.notice;
+package life.offonoff.ab.domain.notification;
 
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.ManyToOne;
-import life.offonoff.ab.domain.member.Member;
-import life.offonoff.ab.domain.vote.VoteResult;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import static life.offonoff.ab.domain.notice.NotificationType.COMMENT_ON_TOPIC_NOTIFICATION;
+import static life.offonoff.ab.domain.notification.NotificationType.COMMENT_ON_TOPIC_NOTIFICATION;
 // TODO:수정대상
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
 @DiscriminatorValue(COMMENT_ON_TOPIC_NOTIFICATION)
 public class CommentOnTopicNotification extends Notification {
+    @Override
+    public String getType() {
+        return COMMENT_ON_TOPIC_NOTIFICATION;
+    }
 }

src/main/java/life/offonoff/ab/domain/notice/DefaultNotification.java → src/main/java/life/offonoff/ab/domain/notification/DefaultNotification.java

@@ -1,15 +1,13 @@
-package life.offonoff.ab.domain.notice;
+package life.offonoff.ab.domain.notification;
 
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
 import life.offonoff.ab.domain.member.Member;
-import life.offonoff.ab.domain.topic.Topic;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import static life.offonoff.ab.domain.notice.NotificationType.DEFAULT;
-import static life.offonoff.ab.domain.notice.NotificationType.VOTE_COUNT_ON_TOPIC_NOTIFICATION;
+import static life.offonoff.ab.domain.notification.NotificationType.DEFAULT;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -26,4 +24,9 @@ public DefaultNotification(Member receiver, String title, String content) {
         this.title = title;
         this.content = content;
     }
+
+    @Override
+    public String getType() {
+        return DEFAULT;
+    }
 }

src/main/java/life/offonoff/ab/domain/notice/LikeInCommentNotification.java → src/main/java/life/offonoff/ab/domain/notification/LikeInCommentNotification.java

@@ -1,20 +1,21 @@
-package life.offonoff.ab.domain.notice;
+package life.offonoff.ab.domain.notification;
 
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.ManyToOne;
-import life.offonoff.ab.domain.member.Member;
-import life.offonoff.ab.domain.vote.VoteResult;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import static life.offonoff.ab.domain.notice.NotificationType.LIKE_IN_COMMENT_NOTIFICATION;
+import static life.offonoff.ab.domain.notification.NotificationType.LIKE_IN_COMMENT_NOTIFICATION;
 // TODO:수정대상
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
 @DiscriminatorValue(LIKE_IN_COMMENT_NOTIFICATION)
 public class LikeInCommentNotification extends Notification {
+
+    @Override
+    public String getType() {
+        return LIKE_IN_COMMENT_NOTIFICATION;
+    }
 }

src/main/java/life/offonoff/ab/domain/notice/Notification.java → src/main/java/life/offonoff/ab/domain/notification/Notification.java

@@ -1,4 +1,4 @@
-package life.offonoff.ab.domain.notice;
+package life.offonoff.ab.domain.notification;
 
 import jakarta.persistence.*;
 import life.offonoff.ab.domain.BaseEntity;
@@ -34,4 +34,6 @@ public Notification(Member receiver) {
     public void check() {
         this.checked = true;
     }
+
+    public abstract String getType();
 }

src/main/java/life/offonoff/ab/domain/notice/NotificationType.java → src/main/java/life/offonoff/ab/domain/notification/NotificationType.java

@@ -1,4 +1,4 @@
-package life.offonoff.ab.domain.notice;
+package life.offonoff.ab.domain.notification;
 
 public class NotificationType {
     public static final String DEFAULT = "DEFAULT";

src/main/java/life/offonoff/ab/domain/notice/VoteCountOnTopicNotification.java → src/main/java/life/offonoff/ab/domain/notification/VoteCountOnTopicNotification.java

@@ -1,17 +1,16 @@
-package life.offonoff.ab.domain.notice;
+package life.offonoff.ab.domain.notification;
 
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.ManyToOne;
 import life.offonoff.ab.domain.member.Member;
 import life.offonoff.ab.domain.topic.Topic;
-import life.offonoff.ab.domain.vote.VoteResult;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import static life.offonoff.ab.domain.notice.NotificationType.VOTE_COUNT_ON_TOPIC_NOTIFICATION;
+import static life.offonoff.ab.domain.notification.NotificationType.VOTE_COUNT_ON_TOPIC_NOTIFICATION;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -29,4 +28,9 @@ public VoteCountOnTopicNotification(Member receiver, Topic topic) {
         this.topic = topic;
         this.totalVoteCount = topic.getVoteCount();
     }
+
+    @Override
+    public String getType() {
+        return VOTE_COUNT_ON_TOPIC_NOTIFICATION;
+    }
 }

src/main/java/life/offonoff/ab/domain/notice/VoteResultNotification.java → src/main/java/life/offonoff/ab/domain/notification/VoteResultNotification.java

@@ -1,4 +1,4 @@
-package life.offonoff.ab.domain.notice;
+package life.offonoff.ab.domain.notification;
 
 import jakarta.persistence.*;
 import life.offonoff.ab.domain.member.Member;
@@ -7,7 +7,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import static life.offonoff.ab.domain.notice.NotificationType.*;
+import static life.offonoff.ab.domain.notification.NotificationType.*;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -22,4 +22,9 @@ public VoteResultNotification(Member member, VoteResult voteResult) {
         super(member);
         this.voteResult = voteResult;
     }
+
+    @Override
+    public String getType() {
+        return VOTE_RESULT_NOTIFICATION;
+    }
 }

src/main/java/life/offonoff/ab/repository/notice/NotificationJdbcRepository.java

@@ -1,6 +1,6 @@
 package life.offonoff.ab.repository.notice;
 
-import life.offonoff.ab.domain.notice.VoteResultNotification;
+import life.offonoff.ab.domain.notification.VoteResultNotification;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;
 
@@ -9,7 +9,7 @@
 import java.time.LocalDateTime;
 import java.util.List;
 
-import static life.offonoff.ab.domain.notice.NotificationType.*;
+import static life.offonoff.ab.domain.notification.NotificationType.*;
 
 @Repository
 public class NotificationJdbcRepository {

src/main/java/life/offonoff/ab/repository/notice/NotificationRepository.java

@@ -1,6 +1,6 @@
 package life.offonoff.ab.repository.notice;
 
-import life.offonoff.ab.domain.notice.Notification;
+import life.offonoff.ab.domain.notification.Notification;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

src/main/java/life/offonoff/ab/repository/notice/NotificationRepositoryCustom.java

@@ -1,6 +1,6 @@
 package life.offonoff.ab.repository.notice;
 
-import life.offonoff.ab.domain.notice.VoteResultNotification;
+import life.offonoff.ab.domain.notification.VoteResultNotification;
 
 import java.util.List;
 

src/main/java/life/offonoff/ab/repository/notice/NotificationRepositoryImpl.java

@@ -1,6 +1,6 @@
 package life.offonoff.ab.repository.notice;
 
-import life.offonoff.ab.domain.notice.VoteResultNotification;
+import life.offonoff.ab.domain.notification.VoteResultNotification;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 

src/main/java/life/offonoff/ab/web/NoticeController.java → src/main/java/life/offonoff/ab/web/NotificationController.java

@@ -1,8 +1,8 @@
 package life.offonoff.ab.web;
 
-import life.offonoff.ab.application.notice.NoticeService;
+import life.offonoff.ab.application.notification.NotificationService;
 import life.offonoff.ab.web.common.aspect.auth.Authorized;
-import life.offonoff.ab.web.response.notice.NoticeResponse;
+import life.offonoff.ab.web.response.notification.NotificationResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -13,13 +13,13 @@
 
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/notices")
-public class NoticeController {
+@RequestMapping("/notifications")
+public class NotificationController {
 
-    private final NoticeService noticeService;
+    private final NotificationService notificationService;
 
     @GetMapping("")
-    public ResponseEntity<List<NoticeResponse>> getNotices(@Authorized Long memberId) {
-        return ResponseEntity.ok(noticeService.findAllByReceiverId(memberId));
+    public ResponseEntity<List<NotificationResponse>> getNotifications(@Authorized Long memberId) {
+        return ResponseEntity.ok(notificationService.findAllByReceiverId(memberId));
     }
 }