[TEST] 테스트 코드 구현

build.gradle

@@ -27,14 +27,17 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-jdbc'
     implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-web'
+
     compileOnly 'org.projectlombok:lombok'
     developmentOnly 'org.springframework.boot:spring-boot-devtools'
     runtimeOnly 'com.mysql:mysql-connector-j'
     annotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.security:spring-security-test'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    implementation 'org.springframework.boot:spring-boot-starter-aop'
 }
 
 tasks.named('test') {

src/main/java/org/example/gc_coffee/Exception/GlobalExceptionHandler.java

@@ -1,12 +1,12 @@
 package org.example.gc_coffee.Exception;
 
 import jakarta.persistence.EntityNotFoundException;
-import org.example.gc_coffee.dto.response.ApiResponseDto;
+import org.example.gc_coffee.dto.common.ApiResponseDto;
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-@ControllerAdvice
+@RestControllerAdvice
 public class GlobalExceptionHandler {
 
     @ExceptionHandler(EntityNotFoundException.class)

src/main/java/org/example/gc_coffee/GcCoffeeApplication.java

@@ -2,7 +2,9 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
+@EnableJpaAuditing //등록시각, 수정시각을 위한 전체 auditing 활성화를 위한 에노테이션
 @SpringBootApplication
 public class GcCoffeeApplication {
 

src/main/java/org/example/gc_coffee/aspects/ExeTimer.java

@@ -0,0 +1,11 @@
+package org.example.gc_coffee.aspects;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ExeTimer {
+}

src/main/java/org/example/gc_coffee/aspects/ExecutionTimer.java

@@ -0,0 +1,68 @@
+package org.example.gc_coffee.aspects;
+
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StopWatch;
+
+@Slf4j
+@Component
+@Aspect
+public class ExecutionTimer {
+
+    /*
+     * @Arund 사용 -> 메서드 실행 전, 후로 시간을 공유해야 하기 때문
+     * * org.example.gc_coffee.controller.*.*(..) -> controller 패키지 내의 모든 클래스 및 함수 실행 시 동작
+     */
+    @Around("execution(* org.example.gc_coffee.controller.*.*(..))")
+    public Object PackageExecutionTime(ProceedingJoinPoint joinPoint) throws Throwable {
+
+        StopWatch stopWatch = new StopWatch();
+
+        stopWatch.start();
+        Object result = joinPoint.proceed();
+        stopWatch.stop();
+
+        long totalTimeMillis = stopWatch.getTotalTimeMillis();
+
+        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+        String methodName = signature.getMethod().getName();
+
+        log.info("실행 메서드: {}, 실행시간 = {}ms", methodName, totalTimeMillis);
+
+        return result;
+    }
+
+
+
+    /*
+     * 조인포인트를 어노테이션으로 설정
+     * 시간을 테스트할 함수에 @ExeTimer 작성
+     */
+//    @Pointcut("@annotation(org.example.gc_coffee.aspects.ExeTimer)")
+//    private void timer(){};
+//
+//    // 메서드 실행 전,후로 시간을 공유해야 하기 때문
+//    @Around("timer()")
+//    public Object UnitExecutionTime(ProceedingJoinPoint joinPoint) throws Throwable {
+//
+//        StopWatch stopWatch = new StopWatch();
+//
+//        stopWatch.start();
+//        Object result = joinPoint.proceed(); // 조인포인트의 메서드 실행
+//        stopWatch.stop();
+//
+//        long totalTimeMillis = stopWatch.getTotalTimeMillis();
+//
+//        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+//        String methodName = signature.getMethod().getName();
+//
+//        log.info("실행 메서드: {}, 실행시간 = {}ms", methodName, totalTimeMillis);
+//
+//        return result;
+//    }
+}

src/main/java/org/example/gc_coffee/controller/OrderController.java

@@ -1,8 +1,10 @@
 package org.example.gc_coffee.controller;
 
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import org.example.gc_coffee.dto.OrderDto;
-import org.example.gc_coffee.dto.response.ApiResponseDto;
+import org.example.gc_coffee.dto.request.OrderReqDto;
+import org.example.gc_coffee.dto.response.OrderResDto;
+import org.example.gc_coffee.dto.common.ApiResponseDto;
 import org.example.gc_coffee.service.OrderService;
 import org.springframework.web.bind.annotation.*;
 
@@ -16,20 +18,20 @@ public class OrderController {
     private final OrderService orderService;
 
     @GetMapping("/{email}")
-    public ApiResponseDto<List<OrderDto>> getOrderByEmail(@PathVariable(value = "email") String email) {
-        List<OrderDto> orderDtoList = orderService.getOrderByEmail(email);
-        return new ApiResponseDto<>("Order retrieved successfully", orderDtoList);
+    public ApiResponseDto<List<OrderResDto>> getOrderByEmail(@PathVariable(value = "email") String email) {
+        List<OrderResDto> orderResDtoList = orderService.getOrderByEmail(email);
+        return new ApiResponseDto<>("Order retrieved successfully", orderResDtoList);
     }
 
     @GetMapping("/all")
-    public ApiResponseDto<List<OrderDto>> getAllOrder() {
-        List<OrderDto> orders = orderService.getAllOrders();
+    public ApiResponseDto<List<OrderResDto>> getAllOrder() {
+        List<OrderResDto> orders = orderService.getAllOrders();
         return new ApiResponseDto<>("Orders retrieved successfully", orders);
     }
 
     @PostMapping
-    public ApiResponseDto<String> registerOrder(@RequestBody OrderDto orderDto) {
-        orderService.registerOrder(orderDto);
+    public ApiResponseDto<String> registerOrder(@RequestBody @Valid OrderReqDto orderReqDto) {
+        orderService.registerOrder(orderReqDto);
         return new ApiResponseDto<>(201, "Order registered successfully \n당일 오후 2시 이후의 주문은 다음날 배송을 시작합니다.", null);
     }
 }

src/main/java/org/example/gc_coffee/controller/ProductController.java

@@ -1,11 +1,10 @@
 package org.example.gc_coffee.controller;
 
 import lombok.RequiredArgsConstructor;
-import org.example.gc_coffee.dto.ProductDto;
-import org.example.gc_coffee.dto.response.ApiResponseDto;
+import org.example.gc_coffee.dto.request.ProductReqDto;
+import org.example.gc_coffee.dto.response.ProductResDto;
+import org.example.gc_coffee.dto.common.ApiResponseDto;
 import org.example.gc_coffee.service.ProductService;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -18,20 +17,20 @@ public class ProductController {
     private final ProductService productService;
 
     @GetMapping("/{name}")
-    public ApiResponseDto<ProductDto> getProductByName(@PathVariable(value = "name") String name) {
-        ProductDto product = productService.getProductByNames(name);
+    public ApiResponseDto<ProductResDto> getProductByName(@PathVariable(value = "name") String name) {
+        ProductResDto product = productService.getProductByNames(name);
         return new ApiResponseDto<>("Product retrieved successfully", product);
     }
 
     @GetMapping("/all")
-    public ApiResponseDto<List<ProductDto>> getAllProducts() {
-        List<ProductDto> products = productService.getAllProducts();
+    public ApiResponseDto<List<ProductResDto>> getAllProducts() {
+        List<ProductResDto> products = productService.getAllProducts();
         return new ApiResponseDto<>("All products retrieved successfully", products);
     }
 
     @PostMapping
-    public ApiResponseDto<String> registerProduct(@RequestBody ProductDto productDto) {
-        productService.registerProduct(productDto);
+    public ApiResponseDto<String> registerProduct(@RequestBody ProductReqDto productReqDto) {
+        productService.registerProduct(productReqDto);
         return new ApiResponseDto<>(201,"Product registered successfully", null);
     }
 }

src/main/java/org/example/gc_coffee/dto/response/ApiResponseDto.java → src/main/java/org/example/gc_coffee/dto/common/ApiResponseDto.java

@@ -1,4 +1,4 @@
-package org.example.gc_coffee.dto.response;
+package org.example.gc_coffee.dto.common;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/org/example/gc_coffee/dto/common/OrderStatus.java

@@ -0,0 +1,12 @@
+package org.example.gc_coffee.dto.common;
+
+public enum OrderStatus {
+    ORDER_PLACED,        // 주문 완료
+    PENDING_PAYMENT,     // 결제 대기
+    PAYMENT_COMPLETED,   // 결제 완료
+    PREPARING_SHIPMENT,  // 상품 준비 중
+    SHIPPED,             // 배송 중
+    DELIVERED,           // 배송 완료
+    COMPLETED            // 주문 완료
+    ;
+}

src/main/java/org/example/gc_coffee/dto/request/OrderProductReqDto.java

@@ -0,0 +1,39 @@
+package org.example.gc_coffee.dto.request;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import org.example.gc_coffee.entity.Order;
+import org.example.gc_coffee.entity.OrderProduct;
+import org.example.gc_coffee.entity.Product;
+
+import java.util.UUID;
+
+public record OrderProductReqDto(
+        @NotNull(message = "상품 ID를 입력해주세요.")
+        UUID productId,
+
+        @NotBlank(message = "카테고리를 입력해주세요.")
+        String category,
+
+        @NotNull(message = "가격을 입력해주세요.")
+        Long price,
+
+        @NotNull(message = "수량을 입력해주세요.")
+        Integer quantity
+) {
+    // 정적 팩토리 메서드 of
+    public static OrderProductReqDto of(UUID productId, String category, Long price, Integer quantity) {
+        return new OrderProductReqDto(productId, category, price, quantity);
+    }
+
+    // DTO로부터 엔티티 생성하는 메서드 toEntity
+    public OrderProduct toEntity(Order order, Product product) {
+        return OrderProduct.builder()
+                .order(order)
+                .product(product)
+                .category(category)
+                .price(price)
+                .quantity(quantity)
+                .build();
+    }
+}