From 60c0dc4ef3f82e1959c30ae786a2d5821a78fa55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9A=B0=EB=94=94?=
 <38103085+EunjiShin@users.noreply.github.com>
Date: Mon, 5 Aug 2024 23:49:00 +0900
Subject: [PATCH 01/13] =?UTF-8?q?[NO=5FJIRA]=20=EA=B2=BD=EA=B8=B0=EC=9E=A5?=
 =?UTF-8?q?=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=ED=95=84=EB=93=9C=20=EA=B8=B8?=
 =?UTF-8?q?=EC=9D=B4=20=EC=A1=B0=EC=A0=95=20(#117)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: 경기장 이미지 필드 길이 조정

* fix: 잘못 올라간 grafana 파일 삭제
---
 .../infrastructure/jpa/stadium/entity/StadiumEntity.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/infrastructure/src/main/java/org/depromeet/spot/infrastructure/jpa/stadium/entity/StadiumEntity.java b/infrastructure/src/main/java/org/depromeet/spot/infrastructure/jpa/stadium/entity/StadiumEntity.java
index c572da16..f9516b71 100644
--- a/infrastructure/src/main/java/org/depromeet/spot/infrastructure/jpa/stadium/entity/StadiumEntity.java
+++ b/infrastructure/src/main/java/org/depromeet/spot/infrastructure/jpa/stadium/entity/StadiumEntity.java
@@ -19,13 +19,13 @@ public class StadiumEntity extends BaseEntity {
     @Column(name = "name", nullable = false, length = 50)
     private String name;
 
-    @Column(name = "main_image", length = 255)
+    @Column(name = "main_image", length = 300)
     private String mainImage;
 
-    @Column(name = "seating_chart_image", length = 255)
+    @Column(name = "seating_chart_image", length = 300)
     private String seatingChartImage;
 
-    @Column(name = "labeled_seating_chart_image", length = 255)
+    @Column(name = "labeled_seating_chart_image", length = 300)
     private String labeledSeatingChartImage;
 
     @Column(name = "is_active", nullable = false)

From 2f5d7a3d613e0bf5314f5832e1657a06bffd028a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9A=B0=EB=94=94?=
 <38103085+EunjiShin@users.noreply.github.com>
Date: Tue, 6 Aug 2024 12:46:10 +0900
Subject: [PATCH 02/13] =?UTF-8?q?fix:=20loki=20=EC=84=A4=EC=A0=95=20?=
 =?UTF-8?q?=EC=A0=84=EA=B9=8C=EC=A7=80=20prod=EC=97=90=20Loki=20Appender?=
 =?UTF-8?q?=20=EB=B9=84=ED=99=9C=EC=84=B1=ED=99=94=20(#119)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/src/main/resources/logback-spring.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/src/main/resources/logback-spring.xml b/application/src/main/resources/logback-spring.xml
index ebd75254..119d005d 100644
--- a/application/src/main/resources/logback-spring.xml
+++ b/application/src/main/resources/logback-spring.xml
@@ -18,7 +18,7 @@
         <root level="ERROR">
             <appender-ref ref="CONSOLE_APPENDER"/>
             <appender-ref ref="SENTRY_APPENDER"/>
-            <appender-ref ref="LOKI_APPENDER"/>
+<!--            <appender-ref ref="LOKI_APPENDER"/>-->
         </root>
     </springProfile>
 </configuration>

From f7ea2b16867515ce32ccf29bcddd5497890e790b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9A=B0=EB=94=94?=
 <38103085+EunjiShin@users.noreply.github.com>
Date: Tue, 6 Aug 2024 13:23:37 +0900
Subject: [PATCH 03/13] =?UTF-8?q?feat:=20http=EC=97=90=EC=84=9C=20presigne?=
 =?UTF-8?q?d=20url=20403=20=ED=99=95=EC=9D=B8=EC=9D=84=20=EC=9C=84?=
 =?UTF-8?q?=ED=95=9C=20=EB=A1=9C=EA=B7=B8=20=EC=B6=94=EA=B0=80=20(#120)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/src/main/resources/logback-spring.xml             | 2 +-
 .../aws/objectstorage/PresignedUrlGenerator.java              | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/application/src/main/resources/logback-spring.xml b/application/src/main/resources/logback-spring.xml
index 119d005d..cbacde37 100644
--- a/application/src/main/resources/logback-spring.xml
+++ b/application/src/main/resources/logback-spring.xml
@@ -15,7 +15,7 @@
     </springProfile>
 
     <springProfile name="prod">
-        <root level="ERROR">
+        <root level="INFO">
             <appender-ref ref="CONSOLE_APPENDER"/>
             <appender-ref ref="SENTRY_APPENDER"/>
 <!--            <appender-ref ref="LOKI_APPENDER"/>-->
diff --git a/infrastructure/src/main/java/org/depromeet/spot/infrastructure/aws/objectstorage/PresignedUrlGenerator.java b/infrastructure/src/main/java/org/depromeet/spot/infrastructure/aws/objectstorage/PresignedUrlGenerator.java
index d8f259e8..eb490d6e 100644
--- a/infrastructure/src/main/java/org/depromeet/spot/infrastructure/aws/objectstorage/PresignedUrlGenerator.java
+++ b/infrastructure/src/main/java/org/depromeet/spot/infrastructure/aws/objectstorage/PresignedUrlGenerator.java
@@ -32,6 +32,7 @@ public class PresignedUrlGenerator implements CreatePresignedUrlPort {
 
     @Override
     public String forImage(final Long memberId, PresignedUrlRequest request) {
+        log.info("presigned url generator: forImage");
         isValidImageExtension(request.getFileExtension());
 
         final ImageExtension fileExtension = ImageExtension.from(request.getFileExtension());
@@ -50,16 +51,19 @@ private void isValidImageExtension(final String fileExtension) {
     }
 
     private URL createPresignedUrl(final String fileName) {
+        log.info("presigned url generator: createPresignedUrl");
         return amazonS3.generatePresignedUrl(createGeneratePreSignedUrlRequest(fileName));
     }
 
     private GeneratePresignedUrlRequest createGeneratePreSignedUrlRequest(final String fileName) {
+        log.info("presigned url generator: createGeneratePreSignedUrlRequest");
         final String bucketName = ObjectStorageConfig.BUCKET_NAME;
         GeneratePresignedUrlRequest generatePresignedUrlRequest =
                 new GeneratePresignedUrlRequest(bucketName, fileName)
                         .withMethod(HttpMethod.PUT)
                         .withExpiration(createPreSignedUrlExpiration());
 
+        log.info("presigned url generator: addRequestParameter");
         generatePresignedUrlRequest.addRequestParameter(
                 Headers.S3_CANNED_ACL, CannedAccessControlList.PublicRead.toString());
 

From f8e7f8e7d8a447a052dd3ec1804912b44bd5c066 Mon Sep 17 00:00:00 2001
From: Minseong Park <52368015+pminsung12@users.noreply.github.com>
Date: Wed, 7 Aug 2024 23:49:36 +0900
Subject: [PATCH 04/13] =?UTF-8?q?[BSVR-190]=20=EA=B0=9C=EB=B0=9C=20?=
 =?UTF-8?q?=EC=84=9C=EB=B2=84=20AWS=20=EB=A7=88=EC=9D=B4=EA=B7=B8=EB=A0=88?=
 =?UTF-8?q?=EC=9D=B4=EC=85=98=20(#122)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: ncp->aws application 파일 네이밍 수정 && gitignore 추가

* feat: aws 마이크레이션으로 인한 object storage 코드 수정

* feat: aws 마이크레이션으로 인한 object storage 코드 수정

* feat: cicd 스크립트 수정 및 console appender loki부분 주석처리

* feat: 프로필 dev로 롤백

* feat: 최소힙 512 도커파일 수정

* test: s3쪽 테스트 코드 수정
---
 .github/workflows/dev-build-and-deploy.yaml   | 13 ++--
 .github/workflows/manual-prod-deploy.yaml     | 68 +++++++++++++------
 .gitignore                                    |  1 +
 Dockerfile                                    | 11 ++-
 .../resources/appenders/console-appender.xml  |  2 +-
 .../src/main/resources/application.yaml       |  8 +--
 .../aws/config/ObjectStorageConfig.java       |  7 +-
 .../aws/objectstorage/ImageUploader.java      |  5 +-
 .../objectstorage/PresignedUrlGenerator.java  |  5 +-
 .../aws/property/ObjectStorageProperties.java |  4 +-
 .../src/main/resources/application-ncp.yaml   |  4 --
 .../aws/PresignedUrlGeneratorTest.java        |  2 +-
 12 files changed, 82 insertions(+), 48 deletions(-)
 delete mode 100644 infrastructure/src/main/resources/application-ncp.yaml

diff --git a/.github/workflows/dev-build-and-deploy.yaml b/.github/workflows/dev-build-and-deploy.yaml
index 945630bf..6766dd9c 100644
--- a/.github/workflows/dev-build-and-deploy.yaml
+++ b/.github/workflows/dev-build-and-deploy.yaml
@@ -98,10 +98,10 @@ jobs:
           - name: Deploy to Dev NCP Server
             uses: appleboy/ssh-action@master
             with:
-                host: ${{ secrets.DEV_NCP_SERVER_HOST }}
-                username: ${{ secrets.DEV_NCP_SERVER_USERNAME }}
-                password: ${{ secrets.DEV_NCP_SERVER_PASSWORD }}
-                port: ${{ secrets.DEV_NCP_SERVER_PORT }}
+                host: ${{ secrets.DEV_SERVER_HOST }}
+                username: ${{ secrets.DEV_SERVER_USERNAME }}
+                password: ${{ secrets.DEV_SERVER_PASSWORD }}
+                port: ${{ secrets.DEV_SERVER_PORT }}
                 script: |
                     docker pull ${{ secrets.DOCKERHUB_USERNAME }}/spot-server:dev-${{ github.sha }}
                     docker stop spot-server-dev || true
@@ -117,8 +117,9 @@ jobs:
                       -e OAUTH_KAUTHTOKENURLHOST=${{ secrets.KAUTH_TOKEN_URL_HOST }} \
                       -e OAUTH_KAUTHUSERURLHOST=${{ secrets.KAUTH_USER_URL_HOST }} \
                       -e SPRING_JPA_HIBERNATE_DDL_AUTO=validate \
-                      -e NCP_OBJECT_STORAGE_ACCESS_KEY=${{ secrets.NCP_OBJECT_STORAGE_ACCESS_KEY }} \
-                      -e NCP_OBJECT_STORAGE_SECRET_KEY=${{ secrets.NCP_OBJECT_STORAGE_SECRET_KEY }} \
+                      -e AWS_S3_ACCESS_KEY=${{ secrets.AWS_S3_ACCESS_KEY }} \
+                      -e AWS_S3_SECRET_KEY=${{ secrets.AWS_S3_SECRET_KEY }} \
+                      -e AWS_S3_BUCKET_NAME=${{ secrets.DEV_AWS_S3_BUCKET_NAME }} \
                       -e TZ=Asia/Seoul \
                       -e SENTRY_DSN=${{ secrets.SENTRY_DSN }} \
                       -e SENTRY_ENABLE_TRACING=true \
diff --git a/.github/workflows/manual-prod-deploy.yaml b/.github/workflows/manual-prod-deploy.yaml
index 45573a0f..fa5ac18e 100644
--- a/.github/workflows/manual-prod-deploy.yaml
+++ b/.github/workflows/manual-prod-deploy.yaml
@@ -4,7 +4,7 @@ on:
     workflow_dispatch:
         inputs:
             tag:
-                description: 'Tag to deploy  (v1.0.0)'
+                description: 'Tag to deploy  (v0.33.8)'
                 required: true
 
 jobs:
@@ -16,22 +16,50 @@ jobs:
               with:
                   ref: ${{ github.event.inputs.tag }}
 
-            - name: Deploy to Prod NCP Server
-              uses: appleboy/ssh-action@master
-              with:
-                  host: ${{ secrets.PROD_NCP_SERVER_HOST }}
-                  username: ${{ secrets.PROD_NCP_SERVER_USERNAME }}
-                  password: ${{ secrets.PROD_NCP_SERVER_PASSWORD }}
-                  port: ${{ secrets.PROD_NCP_SERVER_PORT }}
-                  script: |
-                      docker pull ${{ secrets.DOCKERHUB_USERNAME }}/spot-server:${{ github.event.inputs.tag }}
-                      docker stop spot-server-prod || true
-                      docker rm spot-server-prod || true
-                      docker run -d --name spot-server-prod \
-                        -p 8080:8080 \
-                        -e SPRING_DATASOURCE_URL=${{ secrets.PROD_DB_URL }} \
-                        -e SPRING_DATASOURCE_USERNAME=${{ secrets.PROD_DB_USERNAME }} \
-                        -e SPRING_DATASOURCE_PASSWORD=${{ secrets.PROD_DB_PASSWORD }} \
-                        -e TZ=Asia/Seoul \
-                        ${{ secrets.DOCKERHUB_USERNAME }}/spot-server:${{ github.event.inputs.tag }}
-                      docker system prune -af
\ No newline at end of file
+            -   name: Set up Docker Buildx
+                uses: docker/setup-buildx-action@v2
+
+            -   name: Login to DockerHub
+                uses: docker/login-action@v2
+                with:
+                    username: ${{ secrets.DOCKERHUB_USERNAME }}
+                    password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+            -   name: Build and push Docker image
+                uses: docker/build-push-action@v4
+                with:
+                    context: .
+                    push: true
+                    tags: ${{ secrets.DOCKERHUB_USERNAME }}/spot-server:prod-${{ github.event.inputs.tag }}
+
+            -   name: Deploy to PROD - AWS EC2
+                uses: appleboy/ssh-action@master
+                with:
+                    host: ${{ secrets.PROD_AWS_SERVER_HOST }}
+                    username: ${{ secrets.PROD_AWS_SERVER_USERNAME }}
+                    password: ${{ secrets.PROD_AWS_SERVER_PASSWORD }}
+                    port: ${{ secrets.PROD_AWS_SERVER_PORT }}
+                    script: |
+                        docker pull ${{ secrets.DOCKERHUB_USERNAME }}/spot-server:prod-${{ github.event.inputs.tag }}
+                        docker stop spot-server-prod || true
+                        docker rm spot-server-prod || true
+                        docker run -d --name spot-server-prod \
+                          -p 8080:8080 \
+                          -e SPRING_PROFILES_ACTIVE=prod \
+                          -e SPRING_DATASOURCE_URL=${{ secrets.PROD_DB_URL }} \
+                          -e SPRING_DATASOURCE_USERNAME=${{ secrets.PROD_DB_USERNAME }} \
+                          -e SPRING_DATASOURCE_PASSWORD=${{ secrets.PROD_DB_PASSWORD }} \
+                          -e SPRING_JWT_SECRET=${{ secrets.JWT_SECRET }} \
+                          -e OAUTH_CLIENTID=${{ secrets.KAKAO_CLIENT_ID }} \
+                          -e OAUTH_KAUTHTOKENURLHOST=${{ secrets.KAUTH_TOKEN_URL_HOST }} \
+                          -e OAUTH_KAUTHUSERURLHOST=${{ secrets.KAUTH_USER_URL_HOST }} \
+                          -e SPRING_JPA_HIBERNATE_DDL_AUTO=validate \
+                          -e AWS_S3_ACCESS_KEY=${{ secrets.AWS_S3_ACCESS_KEY }} \
+                          -e AWS_S3_SECRET_KEY=${{ secrets.AWS_S3_SECRET_KEY }} \
+                          -e AWS_S3_BUCKET_NAME=${{ secrets.PROD_AWS_S3_BUCKET_NAME }} \
+                          -e TZ=Asia/Seoul \
+                          -e SENTRY_DSN=${{ secrets.SENTRY_DSN }} \
+                          -e SENTRY_ENABLE_TRACING=true \
+                          -e SENTRY_ENVIRONMENT=prod \
+                          ${{ secrets.DOCKERHUB_USERNAME }}/spot-server:prod-${{ github.event.inputs.tag }}
+                        docker system prune -af
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 04ea8a7b..9f5307c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -388,3 +388,4 @@ gradle-app.setting
 application-jwt.yml
 application-kakao.yml
 application-sentry.yml
+application-aws.yaml
diff --git a/Dockerfile b/Dockerfile
index a9b87f5e..20556426 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,10 +3,17 @@ FROM gradle:7.4-jdk17 AS build
 WORKDIR /app
 COPY . .
 RUN ./gradlew build -x test
-
 # 실행 스테이지
 FROM openjdk:17-jdk-slim
 WORKDIR /app
 COPY --from=build /app/application/build/libs/*.jar app.jar
 EXPOSE 8080
-ENTRYPOINT ["java", "-jar", "app.jar"]
\ No newline at end of file
+#ENTRYPOINT ["java", "-jar", "app.jar"]
+
+# JVM 튜닝 옵션 추가
+ENTRYPOINT ["java", \
+            "-Xms512m", \
+            "-Xmx512m", \
+            "-Xminf0.4", \
+            "-Xmaxf0.7", \
+            "-jar", "app.jar"]
\ No newline at end of file
diff --git a/application/src/main/resources/appenders/console-appender.xml b/application/src/main/resources/appenders/console-appender.xml
index 2722d120..d31218e6 100644
--- a/application/src/main/resources/appenders/console-appender.xml
+++ b/application/src/main/resources/appenders/console-appender.xml
@@ -14,7 +14,7 @@
     <appender name="LOKI_APPENDER" class="com.github.loki4j.logback.Loki4jAppender">
         <http>
             <!-- TODO: Loki 인스턴스 세팅 후 URL 변경 필요 -->
-            <url>http://localhost:3100/loki/api/v1/push</url>
+<!--            <url>http://localhost:3100/loki/api/v1/push</url>-->
         </http>
         <format>
             <label>
diff --git a/application/src/main/resources/application.yaml b/application/src/main/resources/application.yaml
index 52dee6c6..7884197d 100644
--- a/application/src/main/resources/application.yaml
+++ b/application/src/main/resources/application.yaml
@@ -5,21 +5,21 @@ server:
 spring:
     # 서브모듈 profile
     profiles:
-        active: local
+        active: dev
         group:
             local:
                 - jpa
-                - ncp
+                - aws
                 - jwt
                 - kakao
             dev:
                 - jpa
-                - ncp
+                - aws
                 - jwt
                 - kakao
             prod:
                 - jpa
-                - ncp
+                - aws
                 - jwt
                 - kakao
                 - sentry
diff --git a/infrastructure/src/main/java/org/depromeet/spot/infrastructure/aws/config/ObjectStorageConfig.java b/infrastructure/src/main/java/org/depromeet/spot/infrastructure/aws/config/ObjectStorageConfig.java
index 0e2252b5..c46aaaac 100644
--- a/infrastructure/src/main/java/org/depromeet/spot/infrastructure/aws/config/ObjectStorageConfig.java
+++ b/infrastructure/src/main/java/org/depromeet/spot/infrastructure/aws/config/ObjectStorageConfig.java
@@ -7,7 +7,7 @@
 
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
+import com.amazonaws.regions.Regions;
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 
@@ -19,14 +19,13 @@
 public class ObjectStorageConfig {
 
     private final ObjectStorageProperties objectStorageProperties;
-    private static final String ENDPOINT = "https://kr.object.ncloudstorage.com";
+    private final Regions clientRegion = Regions.AP_NORTHEAST_2;
     private static final String REGION = "kr-standard";
-    public static final String BUCKET_NAME = "spot-image-bucket";
 
     @Bean
     public AmazonS3 getAmazonS3() {
         return AmazonS3ClientBuilder.standard()
-                .withEndpointConfiguration(new EndpointConfiguration(ENDPOINT, REGION))
+                .withRegion(clientRegion)
                 .withCredentials(
                         new AWSStaticCredentialsProvider(
                                 new BasicAWSCredentials(
diff --git a/infrastructure/src/main/java/org/depromeet/spot/infrastructure/aws/objectstorage/ImageUploader.java b/infrastructure/src/main/java/org/depromeet/spot/infrastructure/aws/objectstorage/ImageUploader.java
index bcbbd4f2..e8d8c48f 100644
--- a/infrastructure/src/main/java/org/depromeet/spot/infrastructure/aws/objectstorage/ImageUploader.java
+++ b/infrastructure/src/main/java/org/depromeet/spot/infrastructure/aws/objectstorage/ImageUploader.java
@@ -8,7 +8,7 @@
 import org.depromeet.spot.domain.media.MediaProperty;
 import org.depromeet.spot.domain.media.extension.ImageExtension;
 import org.depromeet.spot.domain.media.extension.StadiumSeatMediaExtension;
-import org.depromeet.spot.infrastructure.aws.config.ObjectStorageConfig;
+import org.depromeet.spot.infrastructure.aws.property.ObjectStorageProperties;
 import org.depromeet.spot.usecase.port.out.media.ImageUploadPort;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -28,6 +28,7 @@
 public class ImageUploader implements ImageUploadPort {
 
     private final AmazonS3 amazonS3;
+    private final ObjectStorageProperties objectStorageProperties;
 
     @Override
     public String upload(String targetName, MultipartFile file, MediaProperty property) {
@@ -36,7 +37,7 @@ public String upload(String targetName, MultipartFile file, MediaProperty proper
         final String fileExtension = StringUtils.getFilenameExtension(file.getOriginalFilename());
         checkValidExtension(fileExtension, property);
 
-        final String bucketName = ObjectStorageConfig.BUCKET_NAME;
+        final String bucketName = objectStorageProperties.bucketName();
         final String fileName = createFileName(targetName, property.getFolderName(), fileExtension);
         ObjectMetadata objectMetadata = createObjectMetadata(file);
 
diff --git a/infrastructure/src/main/java/org/depromeet/spot/infrastructure/aws/objectstorage/PresignedUrlGenerator.java b/infrastructure/src/main/java/org/depromeet/spot/infrastructure/aws/objectstorage/PresignedUrlGenerator.java
index eb490d6e..42565755 100644
--- a/infrastructure/src/main/java/org/depromeet/spot/infrastructure/aws/objectstorage/PresignedUrlGenerator.java
+++ b/infrastructure/src/main/java/org/depromeet/spot/infrastructure/aws/objectstorage/PresignedUrlGenerator.java
@@ -5,7 +5,7 @@
 
 import org.depromeet.spot.common.exception.media.MediaException.InvalidExtensionException;
 import org.depromeet.spot.domain.media.extension.ImageExtension;
-import org.depromeet.spot.infrastructure.aws.config.ObjectStorageConfig;
+import org.depromeet.spot.infrastructure.aws.property.ObjectStorageProperties;
 import org.depromeet.spot.usecase.port.out.media.CreatePresignedUrlPort;
 import org.springframework.stereotype.Service;
 
@@ -27,6 +27,7 @@ public class PresignedUrlGenerator implements CreatePresignedUrlPort {
 
     private final AmazonS3 amazonS3;
     private final FileNameGenerator fileNameGenerator;
+    private final ObjectStorageProperties objectStorageProperties;
 
     private static final long EXPIRE_MS = 1000 * 60 * 5L;
 
@@ -57,7 +58,7 @@ private URL createPresignedUrl(final String fileName) {
 
     private GeneratePresignedUrlRequest createGeneratePreSignedUrlRequest(final String fileName) {
         log.info("presigned url generator: createGeneratePreSignedUrlRequest");
-        final String bucketName = ObjectStorageConfig.BUCKET_NAME;
+        final String bucketName = objectStorageProperties.bucketName();
         GeneratePresignedUrlRequest generatePresignedUrlRequest =
                 new GeneratePresignedUrlRequest(bucketName, fileName)
                         .withMethod(HttpMethod.PUT)
diff --git a/infrastructure/src/main/java/org/depromeet/spot/infrastructure/aws/property/ObjectStorageProperties.java b/infrastructure/src/main/java/org/depromeet/spot/infrastructure/aws/property/ObjectStorageProperties.java
index c2c0c7bc..19dd0d5b 100644
--- a/infrastructure/src/main/java/org/depromeet/spot/infrastructure/aws/property/ObjectStorageProperties.java
+++ b/infrastructure/src/main/java/org/depromeet/spot/infrastructure/aws/property/ObjectStorageProperties.java
@@ -2,5 +2,5 @@
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
-@ConfigurationProperties(prefix = "ncp.object-storage")
-public record ObjectStorageProperties(String accessKey, String secretKey) {}
+@ConfigurationProperties(prefix = "aws.s3")
+public record ObjectStorageProperties(String accessKey, String secretKey, String bucketName) {}
diff --git a/infrastructure/src/main/resources/application-ncp.yaml b/infrastructure/src/main/resources/application-ncp.yaml
deleted file mode 100644
index 181d0488..00000000
--- a/infrastructure/src/main/resources/application-ncp.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-ncp:
-    object-storage:
-        accessKey: ${NCP_OBJECT_STORAGE_ACCESS_KEY}
-        secretKey: ${NCP_OBJECT_STORAGE_SECRET_KEY}
\ No newline at end of file
diff --git a/infrastructure/src/test/java/org/depromeet/spot/infrastructure/aws/PresignedUrlGeneratorTest.java b/infrastructure/src/test/java/org/depromeet/spot/infrastructure/aws/PresignedUrlGeneratorTest.java
index d73b08c1..54d78461 100644
--- a/infrastructure/src/test/java/org/depromeet/spot/infrastructure/aws/PresignedUrlGeneratorTest.java
+++ b/infrastructure/src/test/java/org/depromeet/spot/infrastructure/aws/PresignedUrlGeneratorTest.java
@@ -20,7 +20,7 @@ class PresignedUrlGeneratorTest {
     @BeforeEach
     void init() {
         ObjectStorageProperties objectStorageProperties =
-                new ObjectStorageProperties("accessKey", "secretKey");
+                new ObjectStorageProperties("accessKey", "secretKey", "bucketName");
         FakeAmazonS3Config amazonS3 = new FakeAmazonS3Config(objectStorageProperties);
 
         FakeTimeUsecase fakeTimeUsecase = new FakeTimeUsecase("2024-07-09 21:00:00");

From 6449104ce5e07ab5685fcf2277c0acee5b349358 Mon Sep 17 00:00:00 2001
From: junwon <67488973+wjdwnsdnjs13@users.noreply.github.com>
Date: Sun, 11 Aug 2024 22:55:26 +0900
Subject: [PATCH 05/13] =?UTF-8?q?[BSVR-189]=20JWT=20=ED=95=84=ED=84=B0=20?=
 =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95,=20Filter=20Exception?=
 =?UTF-8?q?=20handling,=20Oauth=20exception=20(#123)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat : 요청 메서드에 따른 화이트리스트 구현

* refactor : 같은 요청 URL이더라도 메서드에 따라 filter 화이트 리스트 여부 결정하도록 리팩토링

* refactor : matchUrl 처리 시 optional 그대로 사용하도록 변경

* refactor : jwt 필터 화이트리스트 로직 통합하여 관리

* feat : jwt 필터에 커스텀 Exception 추가(filter Exception handling)

* feat : jwt 필터에 커스텀 Exception 추가(filter Exception handling)

* refactor : jwt 필터, Exception Handler 필터 final 처리

* refactor : jwt 검증 시 커스텀 Exception으로 처리하도록 변경

* refactor : ExceptionHandlerFilter 처리 시 Error 로그 출력하도록 수정

* feat : 카카오 콜백 jwt 필터 화이트리스트 추가

* feat : JwtException Exception Handler에 추가

* refactor : 유저 삭제(하드 delete) 메소드 화이트리스트 추가

* refactor : 유저 삭제(하드 delete) 메소드 화이트리스트 추가

* feat : Oauth custom Exception 추가

* feat : MethodArgumentNotValidException Exception 핸들러에 추가

* refactor : 빈 String을 체크하는 로직 수정

* refactor : API URL 내의 중복된 의미 삭제
---
 .../common/config/SecurityConfig.java         | 10 +--
 .../common/exception/CustomJwtException.java  | 13 ++++
 .../common/exception/ErrorResponse.java       |  4 ++
 .../exception/ExceptionHandlerFilter.java     | 54 +++++++++++++++
 .../common/exception/JwtErrorCode.java        | 20 ++++++
 .../exception/SpotAppExceptionHandler.java    | 29 ++++++++
 .../common/jwt/JwtAuthenticationFilter.java   | 67 ++++++++++++++-----
 .../application/common/jwt/JwtTokenUtil.java  | 17 +++--
 .../exception/oauth/OauthErrorCode.java       | 22 ++++++
 .../exception/oauth/OauthException.java       | 23 +++++++
 .../jpa/oauth/OauthRepositoryImpl.java        |  8 +--
 11 files changed, 236 insertions(+), 31 deletions(-)
 create mode 100644 application/src/main/java/org/depromeet/spot/application/common/exception/CustomJwtException.java
 create mode 100644 application/src/main/java/org/depromeet/spot/application/common/exception/ExceptionHandlerFilter.java
 create mode 100644 application/src/main/java/org/depromeet/spot/application/common/exception/JwtErrorCode.java
 create mode 100644 common/src/main/java/org/depromeet/spot/common/exception/oauth/OauthErrorCode.java
 create mode 100644 common/src/main/java/org/depromeet/spot/common/exception/oauth/OauthException.java

diff --git a/application/src/main/java/org/depromeet/spot/application/common/config/SecurityConfig.java b/application/src/main/java/org/depromeet/spot/application/common/config/SecurityConfig.java
index f9bf30a1..6b4e41fc 100644
--- a/application/src/main/java/org/depromeet/spot/application/common/config/SecurityConfig.java
+++ b/application/src/main/java/org/depromeet/spot/application/common/config/SecurityConfig.java
@@ -1,7 +1,7 @@
 package org.depromeet.spot.application.common.config;
 
+import org.depromeet.spot.application.common.exception.ExceptionHandlerFilter;
 import org.depromeet.spot.application.common.jwt.JwtAuthenticationFilter;
-import org.depromeet.spot.application.common.jwt.JwtTokenUtil;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -17,7 +17,9 @@
 @RequiredArgsConstructor
 public class SecurityConfig {
 
-    private final JwtTokenUtil jwtTokenUtil;
+    private final JwtAuthenticationFilter jwtAuthenticationFilter;
+
+    private final ExceptionHandlerFilter exceptionHandlerFilter;
 
     private static final String[] AUTH_WHITELIST = {
         "/api/**",
@@ -50,8 +52,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                                         .authenticated())
                 // UsernamePasswordAuthenticationFilter 필터 전에 jwt 필터가 먼저 동작하도록함.
                 .addFilterBefore(
-                        new JwtAuthenticationFilter(jwtTokenUtil),
-                        UsernamePasswordAuthenticationFilter.class);
+                        jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class)
+                .addFilterBefore(exceptionHandlerFilter, JwtAuthenticationFilter.class);
         return http.build();
     }
 }
diff --git a/application/src/main/java/org/depromeet/spot/application/common/exception/CustomJwtException.java b/application/src/main/java/org/depromeet/spot/application/common/exception/CustomJwtException.java
new file mode 100644
index 00000000..7b1bff0b
--- /dev/null
+++ b/application/src/main/java/org/depromeet/spot/application/common/exception/CustomJwtException.java
@@ -0,0 +1,13 @@
+package org.depromeet.spot.application.common.exception;
+
+import lombok.Getter;
+
+@Getter
+public class CustomJwtException extends RuntimeException {
+    private final JwtErrorCode jwtErrorCode;
+
+    public CustomJwtException(JwtErrorCode jwtErrorCode) {
+        super(jwtErrorCode.getMessage());
+        this.jwtErrorCode = jwtErrorCode;
+    }
+}
diff --git a/application/src/main/java/org/depromeet/spot/application/common/exception/ErrorResponse.java b/application/src/main/java/org/depromeet/spot/application/common/exception/ErrorResponse.java
index 00fb235d..953f8d74 100644
--- a/application/src/main/java/org/depromeet/spot/application/common/exception/ErrorResponse.java
+++ b/application/src/main/java/org/depromeet/spot/application/common/exception/ErrorResponse.java
@@ -7,4 +7,8 @@ public record ErrorResponse(String code, String message) {
     public static ErrorResponse from(BusinessException e) {
         return new ErrorResponse(e.getCode(), e.getMessage());
     }
+
+    public static ErrorResponse from(CustomJwtException e) {
+        return new ErrorResponse(e.getJwtErrorCode().getCode(), e.getJwtErrorCode().getMessage());
+    }
 }
diff --git a/application/src/main/java/org/depromeet/spot/application/common/exception/ExceptionHandlerFilter.java b/application/src/main/java/org/depromeet/spot/application/common/exception/ExceptionHandlerFilter.java
new file mode 100644
index 00000000..6b758968
--- /dev/null
+++ b/application/src/main/java/org/depromeet/spot/application/common/exception/ExceptionHandlerFilter.java
@@ -0,0 +1,54 @@
+package org.depromeet.spot.application.common.exception;
+
+import java.io.IOException;
+
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Component
+public class ExceptionHandlerFilter extends OncePerRequestFilter {
+
+    private final String UTF_8 = "UTF-8";
+
+    @Override
+    protected void doFilterInternal(
+            HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+            throws ServletException, IOException {
+        try {
+            filterChain.doFilter(request, response);
+        } catch (CustomJwtException e) {
+            // logging 안 하면 콘솔에 로그 출력 안 됨.
+            logger.error("CustomJwtException : {}", e);
+            setErrorResponse(response, e.getJwtErrorCode());
+        }
+    }
+
+    private void setErrorResponse(HttpServletResponse response, JwtErrorCode jwtErrorCode)
+            throws IOException {
+        ObjectMapper objectMapper = new ObjectMapper();
+        response.setStatus(jwtErrorCode.getStatus().value());
+        response.setContentType(MediaType.APPLICATION_JSON_VALUE);
+        response.setCharacterEncoding(UTF_8);
+        ErrorResponse errorResponse =
+                new ErrorResponse(jwtErrorCode.getCode(), jwtErrorCode.getMessage());
+        response.getWriter().write(objectMapper.writeValueAsString(errorResponse));
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public static class ErrorResponse {
+        private final String code;
+        private final String message;
+    }
+}
diff --git a/application/src/main/java/org/depromeet/spot/application/common/exception/JwtErrorCode.java b/application/src/main/java/org/depromeet/spot/application/common/exception/JwtErrorCode.java
new file mode 100644
index 00000000..9b18246f
--- /dev/null
+++ b/application/src/main/java/org/depromeet/spot/application/common/exception/JwtErrorCode.java
@@ -0,0 +1,20 @@
+package org.depromeet.spot.application.common.exception;
+
+import org.depromeet.spot.common.exception.ErrorCode;
+import org.springframework.http.HttpStatus;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum JwtErrorCode implements ErrorCode {
+    NONEXISTENT_TOKEN(HttpStatus.UNAUTHORIZED, "JWT001", "해당 요청은 Jwt 토큰이 필요합니다."),
+    INVALID_TOKEN(HttpStatus.UNAUTHORIZED, "JWT002", "잘못된 토큰입니다."),
+    EXPIRED_TOKEN(HttpStatus.UNAUTHORIZED, "JWT003", "만료된 토큰입니다."),
+    INVALID_PERMISSION(HttpStatus.UNAUTHORIZED, "JWT004", "사용자가 권한이 없습니다.");
+
+    private final HttpStatus status;
+    private final String code;
+    private final String message;
+}
diff --git a/application/src/main/java/org/depromeet/spot/application/common/exception/SpotAppExceptionHandler.java b/application/src/main/java/org/depromeet/spot/application/common/exception/SpotAppExceptionHandler.java
index 58efd9ac..ace904ce 100644
--- a/application/src/main/java/org/depromeet/spot/application/common/exception/SpotAppExceptionHandler.java
+++ b/application/src/main/java/org/depromeet/spot/application/common/exception/SpotAppExceptionHandler.java
@@ -1,7 +1,11 @@
 package org.depromeet.spot.application.common.exception;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.depromeet.spot.common.exception.BusinessException;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
@@ -24,4 +28,29 @@ protected ResponseEntity<ErrorResponse> handleBusinessException(BusinessExceptio
 
         return ResponseEntity.status(httpStatus).body(response);
     }
+
+    @ExceptionHandler(CustomJwtException.class)
+    protected ResponseEntity<ErrorResponse> handleCustomJwtException(CustomJwtException e) {
+        var code = e.getJwtErrorCode().getCode();
+        var message = e.getJwtErrorCode().getMessage();
+        var httpStatus = e.getJwtErrorCode().getStatus();
+
+        log.error(EXCEPTION_LOG_TEMPLATE, code, message, e);
+        var response = ErrorResponse.from(e);
+
+        return ResponseEntity.status(httpStatus).body(response);
+    }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    protected ResponseEntity<Map<String, String>> handleMethodArgumentNotValidException(
+            MethodArgumentNotValidException e) {
+        Map<String, String> errors = new HashMap<>();
+        e.getBindingResult()
+                .getFieldErrors()
+                .forEach(
+                        error -> {
+                            errors.put(error.getField(), error.getDefaultMessage());
+                        });
+        return ResponseEntity.status(e.getStatusCode()).body(errors);
+    }
 }
diff --git a/application/src/main/java/org/depromeet/spot/application/common/jwt/JwtAuthenticationFilter.java b/application/src/main/java/org/depromeet/spot/application/common/jwt/JwtAuthenticationFilter.java
index ede259f9..f6aae5c4 100644
--- a/application/src/main/java/org/depromeet/spot/application/common/jwt/JwtAuthenticationFilter.java
+++ b/application/src/main/java/org/depromeet/spot/application/common/jwt/JwtAuthenticationFilter.java
@@ -2,19 +2,22 @@
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
+import org.depromeet.spot.application.common.exception.CustomJwtException;
+import org.depromeet.spot.application.common.exception.JwtErrorCode;
 import org.depromeet.spot.domain.member.enums.MemberRole;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
-import org.springframework.web.server.ResponseStatusException;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -34,12 +37,20 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
         "/api-docs",
         "/swagger-ui.html",
         "/favicon.ico",
-        "/api/v1/members",
         "/actuator",
         "/api/v1/levels/info",
-        "/api/v1/baseball-teams",
+        "/kakao"
     };
 
+    private static final Map<String, Set<String>> AUTH_METHOD_WHITELIST =
+            Map.of(
+                    "/api/v1/members",
+                    Set.of("GET", "POST"),
+                    "/api/v1/members/delete",
+                    Set.of("DELETE"),
+                    "/api/v1/baseball-teams",
+                    Set.of("GET"));
+
     @Override
     protected void doFilterInternal(
             HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
@@ -47,25 +58,45 @@ protected void doFilterInternal(
 
         String header = request.getHeader(HttpHeaders.AUTHORIZATION);
         final String requestURI = request.getRequestURI();
-        if (Arrays.stream(AUTH_WHITELIST).anyMatch(requestURI::startsWith)) {
+        final String requestMethod = request.getMethod();
+
+        if (checkMethodWhitelist(requestURI, requestMethod)) {
             filterChain.doFilter(request, response);
             return;
         }
 
         // header가 null이거나 빈 문자열이면 안됨.
-        if (header != null && !header.equalsIgnoreCase("")) {
-            if (header.startsWith(JwtTokenEnums.BEARER.getValue())) {
-                String accessToken = header.split(" ")[1];
-                if (jwtTokenUtil.isValidateToken(accessToken)) {
-                    Long memberId = jwtTokenUtil.getIdFromJWT(accessToken);
-                    MemberRole role = MemberRole.valueOf(jwtTokenUtil.getRoleFromJWT(accessToken));
-                    JwtToken jwtToken = new JwtToken(memberId, role);
-                    SecurityContextHolder.getContext().setAuthentication(jwtToken);
-                    filterChain.doFilter(request, response);
-                    return;
-                }
+        if (header == null || header.isEmpty()) {
+            throw new CustomJwtException(JwtErrorCode.NONEXISTENT_TOKEN);
+        }
+
+        if (header.startsWith(JwtTokenEnums.BEARER.getValue())) {
+            String accessToken = header.split(" ")[1];
+            if (jwtTokenUtil.isValidateToken(accessToken)) {
+                Long memberId = jwtTokenUtil.getIdFromJWT(accessToken);
+                MemberRole role = MemberRole.valueOf(jwtTokenUtil.getRoleFromJWT(accessToken));
+                JwtToken jwtToken = new JwtToken(memberId, role);
+                SecurityContextHolder.getContext().setAuthentication(jwtToken);
+                filterChain.doFilter(request, response);
             }
-            // 토큰 검증 실패 -> Exception
-        } else throw new ResponseStatusException(HttpStatus.UNAUTHORIZED);
+        }
+        // 토큰 검증 실패 -> Exception
+        else throw new CustomJwtException(JwtErrorCode.INVALID_TOKEN);
+    }
+
+    private boolean checkMethodWhitelist(String requestURI, String requestMethod) {
+        if (Arrays.stream(AUTH_WHITELIST).anyMatch(requestURI::startsWith)) {
+            return true;
+        }
+
+        Optional<String> matchUrl =
+                AUTH_METHOD_WHITELIST.keySet().stream().filter(requestURI::startsWith).findFirst();
+        if (matchUrl.isPresent()
+                && AUTH_METHOD_WHITELIST
+                        .getOrDefault(matchUrl.get(), Set.of())
+                        .contains(requestMethod)) {
+            return true;
+        }
+        return false;
     }
 }
diff --git a/application/src/main/java/org/depromeet/spot/application/common/jwt/JwtTokenUtil.java b/application/src/main/java/org/depromeet/spot/application/common/jwt/JwtTokenUtil.java
index f0a2dfd7..8d8e570a 100644
--- a/application/src/main/java/org/depromeet/spot/application/common/jwt/JwtTokenUtil.java
+++ b/application/src/main/java/org/depromeet/spot/application/common/jwt/JwtTokenUtil.java
@@ -12,6 +12,8 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 
+import org.depromeet.spot.application.common.exception.CustomJwtException;
+import org.depromeet.spot.application.common.exception.JwtErrorCode;
 import org.depromeet.spot.domain.member.Member;
 import org.depromeet.spot.domain.member.enums.MemberRole;
 import org.springframework.beans.factory.annotation.Value;
@@ -84,17 +86,21 @@ public Jws<Claims> getClaims(String token) {
     }
 
     public boolean isValidateToken(String token) {
+        if (token == null) {
+            throw new CustomJwtException(JwtErrorCode.NONEXISTENT_TOKEN);
+        }
         try {
             Jws<Claims> claims = getClaims(token);
             return true;
         } catch (ExpiredJwtException exception) {
             log.error("Token Expired");
-            throw new ExpiredJwtException(exception.getHeader(), exception.getClaims(), token);
-        } catch (UnsupportedJwtException | WeakKeyException exception) {
+            throw new CustomJwtException(JwtErrorCode.EXPIRED_TOKEN);
+        } catch (UnsupportedJwtException
+                | WeakKeyException
+                | MalformedJwtException
+                | IllegalArgumentException exception) {
             log.error("Unsupported Token");
-            throw new UnsupportedJwtException("지원되지 않는 토큰입니다.");
-        } catch (MalformedJwtException | IllegalArgumentException exception) {
-            throw new MalformedJwtException("잘못된 형식의 토큰입니다.");
+            throw new CustomJwtException(JwtErrorCode.INVALID_TOKEN);
         }
     }
 
@@ -124,6 +130,7 @@ private Key createSignature() {
 
     public String getAccessToken(HttpServletRequest request) {
         String jwtToken = request.getHeader("Authorization");
+        isValidateToken(jwtToken);
         return jwtToken.split(" ")[1];
     }
 }
diff --git a/common/src/main/java/org/depromeet/spot/common/exception/oauth/OauthErrorCode.java b/common/src/main/java/org/depromeet/spot/common/exception/oauth/OauthErrorCode.java
new file mode 100644
index 00000000..7974ea98
--- /dev/null
+++ b/common/src/main/java/org/depromeet/spot/common/exception/oauth/OauthErrorCode.java
@@ -0,0 +1,22 @@
+package org.depromeet.spot.common.exception.oauth;
+
+import org.depromeet.spot.common.exception.ErrorCode;
+import org.springframework.http.HttpStatus;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum OauthErrorCode implements ErrorCode {
+    INVALID_ACCESS_TOKEN(HttpStatus.BAD_REQUEST, "Oauth001", "올바르지 않은 액세스 토큰입니다. 액세스 토큰은 1회용입니다."),
+    INTERNAL_OAUTH_SERVER_ERROR(
+            HttpStatus.INTERNAL_SERVER_ERROR,
+            "Oauth002",
+            "Oauth 로그인 서버 오류입니다. 잠시 후 다시 시도해주세요. 반복되면 Oauth 서버에 문의바랍니다."),
+    ;
+
+    private final HttpStatus status;
+    private final String code;
+    private String message;
+}
diff --git a/common/src/main/java/org/depromeet/spot/common/exception/oauth/OauthException.java b/common/src/main/java/org/depromeet/spot/common/exception/oauth/OauthException.java
new file mode 100644
index 00000000..6eee7c9d
--- /dev/null
+++ b/common/src/main/java/org/depromeet/spot/common/exception/oauth/OauthException.java
@@ -0,0 +1,23 @@
+package org.depromeet.spot.common.exception.oauth;
+
+import org.depromeet.spot.common.exception.BusinessException;
+import org.depromeet.spot.common.exception.ErrorCode;
+
+public abstract class OauthException extends BusinessException {
+
+    public OauthException(ErrorCode errorCode) {
+        super(errorCode);
+    }
+
+    public static class InvalidAcessTokenException extends OauthException {
+        public InvalidAcessTokenException() {
+            super(OauthErrorCode.INVALID_ACCESS_TOKEN);
+        }
+    }
+
+    public static class InternalOauthServerException extends OauthException {
+        public InternalOauthServerException() {
+            super(OauthErrorCode.INTERNAL_OAUTH_SERVER_ERROR);
+        }
+    }
+}
diff --git a/infrastructure/src/main/java/org/depromeet/spot/infrastructure/jpa/oauth/OauthRepositoryImpl.java b/infrastructure/src/main/java/org/depromeet/spot/infrastructure/jpa/oauth/OauthRepositoryImpl.java
index 6a537cda..a3d7fd70 100644
--- a/infrastructure/src/main/java/org/depromeet/spot/infrastructure/jpa/oauth/OauthRepositoryImpl.java
+++ b/infrastructure/src/main/java/org/depromeet/spot/infrastructure/jpa/oauth/OauthRepositoryImpl.java
@@ -1,5 +1,7 @@
 package org.depromeet.spot.infrastructure.jpa.oauth;
 
+import org.depromeet.spot.common.exception.oauth.OauthException.InternalOauthServerException;
+import org.depromeet.spot.common.exception.oauth.OauthException.InvalidAcessTokenException;
 import org.depromeet.spot.domain.member.Member;
 import org.depromeet.spot.infrastructure.jpa.oauth.entity.KakaoTokenEntity;
 import org.depromeet.spot.infrastructure.jpa.oauth.entity.KakaoUserInfoEntity;
@@ -103,12 +105,10 @@ public KakaoUserInfoEntity getUserInfo(String accessToken) {
                         // TODO : Custom Exception
                         .onStatus(
                                 HttpStatusCode::is4xxClientError,
-                                clientResponse ->
-                                        Mono.error(new RuntimeException("Invalid Parameter")))
+                                clientResponse -> Mono.error(new InvalidAcessTokenException()))
                         .onStatus(
                                 HttpStatusCode::is5xxServerError,
-                                clientResponse ->
-                                        Mono.error(new RuntimeException("Internal Server Error")))
+                                clientResponse -> Mono.error(new InternalOauthServerException()))
                         .bodyToMono(KakaoUserInfoEntity.class)
                         .block();
 

From 07499df67dd398f6c8db092f954afd2b30d5c4d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9A=B0=EB=94=94?=
 <38103085+EunjiShin@users.noreply.github.com>
Date: Mon, 12 Aug 2024 11:40:39 +0900
Subject: [PATCH 06/13] =?UTF-8?q?refactor:=20=EC=82=AC=EC=9A=A9=ED=95=98?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EC=83=98=ED=94=8C=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EC=82=AD=EC=A0=9C=20(#125)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sample/controller/SampleController.java   | 30 -------------------
 .../controller/request/SampleRequest.java     | 10 -------
 .../controller/response/SampleResponse.java   |  3 --
 3 files changed, 43 deletions(-)
 delete mode 100644 application/src/main/java/org/depromeet/spot/application/sample/controller/SampleController.java
 delete mode 100644 application/src/main/java/org/depromeet/spot/application/sample/controller/request/SampleRequest.java
 delete mode 100644 application/src/main/java/org/depromeet/spot/application/sample/controller/response/SampleResponse.java

diff --git a/application/src/main/java/org/depromeet/spot/application/sample/controller/SampleController.java b/application/src/main/java/org/depromeet/spot/application/sample/controller/SampleController.java
deleted file mode 100644
index a7704069..00000000
--- a/application/src/main/java/org/depromeet/spot/application/sample/controller/SampleController.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.depromeet.spot.application.sample.controller;
-
-import org.depromeet.spot.application.sample.controller.request.SampleRequest;
-import org.depromeet.spot.application.sample.controller.response.SampleResponse;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.RequiredArgsConstructor;
-
-// FIXME: swagger 확인용 샘플 컨트롤러 입니다. 이후 실제 작업 시작할 때 삭제 예정이에요!
-@RestController
-@RequiredArgsConstructor
-@Tag(name = "샘플")
-@RequestMapping("/api/sample")
-public class SampleController {
-
-    @PostMapping
-    @ResponseStatus(HttpStatus.OK)
-    @Operation(summary = "swagger 테스트용 API :: 주어진 메세지를 반환한다.")
-    public SampleResponse testSwagger(@RequestBody SampleRequest sampleRequest) {
-        var message = sampleRequest.message();
-        return new SampleResponse(message);
-    }
-}
diff --git a/application/src/main/java/org/depromeet/spot/application/sample/controller/request/SampleRequest.java b/application/src/main/java/org/depromeet/spot/application/sample/controller/request/SampleRequest.java
deleted file mode 100644
index 267ef73f..00000000
--- a/application/src/main/java/org/depromeet/spot/application/sample/controller/request/SampleRequest.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.depromeet.spot.application.sample.controller.request;
-
-import jakarta.validation.constraints.NotBlank;
-
-import org.hibernate.validator.constraints.Length;
-
-public record SampleRequest(
-        @NotBlank(message = "메세지는 공백일 수 없습니다.")
-                @Length(min = 1, max = 30, message = "메세지는 1~30글자 사이여야 합니다.")
-                String message) {}
diff --git a/application/src/main/java/org/depromeet/spot/application/sample/controller/response/SampleResponse.java b/application/src/main/java/org/depromeet/spot/application/sample/controller/response/SampleResponse.java
deleted file mode 100644
index 030a2381..00000000
--- a/application/src/main/java/org/depromeet/spot/application/sample/controller/response/SampleResponse.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package org.depromeet.spot.application.sample.controller.response;
-
-public record SampleResponse(String message) {}

From 2df5b55c87c5169d4e21ca3947622616e8bc422b Mon Sep 17 00:00:00 2001
From: junwon <67488973+wjdwnsdnjs13@users.noreply.github.com>
Date: Mon, 12 Aug 2024 16:14:09 +0900
Subject: [PATCH 07/13] =?UTF-8?q?[NO=5FJIRA]=20Loki=20=EB=AA=A8=EB=8B=88?=
 =?UTF-8?q?=ED=84=B0=EB=A7=81=20=EC=9D=B8=EC=8A=A4=ED=84=B4=EC=8A=A4=20ip?=
 =?UTF-8?q?=20=EC=84=A4=EC=A0=95=20(#116)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor : Loki 모니터링 인스턴스 ip 설정

* feat : monitoring yml 추가

* feat : monitoring yml 추가

* feat : loki 환경변수 ignore 추가

* refactor : loki url 환경변수 적용

* refactor : 사용되지 않는 local monitoring 설정 제거

* refactor : 사용되지 않는 주석 제거
---
 .gitignore                                    |  1 +
 application/.gitignore                        |  5 ++++-
 .../resources/appenders/console-appender.xml  | 16 --------------
 .../src/main/resources/application.yaml       |  2 ++
 .../src/main/resources/logback-spring.xml     | 21 ++++++++++++++++---
 5 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9f5307c8..459202df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -385,6 +385,7 @@ gradle-app.setting
 .env
 
 *.application-jwt.yml
+*.application-monitoring.yml
 application-jwt.yml
 application-kakao.yml
 application-sentry.yml
diff --git a/application/.gitignore b/application/.gitignore
index 59c70a62..fbcb1d18 100644
--- a/application/.gitignore
+++ b/application/.gitignore
@@ -41,4 +41,7 @@ bin/
 ### Mac OS ###
 .DS_Store
 
-*.application-jwt.yml
\ No newline at end of file
+*.application-jwt.yml
+
+### loki ###
+**/application-monitoring.yml
\ No newline at end of file
diff --git a/application/src/main/resources/appenders/console-appender.xml b/application/src/main/resources/appenders/console-appender.xml
index d31218e6..d02fa9d8 100644
--- a/application/src/main/resources/appenders/console-appender.xml
+++ b/application/src/main/resources/appenders/console-appender.xml
@@ -11,20 +11,4 @@
         <minimumEventLevel>ERROR</minimumEventLevel>
     </appender>
 
-    <appender name="LOKI_APPENDER" class="com.github.loki4j.logback.Loki4jAppender">
-        <http>
-            <!-- TODO: Loki 인스턴스 세팅 후 URL 변경 필요 -->
-<!--            <url>http://localhost:3100/loki/api/v1/push</url>-->
-        </http>
-        <format>
-            <label>
-                <pattern>app=${name},host=${HOSTNAME},level=%level</pattern>
-                <readMarkers>true</readMarkers>
-            </label>
-            <message>
-                <pattern>%highlight([%-5level]) %d{yy-MM-dd HH:mm:ss.SSS} %green([%thread]) %yellow([traceId=%X{traceId}]) %cyan([%logger{0}:%line])-%message%n</pattern>
-            </message>
-            <sortByTime>true</sortByTime>
-        </format>
-    </appender>
 </included>
diff --git a/application/src/main/resources/application.yaml b/application/src/main/resources/application.yaml
index 7884197d..f26a91b6 100644
--- a/application/src/main/resources/application.yaml
+++ b/application/src/main/resources/application.yaml
@@ -17,12 +17,14 @@ spring:
                 - aws
                 - jwt
                 - kakao
+                - monitoring
             prod:
                 - jpa
                 - aws
                 - jwt
                 - kakao
                 - sentry
+                - monitoring
     servlet:
         multipart:
             max-file-size: 10MB
diff --git a/application/src/main/resources/logback-spring.xml b/application/src/main/resources/logback-spring.xml
index cbacde37..3b9ef380 100644
--- a/application/src/main/resources/logback-spring.xml
+++ b/application/src/main/resources/logback-spring.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="5 seconds">
     <include resource="appenders/console-appender.xml"/>
-
+    <property resource="application-monitoring.yml" />
     <springProfile name="local">
         <root level="INFO">
             <appender-ref ref="CONSOLE_APPENDER"/>
@@ -15,10 +15,25 @@
     </springProfile>
 
     <springProfile name="prod">
-        <root level="INFO">
+        <root level="ERROR">
             <appender-ref ref="CONSOLE_APPENDER"/>
             <appender-ref ref="SENTRY_APPENDER"/>
-<!--            <appender-ref ref="LOKI_APPENDER"/>-->
+
+            <appender name="LOKI_APPENDER" class="com.github.loki4j.logback.Loki4jAppender">
+                <http>
+                    <url>http://${loki.url}:3100/loki/api/v1/push</url>
+                </http>
+                <format>
+                    <label>
+                        <pattern>app=${name},host=${HOSTNAME},level=%level</pattern>
+                        <readMarkers>true</readMarkers>
+                    </label>
+                    <message>
+                        <pattern>%highlight([%-5level]) %d{yy-MM-dd HH:mm:ss.SSS} %green([%thread]) %yellow([traceId=%X{traceId}]) %cyan([%logger{0}:%line])-%message%n</pattern>
+                    </message>
+                    <sortByTime>true</sortByTime>
+                </format>
+            </appender>
         </root>
     </springProfile>
 </configuration>

From c7c03d9c0fbc356482ec0f66039ee732c4496fb1 Mon Sep 17 00:00:00 2001
From: junwon <67488973+wjdwnsdnjs13@users.noreply.github.com>
Date: Mon, 12 Aug 2024 19:51:09 +0900
Subject: [PATCH 08/13] [NO-JIRA] jwt fix (#127)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix : 토큰 검증 오류 수정 및 Exception 설정

* feat : (개발용)원하는 id에 대한 jwt 생성 구현
---
 .../common/jwt/JwtAuthenticationFilter.java   |  3 +-
 .../application/common/jwt/JwtTokenUtil.java  | 14 +++++---
 .../controller/JwtCreateController.java       | 35 +++++++++++++++++++
 3 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 application/src/main/java/org/depromeet/spot/application/member/controller/JwtCreateController.java

diff --git a/application/src/main/java/org/depromeet/spot/application/common/jwt/JwtAuthenticationFilter.java b/application/src/main/java/org/depromeet/spot/application/common/jwt/JwtAuthenticationFilter.java
index f6aae5c4..7fa27c12 100644
--- a/application/src/main/java/org/depromeet/spot/application/common/jwt/JwtAuthenticationFilter.java
+++ b/application/src/main/java/org/depromeet/spot/application/common/jwt/JwtAuthenticationFilter.java
@@ -39,7 +39,8 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
         "/favicon.ico",
         "/actuator",
         "/api/v1/levels/info",
-        "/kakao"
+        "/kakao",
+        "/api/v1/jwts",
     };
 
     private static final Map<String, Set<String>> AUTH_METHOD_WHITELIST =
diff --git a/application/src/main/java/org/depromeet/spot/application/common/jwt/JwtTokenUtil.java b/application/src/main/java/org/depromeet/spot/application/common/jwt/JwtTokenUtil.java
index 8d8e570a..97b787f0 100644
--- a/application/src/main/java/org/depromeet/spot/application/common/jwt/JwtTokenUtil.java
+++ b/application/src/main/java/org/depromeet/spot/application/common/jwt/JwtTokenUtil.java
@@ -85,12 +85,12 @@ public Jws<Claims> getClaims(String token) {
         return Jwts.parserBuilder().setSigningKey(createSignature()).build().parseClaimsJws(token);
     }
 
-    public boolean isValidateToken(String token) {
-        if (token == null) {
+    public boolean isValidateToken(String accessToken) {
+        if (accessToken == null) {
             throw new CustomJwtException(JwtErrorCode.NONEXISTENT_TOKEN);
         }
         try {
-            Jws<Claims> claims = getClaims(token);
+            Jws<Claims> claims = getClaims(accessToken);
             return true;
         } catch (ExpiredJwtException exception) {
             log.error("Token Expired");
@@ -130,7 +130,11 @@ private Key createSignature() {
 
     public String getAccessToken(HttpServletRequest request) {
         String jwtToken = request.getHeader("Authorization");
-        isValidateToken(jwtToken);
-        return jwtToken.split(" ")[1];
+        if (jwtToken == null || jwtToken.isEmpty()) {
+            throw new CustomJwtException(JwtErrorCode.NONEXISTENT_TOKEN);
+        }
+        String accessToken = jwtToken.split(" ")[1];
+        isValidateToken(accessToken);
+        return accessToken;
     }
 }
diff --git a/application/src/main/java/org/depromeet/spot/application/member/controller/JwtCreateController.java b/application/src/main/java/org/depromeet/spot/application/member/controller/JwtCreateController.java
new file mode 100644
index 00000000..6f06404f
--- /dev/null
+++ b/application/src/main/java/org/depromeet/spot/application/member/controller/JwtCreateController.java
@@ -0,0 +1,35 @@
+package org.depromeet.spot.application.member.controller;
+
+import org.depromeet.spot.application.common.jwt.JwtTokenUtil;
+import org.depromeet.spot.application.member.dto.response.JwtTokenResponse;
+import org.depromeet.spot.domain.member.Member;
+import org.depromeet.spot.domain.member.enums.MemberRole;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@RestController
+@RequiredArgsConstructor
+@Slf4j
+@Tag(name = "Jwt 생성용")
+@RequestMapping("/api/v1/jwts")
+public class JwtCreateController {
+
+    private final JwtTokenUtil jwtTokenUtil;
+
+    @GetMapping("/{id}")
+    public JwtTokenResponse jwtTokenCreate(
+            @PathVariable("id")
+                    @Parameter(name = "id", description = "생성하고자하는 jwt 토큰의 id", required = true)
+                    Long id) {
+        Member member = Member.builder().id(id).role(MemberRole.ROLE_USER).build();
+
+        return new JwtTokenResponse(jwtTokenUtil.getJWTToken(member));
+    }
+}

From 1707a5621c2968f17f5aeca6ceaf393957600993 Mon Sep 17 00:00:00 2001
From: Minseong Park <52368015+pminsung12@users.noreply.github.com>
Date: Mon, 12 Aug 2024 21:02:30 +0900
Subject: [PATCH 09/13] =?UTF-8?q?[BSVR-202]=20=EB=B0=B0=ED=8F=AC=20?=
 =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=EC=97=90=20application-mon?=
 =?UTF-8?q?itoring=20=ED=99=98=EA=B2=BD=EB=B3=80=EC=88=98=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=20(#128)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: dev 배포 스크립트에 loki url 추가

* feat: prod 수동 배포 스크립트에 loki url 추가
---
 .github/workflows/dev-build-and-deploy.yaml | 1 +
 .github/workflows/manual-prod-deploy.yaml   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/dev-build-and-deploy.yaml b/.github/workflows/dev-build-and-deploy.yaml
index 6766dd9c..e4851e10 100644
--- a/.github/workflows/dev-build-and-deploy.yaml
+++ b/.github/workflows/dev-build-and-deploy.yaml
@@ -124,6 +124,7 @@ jobs:
                       -e SENTRY_DSN=${{ secrets.SENTRY_DSN }} \
                       -e SENTRY_ENABLE_TRACING=true \
                       -e SENTRY_ENVIRONMENT=prod \
+                      -e LOKI_URL=${{ secrets.LOKI_SERVER_URL }} \
                       ${{ secrets.DOCKERHUB_USERNAME }}/spot-server:dev-${{ github.sha }}
                     docker system prune -af
 
diff --git a/.github/workflows/manual-prod-deploy.yaml b/.github/workflows/manual-prod-deploy.yaml
index fa5ac18e..827b1f54 100644
--- a/.github/workflows/manual-prod-deploy.yaml
+++ b/.github/workflows/manual-prod-deploy.yaml
@@ -61,5 +61,6 @@ jobs:
                           -e SENTRY_DSN=${{ secrets.SENTRY_DSN }} \
                           -e SENTRY_ENABLE_TRACING=true \
                           -e SENTRY_ENVIRONMENT=prod \
+                          -e LOKI_URL=${{ secrets.LOKI_SERVER_URL }} \
                           ${{ secrets.DOCKERHUB_USERNAME }}/spot-server:prod-${{ github.event.inputs.tag }}
                         docker system prune -af
\ No newline at end of file

From ea132a59403c307d263f253607be01d436cc3955 Mon Sep 17 00:00:00 2001
From: Minseong Park <52368015+pminsung12@users.noreply.github.com>
Date: Mon, 12 Aug 2024 22:47:59 +0900
Subject: [PATCH 10/13] =?UTF-8?q?[BSVR-202/=EB=B0=B0=ED=8F=AC]=20monitorin?=
 =?UTF-8?q?g=20yml=20=ED=8A=B8=EB=9F=AC=EB=B8=94=20=EC=87=BC=ED=8C=85=20(#?=
 =?UTF-8?q?129)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: dev 배포 스크립트에 loki url 추가

* feat: prod 수동 배포 스크립트에 loki url 추가

* feat: logback-spring.xml에 yml 파일이 아닌 환경변수만 사용하도록 수정
---
 application/src/main/resources/logback-spring.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/src/main/resources/logback-spring.xml b/application/src/main/resources/logback-spring.xml
index 3b9ef380..54ceeb8d 100644
--- a/application/src/main/resources/logback-spring.xml
+++ b/application/src/main/resources/logback-spring.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="5 seconds">
     <include resource="appenders/console-appender.xml"/>
-    <property resource="application-monitoring.yml" />
+    <property name="loki.url" value="${LOKI_URL:-localhost}" />
     <springProfile name="local">
         <root level="INFO">
             <appender-ref ref="CONSOLE_APPENDER"/>

From 5c4660e0fc981b258266bc365350ef17212e7542 Mon Sep 17 00:00:00 2001
From: Minseong Park <52368015+pminsung12@users.noreply.github.com>
Date: Mon, 12 Aug 2024 23:19:17 +0900
Subject: [PATCH 11/13] =?UTF-8?q?[BSVR-202]=20=ED=94=84=EB=A1=9C=EB=A9=94?=
 =?UTF-8?q?=ED=85=8C=EC=9A=B0=EC=8A=A4=20scrape=20=EC=95=88=EB=90=98?=
 =?UTF-8?q?=EB=8A=94=20=EC=9D=B4=EC=8A=88=20=ED=8A=B8=EB=9F=AC=EB=B8=94?=
 =?UTF-8?q?=EC=8A=88=ED=8C=85=20(#130)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: dev 배포 스크립트에 loki url 추가

* feat: prod 수동 배포 스크립트에 loki url 추가

* feat: logback-spring.xml에 yml 파일이 아닌 환경변수만 사용하도록 수정

* feat: 9292 docker port mapping
---
 .github/workflows/dev-build-and-deploy.yaml | 1 +
 .github/workflows/manual-prod-deploy.yaml   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/dev-build-and-deploy.yaml b/.github/workflows/dev-build-and-deploy.yaml
index e4851e10..7fb6952e 100644
--- a/.github/workflows/dev-build-and-deploy.yaml
+++ b/.github/workflows/dev-build-and-deploy.yaml
@@ -108,6 +108,7 @@ jobs:
                     docker rm spot-server-dev || true
                     docker run -d --name spot-server-dev \
                       -p 8080:8080 \
+                      -p 9292:9292 \
                       -e SPRING_PROFILES_ACTIVE=dev \
                       -e SPRING_DATASOURCE_URL=${{ secrets.DEV_DB_URL }} \
                       -e SPRING_DATASOURCE_USERNAME=${{ secrets.DEV_DB_USERNAME }} \
diff --git a/.github/workflows/manual-prod-deploy.yaml b/.github/workflows/manual-prod-deploy.yaml
index 827b1f54..a9620390 100644
--- a/.github/workflows/manual-prod-deploy.yaml
+++ b/.github/workflows/manual-prod-deploy.yaml
@@ -45,6 +45,7 @@ jobs:
                         docker rm spot-server-prod || true
                         docker run -d --name spot-server-prod \
                           -p 8080:8080 \
+                          -p 9292:9292 \
                           -e SPRING_PROFILES_ACTIVE=prod \
                           -e SPRING_DATASOURCE_URL=${{ secrets.PROD_DB_URL }} \
                           -e SPRING_DATASOURCE_USERNAME=${{ secrets.PROD_DB_USERNAME }} \

From 5faa9e836e306724a57452d43af5aaa4b1c90a7d Mon Sep 17 00:00:00 2001
From: Minseong Park <52368015+pminsung12@users.noreply.github.com>
Date: Tue, 13 Aug 2024 23:11:38 +0900
Subject: [PATCH 12/13] =?UTF-8?q?[BSVR-210]=20=EA=B0=9C=EB=B0=9C=20?=
 =?UTF-8?q?=EC=84=9C=EB=B2=84=20=EB=A1=9C=ED=82=A4=20connection=20?=
 =?UTF-8?q?=EC=97=90=EB=9F=AC=20=ED=8A=B8=EB=9F=AC=EB=B8=94=20=EC=8A=88?=
 =?UTF-8?q?=ED=8C=85=20(#133)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: 개발서버 loki 포트 매핑

* feat: 운영서버 loki 포트 매핑
---
 .github/workflows/dev-build-and-deploy.yaml | 1 +
 .github/workflows/manual-prod-deploy.yaml   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/dev-build-and-deploy.yaml b/.github/workflows/dev-build-and-deploy.yaml
index 7fb6952e..a61fcf6d 100644
--- a/.github/workflows/dev-build-and-deploy.yaml
+++ b/.github/workflows/dev-build-and-deploy.yaml
@@ -109,6 +109,7 @@ jobs:
                     docker run -d --name spot-server-dev \
                       -p 8080:8080 \
                       -p 9292:9292 \
+                      -p 3100:3100 \
                       -e SPRING_PROFILES_ACTIVE=dev \
                       -e SPRING_DATASOURCE_URL=${{ secrets.DEV_DB_URL }} \
                       -e SPRING_DATASOURCE_USERNAME=${{ secrets.DEV_DB_USERNAME }} \
diff --git a/.github/workflows/manual-prod-deploy.yaml b/.github/workflows/manual-prod-deploy.yaml
index a9620390..fd040c87 100644
--- a/.github/workflows/manual-prod-deploy.yaml
+++ b/.github/workflows/manual-prod-deploy.yaml
@@ -46,6 +46,7 @@ jobs:
                         docker run -d --name spot-server-prod \
                           -p 8080:8080 \
                           -p 9292:9292 \
+                          -p 3100:3100 \
                           -e SPRING_PROFILES_ACTIVE=prod \
                           -e SPRING_DATASOURCE_URL=${{ secrets.PROD_DB_URL }} \
                           -e SPRING_DATASOURCE_USERNAME=${{ secrets.PROD_DB_USERNAME }} \

From 716e787fe878689c76dd8b31eecc5a5dc5c0a865 Mon Sep 17 00:00:00 2001
From: junwon <67488973+wjdwnsdnjs13@users.noreply.github.com>
Date: Wed, 14 Aug 2024 20:39:19 +0900
Subject: [PATCH 13/13] =?UTF-8?q?[NO=5FJIRA]=20loki=20=EC=98=A4=EB=A5=98?=
 =?UTF-8?q?=20fix=20(#134)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix : loki 오류 fix

* refactor : Loki appender 파일 분리
---
 .../resources/appenders/console-appender.xml  | 15 ++++++++++++++
 .../src/main/resources/logback-spring.xml     | 20 +++----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/application/src/main/resources/appenders/console-appender.xml b/application/src/main/resources/appenders/console-appender.xml
index d02fa9d8..97295287 100644
--- a/application/src/main/resources/appenders/console-appender.xml
+++ b/application/src/main/resources/appenders/console-appender.xml
@@ -11,4 +11,19 @@
         <minimumEventLevel>ERROR</minimumEventLevel>
     </appender>
 
+    <appender name="LOKI_APPENDER" class="com.github.loki4j.logback.Loki4jAppender">
+        <http>
+            <url>http://${LOKI_URL}:3100/loki/api/v1/push</url>
+        </http>
+        <format>
+            <label>
+                <pattern>app=${name},host=${HOSTNAME},level=%level</pattern>
+                <readMarkers>true</readMarkers>
+            </label>
+            <message>
+                <pattern>%highlight([%-5level]) %d{yy-MM-dd HH:mm:ss.SSS} %green([%thread]) %yellow([traceId=%X{traceId}]) %cyan([%logger{0}:%line])-%message%n</pattern>
+            </message>
+            <sortByTime>true</sortByTime>
+        </format>
+    </appender>
 </included>
diff --git a/application/src/main/resources/logback-spring.xml b/application/src/main/resources/logback-spring.xml
index 54ceeb8d..22bf7ecc 100644
--- a/application/src/main/resources/logback-spring.xml
+++ b/application/src/main/resources/logback-spring.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="5 seconds">
     <include resource="appenders/console-appender.xml"/>
-    <property name="loki.url" value="${LOKI_URL:-localhost}" />
     <springProfile name="local">
         <root level="INFO">
             <appender-ref ref="CONSOLE_APPENDER"/>
+            <appender-ref ref="LOKI_APPENDER"/>
         </root>
     </springProfile>
 
     <springProfile name="dev">
         <root level="INFO">
             <appender-ref ref="CONSOLE_APPENDER"/>
+            <appender-ref ref="LOKI_APPENDER"/>
         </root>
     </springProfile>
 
@@ -18,22 +19,7 @@
         <root level="ERROR">
             <appender-ref ref="CONSOLE_APPENDER"/>
             <appender-ref ref="SENTRY_APPENDER"/>
-
-            <appender name="LOKI_APPENDER" class="com.github.loki4j.logback.Loki4jAppender">
-                <http>
-                    <url>http://${loki.url}:3100/loki/api/v1/push</url>
-                </http>
-                <format>
-                    <label>
-                        <pattern>app=${name},host=${HOSTNAME},level=%level</pattern>
-                        <readMarkers>true</readMarkers>
-                    </label>
-                    <message>
-                        <pattern>%highlight([%-5level]) %d{yy-MM-dd HH:mm:ss.SSS} %green([%thread]) %yellow([traceId=%X{traceId}]) %cyan([%logger{0}:%line])-%message%n</pattern>
-                    </message>
-                    <sortByTime>true</sortByTime>
-                </format>
-            </appender>
+            <appender-ref ref="LOKI_APPENDER"/>
         </root>
     </springProfile>
 </configuration>