REFACTOR : Apply 도메인 예외처리 추가

SOPT-33-iOS-Team-1 · Nov 25, 2023 · 4dce402 · 4dce402
1 parent 845c716
commit 4dce402
Show file tree

Hide file tree

Showing 9 changed files with 81 additions and 11 deletions.
diff --git a/src/main/java/org/sopt/sopkerton/program/service/ProgramService.java b/src/main/java/org/sopt/sopkerton/program/service/ProgramService.java
@@ -14,6 +14,8 @@
 import org.sopt.sopkerton.program.infrastructure.ProgramRepository;
 import org.sopt.sopkerton.user.domain.Apply;
 import org.sopt.sopkerton.user.domain.enums.ApplyStatus;
+import org.sopt.sopkerton.user.domain.exception.apply.ApplyError;
+import org.sopt.sopkerton.user.domain.exception.apply.ApplyException;
 import org.sopt.sopkerton.user.infrastructure.ApplyRepository;
 import org.springframework.stereotype.Service;
 
@@ -29,7 +31,7 @@ public class ProgramService {
     public List<ProgramListResponse> getProgramListByProgramType(String programType) {
         List<Program> programs = programRepository.findAllByProgramType(programType);
 
-        List<ProgramListResponse> programListResponses = programs.stream()
+        return programs.stream()
                 .map(program -> new ProgramListResponse(
                         program.getId(),
                         program.getTitle(),
@@ -40,13 +42,12 @@ public List<ProgramListResponse> getProgramListByProgramType(String programType)
                         program.getType()
                 ))
                 .collect(Collectors.toList());
-        return programListResponses;
     }
 
     public List<ProgramListResponse> getStatusDoneProgramList() {
         List<Program> programs = programRepository.findAllByStatus(Status.DONE);
 
-        List<ProgramListResponse> programListResponses = programs.stream()
+        return programs.stream()
                 .map(program -> new ProgramListResponse(
                         program.getId(),
                         program.getTitle(),
@@ -57,13 +58,13 @@ public List<ProgramListResponse> getStatusDoneProgramList() {
                         program.getType()
                 ))
                 .collect(Collectors.toList());
-        return programListResponses;
     }
 
     public Object getProgramDetail(Long userId, Long programId) {
         Program program = programRepository.findById(programId)
                 .orElseThrow(() -> new ProgramException(ProgramError.PROGRAM_NOT_FOUND));
-        Apply apply = applyRepository.findByUserIdAndProgramId(userId, programId).get();
+        Apply apply = applyRepository.findByUserIdAndProgramId(userId, programId)
+                .orElseThrow(() -> new ApplyException(ApplyError.APPLY_NOT_FOUND));
         boolean isApply = convertToIsApply(apply.getIsApply());
         if (program.getType().equals(VOLUNTEER_TYPE)) {
             return new ProgramDetailResponse.VolunteerDetail(

diff --git a/src/main/java/org/sopt/sopkerton/user/controller/UserController.java b/src/main/java/org/sopt/sopkerton/user/controller/UserController.java
@@ -2,7 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import org.sopt.sopkerton.common.response.ApiResponse;
-import org.sopt.sopkerton.user.domain.exception.UserSuccess;
+import org.sopt.sopkerton.user.domain.exception.user.UserSuccess;
 import org.sopt.sopkerton.user.dto.response.DetailView;
 import org.sopt.sopkerton.user.dto.response.MainView;
 import org.sopt.sopkerton.user.service.UserService;

diff --git a/src/main/java/org/sopt/sopkerton/user/domain/exception/apply/ApplyError.java b/src/main/java/org/sopt/sopkerton/user/domain/exception/apply/ApplyError.java
@@ -0,0 +1,31 @@
+package org.sopt.sopkerton.user.domain.exception.apply;
+
+import lombok.AllArgsConstructor;
+import org.sopt.sopkerton.common.exception.base.ErrorBase;
+import org.springframework.http.HttpStatus;
+
+@AllArgsConstructor
+public enum ApplyError implements ErrorBase {
+
+    APPLY_NOT_FOUND(HttpStatus.NOT_FOUND, "Can not found Apply.")
+    ;
+
+
+    private final HttpStatus status;
+    private final String errorMessage;
+
+    @Override
+    public int getHttpStatusCode() {
+        return this.status.value();
+    }
+
+    @Override
+    public HttpStatus getHttpStatus() {
+        return this.status;
+    }
+
+    @Override
+    public String getErrorMessage() {
+        return this.errorMessage;
+    }
+}
diff --git a/src/main/java/org/sopt/sopkerton/user/domain/exception/apply/ApplyException.java b/src/main/java/org/sopt/sopkerton/user/domain/exception/apply/ApplyException.java
@@ -0,0 +1,9 @@
+package org.sopt.sopkerton.user.domain.exception.apply;
+
+import org.sopt.sopkerton.common.exception.base.ExceptionBase;
+
+public class ApplyException extends ExceptionBase {
+    public ApplyException(ApplyError errorBase) {
+        super(errorBase);
+    }
+}
diff --git a/src/main/java/org/sopt/sopkerton/user/domain/exception/apply/ApplySuccess.java b/src/main/java/org/sopt/sopkerton/user/domain/exception/apply/ApplySuccess.java
@@ -0,0 +1,29 @@
+package org.sopt.sopkerton.user.domain.exception.apply;
+
+import lombok.AllArgsConstructor;
+import org.sopt.sopkerton.common.exception.base.SuccessBase;
+import org.springframework.http.HttpStatus;
+
+@AllArgsConstructor
+public enum ApplySuccess implements SuccessBase {
+
+    ;
+
+    private final HttpStatus status;
+    private final String successMessage;
+
+    @Override
+    public int getHttpStatusCode() {
+        return this.status.value();
+    }
+
+    @Override
+    public HttpStatus getHttpStatus() {
+        return this.status;
+    }
+
+    @Override
+    public String getSuccessMessage() {
+        return this.successMessage;
+    }
+}
diff --git a/...rton/user/domain/exception/UserError.java → ...user/domain/exception/user/UserError.java b/...rton/user/domain/exception/UserError.java → ...user/domain/exception/user/UserError.java
@@ -1,4 +1,4 @@
-package org.sopt.sopkerton.user.domain.exception;
+package org.sopt.sopkerton.user.domain.exception.user;
 
 import lombok.AllArgsConstructor;
 import org.sopt.sopkerton.common.exception.base.ErrorBase;

diff --git a/.../user/domain/exception/UserException.java → .../domain/exception/user/UserException.java b/.../user/domain/exception/UserException.java → .../domain/exception/user/UserException.java
@@ -1,4 +1,4 @@
-package org.sopt.sopkerton.user.domain.exception;
+package org.sopt.sopkerton.user.domain.exception.user;
 
 import org.sopt.sopkerton.common.exception.base.ExceptionBase;
 

diff --git a/...on/user/domain/exception/UserSuccess.java → ...er/domain/exception/user/UserSuccess.java b/...on/user/domain/exception/UserSuccess.java → ...er/domain/exception/user/UserSuccess.java
@@ -1,4 +1,4 @@
-package org.sopt.sopkerton.user.domain.exception;
+package org.sopt.sopkerton.user.domain.exception.user;
 
 import lombok.AllArgsConstructor;
 import org.sopt.sopkerton.common.exception.base.SuccessBase;

diff --git a/src/main/java/org/sopt/sopkerton/user/service/UserService.java b/src/main/java/org/sopt/sopkerton/user/service/UserService.java
@@ -3,8 +3,8 @@
 import lombok.RequiredArgsConstructor;
 import org.sopt.sopkerton.user.domain.User;
 import org.sopt.sopkerton.user.domain.enums.Gender;
-import org.sopt.sopkerton.user.domain.exception.UserError;
-import org.sopt.sopkerton.user.domain.exception.UserException;
+import org.sopt.sopkerton.user.domain.exception.user.UserError;
+import org.sopt.sopkerton.user.domain.exception.user.UserException;
 import org.sopt.sopkerton.user.dto.response.DetailView;
 import org.sopt.sopkerton.user.dto.response.MainView;
 import org.sopt.sopkerton.user.infrastructure.UserRepository;