-
Notifications
You must be signed in to change notification settings - Fork 0
#170 [Feat] 마이페이지 기능 구현 #173
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
Merged
Merged
Changes from 51 commits
Commits
Show all changes
53 commits
Select commit
Hold shift + click to select a range
798bacb
#170 [feat] 마이페이지 홈화면 API 구현
seongmin0229 ca83d8f
#170 [feat] 개인정보 수정 페이지 조회 API
seongmin0229 6b1a58a
#170 [feat] 개인정보 수정 API 구현, 테스트 코드 추가
seongmin0229 a44999d
#170 [feat] SignupRequest 수정, 닉네임 검증 API 구현
seongmin0229 876cfa1
#170 [feat] 닉네임 검증 기능 재사용할 수 있도록 수정
seongmin0229 ea1df52
#170 [feat] 취득, 취득 예정 API 추가 및 수정
seongmin0229 eb627be
#170 [feat] 대학교 변경 API 추가, 닉네임 검증 API 화이트 리스트에 반영
seongmin0229 c6752f2
# 170 [feat] 학과 변경 API 추가
seongmin0229 2754125
#164 [fix] 계열별/직무별 자격증 Top3 조회 구현
woals2840 85f0d76
#164 [fix] 자격증 조회 수정
woals2840 3477234
#170 [feat] 마이페이지 홈화면 API 구현
seongmin0229 edc7fbb
#170 [feat] 개인정보 수정 페이지 조회 API
seongmin0229 b3a494b
#170 [feat] 개인정보 수정 API 구현, 테스트 코드 추가
seongmin0229 65c89f7
#170 [feat] SignupRequest 수정, 닉네임 검증 API 구현
seongmin0229 5316e1a
#170 [feat] 닉네임 검증 기능 재사용할 수 있도록 수정
seongmin0229 43f3016
#170 [feat] 취득, 취득 예정 API 추가 및 수정
seongmin0229 4cd9d13
#170 [feat] 대학교 변경 API 추가, 닉네임 검증 API 화이트 리스트에 반영
seongmin0229 4058d84
# 170 [feat] 학과 변경 API 추가
seongmin0229 3fd0166
Merge remote-tracking branch 'origin/feat/#170' into feat/#170
seongmin0229 9de7f45
#164 [fix] 계열별/직무별 자격증 Top3 조회 구현
woals2840 55eb838
#164 [fix] 자격증 조회 수정
woals2840 becfb70
Merge remote-tracking branch 'origin/fix/#164' into fix/#164
seongmin0229 5569a68
#170 [feat] 닉네임 검증 로직 변경
seongmin0229 dd5f9cf
#170 [feat] 닉네임 검증 메서드 분리
seongmin0229 6c3ea00
#170 [feat] 닉네임 검증 API jwt 필터 예외 처리
seongmin0229 a0f8adf
#170 [fix] 에러 코드 수정
seongmin0229 c08a34a
#164 [fix] 코드래빗 반영
woals2840 5499a47
Merge pull request #172 from cerdeuk/fix/#164
woals2840 405ddbe
#170 [fix] 에러 코드 수정
seongmin0229 916c3fe
#170 [feat] 마이페이지 홈화면 API 구현
seongmin0229 5674896
#170 [feat] 개인정보 수정 페이지 조회 API
seongmin0229 da58c65
#170 [feat] 개인정보 수정 API 구현, 테스트 코드 추가
seongmin0229 77afe8d
#170 [feat] SignupRequest 수정, 닉네임 검증 API 구현
seongmin0229 1f26c5d
#170 [feat] 닉네임 검증 기능 재사용할 수 있도록 수정
seongmin0229 e4843a9
#170 [feat] 취득, 취득 예정 API 추가 및 수정
seongmin0229 5595795
#170 [feat] 대학교 변경 API 추가, 닉네임 검증 API 화이트 리스트에 반영
seongmin0229 53b5697
# 170 [feat] 학과 변경 API 추가
seongmin0229 8384bbd
#170 [feat] 마이페이지 홈화면 API 구현
seongmin0229 3b3670c
#170 [feat] 개인정보 수정 페이지 조회 API
seongmin0229 5b17bbc
#170 [feat] 개인정보 수정 API 구현, 테스트 코드 추가
seongmin0229 6834098
#170 [feat] SignupRequest 수정, 닉네임 검증 API 구현
seongmin0229 0b1ca31
#170 [feat] 닉네임 검증 기능 재사용할 수 있도록 수정
seongmin0229 3c3dfe4
#170 [feat] 대학교 변경 API 추가, 닉네임 검증 API 화이트 리스트에 반영
seongmin0229 fb28e5c
# 170 [feat] 학과 변경 API 추가
seongmin0229 7a96b96
#170 [feat] 닉네임 검증 로직 변경
seongmin0229 98f17b8
#170 [feat] 닉네임 검증 메서드 분리
seongmin0229 a31eb8d
#170 [feat] 닉네임 검증 API jwt 필터 예외 처리
seongmin0229 3774ad0
#170 [fix] 에러 코드 수정
seongmin0229 a5538fd
#170 [fix] 에러 코드 수정
seongmin0229 aef719f
#170 [feat] rebase
seongmin0229 e8f6309
Merge remote-tracking branch 'origin/feat/#170' into feat/#170
seongmin0229 d3d140a
#170 [fix] 코드래빗 리뷰 반영
seongmin0229 078d2ed
#170 [fix] 코드래빗 리뷰 반영2
seongmin0229 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 hidden or 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
This file contains hidden or 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
10 changes: 10 additions & 0 deletions
10
...n/java/org/sopt/certi_server/domain/acquisition/dto/request/CreateAcquisitionRequest.java
This file contains hidden or 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,10 @@ | ||
| package org.sopt.certi_server.domain.acquisition.dto.request; | ||
|
|
||
| import jakarta.validation.constraints.NotBlank; | ||
| import jakarta.validation.constraints.NotEmpty; | ||
| import jakarta.validation.constraints.NotNull; | ||
coderabbitai[bot] marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| public record CreateAcquisitionRequest( | ||
| @NotNull(message = "자격증 id는 필수 값입니다.") Long certificationId | ||
| ) { | ||
| } | ||
16 changes: 16 additions & 0 deletions
16
...in/java/org/sopt/certi_server/domain/acquisition/dto/request/PatchAcquisitionRequest.java
This file contains hidden or 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,16 @@ | ||
| package org.sopt.certi_server.domain.acquisition.dto.request; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonFormat; | ||
| import jakarta.validation.constraints.NotNull; | ||
|
|
||
| import java.time.LocalDate; | ||
|
|
||
| public record PatchAcquisitionRequest( | ||
|
|
||
| @NotNull(message = "취득 날짜 정보를 입력해주세요") | ||
| @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd", timezone = "Asia/Seoul") | ||
| LocalDate acquisitionDate, | ||
|
|
||
| String grade | ||
| ) { | ||
| } |
This file contains hidden or 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
34 changes: 0 additions & 34 deletions
34
...g/sopt/certi_server/domain/acquisition/dto/response/GetAcquisitionListDetailResponse.java
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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
50 changes: 27 additions & 23 deletions
50
...in/java/org/sopt/certi_server/domain/acquisition/dto/response/GetAcquisitionResponse.java
This file contains hidden or 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,32 +1,36 @@ | ||
| package org.sopt.certi_server.domain.acquisition.dto.response; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonFormat; | ||
| import lombok.Builder; | ||
| import org.sopt.certi_server.domain.acquisition.entity.Acquisition; | ||
|
|
||
| import java.time.LocalDate; | ||
| import java.util.List; | ||
|
|
||
| import org.sopt.certi_server.domain.acquisition.entity.Acquisition; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonFormat; | ||
|
|
||
| import lombok.Builder; | ||
|
|
||
| @Builder | ||
| public record GetAcquisitionResponse( | ||
| Long acquisitionId, | ||
| int index, | ||
| String name, | ||
| @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd", timezone = "Asia/Seoul") | ||
| LocalDate createdAt, | ||
| String cardFrontImageUrl, | ||
| String cardBackImageUrl, | ||
| List<String> tags | ||
| Long acquisitionId, | ||
| String cardFrontImageUrl, | ||
| int index, | ||
| String name, | ||
| List<String> tags, | ||
| String description, | ||
| @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd", timezone = "Asia/Seoul") | ||
| LocalDate acquisitionDate, | ||
| String grade | ||
| ) { | ||
| public static GetAcquisitionResponse from(Acquisition acquisition) { | ||
| return GetAcquisitionResponse.builder() | ||
| .acquisitionId(acquisition.getId()) | ||
| .index(acquisition.getCardType().getIndex()) | ||
| .name(acquisition.getCertification().getName()) | ||
| .createdAt(acquisition.getCreatedTime().toLocalDate()) | ||
| .cardFrontImageUrl(acquisition.getCardType().getCardFrontImageUrl()) | ||
| .cardBackImageUrl(acquisition.getCardType().getCardBackImageUrl()) | ||
| .tags(acquisition.getCertification().getTags()) | ||
| .build(); | ||
| } | ||
| public static GetAcquisitionResponse from(Acquisition acquisition) { | ||
| return GetAcquisitionResponse.builder() | ||
| .acquisitionId(acquisition.getId()) | ||
| .cardFrontImageUrl(acquisition.getCardType().getCardFrontImageUrl()) | ||
| .index(acquisition.getCardType().getIndex()) | ||
| .name(acquisition.getCertification().getName()) | ||
| .acquisitionDate(acquisition.getAcquisitionDate()) | ||
| .description(acquisition.getCertification().getDescription()) | ||
| .tags(acquisition.getCertification().getTags()) | ||
| .grade(acquisition.getGrade()) | ||
| .build(); | ||
| } | ||
| } |
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -11,6 +11,8 @@ | |
| import org.sopt.certi_server.domain.user.entity.User; | ||
| import org.sopt.certi_server.global.entity.BaseTimeEntity; | ||
|
|
||
| import java.time.LocalDate; | ||
|
|
||
| @Entity | ||
| @Getter | ||
| @NoArgsConstructor(access = AccessLevel.PROTECTED) | ||
|
|
@@ -44,11 +46,23 @@ public class Acquisition extends BaseTimeEntity { | |
| @JoinColumn(name = "user_id") | ||
| private User user; | ||
|
|
||
| @Column(name = "grade") | ||
| private String grade; | ||
|
|
||
| @Column(name = "acquisition_date") | ||
| private LocalDate acquisitionDate; | ||
|
|
||
| @Builder | ||
| public Acquisition(Certification certification, CardType cardType, User user, SmallCardType smallCardType) { | ||
| public Acquisition(Certification certification, CardType cardType, User user, SmallCardType smallCardType, String grade) { | ||
| this.certification = certification; | ||
| this.smallCardType = smallCardType; | ||
| this.cardType = cardType; | ||
| this.user = user; | ||
| this.acquisitionDate = LocalDate.now(); | ||
| } | ||
|
||
|
|
||
| public void changeAcquisition(LocalDate acquisitionDate, String grade) { | ||
| this.acquisitionDate = acquisitionDate; | ||
| this.grade = grade; | ||
| } | ||
| } | ||
This file contains hidden or 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
This file contains hidden or 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
19 changes: 19 additions & 0 deletions
19
...va/org/sopt/certi_server/domain/certification/dto/response/CertificationRankResponse.java
This file contains hidden or 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,19 @@ | ||
| package org.sopt.certi_server.domain.certification.dto.response; | ||
|
|
||
| import org.sopt.certi_server.domain.certification.entity.Certification; | ||
|
|
||
| public record CertificationRankResponse( | ||
| int rank, | ||
| String certificationName, | ||
| String certificationType | ||
| ) { | ||
| public CertificationRankResponse(int rank, Certification certification) { | ||
| this( | ||
| rank, | ||
| certification.getName(), | ||
| certification.getCertificationType() != null | ||
| ? certification.getCertificationType().getKoreanName() | ||
| : null | ||
| ); | ||
| } | ||
| } |
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.