Splited entities to user and external

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;
 

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;

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

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<MonitoringResponse> setupMonitoring(@RequestParam("file") MultipartFile file) {
+    public ResponseEntity<MonitoringSetupResponse> setupMonitoring(@RequestParam("file") MultipartFile file) {
         return signalFacade.setupMonitoring(file);
     }
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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);

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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";

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<MonitoringResponse> setupMonitoring(MultipartFile file) {
+    public ResponseEntity<MonitoringSetupResponse> 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<Subject> subjects) {

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;