Skip to content

Commit 57edb8e

Browse files
nayonsosonayonsoso
committed
refactor: 좋아요한 대학 도메인 이름 변경
- LikedUniversity -> LikedUnivApplyInfo
1 parent 7172b58 commit 57edb8e

8 files changed

Lines changed: 35 additions & 32 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package com.example.solidconnection.siteuser.repository;
22

33
import com.example.solidconnection.siteuser.domain.SiteUser;
4-
import com.example.solidconnection.university.domain.LikedUniversity;
4+
import com.example.solidconnection.university.domain.LikedUnivApplyInfo;
55
import com.example.solidconnection.university.domain.UnivApplyInfo;
66
import org.springframework.data.jpa.repository.JpaRepository;
77

88
import java.util.List;
99
import java.util.Optional;
1010

11-
public interface LikedUniversityRepository extends JpaRepository<LikedUniversity, Long> {
11+
public interface LikedUniversityRepository extends JpaRepository<LikedUnivApplyInfo, Long> {
1212

13-
List<LikedUniversity> findAllBySiteUser_Id(long siteUserId);
13+
List<LikedUnivApplyInfo> findAllBySiteUser_Id(long siteUserId);
1414

1515
int countBySiteUser_Id(long siteUserId);
1616

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.example.solidconnection.siteuser.dto.MyPageResponse;
99
import com.example.solidconnection.siteuser.repository.LikedUniversityRepository;
1010
import com.example.solidconnection.siteuser.repository.SiteUserRepository;
11-
import com.example.solidconnection.university.domain.LikedUniversity;
11+
import com.example.solidconnection.university.domain.LikedUnivApplyInfo;
1212
import com.example.solidconnection.university.dto.UniversityInfoForApplyPreviewResponse;
1313
import lombok.RequiredArgsConstructor;
1414
import org.springframework.stereotype.Service;
@@ -95,7 +95,7 @@ private boolean isDefaultProfileImage(String profileImageUrl) {
9595
* */
9696
@Transactional(readOnly = true)
9797
public List<UniversityInfoForApplyPreviewResponse> getWishUniversity(SiteUser siteUser) {
98-
List<LikedUniversity> likedUniversities = likedUniversityRepository.findAllBySiteUser_Id(siteUser.getId());
98+
List<LikedUnivApplyInfo> likedUniversities = likedUniversityRepository.findAllBySiteUser_Id(siteUser.getId());
9999
return likedUniversities.stream()
100100
.map(likedUniversity -> UniversityInfoForApplyPreviewResponse.from(likedUniversity.getUnivApplyInfo()))
101101
.toList();

src/main/java/com/example/solidconnection/university/domain/LikedUniversity.java renamed to src/main/java/com/example/solidconnection/university/domain/LikedUnivApplyInfo.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@
1919
@Builder
2020
@AllArgsConstructor
2121
@NoArgsConstructor
22-
@Table(uniqueConstraints = {
22+
@Table(
23+
name = "liked_university_info_for_apply",
24+
uniqueConstraints = {
2325
@UniqueConstraint(
2426
name = "uk_liked_university_site_user_id_university_info_for_apply_id",
2527
columnNames = {"site_user_id", "university_info_for_apply_id"}
2628
)
2729
})
28-
public class LikedUniversity {
30+
public class LikedUnivApplyInfo {
2931

3032
@Id
3133
@GeneratedValue(strategy = GenerationType.IDENTITY)

‎src/main/java/com/example/solidconnection/university/service/UniversityLikeService.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.example.solidconnection.common.exception.CustomException;
44
import com.example.solidconnection.siteuser.domain.SiteUser;
55
import com.example.solidconnection.siteuser.repository.LikedUniversityRepository;
6-
import com.example.solidconnection.university.domain.LikedUniversity;
6+
import com.example.solidconnection.university.domain.LikedUnivApplyInfo;
77
import com.example.solidconnection.university.domain.UnivApplyInfo;
88
import com.example.solidconnection.university.dto.IsLikeResponse;
99
import com.example.solidconnection.university.dto.LikeResultResponse;
@@ -38,16 +38,16 @@ public class UniversityLikeService {
3838
public LikeResultResponse likeUniversity(SiteUser siteUser, Long universityInfoForApplyId) {
3939
UnivApplyInfo univApplyInfo = univApplyInfoRepository.getUnivApplyInfoById(universityInfoForApplyId);
4040

41-
Optional<LikedUniversity> optionalLikedUniversity = likedUniversityRepository.findBySiteUserAndUnivApplyInfo(siteUser, univApplyInfo);
41+
Optional<LikedUnivApplyInfo> optionalLikedUniversity = likedUniversityRepository.findBySiteUserAndUnivApplyInfo(siteUser, univApplyInfo);
4242
if (optionalLikedUniversity.isPresent()) {
4343
throw new CustomException(ALREADY_LIKED_UNIVERSITY);
4444
}
4545

46-
LikedUniversity likedUniversity = LikedUniversity.builder()
46+
LikedUnivApplyInfo likedUnivApplyInfo = LikedUnivApplyInfo.builder()
4747
.univApplyInfo(univApplyInfo)
4848
.siteUser(siteUser)
4949
.build();
50-
likedUniversityRepository.save(likedUniversity);
50+
likedUniversityRepository.save(likedUnivApplyInfo);
5151
return new LikeResultResponse(LIKE_SUCCESS_MESSAGE);
5252
}
5353

@@ -58,7 +58,7 @@ public LikeResultResponse likeUniversity(SiteUser siteUser, Long universityInfoF
5858
public LikeResultResponse cancelLikeUniversity(SiteUser siteUser, long universityInfoForApplyId) throws CustomException {
5959
UnivApplyInfo univApplyInfo = univApplyInfoRepository.getUnivApplyInfoById(universityInfoForApplyId);
6060

61-
Optional<LikedUniversity> optionalLikedUniversity = likedUniversityRepository.findBySiteUserAndUnivApplyInfo(siteUser, univApplyInfo);
61+
Optional<LikedUnivApplyInfo> optionalLikedUniversity = likedUniversityRepository.findBySiteUserAndUnivApplyInfo(siteUser, univApplyInfo);
6262
if (optionalLikedUniversity.isEmpty()) {
6363
throw new CustomException(NOT_LIKED_UNIVERSITY);
6464
}

‎src/main/resources/db/migration/V17__rename_like_university.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE liked_university RENAME liked_university_info_for_apply;

‎src/test/java/com/example/solidconnection/siteuser/service/MyPageServiceTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import com.example.solidconnection.siteuser.repository.LikedUniversityRepository;
1414
import com.example.solidconnection.siteuser.repository.SiteUserRepository;
1515
import com.example.solidconnection.support.TestContainerSpringBootTest;
16-
import com.example.solidconnection.university.domain.LikedUniversity;
16+
import com.example.solidconnection.university.domain.LikedUnivApplyInfo;
1717
import com.example.solidconnection.university.dto.UniversityInfoForApplyPreviewResponse;
1818
import com.example.solidconnection.university.fixture.UnivApplyInfoFixture;
1919
import org.junit.jupiter.api.Assertions;
@@ -193,13 +193,13 @@ void setUp() {
193193
}
194194

195195
private int createLikedUniversities(SiteUser testUser) {
196-
LikedUniversity likedUniversity1 = new LikedUniversity(null, univApplyInfoFixture.괌대학_A_지원_정보(), testUser);
197-
LikedUniversity likedUniversity2 = new LikedUniversity(null, univApplyInfoFixture.메이지대학_지원_정보(), testUser);
198-
LikedUniversity likedUniversity3 = new LikedUniversity(null, univApplyInfoFixture.코펜하겐IT대학_지원_정보(), testUser);
196+
LikedUnivApplyInfo likedUnivApplyInfo1 = new LikedUnivApplyInfo(null, univApplyInfoFixture.괌대학_A_지원_정보(), testUser);
197+
LikedUnivApplyInfo likedUnivApplyInfo2 = new LikedUnivApplyInfo(null, univApplyInfoFixture.메이지대학_지원_정보(), testUser);
198+
LikedUnivApplyInfo likedUnivApplyInfo3 = new LikedUnivApplyInfo(null, univApplyInfoFixture.코펜하겐IT대학_지원_정보(), testUser);
199199

200-
likedUniversityRepository.save(likedUniversity1);
201-
likedUniversityRepository.save(likedUniversity2);
202-
likedUniversityRepository.save(likedUniversity3);
200+
likedUniversityRepository.save(likedUnivApplyInfo1);
201+
likedUniversityRepository.save(likedUnivApplyInfo2);
202+
likedUniversityRepository.save(likedUnivApplyInfo3);
203203
return likedUniversityRepository.countBySiteUser_Id(testUser.getId());
204204
}
205205

‎src/test/java/com/example/solidconnection/university/repository/UniversityLikeRepositoryTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.example.solidconnection.siteuser.fixture.SiteUserFixture;
55
import com.example.solidconnection.siteuser.repository.LikedUniversityRepository;
66
import com.example.solidconnection.support.TestContainerSpringBootTest;
7-
import com.example.solidconnection.university.domain.LikedUniversity;
7+
import com.example.solidconnection.university.domain.LikedUnivApplyInfo;
88
import com.example.solidconnection.university.domain.UnivApplyInfo;
99
import com.example.solidconnection.university.fixture.UnivApplyInfoFixture;
1010
import org.junit.jupiter.api.DisplayName;
@@ -37,10 +37,10 @@ class 사용자와_좋아요한_대학은_복합_유니크_제약조건을_갖
3737
SiteUser user = siteUserFixture.사용자();
3838
UnivApplyInfo university = univApplyInfoFixture.괌대학_A_지원_정보();
3939

40-
LikedUniversity firstLike = createLikedUniversity(user, university);
40+
LikedUnivApplyInfo firstLike = createLikedUniversity(user, university);
4141
likedUniversityRepository.save(firstLike);
4242

43-
LikedUniversity secondLike = createLikedUniversity(user, university);
43+
LikedUnivApplyInfo secondLike = createLikedUniversity(user, university);
4444

4545
// when & then
4646
assertThatCode(() -> likedUniversityRepository.save(secondLike))
@@ -54,10 +54,10 @@ class 사용자와_좋아요한_대학은_복합_유니크_제약조건을_갖
5454
SiteUser user2 = siteUserFixture.사용자(2, "user2");
5555
UnivApplyInfo university = univApplyInfoFixture.괌대학_A_지원_정보();
5656

57-
LikedUniversity firstLike = createLikedUniversity(user1, university);
57+
LikedUnivApplyInfo firstLike = createLikedUniversity(user1, university);
5858
likedUniversityRepository.save(firstLike);
5959

60-
LikedUniversity secondLike = createLikedUniversity(user2, university);
60+
LikedUnivApplyInfo secondLike = createLikedUniversity(user2, university);
6161

6262
// when & then
6363
assertThatCode(() -> likedUniversityRepository.save(secondLike)).doesNotThrowAnyException();
@@ -70,18 +70,18 @@ class 사용자와_좋아요한_대학은_복합_유니크_제약조건을_갖
7070
UnivApplyInfo university1 = univApplyInfoFixture.괌대학_A_지원_정보();
7171
UnivApplyInfo university2 = univApplyInfoFixture.메이지대학_지원_정보();
7272

73-
LikedUniversity firstLike = createLikedUniversity(user, university1);
73+
LikedUnivApplyInfo firstLike = createLikedUniversity(user, university1);
7474
likedUniversityRepository.save(firstLike);
7575

76-
LikedUniversity secondLike = createLikedUniversity(user, university2);
76+
LikedUnivApplyInfo secondLike = createLikedUniversity(user, university2);
7777

7878
// when & then
7979
assertThatCode(() -> likedUniversityRepository.save(secondLike)).doesNotThrowAnyException();
8080
}
8181
}
8282

83-
private LikedUniversity createLikedUniversity(SiteUser siteUser, UnivApplyInfo univApplyInfo) {
84-
return LikedUniversity.builder()
83+
private LikedUnivApplyInfo createLikedUniversity(SiteUser siteUser, UnivApplyInfo univApplyInfo) {
84+
return LikedUnivApplyInfo.builder()
8585
.siteUser(siteUser)
8686
.univApplyInfo(univApplyInfo)
8787
.build();

‎src/test/java/com/example/solidconnection/university/service/UniversityLikeServiceTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.example.solidconnection.siteuser.fixture.SiteUserFixture;
66
import com.example.solidconnection.siteuser.repository.LikedUniversityRepository;
77
import com.example.solidconnection.support.TestContainerSpringBootTest;
8-
import com.example.solidconnection.university.domain.LikedUniversity;
8+
import com.example.solidconnection.university.domain.LikedUnivApplyInfo;
99
import com.example.solidconnection.university.domain.UnivApplyInfo;
1010
import com.example.solidconnection.university.dto.IsLikeResponse;
1111
import com.example.solidconnection.university.dto.LikeResultResponse;
@@ -152,10 +152,10 @@ class 대학_좋아요를_취소한다 {
152152
}
153153

154154
private void saveLikedUniversity(SiteUser siteUser, UnivApplyInfo univApplyInfo) {
155-
LikedUniversity likedUniversity = LikedUniversity.builder()
155+
LikedUnivApplyInfo likedUnivApplyInfo = LikedUnivApplyInfo.builder()
156156
.siteUser(siteUser)
157157
.univApplyInfo(univApplyInfo)
158158
.build();
159-
likedUniversityRepository.save(likedUniversity);
159+
likedUniversityRepository.save(likedUnivApplyInfo);
160160
}
161161
}

0 commit comments

Comments
 (0)