Refactor: import문 최적화

Taekgil99 · Nov 30, 2022 · 807b6e1 · 807b6e1
1 parent 29df86f
commit 807b6e1
Show file tree

Hide file tree

Showing 24 changed files with 31 additions and 86 deletions.
diff --git a/backend/src/main/java/com/backend/domain/order/api/OrderController.java b/backend/src/main/java/com/backend/domain/order/api/OrderController.java
@@ -4,15 +4,9 @@
 import com.backend.domain.order.dao.OrderRepository;
 import com.backend.domain.order.domain.Order;
 import com.backend.domain.order.dto.*;
-
 import com.backend.domain.order.mapper.OrderMapper;
-import com.backend.domain.product.domain.Product;
-import com.backend.domain.product.dto.ProductPatchDto;
-
-
 import com.backend.global.annotation.CurrentUser;
 import com.backend.global.config.auth.userdetails.CustomUserDetails;
-
 import com.backend.global.dto.Response.MultiResponse;
 import com.backend.global.dto.Response.SingleResponseDto;
 import lombok.RequiredArgsConstructor;
@@ -22,13 +16,11 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import javax.validation.constraints.Positive;
 import java.util.List;
-import java.util.Optional;
 
 @RestController
 @RequiredArgsConstructor
@@ -130,8 +122,3 @@ public ResponseEntity getSalesRate(@PathVariable("product-id") long productId) {
         Long orderId = orderService.cartOrder(cartOrderDtoList, principal.getName());
         return new ResponseEntity<Long>(orderId, HttpStatus.OK);*/
     }
-
-
-
-
-
diff --git a/backend/src/main/java/com/backend/domain/order/application/OrderService.java b/backend/src/main/java/com/backend/domain/order/application/OrderService.java
@@ -4,33 +4,33 @@
 import com.backend.domain.order.dao.OrderRepository;
 import com.backend.domain.order.domain.Order;
 import com.backend.domain.order.domain.OrderProduct;
-import com.backend.domain.order.domain.OrderStatus;
-import com.backend.domain.order.domain.QOrderProduct;
-import com.backend.domain.order.dto.*;
+import com.backend.domain.order.dto.CartOrderDto;
+import com.backend.domain.order.dto.CartOrderProductDto;
+import com.backend.domain.order.dto.OrderDto;
+import com.backend.domain.order.dto.OrderHistoryDto;
 import com.backend.domain.order.exception.OrderNotFound;
 import com.backend.domain.product.dao.ProductRepository;
 import com.backend.domain.product.domain.Product;
-import com.backend.domain.product.exception.ProductNotFound;
 import com.backend.domain.user.dao.UserRepository;
 import com.backend.domain.user.domain.User;
 import com.backend.domain.user.exception.MemberNotFound;
 import com.backend.global.error.BusinessLogicException;
 import com.backend.global.error.ExceptionCode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.*;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 import javax.persistence.EntityNotFoundException;
 import javax.transaction.Transactional;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
 import static com.backend.domain.order.domain.OrderStatus.SHIPPED;
 import static com.backend.domain.order.domain.OrderStatus.SHIPPING;
-import static com.backend.domain.order.domain.QOrder.order;
 import static com.backend.global.error.ExceptionCode.CANNOT_CHANGE_ORDER;
 
 @Transactional
@@ -210,5 +210,3 @@ public Page<Order> findUserOrders(long userId,int page, int size){
         return orderRepository.findOrders(userId, PageRequest.of(page,size, Sort.by("orderId").descending()));
 
     }*/
-
-
diff --git a/backend/src/main/java/com/backend/domain/order/dao/OrderRepository.java b/backend/src/main/java/com/backend/domain/order/dao/OrderRepository.java
@@ -1,15 +1,11 @@
 package com.backend.domain.order.dao;
 
-import com.backend.domain.order.application.OrderService;
 import com.backend.domain.order.domain.Order;
 import com.backend.domain.order.domain.OrderStatus;
-import com.backend.domain.user.domain.User;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
 
 import java.util.List;
 

diff --git a/backend/src/main/java/com/backend/domain/order/domain/Order.java b/backend/src/main/java/com/backend/domain/order/domain/Order.java
@@ -8,9 +8,7 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-
 import javax.persistence.*;
-import javax.transaction.Transactional;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/backend/src/main/java/com/backend/domain/order/domain/OrderProduct.java b/backend/src/main/java/com/backend/domain/order/domain/OrderProduct.java
@@ -1,10 +1,10 @@
 package com.backend.domain.order.domain;
 
-import com.backend.domain.order.dto.OrderProductDto;
 import com.backend.domain.product.domain.Product;
 import com.backend.global.audit.Auditable;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import lombok.*;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 import javax.persistence.*;
 

diff --git a/backend/src/main/java/com/backend/domain/order/domain/OrderStatus.java b/backend/src/main/java/com/backend/domain/order/domain/OrderStatus.java
@@ -1,7 +1,6 @@
 package com.backend.domain.order.domain;
 
 import lombok.Getter;
-import lombok.Setter;
 
 @Getter
 public enum OrderStatus {

diff --git a/backend/src/main/java/com/backend/domain/order/dto/CartOrderProductDto.java b/backend/src/main/java/com/backend/domain/order/dto/CartOrderProductDto.java
@@ -1,6 +1,5 @@
 package com.backend.domain.order.dto;
 
-import com.backend.domain.order.domain.OrderProduct;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

diff --git a/backend/src/main/java/com/backend/domain/order/dto/OrderDto.java b/backend/src/main/java/com/backend/domain/order/dto/OrderDto.java
@@ -1,6 +1,7 @@
 package com.backend.domain.order.dto;
 
-import lombok.*;
+import lombok.Getter;
+import lombok.Setter;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
@@ -27,9 +28,3 @@ public class OrderDto {
 
 
     }
-
-
-
-
-
-
diff --git a/backend/src/main/java/com/backend/domain/order/dto/OrderHistoryDto.java b/backend/src/main/java/com/backend/domain/order/dto/OrderHistoryDto.java
@@ -6,9 +6,6 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/backend/src/main/java/com/backend/domain/order/dto/OrderPatchDto.java b/backend/src/main/java/com/backend/domain/order/dto/OrderPatchDto.java
@@ -1,7 +1,8 @@
 package com.backend.domain.order.dto;
 
-import com.backend.domain.order.domain.OrderStatus;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Getter
 @NoArgsConstructor
@@ -20,4 +21,4 @@ public class OrderPatchDto {
 
 }
 //1차완
-//orderId를 받아야하는게 맞나?
+//orderId를 받아야하는게 맞나?
diff --git a/backend/src/main/java/com/backend/domain/order/dto/OrderProductDto.java b/backend/src/main/java/com/backend/domain/order/dto/OrderProductDto.java
@@ -1,10 +1,9 @@
 package com.backend.domain.order.dto;
+
 import com.backend.domain.order.domain.OrderProduct;
 import com.backend.domain.order.domain.OrderProductReviewStatus;
-import com.querydsl.core.annotations.QueryProjection;
-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
-import com.fasterxml.jackson.databind.annotation.JsonNaming;
-import lombok.*;
+import lombok.Getter;
+import lombok.Setter;
 
 @Getter @Setter
 public class OrderProductDto {
@@ -36,7 +35,3 @@ public OrderProductDto(OrderProduct orderProduct){
 
 
 }
-
-
-
-
diff --git a/backend/src/main/java/com/backend/domain/order/mapper/OrderMapper.java b/backend/src/main/java/com/backend/domain/order/mapper/OrderMapper.java
@@ -3,7 +3,6 @@
 import com.backend.domain.order.domain.Order;
 import com.backend.domain.order.dto.OrderDto;
 import com.backend.domain.order.dto.OrderPatchDto;
-import com.backend.domain.order.dto.OrderPriceDto;
 import com.backend.domain.order.dto.OrderResponseDto;
 import org.mapstruct.Mapper;
 
@@ -21,4 +20,4 @@ public interface OrderMapper {
     Order orderPatchDtoToOrder(OrderPatchDto orderPatchDto);
 
 
-}
+}
diff --git a/backend/src/main/java/com/backend/domain/payment/api/PaymentController.java b/backend/src/main/java/com/backend/domain/payment/api/PaymentController.java
@@ -1,6 +1,5 @@
 package com.backend.domain.payment.api;
 
-import com.backend.domain.payment.application.PaymentService;
 import com.backend.domain.payment.domain.Payment;
 import com.backend.domain.payment.dto.PaymentRequest;
 import com.backend.domain.payment.mapper.PaymentMapper;

diff --git a/backend/src/main/java/com/backend/domain/point/api/PointController.java b/backend/src/main/java/com/backend/domain/point/api/PointController.java
@@ -3,19 +3,14 @@
 import com.backend.domain.order.dao.OrderProductRepository;
 import com.backend.domain.order.dao.OrderRepository;
 import com.backend.domain.order.domain.Order;
-import com.backend.domain.order.domain.OrderProduct;
-import com.backend.domain.order.dto.OrderHistoryDto;
 import com.backend.domain.point.application.PointService;
-import com.backend.domain.point.domain.PointHistory;
 import com.backend.domain.point.domain.PointType;
 import com.backend.domain.point.dto.PointChargeDto;
 import com.backend.domain.point.dto.PointResponseDto;
 import com.backend.domain.point.mapper.PointMapper;
 import com.backend.domain.user.dao.UserRepository;
-
 import com.backend.domain.user.domain.User;
 import com.backend.domain.user.exception.MemberNotFound;
-
 import com.backend.global.annotation.CurrentUser;
 import com.backend.global.config.auth.userdetails.CustomUserDetails;
 import com.backend.global.dto.Response.MultiResponse;
@@ -31,7 +26,6 @@
 import javax.persistence.EntityNotFoundException;
 import javax.validation.constraints.Positive;
 import java.util.List;
-import java.util.Optional;
 
 @Slf4j
 @RequiredArgsConstructor

diff --git a/backend/src/main/java/com/backend/domain/point/application/PointService.java b/backend/src/main/java/com/backend/domain/point/application/PointService.java
@@ -95,8 +95,3 @@ public Page<PointResponseDto> getPointList(Long userId, Pageable pageable) {
         return new PageImpl<PointResponseDto>(pointResponseDtoList, pageable, totalQuantity);
     }
 }
-
-
-
-
-
diff --git a/backend/src/main/java/com/backend/domain/point/domain/PointHistory.java b/backend/src/main/java/com/backend/domain/point/domain/PointHistory.java
@@ -1,8 +1,10 @@
 package com.backend.domain.point.domain;
 
 import com.backend.domain.user.domain.User;
-import com.backend.global.audit.Auditable;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import lombok.experimental.SuperBuilder;
 import org.hibernate.annotations.DynamicInsert;
 import org.springframework.data.annotation.CreatedDate;

diff --git a/backend/src/main/java/com/backend/domain/point/domain/PointType.java b/backend/src/main/java/com/backend/domain/point/domain/PointType.java
@@ -1,7 +1,6 @@
 package com.backend.domain.point.domain;
 
 import lombok.Getter;
-import lombok.Setter;
 
 @Getter
 public enum PointType {

diff --git a/backend/src/main/java/com/backend/domain/point/dto/PointChargeDto.java b/backend/src/main/java/com/backend/domain/point/dto/PointChargeDto.java
@@ -1,7 +1,6 @@
 package com.backend.domain.point.dto;
 
 import com.backend.domain.point.domain.PointType;
-import com.backend.domain.user.domain.User;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

diff --git a/backend/src/main/java/com/backend/domain/point/dto/PointResponseDto.java b/backend/src/main/java/com/backend/domain/point/dto/PointResponseDto.java
@@ -5,7 +5,6 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
 @Getter

diff --git a/backend/src/main/java/com/backend/domain/point/mapper/PointMapper.java b/backend/src/main/java/com/backend/domain/point/mapper/PointMapper.java
@@ -1,6 +1,5 @@
 package com.backend.domain.point.mapper;
 
-import com.backend.domain.point.domain.PointHistory;
 import com.backend.domain.point.domain.PointHistory;
 import com.backend.domain.point.dto.PointResponseDto;
 import org.mapstruct.Mapper;

diff --git a/backend/src/main/java/com/backend/domain/user/application/UserService.java b/backend/src/main/java/com/backend/domain/user/application/UserService.java
@@ -93,9 +93,6 @@ public void createUser(User user) {
         log.info("비밀번호 암호화");
         pointService.addCash(user, 1000000, PointType.SignUpPoint);
         log.info("회원가입 포인트 지급");
-
-        userRepository.save(user);
-
     }
 
     private boolean isNotExistsEmailByOriginal(String email) {

diff --git a/backend/src/main/java/com/backend/domain/user/domain/User.java b/backend/src/main/java/com/backend/domain/user/domain/User.java
@@ -65,7 +65,7 @@ public class User extends Auditable {
     private String username;
 
     @Column
-    @ColumnDefault("0")
+    @ColumnDefault("-1")
     private int restCash;
 
     @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)

diff --git a/backend/src/main/java/com/backend/global/config/auth/dto/OAuthAttributes.java b/backend/src/main/java/com/backend/global/config/auth/dto/OAuthAttributes.java
@@ -1,12 +1,9 @@
 package com.backend.global.config.auth.dto;
 
-import com.backend.domain.point.application.PointService;
-import com.backend.domain.point.domain.PointType;
 import com.backend.domain.user.domain.User;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.crypto.password.PasswordEncoder;
 
 import java.util.Map;
 

diff --git a/backend/src/main/java/com/backend/global/config/auth/handler/CustomOAuth2UserService.java b/backend/src/main/java/com/backend/global/config/auth/handler/CustomOAuth2UserService.java
@@ -16,6 +16,7 @@
 import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.Collections;
@@ -78,7 +79,8 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic
      * @param attributes OAuthAttributes
      * @return User
      */
-    private User saveOrUpdate(OAuthAttributes attributes) {
+    @Transactional
+    public User saveOrUpdate(OAuthAttributes attributes) {
         log.info("saveOrUpdate 실행");
         User user = userRepository.findByEmailAndUserStatusAndSocialLogin(attributes.getEmail(), User.UserStatus.USER_EXIST, attributes.getRegistrationId())
                 .orElse(attributes.toEntity());
@@ -87,15 +89,14 @@ private User saveOrUpdate(OAuthAttributes attributes) {
             user.setPassword(passwordEncoder.encode(user.getNickname()));
         }
 
-        User savedUser = userRepository.save(user);
-
-        if (savedUser.getRestCash() == 0) {
+        if (user.getRestCash() == -1) {
+            user.setRestCash(0);
             pointService.addCash(user, 1000000, PointType.SignUpPoint);
             log.info("회원가입 포인트 지급");
         }
 
         log.info("saved User");
-        return savedUser;
+        return user;
     }
 
 }