Skip to content

Commit 907b79c

Browse files
nayonsosonayonsoso
committed
refactor: LikedUnivApplyInfoRepository 패키지 이동
- siteuser 하위 -> university 하위
1 parent c6dc45b commit 907b79c

6 files changed

Lines changed: 31 additions & 32 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.example.solidconnection.s3.service.S3Service;
77
import com.example.solidconnection.siteuser.domain.SiteUser;
88
import com.example.solidconnection.siteuser.dto.MyPageResponse;
9-
import com.example.solidconnection.siteuser.repository.LikedUniversityRepository;
9+
import com.example.solidconnection.university.repository.LikedUnivApplyInfoRepository;
1010
import com.example.solidconnection.siteuser.repository.SiteUserRepository;
1111
import com.example.solidconnection.university.domain.LikedUnivApplyInfo;
1212
import com.example.solidconnection.university.dto.UniversityInfoForApplyPreviewResponse;
@@ -31,15 +31,15 @@ public class MyPageService {
3131
public static final DateTimeFormatter NICKNAME_LAST_CHANGE_DATE_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
3232

3333
private final SiteUserRepository siteUserRepository;
34-
private final LikedUniversityRepository likedUniversityRepository;
34+
private final LikedUnivApplyInfoRepository likedUnivApplyInfoRepository;
3535
private final S3Service s3Service;
3636

3737
/*
3838
* 마이페이지 정보를 조회한다.
3939
* */
4040
@Transactional(readOnly = true)
4141
public MyPageResponse getMyPageInfo(SiteUser siteUser) {
42-
int likedUniversityCount = likedUniversityRepository.countBySiteUser_Id(siteUser.getId());
42+
int likedUniversityCount = likedUnivApplyInfoRepository.countBySiteUser_Id(siteUser.getId());
4343
return MyPageResponse.of(siteUser, likedUniversityCount);
4444
}
4545

@@ -95,7 +95,7 @@ private boolean isDefaultProfileImage(String profileImageUrl) {
9595
* */
9696
@Transactional(readOnly = true)
9797
public List<UniversityInfoForApplyPreviewResponse> getWishUniversity(SiteUser siteUser) {
98-
List<LikedUnivApplyInfo> likedUniversities = likedUniversityRepository.findAllBySiteUser_Id(siteUser.getId());
98+
List<LikedUnivApplyInfo> likedUniversities = likedUnivApplyInfoRepository.findAllBySiteUser_Id(siteUser.getId());
9999
return likedUniversities.stream()
100100
.map(likedUniversity -> UniversityInfoForApplyPreviewResponse.from(likedUniversity.getUnivApplyInfo()))
101101
.toList();

src/main/java/com/example/solidconnection/siteuser/repository/LikedUniversityRepository.java renamed to src/main/java/com/example/solidconnection/university/repository/LikedUnivApplyInfoRepository.java

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

33
import com.example.solidconnection.siteuser.domain.SiteUser;
44
import com.example.solidconnection.university.domain.LikedUnivApplyInfo;
@@ -8,7 +8,7 @@
88
import java.util.List;
99
import java.util.Optional;
1010

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

1313
List<LikedUnivApplyInfo> findAllBySiteUser_Id(long siteUserId);
1414

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

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

33
import com.example.solidconnection.common.exception.CustomException;
44
import com.example.solidconnection.siteuser.domain.SiteUser;
5-
import com.example.solidconnection.siteuser.repository.LikedUniversityRepository;
5+
import com.example.solidconnection.university.repository.LikedUnivApplyInfoRepository;
66
import com.example.solidconnection.university.domain.LikedUnivApplyInfo;
77
import com.example.solidconnection.university.domain.UnivApplyInfo;
88
import com.example.solidconnection.university.dto.IsLikeResponse;
@@ -26,7 +26,7 @@ public class UnivApplyInfoLikeService {
2626
public static final String LIKE_CANCELED_MESSAGE = "LIKE_CANCELED";
2727

2828
private final UnivApplyInfoRepository univApplyInfoRepository;
29-
private final LikedUniversityRepository likedUniversityRepository;
29+
private final LikedUnivApplyInfoRepository likedUnivApplyInfoRepository;
3030

3131
@Value("${university.term}")
3232
public String term;
@@ -38,7 +38,7 @@ public class UnivApplyInfoLikeService {
3838
public LikeResultResponse likeUnivApplyInfo(SiteUser siteUser, Long univApplyInfoId) {
3939
UnivApplyInfo univApplyInfo = univApplyInfoRepository.getUnivApplyInfoById(univApplyInfoId);
4040

41-
Optional<LikedUnivApplyInfo> optionalLikedUnivApplyInfo = likedUniversityRepository.findBySiteUserAndUnivApplyInfo(siteUser, univApplyInfo);
41+
Optional<LikedUnivApplyInfo> optionalLikedUnivApplyInfo = likedUnivApplyInfoRepository.findBySiteUserAndUnivApplyInfo(siteUser, univApplyInfo);
4242
if (optionalLikedUnivApplyInfo.isPresent()) {
4343
throw new CustomException(ALREADY_LIKED_UNIVERSITY);
4444
}
@@ -47,7 +47,7 @@ public LikeResultResponse likeUnivApplyInfo(SiteUser siteUser, Long univApplyInf
4747
.univApplyInfo(univApplyInfo)
4848
.siteUser(siteUser)
4949
.build();
50-
likedUniversityRepository.save(likedUnivApplyInfo);
50+
likedUnivApplyInfoRepository.save(likedUnivApplyInfo);
5151
return new LikeResultResponse(LIKE_SUCCESS_MESSAGE);
5252
}
5353

@@ -58,12 +58,12 @@ public LikeResultResponse likeUnivApplyInfo(SiteUser siteUser, Long univApplyInf
5858
public LikeResultResponse cancelLikeUnivApplyInfo(SiteUser siteUser, long univApplyInfoId) {
5959
UnivApplyInfo univApplyInfo = univApplyInfoRepository.getUnivApplyInfoById(univApplyInfoId);
6060

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

66-
likedUniversityRepository.delete(optionalLikedUnivApplyInfo.get());
66+
likedUnivApplyInfoRepository.delete(optionalLikedUnivApplyInfo.get());
6767
return new LikeResultResponse(LIKE_CANCELED_MESSAGE);
6868
}
6969

@@ -73,7 +73,7 @@ public LikeResultResponse cancelLikeUnivApplyInfo(SiteUser siteUser, long univAp
7373
@Transactional(readOnly = true)
7474
public IsLikeResponse getIsLiked(SiteUser siteUser, Long univApplyInfoId) {
7575
UnivApplyInfo univApplyInfo = univApplyInfoRepository.getUnivApplyInfoById(univApplyInfoId);
76-
boolean isLike = likedUniversityRepository.findBySiteUserAndUnivApplyInfo(siteUser, univApplyInfo).isPresent();
76+
boolean isLike = likedUnivApplyInfoRepository.findBySiteUserAndUnivApplyInfo(siteUser, univApplyInfo).isPresent();
7777
return new IsLikeResponse(isLike);
7878
}
7979
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import com.example.solidconnection.siteuser.dto.MyPageResponse;
1111
import com.example.solidconnection.siteuser.fixture.SiteUserFixture;
1212
import com.example.solidconnection.siteuser.fixture.SiteUserFixtureBuilder;
13-
import com.example.solidconnection.siteuser.repository.LikedUniversityRepository;
13+
import com.example.solidconnection.university.repository.LikedUnivApplyInfoRepository;
1414
import com.example.solidconnection.siteuser.repository.SiteUserRepository;
1515
import com.example.solidconnection.support.TestContainerSpringBootTest;
1616
import com.example.solidconnection.university.domain.LikedUnivApplyInfo;
@@ -54,7 +54,7 @@ class MyPageServiceTest {
5454
private SiteUserRepository siteUserRepository;
5555

5656
@Autowired
57-
private LikedUniversityRepository likedUniversityRepository;
57+
private LikedUnivApplyInfoRepository likedUnivApplyInfoRepository;
5858

5959
@Autowired
6060
private SiteUserFixture siteUserFixture;
@@ -197,10 +197,10 @@ private int createLikedUniversities(SiteUser testUser) {
197197
LikedUnivApplyInfo likedUnivApplyInfo2 = new LikedUnivApplyInfo(null, univApplyInfoFixture.메이지대학_지원_정보(), testUser);
198198
LikedUnivApplyInfo likedUnivApplyInfo3 = new LikedUnivApplyInfo(null, univApplyInfoFixture.코펜하겐IT대학_지원_정보(), testUser);
199199

200-
likedUniversityRepository.save(likedUnivApplyInfo1);
201-
likedUniversityRepository.save(likedUnivApplyInfo2);
202-
likedUniversityRepository.save(likedUnivApplyInfo3);
203-
return likedUniversityRepository.countBySiteUser_Id(testUser.getId());
200+
likedUnivApplyInfoRepository.save(likedUnivApplyInfo1);
201+
likedUnivApplyInfoRepository.save(likedUnivApplyInfo2);
202+
likedUnivApplyInfoRepository.save(likedUnivApplyInfo3);
203+
return likedUnivApplyInfoRepository.countBySiteUser_Id(testUser.getId());
204204
}
205205

206206
private MockMultipartFile createValidImageFile() {

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

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

33
import com.example.solidconnection.siteuser.domain.SiteUser;
44
import com.example.solidconnection.siteuser.fixture.SiteUserFixture;
5-
import com.example.solidconnection.siteuser.repository.LikedUniversityRepository;
65
import com.example.solidconnection.support.TestContainerSpringBootTest;
76
import com.example.solidconnection.university.domain.LikedUnivApplyInfo;
87
import com.example.solidconnection.university.domain.UnivApplyInfo;
@@ -20,7 +19,7 @@
2019
public class UniversityLikeRepositoryTest {
2120

2221
@Autowired
23-
private LikedUniversityRepository likedUniversityRepository;
22+
private LikedUnivApplyInfoRepository likedUnivApplyInfoRepository;
2423

2524
@Autowired
2625
private SiteUserFixture siteUserFixture;
@@ -38,12 +37,12 @@ class 사용자와_좋아요한_대학은_복합_유니크_제약조건을_갖
3837
UnivApplyInfo university = univApplyInfoFixture.괌대학_A_지원_정보();
3938

4039
LikedUnivApplyInfo firstLike = createLikedUniversity(user, university);
41-
likedUniversityRepository.save(firstLike);
40+
likedUnivApplyInfoRepository.save(firstLike);
4241

4342
LikedUnivApplyInfo secondLike = createLikedUniversity(user, university);
4443

4544
// when & then
46-
assertThatCode(() -> likedUniversityRepository.save(secondLike))
45+
assertThatCode(() -> likedUnivApplyInfoRepository.save(secondLike))
4746
.isInstanceOf(DataIntegrityViolationException.class);
4847
}
4948

@@ -55,12 +54,12 @@ class 사용자와_좋아요한_대학은_복합_유니크_제약조건을_갖
5554
UnivApplyInfo university = univApplyInfoFixture.괌대학_A_지원_정보();
5655

5756
LikedUnivApplyInfo firstLike = createLikedUniversity(user1, university);
58-
likedUniversityRepository.save(firstLike);
57+
likedUnivApplyInfoRepository.save(firstLike);
5958

6059
LikedUnivApplyInfo secondLike = createLikedUniversity(user2, university);
6160

6261
// when & then
63-
assertThatCode(() -> likedUniversityRepository.save(secondLike)).doesNotThrowAnyException();
62+
assertThatCode(() -> likedUnivApplyInfoRepository.save(secondLike)).doesNotThrowAnyException();
6463
}
6564

6665
@Test
@@ -71,12 +70,12 @@ class 사용자와_좋아요한_대학은_복합_유니크_제약조건을_갖
7170
UnivApplyInfo university2 = univApplyInfoFixture.메이지대학_지원_정보();
7271

7372
LikedUnivApplyInfo firstLike = createLikedUniversity(user, university1);
74-
likedUniversityRepository.save(firstLike);
73+
likedUnivApplyInfoRepository.save(firstLike);
7574

7675
LikedUnivApplyInfo secondLike = createLikedUniversity(user, university2);
7776

7877
// when & then
79-
assertThatCode(() -> likedUniversityRepository.save(secondLike)).doesNotThrowAnyException();
78+
assertThatCode(() -> likedUnivApplyInfoRepository.save(secondLike)).doesNotThrowAnyException();
8079
}
8180
}
8281

‎src/test/java/com/example/solidconnection/university/service/UnivApplyInfoLikeServiceTest.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.fixture.SiteUserFixture;
6-
import com.example.solidconnection.siteuser.repository.LikedUniversityRepository;
6+
import com.example.solidconnection.university.repository.LikedUnivApplyInfoRepository;
77
import com.example.solidconnection.support.TestContainerSpringBootTest;
88
import com.example.solidconnection.university.domain.LikedUnivApplyInfo;
99
import com.example.solidconnection.university.domain.UnivApplyInfo;
@@ -33,7 +33,7 @@ class UnivApplyInfoLikeServiceTest {
3333
private UnivApplyInfoLikeService univApplyInfoLikeService;
3434

3535
@Autowired
36-
private LikedUniversityRepository likedUniversityRepository;
36+
private LikedUnivApplyInfoRepository likedUnivApplyInfoRepository;
3737

3838
@Autowired
3939
private SiteUserFixture siteUserFixture;
@@ -61,7 +61,7 @@ class 대학_좋아요를_등록한다 {
6161
// then
6262
assertAll(
6363
() -> assertThat(response.result()).isEqualTo(LIKE_SUCCESS_MESSAGE),
64-
() -> assertThat(likedUniversityRepository.findBySiteUserAndUnivApplyInfo(
64+
() -> assertThat(likedUnivApplyInfoRepository.findBySiteUserAndUnivApplyInfo(
6565
user, 괌대학_A_지원_정보
6666
)).isPresent()
6767
);
@@ -93,7 +93,7 @@ class 대학_좋아요를_취소한다 {
9393
// then
9494
assertAll(
9595
() -> assertThat(response.result()).isEqualTo(LIKE_CANCELED_MESSAGE),
96-
() -> assertThat(likedUniversityRepository.findBySiteUserAndUnivApplyInfo(
96+
() -> assertThat(likedUnivApplyInfoRepository.findBySiteUserAndUnivApplyInfo(
9797
user, 괌대학_A_지원_정보
9898
)).isEmpty()
9999
);
@@ -156,6 +156,6 @@ private void saveLikedUniversity(SiteUser siteUser, UnivApplyInfo univApplyInfo)
156156
.siteUser(siteUser)
157157
.univApplyInfo(univApplyInfo)
158158
.build();
159-
likedUniversityRepository.save(likedUnivApplyInfo);
159+
likedUnivApplyInfoRepository.save(likedUnivApplyInfo);
160160
}
161161
}

0 commit comments

Comments
 (0)