From f4cfc7494d21f38f1702f095f76b395ae5c5c874 Mon Sep 17 00:00:00 2001 From: Jeyong Date: Sun, 13 Apr 2025 19:44:07 +0900 Subject: [PATCH] =?UTF-8?q?[refactor]=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=20=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Record/dto/response/StudyLogResponse.java | 7 ++- .../domain/Record/service/RecordService.java | 54 +------------------ 2 files changed, 6 insertions(+), 55 deletions(-) diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/dto/response/StudyLogResponse.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/dto/response/StudyLogResponse.java index 4d6b6f1..c07406a 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/dto/response/StudyLogResponse.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/dto/response/StudyLogResponse.java @@ -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()); } } diff --git a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/service/RecordService.java b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/service/RecordService.java index 4c96ce9..fb3e914 100644 --- a/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/service/RecordService.java +++ b/MathCaptain/weakness/src/main/java/MathCaptain/weakness/domain/Record/service/RecordService.java @@ -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 getWeeklyGoalStatus(Users user, Group group, LocalDateTime weekStart) {