Skip to content

v1.2.0-alpha #122

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
YunJaeHoon merged 7 commits into from
Jan 15, 2025
Merged

v1.2.0-alpha #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6b093e5
Merge pull request #118 from DevKor-github/jaehoon
YunJaeHoon Dec 23, 2024
3a4522a
FIX: 강의 시간 및 장소 엔티티 분리에 따른 api 수정
YunJaeHoon Jan 5, 2025
cf41f6a
VER: v1.1.4
YunJaeHoon Jan 5, 2025
1da4f3a
Merge pull request #120 from DevKor-github/jaehoon
YunJaeHoon Jan 5, 2025
b637dc7
FTR: 프론트에서 조치가 필요한 api를 UpdateController, UpdateServcie에서 따로 관리
YunJaeHoon Jan 15, 2025
12d0828
VER: v1.2.0-alpha
YunJaeHoon Jan 15, 2025
1a0d51b
Merge pull request #121 from DevKor-github/jaehoon
YunJaeHoon Jan 15, 2025
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Academ Back-end repository입니다.
---

### 프로젝트 구조
( 최신화 : v1.1.3 )
( 최신화 : v1.2.0-alpha )
```
│
├── .github
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/com/example/Devkor_project/controller/CourseController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ public class CourseController
@Parameter(name = "page", description = "페이지 번호 ( 1부터 시작 )")
})
@ApiResponses(value = {
@ApiResponse(responseCode = "200 (열람권 보유)", description = "CourseDto.Basic 리스트를 반환합니다.", content = @Content(schema = @Schema(implementation = CourseDto.Basic.class))),
@ApiResponse(responseCode = "200 (열람권 만료, 비로그인)", description = "CourseDto.ExpiredBasic 리스트를 반환합니다.", content = @Content(schema = @Schema(implementation = CourseDto.ExpiredBasic.class))),
@ApiResponse(responseCode = "200 (열람권 보유)", description = "CourseDto.Basic 리스트를 반환합니다.", content = @Content(schema = @Schema(implementation = CourseDto.NOT_UPDATED_Basic.class))),
@ApiResponse(responseCode = "200 (열람권 만료, 비로그인)", description = "CourseDto.ExpiredBasic 리스트를 반환합니다.", content = @Content(schema = @Schema(implementation = CourseDto.NOT_UPDATED_ExpiredBasic.class))),
@ApiResponse(responseCode = "실패: 400 (SHORT_SEARCH_WORD)", description = "검색어가 1글자 이하인 경우 (입력받은 검색어를 반환)", content = @Content(schema = @Schema(implementation = ResponseDto.Error.class))),
@ApiResponse(responseCode = "실패: 400 (INVALID_ORDER)", description = "입력받은 order 인자가 올바르지 않은 경우 (입력받은 배치 순서를 반환)", content = @Content(schema = @Schema(implementation = ResponseDto.Error.class))),
@ApiResponse(responseCode = "실패: 404 (NO_RESULT)", description = "검색 결과가 존재하지 않는 경우 (입력받은 검색어를 반환)", content = @Content(schema = @Schema(implementation = ResponseDto.Error.class))),
Expand Down Expand Up @@ -97,7 +97,7 @@ public ResponseEntity<ResponseDto.Success> searchCourseCountPage(@RequestParam("
@Parameter(name = "page", description = "페이지 번호 ( 1부터 시작 )"),
})
@ApiResponses(value = {
@ApiResponse(responseCode = "200 (열람권 보유)", description = "CourseDto.Detail 데이터를 반환합니다.", content = @Content(schema = @Schema(implementation = CourseDto.Detail.class))),
@ApiResponse(responseCode = "200 (열람권 보유)", description = "CourseDto.Detail 데이터를 반환합니다.", content = @Content(schema = @Schema(implementation = CourseDto.NOT_UPDATED_Detail.class))),
@ApiResponse(responseCode = "실패: 401 (NO_ACCESS_AUTHORITY)", description = "강의평 열람권이 만료된 경우", content = @Content(schema = @Schema(implementation = ResponseDto.Error.class))),
@ApiResponse(responseCode = "실패: 404 (COURSE_NOT_FOUND)", description = "상세 정보를 요청한 course_id에 대한 강의가 존재하지 않는 경우 (입력받은 course_id를 반환)", content = @Content(schema = @Schema(implementation = ResponseDto.Error.class))),
@ApiResponse(responseCode = "실패: 404 (USER_NOT_FOUND)", description = "특정 강의평에 대한 사용자 데이터가 존재하지 않는 경우 (profile_id를 반환)", content = @Content(schema = @Schema(implementation = ResponseDto.Error.class))),
Expand Down Expand Up @@ -158,7 +158,7 @@ public ResponseEntity<ResponseDto.Success> bookmark(Principal principal,
@Parameter(name = "course_id", description = "강의평을 추가할 강의의 course_id")
})
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "CourseDto.Basic 데이터를 반환합니다.", content = @Content(schema = @Schema(implementation = CourseDto.Basic.class))),
@ApiResponse(responseCode = "200", description = "CourseDto.Basic 데이터를 반환합니다.", content = @Content(schema = @Schema(implementation = CourseDto.NOT_UPDATED_Basic.class))),
@ApiResponse(responseCode = "실패: 401 (UNAUTHORIZED)", description = "로그인하지 않은 경우", content = @Content(schema = @Schema(implementation = ResponseDto.Error.class))),
@ApiResponse(responseCode = "실패: 400 (ALREADY_EXIST)", description = "해당 사용자가 해당 강의에 이미 강의평을 등록한 경우 (입력받은 course_id를 반환)", content = @Content(schema = @Schema(implementation = ResponseDto.Error.class))),
@ApiResponse(responseCode = "실패: 404 (COURSE_NOT_FOUND)", description = "요청으로 보낸 course_id에 해당하는 강의가 존재하지 않는 경우 (입력받은 course_id를 반환)", content = @Content(schema = @Schema(implementation = ResponseDto.Error.class))),
Expand All @@ -167,7 +167,7 @@ public ResponseEntity<ResponseDto.Success> bookmark(Principal principal,
public ResponseEntity<ResponseDto.Success> startInsertComment(Principal principal,
@RequestParam("course_id") Long course_id)
{
CourseDto.Basic dto = courseService.startInsertComment(principal, course_id);
CourseDto.NOT_UPDATED_Basic dto = courseService.startInsertComment(principal, course_id);

return ResponseEntity.status(HttpStatus.OK)
.body(
Expand Down Expand Up @@ -218,7 +218,7 @@ public ResponseEntity<ResponseDto.Success> insertComment(Principal principal,
@Parameter(name = "comment_id", description = "수정할 강의평의 comment_id")
})
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "CommentDto.StartUpdate 데이터를 반환합니다.", content = @Content(schema = @Schema(implementation = CommentDto.StartUpdate.class))),
@ApiResponse(responseCode = "200", description = "CommentDto.StartUpdate 데이터를 반환합니다.", content = @Content(schema = @Schema(implementation = CommentDto.NOT_UPDATED_StartUpdate.class))),
@ApiResponse(responseCode = "실패: 401 (UNAUTHORIZED)", description = "로그인하지 않은 경우", content = @Content(schema = @Schema(implementation = ResponseDto.Error.class))),
@ApiResponse(responseCode = "실패: 400 (NOT_COMMENT_BY_USER)", description = "해당 강의평이 해당 사용자가 작성한 강의평이 아닌 경우", content = @Content(schema = @Schema(implementation = ResponseDto.Error.class))),
@ApiResponse(responseCode = "실패: 404 (COMMENT_NOT_FOUND)", description = "요청으로 보낸 comment_id에 해당하는 강의평이 존재하지 않는 경우 (입력받은 comment_id를 반환)", content = @Content(schema = @Schema(implementation = ResponseDto.Error.class))),
Expand All @@ -227,7 +227,7 @@ public ResponseEntity<ResponseDto.Success> insertComment(Principal principal,
public ResponseEntity<ResponseDto.Success> startUpdateComment(Principal principal,
@RequestParam("comment_id") Long comment_id)
{
CommentDto.StartUpdate dto = courseService.startUpdateComment(principal, comment_id);
CommentDto.NOT_UPDATED_StartUpdate dto = courseService.startUpdateComment(principal, comment_id);

return ResponseEntity.status(HttpStatus.OK)
.body(
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/example/Devkor_project/controller/MyPageController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,14 @@ public ResponseEntity<ResponseDto.Success> buyAccessAuthority(Principal principa
@Parameter(name = "page", description = "페이지 번호 ( 1부터 시작 )")
})
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "CommentDto.MyPage 리스트를 반환합니다.", content = @Content(schema = @Schema(implementation = CommentDto.MyPage.class))),
@ApiResponse(responseCode = "200", description = "CommentDto.MyPage 리스트를 반환합니다.", content = @Content(schema = @Schema(implementation = CommentDto.NOT_UPDATED_MyPage.class))),
@ApiResponse(responseCode = "실패: 401 (UNAUTHORIZED)", description = "로그인하지 않은 경우", content = @Content(schema = @Schema(implementation = ResponseDto.Error.class))),
@ApiResponse(responseCode = "실패: 404 (EMAIL_NOT_FOUND)", description = "요청을 보낸 사용자 계정이 존재하지 않는 경우 (이메일을 반환)", content = @Content(schema = @Schema(implementation = ResponseDto.Error.class))),
@ApiResponse(responseCode = "실패: 404 (NO_RESULT)", description = "결과가 없는 경우 (요청으로 보낸 page를 반환)", content = @Content(schema = @Schema(implementation = ResponseDto.Error.class))),
})
public ResponseEntity<ResponseDto.Success> myComments(@RequestParam("page") int page, Principal principal)
{
List<CommentDto.MyPage> my_comments = myPageService.myComments(principal, page - 1);
List<CommentDto.NOT_UPDATED_MyPage> my_comments = myPageService.myComments(principal, page - 1);

return ResponseEntity.status(HttpStatus.OK)
.body(
Expand Down Expand Up @@ -143,14 +143,14 @@ public ResponseEntity<ResponseDto.Success> countMyComments(Principal principal)
@Parameter(name = "page", description = "페이지 번호 ( 1부터 시작 )")
})
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "CourseDto.Basic 리스트를 반환합니다.", content = @Content(schema = @Schema(implementation = CourseDto.Basic.class))),
@ApiResponse(responseCode = "200", description = "CourseDto.Basic 리스트를 반환합니다.", content = @Content(schema = @Schema(implementation = CourseDto.NOT_UPDATED_Basic.class))),
@ApiResponse(responseCode = "실패: 401 (UNAUTHORIZED)", description = "로그인하지 않은 경우", content = @Content(schema = @Schema(implementation = ResponseDto.Error.class))),
@ApiResponse(responseCode = "실패: 404 (EMAIL_NOT_FOUND)", description = "요청을 보낸 사용자 계정이 존재하지 않는 경우 (이메일을 반환)", content = @Content(schema = @Schema(implementation = ResponseDto.Error.class))),
@ApiResponse(responseCode = "실패: 404 (NO_RESULT)", description = "결과가 없는 경우 (요청으로 보낸 page를 반환)", content = @Content(schema = @Schema(implementation = ResponseDto.Error.class))),
})
public ResponseEntity<ResponseDto.Success> myBookmarks(@RequestParam("page") int page, Principal principal)
{
List<CourseDto.Basic> my_bookmarks = myPageService.myBookmarks(principal, page - 1);
List<CourseDto.NOT_UPDATED_Basic> my_bookmarks = myPageService.myBookmarks(principal, page - 1);

return ResponseEntity.status(HttpStatus.OK)
.body(
Expand Down
Loading
Loading