Develop -> Main

.github/workflows/aws/tablekok-user-task-revision1.json

@@ -14,7 +14,7 @@
         },
         {
           "name": "JWT_SECRET",
-          "value": "tablekok-user-dev-secret-key-minimum-32-characters-long"
+          "value": "VGFibGVrb2stU2VjcmV0S2V5LUZvcitKV1QtQXV0aGVudGljYXRpb24tMjAyNTAzMTI="
         },
         {
           "name": "DB_URL",

.github/workflows/aws/tablekok-waiting-task-revision5.json

@@ -0,0 +1,122 @@
+{
+    "compatibilities": [
+        "EC2",
+        "FARGATE",
+        "MANAGED_INSTANCES"
+    ],
+    "containerDefinitions": [
+        {
+            "cpu": 0,
+            "environment": [
+                {
+                    "name": "EUREKA_SERVER_PROD_URL",
+                    "value": "http://tablekok-eureka-server-lb-1162347586.ap-northeast-2.elb.amazonaws.com/eureka"
+                },
+                {
+                    "name": "LB_DNS_STORE",
+                    "value": "tablekok-store-service-lb-752510743.ap-northeast-2.elb.amazonaws.com"
+                },
+                {
+                    "name": "CACHE_HOST",
+                    "value": "tablekok-cache-saweub.serverless.apn2.cache.amazonaws.com"
+                },
+                {
+                    "name": "RDS_ENDPOINT_WAITING",
+                    "value": "jdbc:postgresql://tablekok-db.ch0umigqozdz.ap-northeast-2.rds.amazonaws.com:5433/waiting_db"
+                },
+                {
+                    "name": "CACHE_PORT",
+                    "value": "6379"
+                },
+                {
+                    "name": "DB_USER_WAITING",
+                    "value": "postgres"
+                },
+                {
+                    "name": "DB_PASSWORD_WAITING",
+                    "value": "zhrzhr123"
+                },
+                {
+                    "name": "TIME_OUT",
+                    "value": "10"
+                }
+            ],
+            "environmentFiles": [],
+            "essential": true,
+            "image": "291433606038.dkr.ecr.ap-northeast-2.amazonaws.com/tablekok/waiting@sha256:439c7d0d4b2e5520baac5b2005549bc9c0d153386d8f3b993cc3538fd5a8d11c",
+            "logConfiguration": {
+                "logDriver": "awslogs",
+                "options": {
+                    "awslogs-group": "/ecs/tablekok-waiting-task",
+                    "awslogs-create-group": "true",
+                    "awslogs-region": "ap-northeast-2",
+                    "awslogs-stream-prefix": "ecs"
+                },
+                "secretOptions": []
+            },
+            "mountPoints": [],
+            "name": "tablekok-waiting-container",
+            "portMappings": [
+                {
+                    "appProtocol": "http",
+                    "containerPort": 8086,
+                    "hostPort": 8086,
+                    "name": "tablekok-waiting-container-8086-tcp",
+                    "protocol": "tcp"
+                }
+            ],
+            "systemControls": [],
+            "ulimits": [],
+            "volumesFrom": []
+        }
+    ],
+    "cpu": "1024",
+    "executionRoleArn": "arn:aws:iam::291433606038:role/ecsTaskExecutionRole",
+    "family": "tablekok-waiting-task",
+    "memory": "3072",
+    "networkMode": "awsvpc",
+    "placementConstraints": [],
+    "registeredAt": "2025-12-21T05:29:09.496Z",
+    "registeredBy": "arn:aws:iam::291433606038:user/Gahyeon",
+    "requiresAttributes": [
+        {
+            "name": "com.amazonaws.ecs.capability.logging-driver.awslogs"
+        },
+        {
+            "name": "ecs.capability.execution-role-awslogs"
+        },
+        {
+            "name": "com.amazonaws.ecs.capability.ecr-auth"
+        },
+        {
+            "name": "com.amazonaws.ecs.capability.docker-remote-api.1.19"
+        },
+        {
+            "name": "com.amazonaws.ecs.capability.docker-remote-api.1.21"
+        },
+        {
+            "name": "ecs.capability.execution-role-ecr-pull"
+        },
+        {
+            "name": "com.amazonaws.ecs.capability.docker-remote-api.1.18"
+        },
+        {
+            "name": "ecs.capability.task-eni"
+        },
+        {
+            "name": "com.amazonaws.ecs.capability.docker-remote-api.1.29"
+        }
+    ],
+    "requiresCompatibilities": [
+        "FARGATE"
+    ],
+    "revision": 5,
+    "runtimePlatform": {
+        "cpuArchitecture": "X86_64",
+        "operatingSystemFamily": "LINUX"
+    },
+    "status": "ACTIVE",
+    "taskDefinitionArn": "arn:aws:ecs:ap-northeast-2:291433606038:task-definition/tablekok-waiting-task:5",
+    "volumes": [],
+    "tags": []
+}

.github/workflows/waiting-service-ci.yml

@@ -0,0 +1,144 @@
+# This workflow will build and push a new container image to Amazon ECR,
+# and then will deploy a new task definition to Amazon ECS, when there is a push to the "develop" branch.
+#
+# To use this workflow, you will need to complete the following set-up steps:
+#
+# 1. Create an ECR repository to store your images.
+#    For example: `aws ecr create-repository --repository-name my-ecr-repo --region us-east-2`.
+#    Replace the value of the `ECR_REPOSITORY` environment variable in the workflow below with your repository's name.
+#    Replace the value of the `AWS_REGION` environment variable in the workflow below with your repository's region.
+#
+# 2. Create an ECS task definition, an ECS cluster, and an ECS service.
+#    For example, follow the Getting Started guide on the ECS console:
+#      https://us-east-2.console.aws.amazon.com/ecs/home?region=us-east-2#/firstRun
+#    Replace the value of the `ECS_SERVICE` environment variable in the workflow below with the name you set for the Amazon ECS service.
+#    Replace the value of the `ECS_CLUSTER` environment variable in the workflow below with the name you set for the cluster.
+#
+# 3. Store your ECS task definition as a JSON file in your repository.
+#    The format should follow the output of `aws ecs register-task-definition --generate-cli-skeleton`.
+#    Replace the value of the `ECS_TASK_DEFINITION` environment variable in the workflow below with the path to the JSON file.
+#    Replace the value of the `CONTAINER_NAME` environment variable in the workflow below with the name of the container
+#    in the `containerDefinitions` section of the task definition.
+#
+# 4. Store an IAM user access key in GitHub Actions secrets named `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`.
+#    See the documentation for each action used below for the recommended IAM policies for this IAM user,
+#    and best practices on handling the access key credentials.
+
+name: waiting-service Deploy to Amazon ECS
+
+on:
+  push:
+    branches: [ "main" ]
+    paths: [ 'waiting-server/**' ]
+
+env:
+  AWS_REGION: ap-northeast-2                   # set this to your preferred AWS region, e.g. us-west-1
+  ECR_REPOSITORY: tablekok/waiting           # set this to your Amazon ECR repository name
+  ECS_SERVICE: tablekok-waiting-task-service-t1pqisga                 # set this to your Amazon ECS service name
+  ECS_CLUSTER: tablekok-cluster                 # set this to your Amazon ECS cluster name
+  ECS_TASK_DEFINITION: .github/workflows/aws/tablekok-waiting-task-revision5.json # set this to the path to your Amazon ECS task definition
+  # file, e.g. .aws/task-definition.json
+  CONTAINER_NAME: tablekok-waiting-container           # set this to the name of the container in the
+  # containerDefinitions section of your task definition
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    name: Build Jar
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+        working-directory: ./waiting-server
+
+      - name: Build with Gradle
+        run: ./gradlew clean build -x test
+        working-directory: ./waiting-server
+        env:
+          RDS_ENDPOINT_WAITING: ${{ secrets.RESERVATION_DB_URL }}
+          DB_USER_WAITING: ${{ secrets.DB_USERNAME }}
+          DB_PASSWORD_WAITING: ${{ secrets.DB_PASSWORD }}
+          CACHE_HOST: ${{ secrets.CACHE_HOST }}
+          CACHE_PORT: ${{ secrets.CACHE_PORT }}
+          EUREKA_SERVER_PROD_URL: ${{ secrets.EUREKA_SERVER_URL }}
+          TIME_OUT: ${{ secrets.WAITING_TIME_OUT }}
+          LB_DNS_STORE: ${{ secrets.LB_DNS_STORE }}
+
+      - name: Upload Build Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-libs
+          path: waiting-server/build/libs/*.jar
+
+
+
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+    environment: production
+    needs: build # 추가: build Job이 성공해야만 deploy Job이 실행되도록 의존성 설정
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Download Build Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: build-libs
+          path: waiting-server/build/libs
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ env.AWS_REGION }}
+
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v2
+
+
+      # --- Docker Build/Push 시작 (Task Definition 업데이트보다 먼저 실행되어야 함) ---
+
+      - name: Build, tag, and push image to Amazon ECR
+        id: build-image
+        env:
+          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          IMAGE_TAG: ${{ github.sha }}
+        run: |
+          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG ./waiting-server
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+          echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT
+
+
+      # --- Docker Build/Push 끝 ---
+      - name: Fill in the new image ID in the Amazon ECS task definition
+        id: task-def
+        uses: aws-actions/amazon-ecs-render-task-definition@v1
+        with:
+          task-definition: ${{ env.ECS_TASK_DEFINITION }}
+          container-name: ${{ env.CONTAINER_NAME }}
+          image: ${{ steps.build-image.outputs.image }} # 이제 image output을 정상적으로 참조 가능
+
+      - name: Deploy Amazon ECS task definition
+        uses: aws-actions/amazon-ecs-deploy-task-definition@v1
+        with:
+          task-definition: ${{ steps.task-def.outputs.task-definition }}
+          service: ${{ env.ECS_SERVICE }}
+          cluster: ${{ env.ECS_CLUSTER }}
+          wait-for-service-stability: true
+

search-service/Dockerfile-elastic → Dockerfile-elastic

@@ -1,5 +1,5 @@
 # Dockerfile-elastic
-FROM docker.elastic.co/elasticsearch/elasticsearch:8.11.1
+FROM docker.elastic.co/elasticsearch/elasticsearch:8.18.8
 
 # Nori 형태소 분석기 설치
 RUN elasticsearch-plugin install analysis-nori

gateway-service/build.gradle

@@ -33,6 +33,9 @@ dependencies {
     // 유지할 의존성들
     implementation 'org.springframework.boot:spring-boot-starter-actuator'  // 모니터링용
 
+    // Redis (WebFlux 기반이라 reactive 버전 사용)
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis-reactive'
+
     // JWT 라이브러리 (토큰 검증용)
     compileOnly group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.5'
     runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.5'

gateway-service/src/main/java/com/tablekok/gateway_service/config/GatewayRoutesConfig.java

@@ -31,7 +31,6 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder, JwtAuthentic
 			// Review Service
 			.route("review-service-store-nested", r -> r
 				.path("/v1/stores/*/reviews/**") // 가게 리뷰 (와일드카드 사용)
-				.filters(f -> f.filter(jwtFilter.apply(new JwtAuthenticationFilter.Config())))
 				.uri(uris.review())
 			)
 			.route("review-service-user-nested", r -> r
@@ -83,7 +82,6 @@ public RouteLocator customRouteLocator(RouteLocatorBuilder builder, JwtAuthentic
 			// Search Service
 			.route("search-service", r -> r
 				.path("/v1/search/**")
-				.filters(f -> f.filter(jwtFilter.apply(new JwtAuthenticationFilter.Config())))
 				.uri(uris.search())
 			)
 

gateway-service/src/main/java/com/tablekok/gateway_service/config/RedisConfig.java

@@ -0,0 +1,29 @@
+package com.tablekok.gateway_service.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
+import org.springframework.data.redis.core.ReactiveRedisTemplate;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+@Configuration
+public class RedisConfig {
+
+	@Bean
+	public ReactiveRedisTemplate<String, String> reactiveRedisTemplate(
+		ReactiveRedisConnectionFactory connectionFactory) {
+
+		StringRedisSerializer serializer = new StringRedisSerializer();
+
+		RedisSerializationContext<String, String> context =
+			RedisSerializationContext.<String, String>newSerializationContext(serializer)
+				.key(serializer)
+				.value(serializer)
+				.hashKey(serializer)
+				.hashValue(serializer)
+				.build();
+
+		return new ReactiveRedisTemplate<>(connectionFactory, context);
+	}
+}