port #427 from develop

stellar · Sep 5, 2023 · 0912407 · 0912407
1 parent de71c6c
commit 0912407
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,5 @@ target/
 */out/**
 *.class
 .jpb
-*/bin/*
+*/bin/*
+.vscode
diff --git a/core/src/main/java/org/stellar/anchor/sep31/Sep31TransactionStore.java b/core/src/main/java/org/stellar/anchor/sep31/Sep31TransactionStore.java
@@ -41,6 +41,9 @@ List<? extends Sep31Transaction> findByTransactionIds(@NonNull Collection<String
    */
   Sep31Transaction findByStellarMemo(@NonNull String memo) throws AnchorException;
 
+  Sep31Transaction findByStellarAccountIdAndMemoAndStatus(
+      String accountId, String memo, String status) throws AnchorException;
+
   /**
    * Save a transaction.
    *

diff --git a/platform/src/main/java/org/stellar/anchor/platform/data/JdbcSep31TransactionRepo.java b/platform/src/main/java/org/stellar/anchor/platform/data/JdbcSep31TransactionRepo.java
@@ -19,6 +19,9 @@ public interface JdbcSep31TransactionRepo extends CrudRepository<JdbcSep31Transa
 
   Optional<Sep31Transaction> findByStellarMemo(String stellarMemo);
 
+  Optional<Sep31Transaction> findByStellarAccountIdAndMemoAndStatus(
+      String stellarAccountId, String stellarMemo, String status);
+
   @Query(value = "SELECT COUNT(t) FROM JdbcSep31Transaction t WHERE t.status = :status")
   Integer findByStatusCount(@Param("status") String status);
 }
diff --git a/platform/src/main/java/org/stellar/anchor/platform/data/JdbcSep31TransactionStore.java b/platform/src/main/java/org/stellar/anchor/platform/data/JdbcSep31TransactionStore.java
@@ -51,6 +51,14 @@ public Sep31Transaction findByStellarMemo(@NonNull String memo) throws AnchorExc
     return transactionRepo.findByStellarMemo(memo).orElse(null);
   }
 
+  @Override
+  public Sep31Transaction findByStellarAccountIdAndMemoAndStatus(
+      String accountId, String memo, String status) throws AnchorException {
+    return transactionRepo
+        .findByStellarAccountIdAndMemoAndStatus(accountId, memo, status)
+        .orElse(null);
+  }
+
   @Override
   public Sep31Transaction save(Sep31Transaction transaction) throws SepException {
     if (!(transaction instanceof JdbcSep31Transaction)) {

diff --git a/...rm/src/main/java/org/stellar/anchor/platform/service/PaymentOperationToEventListener.java b/...rm/src/main/java/org/stellar/anchor/platform/service/PaymentOperationToEventListener.java
@@ -73,7 +73,9 @@ public void onReceived(ObservedPayment payment) throws EventPublishException {
     // Find a transaction matching the memo
     Sep31Transaction txn;
     try {
-      txn = transactionStore.findByStellarMemo(memo);
+      txn =
+          transactionStore.findByStellarAccountIdAndMemoAndStatus(
+              payment.getTo(), memo, TransactionEvent.Status.PENDING_SENDER.toString());
       if (txn == null) {
         Log.infoF("Not expecting any transaction with the memo {}.", payment.getTransactionMemo());
         return;