dev to main

src/main/java/com/jobdri/jobdri_api/domain/analysis/service/core/AnalysisExecutionPayload.java → src/main/java/com/jobdri/jobdri_api/domain/analysis/application/model/AnalysisExecutionPayload.java

@@ -1,7 +1,7 @@
-package com.jobdri.jobdri_api.domain.analysis.service.core;
+package com.jobdri.jobdri_api.domain.analysis.application.model;
 
-import com.jobdri.jobdri_api.domain.analysis.dto.criteria.JobCategoryEvaluationCriteria;
-import com.jobdri.jobdri_api.domain.analysis.dto.worker.SimilarJobPostingContext;
+import com.jobdri.jobdri_api.domain.analysis.dto.internal.criteria.JobCategoryEvaluationCriteria;
+import com.jobdri.jobdri_api.domain.analysis.dto.internal.worker.SimilarJobPostingContext;
 import com.jobdri.jobdri_api.domain.analysis.entity.Question;
 import com.jobdri.jobdri_api.domain.corpus.service.CorpusRetrievalService.RetrievalContext;
 import com.jobdri.jobdri_api.domain.jobposting.entity.JobPosting;

src/main/java/com/jobdri/jobdri_api/domain/analysis/application/port/AnalysisGenerator.java

@@ -0,0 +1,8 @@
+package com.jobdri.jobdri_api.domain.analysis.application.port;
+
+import com.jobdri.jobdri_api.domain.analysis.dto.external.llm.AnalysisLlmResponse;
+import com.jobdri.jobdri_api.domain.analysis.application.model.AnalysisExecutionPayload;
+
+public interface AnalysisGenerator {
+    AnalysisLlmResponse analyze(AnalysisExecutionPayload payload);
+}

src/main/java/com/jobdri/jobdri_api/domain/analysis/application/usecase/async/AnalysisAsyncUseCase.java

@@ -0,0 +1,176 @@
+package com.jobdri.jobdri_api.domain.analysis.application.usecase.async;
+
+import com.jobdri.jobdri_api.domain.analysis.dto.response.AnalysisAsyncCancelResponse;
+import com.jobdri.jobdri_api.domain.analysis.dto.response.AnalysisAsyncStatusResponse;
+import com.jobdri.jobdri_api.domain.analysis.dto.response.AnalysisAsyncSubmitResponse;
+import com.jobdri.jobdri_api.domain.analysis.entity.AnalysisAsyncTask;
+import com.jobdri.jobdri_api.domain.analysis.service.async.AnalysisAsyncProcessor;
+import com.jobdri.jobdri_api.domain.analysis.service.async.AnalysisAsyncTaskService;
+import com.jobdri.jobdri_api.domain.analysis.service.core.AnalysisService;
+import com.jobdri.jobdri_api.domain.analysis.type.AnalysisAsyncFailureReason;
+import com.jobdri.jobdri_api.domain.user.entity.User;
+import com.jobdri.jobdri_api.domain.user.service.UserService;
+import com.jobdri.jobdri_api.global.apiPayload.code.GeneralErrorCode;
+import com.jobdri.jobdri_api.global.apiPayload.exception.GeneralException;
+import org.hibernate.exception.ConstraintViolationException;
+import org.springframework.dao.DataIntegrityViolationException;
+
+import java.util.Optional;
+
+// 분석 비동기 작업의 접수/조회/취소 유스케이스를 조율한다.
+public class AnalysisAsyncUseCase {
+    private static final String ACTIVE_TASK_UNIQUE_CONSTRAINT = "uk_analysis_async_tasks_active_user_mock_apply";
+
+    private final AnalysisAsyncTaskService analysisAsyncTaskService;
+    private final AnalysisAsyncProcessor analysisAsyncProcessor;
+    private final AnalysisService analysisService;
+    private final UserService userService;
+
+    public AnalysisAsyncUseCase(
+            AnalysisAsyncTaskService analysisAsyncTaskService,
+            AnalysisAsyncProcessor analysisAsyncProcessor,
+            AnalysisService analysisService,
+            UserService userService
+    ) {
+        this.analysisAsyncTaskService = analysisAsyncTaskService;
+        this.analysisAsyncProcessor = analysisAsyncProcessor;
+        this.analysisService = analysisService;
+        this.userService = userService;
+    }
+
+    public AnalysisAsyncSubmitResponse submit(User user, Long mockApplyId) {
+        User validatedUser = userService.validateUser(user);
+        analysisService.validateAnalysisRequest(validatedUser, mockApplyId);
+
+        return analysisAsyncTaskService.findActiveTask(validatedUser.getId(), mockApplyId)
+                .map(this::toInProgressResponse)
+                .orElseGet(() -> createCachedOrProcessTask(validatedUser, mockApplyId));
+    }
+
+    public AnalysisAsyncStatusResponse getTask(User user, Long mockApplyId, String taskId) {
+        User validatedUser = userService.validateUser(user);
+        AnalysisAsyncStatusResponse status = analysisAsyncTaskService.getTaskStatus(validatedUser.getId(), taskId);
+        if (!status.mockApplyId().equals(mockApplyId)) {
+            throw new GeneralException(GeneralErrorCode.FORBIDDEN, "요청한 mockApplyId와 작업 정보가 일치하지 않습니다.");
+        }
+        if (!"SUCCEEDED".equals(status.status())) {
+            return status;
+        }
+
+        return status.withResult(analysisService.getAnalysis(validatedUser, status.mockApplyId()));
+    }
+
+    public AnalysisAsyncCancelResponse cancel(User user, Long mockApplyId, String taskId) {
+        User validatedUser = userService.validateUser(user);
+        return analysisAsyncTaskService.cancelTask(validatedUser.getId(), mockApplyId, taskId);
+    }
+
+    private AnalysisAsyncSubmitResponse createCachedOrProcessTask(User user, Long mockApplyId) {
+        Optional<AnalysisAsyncTask> recoverableTask =
+                analysisAsyncTaskService.findRecoverablePublishFailureTask(user.getId(), mockApplyId);
+        if (recoverableTask.isPresent()) {
+            return reopenAndProcessTask(user, mockApplyId, recoverableTask.get());
+        }
+        if (analysisService.hasReusableAnalysis(user, mockApplyId)) {
+            return toCachedResponse();
+        }
+        return createAndProcessTask(user, mockApplyId);
+    }
+
+    private AnalysisAsyncSubmitResponse createAndProcessTask(User user, Long mockApplyId) {
+        PendingTaskResult pendingTaskResult = createPendingTask(user, mockApplyId);
+        if (!pendingTaskResult.created()) {
+            return toInProgressResponse(pendingTaskResult.task());
+        }
+
+        AnalysisAsyncTask task = pendingTaskResult.task();
+        return processTask(user, mockApplyId, task);
+    }
+
+    private AnalysisAsyncSubmitResponse reopenAndProcessTask(User user, Long mockApplyId, AnalysisAsyncTask task) {
+        AnalysisAsyncTaskService.ReopenPublishFailureResult reopenResult =
+                analysisAsyncTaskService.reopenPublishFailureTask(task.getTaskId());
+        if (!reopenResult.reopened()) {
+            return toInProgressResponse(reopenResult.task());
+        }
+        return processTask(user, mockApplyId, reopenResult.task());
+    }
+
+    private AnalysisAsyncSubmitResponse processTask(User user, Long mockApplyId, AnalysisAsyncTask task) {
+        String taskId = task.getTaskId();
+        try {
+            analysisAsyncProcessor.process(
+                    taskId,
+                    user.getId(),
+                    mockApplyId,
+                    task.getMaxRetryCount()
+            );
+            return new AnalysisAsyncSubmitResponse(
+                    taskId,
+                    "PENDING",
+                    "자소서 분석 비동기 작업이 접수되었습니다.",
+                    false,
+                    false
+            );
+        } catch (RuntimeException e) {
+            analysisAsyncTaskService.markFailed(
+                    taskId,
+                    AnalysisAsyncFailureReason.PUBLISH_FAILED,
+                    "자소서 분석 비동기 작업 발행에 실패했습니다.",
+                    task.getRetryCount()
+            );
+            throw e;
+        }
+    }
+
+    private PendingTaskResult createPendingTask(User user, Long mockApplyId) {
+        try {
+            return new PendingTaskResult(
+                    analysisAsyncTaskService.createPendingTask(user.getId(), mockApplyId),
+                    true
+            );
+        } catch (DataIntegrityViolationException e) {
+            if (!isActiveTaskUniqueConflict(e)) {
+                throw e;
+            }
+            AnalysisAsyncTask existingTask = analysisAsyncTaskService.findActiveTask(user.getId(), mockApplyId)
+                    .orElseThrow(() -> e);
+            return new PendingTaskResult(existingTask, false);
+        }
+    }
+
+    private AnalysisAsyncSubmitResponse toInProgressResponse(AnalysisAsyncTask task) {
+        return new AnalysisAsyncSubmitResponse(
+                task.getTaskId(),
+                task.getStatus().name(),
+                "이미 진행 중인 자소서 분석 작업이 있습니다.",
+                false,
+                false
+        );
+    }
+
+    private AnalysisAsyncSubmitResponse toCachedResponse() {
+        return new AnalysisAsyncSubmitResponse(
+                null,
+                "SUCCEEDED",
+                "동일 입력의 기존 자소서 분석 결과를 재사용했습니다.",
+                true,
+                true
+        );
+    }
+
+    private boolean isActiveTaskUniqueConflict(DataIntegrityViolationException exception) {
+        Throwable cause = exception;
+        while (cause != null) {
+            if (cause instanceof ConstraintViolationException constraintViolation
+                    && ACTIVE_TASK_UNIQUE_CONSTRAINT.equalsIgnoreCase(constraintViolation.getConstraintName())) {
+                return true;
+            }
+            cause = cause.getCause();
+        }
+        return false;
+    }
+
+    private record PendingTaskResult(AnalysisAsyncTask task, boolean created) {
+    }
+}

src/main/java/com/jobdri/jobdri_api/domain/analysis/controller/AnalysisWorkerInternalController.java

@@ -2,13 +2,13 @@
 
 import com.jobdri.jobdri_api.domain.analysis.dto.response.AnalysisAsyncStatusResponse;
 import com.jobdri.jobdri_api.domain.analysis.dto.response.AnalysisResponse;
-import com.jobdri.jobdri_api.domain.analysis.dto.worker.AnalysisWorkerCompleteRequest;
-import com.jobdri.jobdri_api.domain.analysis.dto.worker.AnalysisWorkerContextRequest;
-import com.jobdri.jobdri_api.domain.analysis.dto.worker.AnalysisWorkerContextResponse;
-import com.jobdri.jobdri_api.domain.analysis.dto.worker.AnalysisWorkerFailureRequest;
-import com.jobdri.jobdri_api.domain.analysis.dto.worker.AnalysisWorkerRetryRequest;
-import com.jobdri.jobdri_api.domain.analysis.dto.worker.AnalysisWorkerResultStoreRequest;
-import com.jobdri.jobdri_api.domain.analysis.dto.worker.AnalysisWorkerRunningRequest;
+import com.jobdri.jobdri_api.domain.analysis.dto.internal.worker.AnalysisWorkerCompleteRequest;
+import com.jobdri.jobdri_api.domain.analysis.dto.internal.worker.AnalysisWorkerContextRequest;
+import com.jobdri.jobdri_api.domain.analysis.dto.internal.worker.AnalysisWorkerContextResponse;
+import com.jobdri.jobdri_api.domain.analysis.dto.internal.worker.AnalysisWorkerFailureRequest;
+import com.jobdri.jobdri_api.domain.analysis.dto.internal.worker.AnalysisWorkerRetryRequest;
+import com.jobdri.jobdri_api.domain.analysis.dto.internal.worker.AnalysisWorkerResultStoreRequest;
+import com.jobdri.jobdri_api.domain.analysis.dto.internal.worker.AnalysisWorkerRunningRequest;
 import com.jobdri.jobdri_api.domain.analysis.service.async.AnalysisAsyncTaskService;
 import com.jobdri.jobdri_api.domain.analysis.service.async.AnalysisWorkerBridgeService;
 import com.jobdri.jobdri_api.domain.workerresult.dto.WorkerTaskResultResponse;

src/main/java/com/jobdri/jobdri_api/domain/analysis/controller/QuestionController.java

@@ -6,7 +6,8 @@
 import com.jobdri.jobdri_api.domain.analysis.dto.response.QuestionAnswerResponse;
 import com.jobdri.jobdri_api.domain.analysis.dto.response.QuestionCandidateResponse;
 import com.jobdri.jobdri_api.domain.analysis.dto.response.QuestionSelectionResponse;
-import com.jobdri.jobdri_api.domain.analysis.service.question.QuestionService;
+import com.jobdri.jobdri_api.domain.analysis.service.question.QuestionCommandService;
+import com.jobdri.jobdri_api.domain.analysis.service.question.QuestionQueryService;
 import com.jobdri.jobdri_api.global.apiPayload.ApiResponse;
 import com.jobdri.jobdri_api.global.security.UserDetailsImpl;
 import io.swagger.v3.oas.annotations.Operation;
@@ -32,7 +33,8 @@
 @Tag(name = "Question", description = "자소서 문항 선택 및 답변 저장 API")
 public class QuestionController {
 
-    private final QuestionService questionService;
+    private final QuestionQueryService questionQueryService;
+    private final QuestionCommandService questionCommandService;
 
     @Operation(summary = "문항 후보 목록 조회", description = "문항 선택 화면에서 사용할 기본 문항 후보와 선택 여부를 조회합니다.")
     @GetMapping("/candidates")
@@ -42,7 +44,7 @@ public ApiResponse<List<QuestionCandidateResponse>> getQuestionCandidates(
     ) {
         return ApiResponse.onSuccess(
                 "문항 후보 목록 조회에 성공했습니다.",
-                questionService.getQuestionCandidates(userDetails.getUser(), mockApplyId)
+                questionQueryService.getQuestionCandidates(userDetails.getUser(), mockApplyId)
         );
     }
 
@@ -55,7 +57,7 @@ public ApiResponse<QuestionCandidateResponse> addCustomQuestionCandidate(
     ) {
         return ApiResponse.onSuccess(
                 "직접 추가 문항 후보가 생성되었습니다.",
-                questionService.addCustomQuestionCandidate(userDetails.getUser(), mockApplyId, request)
+                questionCommandService.addCustomQuestionCandidate(userDetails.getUser(), mockApplyId, request)
         );
     }
 
@@ -67,7 +69,7 @@ public ApiResponse<QuestionSelectionResponse> getSelectedQuestions(
     ) {
         return ApiResponse.onSuccess(
                 "선택 문항 조회에 성공했습니다.",
-                questionService.getSelectedQuestions(userDetails.getUser(), mockApplyId)
+                questionQueryService.getSelectedQuestions(userDetails.getUser(), mockApplyId)
         );
     }
 
@@ -80,7 +82,7 @@ public ApiResponse<QuestionSelectionResponse> saveSelectedQuestions(
     ) {
         return ApiResponse.onSuccess(
                 "선택 문항이 저장되었습니다.",
-                questionService.saveSelectedQuestions(userDetails.getUser(), mockApplyId, request)
+                questionCommandService.saveSelectedQuestions(userDetails.getUser(), mockApplyId, request)
         );
     }
 
@@ -93,7 +95,7 @@ public ApiResponse<QuestionAnswerResponse> saveAnswers(
     ) {
         return ApiResponse.onSuccess(
                 "자소서 답변이 저장되었습니다.",
-                questionService.saveAnswers(userDetails.getUser(), mockApplyId, request)
+                questionCommandService.saveAnswers(userDetails.getUser(), mockApplyId, request)
         );
     }
 
@@ -106,7 +108,7 @@ public ApiResponse<QuestionSelectionResponse> deleteQuestion(
     ) {
         return ApiResponse.onSuccess(
                 "선택 문항이 삭제되었습니다.",
-                questionService.deleteQuestion(userDetails.getUser(), mockApplyId, questionId)
+                questionCommandService.deleteQuestion(userDetails.getUser(), mockApplyId, questionId)
         );
     }
 }

src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/llm/AnalysisCandidateResponse.java → src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/external/llm/AnalysisCandidateResponse.java

@@ -1,4 +1,4 @@
-package com.jobdri.jobdri_api.domain.analysis.dto.llm;
+package com.jobdri.jobdri_api.domain.analysis.dto.external.llm;
 
 import java.util.List;
 

src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/llm/AnalysisLlmResponse.java → src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/external/llm/AnalysisLlmResponse.java

@@ -1,4 +1,4 @@
-package com.jobdri.jobdri_api.domain.analysis.dto.llm;
+package com.jobdri.jobdri_api.domain.analysis.dto.external.llm;
 
 import java.util.List;
 

src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/llm/CandidateRecheckResponse.java → src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/external/llm/CandidateRecheckResponse.java

@@ -1,4 +1,4 @@
-package com.jobdri.jobdri_api.domain.analysis.dto.llm;
+package com.jobdri.jobdri_api.domain.analysis.dto.external.llm;
 
 public record CandidateRecheckResponse(
         RecheckDecision decision,

src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/llm/CandidateReviewResponse.java → src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/external/llm/CandidateReviewResponse.java

@@ -1,4 +1,4 @@
-package com.jobdri.jobdri_api.domain.analysis.dto.llm;
+package com.jobdri.jobdri_api.domain.analysis.dto.external.llm;
 
 import java.util.List;
 

src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/criteria/JobCategoryEvaluationCriteria.java → src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/internal/criteria/JobCategoryEvaluationCriteria.java

@@ -1,4 +1,4 @@
-package com.jobdri.jobdri_api.domain.analysis.dto.criteria;
+package com.jobdri.jobdri_api.domain.analysis.dto.internal.criteria;
 
 import java.util.List;
 

src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/worker/AnalysisTaskMessage.java → src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/internal/worker/AnalysisTaskMessage.java

@@ -1,4 +1,4 @@
-package com.jobdri.jobdri_api.domain.analysis.dto.worker;
+package com.jobdri.jobdri_api.domain.analysis.dto.internal.worker;
 
 import com.jobdri.jobdri_api.global.logging.LoggingMdcKeys;
 import lombok.Builder;

src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/worker/AnalysisWorkerCompleteRequest.java → src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/internal/worker/AnalysisWorkerCompleteRequest.java

@@ -1,6 +1,6 @@
-package com.jobdri.jobdri_api.domain.analysis.dto.worker;
+package com.jobdri.jobdri_api.domain.analysis.dto.internal.worker;
 
-import com.jobdri.jobdri_api.domain.analysis.dto.llm.AnalysisLlmResponse;
+import com.jobdri.jobdri_api.domain.analysis.dto.external.llm.AnalysisLlmResponse;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;

src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/worker/AnalysisWorkerContextRequest.java → src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/internal/worker/AnalysisWorkerContextRequest.java

@@ -1,4 +1,4 @@
-package com.jobdri.jobdri_api.domain.analysis.dto.worker;
+package com.jobdri.jobdri_api.domain.analysis.dto.internal.worker;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;

src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/worker/AnalysisWorkerContextResponse.java → src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/internal/worker/AnalysisWorkerContextResponse.java

@@ -1,4 +1,4 @@
-package com.jobdri.jobdri_api.domain.analysis.dto.worker;
+package com.jobdri.jobdri_api.domain.analysis.dto.internal.worker;
 
 import java.util.List;
 

src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/worker/AnalysisWorkerFailureRequest.java → src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/internal/worker/AnalysisWorkerFailureRequest.java

@@ -1,13 +1,13 @@
-package com.jobdri.jobdri_api.domain.analysis.dto.worker;
+package com.jobdri.jobdri_api.domain.analysis.dto.internal.worker;
 
-import com.jobdri.jobdri_api.domain.analysis.entity.AnalysisAsyncTask.FailureReason;
+import com.jobdri.jobdri_api.domain.analysis.type.AnalysisAsyncFailureReason;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 
 public record AnalysisWorkerFailureRequest(
         @NotBlank String errorMessage,
-        @NotNull FailureReason failureReason,
+        @NotNull AnalysisAsyncFailureReason failureReason,
         @Min(0) int retryCount,
         @NotBlank String workerId,
         Long queueLatencyMillis

src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/worker/AnalysisWorkerResultStoreRequest.java → src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/internal/worker/AnalysisWorkerResultStoreRequest.java

@@ -1,6 +1,6 @@
-package com.jobdri.jobdri_api.domain.analysis.dto.worker;
+package com.jobdri.jobdri_api.domain.analysis.dto.internal.worker;
 
-import com.jobdri.jobdri_api.domain.analysis.dto.llm.AnalysisLlmResponse;
+import com.jobdri.jobdri_api.domain.analysis.dto.external.llm.AnalysisLlmResponse;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 

src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/worker/AnalysisWorkerRetryRequest.java → src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/internal/worker/AnalysisWorkerRetryRequest.java

@@ -1,13 +1,13 @@
-package com.jobdri.jobdri_api.domain.analysis.dto.worker;
+package com.jobdri.jobdri_api.domain.analysis.dto.internal.worker;
 
-import com.jobdri.jobdri_api.domain.analysis.entity.AnalysisAsyncTask.FailureReason;
+import com.jobdri.jobdri_api.domain.analysis.type.AnalysisAsyncFailureReason;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 
 public record AnalysisWorkerRetryRequest(
         @NotBlank String errorMessage,
-        @NotNull FailureReason failureReason,
+        @NotNull AnalysisAsyncFailureReason failureReason,
         @Min(0) int retryCount,
         @NotBlank String workerId,
         Long queueLatencyMillis

src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/worker/AnalysisWorkerRunningRequest.java → src/main/java/com/jobdri/jobdri_api/domain/analysis/dto/internal/worker/AnalysisWorkerRunningRequest.java

@@ -1,4 +1,4 @@
-package com.jobdri.jobdri_api.domain.analysis.dto.worker;
+package com.jobdri.jobdri_api.domain.analysis.dto.internal.worker;
 
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;