diff --git a/src/main/java/sopt/univoice/domain/mypage/service/MypageService.java b/src/main/java/sopt/univoice/domain/mypage/service/MypageService.java index ec72298..e64d41d 100644 --- a/src/main/java/sopt/univoice/domain/mypage/service/MypageService.java +++ b/src/main/java/sopt/univoice/domain/mypage/service/MypageService.java @@ -5,6 +5,8 @@ import sopt.univoice.domain.auth.PrincipalHandler; import sopt.univoice.domain.auth.repository.AuthRepository; import sopt.univoice.domain.mypage.dto.response.GetMypageReponseDto; +import sopt.univoice.domain.universityData.entity.University; +import sopt.univoice.domain.universityData.repository.UniversityDataRepository; import sopt.univoice.domain.user.entity.Member; @Service @@ -13,6 +15,7 @@ public class MypageService { private final AuthRepository authRepository; private final PrincipalHandler principalHandler; + private final UniversityDataRepository universityDataRepository; public GetMypageReponseDto getMypage() { Long memberId = principalHandler.getUserIdFromPrincipal(); @@ -20,6 +23,10 @@ public GetMypageReponseDto getMypage() { Member member = authRepository.findById(memberId) .orElseThrow(() -> new RuntimeException("회원이 존재하지 않습니다.")); + University university = universityDataRepository.findByUniversityName(member.getUniversityName()) + .orElseThrow(() -> new RuntimeException("대학교 정보가 존재하지 않습니다.")); + + GetMypageReponseDto getMypage = new GetMypageReponseDto( member.getId(), member.getName(), @@ -27,7 +34,7 @@ public GetMypageReponseDto getMypage() { member.getDepartmentName(), member.getAdmissionNumber() + "학번", member.getUniversityName(), - member.getUniversityLogoImage() + university.getUniversityLogoImage() ); return getMypage; } diff --git a/src/main/java/sopt/univoice/domain/universityData/entity/University.java b/src/main/java/sopt/univoice/domain/universityData/entity/University.java index 13db38c..c886a5a 100644 --- a/src/main/java/sopt/univoice/domain/universityData/entity/University.java +++ b/src/main/java/sopt/univoice/domain/universityData/entity/University.java @@ -17,6 +17,8 @@ public class University { private String universityName; + private String universityLogoImage; + @OneToMany(mappedBy = "university") private List collegeDepartments; diff --git a/src/main/java/sopt/univoice/domain/user/entity/Member.java b/src/main/java/sopt/univoice/domain/user/entity/Member.java index 91a1825..3772a5f 100644 --- a/src/main/java/sopt/univoice/domain/user/entity/Member.java +++ b/src/main/java/sopt/univoice/domain/user/entity/Member.java @@ -43,8 +43,6 @@ public class Member extends BaseTimeEntity { private String departmentName; - private String universityLogoImage; - @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "affiliation_id") private Affiliation affiliation;