Merge pull request #50 from PowerSupply-ES/feature-admin-member

feat: @transactional 추가, 전화번호 속성 추가
PowerSupply-ES · Jul 10, 2024 · c29921c · c29921c
2 parents d574a34 + 353403d
commit c29921c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/main/java/com/powersupply/PES/domain/dto/ManageDTO.java b/src/main/java/com/powersupply/PES/domain/dto/ManageDTO.java
@@ -88,6 +88,7 @@ public static class MemberDetail {
         private String memberMajor; // 학과
         private String memberStatus; // 상태
         private String memberEmail; // 이메일
+        private String memberPhone;
         private List<MemberDTO.MemberMySolveResponse> mySolveResponse;
         private List<MemberDTO.MemberMyFeedbackResponse> myFeedbackResponse;
 
@@ -99,6 +100,7 @@ public MemberDetail(MemberEntity member, List<MemberDTO.MemberMySolveResponse> m
             this.memberMajor = member.getMemberMajor();
             this.memberStatus = member.getMemberStatus();
             this.memberEmail = member.getMemberEmail();
+            this.memberPhone = member.getMemberPhone();
             this.mySolveResponse = mySolveResponse;
             this.myFeedbackResponse = myFeedbackResponse;
         }

diff --git a/src/main/java/com/powersupply/PES/service/ManageService.java b/src/main/java/com/powersupply/PES/service/ManageService.java
@@ -9,6 +9,7 @@
 import com.powersupply.PES.repository.*;
 import com.powersupply.PES.utils.JwtUtil;
 import lombok.RequiredArgsConstructor;
+import org.hibernate.Hibernate;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -31,7 +32,7 @@ public class ManageService {
     private final CommentRepository commentRepository;
 
     /* ---------- 문제 관리 기능 관련 ---------- */
-    
+
     // 전체 문제 리스트 불러오기
     public List<ManageDTO.ProblemList> problemList() {
         return problemRepository.findAll().stream()
@@ -106,10 +107,14 @@ public List<ManageDTO.MemberList> list() {
     }
 
     // 특정 멤버 detail 불러오기
+    @Transactional
     public ManageDTO.MemberDetail readDetail(String memberId) {
         MemberEntity member = memberRepository.findById(memberId)
                 .orElseThrow(() -> new AppException(ErrorCode.NOT_FOUND,"해당 memberId가 없습니다."));
 
+        Hibernate.initialize(member.getAnswerEntities());
+        Hibernate.initialize(member.getCommentEntities());
+
         List<MemberDTO.MemberMySolveResponse> mySolveResponseList = answerRepository.findAllByMemberEntity_MemberId(memberId).stream()
                 .map(MapperUtils::toMemberMySolveResponse)
                 .collect(Collectors.toList());
@@ -128,10 +133,10 @@ public ManageDTO.MemberDetail readDetail(String memberId) {
     // 멤버 삭제하기
     public ResponseEntity<?> deleteMember(String memberId) {
         String id = JwtUtil.getMemberIdFromToken();
-        
+
         MemberEntity admin = memberRepository.findById(id)
                 .orElseThrow(() -> new AppException(ErrorCode.NOT_FOUND,"해당 memberId가 없음"));
-        
+
         memberRepository.findById(memberId)
                 .orElseThrow(() -> new AppException(ErrorCode.NOT_FOUND,"삭제하려는 memberId가 없음"));