Merge pull request #246 from ShallWeProject/infra/239-monitoring

CD시 Shallwe-Application 만 변경하도록 수정한다.
ShallWeProject · Feb 4, 2024 · 2163b8a · 2163b8a
2 parents ca859a9 + 19267f8
commit 2163b8a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/dev-cicd.yml b/.github/workflows/dev-cicd.yml
@@ -45,6 +45,7 @@ jobs:
           echo "${{ secrets.PROPERTIES_DEV }}" > ./application-dev.yml
         shell: bash
 
+      # gradle build 위한 permission
       - name: Grant execute permission for gradlew
         run: chmod +x ./gradlew
         shell: bash
@@ -63,6 +64,7 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       # Docker 이미지 빌드
+      # docker file 생성 필요
       - name: docker image build
         uses: docker/build-push-action@v2
         with:
@@ -86,9 +88,9 @@ jobs:
           port: 22
           key: ${{ secrets.PRIVATE_KEY }}
           script: |
-            ssh dev sudo docker rm -f $(ssh dev sudo docker ps -qa)
+            ssh dev sudo docker rm -f $(ssh dev sudo docker ps -qa) Shallwe-Application
             ssh dev sudo docker pull ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPO }}
-            ssh dev sudo docker run -dp 80:8080 ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPO }}
+            ssh dev sudo docker run -dp 80:8080 --name Shallwe-Application ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPO }}
 
     ## time ##
   current-time:
@@ -104,4 +106,4 @@ jobs:
 
       - name: Print Current Time
         run: echo "Current Time=${{steps.current-time.outputs.formattedTime}}" # current-time 에서 지정한 포맷대로 현재 시간 출력
-        shell: bash
+        shell: bash
diff --git a/src/main/java/com/shallwe/domain/reservation/presentation/ReservationController.java b/src/main/java/com/shallwe/domain/reservation/presentation/ReservationController.java
@@ -103,7 +103,7 @@ public ResponseCustom<List<ReservationIdUserRes>> getReservationWithDate(
     @Operation(summary = "해당 경험 선물에 생성된 예약 조회 ", description = "경험 ID로 검색")
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "예약 정보 조회 성공", content = {
-                    @Content(mediaType = "application/json", array = @ArraySchema(schema = @Schema(implementation = ReservationResponse.class)))}),
+                    @Content(mediaType = "application/json", array = @ArraySchema(schema = @Schema(implementation = ReservationIdUserRes.class)))}),
             @ApiResponse(responseCode = "400", description = "예약 정보 조회 실패", content = {
                     @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorResponse.class))}),
 

diff --git a/src/main/java/com/shallwe/global/config/security/SecurityConfig.java b/src/main/java/com/shallwe/global/config/security/SecurityConfig.java
@@ -83,7 +83,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .authorizeHttpRequests(authorize -> authorize
                         .requestMatchers("/", "/error", "/favicon.ico", "/**/*.png", "/**/*.gif", "/**/*.svg", "/**/*.jpg", "/**/*.html", "/**/*.css", "/**/*.js")
                                 .permitAll()
-                        .requestMatchers("/management/**")
+                        .requestMatchers("/management/**","/graph/**")
                                  .permitAll()
                         .requestMatchers("/swagger", "/swagger-ui.html", "/swagger-ui/**", "/api-docs", "/api-docs/**", "/v3/api-docs/**")
                                 .permitAll()