Skip to content

Commit

Permalink
[HOTFIX] 도커 볼륨 설정 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
ohksj77 committed Nov 28, 2023
1 parent 8d00297 commit fe0a30b
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ public SecurityFilterChain configure(HttpSecurity http) throws Exception {
"auth/save",
"auth/login",
"member/duplicate/**",
"plan/**",
"/actuator/**")
"actuator/**")
.permitAll())
.authorizeHttpRequests(
x -> x.requestMatchers("/test/**").permitAll().anyRequest().authenticated())
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.twtw.backend.global.advice;

import com.twtw.backend.global.exception.AuthorityException;
import com.twtw.backend.global.exception.EntityNotFoundException;
import com.twtw.backend.global.exception.WebClientResponseException;

import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.ExceptionHandler;
Expand All @@ -17,11 +17,11 @@ public ResponseEntity<ErrorResponse> webClientResponse(final WebClientResponseEx
.body(new ErrorResponse(e.getMessage()));
}

// @ExceptionHandler(EntityNotFoundException.class)
// public ResponseEntity<ErrorResponse> entityNotFound(final EntityNotFoundException e) {
// return ResponseEntity.status(HttpStatus.BAD_REQUEST)
// .body(new ErrorResponse(e.getMessage()));
// }
@ExceptionHandler(EntityNotFoundException.class)
public ResponseEntity<ErrorResponse> entityNotFound(final EntityNotFoundException e) {
return ResponseEntity.status(HttpStatus.BAD_REQUEST)
.body(new ErrorResponse(e.getMessage()));
}

@ExceptionHandler(AuthorityException.class)
public ResponseEntity<ErrorResponse> authority(final AuthorityException e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ void searchSurroundPlace() throws Exception {
final ResultActions perform =
mockMvc.perform(
get("/places/surround")
.queryParam("x", "127.426")
.queryParam("y", "37.0764")
.queryParam("longitude", "127.426")
.queryParam("latitude", "37.0764")
.queryParam("page", "1")
.contentType(MediaType.APPLICATION_JSON)
.header(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ void searchPlanDestination() throws Exception {
mockMvc.perform(
get("/plans/search/destination")
.queryParam("query", "이디야 안성")
.queryParam("x", "127.426")
.queryParam("y", "37.0764")
.queryParam("longitude", "127.426")
.queryParam("latitude", "37.0764")
.queryParam("page", "1")
.queryParam("categoryGroupCode", "CE7")
.contentType(MediaType.APPLICATION_JSON)
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ services:
- backend
depends_on:
- db
- rabbitmq
env_file: .env
restart: always
tty: true
Expand All @@ -23,7 +24,7 @@ services:
environment:
TZ: Asia/Seoul
volumes:
- data_db:/var/lib/mysql
- ./data:/var/lib/mysql
networks:
- backend
restart: always
Expand Down Expand Up @@ -78,7 +79,7 @@ services:
- backend
volumes:
- ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
- data-prometheus:/prometheus
- ./tmp/promtheus:/prometheus

grafana:
image: grafana/grafana
Expand All @@ -94,5 +95,4 @@ networks:

volumes:
data_rabbitmq: null
data_db: null
data-prometheus: null

0 comments on commit fe0a30b

Please sign in to comment.