Skip to content

[refactor] 사용자 로그 관련 코드 리팩토링 #52

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
JayongLee merged 1 commit into from
Apr 13, 2025
Merged

[refactor] 사용자 로그 관련 코드 리팩토링 #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions ...kness/src/main/java/MathCaptain/weakness/domain/Record/dto/response/StudyLogResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,23 @@ public class StudyLogResponse {

private Long activityId;

private Long duration;

private String subject;

private String date;

private String memo;

private StudyLogResponse(Long activityId, String subject, String date, String memo) {
private StudyLogResponse(Long activityId, Long duration, String subject, String date, String memo) {
this.activityId = activityId;
this.subject = subject;
this.duration = duration;
this.date = date;
this.memo = memo;
}

public static StudyLogResponse of(StudyDetail studyDetail) {
return new StudyLogResponse(studyDetail.getActivityId(), studyDetail.getSubject(), studyDetail.getDate().toString(), studyDetail.getMemo());
return new StudyLogResponse(studyDetail.getActivityId(), studyDetail.getDuration(), studyDetail.getSubject(), studyDetail.getDate().toString(), studyDetail.getMemo());
}
}
54 changes: 1 addition & 53 deletions ...tain/weakness/src/main/java/MathCaptain/weakness/domain/Record/service/RecordService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,63 +80,11 @@ private RecordSummaryResponse createRecordSummaryResponse(
studyLogResponse = activityDetailService.enrollStudyLog(activityId, (StudyLogEnrollRequest) logRequest);
break;
default:
throw new IllegalArgumentException("Unsupported activity type: " + activityType);
throw new IllegalArgumentException("지원되지 않는 인증 타입입니다: " + activityType);
}

return RecordSummaryResponse.of(record, relation, fitnessLogResponse, runningLogResponse, studyLogResponse);
}
//
// public RecordSummaryResponse endFitnessActivity(Users user, Long groupId, FitnessLogEnrollRequest logRequest) {
// // 활동 기록 저장
// RelationBetweenUserAndGroup relation = findRelationByMemberAndGroup(user, groupId);
// DayOfWeek nowDay = LocalDate.now().getDayOfWeek();
//
// LocalDateTime startTime = logRequest.getStartTime();
// LocalDateTime endTime = logRequest.getEndTime();
// Long duration = logRequest.getActivityTime();
//
// ActivityRecord record = ActivityRecord.of(relation, nowDay, startTime, endTime, duration);
// updateGoalAchieve(relation, record, nowDay);
// Long activityId = recordRepository.save(record).getId();
//
// // 피트니스 로그 저장
// FitnessLogResponse fitnessLogResponse = activityDetailService.enrollFitnessLog(activityId, logRequest);
// return RecordSummaryResponse.of(record, relation, fitnessLogResponse, null, null);
// }
//
// public RecordSummaryResponse endRunningActivity(Users user, Long groupId, RunningLogEnrollRequest logRequest) {
// // 활동 기록 저장
// RelationBetweenUserAndGroup relation = findRelationByMemberAndGroup(user, groupId);
// DayOfWeek nowDay = LocalDate.now().getDayOfWeek();
// LocalDateTime startTime = logRequest.getStartTime();
// LocalDateTime endTime = logRequest.getEndTime();
// Long duration = logRequest.getActivityTime();
//
// ActivityRecord record = ActivityRecord.of(relation, nowDay, startTime, endTime, duration);
// updateGoalAchieve(relation, record, nowDay);
// Long activityId = recordRepository.save(record).getId();
//
// // 러닝 로그 저장
// RunningLogResponse runningLogResponse = activityDetailService.enrollRunningLog(activityId, logRequest);
// return RecordSummaryResponse.of(record, relation, null, runningLogResponse, null);
// }
//
// public RecordSummaryResponse endStudyActivity(Users user, Long groupId, StudyLogEnrollRequest logRequest) {
// // 활동 기록 저장
// RelationBetweenUserAndGroup relation = findRelationByMemberAndGroup(user, groupId);
// DayOfWeek nowDay = LocalDate.now().getDayOfWeek();
// LocalDateTime startTime = logRequest.getStartTime();
// LocalDateTime endTime = logRequest.getEndTime();
// Long duration = logRequest.getActivityTime();
//
// ActivityRecord record = ActivityRecord.of(relation, nowDay, startTime, endTime, duration);
// updateGoalAchieve(relation, record, nowDay);
// Long activityId = recordRepository.save(record).getId();
//
// // 스터디 로그 저장
// StudyLogResponse studyLogResponse = activityDetailService.enrollStudyLog(activityId, logRequest);
// return RecordSummaryResponse.of(record, relation, null, null, studyLogResponse);
// }

// 주간 목표 달성 여부 조회
public Map<DayOfWeek, Boolean> getWeeklyGoalStatus(Users user, Group group, LocalDateTime weekStart) {
Expand Down