Skip to content

Commit c6dc45b

Browse files
nayonsosonayonsoso
committed
refactor: UnivApplyInfo 사용하도록 likeService 변경
1 parent 57edb8e commit c6dc45b

3 files changed

Lines changed: 31 additions & 31 deletions

File tree

‎src/main/java/com/example/solidconnection/university/controller/UnivApplyInfoController.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.example.solidconnection.university.dto.UniversityDetailResponse;
1010
import com.example.solidconnection.university.dto.UniversityInfoForApplyPreviewResponse;
1111
import com.example.solidconnection.university.dto.UniversityRecommendsResponse;
12-
import com.example.solidconnection.university.service.UniversityLikeService;
12+
import com.example.solidconnection.university.service.UnivApplyInfoLikeService;
1313
import com.example.solidconnection.university.service.UnivApplyInfoQueryService;
1414
import com.example.solidconnection.university.service.UnivApplyInfoRecommendService;
1515
import lombok.RequiredArgsConstructor;
@@ -30,7 +30,7 @@
3030
public class UnivApplyInfoController {
3131

3232
private final UnivApplyInfoQueryService univApplyInfoQueryService;
33-
private final UniversityLikeService universityLikeService;
33+
private final UnivApplyInfoLikeService univApplyInfoLikeService;
3434
private final UnivApplyInfoRecommendService univApplyInfoRecommendService;
3535
private final MyPageService myPageService;
3636

@@ -58,7 +58,7 @@ public ResponseEntity<IsLikeResponse> getIsLiked(
5858
@AuthorizedUser SiteUser siteUser,
5959
@PathVariable("univ-apply-info-id") Long univApplyInfoId
6060
) {
61-
IsLikeResponse isLiked = universityLikeService.getIsLiked(siteUser, univApplyInfoId);
61+
IsLikeResponse isLiked = univApplyInfoLikeService.getIsLiked(siteUser, univApplyInfoId);
6262
return ResponseEntity.ok(isLiked);
6363
}
6464

@@ -67,7 +67,7 @@ public ResponseEntity<LikeResultResponse> addWishUnivApplyInfo(
6767
@AuthorizedUser SiteUser siteUser,
6868
@PathVariable("univ-apply-info-id") Long univApplyInfoId
6969
) {
70-
LikeResultResponse likeResultResponse = universityLikeService.likeUniversity(siteUser, univApplyInfoId);
70+
LikeResultResponse likeResultResponse = univApplyInfoLikeService.likeUnivApplyInfo(siteUser, univApplyInfoId);
7171
return ResponseEntity.ok(likeResultResponse);
7272
}
7373

@@ -76,7 +76,7 @@ public ResponseEntity<LikeResultResponse> cancelWishUnivApplyInfo(
7676
@AuthorizedUser SiteUser siteUser,
7777
@PathVariable("univ-apply-info-id") Long univApplyInfoId
7878
) {
79-
LikeResultResponse likeResultResponse = universityLikeService.cancelLikeUniversity(siteUser, univApplyInfoId);
79+
LikeResultResponse likeResultResponse = univApplyInfoLikeService.cancelLikeUnivApplyInfo(siteUser, univApplyInfoId);
8080
return ResponseEntity.ok(likeResultResponse);
8181
}
8282

src/main/java/com/example/solidconnection/university/service/UniversityLikeService.java renamed to src/main/java/com/example/solidconnection/university/service/UnivApplyInfoLikeService.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
@RequiredArgsConstructor
2222
@Service
23-
public class UniversityLikeService {
23+
public class UnivApplyInfoLikeService {
2424

2525
public static final String LIKE_SUCCESS_MESSAGE = "LIKE_SUCCESS";
2626
public static final String LIKE_CANCELED_MESSAGE = "LIKE_CANCELED";
@@ -35,11 +35,11 @@ public class UniversityLikeService {
3535
* 대학교를 '좋아요' 한다.
3636
* */
3737
@Transactional
38-
public LikeResultResponse likeUniversity(SiteUser siteUser, Long universityInfoForApplyId) {
39-
UnivApplyInfo univApplyInfo = univApplyInfoRepository.getUnivApplyInfoById(universityInfoForApplyId);
38+
public LikeResultResponse likeUnivApplyInfo(SiteUser siteUser, Long univApplyInfoId) {
39+
UnivApplyInfo univApplyInfo = univApplyInfoRepository.getUnivApplyInfoById(univApplyInfoId);
4040

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

@@ -55,24 +55,24 @@ public LikeResultResponse likeUniversity(SiteUser siteUser, Long universityInfoF
5555
* 대학교 '좋아요'를 취소한다.
5656
* */
5757
@Transactional
58-
public LikeResultResponse cancelLikeUniversity(SiteUser siteUser, long universityInfoForApplyId) throws CustomException {
59-
UnivApplyInfo univApplyInfo = univApplyInfoRepository.getUnivApplyInfoById(universityInfoForApplyId);
58+
public LikeResultResponse cancelLikeUnivApplyInfo(SiteUser siteUser, long univApplyInfoId) {
59+
UnivApplyInfo univApplyInfo = univApplyInfoRepository.getUnivApplyInfoById(univApplyInfoId);
6060

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

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

7070
/*
7171
* '좋아요'한 대학교인지 확인한다.
7272
* */
7373
@Transactional(readOnly = true)
74-
public IsLikeResponse getIsLiked(SiteUser siteUser, Long universityInfoForApplyId) {
75-
UnivApplyInfo univApplyInfo = univApplyInfoRepository.getUnivApplyInfoById(universityInfoForApplyId);
74+
public IsLikeResponse getIsLiked(SiteUser siteUser, Long univApplyInfoId) {
75+
UnivApplyInfo univApplyInfo = univApplyInfoRepository.getUnivApplyInfoById(univApplyInfoId);
7676
boolean isLike = likedUniversityRepository.findBySiteUserAndUnivApplyInfo(siteUser, univApplyInfo).isPresent();
7777
return new IsLikeResponse(isLike);
7878
}

src/test/java/com/example/solidconnection/university/service/UniversityLikeServiceTest.java renamed to src/test/java/com/example/solidconnection/university/service/UnivApplyInfoLikeServiceTest.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
import static com.example.solidconnection.common.exception.ErrorCode.ALREADY_LIKED_UNIVERSITY;
2020
import static com.example.solidconnection.common.exception.ErrorCode.NOT_LIKED_UNIVERSITY;
2121
import static com.example.solidconnection.common.exception.ErrorCode.UNIVERSITY_INFO_FOR_APPLY_NOT_FOUND;
22-
import static com.example.solidconnection.university.service.UniversityLikeService.LIKE_CANCELED_MESSAGE;
23-
import static com.example.solidconnection.university.service.UniversityLikeService.LIKE_SUCCESS_MESSAGE;
22+
import static com.example.solidconnection.university.service.UnivApplyInfoLikeService.LIKE_CANCELED_MESSAGE;
23+
import static com.example.solidconnection.university.service.UnivApplyInfoLikeService.LIKE_SUCCESS_MESSAGE;
2424
import static org.assertj.core.api.Assertions.assertThat;
2525
import static org.assertj.core.api.AssertionsForClassTypes.assertThatCode;
2626
import static org.junit.jupiter.api.Assertions.assertAll;
2727

2828
@TestContainerSpringBootTest
2929
@DisplayName("대학교 좋아요 서비스 테스트")
30-
class UniversityLikeServiceTest {
30+
class UnivApplyInfoLikeServiceTest {
3131

3232
@Autowired
33-
private UniversityLikeService universityLikeService;
33+
private UnivApplyInfoLikeService univApplyInfoLikeService;
3434

3535
@Autowired
3636
private LikedUniversityRepository likedUniversityRepository;
@@ -56,7 +56,7 @@ class 대학_좋아요를_등록한다 {
5656
@Test
5757
void 성공적으로_좋아요를_등록한다() {
5858
// when
59-
LikeResultResponse response = universityLikeService.likeUniversity(user, 괌대학_A_지원_정보.getId());
59+
LikeResultResponse response = univApplyInfoLikeService.likeUnivApplyInfo(user, 괌대학_A_지원_정보.getId());
6060

6161
// then
6262
assertAll(
@@ -73,7 +73,7 @@ class 대학_좋아요를_등록한다 {
7373
saveLikedUniversity(user, 괌대학_A_지원_정보);
7474

7575
// when & then
76-
assertThatCode(() -> universityLikeService.likeUniversity(user, 괌대학_A_지원_정보.getId()))
76+
assertThatCode(() -> univApplyInfoLikeService.likeUnivApplyInfo(user, 괌대학_A_지원_정보.getId()))
7777
.isInstanceOf(CustomException.class)
7878
.hasMessage(ALREADY_LIKED_UNIVERSITY.getMessage());
7979
}
@@ -88,7 +88,7 @@ class 대학_좋아요를_취소한다 {
8888
saveLikedUniversity(user, 괌대학_A_지원_정보);
8989

9090
// when
91-
LikeResultResponse response = universityLikeService.cancelLikeUniversity(user, 괌대학_A_지원_정보.getId());
91+
LikeResultResponse response = univApplyInfoLikeService.cancelLikeUnivApplyInfo(user, 괌대학_A_지원_정보.getId());
9292

9393
// then
9494
assertAll(
@@ -102,7 +102,7 @@ class 대학_좋아요를_취소한다 {
102102
@Test
103103
void 좋아요하지_않은_대학이면_예외_응답을_반환한다() {
104104
// when & then
105-
assertThatCode(() -> universityLikeService.cancelLikeUniversity(user, 괌대학_A_지원_정보.getId()))
105+
assertThatCode(() -> univApplyInfoLikeService.cancelLikeUnivApplyInfo(user, 괌대학_A_지원_정보.getId()))
106106
.isInstanceOf(CustomException.class)
107107
.hasMessage(NOT_LIKED_UNIVERSITY.getMessage());
108108
}
@@ -111,10 +111,10 @@ class 대학_좋아요를_취소한다 {
111111
@Test
112112
void 존재하지_않는_대학_좋아요_시도하면_예외_응답을_반환한다() {
113113
// given
114-
Long invalidUniversityId = 9999L;
114+
Long invalidUnivApplyInfoId = 9999L;
115115

116116
// when & then
117-
assertThatCode(() -> universityLikeService.likeUniversity(user, invalidUniversityId))
117+
assertThatCode(() -> univApplyInfoLikeService.likeUnivApplyInfo(user, invalidUnivApplyInfoId))
118118
.isInstanceOf(CustomException.class)
119119
.hasMessage(UNIVERSITY_INFO_FOR_APPLY_NOT_FOUND.getMessage());
120120
}
@@ -125,7 +125,7 @@ class 대학_좋아요를_취소한다 {
125125
saveLikedUniversity(user, 괌대학_A_지원_정보);
126126

127127
// when
128-
IsLikeResponse response = universityLikeService.getIsLiked(user, 괌대학_A_지원_정보.getId());
128+
IsLikeResponse response = univApplyInfoLikeService.getIsLiked(user, 괌대학_A_지원_정보.getId());
129129

130130
// then
131131
assertThat(response.isLike()).isTrue();
@@ -134,7 +134,7 @@ class 대학_좋아요를_취소한다 {
134134
@Test
135135
void 좋아요하지_않은_대학인지_확인한다() {
136136
// when
137-
IsLikeResponse response = universityLikeService.getIsLiked(user, 괌대학_A_지원_정보.getId());
137+
IsLikeResponse response = univApplyInfoLikeService.getIsLiked(user, 괌대학_A_지원_정보.getId());
138138

139139
// then
140140
assertThat(response.isLike()).isFalse();
@@ -143,10 +143,10 @@ class 대학_좋아요를_취소한다 {
143143
@Test
144144
void 존재하지_않는_대학의_좋아요_여부를_조회하면_예외_응답을_반환한다() {
145145
// given
146-
Long invalidUniversityId = 9999L;
146+
Long invalidUnivApplyInfoId = 9999L;
147147

148148
// when & then
149-
assertThatCode(() -> universityLikeService.getIsLiked(user, invalidUniversityId))
149+
assertThatCode(() -> univApplyInfoLikeService.getIsLiked(user, invalidUnivApplyInfoId))
150150
.isInstanceOf(CustomException.class)
151151
.hasMessage(UNIVERSITY_INFO_FOR_APPLY_NOT_FOUND.getMessage());
152152
}

0 commit comments

Comments
 (0)