TransferController sends a message, instead of calling TransferService

[demos/kafka/demos-kafka-payment-system-transfer] / src / main / java / de / juplo / kafka / payment / transfer / domain / TransferService.java

diff --git a/src/main/java/de/juplo/kafka/payment/transfer/domain/TransferService.java b/src/main/java/de/juplo/kafka/payment/transfer/domain/TransferService.java
index 3e6265f..90ef682 100644 (file)
--- a/src/main/java/de/juplo/kafka/payment/transfer/domain/TransferService.java
+++ b/src/main/java/de/juplo/kafka/payment/transfer/domain/TransferService.java
@@ -2,7 +2,7 @@ package de.juplo.kafka.payment.transfer.domain;
 
 
 import de.juplo.kafka.payment.transfer.ports.GetTransferUseCase;
-import de.juplo.kafka.payment.transfer.ports.InitiateTransferUseCase;
+import de.juplo.kafka.payment.transfer.ports.HandleTransferUseCase;
 import de.juplo.kafka.payment.transfer.ports.MessagingService;
 import de.juplo.kafka.payment.transfer.ports.TransferRepository;
 import lombok.RequiredArgsConstructor;
@@ -10,61 +10,62 @@ import lombok.extern.slf4j.Slf4j;
 
 import java.util.Optional;
 
-import static de.juplo.kafka.payment.transfer.domain.Transfer.State.*;
+import static de.juplo.kafka.payment.transfer.domain.Transfer.State.CHECKED;
+import static de.juplo.kafka.payment.transfer.domain.Transfer.State.CREATED;
 
 
 @Slf4j
 @RequiredArgsConstructor
-public class TransferService implements InitiateTransferUseCase, GetTransferUseCase
+public class TransferService implements HandleTransferUseCase, GetTransferUseCase
 {
   private final TransferRepository repository;
   private final MessagingService messagingService;
 
-  public synchronized void initiate(Transfer transfer)
+  private void create(Transfer transfer)
   {
     repository
         .get(transfer.getId())
         .ifPresentOrElse(
-            stored ->
-            {
-              if (!transfer.equals(stored))
-                throw new IllegalArgumentException(
-                    "Re-Initiation of transfer with different data: old=" +
-                        stored +
-                        ", new=" +
-                        transfer);
-
-              if (stored.getState() == FAILED)
-              {
-                repository.update(transfer.getId(), FAILED, SENT);
-                log.info("Resending faild transfer: " + stored);
-                send(transfer);
-              }
-            },
+            stored -> log.info("transfer already exisits: {}, ignoring: {}", stored, transfer),
             () ->
             {
-              send(transfer);
-              transfer.setState(SENT);
               repository.store(transfer);
+              transfer.setState(CREATED);
+              messagingService.send(transfer);
             });
   }
 
-  private void send(Transfer transfer)
+  @Override
+  public void handle(Transfer transfer)
   {
-    messagingService
-        .send(transfer)
-        .thenApply(
-            $ ->
-            {
-              repository.update(transfer.getId(), SENT, PENDING);
-              return null;
-            })
-        .exceptionally(
-            e ->
-            {
-              repository.update(transfer.getId(), SENT, FAILED);
-              return null;
-            });
+    Transfer.State state = transfer.getState();
+    switch (state)
+    {
+      case RECEIVED:
+        repository.store(transfer);
+        create(transfer);
+        break;
+
+      case CREATED:
+        repository.store(transfer);
+        check(transfer);
+        break;
+
+      case CHECKED:
+        repository.store(transfer);
+        // TODO: What's next...?
+        break;
+
+      default:
+        log.warn("TODO: handle {} state {}", state.foreign ? "foreign" : "domain", state);
+    }
+  }
+
+  private void check(Transfer transfer)
+  {
+    // TODO: Do some time consuming checks...
+    transfer.setState(CHECKED);
+    messagingService.send(transfer);
   }
 
   public Optional<Transfer> get(Long id)