CLAP-47 Clenup : 작업 데이터 스케쥴러로 엘라스틱서치에 저장하는 코드 헥사고날에 맞게 수정

<footer>
- 관련: #10

Author: hyoseong-Choi

src/main/java/clap/server/adapter/outbound/infrastructure/elastic/TaskDocumentAdapter.java

@@ -4,6 +4,7 @@
 import clap.server.adapter.outbound.infrastructure.elastic.repository.TaskElasticRepository;
 import clap.server.application.port.outbound.task.TaskDocumentPort;
 import clap.server.common.annotation.architecture.InfrastructureAdapter;
+import clap.server.domain.model.task.Task;
 import co.elastic.clients.elasticsearch._types.aggregations.AggregationBuilders;
 import co.elastic.clients.elasticsearch._types.aggregations.MultiBucketBase;
 import lombok.RequiredArgsConstructor;
@@ -24,8 +25,8 @@ public class TaskDocumentAdapter implements TaskDocumentPort {
     private final ElasticsearchOperations elasticsearchOperations;
 
     @Override
-    public void saveStatistics(List<TaskDocument> statistics) {
-        taskElasticRepository.saveAll(statistics);
+    public void saveStatistics(List<Task> statistics) {
+        taskElasticRepository.saveAll(statistics.stream().map(TaskDocument::new).toList());
     }
 
     @Override

src/main/java/clap/server/adapter/outbound/infrastructure/elastic/document/TaskDocument.java

@@ -1,6 +1,6 @@
 package clap.server.adapter.outbound.infrastructure.elastic.document;
 
-import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
+import clap.server.domain.model.task.Task;
 import jakarta.persistence.Id;
 import lombok.Getter;
 import org.springframework.data.elasticsearch.annotations.Document;
@@ -28,13 +28,13 @@ public class TaskDocument {
     @Field(name="created_at")
     private LocalDate createdAt;
 
-    public TaskDocument(TaskEntity taskEntity) {
+    public TaskDocument(Task taskEntity) {
         this.id = taskEntity.getTaskId();
         this.taskCode = taskEntity.getTaskCode();
         this.mainCategory = taskEntity.getCategory().getMainCategory().getName();
         this.subCategory = taskEntity.getCategory().getName();
         this.status = taskEntity.getTaskStatus().name().toLowerCase();
-        this.processor = taskEntity.getProcessor().getNickname();
+        this.processor = taskEntity.getProcessor().getMemberInfo().getNickname();
         this.createdAt = taskEntity.getCreatedAt().toLocalDate();
     }
 }

src/main/java/clap/server/adapter/outbound/infrastructure/elastic/repository/TaskElasticRepository.java

@@ -1,7 +1,7 @@
 package clap.server.adapter.outbound.infrastructure.elastic.repository;
 
-import clap.server.adapter.outbound.infrastructure.elastic.entity.ElasticTask;
+import clap.server.adapter.outbound.infrastructure.elastic.document.TaskDocument;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
 
-public interface TaskElasticRepository extends ElasticsearchRepository<ElasticTask, Long> {
+public interface TaskElasticRepository extends ElasticsearchRepository<TaskDocument, Long> {
 }

src/main/java/clap/server/adapter/outbound/persistense/TaskPersistenceAdapter.java

@@ -9,12 +9,13 @@
 import clap.server.application.port.outbound.task.CommandTaskPort;
 import clap.server.application.port.outbound.task.LoadTaskPort;
 import clap.server.common.annotation.architecture.PersistenceAdapter;
-
 import clap.server.domain.model.task.Task;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
+import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Optional;
 
 
@@ -42,4 +43,10 @@ public Page<FindTaskListResponse> findAllByRequesterId(Long requesterId, Pageabl
                 .map(taskPersistenceMapper::toDomain);
         return taskList.map(TaskMapper::toFindTaskListResponse);
     }
+
+    @Override
+    public List<Task> findYesterdayTaskByDate(LocalDateTime now) {
+        return taskRepository.findYesterdayTaskByUpdatedAtIsBetween(now.minusDays(1), now)
+                .stream().map(taskPersistenceMapper::toDomain).toList();
+    }
 }

src/main/java/clap/server/adapter/outbound/persistense/TaskPersistentAdapter.java

@@ -1,6 +1,5 @@
 package clap.server.application;
 
-import clap.server.adapter.outbound.infrastructure.elastic.document.TaskDocument;
 import clap.server.application.port.outbound.task.LoadTaskPort;
 import clap.server.application.port.outbound.task.TaskDocumentPort;
 import clap.server.common.annotation.architecture.ApplicationService;
@@ -19,7 +18,6 @@ public class StatisticsIndexingService {
     public void IndexStatistics() {
         taskDocumentPort.saveStatistics(
                 loadTaskPort.findYesterdayTaskByDate(LocalDateTime.now().withNano(0))
-                        .stream().map(TaskDocument::new).toList()
         );
     }
 }

src/main/java/clap/server/application/StatisticsIndexingService.java

@@ -1,8 +1,5 @@
 package clap.server.application.port.outbound.task;
 
-import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
-import org.springframework.data.redis.stream.Task;
-
 import clap.server.adapter.inbound.web.dto.task.FindTaskListRequest;
 import clap.server.adapter.inbound.web.dto.task.FindTaskListResponse;
 import clap.server.domain.model.task.Task;
@@ -16,7 +13,7 @@
 public interface LoadTaskPort {
     Optional<Task> findById(Long id);
 
-    List<TaskEntity> findYesterdayTaskByDate(LocalDateTime now);
+    List<Task> findYesterdayTaskByDate(LocalDateTime now);
 
     Page<FindTaskListResponse> findAllByRequesterId(Long requesterId, Pageable pageable, FindTaskListRequest findTaskListRequest);
 

src/main/java/clap/server/application/port/outbound/task/LoadTaskPort.java

@@ -1,12 +1,12 @@
 package clap.server.application.port.outbound.task;
 
-import clap.server.adapter.outbound.infrastructure.elastic.document.TaskDocument;
+import clap.server.domain.model.task.Task;
 
 import java.util.List;
 import java.util.Map;
 
 public interface TaskDocumentPort {
-    void saveStatistics(List<TaskDocument> statistics);
+    void saveStatistics(List<Task> statistics);
 
     Map<String, Long> findPeriodTaskRequestByPeriod(String period);