galovics commented on code in PR #2718:
URL: https://github.com/apache/fineract/pull/2718#discussion_r1015303111
##########
fineract-provider/src/main/java/org/apache/fineract/commands/service/SynchronousCommandProcessingService.java:
##########
@@ -69,45 +76,43 @@ public class SynchronousCommandProcessingService implements
CommandProcessingSer
private final IdempotencyKeyGenerator idempotencyKeyGenerator;
private final FineractProperties fineractProperties;
+ private final InitialCommandSaver initialCommandSaver;
+
@Transactional
@Override
public CommandProcessingResult executeCommand(final CommandWrapper
wrapper, final JsonCommand command,
final boolean isApprovedByChecker) {
final boolean rollbackTransaction =
configurationDomainService.isMakerCheckerEnabledForTask(wrapper.taskPermissionName());
+ String idempotencyKey = getIdempotencyKey(wrapper);
+ CommandSource existingCommand =
commandSourceRepository.findByActionNameAndEntityNameAndIdempotencyKey(wrapper.actionName(),
+ wrapper.entityName(), idempotencyKey);
+ final CommandProcessingResult result;
+ if (existingCommand != null) {
+ if
(UNDER_PROCESSING.getValue().equals(existingCommand.getStatus())) {
+ throw new DuplicateCommandException(wrapper.actionName(),
wrapper.entityName(), wrapper.getIdempotencyKey(),
+ wrapper.getJson(), UNDER_PROCESSING.getValue());
+ } else if (ERROR.getValue().equals(existingCommand.getStatus())) {
+ throw new DuplicateCommandException(wrapper.actionName(),
wrapper.entityName(), wrapper.getIdempotencyKey(),
+ existingCommand.getResult(), ERROR.getValue());
+ } else if
(PROCESSED.getValue().equals(existingCommand.getStatus())) {
+ throw new DuplicateCommandException(wrapper.actionName(),
wrapper.entityName(), wrapper.getIdempotencyKey(),
+ existingCommand.getResult(), PROCESSED.getValue());
+ }
+ }
- final NewCommandSourceHandler handler = findCommandHandler(wrapper);
+ final AppUser maker = context.authenticatedUser(wrapper);
+ CommandSource commandSourceResult = getInitialCommandSource(wrapper,
command, maker, idempotencyKey);
+ initialCommandSaver.save(commandSourceResult);
Review Comment:
> because transaction forcing inside transactions only works with public
method calls
That's only true for declarative tx management. If you use a
TransactionTemplate, you're pretty much good to go.
##########
fineract-provider/src/main/java/org/apache/fineract/commands/service/SynchronousCommandProcessingService.java:
##########
@@ -69,45 +76,43 @@ public class SynchronousCommandProcessingService implements
CommandProcessingSer
private final IdempotencyKeyGenerator idempotencyKeyGenerator;
private final FineractProperties fineractProperties;
+ private final InitialCommandSaver initialCommandSaver;
+
@Transactional
@Override
public CommandProcessingResult executeCommand(final CommandWrapper
wrapper, final JsonCommand command,
final boolean isApprovedByChecker) {
final boolean rollbackTransaction =
configurationDomainService.isMakerCheckerEnabledForTask(wrapper.taskPermissionName());
+ String idempotencyKey = getIdempotencyKey(wrapper);
+ CommandSource existingCommand =
commandSourceRepository.findByActionNameAndEntityNameAndIdempotencyKey(wrapper.actionName(),
+ wrapper.entityName(), idempotencyKey);
+ final CommandProcessingResult result;
+ if (existingCommand != null) {
+ if
(UNDER_PROCESSING.getValue().equals(existingCommand.getStatus())) {
+ throw new DuplicateCommandException(wrapper.actionName(),
wrapper.entityName(), wrapper.getIdempotencyKey(),
+ wrapper.getJson(), UNDER_PROCESSING.getValue());
+ } else if (ERROR.getValue().equals(existingCommand.getStatus())) {
+ throw new DuplicateCommandException(wrapper.actionName(),
wrapper.entityName(), wrapper.getIdempotencyKey(),
+ existingCommand.getResult(), ERROR.getValue());
+ } else if
(PROCESSED.getValue().equals(existingCommand.getStatus())) {
+ throw new DuplicateCommandException(wrapper.actionName(),
wrapper.entityName(), wrapper.getIdempotencyKey(),
+ existingCommand.getResult(), PROCESSED.getValue());
+ }
+ }
- final NewCommandSourceHandler handler = findCommandHandler(wrapper);
+ final AppUser maker = context.authenticatedUser(wrapper);
+ CommandSource commandSourceResult = getInitialCommandSource(wrapper,
command, maker, idempotencyKey);
+ initialCommandSaver.save(commandSourceResult);
Review Comment:
> because transaction forcing inside transactions only works with public
method calls
That's only true for declarative tx management. If you use a
TransactionTemplate, you're pretty much good to go.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@fineract.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
