CLAP-451 Refactor: department fetch 쿼리 메서드로 수정

#590

Author: joowojr

src/main/java/clap/server/application/service/admin/DeleteMemberService.java

@@ -10,7 +10,6 @@
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.MemberErrorCode;
 import lombok.RequiredArgsConstructor;
-import org.hibernate.Hibernate;
 import org.springframework.transaction.annotation.Transactional;
 
 @ApplicationService
@@ -29,7 +28,6 @@ public void deleteMember(Long memberId) {
         if (member.getMemberInfo().getRole() == MemberRole.ROLE_MANAGER) {
             managerInfoUpdatePolicy.validateNoRemainingTasks(member);
         }
-        Hibernate.initialize(member.getDepartment());
         member.softDelete();
         commandMemberPort.save(member);
     }

src/main/java/clap/server/application/service/admin/ManageMemberService.java

@@ -6,30 +6,32 @@
 import clap.server.application.mapper.response.MemberResponseMapper;
 import clap.server.application.port.inbound.admin.MemberDetailUsecase;
 import clap.server.application.port.inbound.admin.UpdateMemberUsecase;
-import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.outbound.member.CommandMemberPort;
 import clap.server.application.port.outbound.member.LoadDepartmentPort;
+import clap.server.application.port.outbound.member.LoadMemberPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Department;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.policy.member.ManagerInfoUpdatePolicy;
 import clap.server.exception.ApplicationException;
 import clap.server.exception.code.DepartmentErrorCode;
+import clap.server.exception.code.MemberErrorCode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
 @ApplicationService
 @RequiredArgsConstructor
 class ManageMemberService implements UpdateMemberUsecase, MemberDetailUsecase {
-    private final MemberService memberService;
+    private final LoadMemberPort loadMemberPort;
     private final CommandMemberPort commandMemberPort;
     private final LoadDepartmentPort loadDepartmentPort;
     private final ManagerInfoUpdatePolicy managerInfoUpdatePolicy;
 
     @Override
     @Transactional
     public void updateMemberInfo(Long adminId, Long memberId, UpdateMemberRequest request) {
-        Member member = memberService.findById(memberId);
+        Member member = loadMemberPort.findByIdWithFetchDepartment(memberId).orElseThrow(
+                () -> new ApplicationException(MemberErrorCode.MEMBER_NOT_FOUND));
         Department department = loadDepartmentPort.findById(request.departmentId()).orElseThrow(() ->
                 new ApplicationException(DepartmentErrorCode.DEPARTMENT_NOT_FOUND));
         managerInfoUpdatePolicy.validateDepartment(department, request.role());
@@ -46,7 +48,8 @@ public void updateMemberInfo(Long adminId, Long memberId, UpdateMemberRequest re
     @Override
     @Transactional(readOnly = true)
     public MemberDetailsResponse getMemberDetail(Long memberId) {
-        Member member = memberService.findById(memberId);
+        Member member = loadMemberPort.findByIdWithFetchDepartment(memberId).orElseThrow(
+                () -> new ApplicationException(MemberErrorCode.MEMBER_NOT_FOUND));;
         return MemberResponseMapper.toMemberDetailsResponse(member);
     }
 }

src/main/java/clap/server/application/service/member/MemberInfoService.java

@@ -2,11 +2,13 @@
 
 import clap.server.adapter.inbound.web.dto.member.response.MemberDetailInfoResponse;
 import clap.server.adapter.inbound.web.dto.member.response.MemberProfileResponse;
-import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.inbound.member.MemberDetailInfoUsecase;
 import clap.server.application.port.inbound.member.MemberProfileUsecase;
+import clap.server.application.port.outbound.member.LoadMemberPort;
 import clap.server.common.annotation.architecture.ApplicationService;
 import clap.server.domain.model.member.Member;
+import clap.server.exception.ApplicationException;
+import clap.server.exception.code.MemberErrorCode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -16,19 +18,21 @@
 @ApplicationService
 @RequiredArgsConstructor
 class MemberInfoService implements MemberProfileUsecase , MemberDetailInfoUsecase {
-    private final MemberService memberService;
+    private final LoadMemberPort loadMemberPort;
 
     @Override
     @Transactional(readOnly = true)
     public MemberProfileResponse getMemberProfile(Long memberId) {
-        Member member = memberService.findActiveMember(memberId);
+        Member member = loadMemberPort.findActiveMemberByIdWithFetchDepartment(memberId).orElseThrow(
+                () -> new ApplicationException(MemberErrorCode.MEMBER_NOT_FOUND));
         return toMemberProfileResponse(member);
     }
 
     @Override
     @Transactional(readOnly = true)
     public MemberDetailInfoResponse getMemberInfo(Long memberId) {
-        Member member = memberService.findActiveMember(memberId);
+        Member member = loadMemberPort.findActiveMemberByIdWithFetchDepartment(memberId).orElseThrow(
+                () -> new ApplicationException(MemberErrorCode.MEMBER_NOT_FOUND));
         return toMemberDetailInfoResponse(member);
     }
 }