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

feat: 결제 환불 로직 리팩토링 #245

Merged
merged 30 commits into from
Dec 9, 2024
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
6b14711
fix: 3:3 조인 시 성별 체크
seogwoojin Dec 1, 2024
8e81c44
style: apply convention
seogwoojin Dec 1, 2024
1b1253d
fix: 미팅팀 나이 제한
seogwoojin Dec 1, 2024
d06482f
style: apply convention
seogwoojin Dec 1, 2024
2d35cba
style: apply convention
seogwoojin Dec 1, 2024
a661e2d
feat: 카카오톡 ID 중복 시, 유저 ID 체크
seogwoojin Dec 1, 2024
6156e55
style: apply convention
seogwoojin Dec 1, 2024
a44d70d
fix: 포트원 Access Token 생존 기간 60초로 수정
seogwoojin Dec 1, 2024
155609d
chore: merge with main
seogwoojin Dec 1, 2024
26a47e8
fix: 유저 정보 변경
seogwoojin Dec 2, 2024
eb38a99
Merge branch 'main' of https://github.com/uoslife/server-meeting into…
seogwoojin Dec 2, 2024
0a504f7
fix: 개발자 API 유저 삭제 시, 리프레시 토큰 초기화
seogwoojin Dec 2, 2024
fa333d4
chore: merge with main
seogwoojin Dec 2, 2024
9ed60c2
fix: MinAge MaxAge Null 값 거절
seogwoojin Dec 2, 2024
3befd4d
Merge branch 'main' of https://github.com/uoslife/server-meeting into…
seogwoojin Dec 2, 2024
eb69489
feat: Match API 엔드포인트 경로 변경
23tae Dec 3, 2024
87d0c5a
refactor: MatchService 파라미터 변경
23tae Dec 3, 2024
9fbc937
feat: teamType 사용 쿼리 메소드 추가
23tae Dec 3, 2024
97c5378
chore: 사용하지 않는 메서드 제거
23tae Dec 3, 2024
2bea39f
chore: 불필요한 예외 처리 삭제
23tae Dec 3, 2024
36dce8f
docs: Swagger 업데이트
23tae Dec 3, 2024
67d3d9c
refactor: getMatchedPartnerInformation API에서 불필요한 preference 정보 제거
23tae Dec 3, 2024
3610b27
feat: 매칭 API 시즌 파라미터 추가
23tae Dec 3, 2024
52395bf
feat: 필수 파라미터 누락시 에러 처리 추가
23tae Dec 3, 2024
cc96c51
Merge branch 'refactor/match-api-endpoints' of https://github.com/uos…
seogwoojin Dec 4, 2024
89498ca
chore: merge with main
seogwoojin Dec 7, 2024
9d7012a
Merge branch 'main' of https://github.com/uoslife/server-meeting into…
seogwoojin Dec 7, 2024
d0f6722
Merge branch 'main' of https://github.com/uoslife/server-meeting into…
seogwoojin Dec 7, 2024
1831a36
test: 테스트용 임시 이메일 전송 삭제
seogwoojin Dec 7, 2024
d7ad83a
feat: 매칭 안된 결제 정보 환불 로직 생성
seogwoojin Dec 7, 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
Prev Previous commit
Next Next commit
style: apply convention
seogwoojin committed Dec 1, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 6156e5589d9b3a8c209c788e58f78c939a67c592
9 changes: 7 additions & 2 deletions src/main/kotlin/uoslife/servermeeting/user/api/UserApi.kt
Original file line number Diff line number Diff line change
@@ -237,8 +237,13 @@ class UserApi(
)]
)
@GetMapping("/check/kakao-talk-id")
fun isDuplicatedKakaoTalkId(@RequestParam kakaoTalkId: String,@AuthenticationPrincipal userDetails: UserDetails,): ResponseEntity<Boolean> {
return ResponseEntity.ok(userService.isDuplicatedKakaoTalkId(userDetails.username.toLong(), kakaoTalkId))
fun isDuplicatedKakaoTalkId(
@RequestParam kakaoTalkId: String,
@AuthenticationPrincipal userDetails: UserDetails,
): ResponseEntity<Boolean> {
return ResponseEntity.ok(
userService.isDuplicatedKakaoTalkId(userDetails.username.toLong(), kakaoTalkId)
)
}

@Operation(summary = "유저 미팅팀 별 기본 정보", description = "유저의 1:1, 3:3팀의 현재 상태를 요약합니다")
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ class UserService(

@Transactional
fun updateUserPersonalInformation(command: UserCommand.UpdateUserPersonalInformation): User {
if(command.kakaoTalkId != null){
if (command.kakaoTalkId != null) {
isDuplicatedKakaoTalkId(command.userId, command.kakaoTalkId)
}

@@ -128,7 +128,8 @@ class UserService(
fun isDuplicatedKakaoTalkId(userId: Long, kakaoTalkId: String): Boolean {
val user = getUser(userId)
if (kakaoTalkId != user.kakaoTalkId) {
if (userRepository.existsByKakaoTalkId(kakaoTalkId)) throw KakaoTalkIdDuplicationException()
if (userRepository.existsByKakaoTalkId(kakaoTalkId))
throw KakaoTalkIdDuplicationException()
}
return true
}