Skip to content

Commit

Permalink
Merge pull request #19 from StudyFlexUMC5th/changmin
Browse files Browse the repository at this point in the history
FIX: 엔드포인트 중복 오류 수정
  • Loading branch information
Yeeun411 authored Jan 9, 2024
2 parents 241623e + a797a8c commit bb357ad
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -89,26 +89,26 @@ public BaseResponse<?> deleteStudyNotice(@PathVariable Long study_id, @PathVaria
return new BaseResponse<>(BaseResponseStatus.SUCCESS);
}

@GetMapping("/app/studies/{study_id}/notice")
@GetMapping("/{study_id}/notice")
public BaseResponse<?> getStudyNotices(@PathVariable Long study_id, @AuthenticationPrincipal Member member){
StudyNoticesInfoRes studyNotices = studyService.getStudyNotices(study_id, member);

return new BaseResponse<>(BaseResponseStatus.SUCCESS,studyNotices);
}

@GetMapping("/app/studies/{study_id}/completed")
@GetMapping("/{study_id}/completed")
public BaseResponse<?> checkCompletedStudyWeek(@PathVariable Long study_id, @RequestParam int week, @AuthenticationPrincipal Member member){
ProgressRes progressReq = studyService.checkCompletedStudyWeek(study_id, week, member);
return new BaseResponse<>(BaseResponseStatus.SUCCESS, progressReq);
}

@GetMapping("/app/studies/{study_id}/progress")
@GetMapping("/{study_id}/progress")
public BaseResponse<?> getStudyProgressList(@PathVariable Long study_id, @AuthenticationPrincipal Member member){
List<ProgressRes> studyProgressList = studyService.getStudyProgressList(study_id, member);
return new BaseResponse<>(BaseResponseStatus.SUCCESS,studyProgressList);
}

@GetMapping("/app/studies/{study_id}/details")
@GetMapping("/{study_id}/details")
public BaseResponse<?> getStudyDetail(@PathVariable Long study_id){
StudyDetailRes studyDetail = studyService.getStudyDetail(study_id);
return new BaseResponse<>(BaseResponseStatus.SUCCESS,studyDetail);
Expand Down

0 comments on commit bb357ad

Please sign in to comment.