Merge pull request JECT-Study#141 from JECT-Study/release/1.2.0

release: 1.2.0

Author: junest66

build.gradle

@@ -56,6 +56,7 @@ dependencies {
     implementation 'org.flywaydb:flyway-mysql'
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'
     implementation 'org.redisson:redisson-spring-boot-starter:3.37.0'
+    implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
 
     annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta"
     annotationProcessor "jakarta.annotation:jakarta.annotation-api"

compose-local.yaml

@@ -27,11 +27,48 @@ services:
     ports:
       - "6379:6379"
 
-  chzz-frontend:
-    image: cloudoort/chzzmarket-frontend:1.0
-    container_name: react-app
+  #  chzz-frontend:
+  #    image: cloudoort/chzzmarket-frontend:1.0
+  #    container_name: react-app
+  #    ports:
+  #      - "5173:5173"
+  chzz-es:
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.15.5
+    container_name: chzz-es
+    environment:
+      - discovery.type=single-node # 단일 노드
+      - xpack.security.enabled=false # 로컬 개발을 위해 SSL 설정을 비활성화
+      - xpack.security.http.ssl.enabled=false
+      - xpack.security.transport.ssl.enabled=false
+      - bootstrap.memory_lock=true # 메모리 스왑 방지
+      - "ES_JAVA_OPTS=-Xms1g -Xmx1g" # Java heap size 설정
+    ulimits: # 메모리 락 한도 설정 (-1은 무제한)
+      memlock:
+        soft: -1
+        hard: -1
+    ports:
+      - "9200:9200" # https
+      - "9300:9300" # tcp
+    volumes:
+      - chzz-es-data:/usr/share/elasticsearch/data
+    command:
+      - /bin/bash
+      - -c
+      - |
+        /usr/share/elasticsearch/bin/elasticsearch-plugin install analysis-nori &&
+        /usr/local/bin/docker-entrypoint.sh
+  kibana:
+    image: docker.elastic.co/kibana/kibana:8.15.5
+    container_name: chzz-kibana
+    restart: unless-stopped
+    environment:
+      - ELASTICSEARCH_HOSTS=http://chzz-es:9200 # Elasticsearch 호스트 연결
+      - SERVER_NAME=kibana
+      - XPACK_SECURITY_ENABLED=false # 보안 비활성화
     ports:
-      - "5173:5173"
+      - "5601:5601" # Kibana UI 포트
+    depends_on:
+      - chzz-es # Kibana가 Elasticsearch와 연결되도록 의존성 추가
 
 #  node-exporter:
 #    image: prom/node-exporter:latest
@@ -81,3 +118,4 @@ services:
 
 volumes:
   chzz-mysql-data:
+  chzz-es-data:

src/main/java/org/chzz/market/common/config/SecurityConfig.java

@@ -63,6 +63,7 @@ public SecurityFilterChain filterChain(final HttpSecurity http) throws Exception
                         .requestMatchers("/api-docs", "/swagger-ui/**", "/api/v3/api-docs/**").permitAll()
                         .requestMatchers(GET,
                                 "/api/v1/auctions",
+                                "/api/v1/auctions/search",
                                 "/api/v1/auctions/{auctionId:\\d+}",
                                 "/api/v1/auctions/categories",
                                 "/api/v1/notifications/subscribe",

src/main/java/org/chzz/market/domain/auction/controller/AuctionApi.java

@@ -73,6 +73,12 @@ ResponseEntity<Page<?>> getAuctionList(@LoginUser Long userId, @RequestParam(req
                                            @RequestParam(required = false) @Min(value = 1, message = "minutes는 1 이상의 값이어야 합니다.") Integer minutes,
                                            @ParameterObject @PageableDefault(sort = "newest") Pageable pageable);
 
+    @Operation(summary = "경매 검색", description = "경매를 검색합니다. [sort] newest(최신순), expensive(높은 가격순), cheap(낮은 가격순)")
+    ResponseEntity<?> searchAuctionList(@LoginUser Long userId,
+                                        @RequestParam String keyword,
+                                        @RequestParam AuctionStatus status,
+                                        @ParameterObject @PageableDefault(sort = "newest") Pageable pageable);
+
     @Operation(summary = "경매 카테고리 조회", description = "경매 카테고리 목록을 조회합니다.")
     @GetMapping("/categories")
     ResponseEntity<List<CategoryResponse>> getCategoryList();
@@ -120,5 +126,9 @@ ResponseEntity<Void> registerAuction(@LoginUser Long userId,
     @Operation(summary = "경매 테스트 등록", description = "테스트 등록합니다.")
     @PostMapping("/test")
     ResponseEntity<Void> testEndAuction(@LoginUser Long userId,
-                                        @RequestParam int seconds);
+                                        @RequestParam int seconds,
+                                        @RequestParam String name,
+                                        @RequestParam String description,
+                                        @RequestParam AuctionStatus status,
+                                        @RequestParam Integer minPrice);
 }

src/main/java/org/chzz/market/domain/auction/controller/AuctionController.java

@@ -19,6 +19,7 @@
 import org.chzz.market.domain.auction.service.AuctionCategoryService;
 import org.chzz.market.domain.auction.service.AuctionLookupService;
 import org.chzz.market.domain.auction.service.AuctionMyService;
+import org.chzz.market.domain.auction.service.AuctionSearchService;
 import org.chzz.market.domain.auction.service.AuctionTestService;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -40,6 +41,7 @@ public class AuctionController implements AuctionApi {
     private final AuctionCategoryService auctionCategoryService;
     private final AuctionTestService testService;
     private final AuctionMyService auctionMyService;
+    private final AuctionSearchService auctionSearchService;
 
     /**
      * 경매 목록 조회
@@ -56,6 +58,15 @@ public ResponseEntity<Page<?>> getAuctionList(@LoginUser Long userId,
                 auctionLookupService.getAuctionList(userId, category, status, minutes, pageable));
     }
 
+    @Override
+    @GetMapping("/search")
+    public ResponseEntity<?> searchAuctionList(@LoginUser Long userId,
+                                               @RequestParam String keyword,
+                                               @RequestParam AuctionStatus status,
+                                               @PageableDefault(sort = "newest") Pageable pageable) {
+        return ResponseEntity.ok(auctionSearchService.search(userId, keyword, status, pageable));
+    }
+
     /**
      * 경매 카테고리 Enum 조회
      */
@@ -140,8 +151,12 @@ public ResponseEntity<Void> registerAuction(@LoginUser Long userId,
     @Override
     @PostMapping("/test")
     public ResponseEntity<Void> testEndAuction(@LoginUser Long userId,
-                                               @RequestParam("seconds") int seconds) {
-        testService.test(userId, seconds);
+                                               @RequestParam("seconds") int seconds,
+                                               @RequestParam String name,
+                                               @RequestParam String description,
+                                               @RequestParam AuctionStatus status,
+                                               @RequestParam Integer minPrice) {
+        testService.test(userId, seconds, name, description, status, minPrice);
         return ResponseEntity.status(HttpStatus.CREATED).build();
     }
 }

src/main/java/org/chzz/market/domain/auction/dto/AuctionBidDetail.java

@@ -0,0 +1,4 @@
+package org.chzz.market.domain.auction.dto;
+
+public record AuctionBidDetail(Long auctionId, Long bidCount, Boolean isParticipated) {
+}

src/main/java/org/chzz/market/domain/auction/dto/AuctionLikeDetail.java

@@ -0,0 +1,4 @@
+package org.chzz.market.domain.auction.dto;
+
+public record AuctionLikeDetail(Long auctionId, Long likeCount, Boolean isLiked) {
+}

src/main/java/org/chzz/market/domain/auction/dto/event/AuctionDocumentDeleteEvent.java

@@ -0,0 +1,6 @@
+package org.chzz.market.domain.auction.dto.event;
+
+import org.chzz.market.domain.auction.entity.Auction;
+
+public record AuctionDocumentDeleteEvent(Auction auction) {
+}

src/main/java/org/chzz/market/domain/auction/dto/event/AuctionDocumentModifyEvent.java

@@ -0,0 +1,6 @@
+package org.chzz.market.domain.auction.dto.event;
+
+import org.chzz.market.domain.auction.entity.Auction;
+
+public record AuctionDocumentModifyEvent(Auction auction) {
+}

src/main/java/org/chzz/market/domain/auction/dto/event/AuctionDocumentSaveEvent.java

@@ -0,0 +1,6 @@
+package org.chzz.market.domain.auction.dto.event;
+
+import org.chzz.market.domain.auction.entity.Auction;
+
+public record AuctionDocumentSaveEvent(Auction auction) {
+}