Skip to content

Commit 9d0ed76

Browse files
authored
{fix} 목표 수행 기록 오류 수정
{fix} 목표 수행 기록 오류 수정
2 parents 7b73cea + 4ac0c35 commit 9d0ed76

3 files changed

Lines changed: 9 additions & 10 deletions

File tree

MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/dto/response/recordSummaryResponseDto.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class recordSummaryResponseDto {
3131
private int remainingWeeklyGoalDays;
3232

3333
// 사용자가 설정한 일간 목표
34-
private int personalDailyGoal;
34+
private Long personalDailyGoal;
3535

3636
// 사용자가 설정한 주간 목표
3737
private int personalWeeklyGoal;

MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/entity/ActivityRecord.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ public class ActivityRecord {
4848

4949
private DayOfWeek dayOfWeek; // 요일
5050

51-
@PrePersist
52-
public void prePersist() {
53-
this.dailyGoalAchieved = false;
54-
this.weeklyGoalAchieved = false;
55-
this.durationInMinutes = 0L;
56-
}
51+
// @PrePersist
52+
// public void prePersist() {
53+
// this.dailyGoalAchieved = false;
54+
// this.weeklyGoalAchieved = false;
55+
// this.durationInMinutes = 0L;
56+
// }
5757

5858
public void updateEndTime(LocalDateTime endTime) {
5959
this.endTime = endTime;

MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/service/RecordService.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class RecordService {
3737
// 기록 저장
3838
public recordSummaryResponseDto endActivity(Users user, Long groupId, recordEndRequestDto endRequest) {
3939

40-
// 사용자 식별
40+
// 관계 식별
4141
RelationBetweenUserAndGroup relation = relationRepository.findByMemberAndGroup_Id(user, groupId)
4242
.orElseThrow(() -> new IllegalArgumentException("해당 관계가 존재하지 않습니다."));
4343

@@ -55,7 +55,6 @@ public recordSummaryResponseDto endActivity(Users user, Long groupId, recordEndR
5555
}
5656

5757
// 주간 목표 달성 여부 조회
58-
5958
public Map<DayOfWeek, Boolean> getWeeklyGoalStatus(Users user, Group group, LocalDateTime weekStart) {
6059
// 주의 시작과 끝 계산 (월요일 ~ 다음 주 월요일)
6160
LocalDateTime startOfWeek = calculateStartOfWeek(weekStart);
@@ -177,7 +176,7 @@ private recordSummaryResponseDto buildRecordSummaryResponseDto(ActivityRecord ac
177176
.weeklyGoalAchieved(activityRecord.isWeeklyGoalAchieved())
178177
.remainingDailyGoalMinutes(remainingDailyGoalMinutes)
179178
.remainingWeeklyGoalDays(remainingWeeklyGoal)
180-
.personalDailyGoal(relation.getPersonalDailyGoal())
179+
.personalDailyGoal(relation.getPersonalDailyGoal() * 60L)
181180
.personalWeeklyGoal(relation.getPersonalWeeklyGoal())
182181
.build();
183182
}

0 commit comments

Comments
 (0)