feat: Added Querydsl Tests and resulting changes to the production codes

f-lab-edu · Jan 31, 2025 · adf1583 · adf1583
1 parent 657f441
commit adf1583
Show file tree

Hide file tree

Showing 5 changed files with 324 additions and 15 deletions.
diff --git a/orders/src/main/java/com/f_lab/joyeuse_planete/orders/domain/OrderSearchCondition.java b/orders/src/main/java/com/f_lab/joyeuse_planete/orders/domain/OrderSearchCondition.java
@@ -14,12 +14,12 @@ public class OrderSearchCondition {
 
   //TODO Java Bean Validation 추가
 
-  private BigDecimal minCost = BigDecimal.ZERO;   // Default value
+  private BigDecimal minCost = BigDecimal.ZERO;
   private BigDecimal maxCost;
-  private String status = "ALL";
+  private String status;
   private LocalDateTime startDate = LocalDateTime.of(2024, Month.JANUARY, 1, 0, 0);
   private LocalDateTime endDate;
   private List<String> sortBy = List.of("DATE_NEW");
-  private int page = 0;                           // Default page
-  private int size = 10;                          // Default page size
+  private int page = 0;
+  private int size = 10;
 }
diff --git a/orders/src/main/java/com/f_lab/joyeuse_planete/orders/dto/response/OrderDTO.java b/orders/src/main/java/com/f_lab/joyeuse_planete/orders/dto/response/OrderDTO.java
@@ -1,9 +1,7 @@
 package com.f_lab.joyeuse_planete.orders.dto.response;
 
-import com.f_lab.joyeuse_planete.core.domain.*;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.querydsl.core.annotations.QueryProjection;
-import jakarta.persistence.JoinColumn;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -13,7 +11,6 @@
 
 
 @Getter
-@Builder
 @NoArgsConstructor
 public class OrderDTO {
 
@@ -38,15 +35,19 @@ public class OrderDTO {
   @JsonProperty("status")
   private String status;
 
-  @JoinColumn(name = "payment_id")
+  @JsonProperty("payment_id")
   private Long payment;
 
-  @JoinColumn(name = "voucher_id")
+  @JsonProperty("voucher_id")
   private Long voucher;
 
-  @JoinColumn(name = "collection_time")
+  @JsonProperty("created_at")
+  private LocalDateTime createdAt;
+
+  @JsonProperty("collection_time")
   private LocalDateTime collectionTime;
 
+  @Builder
   @QueryProjection
   public OrderDTO(
       Long orderId,
@@ -58,7 +59,8 @@ public OrderDTO(
       String status,
       Long payment,
       Long voucher,
-      LocalDateTime collectionTime
+      LocalDateTime collectionTime,
+      LocalDateTime createdAt
   ) {
 
     this.orderId = orderId;
@@ -71,5 +73,6 @@ public OrderDTO(
     this.payment = payment;
     this.voucher = voucher;
     this.collectionTime = collectionTime;
+    this.createdAt = createdAt;
   }
 }
diff --git a/.../src/main/java/com/f_lab/joyeuse_planete/orders/repository/OrderRepositoryCustomImpl.java b/.../src/main/java/com/f_lab/joyeuse_planete/orders/repository/OrderRepositoryCustomImpl.java
@@ -13,19 +13,18 @@
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 
-
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.f_lab.joyeuse_planete.core.domain.QCurrency.currency;
 import static com.f_lab.joyeuse_planete.core.domain.QFood.food;
 import static com.f_lab.joyeuse_planete.core.domain.QOrder.order;
 import static com.f_lab.joyeuse_planete.core.domain.QPayment.payment;
 
-
 public class OrderRepositoryCustomImpl implements OrderRepositoryCustom {
 
   private Map<String, OrderSpecifier> sortByMap = new HashMap<>();
@@ -58,11 +57,13 @@ public Page<OrderDTO> findOrders(OrderSearchCondition condition, Pageable pageab
             order.status.stringValue(),
             order.payment.id.as("paymentId"),
             order.voucher.id.as("voucherId"),
-            order.collectionTime
+            order.collectionTime.as("collectionTime"),
+            order.createdAt.as("createdAt")
         ))
         .from(order)
         .leftJoin(order.payment, payment)
         .leftJoin(order.food, food)
+        .leftJoin(food.currency, currency)
         .where(
             eqStatus(condition.getStatus()),
             dateGoe(condition.getStartDate()),