FIX: update focus logic

Author: singsangssong

src/main/java/com/studioedge/focus_to_levelup_server/domain/attendance/service/AttendanceService.java

@@ -131,8 +131,8 @@ private int calculateReward(int dayOfCycle, Member member) {
         int reward = cycleReward.getReward();
 
         // VIP 2배 적용
-        if (isVipMember(member)) {
-            reward *= 2;
+        if (isVipMember(member) && cycleReward.equals(AttendanceCycleReward.DAY_7)) {
+            reward += 200;
         }
         return reward;
     }

src/main/java/com/studioedge/focus_to_levelup_server/domain/focus/dao/DailyGoalRepository.java

@@ -16,6 +16,8 @@ interface MonthlyFocusStat {
         Integer getTotalSeconds();
     }
 
+    Optional<DailyGoal> findFirstByMemberIdOrderByDailyGoalDateDesc(Long memberId);
+
     /**
      * 특정 유저의 특정 날짜 DailyGoal 조회
      */

src/main/java/com/studioedge/focus_to_levelup_server/domain/focus/dto/request/CreateDailyGoalRequest.java

@@ -19,7 +19,7 @@ public static DailyGoal from(Member member, CreateDailyGoalRequest request,
         return DailyGoal.builder()
                 .member(member)
                 .targetMinutes(request.targetMinutes())
-                .serviceDate(serviceDate)
+                .dailyGoalDate(serviceDate)
                 .build();
     }
 }

src/main/java/com/studioedge/focus_to_levelup_server/domain/focus/dto/request/SaveFocusRequestV2.java

@@ -19,9 +19,9 @@ public record SaveFocusRequestV2 (
         Integer maxConsecutiveSeconds,
         @NotNull(message = "집중 시작 시각은 필수입니다.")
         @Schema(description = "집중 시작 시각 (ISO 8601, UTC 또는 로컬 시간)", example = "2025-11-19T14:30:00")
-        LocalDateTime startTime,
+        LocalDateTime startTime, // x
         @NotNull(message = "일일 목표 pk는 필수입니다..")
         @Schema(description = "일일 목표 pk", example = "3")
-        Long dailyGoalId
-){
+        Long dailyGoalId // x
+) {
 }

src/main/java/com/studioedge/focus_to_levelup_server/domain/focus/dto/response/GetDailyGoalResponse.java

@@ -21,29 +21,6 @@ public record GetDailyGoalResponse (
         @Schema(description = "일일 목표 수령 여부", example = "false")
         Boolean isReceived
 ) {
-//    public static GetDailyGoalResponse of(DailyGoal dailyGoal) {
-//        float rewardMultiplier = dailyGoal.getRewardMultiplier();
-//        int currentMinutes = dailyGoal.getCurrentSeconds() / 60;
-//
-//        if (currentMinutes < dailyGoal.getTargetMinutes()) {
-//            float exponent = (float) ((currentMinutes / 60.0) - 2.0);
-//            rewardMultiplier = (float) Math.pow(1.1, Math.max(0.0, exponent));
-//            // 소수점 2째자리까지
-//            rewardMultiplier = (float) (Math.round(rewardMultiplier * 100) / 100.0);
-//        }
-//
-//        int bonusExp = (int) (currentMinutes * rewardMultiplier);
-//
-//        return GetDailyGoalResponse.builder()
-//                .dailyGoalId(dailyGoal.getId())
-//                .currentSeconds(dailyGoal.getCurrentSeconds())
-//                .targetMinutes(dailyGoal.getTargetMinutes())
-//                .rewardMultiplier(rewardMultiplier)
-//                .bonusExp(bonusExp)
-//                .levelUp(bonusExp / 600)
-//                .build();
-//    }
-
     public static GetDailyGoalResponse of(DailyGoal dailyGoal) {
         int currentMinutes = dailyGoal.getCurrentSeconds() / 60;
         int targetMinutes = dailyGoal.getTargetMinutes();

src/main/java/com/studioedge/focus_to_levelup_server/domain/focus/entity/DailyGoal.java

@@ -71,10 +71,10 @@ public class DailyGoal extends BaseEntity {
     private LocalTime latestEndTime; // 가장 늦은 종료 시간(아이템 확인용)
 
     @Builder
-    public DailyGoal(Member member, Integer targetMinutes, LocalDate serviceDate) {
+    public DailyGoal(Member member, Integer targetMinutes, LocalDate dailyGoalDate) {
         this.member = member;
         this.targetMinutes = targetMinutes;
-        this.dailyGoalDate = serviceDate;
+        this.dailyGoalDate = dailyGoalDate;
 
         float exponent = (float) ((targetMinutes / 60.0) - 2.0);
         float rewardMultiplier = (float) Math.pow(1.1, Math.max(0.0, exponent));

src/main/java/com/studioedge/focus_to_levelup_server/domain/focus/service/FocusServiceV2.java

@@ -38,8 +38,6 @@
 import java.time.LocalTime;
 import java.util.List;
 
-import static com.studioedge.focus_to_levelup_server.global.common.AppConstants.getServiceDate;
-
 @Service
 @RequiredArgsConstructor
 public class FocusServiceV2 {
@@ -87,16 +85,15 @@ public void saveFocus(Member m, Long subjectId, SaveFocusRequestV2 request) {
 
         int focusMinutes = savedFocusSeconds / 60;
         int remainSeconds = savedFocusSeconds % 60;
-        LocalDate serviceDate = getServiceDate(startTime);
 
         Member member = memberRepository.findById(m.getId())
                 .orElseThrow(MemberNotFoundException::new);
         MemberInfo memberInfo = memberInfoRepository.findByMemberId(m.getId())
                 .orElseThrow(InvalidMemberException::new);
-
-        DailyGoal dailyGoal = dailyGoalRepository.findByMemberIdAndDailyGoalDate(member.getId(), serviceDate)
+        DailyGoal dailyGoal = dailyGoalRepository.findFirstByMemberIdOrderByDailyGoalDateDesc(member.getId())
                 .orElseThrow(DailyGoalNotFoundException::new);
-        Subject subject = this.subjectRepository.findByIdAndDeleteAtIsNull(subjectId)
+        LocalDate serviceDate = dailyGoal.getDailyGoalDate();
+        Subject subject = subjectRepository.findByIdAndDeleteAtIsNull(subjectId)
                 .orElseThrow(SubjectNotFoundException::new);
         MemberCharacter memberCharacter = memberCharacterRepository.findByMemberIdAndIsDefault(m.getId(), true)
                 .orElseThrow(CharacterDefaultNotFoundException::new);