-
Notifications
You must be signed in to change notification settings - Fork 1
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.
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
feat: 과제 조회 API 추가 #543
Merged
Merged
feat: 과제 조회 API 추가 #543
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
src/main/java/com/gdschongik/gdsc/domain/study/application/StudyMentorService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
package com.gdschongik.gdsc.domain.study.application; | ||
|
||
import static com.gdschongik.gdsc.global.exception.ErrorCode.*; | ||
|
||
import com.gdschongik.gdsc.domain.study.dao.StudyDetailRepository; | ||
import com.gdschongik.gdsc.domain.study.domain.StudyDetail; | ||
import com.gdschongik.gdsc.domain.study.dto.response.AssignmentResponse; | ||
import com.gdschongik.gdsc.global.exception.CustomException; | ||
import java.util.List; | ||
import lombok.RequiredArgsConstructor; | ||
import lombok.extern.slf4j.Slf4j; | ||
import org.springframework.stereotype.Service; | ||
import org.springframework.transaction.annotation.Transactional; | ||
|
||
@Slf4j | ||
@Service | ||
@RequiredArgsConstructor | ||
public class StudyMentorService { | ||
|
||
private final StudyDetailRepository studyDetailRepository; | ||
|
||
@Transactional(readOnly = true) | ||
public List<AssignmentResponse> getWeeklyAssignments(Long studyId) { | ||
List<StudyDetail> studyDetails = studyDetailRepository.findAllByStudyId(studyId); | ||
return studyDetails.stream().map(AssignmentResponse::from).toList(); | ||
} | ||
|
||
@Transactional(readOnly = true) | ||
public AssignmentResponse getAssignment(Long studyDetailId) { | ||
StudyDetail studyDetail = studyDetailRepository | ||
.findById(studyDetailId) | ||
.orElseThrow(() -> new CustomException(STUDY_DETAIL_NOT_FOUND)); | ||
return AssignmentResponse.from(studyDetail); | ||
} | ||
} |
6 changes: 5 additions & 1 deletion
6
src/main/java/com/gdschongik/gdsc/domain/study/dao/StudyDetailRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,10 @@ | ||
package com.gdschongik.gdsc.domain.study.dao; | ||
|
||
import com.gdschongik.gdsc.domain.study.domain.StudyDetail; | ||
import java.util.List; | ||
import org.springframework.data.jpa.repository.JpaRepository; | ||
|
||
public interface StudyDetailRepository extends JpaRepository<StudyDetail, Long> {} | ||
public interface StudyDetailRepository extends JpaRepository<StudyDetail, Long> { | ||
|
||
List<StudyDetail> findAllByStudyId(Long studyId); | ||
} |
23 changes: 23 additions & 0 deletions
23
src/main/java/com/gdschongik/gdsc/domain/study/dto/response/AssignmentResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
package com.gdschongik.gdsc.domain.study.dto.response; | ||
|
||
import com.gdschongik.gdsc.domain.study.domain.StudyDetail; | ||
import com.gdschongik.gdsc.domain.study.domain.StudyStatus; | ||
import com.gdschongik.gdsc.domain.study.domain.vo.Assignment; | ||
import io.swagger.v3.oas.annotations.media.Schema; | ||
|
||
public record AssignmentResponse( | ||
Long studyDetailId, | ||
@Schema(description = "과제 제목") String title, | ||
@Schema(description = "마감 기한") String deadline, | ||
@Schema(description = "과제 명세 링크") String descriptionLink, | ||
@Schema(description = "과제 상태") StudyStatus assignmentStatus) { | ||
public static AssignmentResponse from(StudyDetail studyDetail) { | ||
Assignment assignment = studyDetail.getAssignment(); | ||
return new AssignmentResponse( | ||
studyDetail.getId(), | ||
assignment.getTitle(), | ||
assignment.getDeadline().toString(), | ||
assignment.getDescriptionLink(), | ||
assignment.getStatus()); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
createStudyAssignment
메서드의 반환값을 수정하세요.현재 메서드는
null
을 반환하고 있습니다. 적절한ResponseEntity
를 반환하도록 수정해야 합니다.Committable suggestion