Merge pull request #148 from makevook/issue/146,147

refactor,feat: UseCase 어노테이션 적용 및 Exception 적용 범위 포함
makevook · Jul 14, 2024 · c414780 · c414780
2 parents bb66702 + 532b9d2
commit c414780
Show file tree

Hide file tree

Showing 14 changed files with 49 additions and 56 deletions.
diff --git a/api/src/main/java/vook/server/api/globalcommon/annotation/UseCase.java b/api/src/main/java/vook/server/api/globalcommon/annotation/UseCase.java
@@ -0,0 +1,18 @@
+package vook.server.api.globalcommon.annotation;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Service
+@Validated
+@Transactional
+public @interface UseCase {
+}
diff --git a/...in/common/exception/ExceptionAdvisor.java → ...on/exception/ExceptionConvertAdvisor.java b/...in/common/exception/ExceptionAdvisor.java → ...on/exception/ExceptionConvertAdvisor.java
@@ -1,18 +1,19 @@
-package vook.server.api.domain.common.exception;
+package vook.server.api.globalcommon.exception;
 
 import jakarta.validation.ConstraintViolationException;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.springframework.stereotype.Component;
-import vook.server.api.globalcommon.exception.ParameterValidateException;
 
 @Aspect
 @Component
-public class ExceptionAdvisor {
-
-    // vook.server.api.domain 패키지 이하의 모든 메서드에 대해 실행
-    @Around("execution(* vook.server.api.domain..*.*(..))")
+public class ExceptionConvertAdvisor {
+
+    @Around("""
+            @within(vook.server.api.globalcommon.annotation.DomainLogic) || 
+            @within(vook.server.api.globalcommon.annotation.UseCase)
+            """)
     public Object convertException(ProceedingJoinPoint joinPoint) throws Throwable {
         try {
             return joinPoint.proceed();

diff --git a/api/src/main/java/vook/server/api/web/term/usecase/BatchDeleteTermUseCase.java b/api/src/main/java/vook/server/api/web/term/usecase/BatchDeleteTermUseCase.java
@@ -1,17 +1,15 @@
 package vook.server.api.web.term.usecase;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import vook.server.api.domain.user.logic.UserLogic;
 import vook.server.api.domain.vocabulary.logic.TermLogic;
 import vook.server.api.domain.vocabulary.model.Term;
+import vook.server.api.globalcommon.annotation.UseCase;
 import vook.server.api.policy.VocabularyPolicy;
 
 import java.util.List;
 
-@Service
-@Transactional
+@UseCase
 @RequiredArgsConstructor
 public class BatchDeleteTermUseCase {
 

diff --git a/api/src/main/java/vook/server/api/web/term/usecase/CreateTermUseCase.java b/api/src/main/java/vook/server/api/web/term/usecase/CreateTermUseCase.java
@@ -1,20 +1,18 @@
 package vook.server.api.web.term.usecase;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import vook.server.api.domain.user.logic.UserLogic;
 import vook.server.api.domain.vocabulary.logic.TermLogic;
 import vook.server.api.domain.vocabulary.logic.VocabularyLogic;
 import vook.server.api.domain.vocabulary.logic.dto.TermCreateCommand;
 import vook.server.api.domain.vocabulary.model.Term;
 import vook.server.api.domain.vocabulary.model.Vocabulary;
+import vook.server.api.globalcommon.annotation.UseCase;
 import vook.server.api.policy.VocabularyPolicy;
 
 import java.util.List;
 
-@Service
-@Transactional
+@UseCase
 @RequiredArgsConstructor
 public class CreateTermUseCase {
 

diff --git a/api/src/main/java/vook/server/api/web/term/usecase/DeleteTermUseCase.java b/api/src/main/java/vook/server/api/web/term/usecase/DeleteTermUseCase.java
@@ -1,15 +1,13 @@
 package vook.server.api.web.term.usecase;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import vook.server.api.domain.user.logic.UserLogic;
 import vook.server.api.domain.vocabulary.logic.TermLogic;
 import vook.server.api.domain.vocabulary.model.Term;
+import vook.server.api.globalcommon.annotation.UseCase;
 import vook.server.api.policy.VocabularyPolicy;
 
-@Service
-@Transactional
+@UseCase
 @RequiredArgsConstructor
 public class DeleteTermUseCase {
 

diff --git a/api/src/main/java/vook/server/api/web/term/usecase/RetrieveTermUseCase.java b/api/src/main/java/vook/server/api/web/term/usecase/RetrieveTermUseCase.java
@@ -3,19 +3,17 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import vook.server.api.domain.user.logic.UserLogic;
 import vook.server.api.domain.vocabulary.logic.VocabularyLogic;
 import vook.server.api.domain.vocabulary.model.Term;
 import vook.server.api.domain.vocabulary.model.Vocabulary;
+import vook.server.api.globalcommon.annotation.UseCase;
 import vook.server.api.policy.VocabularyPolicy;
 
 import java.time.LocalDateTime;
 import java.util.List;
 
-@Service
-@Transactional
+@UseCase
 @RequiredArgsConstructor
 public class RetrieveTermUseCase {
 

diff --git a/api/src/main/java/vook/server/api/web/term/usecase/SearchTermUseCase.java b/api/src/main/java/vook/server/api/web/term/usecase/SearchTermUseCase.java
@@ -5,21 +5,17 @@
 import jakarta.validation.constraints.NotEmpty;
 import lombok.Builder;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
 import vook.server.api.domain.vocabulary.logic.VocabularyLogic;
 import vook.server.api.domain.vocabulary.model.UserUid;
+import vook.server.api.globalcommon.annotation.UseCase;
 import vook.server.api.policy.VocabularyPolicy;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@Service
-@Validated
-@Transactional
+@UseCase
 @RequiredArgsConstructor
 public class SearchTermUseCase {
 

diff --git a/api/src/main/java/vook/server/api/web/term/usecase/UpdateTermUseCase.java b/api/src/main/java/vook/server/api/web/term/usecase/UpdateTermUseCase.java
@@ -1,18 +1,16 @@
 package vook.server.api.web.term.usecase;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import vook.server.api.domain.user.logic.UserLogic;
 import vook.server.api.domain.vocabulary.logic.TermLogic;
 import vook.server.api.domain.vocabulary.logic.dto.TermUpdateCommand;
 import vook.server.api.domain.vocabulary.model.Term;
+import vook.server.api.globalcommon.annotation.UseCase;
 import vook.server.api.policy.VocabularyPolicy;
 
 import java.util.List;
 
-@Service
-@Transactional
+@UseCase
 @RequiredArgsConstructor
 public class UpdateTermUseCase {
 

diff --git a/api/src/main/java/vook/server/api/web/user/usecase/OnboardingUserUseCase.java b/api/src/main/java/vook/server/api/web/user/usecase/OnboardingUserUseCase.java
@@ -1,8 +1,6 @@
 package vook.server.api.web.user.usecase;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import vook.server.api.domain.user.logic.UserLogic;
 import vook.server.api.domain.user.logic.dto.UserOnboardingCommand;
 import vook.server.api.domain.user.model.Funnel;
@@ -16,11 +14,11 @@
 import vook.server.api.domain.vocabulary.model.TemplateVocabularyType;
 import vook.server.api.domain.vocabulary.model.UserUid;
 import vook.server.api.domain.vocabulary.model.Vocabulary;
+import vook.server.api.globalcommon.annotation.UseCase;
 
 import java.util.List;
 
-@Service
-@Transactional
+@UseCase
 @RequiredArgsConstructor
 public class OnboardingUserUseCase {
 

diff --git a/api/src/main/java/vook/server/api/web/user/usecase/WithdrawUserUseCase.java b/api/src/main/java/vook/server/api/web/user/usecase/WithdrawUserUseCase.java
@@ -1,14 +1,12 @@
 package vook.server.api.web.user.usecase;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import vook.server.api.domain.user.logic.UserLogic;
 import vook.server.api.domain.vocabulary.logic.VocabularyLogic;
 import vook.server.api.domain.vocabulary.model.UserUid;
+import vook.server.api.globalcommon.annotation.UseCase;
 
-@Service
-@Transactional
+@UseCase
 @RequiredArgsConstructor
 public class WithdrawUserUseCase {
 

diff --git a/api/src/main/java/vook/server/api/web/vocabulary/usecase/CreateVocabularyUseCase.java b/api/src/main/java/vook/server/api/web/vocabulary/usecase/CreateVocabularyUseCase.java
@@ -1,15 +1,13 @@
 package vook.server.api.web.vocabulary.usecase;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import vook.server.api.domain.user.logic.UserLogic;
 import vook.server.api.domain.vocabulary.logic.VocabularyLogic;
 import vook.server.api.domain.vocabulary.logic.dto.VocabularyCreateCommand;
 import vook.server.api.domain.vocabulary.model.UserUid;
+import vook.server.api.globalcommon.annotation.UseCase;
 
-@Service
-@Transactional
+@UseCase
 @RequiredArgsConstructor
 public class CreateVocabularyUseCase {
 

diff --git a/api/src/main/java/vook/server/api/web/vocabulary/usecase/DeleteVocabularyUseCase.java b/api/src/main/java/vook/server/api/web/vocabulary/usecase/DeleteVocabularyUseCase.java
@@ -1,15 +1,13 @@
 package vook.server.api.web.vocabulary.usecase;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import vook.server.api.domain.user.logic.UserLogic;
 import vook.server.api.domain.vocabulary.logic.VocabularyLogic;
 import vook.server.api.domain.vocabulary.model.Vocabulary;
+import vook.server.api.globalcommon.annotation.UseCase;
 import vook.server.api.policy.VocabularyPolicy;
 
-@Service
-@Transactional
+@UseCase
 @RequiredArgsConstructor
 public class DeleteVocabularyUseCase {
 

diff --git a/api/src/main/java/vook/server/api/web/vocabulary/usecase/RetrieveVocabularyUseCase.java b/api/src/main/java/vook/server/api/web/vocabulary/usecase/RetrieveVocabularyUseCase.java
@@ -1,18 +1,16 @@
 package vook.server.api.web.vocabulary.usecase;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import vook.server.api.domain.user.logic.UserLogic;
 import vook.server.api.domain.vocabulary.logic.VocabularyLogic;
 import vook.server.api.domain.vocabulary.model.UserUid;
 import vook.server.api.domain.vocabulary.model.Vocabulary;
+import vook.server.api.globalcommon.annotation.UseCase;
 
 import java.time.LocalDateTime;
 import java.util.List;
 
-@Service
-@Transactional
+@UseCase
 @RequiredArgsConstructor
 public class RetrieveVocabularyUseCase {
 

diff --git a/api/src/main/java/vook/server/api/web/vocabulary/usecase/UpdateVocabularyUseCase.java b/api/src/main/java/vook/server/api/web/vocabulary/usecase/UpdateVocabularyUseCase.java
@@ -1,16 +1,14 @@
 package vook.server.api.web.vocabulary.usecase;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import vook.server.api.domain.user.logic.UserLogic;
 import vook.server.api.domain.vocabulary.logic.VocabularyLogic;
 import vook.server.api.domain.vocabulary.logic.dto.VocabularyUpdateCommand;
 import vook.server.api.domain.vocabulary.model.Vocabulary;
+import vook.server.api.globalcommon.annotation.UseCase;
 import vook.server.api.policy.VocabularyPolicy;
 
-@Service
-@Transactional
+@UseCase
 @RequiredArgsConstructor
 public class UpdateVocabularyUseCase {