[MERGE] dev->main 병합

build.gradle

@@ -88,6 +88,10 @@ dependencies {
 
 	//
 	implementation 'org.springframework.boot:spring-boot-starter-actuator'
+
+	//hibernate
+	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	implementation 'org.hibernate.common:hibernate-commons-annotations:6.0.6.Final'
 }
 
 

src/main/java/stackpot/stackpot/event/SseService.java

@@ -15,10 +15,7 @@
 import stackpot.stackpot.chat.service.chatroom.ChatRoomQueryService;
 import stackpot.stackpot.chat.service.chatroominfo.ChatRoomInfoQueryService;
 import stackpot.stackpot.common.util.AuthService;
-import stackpot.stackpot.notification.event.FeedCommentEvent;
-import stackpot.stackpot.notification.event.FeedLikeEvent;
-import stackpot.stackpot.notification.event.PotApplicationEvent;
-import stackpot.stackpot.notification.event.PotCommentEvent;
+import stackpot.stackpot.notification.event.*;
 import stackpot.stackpot.pot.dto.UserMemberIdDto;
 import stackpot.stackpot.pot.service.potMember.PotMemberQueryService;
 
@@ -34,6 +31,7 @@
 @Slf4j
 public class SseService {
 
+    // user 마다 SseEmitter 객체 저장
     private final Map<Long, SseEmitter> emitters = new ConcurrentHashMap<>();
 
     private final ChatRoomQueryService chatRoomQueryService;
@@ -173,6 +171,28 @@ public void sendFeedLikeNotification(FeedLikeEvent event) {
         }
     }
 
+    /**
+     * PotEndNotification
+     * 팟을 끓인 후 팟 멤버들에게 실시간 알림 전송
+     */
+    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+    public void sendPotEndNotification(PotEndEvent event) {
+        Long potId = event.getPotId();
+        List<Long> userIds = potMemberQueryService.selectUserIdsAboutPotMembersByPotId(potId);
+        for (Long userId : userIds) {
+            SseEmitter emitter = userId != null ? emitters.get(userId) : null;
+            if (emitter != null) {
+                try {
+                    emitter.send(SseEmitter.event()
+                            .name("Notification")
+                            .data(event.getUnReadNotificationDto(), MediaType.APPLICATION_JSON));
+                } catch (Exception e) {
+                    emitters.remove(userId);
+                }
+            }
+        }
+    }
+
     private ChatRoomResponseDto.ChatRoomListDto createChatRoomListDto(UserMemberIdDto ids) {
         Long potMemberId = ids.getPotMemberId();
         Long potId = ids.getPotId();

src/main/java/stackpot/stackpot/feed/repository/FeedRepository.java

@@ -54,6 +54,10 @@ List<Feed> findFeeds(
     // 커서 기반 페이징 조회
     List<Feed> findByUserIdAndFeedIdBefore(Long userId, Long cursorFeedId, Pageable pageable);
 
+    // 시리즈 필터링 추가된 페이징 조회
+    List<Feed> findByUser_IdAndSeries_SeriesId(Long userId, Long seriesId, Pageable pageable);
+    List<Feed> findByUser_IdAndSeries_SeriesIdAndFeedIdBefore(Long userId, Long seriesId, Long cursorFeedId, Pageable pageable);
+
     @Modifying
     @Query("DELETE FROM Feed f WHERE f.user.id = :userId")
     void deleteByUserId(@Param("userId") Long userId);

src/main/java/stackpot/stackpot/feed/service/FeedCommandServiceImpl.java

@@ -1,6 +1,5 @@
 package stackpot.stackpot.feed.service;
 
-import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
@@ -13,6 +12,7 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import stackpot.stackpot.apiPayload.code.status.ErrorStatus;
 import stackpot.stackpot.apiPayload.exception.handler.FeedHandler;
 import stackpot.stackpot.apiPayload.exception.handler.UserHandler;
@@ -200,7 +200,7 @@ public boolean toggleLike(Long feedId) {
             feedLikeRepository.delete(existingLike.get());
             feed.setLikeCount(feed.getLikeCount() - 1);
             feedRepository.save(feed);
-
+            // todo 좋아요 알림 삭제
             return false; // 좋아요 취소
         } else {
             // 좋아요 추가

src/main/java/stackpot/stackpot/feed/service/FeedQueryService.java

@@ -9,9 +9,9 @@
 public interface FeedQueryService {
      FeedResponseDto.FeedPreviewList getPreViewFeeds(String category, String sort, Long cursor, int limit);
      FeedResponseDto.AuthorizedFeedDto getFeed(Long feedId);
-     UserMyPageResponseDto getFeedsByUserId(Long userId, Long nextCursor, int pageSize);
+     UserMyPageResponseDto getFeedsByUserId(Long userId, Long nextCursor, int pageSize, Long seriesId);
 //     FeedResponseDto.FeedPreviewList searchByUserIdByKeyword(Long userId, Long nextCursor, int pageSize);
-UserMyPageResponseDto getFeeds(Long nextCursor, int pageSize);
+UserMyPageResponseDto getFeeds(Long nextCursor, int pageSize, Long seriesId);
      Map<Long, String> getMySeries();
      Long getLikeCount(Long feedId);
      Feed getFeedByFeedId(Long feedId);

src/main/java/stackpot/stackpot/feed/service/FeedQueryServiceImpl.java

@@ -180,7 +180,7 @@ public FeedResponseDto.AuthorizedFeedDto getFeed(Long feedId) {
     }
 
     @Transactional
-    public UserMyPageResponseDto getFeedsByUserId(Long userId, Long nextCursor, int pageSize) {
+    public UserMyPageResponseDto getFeedsByUserId(Long userId, Long nextCursor, int pageSize, Long seriesId) {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         boolean isAuthenticated = authentication != null
                 && !(authentication instanceof AnonymousAuthenticationToken)
@@ -202,9 +202,19 @@ public UserMyPageResponseDto getFeedsByUserId(Long userId, Long nextCursor, int
                 : List.of();
 
         Pageable pageable = PageRequest.of(0, pageSize, Sort.by(Sort.Direction.DESC, "feedId"));
-        List<Feed> feeds = (nextCursor == null)
-                ? feedRepository.findByUser_Id(userId, pageable)
-                : feedRepository.findByUserIdAndFeedIdBefore(userId, nextCursor, pageable);
+//        List<Feed> feeds = (nextCursor == null)
+//                ? feedRepository.findByUser_Id(userId, pageable)
+//                : feedRepository.findByUserIdAndFeedIdBefore(userId, nextCursor, pageable);
+        List<Feed> feeds;
+        if (seriesId == 0) {
+            feeds = (nextCursor == null)
+                    ? feedRepository.findByUser_Id(userId, pageable)
+                    : feedRepository.findByUserIdAndFeedIdBefore(userId, nextCursor, pageable);
+        } else {
+            feeds = (nextCursor == null)
+                    ? feedRepository.findByUser_IdAndSeries_SeriesId(userId, seriesId, pageable)
+                    : feedRepository.findByUser_IdAndSeries_SeriesIdAndFeedIdBefore(userId, seriesId, nextCursor, pageable);
+        }
 
         List<FeedResponseDto.FeedDto> feedDtos = feeds.stream()
                 .map(feed -> {
@@ -233,13 +243,20 @@ public UserMyPageResponseDto getFeedsByUserId(Long userId, Long nextCursor, int
     }
 
     @Override
-    public UserMyPageResponseDto getFeeds(Long nextCursor, int pageSize) {
+    public UserMyPageResponseDto getFeeds(Long nextCursor, int pageSize, Long seriesId) {
         User user = authService.getCurrentUser();
 
         Pageable pageable = PageRequest.of(0, pageSize, Sort.by(Sort.Direction.DESC, "feedId"));
-        List<Feed> feeds = (nextCursor == null)
-                ? feedRepository.findByUser_Id(user.getId(), pageable)
-                : feedRepository.findByUserIdAndFeedIdBefore(user.getId(), nextCursor, pageable);
+        List<Feed> feeds;
+        if (seriesId == 0) {
+            feeds = (nextCursor == null)
+                    ? feedRepository.findByUser_Id(user.getId(), pageable)
+                    : feedRepository.findByUserIdAndFeedIdBefore(user.getId(), nextCursor, pageable);
+        } else {
+            feeds = (nextCursor == null)
+                    ? feedRepository.findByUser_IdAndSeries_SeriesId(user.getId(), seriesId, pageable)
+                    : feedRepository.findByUser_IdAndSeries_SeriesIdAndFeedIdBefore(user.getId(), seriesId, nextCursor, pageable);
+        }
 
         List<Long> likedFeedIds = feedLikeRepository.findFeedIdsByUserId(user.getId());
         List<Long> savedFeedIds = feedSaveRepository.findFeedIdsByUserId(user.getId());

src/main/java/stackpot/stackpot/notification/controller/NotificationController.java

@@ -15,7 +15,7 @@
 import java.util.List;
 
 @RestController
-@RequestMapping("/api/notifications")
+@RequestMapping("/notifications")
 @RequiredArgsConstructor
 public class NotificationController {
 
@@ -31,7 +31,10 @@ public ResponseEntity<ApiResponse<List<NotificationResponseDto.UnReadNotificatio
         return ResponseEntity.ok(ApiResponse.onSuccess(notificationQueryService.getAllUnReadNotifications()));
     }
 
-    @Operation(summary = "알림 읽음 처리 API")
+    @Operation(
+            summary = "알림 읽음 처리 API",
+            description = "NotificationType은 알림 조회 응답의 type 필드를 그대로 보내면 됩니다"
+    )
     @ApiErrorCodeExamples({
             ErrorStatus.NOTIFICATION_NOT_FOUND,
             ErrorStatus.INVALID_NOTIFICATION_TYPE

src/main/java/stackpot/stackpot/notification/converter/NotificationConverter.java

@@ -17,7 +17,8 @@ public class NotificationConverter {
     public NotificationResponseDto.UnReadNotificationDto toUnReadNotificationDto(NotificationDto.UnReadNotificationDto unReadNotificationDto) {
         return NotificationResponseDto.UnReadNotificationDto.builder()
                 .notificationId(unReadNotificationDto.getNotificationId())
-                .potOrFeedId(unReadNotificationDto.getPotOrFeedId())
+                .potId(unReadNotificationDto.getPotId())
+                .feedId(unReadNotificationDto.getFeedId())
                 .userName(unReadNotificationDto.getUserName() + " 새싹")
                 .type(unReadNotificationDto.getType())
                 .content(unReadNotificationDto.getContent())
@@ -26,10 +27,11 @@ public NotificationResponseDto.UnReadNotificationDto toUnReadNotificationDto(Not
     }
 
     public NotificationResponseDto.UnReadNotificationDto toUnReadNotificationDto(
-            Long notificationId, Long potOrFeedId, String userName, String type, String content, LocalDateTime createdAt) {
+            Long notificationId, Long potId, Long feedId, String userName, String type, String content, LocalDateTime createdAt) {
         return NotificationResponseDto.UnReadNotificationDto.builder()
                 .notificationId(notificationId)
-                .potOrFeedId(potOrFeedId)
+                .potId(potId)
+                .feedId(feedId)
                 .userName(userName + " 새싹")
                 .type(type)
                 .content(content)

src/main/java/stackpot/stackpot/notification/dto/NotificationDto.java

@@ -16,10 +16,11 @@ public class NotificationDto {
     @AllArgsConstructor
     public static class UnReadNotificationDto {
         private Long notificationId;
-        private Long potOrFeedId;
+        private Long potId;
+        private Long feedId;
         private String userName;
-        private String type;
-        private String content;
+        private String type; // 알림 종류
+        private String content; // 알림 내용
         private LocalDateTime createdAt;
     }
 }

src/main/java/stackpot/stackpot/notification/dto/NotificationResponseDto.java

@@ -16,7 +16,8 @@ public class NotificationResponseDto {
     @AllArgsConstructor
     public static class UnReadNotificationDto {
         private Long notificationId;
-        private Long potOrFeedId;
+        private Long potId;
+        private Long feedId;
         private String userName;
         private String type;
         private String content;

src/main/java/stackpot/stackpot/notification/entity/PotEndNotification.java

@@ -0,0 +1,29 @@
+package stackpot.stackpot.notification.entity;
+
+import jakarta.persistence.*;
+import lombok.*;
+import stackpot.stackpot.common.BaseEntity;
+import stackpot.stackpot.pot.entity.Pot;
+
+@Entity
+@Getter
+@Builder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+public class PotEndNotification extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "pot_end_notification_id")
+    private Long id;
+
+    private Boolean isRead;
+
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "pot_id")
+    private Pot pot;
+
+    public void updateIsRead(Boolean isRead) {
+        this.isRead = isRead;
+    }
+}

src/main/java/stackpot/stackpot/notification/entity/enums/NotificationType.java

@@ -36,16 +36,25 @@ public void read(Long id, NotificationCommandService service) {
                     .orElseThrow(() -> new NotificationHandler(ErrorStatus.NOTIFICATION_NOT_FOUND))
                     .updateIsRead(true);
         }
+    },
+    POT_END {
+      @Override
+      public void read(Long id, NotificationCommandService service){
+            service.getPotEndNotificationRepository().findById(id)
+                    .orElseThrow(() -> new NotificationHandler(ErrorStatus.NOTIFICATION_NOT_FOUND))
+                    .updateIsRead(true);
+      }
     };
 
     public abstract void read(Long id, NotificationCommandService service);
 
     public static NotificationType from(String type) {
         return switch (type) {
-            case "PotApplication" -> POT_APPLICATION;
-            case "PotComment" -> POT_COMMENT;
-            case "FeedLike" -> FEED_LIKE;
-            case "FeedComment" -> FEED_COMMENT;
+            case "팟 지원 알림" -> POT_APPLICATION;
+            case "팟 댓글 알림" -> POT_COMMENT;
+            case "피드 좋아요 알림" -> FEED_LIKE;
+            case "피드 댓글 알림" -> FEED_COMMENT;
+            case "팟 종료 알림" -> POT_END;
             default -> throw new NotificationHandler(ErrorStatus.INVALID_NOTIFICATION_TYPE);
         };
     }

src/main/java/stackpot/stackpot/notification/event/PotEndEvent.java

@@ -0,0 +1,12 @@
+package stackpot.stackpot.notification.event;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import stackpot.stackpot.notification.dto.NotificationResponseDto;
+
+@Getter
+@AllArgsConstructor
+public class PotEndEvent {
+    private Long potId;
+    private NotificationResponseDto.UnReadNotificationDto unReadNotificationDto;
+}

src/main/java/stackpot/stackpot/notification/repository/FeedCommentNotificationRepository.java

@@ -13,14 +13,21 @@
 public interface FeedCommentNotificationRepository extends JpaRepository<FeedCommentNotification, Long> {
 
     @Query("SELECT new stackpot.stackpot.notification.dto.NotificationDto$UnReadNotificationDto(" +
-            "fcn.id, fcn.feedComment.feed.feedId, " +
-            "fcn.feedComment.user.nickname, 'FeedComment', fcn.feedComment.comment, fcn.createdAt) " +
+            "fcn.id, " +
+            "null, " +
+            "f.feedId, " +
+            "u.nickname, " +
+            "'피드 댓글 알림', " +
+            "CONCAT(u.nickname, ' 새싹님의 댓글이 달렸어요. ', fc.comment), " +
+            "fcn.createdAt) " +
             "FROM FeedCommentNotification fcn " +
-            "WHERE fcn.isRead = false AND (" +
-            "     (fcn.feedComment.parent is null AND fcn.feedComment.feed.user.id = :userId) OR " +
-            "     (fcn.feedComment.parent is not null AND " +
-            "         (fcn.feedComment.parent.user.id = :userId OR fcn.feedComment.feed.user.id = :userId)" +
-            "     ))")
+            "JOIN fcn.feedComment fc " +
+            "JOIN fc.user u " +
+            "JOIN fc.feed f " +
+            "LEFT JOIN fc.parent fcp " +
+            "WHERE fcn.isRead = false AND " +
+            "((fc.parent is null AND f.user.id = :userId) OR " +
+            " (fc.parent is not null AND (fcp.user.id = :userId OR f.user.id = :userId)))")
     List<NotificationDto.UnReadNotificationDto> findAllUnReadNotificationsByUserId(Long userId);
 
     @Modifying

src/main/java/stackpot/stackpot/notification/repository/FeedLikeNotificationRepository.java

@@ -4,18 +4,21 @@
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
-import org.springframework.security.core.parameters.P;
 import stackpot.stackpot.notification.dto.NotificationDto;
 import stackpot.stackpot.notification.entity.FeedLikeNotification;
 
 import java.util.List;
-import java.util.Optional;
 
 public interface FeedLikeNotificationRepository extends JpaRepository<FeedLikeNotification, Long> {
 
     @Query("SELECT new stackpot.stackpot.notification.dto.NotificationDto$UnReadNotificationDto(" +
-            "fln.id, fln.feedLike.feed.feedId, " +
-            "fln.feedLike.user.nickname, 'FeedLike', null, fln.createdAt) " +
+            "fln.id, " +
+            "null, " +
+            "fln.feedLike.feed.feedId, " +
+            "fln.feedLike.user.nickname, " +
+            "'피드 좋아요 알림', " +
+            "CONCAT(fln.feedLike.user.nickname, ' 새싹님이 내 피드에 좋아요를 눌렀어요. 확인해 보세요!'), " +
+            "fln.createdAt) " +
             "FROM FeedLikeNotification fln " +
             "WHERE fln.isRead = false and fln.feedLike.feed.user.id = :userId ")
     List<NotificationDto.UnReadNotificationDto> findAllUnReadNotificationsByUserId(@Param("userId") Long userId);

src/main/java/stackpot/stackpot/notification/repository/PotApplicationNotificationRepository.java

@@ -13,8 +13,13 @@
 public interface PotApplicationNotificationRepository extends JpaRepository<PotApplicationNotification, Long> {
 
     @Query("SELECT new stackpot.stackpot.notification.dto.NotificationDto$UnReadNotificationDto(" +
-            "pan.id, pan.potApplication.pot.potId, pan.potApplication.user.nickname, " +
-            "'PotApplication', null, pan.createdAt) " +
+            "pan.id, " +
+            "pan.potApplication.pot.potId, " +
+            "null, " +
+            "pan.potApplication.user.nickname, " +
+            "'팟 지원 알림', " +
+            "CONCAT(pan.potApplication.user.nickname, ' 새싹님이 내 팟에 지원했어요. 확인해 보세요!'), " +
+            "pan.createdAt) " +
             "FROM PotApplicationNotification pan " +
             "WHERE pan.isRead = false AND pan.potApplication.pot.user.id = :userId")
     List<NotificationDto.UnReadNotificationDto> findAllUnReadNotificationsByUserId(@Param("userId") Long userId);