[feat] 로그인 ArgumentResolver 추가 (#97)

* refactor: 패키지 구조 변경 (#96)

* refactor: 어드민 question API 클래스 분리

* feat: 로그인 ArgumentResolver 추가

* refactor: 어드민 question API 분리 원상태로 변경

* test: 워크플로우 실행 환경 확인을 위한 설정 추가

* chore: 테스트 컨테이너 reuse 옵션 추가

* chore: ci 테스트 h2 DB 설정

build.gradle

@@ -43,16 +43,16 @@ dependencies {
     implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
 
     // db
-    runtimeOnly 'com.h2database:h2'
+    runtimeOnly 'com.h2database:h2:1.4.200'
     runtimeOnly 'com.mysql:mysql-connector-j'
 
     // test
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'io.rest-assured:rest-assured'
 
     // test containers
-    testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.testcontainers:mysql'
+//    testImplementation 'org.testcontainers:junit-jupiter'
+//    testImplementation 'org.testcontainers:mysql'
 
     // api docs
     testImplementation 'org.springframework.restdocs:spring-restdocs-restassured'
@@ -65,6 +65,10 @@ dependencyManagement {
     }
 }
 
+test {
+    systemProperty "testcontainers.reuse.enable", "true"
+}
+
 tasks.named('test') {
     outputs.dir snippetsDir
     useJUnitPlatform()

src/main/java/donggi/dev/kkeuroolryo/auth/Auth.java

@@ -0,0 +1,12 @@
+package donggi.dev.kkeuroolryo.auth;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Auth {
+
+}

src/main/java/donggi/dev/kkeuroolryo/auth/LoginArgumentResolver.java

@@ -0,0 +1,58 @@
+package donggi.dev.kkeuroolryo.auth;
+
+import donggi.dev.kkeuroolryo.auth.application.AuthExtractor;
+import donggi.dev.kkeuroolryo.auth.application.dto.AuthPayload;
+import donggi.dev.kkeuroolryo.common.exception.BadRequestException;
+import donggi.dev.kkeuroolryo.common.exception.ErrorCodeAndMessage;
+import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.core.MethodParameter;
+import org.springframework.http.HttpHeaders;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.support.WebDataBinderFactory;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.method.support.ModelAndViewContainer;
+
+@Component
+public class LoginArgumentResolver implements HandlerMethodArgumentResolver {
+
+    private static final String BEARER_TYPE = "Bearer ";
+
+    private final AuthExtractor authExtractor;
+
+    public LoginArgumentResolver(final AuthExtractor authExtractor) {
+        this.authExtractor = authExtractor;
+    }
+
+    @Override
+    public boolean supportsParameter(final MethodParameter parameter) {
+        return parameter.getParameterType().equals(Long.class) &&
+            parameter.hasParameterAnnotation(Auth.class);
+    }
+
+    @Override
+    public Object resolveArgument(
+        final MethodParameter parameter,
+        final ModelAndViewContainer mavContainer,
+        final NativeWebRequest webRequest,
+        final WebDataBinderFactory binderFactory
+    ) {
+        final HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class);
+
+        if (request == null) {
+            throw new BadRequestException(ErrorCodeAndMessage.INVALID_REQUEST);
+        }
+
+        final String accessToken = extractAccessToken(request.getHeader(HttpHeaders.AUTHORIZATION));
+        final AuthPayload authPayload = authExtractor.extract(accessToken);
+        return authPayload.id();
+    }
+
+    private String extractAccessToken(final String header) {
+        if (header != null && header.startsWith(BEARER_TYPE)) {
+            return header.substring(BEARER_TYPE.length()).trim();
+        }
+
+        throw new BadRequestException(ErrorCodeAndMessage.INVALID_AUTH_TOKEN);
+    }
+}

src/main/java/donggi/dev/kkeuroolryo/auth/application/AuthExtractor.java

@@ -0,0 +1,8 @@
+package donggi.dev.kkeuroolryo.auth.application;
+
+import donggi.dev.kkeuroolryo.auth.application.dto.AuthPayload;
+
+public interface AuthExtractor {
+
+    AuthPayload extract(String token);
+}

src/main/java/donggi/dev/kkeuroolryo/auth/application/dto/AuthPayload.java

@@ -0,0 +1,8 @@
+package donggi.dev.kkeuroolryo.auth.application.dto;
+
+public record AuthPayload(
+//    String role,
+    Long id
+) {
+
+}

src/main/java/donggi/dev/kkeuroolryo/auth/config/AuthConfig.java

@@ -0,0 +1,22 @@
+package donggi.dev.kkeuroolryo.auth.config;
+
+import donggi.dev.kkeuroolryo.auth.application.AuthExtractor;
+import donggi.dev.kkeuroolryo.auth.infrastructure.JwtAuthExtractor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class AuthConfig {
+
+    private final String secretKey;
+
+    public AuthConfig(@Value("${security.jwt.secret-key}") final String secretKey) {
+        this.secretKey = secretKey;
+    }
+
+    @Bean
+    public AuthExtractor authExtractor() {
+        return new JwtAuthExtractor(secretKey);
+    }
+}

src/main/java/donggi/dev/kkeuroolryo/auth/infrastructure/JwtAuthExtractor.java

@@ -0,0 +1,43 @@
+package donggi.dev.kkeuroolryo.auth.infrastructure;
+
+import donggi.dev.kkeuroolryo.auth.application.AuthExtractor;
+import donggi.dev.kkeuroolryo.auth.application.dto.AuthPayload;
+import donggi.dev.kkeuroolryo.common.exception.ErrorCodeAndMessage;
+import donggi.dev.kkeuroolryo.common.exception.UnauthorizedException;
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.ExpiredJwtException;
+import io.jsonwebtoken.JwtException;
+import io.jsonwebtoken.JwtParser;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.security.Keys;
+import java.nio.charset.StandardCharsets;
+import javax.crypto.SecretKey;
+
+public class JwtAuthExtractor implements AuthExtractor {
+
+    private final JwtParser parser;
+
+    public JwtAuthExtractor(final String secretKey) {
+        SecretKey key = Keys.hmacShaKeyFor(secretKey.getBytes(StandardCharsets.UTF_8));
+        this.parser = Jwts.parserBuilder()
+            .setSigningKey(key)
+            .build();
+    }
+
+    @Override
+    public AuthPayload extract(final String token) {
+        final Claims claims = getClaims(token);
+        return new AuthPayload(Long.parseLong(claims.getSubject()));
+    }
+
+    private Claims getClaims(final String token) {
+        try {
+            return parser.parseClaimsJws(token)
+                .getBody();
+        } catch (ExpiredJwtException e) {
+            throw new UnauthorizedException(ErrorCodeAndMessage.EXPIRED_TOKEN);
+        } catch (JwtException e) {
+            throw new UnauthorizedException(ErrorCodeAndMessage.INVALID_TOKEN);
+        }
+    }
+}

src/main/java/donggi/dev/kkeuroolryo/core/comment/application/CommentEditor.java → src/main/java/donggi/dev/kkeuroolryo/comment/application/CommentEditor.java

@@ -1,7 +1,7 @@
-package donggi.dev.kkeuroolryo.core.comment.application;
+package donggi.dev.kkeuroolryo.comment.application;
 
-import donggi.dev.kkeuroolryo.core.comment.application.dto.CommentDto;
-import donggi.dev.kkeuroolryo.web.comment.dto.CommentRegisterDto;
+import donggi.dev.kkeuroolryo.comment.application.dto.CommentDto;
+import donggi.dev.kkeuroolryo.comment.presentation.dto.CommentRegisterDto;
 
 public interface CommentEditor {
 

src/main/java/donggi/dev/kkeuroolryo/core/comment/application/CommentFinder.java → src/main/java/donggi/dev/kkeuroolryo/comment/application/CommentFinder.java

@@ -1,7 +1,7 @@
-package donggi.dev.kkeuroolryo.core.comment.application;
+package donggi.dev.kkeuroolryo.comment.application;
 
-import donggi.dev.kkeuroolryo.core.comment.application.dto.CommentPaginationDto;
-import donggi.dev.kkeuroolryo.web.comment.dto.NoOffsetPageCommand;
+import donggi.dev.kkeuroolryo.comment.application.dto.CommentPaginationDto;
+import donggi.dev.kkeuroolryo.comment.presentation.dto.NoOffsetPageCommand;
 
 public interface CommentFinder {
 

src/main/java/donggi/dev/kkeuroolryo/core/comment/application/CommentService.java → src/main/java/donggi/dev/kkeuroolryo/comment/application/CommentService.java

@@ -1,15 +1,15 @@
-package donggi.dev.kkeuroolryo.core.comment.application;
-
-import donggi.dev.kkeuroolryo.core.comment.application.dto.CommentDto;
-import donggi.dev.kkeuroolryo.core.comment.application.dto.CommentPaginationDto;
-import donggi.dev.kkeuroolryo.core.comment.domain.Comment;
-import donggi.dev.kkeuroolryo.core.comment.domain.CommentRepository;
-import donggi.dev.kkeuroolryo.core.comment.domain.exception.CommentNotFoundException;
-import donggi.dev.kkeuroolryo.core.comment.domain.exception.NoOffsetPageInvalidException;
-import donggi.dev.kkeuroolryo.core.question.domain.QuestionRepository;
-import donggi.dev.kkeuroolryo.core.question.domain.exception.QuestionNotFoundException;
-import donggi.dev.kkeuroolryo.web.comment.dto.CommentRegisterDto;
-import donggi.dev.kkeuroolryo.web.comment.dto.NoOffsetPageCommand;
+package donggi.dev.kkeuroolryo.comment.application;
+
+import donggi.dev.kkeuroolryo.comment.application.dto.CommentDto;
+import donggi.dev.kkeuroolryo.comment.application.dto.CommentPaginationDto;
+import donggi.dev.kkeuroolryo.comment.domain.Comment;
+import donggi.dev.kkeuroolryo.comment.domain.CommentRepository;
+import donggi.dev.kkeuroolryo.comment.domain.exception.CommentNotFoundException;
+import donggi.dev.kkeuroolryo.comment.domain.exception.NoOffsetPageInvalidException;
+import donggi.dev.kkeuroolryo.question.domain.QuestionRepository;
+import donggi.dev.kkeuroolryo.question.domain.exception.QuestionNotFoundException;
+import donggi.dev.kkeuroolryo.comment.presentation.dto.CommentRegisterDto;
+import donggi.dev.kkeuroolryo.comment.presentation.dto.NoOffsetPageCommand;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;

src/main/java/donggi/dev/kkeuroolryo/core/comment/application/dto/CommentDto.java → src/main/java/donggi/dev/kkeuroolryo/comment/application/dto/CommentDto.java

@@ -1,6 +1,6 @@
-package donggi.dev.kkeuroolryo.core.comment.application.dto;
+package donggi.dev.kkeuroolryo.comment.application.dto;
 
-import donggi.dev.kkeuroolryo.core.comment.domain.Comment;
+import donggi.dev.kkeuroolryo.comment.domain.Comment;
 import lombok.Getter;
 
 @Getter

src/main/java/donggi/dev/kkeuroolryo/core/comment/application/dto/CommentPaginationDto.java → src/main/java/donggi/dev/kkeuroolryo/comment/application/dto/CommentPaginationDto.java

@@ -1,7 +1,7 @@
-package donggi.dev.kkeuroolryo.core.comment.application.dto;
+package donggi.dev.kkeuroolryo.comment.application.dto;
 
-import donggi.dev.kkeuroolryo.core.comment.domain.Comment;
-import donggi.dev.kkeuroolryo.core.common.PageDto;
+import donggi.dev.kkeuroolryo.comment.domain.Comment;
+import donggi.dev.kkeuroolryo.common.PageDto;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;

src/main/java/donggi/dev/kkeuroolryo/core/comment/domain/Comment.java → src/main/java/donggi/dev/kkeuroolryo/comment/domain/Comment.java

@@ -1,7 +1,7 @@
-package donggi.dev.kkeuroolryo.core.comment.domain;
+package donggi.dev.kkeuroolryo.comment.domain;
 
-import donggi.dev.kkeuroolryo.core.comment.domain.exception.CommentUnauthorizedException;
-import donggi.dev.kkeuroolryo.web.comment.dto.CommentRegisterDto;
+import donggi.dev.kkeuroolryo.comment.domain.exception.CommentUnauthorizedException;
+import donggi.dev.kkeuroolryo.comment.presentation.dto.CommentRegisterDto;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;

src/main/java/donggi/dev/kkeuroolryo/core/comment/domain/CommentContent.java → src/main/java/donggi/dev/kkeuroolryo/comment/domain/CommentContent.java

@@ -1,6 +1,6 @@
-package donggi.dev.kkeuroolryo.core.comment.domain;
+package donggi.dev.kkeuroolryo.comment.domain;
 
-import donggi.dev.kkeuroolryo.core.comment.domain.exception.CommentInvalidContentException;
+import donggi.dev.kkeuroolryo.comment.domain.exception.CommentInvalidContentException;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import java.util.Objects;

src/main/java/donggi/dev/kkeuroolryo/core/comment/domain/CommentPassword.java → src/main/java/donggi/dev/kkeuroolryo/comment/domain/CommentPassword.java

@@ -1,6 +1,6 @@
-package donggi.dev.kkeuroolryo.core.comment.domain;
+package donggi.dev.kkeuroolryo.comment.domain;
 
-import donggi.dev.kkeuroolryo.core.comment.domain.exception.CommentInvalidPasswordException;
+import donggi.dev.kkeuroolryo.comment.domain.exception.CommentInvalidPasswordException;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import java.util.Objects;

src/main/java/donggi/dev/kkeuroolryo/core/comment/domain/CommentRepository.java → src/main/java/donggi/dev/kkeuroolryo/comment/domain/CommentRepository.java

@@ -1,4 +1,4 @@
-package donggi.dev.kkeuroolryo.core.comment.domain;
+package donggi.dev.kkeuroolryo.comment.domain;
 
 import java.util.Optional;
 import org.springframework.data.domain.Pageable;

src/main/java/donggi/dev/kkeuroolryo/core/comment/domain/CommentUsername.java → src/main/java/donggi/dev/kkeuroolryo/comment/domain/CommentUsername.java

@@ -1,6 +1,6 @@
-package donggi.dev.kkeuroolryo.core.comment.domain;
+package donggi.dev.kkeuroolryo.comment.domain;
 
-import donggi.dev.kkeuroolryo.core.comment.domain.exception.CommentInvalidUsernameException;
+import donggi.dev.kkeuroolryo.comment.domain.exception.CommentInvalidUsernameException;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import java.util.Objects;

src/main/java/donggi/dev/kkeuroolryo/core/comment/domain/exception/CommentInvalidContentException.java → src/main/java/donggi/dev/kkeuroolryo/comment/domain/exception/CommentInvalidContentException.java

@@ -1,4 +1,4 @@
-package donggi.dev.kkeuroolryo.core.comment.domain.exception;
+package donggi.dev.kkeuroolryo.comment.domain.exception;
 
 import donggi.dev.kkeuroolryo.common.exception.ErrorCodeAndMessage;
 import donggi.dev.kkeuroolryo.common.exception.GolrabaException;

src/main/java/donggi/dev/kkeuroolryo/core/comment/domain/exception/CommentInvalidPasswordException.java → src/main/java/donggi/dev/kkeuroolryo/comment/domain/exception/CommentInvalidPasswordException.java

@@ -1,4 +1,4 @@
-package donggi.dev.kkeuroolryo.core.comment.domain.exception;
+package donggi.dev.kkeuroolryo.comment.domain.exception;
 
 import donggi.dev.kkeuroolryo.common.exception.ErrorCodeAndMessage;
 import donggi.dev.kkeuroolryo.common.exception.GolrabaException;

src/main/java/donggi/dev/kkeuroolryo/core/comment/domain/exception/CommentInvalidUsernameException.java → src/main/java/donggi/dev/kkeuroolryo/comment/domain/exception/CommentInvalidUsernameException.java

@@ -1,4 +1,4 @@
-package donggi.dev.kkeuroolryo.core.comment.domain.exception;
+package donggi.dev.kkeuroolryo.comment.domain.exception;
 
 import donggi.dev.kkeuroolryo.common.exception.ErrorCodeAndMessage;
 import donggi.dev.kkeuroolryo.common.exception.GolrabaException;

src/main/java/donggi/dev/kkeuroolryo/core/comment/domain/exception/CommentNotFoundException.java → src/main/java/donggi/dev/kkeuroolryo/comment/domain/exception/CommentNotFoundException.java

@@ -1,4 +1,4 @@
-package donggi.dev.kkeuroolryo.core.comment.domain.exception;
+package donggi.dev.kkeuroolryo.comment.domain.exception;
 
 import donggi.dev.kkeuroolryo.common.exception.ErrorCodeAndMessage;
 import donggi.dev.kkeuroolryo.common.exception.GolrabaException;

src/main/java/donggi/dev/kkeuroolryo/core/comment/domain/exception/CommentUnauthorizedException.java → src/main/java/donggi/dev/kkeuroolryo/comment/domain/exception/CommentUnauthorizedException.java

@@ -1,4 +1,4 @@
-package donggi.dev.kkeuroolryo.core.comment.domain.exception;
+package donggi.dev.kkeuroolryo.comment.domain.exception;
 
 import donggi.dev.kkeuroolryo.common.exception.ErrorCodeAndMessage;
 import donggi.dev.kkeuroolryo.common.exception.GolrabaException;

src/main/java/donggi/dev/kkeuroolryo/core/comment/domain/exception/NoOffsetPageInvalidException.java → src/main/java/donggi/dev/kkeuroolryo/comment/domain/exception/NoOffsetPageInvalidException.java

@@ -1,4 +1,4 @@
-package donggi.dev.kkeuroolryo.core.comment.domain.exception;
+package donggi.dev.kkeuroolryo.comment.domain.exception;
 
 import donggi.dev.kkeuroolryo.common.exception.ErrorCodeAndMessage;
 import donggi.dev.kkeuroolryo.common.exception.GolrabaException;

src/main/java/donggi/dev/kkeuroolryo/core/comment/infrastructure/CommentJpaRepository.java → src/main/java/donggi/dev/kkeuroolryo/comment/infrastructure/CommentJpaRepository.java

@@ -1,8 +1,8 @@
-package donggi.dev.kkeuroolryo.core.comment.infrastructure;
+package donggi.dev.kkeuroolryo.comment.infrastructure;
 
-import donggi.dev.kkeuroolryo.core.comment.domain.Comment;
-import donggi.dev.kkeuroolryo.core.comment.domain.CommentRepository;
-import donggi.dev.kkeuroolryo.core.comment.domain.exception.CommentNotFoundException;
+import donggi.dev.kkeuroolryo.comment.domain.Comment;
+import donggi.dev.kkeuroolryo.comment.domain.CommentRepository;
+import donggi.dev.kkeuroolryo.comment.domain.exception.CommentNotFoundException;
 import java.util.Optional;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;

src/main/java/donggi/dev/kkeuroolryo/web/comment/CommentRestController.java → src/main/java/donggi/dev/kkeuroolryo/comment/presentation/CommentRestController.java

@@ -1,13 +1,13 @@
-package donggi.dev.kkeuroolryo.web.comment;
+package donggi.dev.kkeuroolryo.comment.presentation;
 
 import donggi.dev.kkeuroolryo.common.response.ApiResponse;
-import donggi.dev.kkeuroolryo.core.comment.application.CommentEditor;
-import donggi.dev.kkeuroolryo.core.comment.application.CommentFinder;
-import donggi.dev.kkeuroolryo.core.comment.application.dto.CommentDto;
-import donggi.dev.kkeuroolryo.core.comment.application.dto.CommentPaginationDto;
-import donggi.dev.kkeuroolryo.web.comment.dto.CommentDeleteCommand;
-import donggi.dev.kkeuroolryo.web.comment.dto.CommentRegisterDto;
-import donggi.dev.kkeuroolryo.web.comment.dto.NoOffsetPageCommand;
+import donggi.dev.kkeuroolryo.comment.application.CommentEditor;
+import donggi.dev.kkeuroolryo.comment.application.CommentFinder;
+import donggi.dev.kkeuroolryo.comment.application.dto.CommentDto;
+import donggi.dev.kkeuroolryo.comment.application.dto.CommentPaginationDto;
+import donggi.dev.kkeuroolryo.comment.presentation.dto.CommentDeleteCommand;
+import donggi.dev.kkeuroolryo.comment.presentation.dto.CommentRegisterDto;
+import donggi.dev.kkeuroolryo.comment.presentation.dto.NoOffsetPageCommand;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/donggi/dev/kkeuroolryo/web/comment/dto/CommentDeleteCommand.java → src/main/java/donggi/dev/kkeuroolryo/comment/presentation/dto/CommentDeleteCommand.java

@@ -1,4 +1,4 @@
-package donggi.dev.kkeuroolryo.web.comment.dto;
+package donggi.dev.kkeuroolryo.comment.presentation.dto;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/donggi/dev/kkeuroolryo/web/comment/dto/CommentRegisterDto.java → src/main/java/donggi/dev/kkeuroolryo/comment/presentation/dto/CommentRegisterDto.java

@@ -1,6 +1,6 @@
-package donggi.dev.kkeuroolryo.web.comment.dto;
+package donggi.dev.kkeuroolryo.comment.presentation.dto;
 
-import donggi.dev.kkeuroolryo.core.comment.domain.Comment;
+import donggi.dev.kkeuroolryo.comment.domain.Comment;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 

src/main/java/donggi/dev/kkeuroolryo/web/comment/dto/NoOffsetPageCommand.java → src/main/java/donggi/dev/kkeuroolryo/comment/presentation/dto/NoOffsetPageCommand.java

@@ -1,6 +1,6 @@
-package donggi.dev.kkeuroolryo.web.comment.dto;
+package donggi.dev.kkeuroolryo.comment.presentation.dto;
 
-import donggi.dev.kkeuroolryo.core.comment.domain.exception.NoOffsetPageInvalidException;
+import donggi.dev.kkeuroolryo.comment.domain.exception.NoOffsetPageInvalidException;
 import lombok.Getter;
 
 @Getter