[feat] 웨이블존 추천, 검색 응답 필드에 장애 시설 정보 추가

.github/workflows/cd-develop.yml

@@ -49,18 +49,56 @@ jobs:
       - name: Pull latest image from Docker Hub
         run: sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/github-actions-demo:latest
 
-      - name: Stop existing container if any
+      - name: Stop existing containers if any
         run: |
-          CONTAINER_ID=$(sudo docker ps -q --filter "name=github-actions-demo")
-          if [ ! -z "$CONTAINER_ID" ]; then
-            sudo docker stop $CONTAINER_ID
+          # Stop Spring Boot app container
+          APP_CONTAINER_ID=$(sudo docker ps -q --filter "name=github-actions-demo")
+          if [ ! -z "$APP_CONTAINER_ID" ]; then
+            sudo docker stop $APP_CONTAINER_ID
           fi
+
+          # Stop Elasticsearch container
+          ES_CONTAINER_ID=$(sudo docker ps -q --filter "name=elasticsearch")
+          if [ ! -z "$ES_CONTAINER_ID" ]; then
+            sudo docker stop $ES_CONTAINER_ID
+          fi
+
+      - name: Create Docker network if not exists
+        run: |
+          sudo docker network create wayble-network || true
 
-      - name: Run new container
+      - name: Run Elasticsearch container
+        run: |
+          sudo docker run -d \
+            --name elasticsearch \
+            --network wayble-network \
+            -p 9200:9200 -p 9300:9300 \
+            -e "discovery.type=single-node" \
+            -e "xpack.security.enabled=false" \
+            -e "ES_JAVA_OPTS=-Xms512m -Xmx512m" \
+            --restart unless-stopped \
+            docker.elastic.co/elasticsearch/elasticsearch:9.0.2
+
+      - name: Wait for Elasticsearch to be ready
+        run: |
+          echo "Waiting for Elasticsearch to start..."
+          for i in {1..30}; do
+            if curl -s http://localhost:9200/_health > /dev/null 2>&1; then
+              echo "Elasticsearch is ready!"
+              break
+            fi
+            echo "Waiting... ($i/30)"
+            sleep 10
+          done
+
+      - name: Run new Spring Boot container
         run: |
           sudo docker run -d --rm \
             --name github-actions-demo \
+            --network wayble-network \
             -p 8080:8080 \
+            -e "ELASTICSEARCH_HOST=elasticsearch" \
+            -e "ELASTICSEARCH_PORT=9200" \
             ${{ secrets.DOCKERHUB_USERNAME }}/github-actions-demo:latest
 
       - name: Prune unused docker resources

.github/workflows/test-elasticsearch.yml

@@ -0,0 +1,153 @@
+name: Test Elasticsearch CI/CD
+
+on:
+  workflow_dispatch: # 수동 실행 전용
+  push:
+    branches: [ "feature/seungmin" ] # 본인 브랜치에서만 실행
+
+permissions:
+  contents: read
+
+jobs:
+  # 1. 도커 이미지 빌드 및 푸시
+  build-docker-image:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Build with Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: clean bootJar
+
+      - name: Docker build with test tag
+        run: docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/wayble-test:latest .
+
+      - name: Docker login
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
+
+      - name: Push Docker image
+        run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/wayble-test:latest
+
+  # 2. EC2에서 테스트 컨테이너 실행
+  test-elasticsearch-on-ec2:
+    needs: build-docker-image
+    runs-on: self-hosted
+
+    steps:
+      - name: Pull latest test image from Docker Hub
+        run: sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/wayble-test:latest
+
+      - name: Stop existing test containers if any
+        run: |
+          # Stop test app container
+          TEST_APP_CONTAINER_ID=$(sudo docker ps -q --filter "name=wayble-test-app")
+          if [ ! -z "$TEST_APP_CONTAINER_ID" ]; then
+            sudo docker stop $TEST_APP_CONTAINER_ID
+            sudo docker rm $TEST_APP_CONTAINER_ID
+          fi
+
+          # Stop test Elasticsearch container
+          TEST_ES_CONTAINER_ID=$(sudo docker ps -q --filter "name=elasticsearch-test")
+          if [ ! -z "$TEST_ES_CONTAINER_ID" ]; then
+            sudo docker stop $TEST_ES_CONTAINER_ID
+            sudo docker rm $TEST_ES_CONTAINER_ID
+          fi
+
+      - name: Create test Docker network if not exists
+        run: |
+          sudo docker network create wayble-test-network || true
+
+      - name: Run test Elasticsearch container
+        run: |
+          sudo docker run -d \
+            --name elasticsearch-test \
+            --network wayble-test-network \
+            -p 9201:9200 -p 9301:9300 \
+            -e "discovery.type=single-node" \
+            -e "xpack.security.enabled=false" \
+            -e "ES_JAVA_OPTS=-Xms512m -Xmx512m" \
+            docker.elastic.co/elasticsearch/elasticsearch:9.0.2
+
+      - name: Wait for test Elasticsearch to be ready
+        run: |
+          echo "Waiting for test Elasticsearch to start..."
+          for i in {1..30}; do
+            if curl -s http://localhost:9201/_cluster/health > /dev/null 2>&1; then
+              echo "Test Elasticsearch is ready!"
+              break
+            fi
+            echo "Waiting... ($i/30)"
+            sleep 10
+          done
+
+      - name: Run test Spring Boot container
+        run: |
+          sudo docker run -d \
+            --name wayble-test-app \
+            --network wayble-test-network \
+            -p 8081:8080 \
+            -e "ELASTICSEARCH_HOST=elasticsearch-test" \
+            -e "ELASTICSEARCH_PORT=9200" \
+            -e "SPRING_PROFILES_ACTIVE=develop" \
+            ${{ secrets.DOCKERHUB_USERNAME }}/wayble-test:latest
+
+      - name: Test application health
+        run: |
+          echo "Waiting for application to start..."
+          sleep 30
+
+          # 애플리케이션 헬스체크
+          if curl -f http://localhost:8081/actuator/health > /dev/null 2>&1; then
+            echo "✅ Application is healthy!"
+          else
+            echo "❌ Application health check failed"
+            exit 1
+          fi
+
+          # Elasticsearch 연결 테스트
+          if curl -f http://localhost:9201/_cluster/health > /dev/null 2>&1; then
+            echo "✅ Elasticsearch is accessible!"
+          else
+            echo "❌ Elasticsearch connection failed"
+            exit 1
+          fi
+
+      - name: Cleanup test containers
+        if: always() # 성공/실패 관계없이 항상 실행
+        run: |
+          # 테스트 컨테이너들 정리
+          sudo docker stop wayble-test-app elasticsearch-test || true
+          sudo docker rm wayble-test-app elasticsearch-test || true
+          sudo docker network rm wayble-test-network || true
+
+      - name: Prune unused docker resources
+        run: sudo docker system prune -f
+
+      # ✅ 테스트 성공 알림
+      - name: Send test success notification
+        if: success()
+        run: |
+          curl -H "Content-Type: application/json" \
+               -X POST \
+               -d "{\"content\": \"✅ Elasticsearch CI/CD 테스트 성공! 이제 develop에 머지해도 안전합니다.\"}" \
+               ${{ secrets.DISCORD_WEBHOOK_URL }}
+
+      # ❌ 테스트 실패 알림
+      - name: Send test failure notification
+        if: failure()
+        run: |
+          curl -H "Content-Type: application/json" \
+               -X POST \
+               -d "{\"content\": \"❌ Elasticsearch CI/CD 테스트 실패! develop 머지 전에 수정이 필요합니다.\"}" \
+               ${{ secrets.DISCORD_WEBHOOK_URL }}

build.gradle

@@ -35,6 +35,8 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
 	implementation 'jakarta.servlet:jakarta.servlet-api:6.0.0'
+	implementation 'com.amazonaws:aws-java-sdk-core:1.12.698'
+	implementation 'com.amazonaws:aws-java-sdk-s3:1.12.698'
 	runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
 	runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
 

docker-compose.test.yml

@@ -0,0 +1,45 @@
+version: '3.8'
+
+services:
+  # Spring Boot 애플리케이션 (테스트용)
+  app-test:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: wayble-app-test
+    ports:
+      - "8081:8080" # 다른 포트 사용
+    environment:
+      - SPRING_PROFILES_ACTIVE=develop
+      - ELASTICSEARCH_HOST=elasticsearch-test
+      - ELASTICSEARCH_PORT=9200
+    depends_on:
+      - elasticsearch-test
+    networks:
+      - test-network
+
+  # Elasticsearch (테스트용)
+  elasticsearch-test:
+    build:
+      context: .
+      dockerfile: Dockerfile.elasticsearch
+    container_name: elasticsearch-test
+    environment:
+      - discovery.type=single-node
+      - xpack.security.enabled=false
+      - ES_JAVA_OPTS=-Xms512m -Xmx512m
+    ports:
+      - "9201:9200" # 다른 포트 사용
+      - "9301:9300"
+    volumes:
+      - es-test-data:/usr/share/elasticsearch/data
+    networks:
+      - test-network
+
+networks:
+  test-network:
+    driver: bridge
+
+volumes:
+  es-test-data:
+    driver: local

docker-compose.yml

@@ -0,0 +1,48 @@
+version: '3.8'
+
+services:
+  # Spring Boot 애플리케이션
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    container_name: wayble-app
+    restart: unless-stopped
+    ports:
+      - "8080:8080"
+    environment:
+      - SPRING_PROFILES_ACTIVE=develop
+      - ELASTICSEARCH_HOST=elasticsearch
+      - ELASTICSEARCH_PORT=9200
+    depends_on:
+      - elasticsearch
+    networks:
+      - app-network
+
+  # Elasticsearch
+  elasticsearch:
+    build:
+      context: .
+      dockerfile: Dockerfile.elasticsearch
+    container_name: elasticsearch
+    image: es-with-nori:9.0.2
+    restart: unless-stopped
+    environment:
+      - discovery.type=single-node
+      - xpack.security.enabled=false
+      - ES_JAVA_OPTS=-Xms512m -Xmx512m
+    ports:
+      - "9200:9200"
+      - "9300:9300"
+    volumes:
+      - esdata:/usr/share/elasticsearch/data
+    networks:
+      - app-network
+
+networks:
+  app-network:
+    driver: bridge
+
+volumes:
+  esdata:
+    driver: local

src/main/java/com/wayble/server/common/entity/BaseEntity.java

@@ -23,4 +23,8 @@ public class BaseEntity {
 
     @Column(name = "deleted_at")
     private LocalDateTime deletedAt;
+
+    public void restore() {
+        this.deletedAt = null;
+    }
 }

src/main/java/com/wayble/server/explore/controller/WaybleZoneSearchController.java

@@ -21,7 +21,7 @@ public class WaybleZoneSearchController {
 
     private final WaybleZoneSearchService waybleZoneSearchService;
 
-    @GetMapping("")
+    @GetMapping("/maps")
     public CommonResponse<SearchSliceDto<WaybleZoneSearchResponseDto>> findByCondition(
             @Valid @ModelAttribute WaybleZoneSearchConditionDto conditionDto,
             @RequestParam(name = "page", defaultValue = "0") int page,

src/main/java/com/wayble/server/explore/dto/FacilityResponseDto.java

@@ -0,0 +1,29 @@
+package com.wayble.server.explore.dto;
+
+import com.wayble.server.explore.entity.EsWaybleZoneFacility;
+import lombok.Builder;
+
+@Builder
+public record FacilityResponseDto(
+        Boolean hasSlope,
+        Boolean hasNoDoorStep,
+        Boolean hasElevator,
+        Boolean hasTableSeat,
+        Boolean hasDisabledToilet,
+        String floorInfo
+) {
+    public static FacilityResponseDto from(EsWaybleZoneFacility facility) {
+        if (facility == null) {
+            return null;
+        }
+
+        return FacilityResponseDto.builder()
+                .hasSlope(facility.isHasSlope())
+                .hasNoDoorStep(facility.isHasNoDoorStep())
+                .hasElevator(facility.isHasElevator())
+                .hasTableSeat(facility.isHasTableSeat())
+                .hasDisabledToilet(facility.isHasDisabledToilet())
+                .floorInfo(facility.getFloorInfo())
+                .build();
+    }
+}

src/main/java/com/wayble/server/explore/dto/recommend/WaybleZoneRecommendResponseDto.java

@@ -1,5 +1,6 @@
 package com.wayble.server.explore.dto.recommend;
 
+import com.wayble.server.explore.dto.FacilityResponseDto;
 import com.wayble.server.explore.entity.WaybleZoneDocument;
 import com.wayble.server.wayblezone.entity.WaybleZoneType;
 import lombok.Builder;
@@ -23,6 +24,8 @@ public record WaybleZoneRecommendResponseDto(
 
         Long reviewCount,
 
+        FacilityResponseDto facility,
+
         Double distanceScore,
 
         Double similarityScore,
@@ -42,6 +45,7 @@ public static WaybleZoneRecommendResponseDto from(WaybleZoneDocument waybleZoneD
                 .reviewCount(waybleZoneDocument.getReviewCount())
                 .latitude(waybleZoneDocument.getAddress().getLocation().getLat())
                 .longitude(waybleZoneDocument.getAddress().getLocation().getLon())
+                .facility(FacilityResponseDto.from(waybleZoneDocument.getFacility()))
                 .distanceScore(0.0)
                 .similarityScore(0.0)
                 .recencyScore(0.0)