From 9eb9f21950936aa9deb635e8aca62cad19c632e5 Mon Sep 17 00:00:00 2001 From: Hyojin Ahn Date: Thu, 22 Jan 2026 16:16:36 -0500 Subject: [PATCH] [Scheduler] Separated External DTOs (before start working Tank) --- .../com/goi/erp/client/SamsaraStatEngineSecondsClient.java | 2 +- .../java/com/goi/erp/client/SamsaraStatOdometerClient.java | 2 +- .../com/goi/erp/client/SamsaraStatSafetyEventClient.java | 2 +- .../ingest/ExtSamsaraInspectionIngestController.java | 6 +++--- .../java/com/goi/erp/dto/{ => ext}/ExtApiErrorResponse.java | 2 +- .../java/com/goi/erp/dto/{ => ext}/ExtIngestResult.java | 2 +- .../dto/{ => ext}/ExtSamsaraEngineSecondsFetchCommand.java | 2 +- .../erp/dto/{ => ext}/ExtSamsaraEngineSecondsRecordDto.java | 2 +- .../dto/{ => ext}/ExtSamsaraInspectionIngestCommand.java | 2 +- .../erp/dto/{ => ext}/ExtSamsaraInspectionRecordDto.java | 2 +- .../erp/dto/{ => ext}/ExtSamsaraOdometerFetchCommand.java | 2 +- .../goi/erp/dto/{ => ext}/ExtSamsaraOdometerRecordDto.java | 2 +- .../dto/{ => ext}/ExtSamsaraSafetyEventFetchCommand.java | 2 +- .../erp/dto/{ => ext}/ExtSamsaraSafetyEventRecordDto.java | 2 +- .../erp/service/ExtSamsaraEngineSecondsIngestService.java | 4 ++-- .../goi/erp/service/ExtSamsaraInspectionIngestService.java | 6 +++--- .../goi/erp/service/ExtSamsaraOdometerIngestService.java | 4 ++-- .../goi/erp/service/ExtSamsaraSafetyEventIngestService.java | 4 ++-- .../erp/service/SchedulerEngineSecondsRawOrchestrator.java | 2 +- .../goi/erp/service/SchedulerOdometerRawOrchestrator.java | 2 +- .../erp/service/SchedulerSafetyEventRawOrchestrator.java | 2 +- 21 files changed, 28 insertions(+), 28 deletions(-) rename src/main/java/com/goi/erp/dto/{ => ext}/ExtApiErrorResponse.java (92%) rename src/main/java/com/goi/erp/dto/{ => ext}/ExtIngestResult.java (91%) rename src/main/java/com/goi/erp/dto/{ => ext}/ExtSamsaraEngineSecondsFetchCommand.java (93%) rename src/main/java/com/goi/erp/dto/{ => ext}/ExtSamsaraEngineSecondsRecordDto.java (94%) rename src/main/java/com/goi/erp/dto/{ => ext}/ExtSamsaraInspectionIngestCommand.java (93%) rename src/main/java/com/goi/erp/dto/{ => ext}/ExtSamsaraInspectionRecordDto.java (95%) rename src/main/java/com/goi/erp/dto/{ => ext}/ExtSamsaraOdometerFetchCommand.java (93%) rename src/main/java/com/goi/erp/dto/{ => ext}/ExtSamsaraOdometerRecordDto.java (94%) rename src/main/java/com/goi/erp/dto/{ => ext}/ExtSamsaraSafetyEventFetchCommand.java (93%) rename src/main/java/com/goi/erp/dto/{ => ext}/ExtSamsaraSafetyEventRecordDto.java (96%) diff --git a/src/main/java/com/goi/erp/client/SamsaraStatEngineSecondsClient.java b/src/main/java/com/goi/erp/client/SamsaraStatEngineSecondsClient.java index 6d0bcdf..479b40c 100644 --- a/src/main/java/com/goi/erp/client/SamsaraStatEngineSecondsClient.java +++ b/src/main/java/com/goi/erp/client/SamsaraStatEngineSecondsClient.java @@ -1,7 +1,7 @@ package com.goi.erp.client; -import com.goi.erp.dto.ExtSamsaraEngineSecondsFetchCommand; import com.goi.erp.dto.ScheduleWorkerRequestDto; +import com.goi.erp.dto.ext.ExtSamsaraEngineSecondsFetchCommand; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/goi/erp/client/SamsaraStatOdometerClient.java b/src/main/java/com/goi/erp/client/SamsaraStatOdometerClient.java index 4d9eabb..b3f1630 100644 --- a/src/main/java/com/goi/erp/client/SamsaraStatOdometerClient.java +++ b/src/main/java/com/goi/erp/client/SamsaraStatOdometerClient.java @@ -1,7 +1,7 @@ package com.goi.erp.client; -import com.goi.erp.dto.ExtSamsaraOdometerFetchCommand; import com.goi.erp.dto.ScheduleWorkerRequestDto; +import com.goi.erp.dto.ext.ExtSamsaraOdometerFetchCommand; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/goi/erp/client/SamsaraStatSafetyEventClient.java b/src/main/java/com/goi/erp/client/SamsaraStatSafetyEventClient.java index c44c646..9e83012 100644 --- a/src/main/java/com/goi/erp/client/SamsaraStatSafetyEventClient.java +++ b/src/main/java/com/goi/erp/client/SamsaraStatSafetyEventClient.java @@ -1,7 +1,7 @@ package com.goi.erp.client; -import com.goi.erp.dto.ExtSamsaraSafetyEventFetchCommand; import com.goi.erp.dto.ScheduleWorkerRequestDto; +import com.goi.erp.dto.ext.ExtSamsaraSafetyEventFetchCommand; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/goi/erp/controller/ingest/ExtSamsaraInspectionIngestController.java b/src/main/java/com/goi/erp/controller/ingest/ExtSamsaraInspectionIngestController.java index cde05d1..2bdbadb 100644 --- a/src/main/java/com/goi/erp/controller/ingest/ExtSamsaraInspectionIngestController.java +++ b/src/main/java/com/goi/erp/controller/ingest/ExtSamsaraInspectionIngestController.java @@ -1,8 +1,8 @@ package com.goi.erp.controller.ingest; -import com.goi.erp.dto.ExtApiErrorResponse; -import com.goi.erp.dto.ExtIngestResult; -import com.goi.erp.dto.ExtSamsaraInspectionIngestCommand; +import com.goi.erp.dto.ext.ExtApiErrorResponse; +import com.goi.erp.dto.ext.ExtIngestResult; +import com.goi.erp.dto.ext.ExtSamsaraInspectionIngestCommand; import com.goi.erp.service.ExtSamsaraInspectionIngestService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/goi/erp/dto/ExtApiErrorResponse.java b/src/main/java/com/goi/erp/dto/ext/ExtApiErrorResponse.java similarity index 92% rename from src/main/java/com/goi/erp/dto/ExtApiErrorResponse.java rename to src/main/java/com/goi/erp/dto/ext/ExtApiErrorResponse.java index 7520f8f..9880cd5 100644 --- a/src/main/java/com/goi/erp/dto/ExtApiErrorResponse.java +++ b/src/main/java/com/goi/erp/dto/ext/ExtApiErrorResponse.java @@ -1,4 +1,4 @@ -package com.goi.erp.dto; +package com.goi.erp.dto.ext; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/goi/erp/dto/ExtIngestResult.java b/src/main/java/com/goi/erp/dto/ext/ExtIngestResult.java similarity index 91% rename from src/main/java/com/goi/erp/dto/ExtIngestResult.java rename to src/main/java/com/goi/erp/dto/ext/ExtIngestResult.java index b969e31..b45f776 100644 --- a/src/main/java/com/goi/erp/dto/ExtIngestResult.java +++ b/src/main/java/com/goi/erp/dto/ext/ExtIngestResult.java @@ -1,4 +1,4 @@ -package com.goi.erp.dto; +package com.goi.erp.dto.ext; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/goi/erp/dto/ExtSamsaraEngineSecondsFetchCommand.java b/src/main/java/com/goi/erp/dto/ext/ExtSamsaraEngineSecondsFetchCommand.java similarity index 93% rename from src/main/java/com/goi/erp/dto/ExtSamsaraEngineSecondsFetchCommand.java rename to src/main/java/com/goi/erp/dto/ext/ExtSamsaraEngineSecondsFetchCommand.java index 6ec6de6..58f200f 100644 --- a/src/main/java/com/goi/erp/dto/ExtSamsaraEngineSecondsFetchCommand.java +++ b/src/main/java/com/goi/erp/dto/ext/ExtSamsaraEngineSecondsFetchCommand.java @@ -1,4 +1,4 @@ -package com.goi.erp.dto; +package com.goi.erp.dto.ext; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/goi/erp/dto/ExtSamsaraEngineSecondsRecordDto.java b/src/main/java/com/goi/erp/dto/ext/ExtSamsaraEngineSecondsRecordDto.java similarity index 94% rename from src/main/java/com/goi/erp/dto/ExtSamsaraEngineSecondsRecordDto.java rename to src/main/java/com/goi/erp/dto/ext/ExtSamsaraEngineSecondsRecordDto.java index b98a664..2c319d2 100644 --- a/src/main/java/com/goi/erp/dto/ExtSamsaraEngineSecondsRecordDto.java +++ b/src/main/java/com/goi/erp/dto/ext/ExtSamsaraEngineSecondsRecordDto.java @@ -1,4 +1,4 @@ -package com.goi.erp.dto; +package com.goi.erp.dto.ext; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/goi/erp/dto/ExtSamsaraInspectionIngestCommand.java b/src/main/java/com/goi/erp/dto/ext/ExtSamsaraInspectionIngestCommand.java similarity index 93% rename from src/main/java/com/goi/erp/dto/ExtSamsaraInspectionIngestCommand.java rename to src/main/java/com/goi/erp/dto/ext/ExtSamsaraInspectionIngestCommand.java index 1675b01..5b7a6e6 100644 --- a/src/main/java/com/goi/erp/dto/ExtSamsaraInspectionIngestCommand.java +++ b/src/main/java/com/goi/erp/dto/ext/ExtSamsaraInspectionIngestCommand.java @@ -1,4 +1,4 @@ -package com.goi.erp.dto; +package com.goi.erp.dto.ext; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/goi/erp/dto/ExtSamsaraInspectionRecordDto.java b/src/main/java/com/goi/erp/dto/ext/ExtSamsaraInspectionRecordDto.java similarity index 95% rename from src/main/java/com/goi/erp/dto/ExtSamsaraInspectionRecordDto.java rename to src/main/java/com/goi/erp/dto/ext/ExtSamsaraInspectionRecordDto.java index 39423d7..c95007c 100644 --- a/src/main/java/com/goi/erp/dto/ExtSamsaraInspectionRecordDto.java +++ b/src/main/java/com/goi/erp/dto/ext/ExtSamsaraInspectionRecordDto.java @@ -1,4 +1,4 @@ -package com.goi.erp.dto; +package com.goi.erp.dto.ext; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/goi/erp/dto/ExtSamsaraOdometerFetchCommand.java b/src/main/java/com/goi/erp/dto/ext/ExtSamsaraOdometerFetchCommand.java similarity index 93% rename from src/main/java/com/goi/erp/dto/ExtSamsaraOdometerFetchCommand.java rename to src/main/java/com/goi/erp/dto/ext/ExtSamsaraOdometerFetchCommand.java index 799f039..c4e0b4e 100644 --- a/src/main/java/com/goi/erp/dto/ExtSamsaraOdometerFetchCommand.java +++ b/src/main/java/com/goi/erp/dto/ext/ExtSamsaraOdometerFetchCommand.java @@ -1,4 +1,4 @@ -package com.goi.erp.dto; +package com.goi.erp.dto.ext; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/goi/erp/dto/ExtSamsaraOdometerRecordDto.java b/src/main/java/com/goi/erp/dto/ext/ExtSamsaraOdometerRecordDto.java similarity index 94% rename from src/main/java/com/goi/erp/dto/ExtSamsaraOdometerRecordDto.java rename to src/main/java/com/goi/erp/dto/ext/ExtSamsaraOdometerRecordDto.java index 219fb28..1fb39e1 100644 --- a/src/main/java/com/goi/erp/dto/ExtSamsaraOdometerRecordDto.java +++ b/src/main/java/com/goi/erp/dto/ext/ExtSamsaraOdometerRecordDto.java @@ -1,4 +1,4 @@ -package com.goi.erp.dto; +package com.goi.erp.dto.ext; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/goi/erp/dto/ExtSamsaraSafetyEventFetchCommand.java b/src/main/java/com/goi/erp/dto/ext/ExtSamsaraSafetyEventFetchCommand.java similarity index 93% rename from src/main/java/com/goi/erp/dto/ExtSamsaraSafetyEventFetchCommand.java rename to src/main/java/com/goi/erp/dto/ext/ExtSamsaraSafetyEventFetchCommand.java index c616cd4..8e41dc3 100644 --- a/src/main/java/com/goi/erp/dto/ExtSamsaraSafetyEventFetchCommand.java +++ b/src/main/java/com/goi/erp/dto/ext/ExtSamsaraSafetyEventFetchCommand.java @@ -1,4 +1,4 @@ -package com.goi.erp.dto; +package com.goi.erp.dto.ext; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/goi/erp/dto/ExtSamsaraSafetyEventRecordDto.java b/src/main/java/com/goi/erp/dto/ext/ExtSamsaraSafetyEventRecordDto.java similarity index 96% rename from src/main/java/com/goi/erp/dto/ExtSamsaraSafetyEventRecordDto.java rename to src/main/java/com/goi/erp/dto/ext/ExtSamsaraSafetyEventRecordDto.java index 97aa62c..26772f7 100644 --- a/src/main/java/com/goi/erp/dto/ExtSamsaraSafetyEventRecordDto.java +++ b/src/main/java/com/goi/erp/dto/ext/ExtSamsaraSafetyEventRecordDto.java @@ -1,4 +1,4 @@ -package com.goi.erp.dto; +package com.goi.erp.dto.ext; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/goi/erp/service/ExtSamsaraEngineSecondsIngestService.java b/src/main/java/com/goi/erp/service/ExtSamsaraEngineSecondsIngestService.java index 73761fc..bf17475 100644 --- a/src/main/java/com/goi/erp/service/ExtSamsaraEngineSecondsIngestService.java +++ b/src/main/java/com/goi/erp/service/ExtSamsaraEngineSecondsIngestService.java @@ -2,8 +2,8 @@ package com.goi.erp.service; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.goi.erp.dto.ExtSamsaraEngineSecondsFetchCommand; -import com.goi.erp.dto.ExtSamsaraEngineSecondsRecordDto; +import com.goi.erp.dto.ext.ExtSamsaraEngineSecondsFetchCommand; +import com.goi.erp.dto.ext.ExtSamsaraEngineSecondsRecordDto; import com.goi.erp.repository.ExtSamsaraRawEngineSecondsRepository; import jakarta.transaction.Transactional; diff --git a/src/main/java/com/goi/erp/service/ExtSamsaraInspectionIngestService.java b/src/main/java/com/goi/erp/service/ExtSamsaraInspectionIngestService.java index 27bfb8e..44d2e41 100644 --- a/src/main/java/com/goi/erp/service/ExtSamsaraInspectionIngestService.java +++ b/src/main/java/com/goi/erp/service/ExtSamsaraInspectionIngestService.java @@ -1,8 +1,8 @@ package com.goi.erp.service; -import com.goi.erp.dto.ExtIngestResult; -import com.goi.erp.dto.ExtSamsaraInspectionIngestCommand; -import com.goi.erp.dto.ExtSamsaraInspectionRecordDto; +import com.goi.erp.dto.ext.ExtIngestResult; +import com.goi.erp.dto.ext.ExtSamsaraInspectionIngestCommand; +import com.goi.erp.dto.ext.ExtSamsaraInspectionRecordDto; import com.goi.erp.entity.ExtSamsaraRawInspection; import com.goi.erp.repository.ExtSamsaraRawInspectionRepository; diff --git a/src/main/java/com/goi/erp/service/ExtSamsaraOdometerIngestService.java b/src/main/java/com/goi/erp/service/ExtSamsaraOdometerIngestService.java index ef3cfe3..cd16c10 100644 --- a/src/main/java/com/goi/erp/service/ExtSamsaraOdometerIngestService.java +++ b/src/main/java/com/goi/erp/service/ExtSamsaraOdometerIngestService.java @@ -2,8 +2,8 @@ package com.goi.erp.service; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.goi.erp.dto.ExtSamsaraOdometerFetchCommand; -import com.goi.erp.dto.ExtSamsaraOdometerRecordDto; +import com.goi.erp.dto.ext.ExtSamsaraOdometerFetchCommand; +import com.goi.erp.dto.ext.ExtSamsaraOdometerRecordDto; import com.goi.erp.repository.ExtSamsaraRawOdometerRepository; import jakarta.transaction.Transactional; diff --git a/src/main/java/com/goi/erp/service/ExtSamsaraSafetyEventIngestService.java b/src/main/java/com/goi/erp/service/ExtSamsaraSafetyEventIngestService.java index 1a9bbbf..1ec37bd 100644 --- a/src/main/java/com/goi/erp/service/ExtSamsaraSafetyEventIngestService.java +++ b/src/main/java/com/goi/erp/service/ExtSamsaraSafetyEventIngestService.java @@ -2,8 +2,8 @@ package com.goi.erp.service; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.goi.erp.dto.ExtSamsaraSafetyEventFetchCommand; -import com.goi.erp.dto.ExtSamsaraSafetyEventRecordDto; +import com.goi.erp.dto.ext.ExtSamsaraSafetyEventFetchCommand; +import com.goi.erp.dto.ext.ExtSamsaraSafetyEventRecordDto; import com.goi.erp.repository.ExtSamsaraRawSafetyEventRepository; import jakarta.transaction.Transactional; diff --git a/src/main/java/com/goi/erp/service/SchedulerEngineSecondsRawOrchestrator.java b/src/main/java/com/goi/erp/service/SchedulerEngineSecondsRawOrchestrator.java index abe500b..7f6bd23 100644 --- a/src/main/java/com/goi/erp/service/SchedulerEngineSecondsRawOrchestrator.java +++ b/src/main/java/com/goi/erp/service/SchedulerEngineSecondsRawOrchestrator.java @@ -1,9 +1,9 @@ package com.goi.erp.service; import com.goi.erp.client.SamsaraStatEngineSecondsClient; -import com.goi.erp.dto.ExtSamsaraEngineSecondsFetchCommand; import com.goi.erp.dto.ScheduleWorkerRequestDto; import com.goi.erp.dto.ScheduleWorkerResponseDto; +import com.goi.erp.dto.ext.ExtSamsaraEngineSecondsFetchCommand; import com.goi.erp.entity.VehicleDispatch; import com.goi.erp.repository.VehicleDispatchRepository; diff --git a/src/main/java/com/goi/erp/service/SchedulerOdometerRawOrchestrator.java b/src/main/java/com/goi/erp/service/SchedulerOdometerRawOrchestrator.java index 6e0a0eb..f1acb00 100644 --- a/src/main/java/com/goi/erp/service/SchedulerOdometerRawOrchestrator.java +++ b/src/main/java/com/goi/erp/service/SchedulerOdometerRawOrchestrator.java @@ -1,9 +1,9 @@ package com.goi.erp.service; import com.goi.erp.client.SamsaraStatOdometerClient; -import com.goi.erp.dto.ExtSamsaraOdometerFetchCommand; import com.goi.erp.dto.ScheduleWorkerRequestDto; import com.goi.erp.dto.ScheduleWorkerResponseDto; +import com.goi.erp.dto.ext.ExtSamsaraOdometerFetchCommand; import com.goi.erp.entity.VehicleDispatch; import com.goi.erp.repository.VehicleDispatchRepository; diff --git a/src/main/java/com/goi/erp/service/SchedulerSafetyEventRawOrchestrator.java b/src/main/java/com/goi/erp/service/SchedulerSafetyEventRawOrchestrator.java index 1aa2565..fd8fcdd 100644 --- a/src/main/java/com/goi/erp/service/SchedulerSafetyEventRawOrchestrator.java +++ b/src/main/java/com/goi/erp/service/SchedulerSafetyEventRawOrchestrator.java @@ -1,9 +1,9 @@ package com.goi.erp.service; import com.goi.erp.client.SamsaraStatSafetyEventClient; -import com.goi.erp.dto.ExtSamsaraSafetyEventFetchCommand; import com.goi.erp.dto.ScheduleWorkerRequestDto; import com.goi.erp.dto.ScheduleWorkerResponseDto; +import com.goi.erp.dto.ext.ExtSamsaraSafetyEventFetchCommand; import com.goi.erp.entity.VehicleDispatch; import com.goi.erp.repository.VehicleDispatchRepository;