Merge pull request #80 from Nexters/dev

Dev

Author: k906506

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

@@ -18,4 +18,5 @@ public class ExpenseResponseDTO {
 	private String userKey;
 	private List<RecordDTO> records;
 	private List<RewardItemResponseDTO> saveItems;
+	private boolean hasNotOpenedRewards;
 }

src/main/java/donmani/donmani_server/expense/repository/ExpenseRepository.java

@@ -28,7 +28,7 @@ public interface ExpenseRepository extends JpaRepository<Expense, Long> {
 	Expense findExpenseByUserIdAndAndCreatedAt(Long userId, LocalDateTime date);
 
 	// @Query("SELECT DISTINCT e.createdAt FROM Expense e WHERE DATE_FORMAT(e.createdAt, '%Y%m%d') >= DATE_FORMAT('20250525', '%Y%m%d') AND e.userId = :userId")
-	@Query("SELECT DISTINCT e.createdAt FROM Expense e WHERE e.userId = :userId")
+	@Query("SELECT DISTINCT e.createdAt FROM Expense e JOIN Feedback f ON e.feedback.id = f.id WHERE e.userId = :userId")
 	List<LocalDateTime> findTotalExpensesCount(Long userId);
 
 	Expense findExpenseById(Long id);

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

@@ -81,7 +81,7 @@ public void addExpense(ExpenseRequestDTO request) {
 	}
 
 
-	@Transactional(readOnly = true)
+	@Transactional
 	public ExpenseResponseDTO getExpenses(String userKey, int year, int month, boolean sortedDesc) {
 		Long userId = userService.getUserIdByUserKey(userKey);
 
@@ -92,17 +92,22 @@ public ExpenseResponseDTO getExpenses(String userKey, int year, int month, boole
 		// userId와 year, month로 직접 expense를 조회
 		List<Expense> expenses = expenseRepository.findByUserIdAndMonth(userId, year, month);
 
+		// 오픈하지 않은 선물 여부 확인
+		boolean hasNotOpenedRewards = rewardService.hasNotOpenedRewards(userKey);
+
 		if(expenses.isEmpty()) {
 			return ExpenseResponseDTO.builder()
 					.userKey(userKey)
 					.records(null)
+					.hasNotOpenedRewards(hasNotOpenedRewards)
 					.build();
 		}
 
 		return ExpenseResponseDTO.builder()
 			.userKey(userKey)
 			.records(expenseToDto(expenses, sortedDesc))
-				.saveItems(rewardService.getSavedItem(userKey, year, month))
+			.saveItems(rewardService.getSavedItem(userKey, year, month))
+			.hasNotOpenedRewards(hasNotOpenedRewards)
 			.build();
 	}
 

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

@@ -324,4 +324,22 @@ private UserItem makeUserItem(User user, RewardItem item) {
                 .acquiredAt(LocalDateTime.now())
                 .isOpened(true).build();
     }
+
+    /**
+     * 오픈하지 않은 선물 여부 확인
+     * @param userKey
+     * @return boolean
+     */
+    @Transactional(readOnly = true)
+    public boolean hasNotOpenedRewards(String userKey) {
+        User user = userRepository.findByUserKey(userKey)
+            .orElseThrow(() -> new RuntimeException("USER NOT FOUND"));
+
+        LocalDateTime start = YearMonth.now().atDay(1).atStartOfDay();
+        LocalDateTime end = start.plusMonths(1).minusNanos(1); // 23:59:59.999999999
+
+        List<UserItem> notOpenedItems = userItemRepository.findByUserAndAcquiredAtBetweenAndNotOpened(user, start, end);
+
+        return notOpenedItems == null || notOpenedItems.isEmpty() ? false : true;
+    }
 }