Merge pull request #70 from taco-official/KL-163/프론트-요구사항-처리

fix(KL-163): handle isLiked error

src/main/java/taco/klkl/domain/product/service/ProductServiceImpl.java

@@ -138,7 +138,7 @@ public ProductDetailResponse createProduct(final ProductCreateUpdateRequest crea
 			Set<Tag> tags = createTagsByTagIds(createRequest.tagIds());
 			product.addTags(tags);
 		}
-		return ProductDetailResponse.from(product, false);
+		return productUtil.createProductDetailResponse(product);
 	}
 
 	@Override

src/main/java/taco/klkl/global/config/security/SecurityEndpoint.java

@@ -1,11 +1,15 @@
 package taco.klkl.global.config.security;
 
+import java.util.Arrays;
+
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.security.web.util.matcher.RequestMatcher;
 
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
+
 @Getter
 @RequiredArgsConstructor
 public enum SecurityEndpoint {
@@ -28,7 +32,6 @@ public enum SecurityEndpoint {
 		new AntPathRequestMatcher("/v1/login/**"),
 		new AntPathRequestMatcher("/v1/oauth2/**"),
 		new AntPathRequestMatcher("/v1/members/**"),
-		new AntPathRequestMatcher("/v1/products/**"),
 		new AntPathRequestMatcher("/v1/regions/**"),
 		new AntPathRequestMatcher("/v1/countries/**"),
 		new AntPathRequestMatcher("/v1/cities/**"),
@@ -43,7 +46,20 @@ public enum SecurityEndpoint {
 		new AntPathRequestMatcher("/v1/notifications/**"),
 		new AntPathRequestMatcher("/v1/logout/**"),
 	}),
+	BOTH(new RequestMatcher[]{
+		new AntPathRequestMatcher("/v1/products/**"),
+	}),
 	;
 
 	private final RequestMatcher[] matchers;
+
+	public static boolean isBothEndpoint(HttpServletRequest request) {
+		return Arrays.stream(BOTH.getMatchers())
+			.anyMatch(matcher -> matcher.matches(request));
+	}
+
+	public static boolean isPublicEndpoint(HttpServletRequest request) {
+		return Arrays.stream(PUBLIC.getMatchers())
+			.anyMatch(matcher -> matcher.matches(request));
+	}
 }

src/main/java/taco/klkl/global/config/security/TokenAuthenticationFilter.java

@@ -1,7 +1,6 @@
 package taco.klkl.global.config.security;
 
 import java.io.IOException;
-import java.util.Arrays;
 
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -18,6 +17,7 @@
 import taco.klkl.domain.token.exception.TokenExpiredException;
 import taco.klkl.domain.token.exception.TokenInvalidException;
 import taco.klkl.domain.token.service.TokenProvider;
+import taco.klkl.global.error.exception.CustomException;
 import taco.klkl.global.util.ResponseUtil;
 import taco.klkl.global.util.TokenUtil;
 
@@ -32,8 +32,8 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter {
 	@Override
 	protected boolean shouldNotFilter(HttpServletRequest request) throws ServletException {
 		if ("GET".equalsIgnoreCase(request.getMethod())) {
-			return Arrays.stream(SecurityEndpoint.PUBLIC.getMatchers())
-				.anyMatch(matcher -> matcher.matches(request));
+			return SecurityEndpoint.isPublicEndpoint(request)
+				&& !SecurityEndpoint.isBothEndpoint(request);
 		}
 		return false;
 	}
@@ -44,24 +44,28 @@ protected void doFilterInternal(
 		HttpServletResponse response,
 		FilterChain filterChain
 	) throws ServletException, IOException {
+		final String accessToken = tokenUtil.resolveToken(request);
+
+		if (accessToken == null && SecurityEndpoint.isBothEndpoint(request)) {
+			proceedWithoutAuthentication(request, response, filterChain);
+			return;
+		}
+
 		try {
-			String accessToken = tokenUtil.resolveToken(request);
 			if (tokenProvider.validateToken(accessToken)) {
 				setAuthentication(accessToken);
 			} else {
-				String reissueAccessToken = tokenProvider.reissueAccessToken(accessToken);
+				final String reissueAccessToken = tokenProvider.reissueAccessToken(accessToken);
 				if (StringUtils.hasText(reissueAccessToken)) {
 					setAuthentication(reissueAccessToken);
 					tokenUtil.addAccessTokenCookie(response, reissueAccessToken);
 				}
 			}
 		} catch (TokenInvalidException | TokenExpiredException e) {
-			SecurityContextHolder.clearContext();
-			responseUtil.sendErrorResponse(response, e);
+			handleTokenException(request, response, filterChain, e);
 			return;
 		} catch (Exception e) {
-			SecurityContextHolder.clearContext();
-			responseUtil.sendErrorResponse(response, new UnauthorizedException());
+			handleTokenException(request, response, filterChain, new UnauthorizedException());
 			return;
 		}
 
@@ -72,4 +76,26 @@ private void setAuthentication(final String accessToken) {
 		Authentication authentication = tokenProvider.getAuthentication(accessToken);
 		SecurityContextHolder.getContext().setAuthentication(authentication);
 	}
+
+	private void handleTokenException(
+		HttpServletRequest request,
+		HttpServletResponse response,
+		FilterChain filterChain,
+		CustomException ex
+	) throws IOException, ServletException {
+		SecurityContextHolder.clearContext();
+		if (SecurityEndpoint.isBothEndpoint(request)) {
+			proceedWithoutAuthentication(request, response, filterChain);
+		} else {
+			responseUtil.sendErrorResponse(response, ex);
+		}
+	}
+
+	private void proceedWithoutAuthentication(
+		HttpServletRequest request,
+		HttpServletResponse response,
+		FilterChain filterChain
+	) throws IOException, ServletException {
+		filterChain.doFilter(request, response);
+	}
 }

src/main/resources/application-h2.yaml

@@ -12,6 +12,8 @@ spring:
       hibernate:
         show_sql: true
         format_sql: true
+      jdbc:
+        time_zone: ${TZ}
   datasource:
     driver-class-name: org.h2.Driver
     url: jdbc:h2:mem:klkldb;MODE=MySQL

src/main/resources/application-mysql.yaml

@@ -10,11 +10,11 @@ spring:
   jpa:
     hibernate:
       ddl-auto: update
+    defer-datasource-initialization: true
     properties:
       hibernate:
         show_sql: true
         format_sql: true
-    defer-datasource-initialization: true
     database-platform: org.hibernate.dialect.MySQLDialect
   sql:
     init:

src/test/java/taco/klkl/domain/product/service/ProductServiceImplTest.java

@@ -425,6 +425,9 @@ void testCreateProduct() {
 			ReflectionTestUtils.setField(savedProduct, "id", 1L);
 			return savedProduct;
 		});
+		ProductDetailResponse mockResponse = mock(ProductDetailResponse.class);
+		when(mockResponse.id()).thenReturn(1L);
+		when(productUtil.createProductDetailResponse(any(Product.class))).thenReturn(mockResponse);
 
 		// When
 		ProductDetailResponse result = productService.createProduct(productCreateUpdateRequest);