CLAP-28 Feat: 회원 등록 예외 처리 추가

<footer>
- 관련: #2

Author: joowojr

src/main/java/clap/server/adapter/outbound/persistense/MemberPersistenceAdapter.java

@@ -1,6 +1,7 @@
 package clap.server.adapter.outbound.persistense;
 
 import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import clap.server.adapter.outbound.persistense.mapper.MemberPersistenceMapper;
 import clap.server.adapter.outbound.persistense.repository.member.MemberRepository;
 import clap.server.application.port.outbound.member.LoadMemberPort;
@@ -23,6 +24,12 @@ public Optional<Member> findById(final Long id) {
         return memberEntity.map(memberPersistenceMapper::toDomain);
     }
 
+    @Override
+    public Optional<Member> findActiveMemberById(Long id) {
+        Optional<MemberEntity> memberEntity = memberRepository.findByMemberStatusAndMemberId(MemberStatus.ACTIVE, id);
+        return memberEntity.map(memberPersistenceMapper::toDomain);
+    }
+
     @Override
     public void save(final Member member) {
         MemberEntity memberEntity = memberPersistenceMapper.toEntity(member);

src/main/java/clap/server/adapter/outbound/persistense/repository/member/MemberRepository.java

@@ -1,9 +1,13 @@
 package clap.server.adapter.outbound.persistense.repository.member;
 
 import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
+import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.Optional;
+
 @Repository
 public interface MemberRepository extends JpaRepository<MemberEntity, Long> {
+    Optional<MemberEntity> findByMemberStatusAndMemberId(MemberStatus memberStatus, Long memberId);
 }

src/main/java/clap/server/application/RegisterMemberService.java

@@ -2,14 +2,17 @@
 
 import clap.server.adapter.inbound.web.dto.admin.RegisterMemberRequest;
 import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
+import clap.server.application.port.inbound.domain.MemberService;
 import clap.server.application.port.inbound.management.RegisterMemberUsecase;
 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.common.exception.ApplicationException;
 import clap.server.domain.model.member.Department;
 import clap.server.domain.model.member.Member;
 import clap.server.domain.model.member.MemberInfo;
+import clap.server.exception.DepartmentErrorCode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -19,15 +22,15 @@
 @ApplicationService
 @RequiredArgsConstructor
 public class RegisterMemberService implements RegisterMemberUsecase {
-    private final LoadMemberPort loadMemberPort;
+    private final MemberService memberService;
     private final CommandMemberPort commandMemberPort;
     private final LoadDepartmentPort loadDepartmentPort;
 
     @Override
     @Transactional
     public void registerMember(Long adminId, RegisterMemberRequest request) {
-        Member admin = loadMemberPort.findById(adminId).orElse(null);
-        Department department = loadDepartmentPort.findById(1l).orElse(null);
+        Member admin = memberService.findActiveMember(adminId);
+        Department department = loadDepartmentPort.findById(request.departmentId()).orElseThrow(()-> new ApplicationException(DepartmentErrorCode.DEPARTMENT_NOT_FOUND));
         MemberInfo memberInfo = toMemberInfo(request.name(), request.email(), request.nickname(), request.isReviewer(),
                 department, MemberRole.ROLE_USER, request.departmentRole());
         Member member = toMember(memberInfo);

src/main/java/clap/server/application/port/inbound/domain/MemberService.java

@@ -0,0 +1,24 @@
+package clap.server.application.port.inbound.domain;
+
+import clap.server.application.port.outbound.member.LoadMemberPort;
+import clap.server.common.exception.ApplicationException;
+import clap.server.domain.model.member.Member;
+import clap.server.exception.MemberErrorCode;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class MemberService {
+    private final LoadMemberPort loadMemberPort;
+
+    public Member findById(Long memberId) {
+        return loadMemberPort.findById(memberId).orElseThrow(
+                ()-> new ApplicationException(MemberErrorCode.MEMBER_NOT_FOUND));
+    }
+    
+    public Member findActiveMember(Long memberId) {
+        return loadMemberPort.findActiveMemberById(memberId).orElseThrow(
+                ()-> new ApplicationException(MemberErrorCode.ACTIVE_MEMBER_NOT_FOUND));
+    }
+}

src/main/java/clap/server/application/port/outbound/member/LoadMemberPort.java

@@ -6,4 +6,6 @@
 
 public interface LoadMemberPort {
     Optional<Member> findById(Long id);
+
+    Optional<Member> findActiveMemberById(Long id);
 }

src/main/java/clap/server/exception/MemberErrorCode.java

@@ -9,6 +9,7 @@
 @RequiredArgsConstructor
 public enum MemberErrorCode implements BaseErrorCode {
     MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "MEMBER_001", "회원을 찾을 수 없습니다."),
+    ACTIVE_MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "MEMBER_002", "활성화 회원을 찾을 수 없습니다."),
     ;
 
     private final HttpStatus httpStatus;