Merge pull request #359 from Team-WSS/feat/#358

rinarina0429 · web-flow · commit 95bfb8f5d7bb · 2025-06-11T23:54:47.000+09:00
[FEAT] 서재 변경 조회 기능 추가
diff --git a/src/main/java/org/websoso/WSSServer/controller/UserController.java b/src/main/java/org/websoso/WSSServer/controller/UserController.java
@@ -5,6 +5,7 @@
 import static org.springframework.http.HttpStatus.OK;
 
 import jakarta.validation.Valid;
+import java.time.LocalDateTime;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -156,12 +157,13 @@ public ResponseEntity<UserNovelAndNovelsGetResponse> getUserNovelsAndNovels(@Aut
                                                                                 @RequestParam(value = "query", required = false) String query,
                                                                                 @RequestParam("lastUserNovelId") Long lastUserNovelId,
                                                                                 @RequestParam("size") int size,
-                                                                                @RequestParam("sortType") String sortType) {
+                                                                                @RequestParam("sortType") String sortType,
+                                                                                @RequestParam(value = "updatedSince", required = false) LocalDateTime updatedSince) {
         return ResponseEntity
                 .status(OK)
                 .body(userNovelService.getUserNovelsAndNovels(
                         visitor, userId, isInterest, readStatuses, attractivePoints, novelRating, query,
-                        lastUserNovelId, size, sortType));
+                        lastUserNovelId, size, sortType, updatedSince));
     }
 
     @GetMapping("/{userId}/feeds")
diff --git a/src/main/java/org/websoso/WSSServer/domain/UserNovelAttractivePoint.java b/src/main/java/org/websoso/WSSServer/domain/UserNovelAttractivePoint.java
@@ -4,6 +4,7 @@
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
@@ -12,10 +13,12 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.websoso.WSSServer.domain.common.ParentTouchListener;
 
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
+@EntityListeners(ParentTouchListener.class)
 public class UserNovelAttractivePoint {
 
     @Id
diff --git a/src/main/java/org/websoso/WSSServer/domain/UserNovelKeyword.java b/src/main/java/org/websoso/WSSServer/domain/UserNovelKeyword.java
@@ -4,6 +4,7 @@
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
@@ -12,10 +13,12 @@
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.websoso.WSSServer.domain.common.ParentTouchListener;
 
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
+@EntityListeners(ParentTouchListener.class)
 public class UserNovelKeyword {
 
     @Id
diff --git a/src/main/java/org/websoso/WSSServer/domain/common/BaseEntity.java b/src/main/java/org/websoso/WSSServer/domain/common/BaseEntity.java
@@ -35,4 +35,7 @@ public void onPreUpdate() {
         this.modifiedDate = LocalDateTime.now();
     }
 
+    public void touch() {
+        this.modifiedDate = LocalDateTime.now();
+    }
 }
diff --git a/src/main/java/org/websoso/WSSServer/domain/common/ParentTouchListener.java b/src/main/java/org/websoso/WSSServer/domain/common/ParentTouchListener.java
@@ -0,0 +1,20 @@
+package org.websoso.WSSServer.domain.common;
+
+import jakarta.persistence.PostPersist;
+import jakarta.persistence.PostRemove;
+import jakarta.persistence.PostUpdate;
+import org.websoso.WSSServer.domain.UserNovelAttractivePoint;
+import org.websoso.WSSServer.domain.UserNovelKeyword;
+
+public class ParentTouchListener {
+    @PostPersist
+    @PostRemove
+    @PostUpdate
+    public void touchParent(Object child) {
+        if (child instanceof UserNovelKeyword uk) {
+            uk.getUserNovel().touch();
+        } else if (child instanceof UserNovelAttractivePoint ap) {
+            ap.getUserNovel().touch();
+        }
+    }
+}
diff --git a/src/main/java/org/websoso/WSSServer/repository/UserNovelCustomRepository.java b/src/main/java/org/websoso/WSSServer/repository/UserNovelCustomRepository.java
@@ -1,5 +1,6 @@
 package org.websoso.WSSServer.repository;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import org.springframework.data.domain.Pageable;
 import org.websoso.WSSServer.domain.Genre;
@@ -17,8 +18,9 @@ public interface UserNovelCustomRepository {
 
     List<UserNovel> findFilteredUserNovels(Long userId, Boolean isInterest, List<String> readStatuses,
                                            List<String> attractivePoints, Float novelRating, String query,
-                                           Long lastNovelId, int size, boolean isAscending);
+                                           Long lastNovelId, int size, boolean isAscending, LocalDateTime updatedSince);
 
     Long countByUserIdAndFilters(Long userId, Boolean isInterest, List<String> readStatuses,
-                                 List<String> attractivePoints, Float novelRating, String query);
+                                 List<String> attractivePoints, Float novelRating, String query,
+                                 LocalDateTime updatedSince);
 }
diff --git a/src/main/java/org/websoso/WSSServer/repository/UserNovelCustomRepositoryImpl.java b/src/main/java/org/websoso/WSSServer/repository/UserNovelCustomRepositoryImpl.java
@@ -11,6 +11,7 @@
 import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -100,13 +101,14 @@ public List<Novel> findTasteNovels(List<Genre> preferGenres) {
     @Override
     public List<UserNovel> findFilteredUserNovels(Long userId, Boolean isInterest, List<String> readStatuses,
                                                   List<String> attractivePoints, Float novelRating, String query,
-                                                  Long lastUserNovelId, int size, boolean isAscending) {
+                                                  Long lastUserNovelId, int size, boolean isAscending,
+                                                  LocalDateTime updatedSince) {
         JPAQuery<UserNovel> queryBuilder = jpaQueryFactory
                 .selectFrom(userNovel)
                 .join(userNovel.novel, novel).fetchJoin()
                 .where(userNovel.user.userId.eq(userId));
 
-        applyFilters(queryBuilder, isInterest, readStatuses, attractivePoints, novelRating, query);
+        applyFilters(queryBuilder, isInterest, readStatuses, attractivePoints, novelRating, query, updatedSince);
 
         queryBuilder.where(isAscending
                 ? userNovel.userNovelId.gt(lastUserNovelId)
@@ -119,20 +121,22 @@ public List<UserNovel> findFilteredUserNovels(Long userId, Boolean isInterest, L
 
     @Override
     public Long countByUserIdAndFilters(Long userId, Boolean isInterest, List<String> readStatuses,
-                                        List<String> attractivePoints, Float novelRating, String query) {
+                                        List<String> attractivePoints, Float novelRating, String query,
+                                        LocalDateTime updatedSince) {
         JPAQuery<Long> queryBuilder = jpaQueryFactory
                 .select(userNovel.count())
                 .from(userNovel)
                 .join(userNovel.novel, novel)
                 .where(userNovel.user.userId.eq(userId));
 
-        applyFilters(queryBuilder, isInterest, readStatuses, attractivePoints, novelRating, query);
+        applyFilters(queryBuilder, isInterest, readStatuses, attractivePoints, novelRating, query, updatedSince);
 
         return queryBuilder.fetchOne();
     }
 
     private <T> void applyFilters(JPAQuery<T> queryBuilder, Boolean isInterest, List<String> readStatuses,
-                                  List<String> attractivePoints, Float novelRating, String query) {
+                                  List<String> attractivePoints, Float novelRating, String query,
+                                  LocalDateTime updatedSince) {
         Optional.ofNullable(isInterest)
                 .ifPresent(interest -> queryBuilder.where(userNovel.isInterest.eq(interest)));
 
@@ -154,5 +158,8 @@ private <T> void applyFilters(JPAQuery<T> queryBuilder, Boolean isInterest, List
                 .filter(q -> !q.isBlank())
                 .ifPresent(q -> queryBuilder.where(
                         novel.title.containsIgnoreCase(q).or(novel.author.containsIgnoreCase(q))));
+
+        Optional.ofNullable(updatedSince)
+                .ifPresent(ts -> queryBuilder.where(userNovel.modifiedDate.gt(ts)));
     }
 }
diff --git a/src/main/java/org/websoso/WSSServer/service/UserNovelService.java b/src/main/java/org/websoso/WSSServer/service/UserNovelService.java
@@ -8,6 +8,8 @@
 import static org.websoso.WSSServer.exception.error.CustomUserNovelError.USER_NOVEL_ALREADY_EXISTS;
 import static org.websoso.WSSServer.exception.error.CustomUserNovelError.USER_NOVEL_NOT_FOUND;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -122,51 +124,84 @@ private void updateUserNovel(UserNovel userNovel, UserNovelUpdateRequest request
     }
 
     private void updateAssociations(UserNovel userNovel, UserNovelUpdateRequest request) {
-        Set<AttractivePoint> previousAttractivePoints = getPreviousAttractivePoints(userNovel);
-        Set<Keyword> previousKeywords = getPreviousKeywords(userNovel);
-
-        manageAttractivePoints(userNovel, request.attractivePoints(), previousAttractivePoints);
-        manageKeywords(userNovel, request.keywordIds(), previousKeywords);
-
-        userNovelAttractivePointRepository.deleteByAttractivePointsAndUserNovel(previousAttractivePoints, userNovel);
-        userNovelKeywordRepository.deleteByKeywordsAndUserNovel(previousKeywords, userNovel);
+        updateAttractivePoints(userNovel, request.attractivePoints());
+        updateKeywords(userNovel, request.keywordIds());
     }
 
-    private Set<AttractivePoint> getPreviousAttractivePoints(UserNovel userNovel) {
-        return userNovel.getUserNovelAttractivePoints()
+    private void updateAttractivePoints(UserNovel userNovel, List<String> attractivePoints) {
+        Map<AttractivePoint, UserNovelAttractivePoint> currentPointMap = userNovel.getUserNovelAttractivePoints()
                 .stream()
-                .map(UserNovelAttractivePoint::getAttractivePoint)
+                .collect(Collectors.toMap(UserNovelAttractivePoint::getAttractivePoint, it -> it));
+
+        Set<AttractivePoint> requestedPoints = attractivePoints.stream()
+                .map(attractivePointService::getAttractivePointByString)
                 .collect(Collectors.toSet());
+
+        addUserNovelAttractivePoints(userNovel, currentPointMap, requestedPoints);
+        deleteUserNovelAttractivePoints(userNovel, currentPointMap, requestedPoints);
+    }
+
+    private void addUserNovelAttractivePoints(UserNovel userNovel,
+                                              Map<AttractivePoint, UserNovelAttractivePoint> currentPointMap,
+                                              Set<AttractivePoint> requestedPoints) {
+        for (AttractivePoint requested : requestedPoints) {
+            if (!currentPointMap.containsKey(requested)) {
+                userNovelAttractivePointRepository.save(UserNovelAttractivePoint.create(userNovel, requested));
+            }
+        }
+    }
+
+    private void deleteUserNovelAttractivePoints(UserNovel userNovel,
+                                                 Map<AttractivePoint, UserNovelAttractivePoint> currentPointMap,
+                                                 Set<AttractivePoint> requestedPoints) {
+        List<UserNovelAttractivePoint> toDelete = new ArrayList<>();
+        for (Map.Entry<AttractivePoint, UserNovelAttractivePoint> entry : currentPointMap.entrySet()) {
+            if (!requestedPoints.contains(entry.getKey())) {
+                toDelete.add(entry.getValue());
+            }
+        }
+        if (!toDelete.isEmpty()) {
+            userNovel.getUserNovelAttractivePoints().removeAll(toDelete);
+            userNovel.touch();
+        }
     }
 
-    private Set<Keyword> getPreviousKeywords(UserNovel userNovel) {
-        return userNovel.getUserNovelKeywords()
+    private void updateKeywords(UserNovel userNovel, List<Integer> keywordIds) {
+        Map<Keyword, UserNovelKeyword> currentKeywordMap = userNovel.getUserNovelKeywords()
                 .stream()
-                .map(UserNovelKeyword::getKeyword)
+                .collect(Collectors.toMap(UserNovelKeyword::getKeyword, it -> it));
+
+        Set<Keyword> requestedKeywords = keywordIds.stream()
+                .map(keywordService::getKeywordOrException)
                 .collect(Collectors.toSet());
+
+        addUserNovelKeywords(userNovel, currentKeywordMap, requestedKeywords);
+        deleteUserNovelKeywords(userNovel, currentKeywordMap, requestedKeywords);
     }
 
-    private void manageAttractivePoints(UserNovel userNovel, List<String> attractivePoints,
-                                        Set<AttractivePoint> previousAttractivePoints) {
-        for (String stringAttractivePoint : attractivePoints) {
-            AttractivePoint attractivePoint = attractivePointService.getAttractivePointByString(stringAttractivePoint);
-            if (previousAttractivePoints.contains(attractivePoint)) {
-                previousAttractivePoints.remove(attractivePoint);
-            } else {
-                userNovelAttractivePointRepository.save(UserNovelAttractivePoint.create(userNovel, attractivePoint));
+    private void addUserNovelKeywords(UserNovel userNovel,
+                                      Map<Keyword, UserNovelKeyword> currentKeywordMap,
+                                      Set<Keyword> requestedKeywords) {
+        for (Keyword requested : requestedKeywords) {
+            if (!currentKeywordMap.containsKey(requested)) {
+                userNovelKeywordRepository.save(UserNovelKeyword.create(userNovel, requested));
             }
         }
     }
 
-    private void manageKeywords(UserNovel userNovel, List<Integer> keywordIds, Set<Keyword> previousKeywords) {
-        for (Integer keywordId : keywordIds) {
-            Keyword keyword = keywordService.getKeywordOrException(keywordId);
-            if (previousKeywords.contains(keyword)) {
-                previousKeywords.remove(keyword);
-            } else {
-                userNovelKeywordRepository.save(UserNovelKeyword.create(userNovel, keyword));
+    private void deleteUserNovelKeywords(UserNovel userNovel,
+                                         Map<Keyword, UserNovelKeyword> currentKeywordMap,
+                                         Set<Keyword> requestedKeywords) {
+        List<UserNovelKeyword> toDelete = new ArrayList<>();
+        for (Map.Entry<Keyword, UserNovelKeyword> entry : currentKeywordMap.entrySet()) {
+            if (!requestedKeywords.contains(entry.getKey())) {
+                toDelete.add(entry.getValue());
             }
         }
+        if (!toDelete.isEmpty()) {
+            userNovel.getUserNovelKeywords().removeAll(toDelete);
+            userNovel.touch();
+        }
     }
 
     private void createUserNovelAttractivePoints(UserNovel userNovel, List<String> request) {
@@ -242,7 +277,7 @@ public UserNovelAndNovelsGetResponse getUserNovelsAndNovels(User visitor, Long o
                                                                 List<String> readStatuses,
                                                                 List<String> attractivePoints, Float novelRating,
                                                                 String query, Long lastUserNovelId, int size,
-                                                                String sortType) {
+                                                                String sortType, LocalDateTime updatedSince) {
         User owner = userService.getUserOrException(ownerId);
 
         if (isProfileInaccessible(visitor, ownerId, owner)) {
@@ -253,10 +288,10 @@ public UserNovelAndNovelsGetResponse getUserNovelsAndNovels(User visitor, Long o
         boolean isAscending = sortType.equalsIgnoreCase(SORT_TYPE_OLDEST);
 
         List<UserNovel> userNovels = userNovelRepository.findFilteredUserNovels(ownerId, isInterest, readStatuses,
-                attractivePoints, novelRating, query, lastUserNovelId, size, isAscending);
+                attractivePoints, novelRating, query, lastUserNovelId, size, isAscending, updatedSince);
 
         Long totalCount = userNovelRepository.countByUserIdAndFilters(ownerId, isInterest, readStatuses,
-                attractivePoints, novelRating, query);
+                attractivePoints, novelRating, query, updatedSince);
 
         boolean isLoadable = userNovels.size() == size;
 

Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,7 @@ public void onPreUpdate() {`
`35`	`35`	`this.modifiedDate = LocalDateTime.now();`
`36`	`36`	`}`
`37`	`37`
	`38`	`+ public void touch() {`
	`39`	`+ this.modifiedDate = LocalDateTime.now();`
	`40`	`+ }`
`38`	`41`	`}`