Skip to content

Commit d967a2b

Browse files
committed
CLAP-47 Clenup : 엘라스틱 엔티티,폴더명 document로 수정, 포트와 어댑터명 수정
<footer> - 관련: #10
1 parent 6f68013 commit d967a2b

File tree

8 files changed

+29
-29
lines changed

8 files changed

+29
-29
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package clap.server.adapter.outbound.infrastructure.elastic;
22

3-
import clap.server.adapter.outbound.infrastructure.elastic.entity.ElasticTask;
3+
import clap.server.adapter.outbound.infrastructure.elastic.document.TaskDocument;
44
import clap.server.adapter.outbound.infrastructure.elastic.repository.TaskElasticRepository;
5-
import clap.server.application.port.outbound.task.ElasticTaskPort;
5+
import clap.server.application.port.outbound.task.TaskDocumentPort;
66
import clap.server.common.annotation.architecture.InfrastructureAdapter;
77
import co.elastic.clients.elasticsearch._types.aggregations.AggregationBuilders;
88
import co.elastic.clients.elasticsearch._types.aggregations.MultiBucketBase;
@@ -19,12 +19,12 @@
1919

2020
@InfrastructureAdapter
2121
@RequiredArgsConstructor
22-
public class ElasticTaskAdapter implements ElasticTaskPort {
22+
public class TaskDocumentAdapter implements TaskDocumentPort {
2323
private final TaskElasticRepository taskElasticRepository;
2424
private final ElasticsearchOperations elasticsearchOperations;
2525

2626
@Override
27-
public void saveStatistics(List<ElasticTask> statistics) {
27+
public void saveStatistics(List<TaskDocument> statistics) {
2828
taskElasticRepository.saveAll(statistics);
2929
}
3030

@@ -142,7 +142,7 @@ private NativeQuery buildSubCategoryTaskRequestQuery(PeriodConfig config, String
142142

143143
private ElasticsearchAggregations executeQuery(NativeQuery query) {
144144
return (ElasticsearchAggregations) elasticsearchOperations
145-
.search(query, ElasticTask.class)
145+
.search(query, TaskDocument.class)
146146
.getAggregations();
147147
}
148148

src/main/java/clap/server/adapter/outbound/infrastructure/elastic/entity/ElasticTask.java renamed to src/main/java/clap/server/adapter/outbound/infrastructure/elastic/document/TaskDocument.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package clap.server.adapter.outbound.infrastructure.elastic.entity;
1+
package clap.server.adapter.outbound.infrastructure.elastic.document;
22

33
import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
44
import jakarta.persistence.Id;
@@ -12,7 +12,7 @@
1212
@Document(indexName = "task")
1313
@Mapping(mappingPath = "elastic/task-mapping.json")
1414
@Getter
15-
public class ElasticTask {
15+
public class TaskDocument {
1616
@Id
1717
private Long id;
1818
@Field(name="task_code")
@@ -28,12 +28,12 @@ public class ElasticTask {
2828
@Field(name="created_at")
2929
private LocalDate createdAt;
3030

31-
public ElasticTask(TaskEntity taskEntity) {
31+
public TaskDocument(TaskEntity taskEntity) {
3232
this.id = taskEntity.getTaskId();
3333
this.taskCode = taskEntity.getTaskCode();
3434
this.mainCategory = taskEntity.getCategory().getMainCategory().getName();
3535
this.subCategory = taskEntity.getCategory().getName();
36-
this.status = taskEntity.getStatus().getStatusName().name().toLowerCase();
36+
this.status = taskEntity.getTaskStatus().name().toLowerCase();
3737
this.processor = taskEntity.getProcessor().getNickname();
3838
this.createdAt = taskEntity.getCreatedAt().toLocalDate();
3939
}
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package clap.server.application;
22

3-
import clap.server.adapter.outbound.infrastructure.elastic.entity.ElasticTask;
4-
import clap.server.application.port.outbound.task.ElasticTaskPort;
3+
import clap.server.adapter.outbound.infrastructure.elastic.document.TaskDocument;
54
import clap.server.application.port.outbound.task.LoadTaskPort;
5+
import clap.server.application.port.outbound.task.TaskDocumentPort;
66
import clap.server.common.annotation.architecture.ApplicationService;
77
import lombok.RequiredArgsConstructor;
88
import org.springframework.scheduling.annotation.Scheduled;
@@ -13,13 +13,13 @@
1313
@RequiredArgsConstructor
1414
public class StatisticsIndexingService {
1515
private final LoadTaskPort loadTaskPort;
16-
private final ElasticTaskPort elasticTaskPort;
16+
private final TaskDocumentPort taskDocumentPort;
1717

1818
@Scheduled(cron = "0 0 0 * * *")
1919
public void IndexStatistics() {
20-
elasticTaskPort.saveStatistics(
20+
taskDocumentPort.saveStatistics(
2121
loadTaskPort.findYesterdayTaskByDate(LocalDateTime.now().withNano(0))
22-
.stream().map(ElasticTask::new).toList()
22+
.stream().map(TaskDocument::new).toList()
2323
);
2424
}
2525
}

src/main/java/clap/server/application/port/outbound/task/ElasticTaskPort.java renamed to src/main/java/clap/server/application/port/outbound/task/TaskDocumentPort.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package clap.server.application.port.outbound.task;
22

3-
import clap.server.adapter.outbound.infrastructure.elastic.entity.ElasticTask;
3+
import clap.server.adapter.outbound.infrastructure.elastic.document.TaskDocument;
44

55
import java.util.List;
66
import java.util.Map;
77

8-
public interface ElasticTaskPort {
9-
void saveStatistics(List<ElasticTask> statistics);
8+
public interface TaskDocumentPort {
9+
void saveStatistics(List<TaskDocument> statistics);
1010

1111
Map<String, Long> findPeriodTaskRequestByPeriod(String period);
1212

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package clap.server.application.statistics;
22

33
import clap.server.application.port.inbound.statistics.FindCategoryTaskRequestUsecase;
4-
import clap.server.application.port.outbound.task.ElasticTaskPort;
4+
import clap.server.application.port.outbound.task.TaskDocumentPort;
55
import clap.server.common.annotation.architecture.ApplicationService;
66
import lombok.RequiredArgsConstructor;
77

@@ -10,10 +10,10 @@
1010
@ApplicationService
1111
@RequiredArgsConstructor
1212
public class FindCategoryTaskRequestService implements FindCategoryTaskRequestUsecase {
13-
private final ElasticTaskPort elasticTaskPort;
13+
private final TaskDocumentPort taskDocumentPort;
1414

1515
@Override
1616
public Map<String, Long> aggregateCategoryTaskRequest(String period) {
17-
return elasticTaskPort.findCategoryTaskRequestByPeriod(period);
17+
return taskDocumentPort.findCategoryTaskRequestByPeriod(period);
1818
}
1919
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package clap.server.application.statistics;
22

33
import clap.server.application.port.inbound.statistics.FindPeriodTaskProcessUsecase;
4-
import clap.server.application.port.outbound.task.ElasticTaskPort;
4+
import clap.server.application.port.outbound.task.TaskDocumentPort;
55
import clap.server.common.annotation.architecture.ApplicationService;
66
import lombok.RequiredArgsConstructor;
77

@@ -10,10 +10,10 @@
1010
@ApplicationService
1111
@RequiredArgsConstructor
1212
public class FindPeriodTaskProcessService implements FindPeriodTaskProcessUsecase {
13-
private final ElasticTaskPort elasticTaskPort;
13+
private final TaskDocumentPort taskDocumentPort;
1414

1515
@Override
1616
public Map<String, Long> aggregatePeriodTaskProcess(String period) {
17-
return elasticTaskPort.findPeriodTaskProcessByPeriod(period);
17+
return taskDocumentPort.findPeriodTaskProcessByPeriod(period);
1818
}
1919
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package clap.server.application.statistics;
22

33
import clap.server.application.port.inbound.statistics.FindPeriodTaskRequestUsecase;
4-
import clap.server.application.port.outbound.task.ElasticTaskPort;
4+
import clap.server.application.port.outbound.task.TaskDocumentPort;
55
import clap.server.common.annotation.architecture.ApplicationService;
66
import lombok.RequiredArgsConstructor;
77

@@ -10,10 +10,10 @@
1010
@ApplicationService
1111
@RequiredArgsConstructor
1212
public class FindPeriodTaskRequestService implements FindPeriodTaskRequestUsecase {
13-
private final ElasticTaskPort elasticTaskPort;
13+
private final TaskDocumentPort taskDocumentPort;
1414

1515
@Override
1616
public Map<String, Long> aggregatePeriodTaskRequest(String period) {
17-
return elasticTaskPort.findPeriodTaskRequestByPeriod(period);
17+
return taskDocumentPort.findPeriodTaskRequestByPeriod(period);
1818
}
1919
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package clap.server.application.statistics;
22

33
import clap.server.application.port.inbound.statistics.FindSubCategoryTaskRequestUsecase;
4-
import clap.server.application.port.outbound.task.ElasticTaskPort;
4+
import clap.server.application.port.outbound.task.TaskDocumentPort;
55
import clap.server.common.annotation.architecture.ApplicationService;
66
import lombok.RequiredArgsConstructor;
77

@@ -10,10 +10,10 @@
1010
@ApplicationService
1111
@RequiredArgsConstructor
1212
public class FindSubCategoryTaskRequestService implements FindSubCategoryTaskRequestUsecase {
13-
private final ElasticTaskPort elasticTaskPort;
13+
private final TaskDocumentPort taskDocumentPort;
1414

1515
@Override
1616
public Map<String, Long> aggregateSubCategoryTaskRequest(String period, String mainCategory) {
17-
return elasticTaskPort.findSubCategoryTaskRequestByPeriod(period, mainCategory);
17+
return taskDocumentPort.findSubCategoryTaskRequestByPeriod(period, mainCategory);
1818
}
1919
}

0 commit comments

Comments
 (0)