[016-HelpMS-리포지토리-구조변경]JPAException을 인프라로 옮기기 위해 SpringJPA를 상속받는 JPAR…

check-in-request-MS/src/main/java/com/example/checkinrequestMS/HelpAPI/domain/exceptions/HelpErrorCode.java → check-in-request-MS/src/main/java/com/example/checkinrequestMS/HelpAPI/domain/exceptions/help/HelpErrorCode.java

@@ -1,4 +1,4 @@
-package com.example.checkinrequestMS.HelpAPI.domain.exceptions;
+package com.example.checkinrequestMS.HelpAPI.domain.exceptions.help;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

check-in-request-MS/src/main/java/com/example/checkinrequestMS/HelpAPI/domain/exceptions/HelpException.java → check-in-request-MS/src/main/java/com/example/checkinrequestMS/HelpAPI/domain/exceptions/help/HelpException.java

@@ -1,4 +1,4 @@
-package com.example.checkinrequestMS.HelpAPI.domain.exceptions;
+package com.example.checkinrequestMS.HelpAPI.domain.exceptions.help;
 
 import com.example.checkinrequestMS.common.exception.types.DomainException;
 

check-in-request-MS/src/main/java/com/example/checkinrequestMS/HelpAPI/domain/exceptions/ProgressErrorCode.java → check-in-request-MS/src/main/java/com/example/checkinrequestMS/HelpAPI/domain/exceptions/progress/ProgressErrorCode.java

@@ -1,12 +1,12 @@
-package com.example.checkinrequestMS.HelpAPI.domain.exceptions;
+package com.example.checkinrequestMS.HelpAPI.domain.exceptions.progress;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 @Getter
 @RequiredArgsConstructor
 public enum ProgressErrorCode {
-    ;
+    NO_PROGRESS("진행 정보가 존재하지 않습니다.");
 
     private final String detail;
 }

check-in-request-MS/src/main/java/com/example/checkinrequestMS/HelpAPI/domain/exceptions/progress/ProgressException.java

@@ -0,0 +1,10 @@
+package com.example.checkinrequestMS.HelpAPI.domain.exceptions.progress;
+
+import com.example.checkinrequestMS.common.exception.types.DomainException;
+
+public class ProgressException extends DomainException {
+
+        public ProgressException(ProgressErrorCode errorCode) {
+            super(errorCode.getDetail());
+        }
+}

check-in-request-MS/src/main/java/com/example/checkinrequestMS/HelpAPI/domain/service/LineUp/LineUpCRUDService.java

@@ -2,15 +2,15 @@
 
 import com.example.checkinrequestMS.HelpAPI.domain.entities.help.child.LineUp;
 import com.example.checkinrequestMS.HelpAPI.infra.db.help.LineUpJPARepository;
-import com.example.checkinrequestMS.HelpAPI.infra.exceptions.JPAException;
+import com.example.checkinrequestMS.HelpAPI.infra.aop.exceptions.JPAException;
 import com.example.checkinrequestMS.PlaceAPI.domain.Place;
 import com.example.checkinrequestMS.PlaceAPI.domain.exceptions.place.PlaceException;
 import com.example.checkinrequestMS.PlaceAPI.infra.PlaceRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import static com.example.checkinrequestMS.HelpAPI.infra.exceptions.JPAErrorCode.ERROR_SAVING;
+import static com.example.checkinrequestMS.HelpAPI.infra.aop.exceptions.JPAErrorCode.ERROR_SAVE;
 import static com.example.checkinrequestMS.PlaceAPI.domain.exceptions.place.PlaceErrorCode.NO_PLACE_INFO;
 
 @Service
@@ -24,14 +24,11 @@ public class LineUpCRUDService {
     public void registerLineUp(LineUp lineUp) {
         Place place = placeRepository.findById(lineUp.getPlaceId())
                 .orElseThrow(() -> new PlaceException(NO_PLACE_INFO));
-        lineUp.setPlaceWithFullInfo(place);
+        //lineUp.setPlaceWithFullInfo(place);
         lineUp.setLineUpTitle(place);
 
-        try {
-            lineUpJPARepository.save(lineUp);
-        } catch (Exception e) {
-            throw new JPAException(ERROR_SAVING);
-        }
+        lineUpJPARepository.save(lineUp);
+
     }
 
 

check-in-request-MS/src/main/java/com/example/checkinrequestMS/HelpAPI/domain/service/LineUp/LineUpSelectService.java

@@ -1,13 +1,13 @@
 package com.example.checkinrequestMS.HelpAPI.domain.service.LineUp;
 
 import com.example.checkinrequestMS.HelpAPI.domain.entities.help.child.LineUp;
-import com.example.checkinrequestMS.HelpAPI.domain.exceptions.HelpException;
+import com.example.checkinrequestMS.HelpAPI.domain.exceptions.help.HelpException;
 import com.example.checkinrequestMS.HelpAPI.infra.db.help.LineUpJPARepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import static com.example.checkinrequestMS.HelpAPI.domain.exceptions.HelpErrorCode.NO_LINE_UP_INFO;
+import static com.example.checkinrequestMS.HelpAPI.domain.exceptions.help.HelpErrorCode.NO_LINE_UP_INFO;
 
 @Service
 @RequiredArgsConstructor
@@ -18,7 +18,6 @@ public class LineUpSelectService {
     @Transactional
     public LineUp selectLineUp(Long id) {
         return lineUpJPARepository.findById(id).orElseThrow(
-                () -> new HelpException(NO_LINE_UP_INFO)
-        );
+                () -> new HelpException(NO_LINE_UP_INFO));
     }
 }

check-in-request-MS/src/main/java/com/example/checkinrequestMS/HelpAPI/domain/service/checkIn/CheckInCRUDService.java

@@ -1,16 +1,16 @@
 package com.example.checkinrequestMS.HelpAPI.domain.service.checkIn;
 
 import com.example.checkinrequestMS.HelpAPI.domain.entities.help.child.CheckIn;
-import com.example.checkinrequestMS.HelpAPI.domain.entities.progress.Progress;
+import com.example.checkinrequestMS.HelpAPI.infra.aop.exceptions.JPAErrorCode;
 import com.example.checkinrequestMS.HelpAPI.infra.db.help.CheckInJPARepository;
-import com.example.checkinrequestMS.HelpAPI.infra.exceptions.JPAException;
+import com.example.checkinrequestMS.HelpAPI.infra.aop.exceptions.JPAException;
 import com.example.checkinrequestMS.PlaceAPI.domain.Place;
 import com.example.checkinrequestMS.PlaceAPI.domain.exceptions.place.PlaceException;
 import com.example.checkinrequestMS.PlaceAPI.infra.PlaceRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import static com.example.checkinrequestMS.HelpAPI.infra.exceptions.JPAErrorCode.ERROR_SAVING;
+
 import static com.example.checkinrequestMS.PlaceAPI.domain.exceptions.place.PlaceErrorCode.NO_PLACE_INFO;
 
 @Service
@@ -26,10 +26,6 @@ public void registerCheckIn(CheckIn checkIn) {
                 .orElseThrow(() -> new PlaceException(NO_PLACE_INFO));
         checkIn.setCheckInTitle(place);
 
-        try {
-            checkInJPARepository.save(checkIn);
-        } catch (Exception e) {
-            throw new JPAException(ERROR_SAVING);
-        }
+        checkInJPARepository.save(checkIn);
     }
 }

check-in-request-MS/src/main/java/com/example/checkinrequestMS/HelpAPI/domain/service/checkIn/CheckInSelectService.java

@@ -1,14 +1,14 @@
 package com.example.checkinrequestMS.HelpAPI.domain.service.checkIn;
 
 import com.example.checkinrequestMS.HelpAPI.domain.entities.help.child.CheckIn;
-import com.example.checkinrequestMS.HelpAPI.domain.exceptions.HelpException;
+import com.example.checkinrequestMS.HelpAPI.domain.exceptions.help.HelpException;
 import com.example.checkinrequestMS.HelpAPI.infra.db.help.CheckInJPARepository;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import static com.example.checkinrequestMS.HelpAPI.domain.exceptions.HelpErrorCode.NO_CHECK_IN_INFO;
+import static com.example.checkinrequestMS.HelpAPI.domain.exceptions.help.HelpErrorCode.NO_CHECK_IN_INFO;
 
 @Service
 @RequiredArgsConstructor

check-in-request-MS/src/main/java/com/example/checkinrequestMS/HelpAPI/domain/service/etc/EtcCRUDService.java

@@ -1,16 +1,18 @@
 package com.example.checkinrequestMS.HelpAPI.domain.service.etc;
 
 import com.example.checkinrequestMS.HelpAPI.domain.entities.help.child.Etc;
+import com.example.checkinrequestMS.HelpAPI.infra.aop.exceptions.JPAErrorCode;
 import com.example.checkinrequestMS.HelpAPI.infra.db.help.EtcJPARepository;
-import com.example.checkinrequestMS.HelpAPI.infra.exceptions.JPAException;
+import com.example.checkinrequestMS.HelpAPI.infra.aop.exceptions.JPAException;
 import com.example.checkinrequestMS.PlaceAPI.domain.Place;
 import com.example.checkinrequestMS.PlaceAPI.domain.exceptions.place.PlaceException;
 import com.example.checkinrequestMS.PlaceAPI.infra.PlaceRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import static com.example.checkinrequestMS.HelpAPI.infra.exceptions.JPAErrorCode.ERROR_SAVING;
+
+import static com.example.checkinrequestMS.HelpAPI.infra.aop.exceptions.JPAErrorCode.ERROR_SAVE;
 import static com.example.checkinrequestMS.PlaceAPI.domain.exceptions.place.PlaceErrorCode.NO_PLACE_INFO;
 
 @Service
@@ -21,14 +23,11 @@ public class EtcCRUDService {
 
     @Transactional
     public void registerEtc(Etc etc) {
-        Place place = placeRepository.findById(etc.getPlace().getId())
+        Place place = placeRepository.findById(etc.getPlaceId())
                 .orElseThrow(() -> new PlaceException(NO_PLACE_INFO));
-        etc.setPlaceWithFullInfo(place);
+        //etc.setPlaceWithFullInfo(place);
+
+        etcJPARepository.save(etc);
 
-        try {
-            etcJPARepository.save(etc);
-        } catch (Exception e) {
-            throw new JPAException(ERROR_SAVING);
-        }
     }
 }

check-in-request-MS/src/main/java/com/example/checkinrequestMS/HelpAPI/domain/service/etc/EtcSelectService.java

@@ -1,14 +1,13 @@
 package com.example.checkinrequestMS.HelpAPI.domain.service.etc;
 
 import com.example.checkinrequestMS.HelpAPI.domain.entities.help.child.Etc;
-import com.example.checkinrequestMS.HelpAPI.domain.exceptions.HelpErrorCode;
-import com.example.checkinrequestMS.HelpAPI.domain.exceptions.HelpException;
+import com.example.checkinrequestMS.HelpAPI.domain.exceptions.help.HelpException;
 import com.example.checkinrequestMS.HelpAPI.infra.db.help.EtcJPARepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import static com.example.checkinrequestMS.HelpAPI.domain.exceptions.HelpErrorCode.No_ETC_INFO;
+import static com.example.checkinrequestMS.HelpAPI.domain.exceptions.help.HelpErrorCode.No_ETC_INFO;
 
 @Service
 @RequiredArgsConstructor
@@ -21,6 +20,5 @@ public Etc selectEtc(Long id) {
         return etcJPARepository.findById(id).orElseThrow(
                 () -> new HelpException(No_ETC_INFO)
         );
-
     }
 }

check-in-request-MS/src/main/java/com/example/checkinrequestMS/HelpAPI/domain/service/progress/ProgressCRUDService.java

@@ -2,16 +2,17 @@
 
 import com.example.checkinrequestMS.HelpAPI.domain.entities.help.Help;
 import com.example.checkinrequestMS.HelpAPI.domain.entities.progress.Progress;
-import com.example.checkinrequestMS.HelpAPI.domain.exceptions.HelpException;
+import com.example.checkinrequestMS.HelpAPI.domain.exceptions.help.HelpException;
+
+import com.example.checkinrequestMS.HelpAPI.domain.exceptions.progress.ProgressException;
 import com.example.checkinrequestMS.HelpAPI.infra.db.help.HelpJPARepository;
 import com.example.checkinrequestMS.HelpAPI.infra.db.progress.ProgressJPARepository;
-import com.example.checkinrequestMS.HelpAPI.infra.exceptions.JPAException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import static com.example.checkinrequestMS.HelpAPI.domain.exceptions.HelpErrorCode.NO_HELP_INFO;
-import static com.example.checkinrequestMS.HelpAPI.infra.exceptions.JPAErrorCode.ERROR_SAVING;
+import static com.example.checkinrequestMS.HelpAPI.domain.exceptions.help.HelpErrorCode.NO_HELP_INFO;
+import static com.example.checkinrequestMS.HelpAPI.domain.exceptions.progress.ProgressErrorCode.NO_PROGRESS;
 
 @Service
 @RequiredArgsConstructor
@@ -23,15 +24,13 @@ public class ProgressCRUDService {
     @Transactional
     public Progress registerProgress(Progress progress) {
         Help help = helpJPARepository.findById(progress.getHelp().getId()).orElseThrow(
-                () -> new HelpException(NO_HELP_INFO)
-        );
+                () -> new HelpException(NO_HELP_INFO));
         progress.setHelp(help);
+        //todo: 내부 요청으로 MemberID
+        progressJPARepository.save(progress);
 
-        try{
-            return progressJPARepository.save(progress);
-        }catch (Exception e) {
-            throw new JPAException(ERROR_SAVING);
-        }
+        return progressJPARepository.findById(progress.getId()).orElseThrow(
+                () -> new ProgressException(NO_PROGRESS));
     }
 
     //사진파일저장, 인증 변화.

check-in-request-MS/src/main/java/com/example/checkinrequestMS/HelpAPI/infra/aop/aspect/JPAExceptionAspect.java

@@ -0,0 +1,45 @@
+package com.example.checkinrequestMS.HelpAPI.infra.aop.aspect;
+
+
+import com.example.checkinrequestMS.HelpAPI.infra.aop.exceptions.JPAException;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.stereotype.Component;
+
+import static com.example.checkinrequestMS.HelpAPI.infra.aop.exceptions.JPAErrorCode.*;
+
+@Component
+@Aspect
+public class JPAExceptionAspect {
+
+    @Around("@annotation(JPARead)")
+    public Object handleJPAReadException(ProceedingJoinPoint joinPoint) throws Throwable {
+        try {
+            return joinPoint.proceed();
+        } catch (Exception e) {
+            throw new JPAException(ERROR_READ, e);
+
+        }
+    }
+
+    @Around("@annotation(JPASave)")
+    public Object handleJPASaveException(ProceedingJoinPoint joinPoint) throws Throwable {
+        try {
+            return joinPoint.proceed();
+        } catch (Exception e) {
+            throw new JPAException(ERROR_SAVE, e);
+        }
+    }
+
+    @Around("@annotation(JPAUpdate)")
+    public Object handleJPAUpdateException(ProceedingJoinPoint joinPoint) throws Throwable {
+        try {
+            return joinPoint.proceed();
+        } catch (Exception e) {
+            throw new JPAException(ERROR_UPDATE, e);
+        }
+    }
+
+
+}

check-in-request-MS/src/main/java/com/example/checkinrequestMS/HelpAPI/infra/aop/aspect/JPARead.java

@@ -0,0 +1,11 @@
+package com.example.checkinrequestMS.HelpAPI.infra.aop.aspect;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface JPARead {
+}

check-in-request-MS/src/main/java/com/example/checkinrequestMS/HelpAPI/infra/aop/aspect/JPASave.java

@@ -0,0 +1,11 @@
+package com.example.checkinrequestMS.HelpAPI.infra.aop.aspect;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface JPASave {
+}

check-in-request-MS/src/main/java/com/example/checkinrequestMS/HelpAPI/infra/aop/aspect/JPAUpdate.java

@@ -0,0 +1,11 @@
+package com.example.checkinrequestMS.HelpAPI.infra.aop.aspect;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface JPAUpdate {
+}

check-in-request-MS/src/main/java/com/example/checkinrequestMS/HelpAPI/infra/aop/exceptions/JPAErrorCode.java

@@ -0,0 +1,15 @@
+package com.example.checkinrequestMS.HelpAPI.infra.aop.exceptions;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum JPAErrorCode {
+    ERROR_SAVE("JPA 저장 작업 중 에러"),
+    ERROR_UPDATE("JPA 업데이트 작업 중 에러"),
+    ERROR_READ("JPA 조회 작업 중 에러");
+
+
+    private final String detail;
+}

check-in-request-MS/src/main/java/com/example/checkinrequestMS/HelpAPI/infra/aop/exceptions/JPAException.java

@@ -0,0 +1,14 @@
+package com.example.checkinrequestMS.HelpAPI.infra.aop.exceptions;
+
+import com.example.checkinrequestMS.common.exception.types.InfraException;
+
+public class JPAException extends InfraException {
+
+    public JPAException(JPAErrorCode error) {
+        super(error.getDetail());
+    }
+
+    public JPAException(JPAErrorCode error, Exception e) {
+        super(error.getDetail(), e);
+    }
+}

check-in-request-MS/src/main/java/com/example/checkinrequestMS/HelpAPI/infra/db/help/CheckInJPARepository.java

@@ -1,7 +1,25 @@
 package com.example.checkinrequestMS.HelpAPI.infra.db.help;
 
 import com.example.checkinrequestMS.HelpAPI.domain.entities.help.child.CheckIn;
-import org.springframework.data.jpa.repository.JpaRepository;
+import com.example.checkinrequestMS.HelpAPI.infra.aop.aspect.JPARead;
+import com.example.checkinrequestMS.HelpAPI.infra.aop.aspect.JPASave;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+
+import java.util.Optional;
+
+@Repository
+@RequiredArgsConstructor
+public class CheckInJPARepository {
+    private final CheckInSpringJPARepository checkInSpringJPARepository;
+
+    @JPASave
+    public void save(CheckIn checkIn) {
+        checkInSpringJPARepository.save(checkIn);
+    }
+    @JPARead
+    public Optional<CheckIn> findById(Long id){
+        return checkInSpringJPARepository.findById(id);
+    }
 
-public interface CheckInJPARepository extends JpaRepository<CheckIn, Long> {
 }