Skip to content

Commit c63647f

Browse files
whqtkerwhqtker
committed
refactor: rename UniversityInfoForApply to UnivApplyInfo
- 엔티티명만 변경, 이에 따른 변수명 변경
1 parent ac0f60e commit c63647f

33 files changed

Lines changed: 223 additions & 219 deletions

‎src/main/java/com/example/solidconnection/application/domain/Application.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.example.solidconnection.application.domain;
22

33
import com.example.solidconnection.siteuser.domain.SiteUser;
4-
import com.example.solidconnection.university.domain.UniversityInfoForApply;
4+
import com.example.solidconnection.university.domain.UnivApplyInfo;
55
import jakarta.persistence.Column;
66
import jakarta.persistence.Embedded;
77
import jakarta.persistence.Entity;
@@ -55,13 +55,13 @@ public class Application {
5555
private boolean isDelete = false;
5656

5757
@ManyToOne(fetch = FetchType.LAZY)
58-
private UniversityInfoForApply firstChoiceUniversity;
58+
private UnivApplyInfo firstChoiceUniversity;
5959

6060
@ManyToOne(fetch = FetchType.LAZY)
61-
private UniversityInfoForApply secondChoiceUniversity;
61+
private UnivApplyInfo secondChoiceUniversity;
6262

6363
@ManyToOne(fetch = FetchType.LAZY)
64-
private UniversityInfoForApply thirdChoiceUniversity;
64+
private UnivApplyInfo thirdChoiceUniversity;
6565

6666
@ManyToOne(fetch = FetchType.LAZY)
6767
private SiteUser siteUser;
@@ -85,9 +85,9 @@ public Application(
8585
LanguageTest languageTest,
8686
String term,
8787
Integer updateCount,
88-
UniversityInfoForApply firstChoiceUniversity,
89-
UniversityInfoForApply secondChoiceUniversity,
90-
UniversityInfoForApply thirdChoiceUniversity,
88+
UnivApplyInfo firstChoiceUniversity,
89+
UnivApplyInfo secondChoiceUniversity,
90+
UnivApplyInfo thirdChoiceUniversity,
9191
String nicknameForApply) {
9292
this.siteUser = siteUser;
9393
this.gpa = gpa;
@@ -106,9 +106,9 @@ public Application(
106106
Gpa gpa,
107107
LanguageTest languageTest,
108108
String term,
109-
UniversityInfoForApply firstChoiceUniversity,
110-
UniversityInfoForApply secondChoiceUniversity,
111-
UniversityInfoForApply thirdChoiceUniversity,
109+
UnivApplyInfo firstChoiceUniversity,
110+
UnivApplyInfo secondChoiceUniversity,
111+
UnivApplyInfo thirdChoiceUniversity,
112112
String nicknameForApply) {
113113
this.siteUser = siteUser;
114114
this.gpa = gpa;
@@ -127,9 +127,9 @@ public void setIsDeleteTrue() {
127127
}
128128

129129
public void updateUniversityChoice(
130-
UniversityInfoForApply firstChoiceUniversity,
131-
UniversityInfoForApply secondChoiceUniversity,
132-
UniversityInfoForApply thirdChoiceUniversity,
130+
UnivApplyInfo firstChoiceUniversity,
131+
UnivApplyInfo secondChoiceUniversity,
132+
UnivApplyInfo thirdChoiceUniversity,
133133
String nicknameForApply) {
134134
if (this.firstChoiceUniversity != null) {
135135
this.updateCount++;

‎src/main/java/com/example/solidconnection/application/dto/UniversityApplicantsResponse.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.example.solidconnection.application.dto;
22

3-
import com.example.solidconnection.university.domain.UniversityInfoForApply;
3+
import com.example.solidconnection.university.domain.UnivApplyInfo;
44

55
import java.util.List;
66

@@ -11,12 +11,12 @@ public record UniversityApplicantsResponse(
1111
String country,
1212
List<ApplicantResponse> applicants) {
1313

14-
public static UniversityApplicantsResponse of(UniversityInfoForApply universityInfoForApply, List<ApplicantResponse> applicant) {
14+
public static UniversityApplicantsResponse of(UnivApplyInfo univApplyInfo, List<ApplicantResponse> applicant) {
1515
return new UniversityApplicantsResponse(
16-
universityInfoForApply.getKoreanName(),
17-
universityInfoForApply.getStudentCapacity(),
18-
universityInfoForApply.getUniversity().getRegion().getKoreanName(),
19-
universityInfoForApply.getUniversity().getCountry().getKoreanName(),
16+
univApplyInfo.getKoreanName(),
17+
univApplyInfo.getStudentCapacity(),
18+
univApplyInfo.getUniversity().getRegion().getKoreanName(),
19+
univApplyInfo.getUniversity().getCountry().getKoreanName(),
2020
applicant);
2121
}
2222
}

‎src/main/java/com/example/solidconnection/application/repository/ApplicationRepository.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.example.solidconnection.application.domain.VerifyStatus;
55
import com.example.solidconnection.common.exception.CustomException;
66
import com.example.solidconnection.siteuser.domain.SiteUser;
7-
import com.example.solidconnection.university.domain.UniversityInfoForApply;
7+
import com.example.solidconnection.university.domain.UnivApplyInfo;
88
import org.springframework.data.jpa.repository.JpaRepository;
99
import org.springframework.data.jpa.repository.Query;
1010
import org.springframework.data.repository.query.Param;
@@ -21,13 +21,13 @@ public interface ApplicationRepository extends JpaRepository<Application, Long>
2121
boolean existsByNicknameForApply(String nicknameForApply);
2222

2323
List<Application> findAllByFirstChoiceUniversityAndVerifyStatusAndTermAndIsDeleteFalse(
24-
UniversityInfoForApply firstChoiceUniversity, VerifyStatus verifyStatus, String term);
24+
UnivApplyInfo firstChoiceUniversity, VerifyStatus verifyStatus, String term);
2525

2626
List<Application> findAllBySecondChoiceUniversityAndVerifyStatusAndTermAndIsDeleteFalse(
27-
UniversityInfoForApply secondChoiceUniversity, VerifyStatus verifyStatus, String term);
27+
UnivApplyInfo secondChoiceUniversity, VerifyStatus verifyStatus, String term);
2828

2929
List<Application> findAllByThirdChoiceUniversityAndVerifyStatusAndTermAndIsDeleteFalse(
30-
UniversityInfoForApply thirdChoiceUniversity, VerifyStatus verifyStatus, String term);
30+
UnivApplyInfo thirdChoiceUniversity, VerifyStatus verifyStatus, String term);
3131

3232
@Query("""
3333
SELECT a FROM Application a

‎src/main/java/com/example/solidconnection/application/service/ApplicationQueryService.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import com.example.solidconnection.common.exception.CustomException;
1111
import com.example.solidconnection.siteuser.domain.SiteUser;
1212
import com.example.solidconnection.university.domain.University;
13-
import com.example.solidconnection.university.domain.UniversityInfoForApply;
13+
import com.example.solidconnection.university.domain.UnivApplyInfo;
1414
import com.example.solidconnection.university.repository.UniversityInfoForApplyRepository;
1515
import com.example.solidconnection.university.repository.custom.UniversityFilterRepositoryImpl;
1616
import lombok.RequiredArgsConstructor;
@@ -65,13 +65,13 @@ public ApplicationsResponse getApplicantsByUserApplications(SiteUser siteUser) {
6565
Application userLatestApplication = applicationRepository.getApplicationBySiteUserAndTerm(siteUser, term);
6666
List<University> userAppliedUniversities = Arrays.asList(
6767
Optional.ofNullable(userLatestApplication.getFirstChoiceUniversity())
68-
.map(UniversityInfoForApply::getUniversity)
68+
.map(UnivApplyInfo::getUniversity)
6969
.orElse(null),
7070
Optional.ofNullable(userLatestApplication.getSecondChoiceUniversity())
71-
.map(UniversityInfoForApply::getUniversity)
71+
.map(UnivApplyInfo::getUniversity)
7272
.orElse(null),
7373
Optional.ofNullable(userLatestApplication.getThirdChoiceUniversity())
74-
.map(UniversityInfoForApply::getUniversity)
74+
.map(UnivApplyInfo::getUniversity)
7575
.orElse(null)
7676
).stream()
7777
.filter(Objects::nonNull)
@@ -120,7 +120,7 @@ private List<UniversityApplicantsResponse> getThirdChoiceApplicants(List<Univers
120120
private List<UniversityApplicantsResponse> getApplicantsByChoice(
121121
List<University> searchedUniversities,
122122
SiteUser siteUser,
123-
Function<UniversityInfoForApply, List<Application>> findApplicationsByChoice) {
123+
Function<UnivApplyInfo, List<Application>> findApplicationsByChoice) {
124124
return universityInfoForApplyRepository.findByUniversitiesAndTerm(searchedUniversities, term).stream()
125125
.map(universityInfoForApply -> UniversityApplicantsResponse.of(
126126
universityInfoForApply,

‎src/main/java/com/example/solidconnection/application/service/ApplicationSubmissionService.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import com.example.solidconnection.score.repository.GpaScoreRepository;
1414
import com.example.solidconnection.score.repository.LanguageTestScoreRepository;
1515
import com.example.solidconnection.siteuser.domain.SiteUser;
16-
import com.example.solidconnection.university.domain.UniversityInfoForApply;
16+
import com.example.solidconnection.university.domain.UnivApplyInfo;
1717
import com.example.solidconnection.university.repository.UniversityInfoForApplyRepository;
1818
import lombok.RequiredArgsConstructor;
1919
import org.springframework.beans.factory.annotation.Value;
@@ -55,12 +55,12 @@ public ApplicationSubmissionResponse apply(SiteUser siteUser, ApplyRequest apply
5555
GpaScore gpaScore = getValidGpaScore(siteUser, applyRequest.gpaScoreId());
5656
LanguageTestScore languageTestScore = getValidLanguageTestScore(siteUser, applyRequest.languageTestScoreId());
5757

58-
UniversityInfoForApply firstChoiceUniversity = universityInfoForApplyRepository
58+
UnivApplyInfo firstChoiceUniversity = universityInfoForApplyRepository
5959
.getUniversityInfoForApplyByIdAndTerm(universityChoiceRequest.firstChoiceUniversityId(), term);
60-
UniversityInfoForApply secondChoiceUniversity = Optional.ofNullable(universityChoiceRequest.secondChoiceUniversityId())
60+
UnivApplyInfo secondChoiceUniversity = Optional.ofNullable(universityChoiceRequest.secondChoiceUniversityId())
6161
.map(id -> universityInfoForApplyRepository.getUniversityInfoForApplyByIdAndTerm(id, term))
6262
.orElse(null);
63-
UniversityInfoForApply thirdChoiceUniversity = Optional.ofNullable(universityChoiceRequest.thirdChoiceUniversityId())
63+
UnivApplyInfo thirdChoiceUniversity = Optional.ofNullable(universityChoiceRequest.thirdChoiceUniversityId())
6464
.map(id -> universityInfoForApplyRepository.getUniversityInfoForApplyByIdAndTerm(id, term))
6565
.orElse(null);
6666

‎src/main/java/com/example/solidconnection/siteuser/repository/LikedUniversityRepository.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.example.solidconnection.siteuser.domain.SiteUser;
44
import com.example.solidconnection.university.domain.LikedUniversity;
5-
import com.example.solidconnection.university.domain.UniversityInfoForApply;
5+
import com.example.solidconnection.university.domain.UnivApplyInfo;
66
import org.springframework.data.jpa.repository.JpaRepository;
77

88
import java.util.List;
@@ -14,5 +14,5 @@ public interface LikedUniversityRepository extends JpaRepository<LikedUniversity
1414

1515
int countBySiteUser_Id(long siteUserId);
1616

17-
Optional<LikedUniversity> findBySiteUserAndUniversityInfoForApply(SiteUser siteUser, UniversityInfoForApply universityInfoForApply);
17+
Optional<LikedUniversity> findBySiteUserAndUnivApplyInfo(SiteUser siteUser, UnivApplyInfo univApplyInfo);
1818
}

‎src/main/java/com/example/solidconnection/siteuser/service/MyPageService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ private boolean isDefaultProfileImage(String profileImageUrl) {
9494
public List<UniversityInfoForApplyPreviewResponse> getWishUniversity(SiteUser siteUser) {
9595
List<LikedUniversity> likedUniversities = likedUniversityRepository.findAllBySiteUser_Id(siteUser.getId());
9696
return likedUniversities.stream()
97-
.map(likedUniversity -> UniversityInfoForApplyPreviewResponse.from(likedUniversity.getUniversityInfoForApply()))
97+
.map(likedUniversity -> UniversityInfoForApplyPreviewResponse.from(likedUniversity.getUnivApplyInfo()))
9898
.toList();
9999
}
100100
}

‎src/main/java/com/example/solidconnection/university/domain/LanguageRequirement.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import jakarta.persistence.GeneratedValue;
99
import jakarta.persistence.GenerationType;
1010
import jakarta.persistence.Id;
11+
import jakarta.persistence.JoinColumn;
1112
import jakarta.persistence.ManyToOne;
1213
import lombok.AccessLevel;
1314
import lombok.AllArgsConstructor;
@@ -32,5 +33,6 @@ public class LanguageRequirement {
3233
private String minScore;
3334

3435
@ManyToOne(fetch = FetchType.LAZY)
35-
private UniversityInfoForApply universityInfoForApply;
36+
@JoinColumn(name = "university_info_for_apply_id")
37+
private UnivApplyInfo univApplyInfo;
3638
}

‎src/main/java/com/example/solidconnection/university/domain/LikedUniversity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class LikedUniversity {
2323
private Long id;
2424

2525
@ManyToOne
26-
private UniversityInfoForApply universityInfoForApply;
26+
private UnivApplyInfo univApplyInfo;
2727

2828
@ManyToOne
2929
private SiteUser siteUser;

src/main/java/com/example/solidconnection/university/domain/UniversityInfoForApply.java renamed to src/main/java/com/example/solidconnection/university/domain/UnivApplyInfo.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import jakarta.persistence.Id;
1111
import jakarta.persistence.ManyToOne;
1212
import jakarta.persistence.OneToMany;
13+
import jakarta.persistence.Table;
1314
import lombok.AccessLevel;
1415
import lombok.AllArgsConstructor;
1516
import lombok.EqualsAndHashCode;
@@ -24,7 +25,8 @@
2425
@AllArgsConstructor(access = AccessLevel.PUBLIC)
2526
@NoArgsConstructor(access = AccessLevel.PROTECTED)
2627
@Entity
27-
public class UniversityInfoForApply {
28+
@Table(name = "university_info_for_apply")
29+
public class UnivApplyInfo {
2830

2931
@Id
3032
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -74,7 +76,7 @@ public class UniversityInfoForApply {
7476
@Column(length = 1000)
7577
private String details;
7678

77-
@OneToMany(mappedBy = "universityInfoForApply", fetch = FetchType.EAGER)
79+
@OneToMany(mappedBy = "univApplyInfo", fetch = FetchType.EAGER)
7880
private Set<LanguageRequirement> languageRequirements = new HashSet<>();
7981

8082
@ManyToOne(fetch = FetchType.EAGER)

0 commit comments

Comments
 (0)