From 11362cf2290d1c9b06e6a9f0be3790a19242fb20 Mon Sep 17 00:00:00 2001
From: eeddiinn <gdw4013@naver.com>
Date: Wed, 17 Jul 2024 19:39:37 +0900
Subject: [PATCH] =?UTF-8?q?[FIX]=20=EB=8C=80=ED=95=99=EA=B5=90=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B3=A0=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EA=B0=80=EC=A0=B8?=
 =?UTF-8?q?=EC=98=A4=EB=8A=94=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?#64?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../univoice/domain/mypage/service/MypageService.java    | 9 ++++++++-
 .../domain/universityData/entity/University.java         | 2 ++
 .../java/sopt/univoice/domain/user/entity/Member.java    | 2 --
 3 files changed, 10 insertions(+), 3 deletions(-)

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<CollegeDepartment> 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;