Skip to content

Commit 9963bf6

Browse files
committed
refactor: 코딩 컨벤션 리팩터링
1 parent 07af2bc commit 9963bf6

4 files changed

Lines changed: 28 additions & 29 deletions

File tree

src/main/java/com/example/solidconnection/admin/university/controller/AdminUnivApplyInfoController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
import org.springframework.http.ResponseEntity;
1313
import org.springframework.web.bind.annotation.DeleteMapping;
1414
import org.springframework.web.bind.annotation.GetMapping;
15+
import org.springframework.web.bind.annotation.PatchMapping;
1516
import org.springframework.web.bind.annotation.PathVariable;
1617
import org.springframework.web.bind.annotation.PostMapping;
17-
import org.springframework.web.bind.annotation.PatchMapping;
1818
import org.springframework.web.bind.annotation.RequestBody;
1919
import org.springframework.web.bind.annotation.RequestMapping;
2020
import org.springframework.web.bind.annotation.RestController;
@@ -47,15 +47,15 @@ public ResponseEntity<AdminUnivApplyInfoResponse> createUnivApplyInfo(
4747

4848
@PatchMapping("/{id}")
4949
public ResponseEntity<AdminUnivApplyInfoResponse> updateUnivApplyInfo(
50-
@PathVariable Long id,
50+
@PathVariable long id,
5151
@Valid @RequestBody AdminUnivApplyInfoUpdateRequest request
5252
) {
5353
return ResponseEntity.ok(adminUnivApplyInfoService.updateUnivApplyInfo(id, request));
5454
}
5555

5656
@DeleteMapping("/{id}")
5757
public ResponseEntity<Void> deleteUnivApplyInfo(
58-
@PathVariable Long id
58+
@PathVariable long id
5959
) {
6060
adminUnivApplyInfoService.deleteUnivApplyInfo(id);
6161
return ResponseEntity.ok().build();

src/main/java/com/example/solidconnection/admin/university/dto/AdminUnivApplyInfoResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import java.util.Map;
88

99
public record AdminUnivApplyInfoResponse(
10-
Long id,
10+
long id,
1111
long termId,
1212
Long homeUniversityId,
13-
Long hostUniversityId,
13+
long hostUniversityId,
1414
String koreanName,
1515
Integer studentCapacity,
1616
SemesterAvailableForDispatch semesterAvailableForDispatch,

src/main/java/com/example/solidconnection/admin/university/service/AdminUnivApplyInfoService.java

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@
2222
import com.example.solidconnection.university.domain.HostUniversity;
2323
import com.example.solidconnection.university.domain.LanguageRequirement;
2424
import com.example.solidconnection.university.domain.UnivApplyInfo;
25+
import com.example.solidconnection.university.repository.HomeUniversityRepository;
2526
import com.example.solidconnection.university.repository.HostUniversityRepository;
26-
import com.example.solidconnection.university.repository.LanguageRequirementRepository;
2727
import com.example.solidconnection.university.repository.LikedUnivApplyInfoRepository;
2828
import com.example.solidconnection.university.repository.UnivApplyInfoRepository;
29-
import com.example.solidconnection.university.repository.HomeUniversityRepository;
3029
import java.util.ArrayList;
3130
import java.util.HashSet;
3231
import java.util.List;
@@ -45,7 +44,6 @@ public class AdminUnivApplyInfoService {
4544
private final AdminUnivApplyInfoRowSaver rowSaver;
4645
private final UnivApplyInfoRepository univApplyInfoRepository;
4746
private final HostUniversityRepository hostUniversityRepository;
48-
private final LanguageRequirementRepository languageRequirementRepository;
4947
private final LikedUnivApplyInfoRepository likedUnivApplyInfoRepository;
5048
private final ApplicationRepository applicationRepository;
5149

@@ -78,6 +76,24 @@ public UnivApplyInfoImportResponse importUnivApplyInfos(UnivApplyInfoImportReque
7876
return new UnivApplyInfoImportResponse(rows.size(), createdUniversities);
7977
}
8078

79+
private void validateColumnMappings(Map<String, String> columnMappings) {
80+
boolean hasBlankEntry = columnMappings.entrySet().stream()
81+
.anyMatch(e -> e.getKey().isBlank() || e.getValue().isBlank());
82+
if (hasBlankEntry) {
83+
throw new CustomException(INVALID_INPUT, "컬럼 매핑의 키와 값은 공백일 수 없습니다");
84+
}
85+
}
86+
87+
private void validateTermExists(Long termId) {
88+
termRepository.findById(termId)
89+
.orElseThrow(() -> new CustomException(TERM_NOT_FOUND));
90+
}
91+
92+
private HomeUniversity findHomeUniversity(Long homeUniversityId) {
93+
return homeUniversityRepository.findById(homeUniversityId)
94+
.orElseThrow(() -> new CustomException(HOME_UNIVERSITY_NOT_FOUND));
95+
}
96+
8197
@Transactional
8298
@DefaultCacheOut(
8399
key = {"univApplyInfoTextSearch", "university:recommend:general"},
@@ -131,7 +147,7 @@ private HostUniversity findHostUniversity(Long hostUniversityId) {
131147
cacheManager = "customCacheManager",
132148
prefix = true
133149
)
134-
public AdminUnivApplyInfoResponse updateUnivApplyInfo(Long id, AdminUnivApplyInfoUpdateRequest request) {
150+
public AdminUnivApplyInfoResponse updateUnivApplyInfo(long id, AdminUnivApplyInfoUpdateRequest request) {
135151
UnivApplyInfo univApplyInfo = univApplyInfoRepository.findById(id)
136152
.orElseThrow(() -> new CustomException(UNIV_APPLY_INFO_NOT_FOUND));
137153

@@ -165,35 +181,18 @@ public AdminUnivApplyInfoResponse updateUnivApplyInfo(Long id, AdminUnivApplyInf
165181
cacheManager = "customCacheManager",
166182
prefix = true
167183
)
168-
public void deleteUnivApplyInfo(Long id) {
184+
public void deleteUnivApplyInfo(long id) {
169185
UnivApplyInfo univApplyInfo = univApplyInfoRepository.findById(id)
170186
.orElseThrow(() -> new CustomException(UNIV_APPLY_INFO_NOT_FOUND));
171187
validateNoReferences(id);
172188
univApplyInfoRepository.delete(univApplyInfo);
173189
}
174190

175-
private void validateNoReferences(Long id) {
191+
private void validateNoReferences(long id) {
176192
if (likedUnivApplyInfoRepository.existsByUnivApplyInfoId(id)
177193
|| applicationRepository.existsByChoicesUnivApplyInfoId(id)) {
178194
throw new CustomException(UNIV_APPLY_INFO_HAS_REFERENCES);
179195
}
180196
}
181197

182-
private void validateColumnMappings(Map<String, String> columnMappings) {
183-
boolean hasBlankEntry = columnMappings.entrySet().stream()
184-
.anyMatch(e -> e.getKey().isBlank() || e.getValue().isBlank());
185-
if (hasBlankEntry) {
186-
throw new CustomException(INVALID_INPUT, "컬럼 매핑의 키와 값은 공백일 수 없습니다");
187-
}
188-
}
189-
190-
private void validateTermExists(Long termId) {
191-
termRepository.findById(termId)
192-
.orElseThrow(() -> new CustomException(TERM_NOT_FOUND));
193-
}
194-
195-
private HomeUniversity findHomeUniversity(Long homeUniversityId) {
196-
return homeUniversityRepository.findById(homeUniversityId)
197-
.orElseThrow(() -> new CustomException(HOME_UNIVERSITY_NOT_FOUND));
198-
}
199198
}

src/test/java/com/example/solidconnection/admin/university/service/AdminUnivApplyInfoServiceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ class 지원_정보_생성 {
442442

443443
// then
444444
assertAll(
445-
() -> assertThat(response.id()).isNotNull(),
445+
() -> assertThat(response.id()).isPositive(),
446446
() -> assertThat(response.termId()).isEqualTo(term.getId()),
447447
() -> assertThat(response.homeUniversityId()).isEqualTo(homeUniversity.getId()),
448448
() -> assertThat(response.hostUniversityId()).isEqualTo(hostUniversity.getId()),

0 commit comments

Comments
 (0)