Skip to content

[CI/CD] dev 브랜치 최신화 반영하여 배포 #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dainnida merged 2 commits into from
Feb 24, 2025
Merged

[CI/CD] dev 브랜치 최신화 반영하여 배포 #113

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c9a226
[#109] Fix: 타이머 정책 변경사항 반영
dainnida Feb 24, 2025
409d1d8
[Fix] 타이머 정책 변경사항 반영
dainnida Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/main/java/com/cmc/mercury/domain/timer/service/TimerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ public class TimerService {
private final HabitHistoryRepository habitHistoryRepository;
private final MyPageService myPageService;

private static final int MIN_EXP_MINUTES = 5;
private static final int MAX_EXP_MINUTES = 25;
private static final int DAILY_EXP_LIMIT = 120;
private static final int MAX_EXP_SECONDS = 1800;
private static final int DAILY_EXP_LIMIT = 180;


@Transactional
Expand Down Expand Up @@ -80,11 +79,10 @@ public TimerListResponse getTimerList(User user) {

// 타이머 기록 시간에 따라 경험치 계산
private int calculateExp(int seconds) {
int minutes = seconds / 60;
int exp = seconds / 10;

if (minutes < MIN_EXP_MINUTES) return 0;
if (minutes > MAX_EXP_MINUTES) return 25;
return minutes;
if (exp > MAX_EXP_SECONDS) return DAILY_EXP_LIMIT;
return exp;
}

// 오늘 획득한 총 경험치 계산
Expand Down