X-Git-Url: https://juplo.de/gitweb/?p=demos%2Fkafka%2Fdemos-kafka-payment-system-transfer;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fpayment%2Ftransfer%2Fadapter%2FTransferController.java;h=8240310c7d0f4c7c1e90b96323f88a32ceb5d2c9;hp=e20f9bf9caf5bc94969ff26b7f9f6ef2a727758c;hb=fae41770a1f65b4ddfe8d51d09a8a8cdc35a5bdd;hpb=6191849fee717b080118717c86df79fad12bafc8 diff --git a/src/main/java/de/juplo/kafka/payment/transfer/adapter/TransferController.java b/src/main/java/de/juplo/kafka/payment/transfer/adapter/TransferController.java index e20f9bf..8240310 100644 --- a/src/main/java/de/juplo/kafka/payment/transfer/adapter/TransferController.java +++ b/src/main/java/de/juplo/kafka/payment/transfer/adapter/TransferController.java @@ -3,7 +3,7 @@ package de.juplo.kafka.payment.transfer.adapter; import de.juplo.kafka.payment.transfer.domain.Transfer; import de.juplo.kafka.payment.transfer.ports.GetTransferUseCase; -import de.juplo.kafka.payment.transfer.ports.InitiateTransferUseCase; +import de.juplo.kafka.payment.transfer.ports.MessagingService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; @@ -12,6 +12,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.validation.FieldError; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.*; +import org.springframework.web.context.request.async.DeferredResult; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; @@ -19,6 +20,8 @@ import java.net.URI; import java.util.Date; import java.util.HashMap; import java.util.Map; +import java.util.Optional; +import java.util.concurrent.CompletableFuture; @RestController @@ -28,28 +31,58 @@ import java.util.Map; { public final static String PATH = "/transfers"; - private final InitiateTransferUseCase initiateTransferUseCase; private final GetTransferUseCase getTransferUseCase; + private final MessagingService messagingService; @PostMapping( path = PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity transfer(@Valid @RequestBody TransferDTO transferDTO) + public DeferredResult> transfer( + HttpServletRequest request, + @Valid @RequestBody TransferDTO transferDTO) { - Transfer transfer = - Transfer - .builder() - .id(transferDTO.getId()) - .payer(transferDTO.getPayer()) - .payee(transferDTO.getPayee()) - .amount(transferDTO.getAmount()) - .build(); + DeferredResult> result = new DeferredResult<>(); + + getTransferUseCase + .get(transferDTO.getId()) + .map(transfer -> + CompletableFuture.completedFuture( + ResponseEntity + .ok() + .location(location(transferDTO)) + .build())) + .or(() -> + Optional.of( + messagingService + .send( + Transfer + .builder() + .id(transferDTO.getId()) + .payer(transferDTO.getPayer()) + .payee(transferDTO.getPayee()) + .amount(transferDTO.getAmount()) + .state(Transfer.State.RECEIVED) + .build()) + .thenApply($ -> + ResponseEntity + .created(location(transferDTO)) + .build()))) + .get() + .thenAccept(responseEntity -> result.setResult(responseEntity)) + .exceptionally(e -> + { + result.setErrorResult(e); + return null; + }); - initiateTransferUseCase.initiate(transfer); + return result; + } - return ResponseEntity.created(URI.create(PATH + "/" + transferDTO.getId())).build(); + private URI location(TransferDTO transferDTO) + { + return URI.create(PATH + "/" + transferDTO.getId()); } @GetMapping(