Skip to content
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

Jump to bottom

feat: 나의 수강중인 스터디 조회 API 추가 #656

Merged
merged 4 commits into from
Aug 21, 2024
Merged

feat: 나의 수강중인 스터디 조회 API 추가 #656

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa2b4f7
feat: 나의 수강중인 스터디 조회 api 추가
Sangwook02 Aug 20, 2024
f217b3b
fix: 진행중인 스터디만 취급하도록 수정
Sangwook02 Aug 20, 2024
a9cb3b1
resolve: merge conflict
Sangwook02 Aug 21, 2024
701b2fc
rename: 메서드 및 dto 이름 변경
Sangwook02 Aug 21, 2024
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
8 changes: 8 additions & 0 deletions src/main/java/com/gdschongik/gdsc/domain/study/api/StudentStudyController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.gdschongik.gdsc.domain.study.application.StudentStudyService;
import com.gdschongik.gdsc.domain.study.dto.request.StudyAttendCreateRequest;
import com.gdschongik.gdsc.domain.study.dto.response.StudentOngoingStudyResponse;
import com.gdschongik.gdsc.domain.study.dto.response.StudyResponse;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
Expand Down Expand Up @@ -53,4 +54,11 @@ public ResponseEntity<Void> attend(
studentStudyService.attend(studyDetailId, request);
return ResponseEntity.ok().build();
}

@Operation(summary = "내 수강중인 스터디 조회", description = "나의 수강 중인 스터디를 조회합니다.")
@GetMapping("/me/ongoing")
public ResponseEntity<StudentOngoingStudyResponse> getMyOngoingStudy() {
StudentOngoingStudyResponse response = studentStudyService.getMyOngoingStudy();
return ResponseEntity.ok(response);
}
}
11 changes: 11 additions & 0 deletions src/main/java/com/gdschongik/gdsc/domain/study/application/StudentStudyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@
import com.gdschongik.gdsc.domain.study.domain.Attendance;
import com.gdschongik.gdsc.domain.study.domain.AttendanceValidator;
import com.gdschongik.gdsc.domain.study.dto.request.StudyAttendCreateRequest;
import com.gdschongik.gdsc.domain.study.dto.response.StudentOngoingStudyResponse;
import com.gdschongik.gdsc.domain.study.dto.response.StudyResponse;
import com.gdschongik.gdsc.global.exception.CustomException;
import com.gdschongik.gdsc.global.util.MemberUtil;
import java.time.LocalDate;
import java.util.List;
import java.util.Optional;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
Expand Down Expand Up @@ -90,4 +92,13 @@ public void attend(Long studyDetailId, StudyAttendCreateRequest request) {

log.info("[StudyService] 스터디 출석: attendanceId={}", attendance.getId());
}

@Transactional(readOnly = true)
public StudentOngoingStudyResponse getMyOngoingStudy() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ongoing은 현재 진행중인 이라는 뜻이 있어서, 내가 '수강중인' 스터디라는 맥락을 드러내기엔 부적합한 것 같습니다.
그냥 getMyCurrentStudy 나 getMyEnrolledStudy 가 적절할듯 하네요

Member currentMember = memberUtil.getCurrentMember();
Optional<StudyHistory> studyHistory = studyHistoryRepository.findAllByMentee(currentMember).stream()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

마이너하긴 한데 여기서 orElse(null)까지 끌고가는게 의미적으로 더 낫지 않을까 싶네요
파라미터에서 로직을 수행하는 건 한 라인에 두 가지 일을 수행하는 거라 별로라서요

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

그렇네요
굳이 파라미터에서 할 필요없겠어요

수정 후 반영했습니다~

.filter(s -> s.getStudy().isStudyOngoing())
.findFirst();
return StudentOngoingStudyResponse.from(studyHistory.orElse(null));
}
}
12 changes: 12 additions & 0 deletions src/main/java/com/gdschongik/gdsc/domain/study/dto/response/StudentOngoingStudyResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.gdschongik.gdsc.domain.study.dto.response;

import com.gdschongik.gdsc.domain.study.domain.StudyHistory;

public record StudentOngoingStudyResponse(Long studyId) {
public static StudentOngoingStudyResponse from(StudyHistory studyHistory) {
if (studyHistory == null) {
return new StudentOngoingStudyResponse(null);
}
return new StudentOngoingStudyResponse(studyHistory.getStudy().getId());
}
}