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.

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

Merge branch 'develop' into main #107

Merged
merged 70 commits into from
Nov 28, 2024
Merged
Changes from 2 commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
f1ac769
Merge pull request #56 from LeeSM0518/DVK-88-apply-jooq-to-ebook-api
LeeSM0518 Nov 21, 2024
29aadfe
[DVK-64] docs: 알림 API에 Swagger 적용
LeeSM0518 Nov 22, 2024
83acebd
Merge branch 'develop' into DVK-64-apply-swagger-to-notification-api
LeeSM0518 Nov 22, 2024
3d3a14b
Merge pull request #57 from LeeSM0518/DVK-64-apply-swagger-to-notific…
LeeSM0518 Nov 22, 2024
cc58787
[DVK-66] docs: 리뷰 API에 Swagger 적용
LeeSM0518 Nov 22, 2024
b08308a
[DVK-66] docs: 리뷰 API에 Swagger 적용
LeeSM0518 Nov 22, 2024
d2a51d1
Merge pull request #59 from LeeSM0518/DVK-66-apply-swagger-to-review-api
LeeSM0518 Nov 22, 2024
5562e30
[DVK-66] docs: 리뷰 API에 Swagger 적용
LeeSM0518 Nov 22, 2024
f53aaeb
Merge pull request #61 from LeeSM0518/DVK-67-apply-swagger-to-service…
LeeSM0518 Nov 22, 2024
f061d59
[DVK-81] docs: 전자책 사진 API에 Swagger 적용
LeeSM0518 Nov 22, 2024
fd8dfa5
Merge pull request #63 from LeeSM0518/DVK-81-apply-swagger-to-ebook-i…
LeeSM0518 Nov 22, 2024
a7a2a2c
[DVK-82] docs: 전자책 문의 API에 Swagger 적용
LeeSM0518 Nov 22, 2024
3e02183
Merge pull request #65 from LeeSM0518/DVK-82-apply-swagger-to-ebook-i…
LeeSM0518 Nov 22, 2024
e625f97
[DVK-101] docs: 서비스 문의 사진 API에 Swagger 적용
LeeSM0518 Nov 22, 2024
64aca1a
Merge pull request #67 from LeeSM0518/DVK-66-apply-swagger-to-service…
LeeSM0518 Nov 22, 2024
2aaca30
[DVK-75] chore: Flyway 적용
LeeSM0518 Nov 22, 2024
1bc77f4
Merge pull request #69 from LeeSM0518/DVK-75-apply-flyway
LeeSM0518 Nov 22, 2024
a1fb4ab
[DVK-100] refactor: 전자책 페이징 리팩토링
LeeSM0518 Nov 23, 2024
f8adb69
[DVK-100] refactor: 전자책 페이징 리팩토링
LeeSM0518 Nov 23, 2024
fefa11f
Merge pull request #71 from LeeSM0518/DVK-100-unification-of-paging-m…
LeeSM0518 Nov 23, 2024
41da3e2
[DVK-72] fix: 예외 처리 수정
LeeSM0518 Nov 23, 2024
3e45bf9
Merge pull request #73 from LeeSM0518/DVK-72-edit-exception-handling
LeeSM0518 Nov 23, 2024
eb733db
[DVK-102] refactor: 전자책 문의 페이징 리팩토링
LeeSM0518 Nov 23, 2024
56bc7a0
Merge branch 'develop' into DVK-102-refactoring-ebook-inquiry
LeeSM0518 Nov 23, 2024
baef212
Merge pull request #75 from LeeSM0518/DVK-102-refactoring-ebook-inquiry
LeeSM0518 Nov 23, 2024
9f120dc
[DVK-103] refactor: 전자책 문의 댓글 페이징 리팩토링
LeeSM0518 Nov 23, 2024
50f8d5e
Merge pull request #77 from LeeSM0518/DVK-103-refactoring-ebook-inqui…
LeeSM0518 Nov 23, 2024
3806546
[DVK-104] refactor: 리뷰 페이징 리팩토링
LeeSM0518 Nov 23, 2024
9ef2c20
Merge pull request #79 from LeeSM0518/DVK-104-refactoring-review-paging
LeeSM0518 Nov 23, 2024
94694ff
[DVK-110] fix: 전자책 메인 사진 업로드 수정
LeeSM0518 Nov 23, 2024
fed0bab
[DVK-110] fix: 전자책 메인 사진 업로드 수정
LeeSM0518 Nov 23, 2024
5e2b43e
Merge pull request #82 from LeeSM0518/DVK-110-fix-swagger-of-ebook-im…
LeeSM0518 Nov 23, 2024
e2f713d
[DVK-105] refactor: 서비스 문의 페이징 리팩토링
LeeSM0518 Nov 23, 2024
bda43b4
Merge pull request #83 from LeeSM0518/DVK-105-refactoring-service-inq…
LeeSM0518 Nov 23, 2024
1956db1
[DVK-108] refactor: 찜 페이징 리팩토링
LeeSM0518 Nov 23, 2024
e0d1399
Merge pull request #86 from LeeSM0518/DVK-108-refactoring-wishlist-pa…
LeeSM0518 Nov 23, 2024
c97fdc5
[DVK-109] refactor: 리뷰 댓글 페이징 리팩토링
LeeSM0518 Nov 23, 2024
073f3ee
Merge pull request #88 from LeeSM0518/DVK-109-refactoring-review-comm…
LeeSM0518 Nov 23, 2024
270ca0d
[DVK-110] fix: 전자책 사진 저장 수정
LeeSM0518 Nov 23, 2024
b2d1e08
Merge branch 'develop' into DVK-110-fix-to-save-ebook-image
LeeSM0518 Nov 23, 2024
4a408ce
Merge pull request #90 from LeeSM0518/DVK-110-fix-to-save-ebook-image
LeeSM0518 Nov 23, 2024
4fcf9fe
[DVK-113] 전자책 사진 저장 API 수정
LeeSM0518 Nov 23, 2024
f1c5af7
Merge pull request #93 from LeeSM0518/DVK-113-modify-to-save-ebook-im…
LeeSM0518 Nov 23, 2024
d90c917
[DVK-98] fix: 전자책 사진 저장 API 수정
LeeSM0518 Nov 24, 2024
c66a725
Merge pull request #94 from LeeSM0518/DVK-98-supplementation-of-ebook…
LeeSM0518 Nov 24, 2024
897466c
[DVK-115] fix: 회원의 관심 카테고리 응답 수정
LeeSM0518 Nov 24, 2024
2ed3ea6
Merge pull request #96 from LeeSM0518/DVK-115-fix-favorite-category
LeeSM0518 Nov 24, 2024
0587a80
[DVK-78] fix: 회원 API 값 검증 로직 수정
LeeSM0518 Nov 24, 2024
d9769bc
[DVK-78] fix: 인증 API 값 검증 로직 수정
LeeSM0518 Nov 24, 2024
9cf9c1c
[DVK-78] fix: 전자책 API 값 검증 로직 수정
LeeSM0518 Nov 24, 2024
e7c111d
[DVK-78] fix: 알림 API 값 검증 로직 수정
LeeSM0518 Nov 24, 2024
27cf356
[DVK-78] fix: 리뷰 API 값 검증 로직 수정
LeeSM0518 Nov 24, 2024
8c7ae57
[DVK-78] fix: 리뷰 API 값 검증 로직 수정
LeeSM0518 Nov 24, 2024
fe48de4
[DVK-78] fix: 서비스 문의 API 값 검증 로직 수정
LeeSM0518 Nov 24, 2024
d4155b3
[DVK-78] fix: 서비스 문의 API 값 검증 로직 수정
LeeSM0518 Nov 24, 2024
8995871
[DVK-78] fix: 거래 API 값 검증 로직 수정
LeeSM0518 Nov 24, 2024
ea1bd83
[DVK-78] fix: 찜 API 값 검증 로직 수정
LeeSM0518 Nov 24, 2024
2e38268
[DVK-78] test: 테스트 버그 수정
LeeSM0518 Nov 24, 2024
1bd99de
[DVK-78] test: 테스트 버그 수정
LeeSM0518 Nov 24, 2024
2bcab44
Merge pull request #97 from LeeSM0518/DVK-78-modify-value-validation-…
LeeSM0518 Nov 24, 2024
c4ee231
[DVK-117] fix: 찜 목록 조회 수정
LeeSM0518 Nov 25, 2024
364cd52
Merge pull request #100 from LeeSM0518/DVK-117-edit-wish-list-view
LeeSM0518 Nov 25, 2024
a9acef1
[DVK-118] fix: 전자책 사진 저장 수정
LeeSM0518 Nov 25, 2024
af6815b
[DVK-118] fix: 전자책 사진 저장 수정
LeeSM0518 Nov 25, 2024
cdd1248
[DVK-118] fix: 전자책 사진 저장 수정
LeeSM0518 Nov 25, 2024
1c4590d
Merge pull request #102 from LeeSM0518/DVK-118-edit-to-save-ebook-image
LeeSM0518 Nov 25, 2024
e2fc12c
[DVK-119] fix: CORS 수정
LeeSM0518 Nov 25, 2024
2d1a2d5
Merge pull request #104 from LeeSM0518/DVK-119-fix-cors
LeeSM0518 Nov 25, 2024
f72a834
[DVK-121] fix: 알림 확인 API 수정
LeeSM0518 Nov 26, 2024
e098ba8
Merge pull request #106 from LeeSM0518/DVK-121-notification-confirmat…
LeeSM0518 Nov 26, 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
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@ import org.springframework.web.reactive.function.server.ServerResponse
import org.springframework.web.reactive.resource.NoResourceFoundException
import org.springframework.web.server.MissingRequestValueException
import org.springframework.web.server.ServerWebInputException
import org.springframework.web.server.UnsupportedMediaTypeStatusException
import reactor.core.publisher.Mono

@Component
@@ -94,7 +95,16 @@ class GlobalErrorWebExceptionHandler(
.body(BodyInserters.fromValue(errorAttributes))
}

is UnsupportedMediaTypeStatusException -> {
errorAttributes["reason"] = error.reason
ServerResponse
.status(error.statusCode)
.contentType(MediaType.APPLICATION_JSON)
.body(BodyInserters.fromValue(errorAttributes))
}

else -> {
errorAttributes["reason"] = error.cause.toString()
ServerResponse
.status(HttpStatus.INTERNAL_SERVER_ERROR)
.contentType(MediaType.APPLICATION_JSON)
Loading