Merge branch 'develop' into CLAP-118

Author: Sihun23

.github/workflows/dev-cd.yml

@@ -62,4 +62,7 @@ jobs:
           script: |
             docker rm -f taskflow
             docker image rm ${{ secrets.DOCKER_REPO }} -f
-            docker run --name taskflow -d -p 9090:9090 ${{ secrets.DOCKER_REPO }} --restart on-failure
+            docker run --name taskflow -d -p 9090:9090 \
+              --env-file /home/ubuntu/.env \
+              ${{ secrets.DOCKER_REPO }} \
+              --restart on-failure

.github/workflows/dev-ci.yml

@@ -13,7 +13,6 @@ permissions:
 
 jobs:
   DEV_CI:
-    if: github.event.action == 'opened' || github.event.action == 'synchronize'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -22,7 +21,9 @@ jobs:
         with:
           java-version: '17'
           distribution: 'temurin' # https://github.com/actions/setup-java
-
+      - run: touch ./src/test/resources/application.yml
+      - run: echo "${{ secrets.S3_PROPERTIES }}" > ./src/test/resources/application.yml
+      
       # gradle caching - 빌드 시간 향상
       - name: Gradle Caching
         uses: actions/cache@v4

build.gradle

@@ -24,7 +24,9 @@ repositories {
 }
 
 dependencies {
+    implementation 'org.springframework.boot:spring-boot-starter'
     implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter'
 
     //ElasticSearch
     implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
@@ -90,9 +92,21 @@ dependencies {
     // Email Sender
     implementation 'org.springframework.boot:spring-boot-starter-mail'
 
+    // Thymeleaf
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+
     // Spring aop
     implementation 'org.springframework.boot:spring-boot-starter-aop'
 
+    // S3
+    implementation platform('software.amazon.awssdk:bom:2.23.7')
+    implementation 'software.amazon.awssdk:s3'
+    implementation 'ch.qos.logback:logback-classic:1.4.12'
+
+    // Apache Tika
+    implementation 'org.apache.tika:tika-core:2.9.0'
+    implementation 'org.apache.tika:tika-parsers:2.9.0'
+
 }
 
 tasks.named('test') {

src/main/java/clap/server/adapter/inbound/security/LoginAttemptFilter.java

@@ -2,7 +2,7 @@
 
 import clap.server.application.service.auth.LoginAttemptService;
 import clap.server.exception.AuthException;
-import clap.server.exception.code.CommonErrorCode;
+import clap.server.exception.code.GlobalErrorCode;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
@@ -35,7 +35,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
         if (request.getRequestURI().equals(LOGIN_ENDPOINT)) {
             if (sessionId == null) {
-                throw new AuthException(CommonErrorCode.BAD_REQUEST);
+                throw new AuthException(GlobalErrorCode.BAD_REQUEST);
             }
             loginAttemptService.checkAccountIsLocked(sessionId);
         }

src/main/java/clap/server/adapter/inbound/security/filter/JwtAuthenticationFilter.java

@@ -2,6 +2,7 @@
 
 import clap.server.adapter.outbound.jwt.JwtClaims;
 import clap.server.adapter.outbound.jwt.access.AccessTokenClaimKeys;
+import clap.server.application.port.outbound.auth.ForbiddenTokenPort;
 import clap.server.application.port.outbound.auth.JwtProvider;
 import clap.server.exception.JwtException;
 import clap.server.exception.code.AuthErrorCode;
@@ -27,7 +28,6 @@
 
 import java.io.IOException;
 
-// 요청에서 JWT 토큰을 추출하고 유효성을 검사합니다.
 @Slf4j
 @Component
 @RequiredArgsConstructor
@@ -37,6 +37,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
     private final JwtProvider accessTokenProvider;
     private final JwtProvider temporaryTokenProvider;
     private final AccessDeniedHandler accessDeniedHandler;
+    private final ForbiddenTokenPort forbiddenTokenPort;
 
     @Override
     protected void doFilterInternal(
@@ -70,15 +71,15 @@ private String resolveAccessToken(
             HttpServletRequest request
     ) throws ServletException {
         String authHeader = request.getHeader(HttpHeaders.AUTHORIZATION);
-        String token = accessTokenProvider.resolveToken(authHeader);
+        String accessToken = accessTokenProvider.resolveToken(authHeader);
 
-        if (!StringUtils.hasText(token)) {
+        if (!StringUtils.hasText(accessToken)) {
             log.error("EMPTY_ACCESS_TOKEN");
             handleAuthException(AuthErrorCode.EMPTY_ACCESS_KEY);
         }
 
         String requestUrl = request.getRequestURI();
-        boolean isTemporaryToken = isTemporaryToken(token);
+        boolean isTemporaryToken = isTemporaryToken(accessToken);
         JwtProvider tokenProvider = isTemporaryToken ? temporaryTokenProvider : accessTokenProvider;
 
         log.info("Token is Temporary {}", isTemporaryToken);
@@ -88,14 +89,17 @@ private String resolveAccessToken(
             handleAuthException(AuthErrorCode.FORBIDDEN_ACCESS_TOKEN);
         }
 
-        // TODO: 블랙리스트 토큰 처리 로직 추가 필요
+        if (forbiddenTokenPort.getIsForbidden(accessToken)) {
+            log.error("FORBIDDEN_ACCESS_TOKEN");
+            handleAuthException(AuthErrorCode.FORBIDDEN_ACCESS_TOKEN);
+        }
 
-        if (tokenProvider.isTokenExpired(token)) {
+        if (tokenProvider.isTokenExpired(accessToken)) {
             log.error("EXPIRED_TOKEN");
             handleAuthException(AuthErrorCode.EXPIRED_TOKEN);
         }
 
-        return token;
+        return accessToken;
     }
 
 

src/main/java/clap/server/adapter/inbound/security/filter/JwtErrorCodeUtil.java

@@ -2,7 +2,7 @@
 import clap.server.exception.JwtException;
 import clap.server.exception.code.AuthErrorCode;
 import clap.server.exception.code.BaseErrorCode;
-import clap.server.exception.code.CommonErrorCode;
+import clap.server.exception.code.GlobalErrorCode;
 import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.MalformedJwtException;
 import io.jsonwebtoken.UnsupportedJwtException;
@@ -36,7 +36,7 @@ public static BaseErrorCode determineErrorCode(Exception exception, BaseErrorCod
     public static JwtException determineAuthErrorException(Exception exception) {
         return findAuthErrorException(exception).orElseGet(
                 () -> {
-                    BaseErrorCode errorCode = determineErrorCode(exception, CommonErrorCode.INTERNAL_SERVER_ERROR);
+                    BaseErrorCode errorCode = determineErrorCode(exception, GlobalErrorCode.INTERNAL_SERVER_ERROR);
                     log.debug(exception.getMessage(), exception);
                     return new JwtException(errorCode);
                 }

src/main/java/clap/server/adapter/inbound/web/admin/AddCategoryController.java

@@ -1,10 +1,9 @@
 package clap.server.adapter.inbound.web.admin;
 
 import clap.server.adapter.inbound.security.SecurityUserDetails;
-import clap.server.adapter.inbound.web.dto.AddSubCategoryRequest;
 import clap.server.adapter.inbound.web.dto.admin.AddMainCategoryRequest;
-import clap.server.application.port.inbound.management.AddMainCategoryUsecase;
-import clap.server.application.port.inbound.management.AddSubCategoryUsecase;
+import clap.server.adapter.inbound.web.dto.admin.AddSubCategoryRequest;
+import clap.server.application.port.inbound.admin.AddCategoryUsecase;
 import clap.server.common.annotation.architecture.WebAdapter;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -14,26 +13,27 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 
-@Tag(name = "카테고리 추가")
+@Tag(name = "05. Admin")
 @WebAdapter
 @RequiredArgsConstructor
+@RequestMapping("/api/managements")
 public class AddCategoryController {
-    private final AddMainCategoryUsecase addMainCategoryUsecase;
-    private final AddSubCategoryUsecase addSubCategoryUsecase;
+    private final AddCategoryUsecase addCategoryUsecase;
 
     @Operation(summary = "1차 카테고리 추가")
-    @PostMapping("/api/maincategory")
+    @PostMapping("/main-category")
     @Secured("ROLE_ADMIN")
     public void addMainCategory(@AuthenticationPrincipal SecurityUserDetails userInfo, @Valid @RequestBody AddMainCategoryRequest addMainCategoryRequest) {
-        addMainCategoryUsecase.addMainCategory(userInfo.getUserId(), addMainCategoryRequest.code(), addMainCategoryRequest.name());
+        addCategoryUsecase.addMainCategory(userInfo.getUserId(), addMainCategoryRequest.code(), addMainCategoryRequest.name());
     }
 
     @Operation(summary = "2차 카테고리 추가")
-    @PostMapping("/api/subcategory")
+    @PostMapping("/sub-category")
     @Secured("ROLE_ADMIN")
     public void addSubCategory(@AuthenticationPrincipal SecurityUserDetails userInfo, @Valid @RequestBody AddSubCategoryRequest addCategoryRequest) {
-        addSubCategoryUsecase.addSubCategory(userInfo.getUserId(), addCategoryRequest.mainCategoryId(), addCategoryRequest.code(), addCategoryRequest.name());
+        addCategoryUsecase.addSubCategory(userInfo.getUserId(), addCategoryRequest.mainCategoryId(), addCategoryRequest.code(), addCategoryRequest.name());
     }
 
 }

src/main/java/clap/server/adapter/inbound/web/admin/DeleteCategoryController.java

@@ -0,0 +1,28 @@
+package clap.server.adapter.inbound.web.admin;
+
+import clap.server.adapter.inbound.security.SecurityUserDetails;
+import clap.server.application.port.inbound.admin.DeleteCategoryUsecase;
+import clap.server.common.annotation.architecture.WebAdapter;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Tag(name = "05. Admin")
+@WebAdapter
+@RequiredArgsConstructor
+@RequestMapping("/api/managements")
+public class DeleteCategoryController {
+    private final DeleteCategoryUsecase deleteCategoryUsecase;
+
+    @Operation(summary = "카테고리 삭제")
+    @DeleteMapping("/categories/{categoryId}")
+    @Secured("ROLE_ADMIN")
+    public void deleteCategory(@AuthenticationPrincipal SecurityUserDetails userInfo, @PathVariable Long categoryId) {
+        deleteCategoryUsecase.deleteCategory(userInfo.getUserId(), categoryId);
+    }
+}

src/main/java/clap/server/adapter/inbound/web/admin/DeleteMemberController.java

@@ -0,0 +1,26 @@
+package clap.server.adapter.inbound.web.admin;
+
+import clap.server.application.port.inbound.admin.DeleteMemberUsecase;
+import clap.server.common.annotation.architecture.WebAdapter;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Tag(name = "05. Admin")
+@WebAdapter
+@RequiredArgsConstructor
+@RequestMapping("/api/managements")
+public class DeleteMemberController {
+    private final DeleteMemberUsecase deleteMemberUsecase;
+
+    @Operation(summary = "회원 삭제 API")
+    @Secured("ROLE_ADMIN")
+    @PatchMapping("/members/{memberId}")
+    public void deleteMember(@PathVariable Long memberId) {
+        deleteMemberUsecase.deleteMember(memberId);
+    }
+}

src/main/java/clap/server/adapter/inbound/web/admin/FindCategoryController.java

@@ -0,0 +1,45 @@
+package clap.server.adapter.inbound.web.admin;
+
+import clap.server.adapter.inbound.web.dto.admin.FindAllCategoryResponse;
+import clap.server.adapter.inbound.web.dto.admin.FindMainCategoryResponse;
+import clap.server.adapter.inbound.web.dto.admin.FindSubCategoryResponse;
+import clap.server.application.port.inbound.admin.FindAllCategoryUsecase;
+import clap.server.application.port.inbound.admin.FindMainCategoryUsecase;
+import clap.server.application.port.inbound.admin.FindSubCategoryUsecase;
+import clap.server.common.annotation.architecture.WebAdapter;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.List;
+
+@Tag(name = "카테고리 조회")
+@WebAdapter
+@RequiredArgsConstructor
+@RequestMapping("/api")
+public class FindCategoryController {
+    private final FindAllCategoryUsecase findAllCategoryUsecase;
+    private final FindMainCategoryUsecase findmainCategoryUsecase;
+    private final FindSubCategoryUsecase findsubCategoryUsecase;
+
+    @Operation(summary = "모든 카테고리 조회")
+    @GetMapping("/category")
+    public ResponseEntity<List<FindAllCategoryResponse>> findAllCategory() {
+        return ResponseEntity.ok(findAllCategoryUsecase.findAllCategory());
+    }
+
+    @Operation(summary = "1차 카테고리 조회")
+    @GetMapping("/main-category")
+    public ResponseEntity<List<FindMainCategoryResponse>> findMainCategory() {
+        return ResponseEntity.ok(findmainCategoryUsecase.findMainCategory());
+    }
+
+    @Operation(summary = "2차 카테고리 조회")
+    @GetMapping("/sub-category")
+    public ResponseEntity<List<FindSubCategoryResponse>> findSubCategory() {
+        return ResponseEntity.ok(findsubCategoryUsecase.findSubCategory());
+    }
+}