refactor: 알림 Entity 구조 변경

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 ## #️⃣연관된 이슈
 
-#이슈번호 #done
+[CHZZ-이슈번호] #done
 
 ## 📝작업 내용
 

compose-local.yaml

@@ -0,0 +1,17 @@
+version: '3.8'
+services:
+  chzzdb:
+    image: mysql:latest
+    container_name: chzzdb
+    environment:
+      MYSQL_ROOT_PASSWORD: qal,1
+      MYSQL_DATABASE: chzzdb
+    ports:
+      - "3306:3306"
+
+  chzz-redis:
+    container_name: chzz-redis
+    image: redis:latest
+    restart: always
+    ports:
+      - "6379:6379"

nginx.conf

@@ -71,6 +71,15 @@
              proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
              proxy_set_header X-Forwarded-Proto $scheme;
          }
+
+         location /api/v1/notifications/subscribe {
+             proxy_pass http://app;
+             proxy_http_version 1.1;
+             proxy_set_header Connection '';
+             proxy_set_header Cache_Control 'no-cache';
+             chunked_transfer_encoding on;
+             proxy_read_timeout 3600s; // Nginx가 백엔드 서버로부터 데이터를 받지 못하는 동안 대기할 최대 시간, 이 시간 동안 데이터가 안오면 연결 끊음 (클라이언트에서 재연결 요청)
+         }
      }
  }
 

src/main/java/org/chzz/market/common/config/SecurityConfig.java

@@ -3,12 +3,16 @@
 import static org.springframework.http.HttpMethod.GET;
 import static org.springframework.http.HttpMethod.POST;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.Collections;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.chzz.market.common.error.handler.CustomAccessDeniedHandler;
 import org.chzz.market.common.error.handler.CustomAuthenticationEntryPoint;
 import org.chzz.market.common.error.handler.ExceptionHandlingFilter;
+import org.chzz.market.common.filter.NotFoundFilter;
 import org.chzz.market.common.filter.JWTFilter;
+import org.chzz.market.common.util.JWTUtil;
 import org.chzz.market.domain.user.oauth2.CustomFailureHandler;
 import org.chzz.market.domain.user.oauth2.CustomSuccessHandler;
 import org.chzz.market.domain.user.service.CustomOAuth2UserService;
@@ -25,6 +29,7 @@
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.servlet.HandlerMapping;
 
 @Configuration
 @EnableWebSecurity
@@ -40,8 +45,9 @@ public class SecurityConfig {
     private final CustomAuthenticationEntryPoint customAuthenticationEntryPoint;
     private final CustomSuccessHandler customSuccessHandler;
     private final CustomFailureHandler customFailureHandler;
-    private final JWTFilter jwtFilter;
-    private final ExceptionHandlingFilter exceptionHandlingFilter;
+    private final JWTUtil jwtUtil;
+    private final ObjectMapper objectMapper;
+    private final List<HandlerMapping> handlerMappings;
 
     @Bean
     public SecurityFilterChain filterChain(final HttpSecurity http) throws Exception {
@@ -79,8 +85,9 @@ public SecurityFilterChain filterChain(final HttpSecurity http) throws Exception
                         .successHandler(customSuccessHandler)
                         .failureHandler(customFailureHandler)
                 )
-                .addFilterBefore(jwtFilter, UsernamePasswordAuthenticationFilter.class)
-                .addFilterBefore(exceptionHandlingFilter, JWTFilter.class)
+                .addFilterBefore(new JWTFilter(jwtUtil), UsernamePasswordAuthenticationFilter.class)
+                .addFilterBefore(new NotFoundFilter(handlerMappings), JWTFilter.class)
+                .addFilterBefore(new ExceptionHandlingFilter(objectMapper), NotFoundFilter.class)
                 .sessionManagement(session -> session
                         .sessionCreationPolicy(SessionCreationPolicy.STATELESS))
                 .build();
@@ -90,7 +97,7 @@ public SecurityFilterChain filterChain(final HttpSecurity http) throws Exception
     public CorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration configuration = new CorsConfiguration();
         configuration.setAllowedOrigins(Collections.singletonList(clientUrl));
-        configuration.setAllowedMethods(Collections.singletonList("*"));
+        configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
         configuration.setAllowCredentials(true);
         configuration.setAllowedHeaders(Collections.singletonList("*"));
         configuration.setExposedHeaders(Collections.singletonList("Authorization"));

src/main/java/org/chzz/market/common/error/handler/ExceptionHandlingFilter.java

@@ -14,10 +14,8 @@
 import org.chzz.market.common.error.GlobalErrorCode;
 import org.chzz.market.common.error.GlobalException;
 import org.chzz.market.common.error.exception.BusinessException;
-import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-@Component
 @RequiredArgsConstructor
 @Slf4j
 public class ExceptionHandlingFilter extends OncePerRequestFilter {

src/main/java/org/chzz/market/common/filter/JWTFilter.java

@@ -1,5 +1,7 @@
 package org.chzz.market.common.filter;
 
+import static org.springframework.http.HttpMethod.POST;
+
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.Cookie;
@@ -17,10 +19,8 @@
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-@Component
 @RequiredArgsConstructor
 @Slf4j
 public class JWTFilter extends OncePerRequestFilter {
@@ -29,6 +29,13 @@ public class JWTFilter extends OncePerRequestFilter {
 
     private final JWTUtil jwtUtil;
 
+    @Override
+    protected boolean shouldNotFilter(HttpServletRequest request)
+            throws ServletException { // 해당 url에 대해서 필터를 적용 제외 (토큰 재발행)
+        return request.getRequestURI().equals("/api/v1/users/tokens/reissue") && request.getMethod()
+                .equals(POST.name());
+    }
+
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
             throws ServletException, IOException {
@@ -40,7 +47,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
             jwtUtil.validateToken(accessToken, TokenType.ACCESS);
             setAuthentication(accessToken);
             filterChain.doFilter(request, response);
-        } else if (tempCookie != null) {
+        } else if (isSignUpRequest(request) && tempCookie != null) {
             String tempToken = tempCookie.getValue();
             jwtUtil.validateToken(tempToken, TokenType.TEMP);
             setAuthentication(tempToken);
@@ -63,4 +70,8 @@ private void setAuthentication(String token) {
                 customUserDetails.getAuthorities());
         SecurityContextHolder.getContext().setAuthentication(authToken);
     }
+
+    private boolean isSignUpRequest(HttpServletRequest request) {
+        return request.getRequestURI().equals("/api/v1/users") && request.getMethod().equals(POST.name());
+    }
 }

src/main/java/org/chzz/market/common/filter/NotFoundFilter.java

@@ -0,0 +1,69 @@
+package org.chzz.market.common.filter;
+
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import org.chzz.market.common.error.GlobalErrorCode;
+import org.chzz.market.common.error.GlobalException;
+import org.springframework.web.filter.OncePerRequestFilter;
+import org.springframework.web.servlet.HandlerExecutionChain;
+import org.springframework.web.servlet.HandlerMapping;
+import org.springframework.web.servlet.resource.ResourceHttpRequestHandler;
+
+/**
+ *
+ */
+public class NotFoundFilter extends OncePerRequestFilter {
+
+    private final List<HandlerMapping> handlerMappings;
+    private final Map<String, HandlerExecutionChain> handlerCache = new ConcurrentHashMap<>();
+
+    public NotFoundFilter(List<HandlerMapping> handlerMappings) {
+        this.handlerMappings = handlerMappings;
+    }
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+            throws ServletException, IOException {
+
+        String requestUri = request.getRequestURI();
+
+        // 캐시에서 HandlerExecutionChain 검색 후 없으면 캐시 추가 (null 일 경우 map 추가 안함)
+        HandlerExecutionChain handlerChain = handlerCache.computeIfAbsent(requestUri, uri -> findHandler(request));
+
+        // 핸들러가 없으면 404 예외 처리
+        if (handlerChain == null) {
+            throw new GlobalException(GlobalErrorCode.RESOURCE_NOT_FOUND);
+        }
+
+        filterChain.doFilter(request, response);
+    }
+
+    /**
+     * 핸들러 매핑에서 HandlerExecutionChain을 검색하는 스트림 메서드
+     */
+    private HandlerExecutionChain findHandler(HttpServletRequest request) {
+        return handlerMappings.stream()
+                .map(handlerMapping -> getHandlerExecutionChain(handlerMapping, request))
+                .filter(chain -> chain != null
+                        && !(chain.getHandler() instanceof ResourceHttpRequestHandler)) // 정적 리소스 핸들러 제외
+                .findFirst()
+                .orElse(null);
+    }
+
+    /**
+     * 핸들러 매핑에서 HandlerExecutionChain을 가져옴
+     */
+    private HandlerExecutionChain getHandlerExecutionChain(HandlerMapping handlerMapping, HttpServletRequest request) {
+        try {
+            return handlerMapping.getHandler(request);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+}

src/main/java/org/chzz/market/common/util/CookieUtil.java

@@ -2,15 +2,20 @@
 
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.chzz.market.domain.token.entity.TokenType;
+import org.springframework.http.ResponseCookie;
 
 public class CookieUtil {
-    public static Cookie createTokenCookie(String token, TokenType tokenType) {
-        Cookie cookie = new Cookie(tokenType.name(), token);
-        cookie.setHttpOnly(true);
-        cookie.setMaxAge(tokenType.getExpirationTime());
-        cookie.setPath("/");
-        return cookie;
+    public static void createTokenCookie(HttpServletResponse response, String token, TokenType tokenType) {
+        ResponseCookie cookie = ResponseCookie.from(tokenType.name(), token)
+                .path("/")
+                .sameSite("None")
+                .httpOnly(true)
+                .secure(true)
+                .maxAge(tokenType.getExpirationTime())
+                .build();
+        response.addHeader("Set-Cookie", cookie.toString());
     }
 
     public static Cookie getCookieByName(HttpServletRequest request, String cookieName) {
@@ -25,11 +30,14 @@ public static Cookie getCookieByName(HttpServletRequest request, String cookieNa
         return null;
     }
 
-    public static Cookie expireCookie(String cookieName) {
-        Cookie cookie = new Cookie(cookieName, null);
-        cookie.setHttpOnly(true);
-        cookie.setMaxAge(0);
-        cookie.setPath("/");
-        return cookie;
+    public static void expireCookie(HttpServletResponse response, String cookieName) {
+        ResponseCookie cookie = ResponseCookie.from(cookieName, null)
+                .path("/")
+                .sameSite("None")
+                .httpOnly(true)
+                .secure(true)
+                .maxAge(0)
+                .build();
+        response.addHeader("Set-Cookie", cookie.toString());
     }
 }

src/main/java/org/chzz/market/common/validation/annotation/EnumValue.java

@@ -0,0 +1,19 @@
+package org.chzz.market.common.validation.annotation;
+
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import org.chzz.market.common.validation.validator.EnumValidator;
+
+@Constraint(validatedBy = EnumValidator.class)
+@Target({ ElementType.FIELD, ElementType.PARAMETER })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EnumValue {
+    Class<? extends Enum<?>> enumClass();
+    String message() default "Invalid value for enum field";
+    Class<?>[] groups() default {};
+    Class<? extends Payload>[] payload() default {};
+}

src/main/java/org/chzz/market/common/validation/validator/EnumValidator.java

@@ -0,0 +1,27 @@
+package org.chzz.market.common.validation.validator;
+
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import java.util.Arrays;
+import org.chzz.market.common.validation.annotation.EnumValue;
+
+public class EnumValidator implements ConstraintValidator<EnumValue, String> {
+    private EnumValue enumValue;
+
+    @Override
+    public void initialize(final EnumValue constraintAnnotation) {
+        this.enumValue = constraintAnnotation;
+    }
+
+    @Override
+    public boolean isValid(final String value, final ConstraintValidatorContext context) {
+        final Enum<?>[] enumConstants = this.enumValue.enumClass().getEnumConstants();
+        if (enumConstants == null) {
+            return false;
+        }
+
+        // Enum의 모든 상수들과 대소문자 구분 없이 비교
+        return Arrays.stream(enumValue.enumClass().getEnumConstants())
+                .anyMatch(enumConstant -> value.trim().equalsIgnoreCase(enumConstant.name()));
+    }
+}

src/main/java/org/chzz/market/common/validation/validator/ThousandMultipleValidator.java

@@ -4,10 +4,10 @@
 import jakarta.validation.ConstraintValidatorContext;
 import org.chzz.market.common.validation.annotation.ThousandMultiple;
 
-public class ThousandMultipleValidator implements ConstraintValidator<ThousandMultiple, Integer> {
+public class ThousandMultipleValidator implements ConstraintValidator<ThousandMultiple, Number> {
 
     @Override
-    public boolean isValid(Integer value, ConstraintValidatorContext context) {
-        return value != null && value % 1000 == 0 && value > 0;
+    public boolean isValid(Number value, ConstraintValidatorContext context) {
+        return value != null && value.longValue() > 0 && value.longValue() % 1000 == 0;
     }
 }

src/main/java/org/chzz/market/domain/auction/error/AuctionErrorCode.java

@@ -12,7 +12,6 @@
 @Getter
 @AllArgsConstructor
 public enum AuctionErrorCode implements ErrorCode {
-    AUCTION_NOT_ACCESSIBLE(BAD_REQUEST, "해당 경매를 조회할 수 없습니다. "),
     AUCTION_ENDED(BAD_REQUEST, "경매가 종료되었습니다."),
     AUCTION_NOT_FOUND(NOT_FOUND, "경매를 찾을 수 없습니다."),
     INVALID_AUCTION_STATE(BAD_REQUEST, "경매 상태가 유효하지 않습니다."),