micord/ervu-eks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change order

Browse source
This commit is contained in:
Maksim Tereshin 2024-12-18 16:33:07 +01:00
parent 30c7d20768
commit 6597a3dd7d
No known key found for this signature in database
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
config-data-executor/src/main/java/org/micord/service/RequestService.java
View file

@ -233,6 +233,10 @@ public class RequestService {
@Transactional @Transactional
public void processSqlAndAqlRequests(Requests config, List<String> ids) { public void processSqlAndAqlRequests(Requests config, List<String> ids) {
logger.debug("Starting transactional processing of requests"); logger.debug("Starting transactional processing of requests");
if (config.getS3Requests() != null && !config.getS3Requests().isEmpty()) {
processS3Requests(config.getS3Requests(), ids);
}
if (config.getSqlRequests() != null) { if (config.getSqlRequests() != null) {
for (SqlRequest request : config.getSqlRequests()) { for (SqlRequest request : config.getSqlRequests()) {
processSqlRequests(request, ids); processSqlRequests(request, ids);
@ -244,14 +248,15 @@ public class RequestService {
processAqlRequests(request, ids); processAqlRequests(request, ids);
} }
} }
if (config.getS3Requests() != null && !config.getS3Requests().isEmpty()) {
processS3Requests(config.getS3Requests(), ids);
}
} }
@Transactional @Transactional
public void processSqlAndAqlRequests(Requests config, RequestParameters parameters) { public void processSqlAndAqlRequests(Requests config, RequestParameters parameters) {
logger.debug("Starting transactional processing of requests"); logger.debug("Starting transactional processing of requests");
if (config.getS3Requests() != null && !config.getS3Requests().isEmpty()) {
processS3Requests(config.getS3Requests(), parameters);
}
if (config.getSqlRequests() != null) { if (config.getSqlRequests() != null) {
for (SqlRequest request : config.getSqlRequests()) { for (SqlRequest request : config.getSqlRequests()) {
processSqlRequests(request, parameters); processSqlRequests(request, parameters);
@ -263,9 +268,6 @@ public class RequestService {
processAqlRequests(request, parameters.getIds()); processAqlRequests(request, parameters.getIds());
} }
} }
if (config.getS3Requests() != null && !config.getS3Requests().isEmpty()) {
processS3Requests(config.getS3Requests(), parameters);
}
} }
private void processSqlRequests(SqlRequest request, List<String> ids) { private void processSqlRequests(SqlRequest request, List<String> ids) {