feat(): 인기 컬렉션 테이블 구현 (#189)

pizzazoa · web-flow · commit dd5cc0ee8a61 · 2025-10-04T13:54:06.000+09:00
* feat: 인기 컬렉션 테이블 및 엔티티 추가

* feat: 인기 컬렉션 테이블에서 조회 수정

* feat: 커뮤니티 응답에 인기 새록인지 아닌지 추가

* feat: 좋아요가 기준치를 넘는 시점에 인기 컬렉션 테이블에 저장 로직 추가

* test: 테스트 수정
diff --git a/src/main/java/org/devkor/apu/saerok_server/domain/collection/application/CollectionLikeCommandService.java b/src/main/java/org/devkor/apu/saerok_server/domain/collection/application/CollectionLikeCommandService.java
@@ -6,6 +6,8 @@
 import org.devkor.apu.saerok_server.domain.collection.core.entity.UserBirdCollectionLike;
 import org.devkor.apu.saerok_server.domain.collection.core.repository.CollectionLikeRepository;
 import org.devkor.apu.saerok_server.domain.collection.core.repository.CollectionRepository;
+import org.devkor.apu.saerok_server.domain.community.core.entity.PopularCollection;
+import org.devkor.apu.saerok_server.domain.community.core.repository.PopularCollectionRepository;
 import org.devkor.apu.saerok_server.domain.notification.application.model.dsl.ActionKind;
 import org.devkor.apu.saerok_server.domain.notification.application.model.dsl.Actor;
 import org.devkor.apu.saerok_server.domain.notification.application.facade.NotifyActionDsl;
@@ -22,9 +24,12 @@
 @RequiredArgsConstructor
 public class CollectionLikeCommandService {
 
+    private static final int POPULAR_COLLECTION_THRESHOLD = 3;
+
     private final CollectionLikeRepository collectionLikeRepository;
     private final CollectionRepository collectionRepository;
     private final UserRepository userRepository;
+    private final PopularCollectionRepository popularCollectionRepository;
     private final NotifyActionDsl notifyAction;
 
     /**
@@ -51,6 +56,16 @@ public LikeStatusResponse toggleLikeResponse(Long userId, Long collectionId) {
             UserBirdCollectionLike like = new UserBirdCollectionLike(user, collection);
             collectionLikeRepository.save(like);
             
+            // 좋아요 수 확인 후 인기 컬렉션 등록
+            long likeCount = collectionLikeRepository.countByCollectionId(collectionId);
+            if (likeCount == POPULAR_COLLECTION_THRESHOLD) {
+                boolean alreadyPopular = popularCollectionRepository.existsByCollectionId(collectionId);
+                if (!alreadyPopular) {
+                    PopularCollection popularCollection = new PopularCollection(collection);
+                    popularCollectionRepository.save(popularCollection);
+                }
+            }
+            
             // 자신의 컬렉션이 아닌 경우에만 푸시 알림 발송
             if (!collection.getUser().getId().equals(userId)) {
                 notifyAction
diff --git a/src/main/java/org/devkor/apu/saerok_server/domain/community/api/dto/common/CommunityCollectionInfo.java b/src/main/java/org/devkor/apu/saerok_server/domain/community/api/dto/common/CommunityCollectionInfo.java
@@ -39,6 +39,9 @@ public record CommunityCollectionInfo(
         @Schema(description = "내가 좋아요 눌렀는지 여부", example = "true")
         Boolean isLiked,
         
+        @Schema(description = "인기 컬렉션 여부", example = "true")
+        Boolean isPopular,
+        
         @Schema(description = "동정 돕기에 참여한 유저 수 (동정 요청 컬렉션인 경우에만)", example = "5", nullable = true)
         Long suggestionUserCount,
         
diff --git a/src/main/java/org/devkor/apu/saerok_server/domain/community/application/CommunityDataAssembler.java b/src/main/java/org/devkor/apu/saerok_server/domain/community/application/CommunityDataAssembler.java
@@ -6,6 +6,7 @@
 import org.devkor.apu.saerok_server.domain.collection.core.repository.CollectionCommentRepository;
 import org.devkor.apu.saerok_server.domain.collection.core.repository.CollectionLikeRepository;
 import org.devkor.apu.saerok_server.domain.collection.core.repository.BirdIdSuggestionRepository;
+import org.devkor.apu.saerok_server.domain.community.core.repository.PopularCollectionRepository;
 import org.devkor.apu.saerok_server.domain.community.api.dto.common.CommunityCollectionInfo;
 import org.devkor.apu.saerok_server.domain.community.api.dto.common.CommunityUserInfo;
 import org.devkor.apu.saerok_server.domain.community.mapper.CommunityWebMapper;
@@ -24,6 +25,7 @@ public class CommunityDataAssembler {
     private final UserProfileImageUrlService userProfileImageUrlService;
     private final CollectionLikeRepository collectionLikeRepository;
     private final CollectionCommentRepository collectionCommentRepository;
+    private final PopularCollectionRepository popularCollectionRepository;
     private final CommunityWebMapper communityWebMapper;
     private final BirdIdSuggestionRepository birdIdSuggestionRepository;
 
@@ -34,6 +36,11 @@ public List<CommunityCollectionInfo> toCollectionInfos(List<UserBirdCollection>
 
         Map<Long, String> imageUrls = collectionImageUrlService.getPrimaryImageUrlsFor(collections);
 
+        List<Long> collectionIds = collections.stream()
+                .map(UserBirdCollection::getId)
+                .toList();
+        Map<Long, Boolean> popularStatusMap = popularCollectionRepository.existsByCollectionIds(collectionIds);
+
         List<Long> pendingCollectionIds = collections.stream()
                 .filter(c -> c.getBird() == null)
                 .map(UserBirdCollection::getId)
@@ -49,13 +56,14 @@ public List<CommunityCollectionInfo> toCollectionInfos(List<UserBirdCollection>
                     long likeCount = collectionLikeRepository.countByCollectionId(collection.getId());
                     long commentCount = collectionCommentRepository.countByCollectionId(collection.getId());
                     boolean isLiked = userId != null && collectionLikeRepository.existsByUserIdAndCollectionId(userId, collection.getId());
+                    boolean isPopular = popularStatusMap.getOrDefault(collection.getId(), false);
 
                     Long suggestionUserCount = collection.getBird() == null 
                             ? suggestionUserCounts.getOrDefault(collection.getId(), 0L) 
                             : null;
                     
                     return communityWebMapper.toCommunityCollectionInfo(
-                            collection, imageUrl, userProfileImageUrl, likeCount, commentCount, isLiked, suggestionUserCount
+                            collection, imageUrl, userProfileImageUrl, likeCount, commentCount, isLiked, isPopular, suggestionUserCount
                     );
                 })
                 .toList();
diff --git a/src/main/java/org/devkor/apu/saerok_server/domain/community/application/CommunityQueryService.java b/src/main/java/org/devkor/apu/saerok_server/domain/community/application/CommunityQueryService.java
@@ -19,8 +19,6 @@
 @RequiredArgsConstructor
 public class CommunityQueryService {
 
-    private static final int POPULAR_MIN_LIKES = 3;
-
     private final CommunityRepository communityRepository;
     private final CommunityDataAssembler dataAssembler;
 
@@ -29,7 +27,7 @@ public GetCommunityMainResponse getCommunityMain(Long userId) {
         CommunityQueryCommand mainCommand = new CommunityQueryCommand(1, 3, null);
 
         List<UserBirdCollection> recentCollections = communityRepository.findRecentPublicCollections(mainCommand);
-        List<UserBirdCollection> popularCollections = communityRepository.findPopularCollections(mainCommand, POPULAR_MIN_LIKES);
+        List<UserBirdCollection> popularCollections = communityRepository.findPopularCollections(mainCommand);
         List<UserBirdCollection> pendingCollections = communityRepository.findPendingBirdIdCollections(mainCommand);
 
         return new GetCommunityMainResponse(
@@ -45,7 +43,7 @@ public GetCommunityCollectionsResponse getRecentCollections(Long userId, Communi
     }
 
     public GetCommunityCollectionsResponse getPopularCollections(Long userId, CommunityQueryCommand command) {
-        List<UserBirdCollection> collections = communityRepository.findPopularCollections(command, POPULAR_MIN_LIKES);
+        List<UserBirdCollection> collections = communityRepository.findPopularCollections(command);
         return new GetCommunityCollectionsResponse(dataAssembler.toCollectionInfos(collections, userId));
     }
 
diff --git a/src/main/java/org/devkor/apu/saerok_server/domain/community/core/entity/PopularCollection.java b/src/main/java/org/devkor/apu/saerok_server/domain/community/core/entity/PopularCollection.java
@@ -0,0 +1,29 @@
+package org.devkor.apu.saerok_server.domain.community.core.entity;
+
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.devkor.apu.saerok_server.domain.collection.core.entity.UserBirdCollection;
+import org.devkor.apu.saerok_server.global.shared.entity.CreatedAtOnly;
+
+@Entity
+@Table(
+        uniqueConstraints = @UniqueConstraint(columnNames = {"user_bird_collection_id"})
+)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Getter
+public class PopularCollection extends CreatedAtOnly {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE)
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_bird_collection_id", nullable = false)
+    private UserBirdCollection collection;
+
+    public PopularCollection(UserBirdCollection collection) {
+        this.collection = collection;
+    }
+}
diff --git a/src/main/java/org/devkor/apu/saerok_server/domain/community/core/repository/CommunityRepository.java b/src/main/java/org/devkor/apu/saerok_server/domain/community/core/repository/CommunityRepository.java
@@ -33,16 +33,16 @@ public List<UserBirdCollection> findRecentPublicCollections(CommunityQueryComman
     }
 
     // 인기 있는 컬렉션들을 조회 (좋아요 수가 minLikes 이상인 것들 최신순)
-    public List<UserBirdCollection> findPopularCollections(CommunityQueryCommand command, int minLikes) {
+    public List<UserBirdCollection> findPopularCollections(CommunityQueryCommand command) {
         Query query = em.createQuery("""
             SELECT c FROM UserBirdCollection c
             JOIN FETCH c.user u
             LEFT JOIN FETCH c.bird b
-            WHERE c.accessLevel = :public AND (SELECT COUNT(l) FROM UserBirdCollectionLike l WHERE l.collection.id = c.id) >= :minLikes
-            ORDER BY c.createdAt DESC
+            JOIN PopularCollection pc ON pc.collection.id = c.id
+            WHERE c.accessLevel = :public
+            ORDER BY pc.createdAt DESC
             """, UserBirdCollection.class)
-                .setParameter("public", AccessLevelType.PUBLIC)
-                .setParameter("minLikes", minLikes);
+                .setParameter("public", AccessLevelType.PUBLIC);
 
         applyPagination(query, command);
         return query.getResultList();
diff --git a/src/main/java/org/devkor/apu/saerok_server/domain/community/core/repository/PopularCollectionRepository.java b/src/main/java/org/devkor/apu/saerok_server/domain/community/core/repository/PopularCollectionRepository.java
@@ -0,0 +1,51 @@
+package org.devkor.apu.saerok_server.domain.community.core.repository;
+
+import jakarta.persistence.EntityManager;
+import lombok.RequiredArgsConstructor;
+import org.devkor.apu.saerok_server.domain.community.core.entity.PopularCollection;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Repository
+@RequiredArgsConstructor
+public class PopularCollectionRepository {
+
+    private final EntityManager em;
+
+    public void save(PopularCollection popularCollection) {
+        em.persist(popularCollection);
+    }
+
+    public boolean existsByCollectionId(Long collectionId) {
+        return !em.createQuery(
+                "SELECT 1 FROM PopularCollection pc " +
+                "WHERE pc.collection.id = :collectionId",
+                Integer.class)
+                .setParameter("collectionId", collectionId)
+                .setMaxResults(1)
+                .getResultList()
+                .isEmpty();
+    }
+
+    public Map<Long, Boolean> existsByCollectionIds(List<Long> collectionIds) {
+        if (collectionIds.isEmpty()) {
+            return Map.of();
+        }
+
+        List<Long> popularCollectionIds = em.createQuery(
+                "SELECT pc.collection.id FROM PopularCollection pc " +
+                "WHERE pc.collection.id IN :collectionIds",
+                Long.class)
+                .setParameter("collectionIds", collectionIds)
+                .getResultList();
+
+        return collectionIds.stream()
+                .collect(Collectors.toMap(
+                        id -> id,
+                        popularCollectionIds::contains
+                ));
+    }
+}
diff --git a/src/main/java/org/devkor/apu/saerok_server/domain/community/mapper/CommunityWebMapper.java b/src/main/java/org/devkor/apu/saerok_server/domain/community/mapper/CommunityWebMapper.java
@@ -22,6 +22,7 @@ public interface CommunityWebMapper {
     @Mapping(target = "likeCount", source = "likeCount")
     @Mapping(target = "commentCount", source = "commentCount")
     @Mapping(target = "isLiked", source = "isLiked")
+    @Mapping(target = "isPopular", source = "isPopular")
     @Mapping(target = "suggestionUserCount", source = "suggestionUserCount")
     @Mapping(target = "bird", expression = "java(mapBirdInfo(collection))")
     @Mapping(target = "user", expression = "java(mapUserInfo(collection, userProfileImageUrl))")
@@ -32,6 +33,7 @@ CommunityCollectionInfo toCommunityCollectionInfo(
             Long likeCount,
             Long commentCount,
             Boolean isLiked,
+            Boolean isPopular,
             Long suggestionUserCount
     );
 
diff --git a/src/main/resources/db/migration/V57__create_popular_collection_table.sql b/src/main/resources/db/migration/V57__create_popular_collection_table.sql
@@ -0,0 +1,17 @@
+CREATE SEQUENCE popular_collection_seq START WITH 1 INCREMENT BY 50;
+
+-- 테이블 생성
+CREATE TABLE popular_collection (
+    id                      BIGINT      NOT NULL PRIMARY KEY,
+    user_bird_collection_id BIGINT      NOT NULL,
+    created_at              TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    
+    CONSTRAINT uq_popular_collection_user_bird_collection UNIQUE (user_bird_collection_id)
+);
+
+-- 외래키 제약조건 추가
+ALTER TABLE popular_collection
+    ADD CONSTRAINT fk_popular_collection_user_bird_collection FOREIGN KEY (user_bird_collection_id) REFERENCES user_bird_collection(id) ON DELETE CASCADE;
+
+-- 인덱스 생성
+CREATE INDEX idx_popular_collection_created_at ON popular_collection(created_at);
diff --git a/src/test/java/org/devkor/apu/saerok_server/domain/collection/application/CollectionLikeCommandServiceTest.java b/src/test/java/org/devkor/apu/saerok_server/domain/collection/application/CollectionLikeCommandServiceTest.java
@@ -5,6 +5,7 @@
 import org.devkor.apu.saerok_server.domain.collection.core.entity.UserBirdCollectionLike;
 import org.devkor.apu.saerok_server.domain.collection.core.repository.CollectionLikeRepository;
 import org.devkor.apu.saerok_server.domain.collection.core.repository.CollectionRepository;
+import org.devkor.apu.saerok_server.domain.community.core.repository.PopularCollectionRepository;
 import org.devkor.apu.saerok_server.domain.notification.application.facade.NotificationPublisher;
 import org.devkor.apu.saerok_server.domain.notification.application.facade.NotifyActionDsl;
 import org.devkor.apu.saerok_server.domain.notification.application.model.dsl.Target;
@@ -39,6 +40,7 @@ class CollectionLikeCommandServiceTest {
     @Mock CollectionLikeRepository collectionLikeRepository;
     @Mock CollectionRepository collectionRepository;
     @Mock UserRepository userRepository;
+    @Mock PopularCollectionRepository popularCollectionRepository;
     @Mock NotificationPublisher publisher;
 
     @BeforeEach
@@ -55,7 +57,7 @@ void setUp() {
                 }
         );
         collectionLikeCommandService = new CollectionLikeCommandService(
-                collectionLikeRepository, collectionRepository, userRepository, notifyActionDsl
+                collectionLikeRepository, collectionRepository, userRepository, popularCollectionRepository, notifyActionDsl
         );
     }
 
@@ -76,6 +78,7 @@ void toggleLike_addLike_success() {
         given(userRepository.findById(userId)).willReturn(Optional.of(user));
         given(collectionRepository.findById(collectionId)).willReturn(Optional.of(collection));
         given(collectionLikeRepository.existsByUserIdAndCollectionId(userId, collectionId)).willReturn(false);
+        given(collectionLikeRepository.countByCollectionId(collectionId)).willReturn(5L);
 
         LikeStatusResponse response = collectionLikeCommandService.toggleLikeResponse(userId, collectionId);
 
diff --git a/src/test/java/org/devkor/apu/saerok_server/domain/community/application/CommunityQueryServiceTest.java b/src/test/java/org/devkor/apu/saerok_server/domain/community/application/CommunityQueryServiceTest.java
@@ -65,6 +65,7 @@ private static CommunityCollectionInfo collectionInfo(
             String note,
             Long likeCount,
             Long commentCount,
+            Boolean isPopular,
             Long suggestionUserCount,
             CommunityCollectionInfo.BirdInfo birdInfo,
             CommunityCollectionInfo.UserInfo userInfo
@@ -81,6 +82,7 @@ private static CommunityCollectionInfo collectionInfo(
                 likeCount,
                 commentCount,
                 false,
+                isPopular,
                 suggestionUserCount,
                 birdInfo,
                 userInfo
@@ -133,7 +135,7 @@ void dataAssemblerException_isPropagated() {
         
         given(communityRepository.findRecentPublicCollections(org.mockito.ArgumentMatchers.any()))
                 .willReturn(List.of());
-        given(communityRepository.findPopularCollections(org.mockito.ArgumentMatchers.any(), org.mockito.ArgumentMatchers.anyInt()))
+        given(communityRepository.findPopularCollections(org.mockito.ArgumentMatchers.any()))
                 .willReturn(List.of());
         given(communityRepository.findPendingBirdIdCollections(org.mockito.ArgumentMatchers.any()))
                 .willReturn(List.of());
@@ -173,13 +175,13 @@ void getRecentCollections_withMixedCollections_correctlySetsParticipantCount() {
         
         CommunityCollectionInfo pendingInfo = collectionInfo(
                 1L, "https://example.com/image1.jpg", "이게 무슨 새일까요?",
-                10L, 5L, 3L, null, userInfo
+                10L, 5L, false, 3L, null, userInfo
         );
         
         CommunityCollectionInfo.BirdInfo birdInfo = new CommunityCollectionInfo.BirdInfo(100L, "까치");
         CommunityCollectionInfo normalInfo = collectionInfo(
                 2L, "https://example.com/image2.jpg", "까치를 발견했어요!",
-                15L, 7L, null, birdInfo, userInfo
+                15L, 7L, false, null, birdInfo, userInfo
         );
         
         given(dataAssembler.toCollectionInfos(collections, userId))
diff --git a/src/test/java/org/devkor/apu/saerok_server/domain/community/core/repository/CommunityRepositoryTest.java b/src/test/java/org/devkor/apu/saerok_server/domain/community/core/repository/CommunityRepositoryTest.java
@@ -4,6 +4,7 @@
 import org.devkor.apu.saerok_server.domain.collection.core.entity.UserBirdCollection;
 import org.devkor.apu.saerok_server.domain.collection.core.entity.UserBirdCollectionLike;
 import org.devkor.apu.saerok_server.domain.community.application.dto.CommunityQueryCommand;
+import org.devkor.apu.saerok_server.domain.community.core.entity.PopularCollection;
 import org.devkor.apu.saerok_server.domain.dex.bird.core.entity.Bird;
 import org.devkor.apu.saerok_server.domain.dex.bird.core.entity.BirdName;
 import org.devkor.apu.saerok_server.domain.dex.bird.core.entity.BirdTaxonomy;
@@ -169,34 +170,43 @@ void findRecent_returnsPublicOnly() throws Exception {
     }
 
     @Test
-    @DisplayName("최소 좋아요 수 이상의 PUBLIC 컬렉션만 조회")
-    void findPopular_returnsWithMinLikes() throws Exception {
+    @DisplayName("PopularCollection 테이블에 등록된 PUBLIC 컬렉션만 조회")
+    void findPopular_returnsRegisteredPopular() throws Exception {
         // given
         User user = newUser("user");
         Bird bird = newBird("참새");
-        int minLikes = 5;
 
-        UserBirdCollection popular = newCollection(user, bird, AccessLevelType.PUBLIC, null);
-        UserBirdCollection notPopular = newCollection(user, bird, AccessLevelType.PUBLIC, null);
+        OffsetDateTime now = OffsetDateTime.now();
+        UserBirdCollection popularOld = newCollection(user, bird, AccessLevelType.PUBLIC, null);
+        UserBirdCollection popularNew = newCollection(user, bird, AccessLevelType.PUBLIC, null);
         UserBirdCollection privatePopular = newCollection(user, bird, AccessLevelType.PRIVATE, null);
 
         em.flush();
         
-        addLikes(popular, 10);
-        addLikes(notPopular, 3);
-        addLikes(privatePopular, 10);
+        // PopularCollection 에 등록
+        PopularCollection pc1 = new PopularCollection(popularOld);
+        ReflectionTestUtils.setField(pc1, "createdAt", now.minusDays(1));
+        em.persist(pc1);
+        
+        PopularCollection pc2 = new PopularCollection(popularNew);
+        ReflectionTestUtils.setField(pc2, "createdAt", now);
+        em.persist(pc2);
+        
+        PopularCollection pc3 = new PopularCollection(privatePopular);
+        em.persist(pc3);
 
         CommunityQueryCommand command = new CommunityQueryCommand(1, 10, null);
 
         em.flush();
         em.clear();
 
         // when
-        List<UserBirdCollection> result = communityRepository.findPopularCollections(command, minLikes);
+        List<UserBirdCollection> result = communityRepository.findPopularCollections(command);
 
         // then
-        assertEquals(1, result.size(), "최소 좋아요 수 이상의 PUBLIC 컬렉션만");
-        assertEquals(popular.getId(), result.getFirst().getId());
+        assertEquals(2, result.size(), "PopularCollection에 등록된 PUBLIC 컬렉션만");
+        assertEquals(popularNew.getId(), result.get(0).getId(), "최근에 등록된 컬렉션이 먼저");
+        assertEquals(popularOld.getId(), result.get(1).getId(), "이전에 등록된 컬렉션이 다음");
     }
 
     @Test
