Merge pull request #123 from Nexters/fix-96

[fix] 리워드 레드돗 로직 수정

Author: k906506

.github/workflows/cd.yml

@@ -51,7 +51,7 @@ jobs:
 
       #test를 제외한 프로젝트 빌드
       - name: Build With Gradle
-        run: ./gradlew build -x test
+        run: ./gradlew clean build -x test --no-build-cache
 
       - name: Set up Docker Build
         uses: docker/setup-buildx-action@v2

.github/workflows/ci.yml

@@ -45,17 +45,6 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
-      # Gradle 캐싱
-      - name: Gradle Caching
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-
       # CI
       - name: Grant Execute Permission For Gradlew
         run: chmod +x gradlew
@@ -71,13 +60,15 @@ jobs:
           echo "${{ secrets.PROPERTIES_TEST }}" > ./application-test.properties
         shell: bash
 
+      - name: Show dependencies
+        run: ./gradlew dependencies --configuration runtimeClasspath
+
       # 테스트를 제외한 프로젝트 빌드
       - name: Build With Gradle
-        run: ./gradlew build -x test
+        run: ./gradlew clean build -x test --no-build-cache
 
-      # 테스트 실행
       - name: Build With Test
-        run: ./gradlew test
+        run: ./gradlew test --no-build-cache
 
       # 테스트 결과 파일 생성
       - name: Publish Unit Test Results

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

@@ -139,31 +139,6 @@ private List<RecordDTO> expenseToDto(List<Expense> expenses, boolean sortedDesc)
 				.sorted(sortedDesc ? Comparator.comparing(RecordDTO::getDate).reversed() : Comparator.comparing(RecordDTO::getDate))
 				.collect(Collectors.toList());
 	}
-	// 미사용
-	@Transactional(readOnly = true)
-	public ExpenseResponseDTO getAllExpenses(String userKey, int page) {
-		Long userId = userService.getUserIdByUserKey(userKey);
-
-		if (userId == null) {
-			throw new EntityNotFoundException("유저 정보를 찾을 수 없습니다.");
-		}
-
-		// 시간순 정렬 20개
-		Page<LocalDateTime> localDateTimes = expenseRepository.findDistinctCreatedAt(userId, PageRequest.of(page, SIZE));
-		if (localDateTimes.isEmpty()) {
-			return ExpenseResponseDTO.builder()
-					.userKey(userKey)
-					.records(null)
-					.build();
-		}
-
-		List<Expense> expenses = expenseRepository.findByCreatedAtIn(userId, localDateTimes.getContent());
-
-		return ExpenseResponseDTO.builder()
-				.userKey(userKey)
-				.records(expenseToDto(expenses, true))
-				.build();
-	}
 
 	@Transactional(readOnly = true)
 	public ExpenseSummaryDTO getYearlyExpenseSummary(String userKey, int year) {
@@ -256,7 +231,7 @@ public Integer getTotalExpensesCount(String userKey) {
 
 		// 오늘 기록된 소비 확인
 		// ver 2.0.0 이후로 기록된 소비만
-		LocalDateTime baseTime = LocalDateTime.of(2025, 5, 26, 0, 0);  // 2025-05-30 00:00
+		LocalDateTime baseTime = LocalDateTime.of(2025, 7, 18, 0, 0);  // 2025-07-18 00:00
 
 		List<LocalDateTime> createdAts = expenseRepository.findTotalExpensesCount(user.getId());
 
@@ -267,8 +242,4 @@ public Integer getTotalExpensesCount(String userKey) {
 
 		return createdAts == null || createdAts.isEmpty() ? 0 : createdAts.size();
 	}
-
-	public Expense getExpense(Long id) {
-		return expenseRepository.findExpenseById(id);
-	}
 }

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

@@ -1,12 +1,10 @@
 package donmani.donmani_server.feedback.service;
 
 import java.time.LocalDateTime;
-import java.time.YearMonth;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Random;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 import donmani.donmani_server.expense.entity.CategoryType;
@@ -18,15 +16,13 @@
 
 import donmani.donmani_server.expense.dto.ExpenseRequestDTO;
 import donmani.donmani_server.expense.entity.Expense;
-import donmani.donmani_server.expense.service.ExpenseService;
 import donmani.donmani_server.feedback.dto.FeedbackOpenResponseDTO;
 import donmani.donmani_server.feedback.provider.FeedbackTemplate;
 import donmani.donmani_server.feedback.provider.FeedbackTemplateProvider;
 import donmani.donmani_server.user.entity.User;
 import donmani.donmani_server.user.service.UserService;
 import donmani.donmani_server.feedback.entity.Feedback;
 import donmani.donmani_server.feedback.repository.FeedbackRepository;
-import jakarta.persistence.EntityNotFoundException;
 import lombok.RequiredArgsConstructor;
 
 @Service
@@ -49,7 +45,7 @@ public void addFeedback(ExpenseRequestDTO requestDTO) {
 		// 오늘 기록된 소비 확인
 		// ver 2.0.0 이후로 기록된 소비만
 		LocalDateTime createdAt = requestDTO.getRecords().get(0).getDate().atStartOfDay(); // 실제 생성일자말고 사용자가 기록하려는 일자
-		LocalDateTime baseTime = LocalDateTime.of(2025, 5, 26, 0, 0);  // 2025-05-30 00:00
+		LocalDateTime baseTime = LocalDateTime.of(2025, 7, 18, 0, 0);  // 2025-07-18 00:00
 
 		// 획득한 피드백 카드가 12개 이상 -> 피드백 카드를 생성하지 않음
 		List<Feedback> feedbacks = feedbackRepository.findFeedbacksByUserId(user.getId());

src/main/java/donmani/donmani_server/user/controller/UserController.java

@@ -128,9 +128,10 @@ public ResponseEntity<RewardCheckDTO> getRewardCheckedStatus(@PathVariable Strin
 		return ResponseEntity.ok(rewardStatus);
 	}
 
+	// 미사용 추후 삭제
 	@PutMapping("api/v1/reward/status/{userKey}")
 	public ResponseEntity<Void> markRewardAsChecked(@PathVariable String userKey) {
-		userService.markRewardAsChecked(userKey);
+
 		return ResponseEntity.ok().build();
 	}
 }

src/main/java/donmani/donmani_server/user/entity/User.java

@@ -46,7 +46,9 @@ public class User {
 
 	private boolean isNoticeEnable;
 
+	// 미사용
 	private boolean isRewardChecked;
+
 	/*
 	 - 2025.05.25
 	 - feedback 양방향 연관 관계 추가

src/main/java/donmani/donmani_server/user/service/UserService.java

@@ -2,10 +2,13 @@
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.util.List;
 import java.util.Optional;
 
 import donmani.donmani_server.expense.dto.NoticeReadDTO;
 import donmani.donmani_server.reward.dto.RewardCheckDTO;
+import donmani.donmani_server.reward.entity.UserItem;
+import donmani.donmani_server.reward.repository.UserItemRepository;
 import donmani.donmani_server.user.dto.UserRegisterResponseDTO;
 import donmani.donmani_server.user.dto.UpdateUsernameResponseDTO;
 import donmani.donmani_server.user.dto.UserRegisterResponseDTOV1;
@@ -22,6 +25,7 @@
 public class UserService {
 
 	private final UserRepository userRepository;
+	private final UserItemRepository userItemRepository;
 
 	@Transactional
 	public UserRegisterResponseDTO registerUser(String userKey) {
@@ -161,25 +165,19 @@ public User getUser(String userKey) {
 		return user;
 	}
 
-
-	@Transactional
-	public void markRewardAsChecked(String userKey) {
-		LocalDateTime localDateTime = LocalDateTime.now(ZoneId.of("Asia/Seoul"));
-
+	@Transactional(readOnly = true)
+	public RewardCheckDTO getRewardCheckedStatus(String userKey) {
 		User user = userRepository.findByUserKey(userKey)
 				.orElseThrow(() -> new IllegalArgumentException("User not found"));
 
-		user.setRewardChecked(true); // 공지사항 읽음 처리
-		user.setUpdateDate(localDateTime);
+		ZoneId zoneId = ZoneId.of("Asia/Seoul");
+		LocalDateTime threeDaysAgo = LocalDateTime.now(zoneId).minusDays(3);
 
-		userRepository.save(user);
-	}
+		List<UserItem> acquiredItems = userItemRepository.findByUserOrderByAcquiredAtDesc(user);
 
-	@Transactional(readOnly = true)
-	public RewardCheckDTO getRewardCheckedStatus(String userKey) {
-		User user = userRepository.findByUserKey(userKey)
-				.orElseThrow(() -> new IllegalArgumentException("User not found"));
+		boolean isRewardChecked = acquiredItems.stream()
+				.anyMatch(item -> item.getAcquiredAt().isAfter(threeDaysAgo));
 
-		return RewardCheckDTO.builder().checked(user.isRewardChecked()).build(); // 읽음 여부 반환
+		return RewardCheckDTO.builder().checked(isRewardChecked).build();
 	}
 }