diff --git a/config-data-executor/src/main/java/org/micord/service/RequestService.java b/config-data-executor/src/main/java/org/micord/service/RequestService.java index 7285745..367abdb 100644 --- a/config-data-executor/src/main/java/org/micord/service/RequestService.java +++ b/config-data-executor/src/main/java/org/micord/service/RequestService.java @@ -233,6 +233,10 @@ public class RequestService { @Transactional public void processSqlAndAqlRequests(Requests config, List ids) { logger.debug("Starting transactional processing of requests"); + if (config.getS3Requests() != null && !config.getS3Requests().isEmpty()) { + processS3Requests(config.getS3Requests(), ids); + } + if (config.getSqlRequests() != null) { for (SqlRequest request : config.getSqlRequests()) { processSqlRequests(request, ids); @@ -244,14 +248,15 @@ public class RequestService { processAqlRequests(request, ids); } } - if (config.getS3Requests() != null && !config.getS3Requests().isEmpty()) { - processS3Requests(config.getS3Requests(), ids); - } } @Transactional public void processSqlAndAqlRequests(Requests config, RequestParameters parameters) { logger.debug("Starting transactional processing of requests"); + if (config.getS3Requests() != null && !config.getS3Requests().isEmpty()) { + processS3Requests(config.getS3Requests(), parameters); + } + if (config.getSqlRequests() != null) { for (SqlRequest request : config.getSqlRequests()) { processSqlRequests(request, parameters); @@ -263,9 +268,6 @@ public class RequestService { processAqlRequests(request, parameters.getIds()); } } - if (config.getS3Requests() != null && !config.getS3Requests().isEmpty()) { - processS3Requests(config.getS3Requests(), parameters); - } } private void processSqlRequests(SqlRequest request, List ids) {