[FEATURE] : [Auction 도메인 필터 기반 검색 기능 추가]

.github/workflows/ci-cd.yml

@@ -0,0 +1,53 @@
+name: Java CI/CD with Gradle
+
+on:
+  push:
+    branches:
+      - 'develop'
+      - 'main' # main 브랜치에 병합될 때 트리거
+
+jobs:
+  ci-pipeline:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'adopt'
+          java-version: '21'
+
+      - name: Grant execute permission for Gradle Wrapper
+        run: chmod +x ./gradlew
+
+      - name: Lint and format code
+        run: ./gradlew editorconfigFormat
+
+      - name: Build with Gradle
+        run: ./gradlew build
+
+      - name: Test with Gradle
+        run: ./gradlew test
+
+  cd-pipeline:
+    if: github.ref == 'refs/heads/main' # main 브랜치에만 배포 실행
+    runs-on: ubuntu-latest
+    steps:
+      - name: SSH로 NCP 접속하기
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ secrets.NCP_HOST }}
+          username: ${{ secrets.NCP_USERNAME }}
+          password: ${{ secrets.NCP_SSH_PASSWORD }}
+          port: ${{ secrets.NCP_SSH_PORT }}
+          script_stop: true
+          script: |
+            cd auction
+            git pull knuk ttest
+            chmod 777 ./gradlew
+            ./gradlew build
+            kill -9 $(lsof -t -i:8080) || echo "No process on 8080"
+            nohup java -jar build/libs/*SNAPSHOT.jar > ./output.log 2>&1 &

src/main/java/com/tasksprints/auction/api/auction/AuctionController.java

@@ -80,8 +80,8 @@ public ResponseEntity<ApiResult<String>> getAuctionStatus(@PathVariable Long auc
     @GetMapping
     @Operation(summary = "Get all auctions", description = "Retrieves all auctions.")
     @ApiResponse(responseCode = "200", description = "All auctions retrieved successfully")
-    public ResponseEntity<ApiResult<List<AuctionResponse>>> getAllAuctions(@RequestParam(required = false) AuctionRequest.AuctionCategoryParam auctionCategory, @RequestParam(required = false) AuctionRequest.ProductCategoryParam productCategory) {
-        List<AuctionResponse> auctions = auctionService.getAuctionsByFilter(productCategory, auctionCategory);
+    public ResponseEntity<ApiResult<List<AuctionResponse>>> getAllAuctions(AuctionRequest.SearchCondition searchCondition) {
+        List<AuctionResponse> auctions = auctionService.getAuctionsByFilter(searchCondition);
         return ResponseEntity.ok(ApiResult.success(ApiResponseMessages.ALL_AUCTIONS_RETRIEVED, auctions));
     }
 

src/main/java/com/tasksprints/auction/common/config/WebConfig.java

@@ -0,0 +1,22 @@
+package com.tasksprints.auction.common.config;
+
+import com.tasksprints.auction.common.resolver.SearchConditionResolver;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.List;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+    private final SearchConditionResolver searchConditionResolver;
+
+    public WebConfig(SearchConditionResolver searchConditionResolver) {
+        this.searchConditionResolver = searchConditionResolver;
+    }
+
+    @Override
+    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
+        resolvers.add(searchConditionResolver);
+    }
+}

src/main/java/com/tasksprints/auction/common/resolver/SearchConditionResolver.java

@@ -0,0 +1,60 @@
+package com.tasksprints.auction.common.resolver;
+
+import com.tasksprints.auction.domain.auction.dto.request.AuctionRequest;
+import com.tasksprints.auction.domain.auction.model.AuctionCategory;
+import com.tasksprints.auction.domain.auction.model.AuctionStatus;
+import com.tasksprints.auction.domain.product.model.ProductCategory;
+import org.springframework.core.MethodParameter;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.support.WebDataBinderFactory;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.method.support.ModelAndViewContainer;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+@Component
+public class SearchConditionResolver implements HandlerMethodArgumentResolver {
+    @Override
+    public boolean supportsParameter(MethodParameter parameter) {
+        // 메서드 파라미터 타입이 AuctionRequest.SearchCondition일 때 처리
+        return parameter.getParameterType().equals(AuctionRequest.SearchCondition.class);
+    }
+
+    @Override
+    public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
+                                  NativeWebRequest webRequest, WebDataBinderFactory binderFactory) {
+
+        // QueryString에서 값을 추출
+        String auctionCategory = webRequest.getParameter("auctionCategory");
+        String productCategory = webRequest.getParameter("productCategory");
+        String startTime = webRequest.getParameter("startTime");
+        String endTime = webRequest.getParameter("endTime");
+        String minPrice = webRequest.getParameter("minPrice");
+        String maxPrice = webRequest.getParameter("maxPrice");
+        String auctionStatus = webRequest.getParameter("auctionStatus");
+        String sortBy = webRequest.getParameter("sortBy");
+        // 파싱 및 변환
+        AuctionCategory parsedAuctionCategory = auctionCategory != null ? AuctionCategory.fromDisplayName(auctionCategory) : null;
+        ProductCategory parsedProductCategory = productCategory != null ? ProductCategory.fromDisplayName(productCategory) : null;
+        LocalDateTime parsedStartTime = startTime != null ? LocalDateTime.parse(startTime, DateTimeFormatter.ISO_DATE_TIME) : null;
+        LocalDateTime parsedEndTime = endTime != null ? LocalDateTime.parse(endTime, DateTimeFormatter.ISO_DATE_TIME) : null;
+        BigDecimal parsedMinPrice = minPrice != null ? new BigDecimal(minPrice) : null;
+        BigDecimal parsedMaxPrice = maxPrice != null ? new BigDecimal(maxPrice) : null;
+        AuctionStatus parsedAuctionStatus = auctionStatus != null ? AuctionStatus.fromDisplayName(auctionStatus) : null;
+
+        // SearchCondition 객체 생성 및 반환
+        return new AuctionRequest.SearchCondition(
+            parsedAuctionCategory,
+            parsedProductCategory,
+            parsedStartTime,
+            parsedEndTime,
+            parsedMinPrice,
+            parsedMaxPrice,
+            parsedAuctionStatus,
+            sortBy
+        );
+    }
+}

src/main/java/com/tasksprints/auction/domain/auction/dto/request/AuctionRequest.java

@@ -3,6 +3,7 @@
 import com.tasksprints.auction.domain.auction.model.AuctionCategory;
 import com.tasksprints.auction.domain.auction.model.AuctionStatus;
 import com.tasksprints.auction.domain.product.model.ProductCategory;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -15,32 +16,25 @@ public class AuctionRequest {
     @NoArgsConstructor
     @AllArgsConstructor
     public static class Create {
-        LocalDateTime startTime;
-        LocalDateTime endTime;
-        BigDecimal startingBid;
-        AuctionCategory auctionCategory;
-        AuctionStatus auctionStatus;
+        private LocalDateTime startTime;
+        private LocalDateTime endTime;
+        private BigDecimal startingBid;
+        private AuctionCategory auctionCategory;
+        private AuctionStatus auctionStatus;
     }
 
     @Getter
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class AuctionCategoryParam {
-        AuctionCategory auctionCategory;
-
-        public AuctionCategoryParam(String auctionCategory) {
-            this.auctionCategory = AuctionCategory.fromDisplayName(auctionCategory);
-        }
-    }
-
-    @Getter
-    @NoArgsConstructor
     @AllArgsConstructor
-    public static class ProductCategoryParam {
-        ProductCategory productCategory;
+    @NoArgsConstructor(access = AccessLevel.PRIVATE)
+    public static class SearchCondition {
+        private AuctionCategory auctionCategory;
+        private ProductCategory productCategory;
+        private LocalDateTime startTime;
+        private LocalDateTime endTime;
+        private BigDecimal minPrice;
+        private BigDecimal maxPrice;
+        private AuctionStatus auctionStatus;
+        private String sortBy;
 
-        public ProductCategoryParam(String productCategory) {
-            this.productCategory = ProductCategory.fromDisplayName(productCategory);
-        }
     }
 }

src/main/java/com/tasksprints/auction/domain/auction/model/Auction.java

@@ -1,13 +1,16 @@
 package com.tasksprints.auction.domain.auction.model;
 
 import com.tasksprints.auction.common.entity.BaseEntity;
+import com.tasksprints.auction.domain.bid.model.Bid;
 import com.tasksprints.auction.domain.product.model.Product;
 import com.tasksprints.auction.domain.user.model.User;
 import jakarta.persistence.*;
 import lombok.*;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 @Builder
 @NoArgsConstructor
@@ -47,6 +50,11 @@ public class Auction extends BaseEntity {
     @Builder.Default
     private Product product = null;
 
+
+    @OneToMany
+    @Builder.Default
+    private List<Bid> bids = new ArrayList<>();
+
     public static Auction create(LocalDateTime startTime, LocalDateTime endTime, BigDecimal startingBid, AuctionCategory auctionCategory, AuctionStatus auctionStatus, User seller) {
         Auction newAuction = Auction.builder()
             .startTime(startTime)

src/main/java/com/tasksprints/auction/domain/auction/model/AuctionStatus.java

@@ -4,5 +4,13 @@ public enum AuctionStatus {
     PENDING,
     ACTIVE,
     CLOSED,
-    CANCELED
+    CANCELED;
+
+    public static AuctionStatus fromDisplayName(String auctionStatus) {
+        try {
+            return AuctionStatus.valueOf(auctionStatus.toUpperCase()); // 대문자로 변환하여 비교
+        } catch (IllegalArgumentException e) {
+            return AuctionStatus.ACTIVE; // 유효하지 않은 값일 경우 기본값으로 ACTIVE 반환
+        }
+    }
 }

src/main/java/com/tasksprints/auction/domain/auction/repository/AuctionRepository.java

@@ -2,9 +2,7 @@
 
 
 import com.tasksprints.auction.domain.auction.model.Auction;
-import com.tasksprints.auction.domain.auction.model.AuctionCategory;
 import com.tasksprints.auction.domain.auction.repository.support.AuctionCriteriaRepository;
-import com.tasksprints.auction.domain.product.model.ProductCategory;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -14,15 +12,11 @@
 
 public interface AuctionRepository extends JpaRepository<Auction, Long>, AuctionCriteriaRepository {
 
-
     @Query("SELECT a FROM auction a WHERE a.seller.id = :userId")
     List<Auction> findAuctionsByUserId(@Param("userId") Long userId);
 
     @Query("SELECT a FROM auction a WHERE a.id = :auctionId")
     Optional<Auction> findAuctionById(@Param("auctionId") Long auctionId);
 
-    List<Auction> findAuctionsByAuctionCategory(AuctionCategory auctionCategory);
-
-    List<Auction> findAuctionByProduct_Category(ProductCategory productCategory);
 }
 

src/main/java/com/tasksprints/auction/domain/auction/repository/support/AuctionCriteriaRepository.java

@@ -1,12 +1,10 @@
 package com.tasksprints.auction.domain.auction.repository.support;
 
+import com.tasksprints.auction.domain.auction.dto.request.AuctionRequest;
 import com.tasksprints.auction.domain.auction.model.Auction;
-import com.tasksprints.auction.domain.auction.model.AuctionCategory;
-import com.tasksprints.auction.domain.product.model.ProductCategory;
 
 import java.util.List;
 
 public interface AuctionCriteriaRepository {
-    public List<Auction> getAuctionsByFilters(ProductCategory productCategory,
-                                              AuctionCategory category);
+    List<Auction> getAuctionsByFilters(AuctionRequest.SearchCondition searchCondition);
 }