diff --git a/docker_compose/credit_tracker_config.env b/docker_compose/credit_tracker_config.env index 5f68a9d..b395b4f 100644 --- a/docker_compose/credit_tracker_config.env +++ b/docker_compose/credit_tracker_config.env @@ -1,5 +1,5 @@ #commons -APP_VERSION=1.14 +APP_VERSION=1.15 REGISTRY_URL=rh8-vm3.nbki.msk:5000 JMX_PORT= JMX_HOSTNAME= diff --git a/pom.xml b/pom.xml index f68a9e1..f876eb6 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ ru.nbch credit-tracker - 1.14 + 1.15 credit_tracker Credit Tracker Application 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 00b268b..cb7037b 100644 --- a/src/main/java/ru/nbch/credit_tracker/controller/SignalController.java +++ b/src/main/java/ru/nbch/credit_tracker/controller/SignalController.java @@ -6,7 +6,9 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import ru.nbch.credit_tracker.entities.user_request.active_packages.MonitoringActivePackagesRequest; +import ru.nbch.credit_tracker.entities.user_request.all_packages.MonitoringAllPackagesRequest; import ru.nbch.credit_tracker.entities.user_response.active_packages.MonitoringActivePackagesResponse; +import ru.nbch.credit_tracker.entities.user_response.all_packages.MonitoringAllPackagesResponse; 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; @@ -33,8 +35,8 @@ public class SignalController { } @PostMapping(value = "/all_packages", consumes = MediaType.APPLICATION_XML_VALUE, produces = MediaType.APPLICATION_XML_VALUE) - public ResponseEntity findAllPackages(@RequestBody MonitoringActivePackagesRequest activePackagesRequest) { - return signalFacade.findAllPackages(activePackagesRequest); + public ResponseEntity findAllPackages(@RequestBody MonitoringAllPackagesRequest allPackagesRequest) { + return signalFacade.findAllPackages(allPackagesRequest); } @PostMapping(value = "/delete", params = {"username", "packageName"}, produces = MediaType.APPLICATION_XML_VALUE) diff --git a/src/main/java/ru/nbch/credit_tracker/entities/user_request/all_packages/MonitoringAllPackagesRequest.java b/src/main/java/ru/nbch/credit_tracker/entities/user_request/all_packages/MonitoringAllPackagesRequest.java new file mode 100644 index 0000000..94a39c9 --- /dev/null +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_request/all_packages/MonitoringAllPackagesRequest.java @@ -0,0 +1,22 @@ + +package ru.nbch.credit_tracker.entities.user_request.all_packages; + +import jakarta.xml.bind.annotation.*; +import lombok.Getter; +import lombok.Setter; + +@Setter +@Getter +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "userId", + "password" +}) +@XmlRootElement(name = "MonitoringAllPackagesRequest") +public class MonitoringAllPackagesRequest { + + @XmlElement(name = "UserId", required = true) + protected String userId; + @XmlElement(name = "Password", required = true) + protected String password; +} diff --git a/src/main/java/ru/nbch/credit_tracker/entities/user_response/active_packages/Package.java b/src/main/java/ru/nbch/credit_tracker/entities/user_response/active_packages/Package.java index e56d1c2..969006b 100644 --- a/src/main/java/ru/nbch/credit_tracker/entities/user_response/active_packages/Package.java +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_response/active_packages/Package.java @@ -12,9 +12,7 @@ import lombok.Setter; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { "packageName", - "createdAt", - "status", - "deactivatedAt" + "createdAt" }) public class Package { @@ -22,8 +20,4 @@ public class Package { protected String packageName; @XmlElement(name = "CreatedAt", required = true) protected String createdAt; - @XmlElement(name = "Status", required = false) - protected String status; - @XmlElement(name = "DeactivatedAt", required = false) - protected String deactivatedAt; } diff --git a/src/main/java/ru/nbch/credit_tracker/entities/user_response/all_packages/MonitoringAllPackagesResponse.java b/src/main/java/ru/nbch/credit_tracker/entities/user_response/all_packages/MonitoringAllPackagesResponse.java new file mode 100644 index 0000000..dbfe20b --- /dev/null +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_response/all_packages/MonitoringAllPackagesResponse.java @@ -0,0 +1,24 @@ +package ru.nbch.credit_tracker.entities.user_response.all_packages; + +import jakarta.xml.bind.annotation.*; +import lombok.Getter; +import lombok.Setter; + +@Setter +@Getter +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "status", + "membercode", + "packages" +}) +@XmlRootElement(name = "MonitoringAllPackagesResponse") +public class MonitoringAllPackagesResponse { + + @XmlElement(name = "Status", required = true) + protected String status; + @XmlElement(name = "Membercode", required = true) + protected String membercode; + @XmlElement(name = "Packages", required = true) + protected PackagesAll packages; +} diff --git a/src/main/java/ru/nbch/credit_tracker/entities/user_response/all_packages/PackageAll.java b/src/main/java/ru/nbch/credit_tracker/entities/user_response/all_packages/PackageAll.java new file mode 100644 index 0000000..bbec537 --- /dev/null +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_response/all_packages/PackageAll.java @@ -0,0 +1,29 @@ +package ru.nbch.credit_tracker.entities.user_response.all_packages; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import lombok.Getter; +import lombok.Setter; + +@Setter +@Getter +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "packageName", + "createdAt", + "status", + "deactivatedAt" +}) +public class PackageAll { + + @XmlElement(name = "PackageName", required = true) + protected String packageName; + @XmlElement(name = "CreatedAt", required = true) + protected String createdAt; + @XmlElement(name = "Status", required = false) + protected String status; + @XmlElement(name = "DeactivatedAt", required = false) + protected String deactivatedAt; +} diff --git a/src/main/java/ru/nbch/credit_tracker/entities/user_response/all_packages/PackagesAll.java b/src/main/java/ru/nbch/credit_tracker/entities/user_response/all_packages/PackagesAll.java new file mode 100644 index 0000000..11c311b --- /dev/null +++ b/src/main/java/ru/nbch/credit_tracker/entities/user_response/all_packages/PackagesAll.java @@ -0,0 +1,26 @@ +package ru.nbch.credit_tracker.entities.user_response.all_packages; + +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; + +import java.util.ArrayList; +import java.util.List; + +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "packages" +}) +public class PackagesAll { + + @XmlElement(name = "Package", required = true) + protected List packages; + + public List getPackages() { + if (packages == null) { + packages = new ArrayList<>(); + } + return this.packages; + } +} 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 e70cac6..218a1c8 100644 --- a/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java +++ b/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java @@ -10,10 +10,14 @@ 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.user_request.active_packages.MonitoringActivePackagesRequest; +import ru.nbch.credit_tracker.entities.user_request.all_packages.MonitoringAllPackagesRequest; import ru.nbch.credit_tracker.entities.user_request.monitoring_request.MonitoringRequest; 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.all_packages.MonitoringAllPackagesResponse; +import ru.nbch.credit_tracker.entities.user_response.all_packages.PackageAll; +import ru.nbch.credit_tracker.entities.user_response.all_packages.PackagesAll; 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; @@ -282,21 +286,21 @@ public class SignalFacade { } } - public ResponseEntity findAllPackages(MonitoringActivePackagesRequest activePackagesRequest) { + public ResponseEntity findAllPackages(MonitoringAllPackagesRequest allPackagesRequest) { try { - AuthorizationService.AuthResult authResult = authorizationService.findAuthInfo(activePackagesRequest.getUserId(), activePackagesRequest.getPassword()); + AuthorizationService.AuthResult authResult = authorizationService.findAuthInfo(allPackagesRequest.getUserId(), allPackagesRequest.getPassword()); if (!authResult.isSuccess()) { throw clientExcp(authResult.getError(), XmlErrorFormat.MonitoringActivePackagesError); } - List activePackages = signalService.findAllPackages(activePackagesRequest.getUserId()); + List activePackages = signalService.findAllPackages(allPackagesRequest.getUserId()); if (!activePackages.isEmpty()) { - MonitoringActivePackagesResponse response = new MonitoringActivePackagesResponse(); + MonitoringAllPackagesResponse response = new MonitoringAllPackagesResponse(); response.setStatus("OK"); - response.setMembercode(activePackagesRequest.getUserId().substring(0, 6)); - Packages packages = new Packages(); + response.setMembercode(allPackagesRequest.getUserId().substring(0, 6)); + PackagesAll packages = new PackagesAll(); activePackages.forEach(data -> { - Package pack = new Package(); + PackageAll pack = new PackageAll(); pack.setPackageName(data.getPackageName()); pack.setCreatedAt(data.getCreatedAt() != null ? data.getCreatedAt().toString() : null); pack.setStatus(data.getStatus());