Merge pull request #109 from Nexters/dev

Dev

Author: k906506

src/main/java/donmani/donmani_server/expense/dto/ExpenseResponseDTO.java

@@ -19,4 +19,5 @@ public class ExpenseResponseDTO {
 	private List<RecordDTO> records;
 	private List<RewardItemResponseDTO> saveItems;
 	private boolean hasNotOpenedRewards;
+	private Integer totalExpensesCount;
 }

src/main/java/donmani/donmani_server/expense/service/ExpenseService.java

@@ -95,12 +95,16 @@ public ExpenseResponseDTO getExpenses(String userKey, int year, int month, boole
 		// 오픈하지 않은 선물 여부 확인
 		boolean hasNotOpenedRewards = rewardService.hasNotOpenedRewards(userKey);
 
+		// 현재 기록 개수 확인
+		Integer totalExpensesCount = getTotalExpensesCount(userKey);
+
 		if(expenses.isEmpty()) {
 			return ExpenseResponseDTO.builder()
 					.userKey(userKey)
 					.records(null)
 					.saveItems(rewardService.getSavedItem(userKey, year, month))
 					.hasNotOpenedRewards(hasNotOpenedRewards)
+					.totalExpensesCount(totalExpensesCount)
 					.build();
 		}
 
@@ -109,6 +113,7 @@ public ExpenseResponseDTO getExpenses(String userKey, int year, int month, boole
 			.records(expenseToDto(expenses, sortedDesc))
 			.saveItems(rewardService.getSavedItem(userKey, year, month))
 			.hasNotOpenedRewards(hasNotOpenedRewards)
+			.totalExpensesCount(totalExpensesCount)
 			.build();
 	}
 

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

@@ -88,7 +88,7 @@ public Boolean isNotOpenedFeedback(String userKey) {
 		}
 
 		// 3. 이미 12개를 모두 열었다면 isNotOpened를 false로
-		List<UserItem> acquiredItems = userItemRepository.findAllByUser(user);
+		List<UserItem> acquiredItems = userItemRepository.findByUserOrderByAcquiredAtDesc(user);
 
 		if(acquiredItems.size() == 12) {
 			return false;

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

@@ -13,6 +13,7 @@
 public interface UserItemRepository extends JpaRepository<UserItem, Long> {
     @Query("SELECT ui FROM UserItem ui " +
             "WHERE ui.user = :user " +
+            "AND ui.isOpened = true " +
             "ORDER BY ui.acquiredAt DESC")
     List<UserItem> findByUserOrderByAcquiredAtDesc(
             @Param("user") User user