Fix:활동 페이징 수정

Kusitms-29th-Meetup-TeamE · Jun 4, 2024 · db03acd · db03acd
1 parent 39c3764
commit db03acd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.../com/meetup/teame/backend/domain/activity/repository/custom/ActivityRepositoryCustom.java b/.../com/meetup/teame/backend/domain/activity/repository/custom/ActivityRepositoryCustom.java
@@ -14,5 +14,5 @@ public interface ActivityRepositoryCustom {
 
     List<Activity> findLikedActivities(Long userId, long offset, long limit, List<AgencyType> agencyTypes, List<Personality> personalities);
 
-    Long countActivities(List<AgencyType> agencyTypes, List<Personality> personalities);
+    Long countActivities(List<AgencyType> agencyTypes, List<Personality> personalities, User user);
 }
diff --git a/...va/com/meetup/teame/backend/domain/activity/repository/custom/ActivityRepositoryImpl.java b/...va/com/meetup/teame/backend/domain/activity/repository/custom/ActivityRepositoryImpl.java
@@ -92,9 +92,13 @@ public List<Activity> findLikedActivities(Long userId, long offset, long limit,
 
 
     @Override
-    public Long countActivities(List<AgencyType> agencyTypes, List<Personality> personalities) {
+    public Long countActivities(List<AgencyType> agencyTypes, List<Personality> personalities, User user) {
         BooleanBuilder builder = new BooleanBuilder();
 
+        if (user != null && !user.getPersonalities().isEmpty()) {
+            builder.and(activity.personalities.any().in(user.getPersonalities()));
+        }
+
         // agencyTypes나 personalities가 입력된 경우 해당 값으로 필터링
         if (agencyTypes != null && !agencyTypes.isEmpty()) {
             builder.and(activity.agencyType.in(agencyTypes));

diff --git a/src/main/java/com/meetup/teame/backend/domain/activity/service/ActivityService.java b/src/main/java/com/meetup/teame/backend/domain/activity/service/ActivityService.java
@@ -80,8 +80,7 @@ public ReadActivitiesRes findActivities(ReadActivitiesReq activitiesReq) {
 
         List<Activity> activities = activityRepository.findByAgencyAndPersonalities(offset, limit, user, agencyTypes, personalities);
 
-        long pageCount = (activities.size() + ACTIVITY_PAGE_SIZE - 1) / ACTIVITY_PAGE_SIZE; // 전체 페이지 수 계산
-
+        long pageCount = (activityRepository.countActivities(agencyTypes, personalities, user) + ACTIVITY_PAGE_SIZE - 1) / ACTIVITY_PAGE_SIZE; // 전체 페이지 수 계산
 
         List<ActivitySummaryRes> activitySummaries = activities.stream()
                 .map(activity -> ActivitySummaryRes.of(activity, likedActivityIdsSet.contains(activity.getId())))