-
Notifications
You must be signed in to change notification settings - Fork 8
feat: 지원 대학 관련 CRUD 추가 #779
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 all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
b463979
feat: 지원 대학 존재 확인 메서드 추가
whqtker 836d2f7
feat: DTO, 도메인 메서드 추가
whqtker c8b5a49
feat: CUD 구현 및 테스트 코드 작성
whqtker e49ed7b
feat: CRUD 컨트롤러 작성
whqtker d1b6fb9
feat: 기존 지원 대학 검색 기능 확장
whqtker fcfc5e6
fix: 캐시 키에 빠진 파라미터 추가
whqtker 154d33e
fix: soft delete된 지원서를 참조하는 경우에도 삭제되지 않도록
whqtker 2984838
refactor: List 원소 검증 추가
whqtker 07af2bc
refactor: PutMapping -> PatchMapping
whqtker 9963bf6
refactor: 코딩 컨벤션 리팩터링
whqtker 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
23 changes: 23 additions & 0 deletions
23
...ava/com/example/solidconnection/admin/university/dto/AdminUnivApplyInfoCreateRequest.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,23 @@ | ||
| package com.example.solidconnection.admin.university.dto; | ||
|
|
||
| import com.example.solidconnection.university.domain.SemesterAvailableForDispatch; | ||
| import jakarta.validation.Valid; | ||
| import jakarta.validation.constraints.NotNull; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| public record AdminUnivApplyInfoCreateRequest( | ||
| @NotNull Long termId, | ||
| @NotNull Long homeUniversityId, | ||
| @NotNull Long hostUniversityId, | ||
| Integer studentCapacity, | ||
| SemesterAvailableForDispatch semesterAvailableForDispatch, | ||
| String semesterRequirement, | ||
| String detailsForLanguage, | ||
| String gpaRequirement, | ||
| String gpaRequirementCriteria, | ||
| String detailsForAccommodation, | ||
| Map<String, String> extraInfo, | ||
| @Valid List<@NotNull AdminUnivApplyInfoLanguageRequirementRequest> languageRequirements | ||
| ) { | ||
| } |
11 changes: 11 additions & 0 deletions
11
...le/solidconnection/admin/university/dto/AdminUnivApplyInfoLanguageRequirementRequest.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,11 @@ | ||
| package com.example.solidconnection.admin.university.dto; | ||
|
|
||
| import com.example.solidconnection.university.domain.LanguageTestType; | ||
| import jakarta.validation.constraints.NotBlank; | ||
| import jakarta.validation.constraints.NotNull; | ||
|
|
||
| public record AdminUnivApplyInfoLanguageRequirementRequest( | ||
| @NotNull LanguageTestType languageTestType, | ||
| @NotBlank String minScore | ||
| ) { | ||
| } |
47 changes: 47 additions & 0 deletions
47
...ain/java/com/example/solidconnection/admin/university/dto/AdminUnivApplyInfoResponse.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,47 @@ | ||
| package com.example.solidconnection.admin.university.dto; | ||
|
|
||
| import com.example.solidconnection.university.domain.SemesterAvailableForDispatch; | ||
| import com.example.solidconnection.university.domain.UnivApplyInfo; | ||
| import com.example.solidconnection.university.dto.LanguageRequirementResponse; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| public record AdminUnivApplyInfoResponse( | ||
| long id, | ||
| long termId, | ||
| Long homeUniversityId, | ||
| long hostUniversityId, | ||
| String koreanName, | ||
| Integer studentCapacity, | ||
| SemesterAvailableForDispatch semesterAvailableForDispatch, | ||
| String semesterRequirement, | ||
| String detailsForLanguage, | ||
| String gpaRequirement, | ||
| String gpaRequirementCriteria, | ||
| String detailsForAccommodation, | ||
| Map<String, String> extraInfo, | ||
| List<LanguageRequirementResponse> languageRequirements | ||
| ) { | ||
|
|
||
| public static AdminUnivApplyInfoResponse from(UnivApplyInfo univApplyInfo) { | ||
| return new AdminUnivApplyInfoResponse( | ||
| univApplyInfo.getId(), | ||
| univApplyInfo.getTermId(), | ||
| univApplyInfo.getHomeUniversity() != null ? univApplyInfo.getHomeUniversity().getId() : null, | ||
| univApplyInfo.getUniversity().getId(), | ||
| univApplyInfo.getKoreanName(), | ||
| univApplyInfo.getStudentCapacity(), | ||
| univApplyInfo.getSemesterAvailableForDispatch(), | ||
| univApplyInfo.getSemesterRequirement(), | ||
| univApplyInfo.getDetailsForLanguage(), | ||
| univApplyInfo.getGpaRequirement(), | ||
| univApplyInfo.getGpaRequirementCriteria(), | ||
| univApplyInfo.getDetailsForAccommodation(), | ||
| univApplyInfo.getExtraInfo(), | ||
| univApplyInfo.getLanguageRequirements().stream() | ||
| .map(LanguageRequirementResponse::from) | ||
| .sorted() | ||
| .toList() | ||
| ); | ||
| } | ||
| } |
20 changes: 20 additions & 0 deletions
20
...ava/com/example/solidconnection/admin/university/dto/AdminUnivApplyInfoUpdateRequest.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,20 @@ | ||
| package com.example.solidconnection.admin.university.dto; | ||
|
|
||
| import com.example.solidconnection.university.domain.SemesterAvailableForDispatch; | ||
| import jakarta.validation.Valid; | ||
| import jakarta.validation.constraints.NotNull; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| public record AdminUnivApplyInfoUpdateRequest( | ||
| Integer studentCapacity, | ||
| SemesterAvailableForDispatch semesterAvailableForDispatch, | ||
| String semesterRequirement, | ||
| String detailsForLanguage, | ||
| String gpaRequirement, | ||
| String gpaRequirementCriteria, | ||
| String detailsForAccommodation, | ||
| Map<String, String> extraInfo, | ||
| @Valid List<@NotNull AdminUnivApplyInfoLanguageRequirementRequest> languageRequirements | ||
| ) { | ||
| } |
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
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
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
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.
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.