Skip to content

Commit c7aa210

Browse files
committed
feature/KD-75 : 졸업대상자 상세조회시 phon컬럼 조회로직 추가
1 parent 3231219 commit c7aa210

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

aics-admin/src/main/java/kgu/developers/admin/graduationUser/application/GraduationUserAdminFacade.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
import kgu.developers.domain.thesis.application.command.ThesisCommandService;
2929
import kgu.developers.domain.thesis.application.query.ThesisQueryService;
3030
import kgu.developers.domain.thesis.domain.Thesis;
31+
import kgu.developers.domain.user.application.query.UserQueryService;
32+
import kgu.developers.domain.user.domain.User;
3133
import lombok.RequiredArgsConstructor;
3234
import org.springframework.data.domain.Pageable;
3335
import org.springframework.stereotype.Component;
@@ -47,6 +49,7 @@ public class GraduationUserAdminFacade {
4749
private final ThesisQueryService thesisQueryService;
4850
private final CertificateCommandService certificateCommandService;
4951
private final CertificateQueryService certificateQueryService;
52+
private final UserQueryService userQueryService;
5053

5154
public GraduationUserPersistResponse createGraduationUser(GraduationUserCreateRequest request) {
5255
Long id = graduationUserCommandService.createGraduationUser(request.studentId(), request.name(), request.advisorProfessor(), request.capstoneCompletion(), request.department(), request.graduationDate());
@@ -136,8 +139,9 @@ public void deleteGraduationUser(Long id) {
136139

137140
public GraduationUserDetailResponse getGraduationUserById(Long graduationUserId) {
138141
GraduationUser graduationUser = graduationUserQueryService.getById(graduationUserId);
142+
User user = userQueryService.getUserById(graduationUser.getUserId());
139143
GraduationUserStatusResponse status = buildSubmissionStatus(graduationUser);
140-
return GraduationUserDetailResponse.from(graduationUser, status);
144+
return GraduationUserDetailResponse.from(graduationUser,user.getPhone() ,status);
141145
}
142146

143147
public GraduationUserBatchDeleteResponse deleteGraduationUsers(GraduationUserBatchDeleteRequest request) {

aics-admin/src/main/java/kgu/developers/admin/graduationUser/presentation/response/GraduationUserDetailResponse.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ public record GraduationUserDetailResponse(
2020
@Schema(description = "학번(교번)", example = "202412345", requiredMode = REQUIRED)
2121
String studentId,
2222

23+
@Schema(description = "전화번호", example = "010-1234-5678", requiredMode = REQUIRED)
24+
String phone,
25+
2326
@Schema(description = "졸업 날짜", example = "2028-08", requiredMode = REQUIRED)
2427
@DateTimeFormat(pattern = "yyyy-MM")
2528
String graduationDate,
@@ -54,13 +57,15 @@ public record GraduationUserDetailResponse(
5457
) {
5558
public static GraduationUserDetailResponse from(
5659
GraduationUser graduationUser,
60+
String phone,
5761
GraduationUserStatusResponse status
5862
) {
5963
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
6064
return GraduationUserDetailResponse.builder()
6165
.graduationUserId(graduationUser.getId())
6266
.name(graduationUser.getName())
6367
.studentId(graduationUser.getUserId())
68+
.phone(phone)
6469
.graduationDate(graduationUser.getGraduationDate().format(formatter))
6570
.advisor(graduationUser.getAdvisorProfessor())
6671
.major(graduationUser.getDepartment())

aics-admin/src/testFixtures/java/graduationUser/application/GraduationUserAdminFacadeTest.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import java.util.HashSet;
5252
import java.util.List;
5353

54+
import static kgu.developers.domain.user.domain.Major.CSE;
5455
import static org.junit.jupiter.api.Assertions.assertEquals;
5556
import static org.junit.jupiter.api.Assertions.assertNotNull;
5657

@@ -133,7 +134,13 @@ public void init() {
133134
.approval(false)
134135
.build()
135136
);
136-
137+
fakeUserRepository.save(User.builder()
138+
.id("202411001")
139+
.name("홍길동")
140+
.phone("010-1111-2222")
141+
.email("hong1@kyonggi.ac.kr")
142+
.major(CSE)
143+
.build());
137144

138145

139146
graduationUserAdminFacade = new GraduationUserAdminFacade(
@@ -142,7 +149,8 @@ public void init() {
142149
thesisCommandService,
143150
new ThesisQueryService(fakeThesisRepository),
144151
certificateCommandService,
145-
new CertificateQueryService(fakeCertificateRepository)
152+
new CertificateQueryService(fakeCertificateRepository),
153+
userQueryService
146154
);
147155

148156
graduationUser1 = fakeGraduationUserRepository.save(GraduationUser.builder()
@@ -275,6 +283,7 @@ public void getGrduationUserById_Success() {
275283

276284
//then
277285
assertEquals(result.studentId(),graduationUser1.getUserId());
286+
assertEquals("010-1111-2222", result.phone());
278287
}
279288

280289
@Test

0 commit comments

Comments
 (0)