Merge pull request #47 from Team-MindWay/46-annotation-create

어노테이션 생성
Team-MindWay · Apr 7, 2024 · 29f4926 · 29f4926
2 parents b295ea3 + 587f03f
commit 29f4926
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 36 deletions.
diff --git a/src/main/java/com/mindway/server/v2/domain/auth/service/impl/LogoutServiceImpl.java b/src/main/java/com/mindway/server/v2/domain/auth/service/impl/LogoutServiceImpl.java
@@ -6,13 +6,11 @@
 import com.mindway.server.v2.domain.auth.service.LogoutService;
 import com.mindway.server.v2.domain.user.entity.User;
 import com.mindway.server.v2.domain.user.util.UserUtil;
+import com.mindway.server.v2.global.annotation.ServiceWithTransaction;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-@Service
-@Transactional(rollbackFor = {Exception.class})
 @RequiredArgsConstructor
+@ServiceWithTransaction
 public class LogoutServiceImpl implements LogoutService {
 
     private final RefreshRepository refreshRepository;

diff --git a/src/main/java/com/mindway/server/v2/domain/auth/service/impl/ReissueTokenServiceImpl.java b/src/main/java/com/mindway/server/v2/domain/auth/service/impl/ReissueTokenServiceImpl.java
@@ -8,14 +8,12 @@
 import com.mindway.server.v2.domain.auth.service.ReissueTokenService;
 import com.mindway.server.v2.domain.user.entity.User;
 import com.mindway.server.v2.domain.user.repository.UserRepository;
+import com.mindway.server.v2.global.annotation.ServiceWithTransaction;
 import com.mindway.server.v2.global.security.jwt.JwtProvider;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-@Service
-@Transactional(rollbackFor = {Exception.class})
 @RequiredArgsConstructor
+@ServiceWithTransaction
 public class ReissueTokenServiceImpl implements ReissueTokenService {
 
     private final JwtProvider jwtProvider;

diff --git a/src/main/java/com/mindway/server/v2/domain/auth/service/impl/SignInServiceImpl.java b/src/main/java/com/mindway/server/v2/domain/auth/service/impl/SignInServiceImpl.java
@@ -9,6 +9,7 @@
 import com.mindway.server.v2.domain.user.entity.User;
 import com.mindway.server.v2.domain.user.entity.StudentNum;
 import com.mindway.server.v2.domain.user.repository.UserRepository;
+import com.mindway.server.v2.global.annotation.ServiceWithTransaction;
 import com.mindway.server.v2.global.security.jwt.JwtProvider;
 import gauth.GAuth;
 import gauth.GAuthToken;
@@ -17,15 +18,12 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
 import java.util.UUID;
 
-@Service
 @RequiredArgsConstructor
-@Transactional(rollbackFor = {Exception.class})
+@ServiceWithTransaction
 @Slf4j
 public class SignInServiceImpl implements SignInService {
 

diff --git a/src/main/java/com/mindway/server/v2/domain/order/service/impl/BookRequestServiceImpl.java b/src/main/java/com/mindway/server/v2/domain/order/service/impl/BookRequestServiceImpl.java
@@ -8,13 +8,11 @@
 import com.mindway.server.v2.domain.order.util.OrdersConverter;
 import com.mindway.server.v2.domain.user.entity.User;
 import com.mindway.server.v2.domain.user.util.UserUtil;
+import com.mindway.server.v2.global.annotation.ServiceWithTransaction;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-@Service
 @RequiredArgsConstructor
-@Transactional(rollbackFor = {Exception.class})
+@ServiceWithTransaction
 public class BookRequestServiceImpl implements BookRequestService {
 
     private final UserUtil userUtil;

diff --git a/...main/java/com/mindway/server/v2/domain/order/service/impl/DeleteBookOrderServiceImpl.java b/...main/java/com/mindway/server/v2/domain/order/service/impl/DeleteBookOrderServiceImpl.java
@@ -8,13 +8,11 @@
 import com.mindway.server.v2.domain.user.entity.Authority;
 import com.mindway.server.v2.domain.user.entity.User;
 import com.mindway.server.v2.domain.user.util.UserUtil;
+import com.mindway.server.v2.global.annotation.ServiceWithTransaction;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-@Service
 @RequiredArgsConstructor
-@Transactional(rollbackFor = {Exception.class})
+@ServiceWithTransaction
 public class DeleteBookOrderServiceImpl implements DeleteBookOrderService {
     private final OrdersRepository ordersRepository;
     private final UserUtil userUtil;

diff --git a/src/main/java/com/mindway/server/v2/domain/order/service/impl/GetBookOrdersServiceImpl.java b/src/main/java/com/mindway/server/v2/domain/order/service/impl/GetBookOrdersServiceImpl.java
@@ -8,16 +8,14 @@
 import com.mindway.server.v2.domain.user.entity.Authority;
 import com.mindway.server.v2.domain.user.entity.User;
 import com.mindway.server.v2.domain.user.util.UserUtil;
+import com.mindway.server.v2.global.annotation.ServiceWithReadOnlyTransaction;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-@Service
 @RequiredArgsConstructor
-@Transactional(readOnly = true, rollbackFor = {Exception.class})
+@ServiceWithReadOnlyTransaction
 public class GetBookOrdersServiceImpl implements GetBookOrdersService {
     private final UserUtil userUtil;
     private final OrdersRepository ordersRepository;

diff --git a/...main/java/com/mindway/server/v2/domain/order/service/impl/UpdateBookOrderServiceImpl.java b/...main/java/com/mindway/server/v2/domain/order/service/impl/UpdateBookOrderServiceImpl.java
@@ -8,13 +8,11 @@
 import com.mindway.server.v2.domain.order.service.UpdateBookOrderService;
 import com.mindway.server.v2.domain.user.entity.User;
 import com.mindway.server.v2.domain.user.util.UserUtil;
+import com.mindway.server.v2.global.annotation.ServiceWithTransaction;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-@Service
 @RequiredArgsConstructor
-@Transactional(rollbackFor = {Exception.class})
+@ServiceWithTransaction
 public class UpdateBookOrderServiceImpl implements UpdateBookOrderService {
     private final UserUtil userUtil;
     private final OrdersRepository ordersRepository;

diff --git a/src/main/java/com/mindway/server/v2/domain/user/service/impl/GetMyOrdersServiceImpl.java b/src/main/java/com/mindway/server/v2/domain/user/service/impl/GetMyOrdersServiceImpl.java
@@ -6,16 +6,14 @@
 import com.mindway.server.v2.domain.user.presentation.dto.response.MyOrdersResponse;
 import com.mindway.server.v2.domain.user.service.GetMyOrdersService;
 import com.mindway.server.v2.domain.user.util.UserUtil;
+import com.mindway.server.v2.global.annotation.ServiceWithReadOnlyTransaction;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-@Service
 @RequiredArgsConstructor
-@Transactional(readOnly = true, rollbackFor = {Exception.class})
+@ServiceWithReadOnlyTransaction
 public class GetMyOrdersServiceImpl implements GetMyOrdersService {
 
     private final UserUtil userUtil;

diff --git a/src/main/java/com/mindway/server/v2/domain/user/service/impl/UserInfoServiceImpl.java b/src/main/java/com/mindway/server/v2/domain/user/service/impl/UserInfoServiceImpl.java
@@ -4,13 +4,11 @@
 import com.mindway.server.v2.domain.user.presentation.dto.response.UserInfoResponse;
 import com.mindway.server.v2.domain.user.service.UserInfoService;
 import com.mindway.server.v2.domain.user.util.UserUtil;
+import com.mindway.server.v2.global.annotation.ServiceWithReadOnlyTransaction;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-@Service
 @RequiredArgsConstructor
-@Transactional(readOnly = true, rollbackFor = {Exception.class})
+@ServiceWithReadOnlyTransaction
 public class UserInfoServiceImpl implements UserInfoService {
 
     private final UserUtil userUtil;

diff --git a/src/main/java/com/mindway/server/v2/global/annotation/ServiceWithReadOnlyTransaction.java b/src/main/java/com/mindway/server/v2/global/annotation/ServiceWithReadOnlyTransaction.java
@@ -0,0 +1,16 @@
+package com.mindway.server.v2.global.annotation;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+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
+@Transactional(readOnly = true, rollbackFor = {Exception.class})
+public @interface ServiceWithReadOnlyTransaction {
+}
diff --git a/src/main/java/com/mindway/server/v2/global/annotation/ServiceWithTransaction.java b/src/main/java/com/mindway/server/v2/global/annotation/ServiceWithTransaction.java
@@ -0,0 +1,16 @@
+package com.mindway.server.v2.global.annotation;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+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
+@Transactional(rollbackFor = {Exception.class})
+public @interface ServiceWithTransaction {
+}