diff --git a/src/main/java/ru/nbch/credit_tracker/builder/PersonFactoryBuilder.java b/src/main/java/ru/nbch/credit_tracker/builder/PersonFactoryBuilder.java index cfc9803..16f339b 100644 --- a/src/main/java/ru/nbch/credit_tracker/builder/PersonFactoryBuilder.java +++ b/src/main/java/ru/nbch/credit_tracker/builder/PersonFactoryBuilder.java @@ -2,7 +2,7 @@ package ru.nbch.credit_tracker.builder; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import ru.nbch.credit_tracker.entities.signal_package.Person; +import ru.nbch.credit_tracker.entities.external_request.signals.Person; import ru.nbch.credit_tracker.service.indic.PersonService; import ru.nbch.credit_tracker.utils.CTUtil; diff --git a/src/main/java/ru/nbch/credit_tracker/config/rest/GlobalExceptionHandler.java b/src/main/java/ru/nbch/credit_tracker/config/rest/GlobalExceptionHandler.java index 0df9e3b..4ce54fe 100644 --- a/src/main/java/ru/nbch/credit_tracker/config/rest/GlobalExceptionHandler.java +++ b/src/main/java/ru/nbch/credit_tracker/config/rest/GlobalExceptionHandler.java @@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.multipart.MaxUploadSizeExceededException; import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; -import ru.nbch.credit_tracker.entities.response.errors.*; +import ru.nbch.credit_tracker.entities.user_response.errors.*; import ru.nbch.credit_tracker.enums.SignalError; import ru.nbch.credit_tracker.exceptions.SignalClientException; import ru.nbch.credit_tracker.exceptions.SignalException; diff --git a/src/main/java/ru/nbch/credit_tracker/config/xml/XmlConfig.java b/src/main/java/ru/nbch/credit_tracker/config/xml/XmlConfig.java index 9fd3f9f..be383a7 100644 --- a/src/main/java/ru/nbch/credit_tracker/config/xml/XmlConfig.java +++ b/src/main/java/ru/nbch/credit_tracker/config/xml/XmlConfig.java @@ -4,9 +4,9 @@ import jakarta.xml.bind.JAXBException; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; -import ru.nbch.credit_tracker.entities.response.errors.MonitoringError; -import ru.nbch.credit_tracker.entities.response.online_report.SgnlOnlineReport; -import ru.nbch.credit_tracker.entities.response.success.MonitoringResponse; +import ru.nbch.credit_tracker.entities.external_response.online_report.SgnlOnlineReport; +import ru.nbch.credit_tracker.entities.user_response.errors.MonitoringError; +import ru.nbch.credit_tracker.entities.user_response.success.MonitoringSetupResponse; import ru.nbch.credit_tracker.service.xml.jaxb.IXmlProcessor; import ru.nbch.credit_tracker.service.xml.jaxb.XmlProcessorImplAnyClasses; import ru.nbch.credit_tracker.service.xml.stax.*; @@ -25,7 +25,7 @@ public class XmlConfig { SgnlOnlineReport.class, // marshalling classes MonitoringError.class, - MonitoringResponse.class); + MonitoringSetupResponse.class); } @Bean diff --git a/src/main/java/ru/nbch/credit_tracker/controller/SignalController.java b/src/main/java/ru/nbch/credit_tracker/controller/SignalController.java index 4bd3da4..7393f6d 100644 --- a/src/main/java/ru/nbch/credit_tracker/controller/SignalController.java +++ b/src/main/java/ru/nbch/credit_tracker/controller/SignalController.java @@ -5,11 +5,11 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import ru.nbch.credit_tracker.entities.request.active_packages.MonitoringActivePackagesRequest; -import ru.nbch.credit_tracker.entities.response.active_packages.MonitoringActivePackagesResponse; -import ru.nbch.credit_tracker.entities.response.success.MonitoringPackageDeleteResponse; -import ru.nbch.credit_tracker.entities.response.success.MonitoringReportListResponse; -import ru.nbch.credit_tracker.entities.response.success.MonitoringResponse; +import ru.nbch.credit_tracker.entities.user_request.active_packages.MonitoringActivePackagesRequest; +import ru.nbch.credit_tracker.entities.user_response.active_packages.MonitoringActivePackagesResponse; +import ru.nbch.credit_tracker.entities.user_response.success.MonitoringPackageDeleteResponse; +import ru.nbch.credit_tracker.entities.user_response.success.MonitoringReportListResponse; +import ru.nbch.credit_tracker.entities.user_response.success.MonitoringSetupResponse; import ru.nbch.credit_tracker.facade.SignalFacade; @RestController @@ -23,7 +23,7 @@ public class SignalController { } @PostMapping(value = "/set", produces = MediaType.APPLICATION_XML_VALUE) - public ResponseEntity setupMonitoring(@RequestParam("file") MultipartFile file) { + public ResponseEntity setupMonitoring(@RequestParam("file") MultipartFile file) { return signalFacade.setupMonitoring(file); } diff --git a/src/main/java/ru/nbch/credit_tracker/entities/signal_package/Auth.java b/src/main/java/ru/nbch/credit_tracker/entities/external_request/signals/Auth.java similarity index 87% rename from src/main/java/ru/nbch/credit_tracker/entities/signal_package/Auth.java rename to src/main/java/ru/nbch/credit_tracker/entities/external_request/signals/Auth.java index bbf5d3c..7c85e24 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/signal_package/Auth.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/external_request/signals/Auth.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.signal_package; +package ru.nbch.credit_tracker.entities.external_request.signals; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/signal_package/Conditions.java b/src/main/java/ru/nbch/credit_tracker/entities/external_request/signals/Conditions.java similarity index 89% rename from src/main/java/ru/nbch/credit_tracker/entities/signal_package/Conditions.java rename to src/main/java/ru/nbch/credit_tracker/entities/external_request/signals/Conditions.java index 0d2fd45..c7327a8 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/signal_package/Conditions.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/external_request/signals/Conditions.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.signal_package; +package ru.nbch.credit_tracker.entities.external_request.signals; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/signal_package/Person.java b/src/main/java/ru/nbch/credit_tracker/entities/external_request/signals/Person.java similarity index 97% rename from src/main/java/ru/nbch/credit_tracker/entities/signal_package/Person.java rename to src/main/java/ru/nbch/credit_tracker/entities/external_request/signals/Person.java index b19f32c..e3f09e4 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/signal_package/Person.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/external_request/signals/Person.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.signal_package; +package ru.nbch.credit_tracker.entities.external_request.signals; import jakarta.xml.bind.annotation.*; import lombok.Getter; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/signal_package/Persons.java b/src/main/java/ru/nbch/credit_tracker/entities/external_request/signals/Persons.java similarity index 90% rename from src/main/java/ru/nbch/credit_tracker/entities/signal_package/Persons.java rename to src/main/java/ru/nbch/credit_tracker/entities/external_request/signals/Persons.java index 91893a4..5238b37 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/signal_package/Persons.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/external_request/signals/Persons.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.signal_package; +package ru.nbch.credit_tracker.entities.external_request.signals; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/signal_package/Signals.java b/src/main/java/ru/nbch/credit_tracker/entities/external_request/signals/Signals.java similarity index 91% rename from src/main/java/ru/nbch/credit_tracker/entities/signal_package/Signals.java rename to src/main/java/ru/nbch/credit_tracker/entities/external_request/signals/Signals.java index 207721a..37624d8 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/signal_package/Signals.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/external_request/signals/Signals.java @@ -1,5 +1,5 @@ -package ru.nbch.credit_tracker.entities.signal_package; +package ru.nbch.credit_tracker.entities.external_request.signals; import jakarta.xml.bind.annotation.*; import lombok.Getter; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/external_errors/Error.java b/src/main/java/ru/nbch/credit_tracker/entities/external_response/errors/Error.java similarity index 89% rename from src/main/java/ru/nbch/credit_tracker/entities/response/external_errors/Error.java rename to src/main/java/ru/nbch/credit_tracker/entities/external_response/errors/Error.java index 7d8aec2..7023405 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/external_errors/Error.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/external_response/errors/Error.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.external_errors; +package ru.nbch.credit_tracker.entities.external_response.errors; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/external_errors/InputParams.java b/src/main/java/ru/nbch/credit_tracker/entities/external_response/errors/InputParams.java similarity index 88% rename from src/main/java/ru/nbch/credit_tracker/entities/response/external_errors/InputParams.java rename to src/main/java/ru/nbch/credit_tracker/entities/external_response/errors/InputParams.java index c65a4c5..b18b967 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/external_errors/InputParams.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/external_response/errors/InputParams.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.external_errors; +package ru.nbch.credit_tracker.entities.external_response.errors; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/external_errors/SgnlReport.java b/src/main/java/ru/nbch/credit_tracker/entities/external_response/errors/SgnlReport.java similarity index 87% rename from src/main/java/ru/nbch/credit_tracker/entities/response/external_errors/SgnlReport.java rename to src/main/java/ru/nbch/credit_tracker/entities/external_response/errors/SgnlReport.java index 1c0802a..321c68b 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/external_errors/SgnlReport.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/external_response/errors/SgnlReport.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.external_errors; +package ru.nbch.credit_tracker.entities.external_response.errors; import jakarta.xml.bind.annotation.*; import lombok.Getter; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/online_download/Inquiry.java b/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_download/Inquiry.java similarity index 95% rename from src/main/java/ru/nbch/credit_tracker/entities/response/online_download/Inquiry.java rename to src/main/java/ru/nbch/credit_tracker/entities/external_response/online_download/Inquiry.java index d3d49d3..90e9b48 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/online_download/Inquiry.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_download/Inquiry.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.online_download; +package ru.nbch.credit_tracker.entities.external_response.online_download; import jakarta.xml.bind.annotation.*; import lombok.Getter; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/online_download/OnlineDownloadReport.java b/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_download/OnlineDownloadReport.java similarity index 90% rename from src/main/java/ru/nbch/credit_tracker/entities/response/online_download/OnlineDownloadReport.java rename to src/main/java/ru/nbch/credit_tracker/entities/external_response/online_download/OnlineDownloadReport.java index d7c25fc..41600d6 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/online_download/OnlineDownloadReport.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_download/OnlineDownloadReport.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.online_download; +package ru.nbch.credit_tracker.entities.external_response.online_download; import jakarta.xml.bind.annotation.*; import lombok.Getter; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/online_download/Person.java b/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_download/Person.java similarity index 92% rename from src/main/java/ru/nbch/credit_tracker/entities/response/online_download/Person.java rename to src/main/java/ru/nbch/credit_tracker/entities/external_response/online_download/Person.java index 9a2fdb5..7b83f53 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/online_download/Person.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_download/Person.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.online_download; +package ru.nbch.credit_tracker.entities.external_response.online_download; import jakarta.xml.bind.annotation.*; import lombok.Getter; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/online_download/Persons.java b/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_download/Persons.java similarity index 92% rename from src/main/java/ru/nbch/credit_tracker/entities/response/online_download/Persons.java rename to src/main/java/ru/nbch/credit_tracker/entities/external_response/online_download/Persons.java index 998cd09..df298b3 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/online_download/Persons.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_download/Persons.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.online_download; +package ru.nbch.credit_tracker.entities.external_response.online_download; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/online_download/Signal.java b/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_download/Signal.java similarity index 85% rename from src/main/java/ru/nbch/credit_tracker/entities/response/online_download/Signal.java rename to src/main/java/ru/nbch/credit_tracker/entities/external_response/online_download/Signal.java index cae1ced..9672b7e 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/online_download/Signal.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_download/Signal.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.online_download; +package ru.nbch.credit_tracker.entities.external_response.online_download; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/online_report/InputParams.java b/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_report/InputParams.java similarity index 88% rename from src/main/java/ru/nbch/credit_tracker/entities/response/online_report/InputParams.java rename to src/main/java/ru/nbch/credit_tracker/entities/external_response/online_report/InputParams.java index 24b02a1..924dfbb 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/online_report/InputParams.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_report/InputParams.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.online_report; +package ru.nbch.credit_tracker.entities.external_response.online_report; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/online_report/OperationReport.java b/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_report/OperationReport.java similarity index 86% rename from src/main/java/ru/nbch/credit_tracker/entities/response/online_report/OperationReport.java rename to src/main/java/ru/nbch/credit_tracker/entities/external_response/online_report/OperationReport.java index 3acb2b8..12a5d10 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/online_report/OperationReport.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_report/OperationReport.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.online_report; +package ru.nbch.credit_tracker.entities.external_response.online_report; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/online_report/Report.java b/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_report/Report.java similarity index 90% rename from src/main/java/ru/nbch/credit_tracker/entities/response/online_report/Report.java rename to src/main/java/ru/nbch/credit_tracker/entities/external_response/online_report/Report.java index 67cf510..fd19a71 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/online_report/Report.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_report/Report.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.online_report; +package ru.nbch.credit_tracker.entities.external_response.online_report; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/online_report/Reports.java b/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_report/Reports.java similarity index 89% rename from src/main/java/ru/nbch/credit_tracker/entities/response/online_report/Reports.java rename to src/main/java/ru/nbch/credit_tracker/entities/external_response/online_report/Reports.java index df2d31b..af0631a 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/online_report/Reports.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_report/Reports.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.online_report; +package ru.nbch.credit_tracker.entities.external_response.online_report; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/online_report/SgnlOnlineReport.java b/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_report/SgnlOnlineReport.java similarity index 87% rename from src/main/java/ru/nbch/credit_tracker/entities/response/online_report/SgnlOnlineReport.java rename to src/main/java/ru/nbch/credit_tracker/entities/external_response/online_report/SgnlOnlineReport.java index 2326d2c..180ff0b 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/online_report/SgnlOnlineReport.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/external_response/online_report/SgnlOnlineReport.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.online_report; +package ru.nbch.credit_tracker.entities.external_response.online_report; import jakarta.xml.bind.annotation.*; import lombok.Getter; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/request/active_packages/MonitoringActivePackagesRequest.java b/src/main/java/ru/nbch/credit_tracker/entities/user_request/active_packages/MonitoringActivePackagesRequest.java similarity index 87% rename from src/main/java/ru/nbch/credit_tracker/entities/request/active_packages/MonitoringActivePackagesRequest.java rename to src/main/java/ru/nbch/credit_tracker/entities/user_request/active_packages/MonitoringActivePackagesRequest.java index 83f9b48..5cc5007 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/request/active_packages/MonitoringActivePackagesRequest.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_request/active_packages/MonitoringActivePackagesRequest.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.request.active_packages; +package ru.nbch.credit_tracker.entities.user_request.active_packages; import jakarta.xml.bind.annotation.*; import lombok.Getter; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/request/monitoring_request/MonitoringRequest.java b/src/main/java/ru/nbch/credit_tracker/entities/user_request/monitoring_request/MonitoringRequest.java similarity index 93% rename from src/main/java/ru/nbch/credit_tracker/entities/request/monitoring_request/MonitoringRequest.java rename to src/main/java/ru/nbch/credit_tracker/entities/user_request/monitoring_request/MonitoringRequest.java index abbb692..5bc4146 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/request/monitoring_request/MonitoringRequest.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_request/monitoring_request/MonitoringRequest.java @@ -1,5 +1,5 @@ -package ru.nbch.credit_tracker.entities.request.monitoring_request; +package ru.nbch.credit_tracker.entities.user_request.monitoring_request; import jakarta.xml.bind.annotation.*; import lombok.Getter; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/request/monitoring_request/Subject.java b/src/main/java/ru/nbch/credit_tracker/entities/user_request/monitoring_request/Subject.java similarity index 88% rename from src/main/java/ru/nbch/credit_tracker/entities/request/monitoring_request/Subject.java rename to src/main/java/ru/nbch/credit_tracker/entities/user_request/monitoring_request/Subject.java index d32f6c9..626f698 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/request/monitoring_request/Subject.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_request/monitoring_request/Subject.java @@ -1,5 +1,5 @@ -package ru.nbch.credit_tracker.entities.request.monitoring_request; +package ru.nbch.credit_tracker.entities.user_request.monitoring_request; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/request/monitoring_request/Subjects.java b/src/main/java/ru/nbch/credit_tracker/entities/user_request/monitoring_request/Subjects.java similarity index 89% rename from src/main/java/ru/nbch/credit_tracker/entities/request/monitoring_request/Subjects.java rename to src/main/java/ru/nbch/credit_tracker/entities/user_request/monitoring_request/Subjects.java index c149a5a..f23b9cb 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/request/monitoring_request/Subjects.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_request/monitoring_request/Subjects.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.request.monitoring_request; +package ru.nbch.credit_tracker.entities.user_request.monitoring_request; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/active_packages/MonitoringActivePackagesResponse.java b/src/main/java/ru/nbch/credit_tracker/entities/user_response/active_packages/MonitoringActivePackagesResponse.java similarity index 89% rename from src/main/java/ru/nbch/credit_tracker/entities/response/active_packages/MonitoringActivePackagesResponse.java rename to src/main/java/ru/nbch/credit_tracker/entities/user_response/active_packages/MonitoringActivePackagesResponse.java index d42631b..19e45a6 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/active_packages/MonitoringActivePackagesResponse.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_response/active_packages/MonitoringActivePackagesResponse.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.active_packages; +package ru.nbch.credit_tracker.entities.user_response.active_packages; import jakarta.xml.bind.annotation.*; import lombok.Getter; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/active_packages/Package.java b/src/main/java/ru/nbch/credit_tracker/entities/user_response/active_packages/Package.java similarity index 88% rename from src/main/java/ru/nbch/credit_tracker/entities/response/active_packages/Package.java rename to src/main/java/ru/nbch/credit_tracker/entities/user_response/active_packages/Package.java index 661d5ef..969006b 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/active_packages/Package.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_response/active_packages/Package.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.active_packages; +package ru.nbch.credit_tracker.entities.user_response.active_packages; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/active_packages/Packages.java b/src/main/java/ru/nbch/credit_tracker/entities/user_response/active_packages/Packages.java similarity index 89% rename from src/main/java/ru/nbch/credit_tracker/entities/response/active_packages/Packages.java rename to src/main/java/ru/nbch/credit_tracker/entities/user_response/active_packages/Packages.java index b7ad1b3..e78aae8 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/active_packages/Packages.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_response/active_packages/Packages.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.active_packages; +package ru.nbch.credit_tracker.entities.user_response.active_packages; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/errors/CommonError.java b/src/main/java/ru/nbch/credit_tracker/entities/user_response/errors/CommonError.java similarity index 70% rename from src/main/java/ru/nbch/credit_tracker/entities/response/errors/CommonError.java rename to src/main/java/ru/nbch/credit_tracker/entities/user_response/errors/CommonError.java index 69f1632..2cf67e2 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/errors/CommonError.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_response/errors/CommonError.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.errors; +package ru.nbch.credit_tracker.entities.user_response.errors; public interface CommonError { void setStatus(String status); diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringActivePackagesError.java b/src/main/java/ru/nbch/credit_tracker/entities/user_response/errors/MonitoringActivePackagesError.java similarity index 91% rename from src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringActivePackagesError.java rename to src/main/java/ru/nbch/credit_tracker/entities/user_response/errors/MonitoringActivePackagesError.java index d4d3f90..4813cc9 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringActivePackagesError.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_response/errors/MonitoringActivePackagesError.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.errors; +package ru.nbch.credit_tracker.entities.user_response.errors; import jakarta.xml.bind.annotation.*; import lombok.Getter; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringDownloadError.java b/src/main/java/ru/nbch/credit_tracker/entities/user_response/errors/MonitoringDownloadError.java similarity index 90% rename from src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringDownloadError.java rename to src/main/java/ru/nbch/credit_tracker/entities/user_response/errors/MonitoringDownloadError.java index 13e1131..a36a460 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringDownloadError.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_response/errors/MonitoringDownloadError.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.errors; +package ru.nbch.credit_tracker.entities.user_response.errors; import jakarta.xml.bind.annotation.*; import lombok.Getter; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringError.java b/src/main/java/ru/nbch/credit_tracker/entities/user_response/errors/MonitoringError.java similarity index 90% rename from src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringError.java rename to src/main/java/ru/nbch/credit_tracker/entities/user_response/errors/MonitoringError.java index 0020463..8de6baf 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringError.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_response/errors/MonitoringError.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.errors; +package ru.nbch.credit_tracker.entities.user_response.errors; import jakarta.xml.bind.annotation.*; import lombok.Getter; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringPackageDeleteError.java b/src/main/java/ru/nbch/credit_tracker/entities/user_response/errors/MonitoringPackageDeleteError.java similarity index 91% rename from src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringPackageDeleteError.java rename to src/main/java/ru/nbch/credit_tracker/entities/user_response/errors/MonitoringPackageDeleteError.java index b13216a..cd395f6 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringPackageDeleteError.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_response/errors/MonitoringPackageDeleteError.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.errors; +package ru.nbch.credit_tracker.entities.user_response.errors; import jakarta.xml.bind.annotation.*; import lombok.Getter; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringReportListError.java b/src/main/java/ru/nbch/credit_tracker/entities/user_response/errors/MonitoringReportListError.java similarity index 90% rename from src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringReportListError.java rename to src/main/java/ru/nbch/credit_tracker/entities/user_response/errors/MonitoringReportListError.java index 8250222..7b5701a 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/errors/MonitoringReportListError.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_response/errors/MonitoringReportListError.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.errors; +package ru.nbch.credit_tracker.entities.user_response.errors; import jakarta.xml.bind.annotation.*; import lombok.Getter; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/monitoring_signal_response/MonitoringSignalResponse.java b/src/main/java/ru/nbch/credit_tracker/entities/user_response/monitoring_signal_response/MonitoringSignalResponse.java similarity index 85% rename from src/main/java/ru/nbch/credit_tracker/entities/response/monitoring_signal_response/MonitoringSignalResponse.java rename to src/main/java/ru/nbch/credit_tracker/entities/user_response/monitoring_signal_response/MonitoringSignalResponse.java index f516cef..85409b9 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/monitoring_signal_response/MonitoringSignalResponse.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_response/monitoring_signal_response/MonitoringSignalResponse.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.monitoring_signal_response; +package ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response; import jakarta.xml.bind.annotation.*; import lombok.Getter; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/monitoring_signal_response/Signal.java b/src/main/java/ru/nbch/credit_tracker/entities/user_response/monitoring_signal_response/Signal.java similarity index 89% rename from src/main/java/ru/nbch/credit_tracker/entities/response/monitoring_signal_response/Signal.java rename to src/main/java/ru/nbch/credit_tracker/entities/user_response/monitoring_signal_response/Signal.java index 0fd67bd..8720cec 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/monitoring_signal_response/Signal.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_response/monitoring_signal_response/Signal.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.monitoring_signal_response; +package ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/monitoring_signal_response/Signals.java b/src/main/java/ru/nbch/credit_tracker/entities/user_response/monitoring_signal_response/Signals.java similarity index 91% rename from src/main/java/ru/nbch/credit_tracker/entities/response/monitoring_signal_response/Signals.java rename to src/main/java/ru/nbch/credit_tracker/entities/user_response/monitoring_signal_response/Signals.java index 24d5b46..a243be0 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/monitoring_signal_response/Signals.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_response/monitoring_signal_response/Signals.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.monitoring_signal_response; +package ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/monitoring_signal_response/Subject.java b/src/main/java/ru/nbch/credit_tracker/entities/user_response/monitoring_signal_response/Subject.java similarity index 91% rename from src/main/java/ru/nbch/credit_tracker/entities/response/monitoring_signal_response/Subject.java rename to src/main/java/ru/nbch/credit_tracker/entities/user_response/monitoring_signal_response/Subject.java index 0def04e..5987f90 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/monitoring_signal_response/Subject.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_response/monitoring_signal_response/Subject.java @@ -1,5 +1,5 @@ -package ru.nbch.credit_tracker.entities.response.monitoring_signal_response; +package ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/monitoring_signal_response/Subjects.java b/src/main/java/ru/nbch/credit_tracker/entities/user_response/monitoring_signal_response/Subjects.java similarity index 91% rename from src/main/java/ru/nbch/credit_tracker/entities/response/monitoring_signal_response/Subjects.java rename to src/main/java/ru/nbch/credit_tracker/entities/user_response/monitoring_signal_response/Subjects.java index 86effd5..00cc46a 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/monitoring_signal_response/Subjects.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_response/monitoring_signal_response/Subjects.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.monitoring_signal_response; +package ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/success/MonitoringPackageDeleteResponse.java b/src/main/java/ru/nbch/credit_tracker/entities/user_response/success/MonitoringPackageDeleteResponse.java similarity index 91% rename from src/main/java/ru/nbch/credit_tracker/entities/response/success/MonitoringPackageDeleteResponse.java rename to src/main/java/ru/nbch/credit_tracker/entities/user_response/success/MonitoringPackageDeleteResponse.java index 3dab92e..2867518 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/success/MonitoringPackageDeleteResponse.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_response/success/MonitoringPackageDeleteResponse.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.success; +package ru.nbch.credit_tracker.entities.user_response.success; import jakarta.xml.bind.annotation.*; import lombok.Getter; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/success/MonitoringReportListResponse.java b/src/main/java/ru/nbch/credit_tracker/entities/user_response/success/MonitoringReportListResponse.java similarity index 94% rename from src/main/java/ru/nbch/credit_tracker/entities/response/success/MonitoringReportListResponse.java rename to src/main/java/ru/nbch/credit_tracker/entities/user_response/success/MonitoringReportListResponse.java index 831181a..0b9f361 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/success/MonitoringReportListResponse.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_response/success/MonitoringReportListResponse.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.success; +package ru.nbch.credit_tracker.entities.user_response.success; import jakarta.xml.bind.annotation.*; import lombok.Getter; diff --git a/src/main/java/ru/nbch/credit_tracker/entities/response/success/MonitoringResponse.java b/src/main/java/ru/nbch/credit_tracker/entities/user_response/success/MonitoringSetupResponse.java similarity index 77% rename from src/main/java/ru/nbch/credit_tracker/entities/response/success/MonitoringResponse.java rename to src/main/java/ru/nbch/credit_tracker/entities/user_response/success/MonitoringSetupResponse.java index a56676e..0275e76 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/response/success/MonitoringResponse.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_response/success/MonitoringSetupResponse.java @@ -1,4 +1,4 @@ -package ru.nbch.credit_tracker.entities.response.success; +package ru.nbch.credit_tracker.entities.user_response.success; import jakarta.xml.bind.annotation.*; import lombok.Getter; @@ -11,7 +11,7 @@ import lombok.Setter; "status", }) @XmlRootElement(name = "MonitoringResponse") -public class MonitoringResponse { +public class MonitoringSetupResponse { @XmlElement(name = "Status", required = true) protected String status = "OK"; diff --git a/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java b/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java index faec5bd..3c9cb37 100644 --- a/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java +++ b/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java @@ -9,15 +9,15 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; import ru.nbch.credit_tracker.entities.dto.UserPackage; -import ru.nbch.credit_tracker.entities.request.active_packages.MonitoringActivePackagesRequest; -import ru.nbch.credit_tracker.entities.request.monitoring_request.MonitoringRequest; -import ru.nbch.credit_tracker.entities.request.monitoring_request.Subject; -import ru.nbch.credit_tracker.entities.response.active_packages.MonitoringActivePackagesResponse; -import ru.nbch.credit_tracker.entities.response.active_packages.Package; -import ru.nbch.credit_tracker.entities.response.active_packages.Packages; -import ru.nbch.credit_tracker.entities.response.success.MonitoringPackageDeleteResponse; -import ru.nbch.credit_tracker.entities.response.success.MonitoringReportListResponse; -import ru.nbch.credit_tracker.entities.response.success.MonitoringResponse; +import ru.nbch.credit_tracker.entities.user_request.active_packages.MonitoringActivePackagesRequest; +import ru.nbch.credit_tracker.entities.user_request.monitoring_request.MonitoringRequest; +import ru.nbch.credit_tracker.entities.user_request.monitoring_request.Subject; +import ru.nbch.credit_tracker.entities.user_response.active_packages.MonitoringActivePackagesResponse; +import ru.nbch.credit_tracker.entities.user_response.active_packages.Package; +import ru.nbch.credit_tracker.entities.user_response.active_packages.Packages; +import ru.nbch.credit_tracker.entities.user_response.success.MonitoringPackageDeleteResponse; +import ru.nbch.credit_tracker.entities.user_response.success.MonitoringReportListResponse; +import ru.nbch.credit_tracker.entities.user_response.success.MonitoringSetupResponse; import ru.nbch.credit_tracker.enums.SignalError; import ru.nbch.credit_tracker.enums.Status; import ru.nbch.credit_tracker.enums.XmlErrorFormat; @@ -71,7 +71,7 @@ public class SignalFacade { this.maxXmlFileSize = config.getMaxXmlFileSize() * 1024 * 1024; } - public ResponseEntity setupMonitoring(MultipartFile file) { + public ResponseEntity setupMonitoring(MultipartFile file) { // первичные валидации if (file.isEmpty() || !isZipFile(file)) { throw clientExcp(SignalError.ERROR_001, XmlErrorFormat.MonitoringError); @@ -153,7 +153,7 @@ public class SignalFacade { // в отдельном потоке запускаем регистрацию субъектов, поиск фидов и расчет флагов просрочек registerFidsAndDebts(packageId, monitoringRequest.getPackageName(), monitoringRequest.getSubjects().getSubject()); - return ResponseEntity.ok().body(new MonitoringResponse()); + return ResponseEntity.ok().body(new MonitoringSetupResponse()); } private void registerFidsAndDebts(Integer packageId, String packageName, List subjects) { diff --git a/src/main/java/ru/nbch/credit_tracker/mapper/signal/PhoneFidMapMapper.java b/src/main/java/ru/nbch/credit_tracker/mapper/signal/PhoneFidMapMapper.java index c8c29d8..5c4d64b 100644 --- a/src/main/java/ru/nbch/credit_tracker/mapper/signal/PhoneFidMapMapper.java +++ b/src/main/java/ru/nbch/credit_tracker/mapper/signal/PhoneFidMapMapper.java @@ -3,7 +3,7 @@ package ru.nbch.credit_tracker.mapper.signal; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import ru.nbch.credit_tracker.entities.dto.PhoneFidMap; -import ru.nbch.credit_tracker.entities.request.monitoring_request.Subject; +import ru.nbch.credit_tracker.entities.user_request.monitoring_request.Subject; import java.util.List; diff --git a/src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java b/src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java index 716cb55..02b22cc 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/MonitoringService.java @@ -8,15 +8,15 @@ import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; import ru.nbch.credit_tracker.entities.dto.Hit; import ru.nbch.credit_tracker.entities.dto.PhoneFidMap; import ru.nbch.credit_tracker.entities.dto.UserPackage; -import ru.nbch.credit_tracker.entities.response.monitoring_signal_response.MonitoringSignalResponse; -import ru.nbch.credit_tracker.entities.response.monitoring_signal_response.Signal; -import ru.nbch.credit_tracker.entities.response.monitoring_signal_response.Signals; -import ru.nbch.credit_tracker.entities.response.monitoring_signal_response.Subject; -import ru.nbch.credit_tracker.entities.response.online_download.Inquiry; -import ru.nbch.credit_tracker.entities.response.online_download.Person; -import ru.nbch.credit_tracker.entities.response.online_download.Persons; -import ru.nbch.credit_tracker.entities.response.online_report.Report; -import ru.nbch.credit_tracker.entities.response.online_report.SgnlOnlineReport; +import ru.nbch.credit_tracker.entities.external_response.online_download.Inquiry; +import ru.nbch.credit_tracker.entities.external_response.online_download.Person; +import ru.nbch.credit_tracker.entities.external_response.online_download.Persons; +import ru.nbch.credit_tracker.entities.external_response.online_report.Report; +import ru.nbch.credit_tracker.entities.external_response.online_report.SgnlOnlineReport; +import ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response.MonitoringSignalResponse; +import ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response.Signal; +import ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response.Signals; +import ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response.Subject; import ru.nbch.credit_tracker.service.signal.SignalRestService; import ru.nbch.credit_tracker.service.xml.stax.MonitoringSignalResponseStaxXmlWriter; import ru.nbch.credit_tracker.service.xml.stax.StaxXmlProcessor; diff --git a/src/main/java/ru/nbch/credit_tracker/service/SignalService.java b/src/main/java/ru/nbch/credit_tracker/service/SignalService.java index e71435d..dcc8277 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/SignalService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/SignalService.java @@ -7,11 +7,11 @@ import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; import ru.nbch.credit_tracker.entities.dto.Hit; import ru.nbch.credit_tracker.entities.dto.PhoneFidMap; import ru.nbch.credit_tracker.entities.dto.UserPackage; -import ru.nbch.credit_tracker.entities.request.monitoring_request.MonitoringRequest; -import ru.nbch.credit_tracker.entities.request.monitoring_request.Subject; -import ru.nbch.credit_tracker.entities.signal_package.Auth; -import ru.nbch.credit_tracker.entities.signal_package.Person; -import ru.nbch.credit_tracker.entities.signal_package.Signals; +import ru.nbch.credit_tracker.entities.external_request.signals.Auth; +import ru.nbch.credit_tracker.entities.external_request.signals.Person; +import ru.nbch.credit_tracker.entities.external_request.signals.Signals; +import ru.nbch.credit_tracker.entities.user_request.monitoring_request.MonitoringRequest; +import ru.nbch.credit_tracker.entities.user_request.monitoring_request.Subject; import ru.nbch.credit_tracker.enums.Status; import ru.nbch.credit_tracker.service.indic.FlagsService; import ru.nbch.credit_tracker.service.indic.PersonService; diff --git a/src/main/java/ru/nbch/credit_tracker/service/signal/PhoneFidMapService.java b/src/main/java/ru/nbch/credit_tracker/service/signal/PhoneFidMapService.java index 1766fc1..7512ad3 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/signal/PhoneFidMapService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/signal/PhoneFidMapService.java @@ -2,7 +2,7 @@ package ru.nbch.credit_tracker.service.signal; import org.springframework.stereotype.Service; import ru.nbch.credit_tracker.entities.dto.PhoneFidMap; -import ru.nbch.credit_tracker.entities.request.monitoring_request.Subject; +import ru.nbch.credit_tracker.entities.user_request.monitoring_request.Subject; import ru.nbch.credit_tracker.mapper.signal.PhoneFidMapMapper; import java.util.List; diff --git a/src/main/java/ru/nbch/credit_tracker/service/signal/SignalRestService.java b/src/main/java/ru/nbch/credit_tracker/service/signal/SignalRestService.java index bed25e4..dd88b02 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/signal/SignalRestService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/signal/SignalRestService.java @@ -12,8 +12,8 @@ import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; import ru.nbch.credit_tracker.entities.dto.PhoneFidMap; -import ru.nbch.credit_tracker.entities.response.external_errors.SgnlReport; -import ru.nbch.credit_tracker.entities.response.online_report.SgnlOnlineReport; +import ru.nbch.credit_tracker.entities.external_response.errors.SgnlReport; +import ru.nbch.credit_tracker.entities.external_response.online_report.SgnlOnlineReport; import ru.nbch.credit_tracker.service.SignalService; import ru.nbch.credit_tracker.service.xml.jaxb.IXmlProcessor; import ru.nbch.credit_tracker.service.xml.stax.StaxXmlProcessor; diff --git a/src/main/java/ru/nbch/credit_tracker/service/xml/stax/MonitoringRequestStaxReader.java b/src/main/java/ru/nbch/credit_tracker/service/xml/stax/MonitoringRequestStaxReader.java index 8bf1ffc..26852c2 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/xml/stax/MonitoringRequestStaxReader.java +++ b/src/main/java/ru/nbch/credit_tracker/service/xml/stax/MonitoringRequestStaxReader.java @@ -1,6 +1,6 @@ package ru.nbch.credit_tracker.service.xml.stax; -import ru.nbch.credit_tracker.entities.request.monitoring_request.MonitoringRequest; +import ru.nbch.credit_tracker.entities.user_request.monitoring_request.MonitoringRequest; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; diff --git a/src/main/java/ru/nbch/credit_tracker/service/xml/stax/MonitoringSignalResponseStaxXmlReader.java b/src/main/java/ru/nbch/credit_tracker/service/xml/stax/MonitoringSignalResponseStaxXmlReader.java index adc800f..df47c04 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/xml/stax/MonitoringSignalResponseStaxXmlReader.java +++ b/src/main/java/ru/nbch/credit_tracker/service/xml/stax/MonitoringSignalResponseStaxXmlReader.java @@ -1,7 +1,7 @@ package ru.nbch.credit_tracker.service.xml.stax; import lombok.extern.slf4j.Slf4j; -import ru.nbch.credit_tracker.entities.response.monitoring_signal_response.MonitoringSignalResponse; +import ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response.MonitoringSignalResponse; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; diff --git a/src/main/java/ru/nbch/credit_tracker/service/xml/stax/MonitoringSignalResponseStaxXmlWriter.java b/src/main/java/ru/nbch/credit_tracker/service/xml/stax/MonitoringSignalResponseStaxXmlWriter.java index 9597d51..f3eed2f 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/xml/stax/MonitoringSignalResponseStaxXmlWriter.java +++ b/src/main/java/ru/nbch/credit_tracker/service/xml/stax/MonitoringSignalResponseStaxXmlWriter.java @@ -1,10 +1,10 @@ package ru.nbch.credit_tracker.service.xml.stax; import lombok.extern.slf4j.Slf4j; -import ru.nbch.credit_tracker.entities.response.monitoring_signal_response.MonitoringSignalResponse; -import ru.nbch.credit_tracker.entities.response.monitoring_signal_response.Signal; -import ru.nbch.credit_tracker.entities.response.monitoring_signal_response.Signals; -import ru.nbch.credit_tracker.entities.response.monitoring_signal_response.Subject; +import ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response.MonitoringSignalResponse; +import ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response.Signal; +import ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response.Signals; +import ru.nbch.credit_tracker.entities.user_response.monitoring_signal_response.Subject; import javax.xml.stream.XMLEventFactory; import javax.xml.stream.XMLEventWriter; diff --git a/src/main/java/ru/nbch/credit_tracker/service/xml/stax/OnlineDownloadReportPersonsStaxReader.java b/src/main/java/ru/nbch/credit_tracker/service/xml/stax/OnlineDownloadReportPersonsStaxReader.java index c85fef8..1126573 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/xml/stax/OnlineDownloadReportPersonsStaxReader.java +++ b/src/main/java/ru/nbch/credit_tracker/service/xml/stax/OnlineDownloadReportPersonsStaxReader.java @@ -1,7 +1,7 @@ package ru.nbch.credit_tracker.service.xml.stax; import lombok.extern.slf4j.Slf4j; -import ru.nbch.credit_tracker.entities.response.online_download.Persons; +import ru.nbch.credit_tracker.entities.external_response.online_download.Persons; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; diff --git a/src/main/java/ru/nbch/credit_tracker/service/xml/stax/SgnlReportStatusStaxReader.java b/src/main/java/ru/nbch/credit_tracker/service/xml/stax/SgnlReportStatusStaxReader.java index a4da8b1..d01f9ab 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/xml/stax/SgnlReportStatusStaxReader.java +++ b/src/main/java/ru/nbch/credit_tracker/service/xml/stax/SgnlReportStatusStaxReader.java @@ -1,9 +1,9 @@ package ru.nbch.credit_tracker.service.xml.stax; import org.springframework.stereotype.Component; -import ru.nbch.credit_tracker.entities.response.external_errors.Error; -import ru.nbch.credit_tracker.entities.response.external_errors.InputParams; -import ru.nbch.credit_tracker.entities.response.external_errors.SgnlReport; +import ru.nbch.credit_tracker.entities.external_response.errors.Error; +import ru.nbch.credit_tracker.entities.external_response.errors.InputParams; +import ru.nbch.credit_tracker.entities.external_response.errors.SgnlReport; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; diff --git a/src/main/java/ru/nbch/credit_tracker/service/xml/stax/SignalsStaxXmlWriter.java b/src/main/java/ru/nbch/credit_tracker/service/xml/stax/SignalsStaxXmlWriter.java index b009e4b..07ef367 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/xml/stax/SignalsStaxXmlWriter.java +++ b/src/main/java/ru/nbch/credit_tracker/service/xml/stax/SignalsStaxXmlWriter.java @@ -1,9 +1,9 @@ package ru.nbch.credit_tracker.service.xml.stax; import lombok.extern.slf4j.Slf4j; -import ru.nbch.credit_tracker.entities.signal_package.Auth; -import ru.nbch.credit_tracker.entities.signal_package.Person; -import ru.nbch.credit_tracker.entities.signal_package.Signals; +import ru.nbch.credit_tracker.entities.external_request.signals.Auth; +import ru.nbch.credit_tracker.entities.external_request.signals.Person; +import ru.nbch.credit_tracker.entities.external_request.signals.Signals; import javax.xml.stream.XMLEventFactory; import javax.xml.stream.XMLEventWriter; diff --git a/src/main/java/ru/nbch/credit_tracker/utils/ValidationUtil.java b/src/main/java/ru/nbch/credit_tracker/utils/ValidationUtil.java index bdfb989..d0068b2 100644 --- a/src/main/java/ru/nbch/credit_tracker/utils/ValidationUtil.java +++ b/src/main/java/ru/nbch/credit_tracker/utils/ValidationUtil.java @@ -1,7 +1,7 @@ package ru.nbch.credit_tracker.utils; -import ru.nbch.credit_tracker.entities.request.monitoring_request.MonitoringRequest; -import ru.nbch.credit_tracker.entities.request.monitoring_request.Subject; +import ru.nbch.credit_tracker.entities.user_request.monitoring_request.MonitoringRequest; +import ru.nbch.credit_tracker.entities.user_request.monitoring_request.Subject; import ru.nbch.credit_tracker.enums.SignalError; import ru.nbch.credit_tracker.enums.XmlErrorFormat; import ru.nbch.credit_tracker.exceptions.SignalClientException; diff --git a/src/test/java/ru/nbch/credit_tracker/stax/StaxTest.java b/src/test/java/ru/nbch/credit_tracker/stax/StaxTest.java index 5598dd0..6a27d08 100644 --- a/src/test/java/ru/nbch/credit_tracker/stax/StaxTest.java +++ b/src/test/java/ru/nbch/credit_tracker/stax/StaxTest.java @@ -6,10 +6,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import ru.nbch.credit_tracker.entities.request.monitoring_request.MonitoringRequest; -import ru.nbch.credit_tracker.entities.request.monitoring_request.Subject; -import ru.nbch.credit_tracker.entities.response.online_download.Person; -import ru.nbch.credit_tracker.entities.response.online_download.Persons; +import ru.nbch.credit_tracker.entities.external_response.online_download.Person; +import ru.nbch.credit_tracker.entities.external_response.online_download.Persons; +import ru.nbch.credit_tracker.entities.user_request.monitoring_request.MonitoringRequest; +import ru.nbch.credit_tracker.entities.user_request.monitoring_request.Subject; import ru.nbch.credit_tracker.service.xml.stax.*; import javax.xml.stream.XMLStreamException; diff --git a/src/test/java/ru/nbch/credit_tracker/utils/UtilTest.java b/src/test/java/ru/nbch/credit_tracker/utils/UtilTest.java index c737601..2c773fc 100644 --- a/src/test/java/ru/nbch/credit_tracker/utils/UtilTest.java +++ b/src/test/java/ru/nbch/credit_tracker/utils/UtilTest.java @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import ru.nbch.credit_tracker.entities.request.monitoring_request.MonitoringRequest; +import ru.nbch.credit_tracker.entities.user_request.monitoring_request.MonitoringRequest; import ru.nbch.credit_tracker.enums.SignalError; import ru.nbch.credit_tracker.enums.XmlErrorFormat; import ru.nbch.credit_tracker.exceptions.SignalClientException;