diff --git a/common/src/main/java/com/ktds/hi/common/response/ApiResponse.java b/common/src/main/java/com/ktds/hi/common/dto/ApiResponse.java similarity index 95% rename from common/src/main/java/com/ktds/hi/common/response/ApiResponse.java rename to common/src/main/java/com/ktds/hi/common/dto/ApiResponse.java index e746554..b181198 100644 --- a/common/src/main/java/com/ktds/hi/common/response/ApiResponse.java +++ b/common/src/main/java/com/ktds/hi/common/dto/ApiResponse.java @@ -1,6 +1,7 @@ -package com.ktds.hi.common.response; +package com.ktds.hi.common.dto; import com.fasterxml.jackson.annotation.JsonInclude; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/common/src/main/java/com/ktds/hi/common/dto/ErrorResponse.java b/common/src/main/java/com/ktds/hi/common/dto/ErrorResponse.java index 7dd8bcb..8627803 100644 --- a/common/src/main/java/com/ktds/hi/common/dto/ErrorResponse.java +++ b/common/src/main/java/com/ktds/hi/common/dto/ErrorResponse.java @@ -1,7 +1,6 @@ package com.ktds.hi.common.dto; import com.fasterxml.jackson.annotation.JsonInclude; -import com.ktds.hi.common.response.ResponseCode; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/common/src/main/java/com/ktds/hi/common/response/ResponseCode.java b/common/src/main/java/com/ktds/hi/common/dto/ResponseCode.java similarity index 96% rename from common/src/main/java/com/ktds/hi/common/response/ResponseCode.java rename to common/src/main/java/com/ktds/hi/common/dto/ResponseCode.java index 62114da..e1125cf 100644 --- a/common/src/main/java/com/ktds/hi/common/response/ResponseCode.java +++ b/common/src/main/java/com/ktds/hi/common/dto/ResponseCode.java @@ -1,4 +1,4 @@ -package com.ktds.hi.common.response; +package com.ktds.hi.common.dto; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/common/src/main/java/com/ktds/hi/common/response/ErrorResponse.java b/common/src/main/java/com/ktds/hi/common/response/ErrorResponse.java index a3205ca..388d68b 100644 --- a/common/src/main/java/com/ktds/hi/common/response/ErrorResponse.java +++ b/common/src/main/java/com/ktds/hi/common/response/ErrorResponse.java @@ -7,6 +7,8 @@ import lombok.NoArgsConstructor; import java.util.List; +import com.ktds.hi.common.dto.ResponseCode; + /** * 에러 응답 DTO */ diff --git a/common/src/main/java/com/ktds/hi/common/security/JwtAuthenticationFilter.java b/common/src/main/java/com/ktds/hi/common/security/JwtAuthenticationFilter.java index a6990e5..2f2ccf6 100644 --- a/common/src/main/java/com/ktds/hi/common/security/JwtAuthenticationFilter.java +++ b/common/src/main/java/com/ktds/hi/common/security/JwtAuthenticationFilter.java @@ -2,8 +2,8 @@ package com.ktds.hi.common.security; import com.fasterxml.jackson.databind.ObjectMapper; import com.ktds.hi.common.constants.SecurityConstants; -import com.ktds.hi.common.response.ApiResponse; -import com.ktds.hi.common.response.ResponseCode; +import com.ktds.hi.common.dto.ApiResponse; +import com.ktds.hi.common.dto.ResponseCode; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/member/src/main/java/com/ktds/hi/member/config/JwtAuthenticationFilter.java b/member/src/main/java/com/ktds/hi/member/config/JwtAuthenticationFilter.java deleted file mode 100644 index 49b28e6..0000000 --- a/member/src/main/java/com/ktds/hi/member/config/JwtAuthenticationFilter.java +++ /dev/null @@ -1,59 +0,0 @@ -// package com.ktds.hi.member.config; -// -// -// import jakarta.servlet.FilterChain; -// import jakarta.servlet.ServletException; -// import jakarta.servlet.http.HttpServletRequest; -// import jakarta.servlet.http.HttpServletResponse; -// import lombok.RequiredArgsConstructor; -// import lombok.extern.slf4j.Slf4j; -// import org.springframework.security.core.Authentication; -// import org.springframework.security.core.context.SecurityContextHolder; -// import org.springframework.util.StringUtils; -// import org.springframework.web.filter.OncePerRequestFilter; -// -// import java.io.IOException; -// -// import com.ktds.hi.common.security.JwtTokenProvider; -// -// /** -// * JWT 인증 필터 클래스 -// * 요청 헤더의 JWT 토큰을 검증하고 인증 정보를 설정 -// */ -// @RequiredArgsConstructor -// @Slf4j -// public class JwtAuthenticationFilter extends OncePerRequestFilter { -// -// private final JwtTokenProvider tokenProvider; -// -// @Override -// protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, -// FilterChain filterChain) throws ServletException, IOException { -// -// try { -// String token = resolveToken(request); -// -// if (StringUtils.hasText(token) && tokenProvider.validateToken(token)) { -// Authentication authentication = tokenProvider.getAuthentication(token); -// SecurityContextHolder.getContext().setAuthentication(authentication); -// log.debug("JWT 토큰 인증 성공: {}", authentication.getName()); -// } -// } catch (Exception e) { -// log.error("JWT 토큰 인증 실패", e); -// SecurityContextHolder.clearContext(); -// } -// -// filterChain.doFilter(request, response); -// } -// -// /** -// * 요청 헤더에서 JWT 토큰 추출 -// */ -// private String resolveToken(HttpServletRequest request) { -// String bearerToken = request.getHeader("Authorization"); -// if (StringUtils.hasText(bearerToken) && bearerToken.startsWith("Bearer ")) { -// return bearerToken.substring(7); -// } -// return null; -// } -// } \ No newline at end of file diff --git a/recommend/build.gradle b/recommend/build.gradle index 5db4df7..57c8b8d 100644 --- a/recommend/build.gradle +++ b/recommend/build.gradle @@ -6,6 +6,6 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-openfeign:4.1.0' - implementation 'org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j:' - implementation 'org.springframework.cloud:spring-cloud-starter-loadbalancer:latest' + implementation 'org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j:3.1.1' + implementation 'org.springframework.cloud:spring-cloud-starter-loadbalancer:4.1.2' } diff --git a/recommend/src/main/java/com/ktds/hi/recommend/infra/controller/StoreRecommendController.java b/recommend/src/main/java/com/ktds/hi/recommend/infra/controller/StoreRecommendController.java index 3caa83a..9d365f9 100644 --- a/recommend/src/main/java/com/ktds/hi/recommend/infra/controller/StoreRecommendController.java +++ b/recommend/src/main/java/com/ktds/hi/recommend/infra/controller/StoreRecommendController.java @@ -5,8 +5,8 @@ import com.ktds.hi.recommend.biz.usecase.in.StoreRecommendUseCase; import com.ktds.hi.recommend.infra.dto.request.RecommendStoreRequest; import com.ktds.hi.recommend.infra.dto.response.RecommendStoreResponse; import com.ktds.hi.recommend.infra.dto.response.StoreDetailResponse; -import com.ktds.hi.common.dto.response.ApiResponse; -import com.ktds.hi.common.dto.response.PageResponse; +import com.ktds.hi.common.dto.ApiResponse; +import com.ktds.hi.common.dto.PageResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/recommend/src/main/java/com/ktds/hi/recommend/infra/controller/TasteAnalysisController.java b/recommend/src/main/java/com/ktds/hi/recommend/infra/controller/TasteAnalysisController.java index 6798770..c5c847c 100644 --- a/recommend/src/main/java/com/ktds/hi/recommend/infra/controller/TasteAnalysisController.java +++ b/recommend/src/main/java/com/ktds/hi/recommend/infra/controller/TasteAnalysisController.java @@ -4,7 +4,7 @@ import com.ktds.hi.recommend.biz.usecase.in.TasteAnalysisUseCase; import com.ktds.hi.recommend.infra.dto.request.TasteUpdateRequest; import com.ktds.hi.recommend.infra.dto.response.TasteAnalysisResponse; import com.ktds.hi.recommend.infra.dto.response.PreferenceTagResponse; -import com.ktds.hi.common.dto.response.ApiResponse; +import com.ktds.hi.common.dto.ApiResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; @@ -45,12 +45,12 @@ public class TasteAnalysisController { */ @PostMapping("/update") @Operation(summary = "취향 프로필 업데이트", description = "사용자의 리뷰 데이터를 기반으로 취향 프로필을 업데이트합니다.") - public ResponseEntity> updateTasteProfile( + public ResponseEntity> updateTasteProfile( Authentication authentication, @Valid @RequestBody TasteUpdateRequest request) { Long memberId = Long.valueOf(authentication.getName()); - tasteAnalysisUseCase.updateTasteProfile(memberId, request); + tasteAnalysisUseCase.updateTasteProfile(memberId); return ResponseEntity.ok(ApiResponse.success("취향 프로필이 업데이트되었습니다")); }