From be58666afc0020a408185589b2fbb1c334fa8d3f Mon Sep 17 00:00:00 2001 From: akulikov Date: Thu, 28 Dec 2023 13:59:55 +0300 Subject: [PATCH] remove validation role for reports-service --- .../reports/services/ReportService.java | 24 ++++--------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java index a391e7b57..260c1d456 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java @@ -25,7 +25,6 @@ import ru.spcex.clearing.reports.builders.ReportInfo; import ru.spcex.clearing.reports.builders.SessionIdParam; import ru.spcex.clearing.reports.config.SFTPReportsConfig; import ru.spcex.clearing.reports.config.settings.ReportsServiceSettings; -import ru.spcex.clearing.util.security.UserRoleVerification; import ru.spcex.clearing.validation.common.ValidationHelper; import ru.spcex.platform.enumeration.ReportBuilderType; import ru.spcex.platform.enumeration.ReportKeys; @@ -44,7 +43,6 @@ import java.util.stream.Collectors; @Service public class ReportService extends QueueConsumer implements InitializingBean { private final Logger log = LoggerFactory.getLogger(getClass()); - private final UserRoleVerification userRoleVerification; private final ValidationHelper validationHelper; private final KafkaSender kafkaSender; @@ -69,7 +67,6 @@ public class ReportService extends QueueConsumer implements InitializingBean { public ReportService(Consumer kafkaQueue, Producer kafkaResponseQueue, KafkaSender kafkaSender, - UserRoleVerification userRoleVerification, ValidationHelper validationHelper, ReportsServiceSettings reportsServiceSettings, @@ -101,7 +98,6 @@ public class ReportService extends QueueConsumer implements InitializingBean { SFTPReportsConfig.ReportsGateway reportsSftpGateway ) { super(kafkaQueue, kafkaResponseQueue); - this.userRoleVerification = userRoleVerification; this.validationHelper = validationHelper; this.kafkaSender = kafkaSender; this.reportRequestValidator = reportRequestValidator; @@ -149,10 +145,8 @@ public class ReportService extends QueueConsumer implements InitializingBean { public RequestInfoUpdate createReport(BaseRequest userRequest) { log.debug("ReportRequest received"); - RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(userRequest); - if (requestInfoUpdate != null) return null; - requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, reportRequestValidator); + RequestInfoUpdate requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, reportRequestValidator); if (requestInfoUpdate != null) return null; ReportRequest req = userRequest.getRequestPayload(); @@ -188,10 +182,8 @@ public class ReportService extends QueueConsumer implements InitializingBean { public RequestInfoUpdate createReportForSessionId(BaseRequest userRequest) { log.debug("ReportRequestWithSessionId received"); - RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(userRequest); - if (requestInfoUpdate != null) return null; - requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, reportRequestWithSessionIdValidator); + RequestInfoUpdate requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, reportRequestWithSessionIdValidator); if (requestInfoUpdate != null) return null; ReportRequestWithSessionId req = userRequest.getRequestPayload(); @@ -229,9 +221,7 @@ public class ReportService extends QueueConsumer implements InitializingBean { public RequestInfoUpdate createReportForGREP(BaseRequest userRequest) { log.debug("GREP task received"); - RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(userRequest); - if (requestInfoUpdate != null) return null; - requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, reportRequestGREPValidator); + RequestInfoUpdate requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, reportRequestGREPValidator); if (requestInfoUpdate != null) return null; logUnknownProperties(userRequest); @@ -249,9 +239,7 @@ public class ReportService extends QueueConsumer implements InitializingBean { public RequestInfoUpdate createReportForGRET(BaseRequest userRequest) { log.debug("GRET task received"); - RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(userRequest); - if (requestInfoUpdate != null) return null; - requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, reportRequestGRETValidator); + RequestInfoUpdate requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, reportRequestGRETValidator); if (requestInfoUpdate != null) return null; logUnknownProperties(userRequest); @@ -287,9 +275,7 @@ public class ReportService extends QueueConsumer implements InitializingBean { public RequestInfoUpdate createReportForGREF(BaseRequest userRequest) { log.debug("GREF task received"); - RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(userRequest); - if (requestInfoUpdate != null) return null; - requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, reportRequestGREFValidator); + RequestInfoUpdate requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, reportRequestGREFValidator); if (requestInfoUpdate != null) return null; logUnknownProperties(userRequest);