Merge pull request #37 from TaskFlow-CLAP/CLAP-67

CLAP-67 Domain 레이어 exception 분리

Author: joowojr

src/main/java/clap/server/adapter/inbound/web/dto/admin/RegisterMemberRequest.java

@@ -18,9 +18,7 @@ public record RegisterMemberRequest(
         @NotNull
         MemberRole role,
         @NotBlank
-        String departmentRole,
-        @NotNull
-        Long adminId
+        String departmentRole
 ) {
 }
 

src/main/java/clap/server/domain/model/member/Member.java

@@ -28,10 +28,11 @@ public Member(MemberInfo memberInfo, Boolean notificationEnabled, String imageUr
         this.password = password;
     }
 
-    public void register(Member Admin){
-        this.notificationEnabled=null;
-        this.imageUrl=null;
-        this.memberStatus=MemberStatus.PENDING;
-        this.password="";
+    public void register(Member admin) {
+        this.admin = admin;
+        this.notificationEnabled = null;
+        this.imageUrl = null;
+        this.memberStatus = MemberStatus.PENDING;
+        this.password = "";
     }
 }

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

@@ -1,16 +1,11 @@
 package clap.server.exception;
 
 import clap.server.exception.code.BaseErrorCode;
-import lombok.Getter;
 
-@Getter
-public class ApplicationException extends RuntimeException {
-
-    private final BaseErrorCode code;
+public class ApplicationException extends BaseException {
 
     public ApplicationException(BaseErrorCode code) {
-        super(code.getMessage());
-        this.code = code;
+        super(code);
     }
 
     public static ApplicationException from(BaseErrorCode code) {

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

@@ -0,0 +1,24 @@
+package clap.server.exception;
+
+import clap.server.exception.code.BaseErrorCode;
+import lombok.Getter;
+
+
+@Getter
+public abstract class BaseException extends RuntimeException {
+
+    private final BaseErrorCode code;
+
+    protected BaseException(BaseErrorCode code) {
+        super(code.getMessage());
+        this.code = code;
+    }
+
+    public static <T extends BaseException> T from(BaseErrorCode code, Class<T> exceptionClass) {
+        try {
+            return exceptionClass.getConstructor(BaseErrorCode.class).newInstance(code);
+        } catch (Exception e) {
+            throw new RuntimeException("Could not create exception instance", e);
+        }
+    }
+}

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

@@ -0,0 +1,14 @@
+package clap.server.exception;
+
+import clap.server.exception.code.BaseErrorCode;
+
+public class DomainException extends BaseException {
+
+    public DomainException(BaseErrorCode code) {
+        super(code);
+    }
+
+    public static DomainException from(BaseErrorCode code) {
+        return new DomainException(code);
+    }
+}

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

@@ -76,21 +76,22 @@ public ResponseEntity<Object> exception(Exception e, WebRequest request) {
         );
     }
 
-    @ExceptionHandler(value = ApplicationException.class)
-    public ResponseEntity onThrowException(ApplicationException applicationException, HttpServletRequest request) {
-        BaseErrorCode baseErrorCode = applicationException.getCode();
+    @ExceptionHandler(value = { ApplicationException.class, DomainException.class })
+    public ResponseEntity<Object> onThrowException(
+            BaseException exception,
+            HttpServletRequest request) {
 
-        return handleExceptionInternal(applicationException, baseErrorCode, null, request);
+        BaseErrorCode baseErrorCode = exception.getCode();
+        return handleExceptionInternal(exception, baseErrorCode, null, request);
     }
 
     private ResponseEntity<Object> handleExceptionInternal(
-            ApplicationException e,
+            BaseException e,
             BaseErrorCode baseErrorCode,
             HttpHeaders headers,
             HttpServletRequest request
     ) {
         String code = baseErrorCode.getCustomCode();
-
         WebRequest webRequest = new ServletWebRequest(request);
 
         return super.handleExceptionInternal(