Merge pull request #105 from Nexters/dev

Author: Jeongminyooa

src/main/java/donmani/donmani_server/feedback/service/FeedbackService.java

@@ -88,10 +88,7 @@ public Boolean isNotOpenedFeedback(String userKey) {
 		}
 
 		// 3. 이미 12개를 모두 열었다면 isNotOpened를 false로
-		LocalDateTime start = YearMonth.now(ZoneId.of("Asia/Seoul")).atDay(1).atStartOfDay();
-		LocalDateTime end = start.plusMonths(1).minusNanos(1); // 23:59:59.999999999
-
-		List<UserItem> acquiredItems = userItemRepository.findByUserAndAcquiredAtBetweenOrderByAcquiredAtDesc(user, start, end);
+		List<UserItem> acquiredItems = userItemRepository.findAllByUser(user);
 
 		if(acquiredItems.size() == 12) {
 			return false;

src/main/java/donmani/donmani_server/reward/repository/UserItemRepository.java

@@ -11,17 +11,6 @@
 import java.util.Optional;
 
 public interface UserItemRepository extends JpaRepository<UserItem, Long> {
-
-    @Query("SELECT ui FROM UserItem ui " +
-            "WHERE ui.user = :user " +
-            "AND ui.acquiredAt BETWEEN :start AND :end " +
-            "ORDER BY ui.acquiredAt DESC")
-    List<UserItem> findByUserAndAcquiredAtBetweenOrderByAcquiredAtDesc(
-            @Param("user") User user,
-            @Param("start") LocalDateTime start,
-            @Param("end") LocalDateTime end
-    );
-
     @Query("SELECT ui FROM UserItem ui " +
             "WHERE ui.user = :user " +
             "ORDER BY ui.acquiredAt DESC")
@@ -36,6 +25,11 @@ List<UserItem> findByUserNotOpened(
             @Param("user") User user
     );
 
+    @Query("SELECT ui FROM UserItem ui " +
+            "WHERE ui.user = :user ")
+    List<UserItem> findAllByUser(
+            @Param("user") User user
+    );
 
     @Query("SELECT ui FROM UserItem ui " +
             "JOIN ui.item i " +

src/main/java/donmani/donmani_server/reward/service/RewardService.java

@@ -42,7 +42,7 @@ public class RewardService {
     public void acquireRandomItems(String userKey, LocalDate reqDate) {
         User user = userRepository.findByUserKey(userKey).orElseThrow(() -> new RuntimeException("USER NOT FOUND"));
 
-        List<UserItem> acquiredItems = userItemRepository.findByUserNotOpened(user);
+        List<UserItem> acquiredItems = userItemRepository.findAllByUser(user);
         Set<Long> acquiredItemIds = acquiredItems.stream()
                 .map(userItem -> userItem.getItem().getId())
                 .collect(Collectors.toSet());
@@ -120,7 +120,7 @@ public List<RewardItemResponseDTO> openItems(String userKey) {
     }
 
     private void acquireHiddenItems(User user) {
-        List<UserItem> acquiredItems = userItemRepository.findByUserOrderByAcquiredAtDesc(user);
+        List<UserItem> acquiredItems = userItemRepository.findAllByUser(user);
         if(acquiredItems.size() == MAX_REWARD) {
             RewardItem hiddenItem = rewardItemRepository.findFirstByHiddenTrue().orElseThrow();
             UserItem newUserItem = UserItem.builder()
@@ -134,7 +134,7 @@ private void acquireHiddenItems(User user) {
     }
 
     /**
-     * 꾸미기 탭 접속하여 아이템 리스트 조회 (해당월)
+     * 꾸미기 탭 접속하여 아이템 리스트 조회
      * 전체 아이템 및 획득 아이템 표시
      * @param userKey
      * @return