treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove validation role for reports-service

Browse source
This commit is contained in:
akulikov 2023-12-28 13:59:55 +03:00
parent da8adbd052
commit be58666afc
1 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/services/ReportService.java
View file

@ -25,7 +25,6 @@ import ru.spcex.clearing.reports.builders.ReportInfo;
import ru.spcex.clearing.reports.builders.SessionIdParam; import ru.spcex.clearing.reports.builders.SessionIdParam;
import ru.spcex.clearing.reports.config.SFTPReportsConfig; import ru.spcex.clearing.reports.config.SFTPReportsConfig;
import ru.spcex.clearing.reports.config.settings.ReportsServiceSettings; 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.clearing.validation.common.ValidationHelper;
import ru.spcex.platform.enumeration.ReportBuilderType; import ru.spcex.platform.enumeration.ReportBuilderType;
import ru.spcex.platform.enumeration.ReportKeys; import ru.spcex.platform.enumeration.ReportKeys;
@ -44,7 +43,6 @@ import java.util.stream.Collectors;
@Service @Service
public class ReportService extends QueueConsumer implements InitializingBean { public class ReportService extends QueueConsumer implements InitializingBean {
private final Logger log = LoggerFactory.getLogger(getClass()); private final Logger log = LoggerFactory.getLogger(getClass());
private final UserRoleVerification userRoleVerification;
private final ValidationHelper validationHelper; private final ValidationHelper validationHelper;
private final KafkaSender kafkaSender; private final KafkaSender kafkaSender;
@ -69,7 +67,6 @@ public class ReportService extends QueueConsumer implements InitializingBean {
public ReportService(Consumer<String, Object> kafkaQueue, public ReportService(Consumer<String, Object> kafkaQueue,
Producer<String, Object> kafkaResponseQueue, Producer<String, Object> kafkaResponseQueue,
KafkaSender kafkaSender, KafkaSender kafkaSender,
UserRoleVerification userRoleVerification,
ValidationHelper validationHelper, ValidationHelper validationHelper,
ReportsServiceSettings reportsServiceSettings, ReportsServiceSettings reportsServiceSettings,
@ -101,7 +98,6 @@ public class ReportService extends QueueConsumer implements InitializingBean {
SFTPReportsConfig.ReportsGateway reportsSftpGateway SFTPReportsConfig.ReportsGateway reportsSftpGateway
) { ) {
super(kafkaQueue, kafkaResponseQueue); super(kafkaQueue, kafkaResponseQueue);
this.userRoleVerification = userRoleVerification;
this.validationHelper = validationHelper; this.validationHelper = validationHelper;
this.kafkaSender = kafkaSender; this.kafkaSender = kafkaSender;
this.reportRequestValidator = reportRequestValidator; this.reportRequestValidator = reportRequestValidator;
@ -149,10 +145,8 @@ public class ReportService extends QueueConsumer implements InitializingBean {
public RequestInfoUpdate createReport(BaseRequest<ReportRequest> userRequest) { public RequestInfoUpdate createReport(BaseRequest<ReportRequest> userRequest) {
log.debug("ReportRequest received"); 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; if (requestInfoUpdate != null) return null;
ReportRequest req = userRequest.getRequestPayload(); ReportRequest req = userRequest.getRequestPayload();
@ -188,10 +182,8 @@ public class ReportService extends QueueConsumer implements InitializingBean {
public RequestInfoUpdate createReportForSessionId(BaseRequest<ReportRequestWithSessionId> userRequest) { public RequestInfoUpdate createReportForSessionId(BaseRequest<ReportRequestWithSessionId> userRequest) {
log.debug("ReportRequestWithSessionId received"); 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; if (requestInfoUpdate != null) return null;
ReportRequestWithSessionId req = userRequest.getRequestPayload(); ReportRequestWithSessionId req = userRequest.getRequestPayload();
@ -229,9 +221,7 @@ public class ReportService extends QueueConsumer implements InitializingBean {
public RequestInfoUpdate createReportForGREP(BaseRequest<LauncherCommandRequest> userRequest) { public RequestInfoUpdate createReportForGREP(BaseRequest<LauncherCommandRequest> userRequest) {
log.debug("GREP task received"); log.debug("GREP task received");
RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(userRequest); RequestInfoUpdate requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, reportRequestGREPValidator);
if (requestInfoUpdate != null) return null;
requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, reportRequestGREPValidator);
if (requestInfoUpdate != null) return null; if (requestInfoUpdate != null) return null;
logUnknownProperties(userRequest); logUnknownProperties(userRequest);
@ -249,9 +239,7 @@ public class ReportService extends QueueConsumer implements InitializingBean {
public RequestInfoUpdate createReportForGRET(BaseRequest<LauncherCommandRequest> userRequest) { public RequestInfoUpdate createReportForGRET(BaseRequest<LauncherCommandRequest> userRequest) {
log.debug("GRET task received"); log.debug("GRET task received");
RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(userRequest); RequestInfoUpdate requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, reportRequestGRETValidator);
if (requestInfoUpdate != null) return null;
requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, reportRequestGRETValidator);
if (requestInfoUpdate != null) return null; if (requestInfoUpdate != null) return null;
logUnknownProperties(userRequest); logUnknownProperties(userRequest);
@ -287,9 +275,7 @@ public class ReportService extends QueueConsumer implements InitializingBean {
public RequestInfoUpdate createReportForGREF(BaseRequest<LauncherCommandRequest> userRequest) { public RequestInfoUpdate createReportForGREF(BaseRequest<LauncherCommandRequest> userRequest) {
log.debug("GREF task received"); log.debug("GREF task received");
RequestInfoUpdate requestInfoUpdate = userRoleVerification.validateRoleAndGetResult(userRequest); RequestInfoUpdate requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, reportRequestGREFValidator);
if (requestInfoUpdate != null) return null;
requestInfoUpdate = validationHelper.validateTillFirstError(userRequest, reportRequestGREFValidator);
if (requestInfoUpdate != null) return null; if (requestInfoUpdate != null) return null;
logUnknownProperties(userRequest); logUnknownProperties(userRequest);