fix(class/eventManagement/~): artefacts of registration

MyUnisoft · Jun 6, 2024 · 2ae4f6e · 2ae4f6e
1 parent 2285db2
commit 2ae4f6e
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 34 deletions.
diff --git a/src/class/eventManagement/dispatcher.class.ts b/src/class/eventManagement/dispatcher.class.ts
@@ -859,7 +859,7 @@ export class Dispatcher<T extends GenericEvent = GenericEvent> extends EventEmit
     else {
       for (const incomer of incomers) {
         if (incomer.baseUUID === origin) {
-          await this.dispatcherTransactionStore.deleteTransaction(transactionId);
+          await relatedTransactionStore.deleteTransaction(transactionId);
 
           throw new Error("Forbidden multiple registration for a same instance");
         }
@@ -903,7 +903,7 @@ export class Dispatcher<T extends GenericEvent = GenericEvent> extends EventEmit
       redisMetadata: {
         mainTransaction: false,
         relatedTransaction: transactionId,
-        eventTransactionId: null,
+        eventTransactionId: transactionId,
         resolved: false
       },
       event: event as any

diff --git a/src/class/eventManagement/dispatcher/transaction-handler.class.ts b/src/class/eventManagement/dispatcher/transaction-handler.class.ts
@@ -558,10 +558,10 @@ export class TransactionHandler<T extends GenericEvent = GenericEvent> {
     const incomerStateToUpdate = new Set<string>();
 
     for (const [dispatcherTransactionId, dispatcherTransaction] of dispatcherTransactions.entries()) {
-      const transactionRecipient = dispatcherTransaction.redisMetadata.to;
+      const relatedIncomer = [...incomers].find((incomer) => incomer.providedUUID === dispatcherTransaction.redisMetadata.to ||
+        incomer.baseUUID === dispatcherTransaction.redisMetadata.to);
 
-      const relatedIncomer = [...incomers].find((incomer) => incomer.providedUUID === transactionRecipient ||
-        incomer.baseUUID === transactionRecipient);
+      const transactionRecipient = relatedIncomer ? relatedIncomer.providedUUID : dispatcherTransaction.redisMetadata.to;
 
       const [relatedBackupIncomerTransactionId, relatedBackupIncomerTransaction] = [...backupIncomerTransactions.entries()]
         .find(([__, incomerTransaction]) => incomerTransaction.redisMetadata.relatedTransaction === dispatcherTransactionId) ||
@@ -596,49 +596,53 @@ export class TransactionHandler<T extends GenericEvent = GenericEvent> {
 
       const relatedIncomerTransactions = await relatedIncomerTransactionStore.getTransactions();
 
-      const [relatedIncomerTransactionId, relatedIncomerTransaction] = [...relatedIncomerTransactions.entries()]
-        .find(([__, incomerTransaction]) => incomerTransaction.redisMetadata.relatedTransaction === dispatcherTransactionId &&
+      const filteredIncomerTransactions = [...relatedIncomerTransactions.values()]
+        .filter((incomerTransaction) => incomerTransaction.redisMetadata.relatedTransaction === dispatcherTransactionId &&
           incomerTransaction.redisMetadata.resolved) ||
           [];
 
       // Event not resolved yet
-      if (!relatedIncomerTransactionId) {
+      if (filteredIncomerTransactions.length === 0) {
         continue;
       }
 
-      if (dispatcherTransaction.redisMetadata.mainTransaction) {
-        // Only in case of ping event
-        incomerStateToUpdate.add(relatedIncomerTransaction.redisMetadata.origin);
-        toResolve.push(Promise.all([
-          relatedIncomerTransactionStore.deleteTransaction(relatedIncomerTransactionId),
-          this.dispatcherTransactionStore.deleteTransaction(dispatcherTransactionId)
-        ]));
+      for (const filteredIncomerTransaction of filteredIncomerTransactions) {
+        const filteredIncomerTransactionId = filteredIncomerTransaction.redisMetadata.transactionId;
 
-        continue;
-      }
+        if (dispatcherTransaction.redisMetadata.mainTransaction) {
+          // Only in case of ping event
+          incomerStateToUpdate.add(filteredIncomerTransaction.redisMetadata.origin);
+          toResolve.push(Promise.all([
+            relatedIncomerTransactionStore.deleteTransaction(filteredIncomerTransactionId),
+            this.dispatcherTransactionStore.deleteTransaction(dispatcherTransactionId)
+          ]));
+
+          continue;
+        }
+
+        if (dispatcherTransaction.name === "APPROVEMENT") {
+          if (!filteredIncomerTransaction || !filteredIncomerTransaction.redisMetadata.resolved) {
+            continue;
+          }
+
+          toResolve.push(Promise.all([
+            relatedIncomerTransactionStore.deleteTransaction(filteredIncomerTransactionId),
+            this.dispatcherTransactionStore.deleteTransaction(dispatcherTransactionId)
+          ]));
 
-      if (dispatcherTransaction.name === "APPROVEMENT") {
-        if (!relatedIncomerTransaction || !relatedIncomerTransaction.redisMetadata.resolved) {
           continue;
         }
 
+        dispatcherTransaction.redisMetadata.resolved = true;
+        incomerStateToUpdate.add((filteredIncomerTransaction.redisMetadata as any).to);
         toResolve.push(Promise.all([
-          relatedIncomerTransactionStore.deleteTransaction(relatedIncomerTransactionId),
-          this.dispatcherTransactionStore.deleteTransaction(dispatcherTransactionId)
+          relatedIncomerTransactionStore.deleteTransaction(filteredIncomerTransactionId),
+          this.dispatcherTransactionStore.updateTransaction(
+            dispatcherTransactionId,
+            dispatcherTransaction
+          )
         ]));
-
-        continue;
       }
-
-      dispatcherTransaction.redisMetadata.resolved = true;
-      incomerStateToUpdate.add((relatedIncomerTransaction.redisMetadata as any).to);
-      toResolve.push(Promise.all([
-        relatedIncomerTransactionStore.deleteTransaction(relatedIncomerTransactionId),
-        this.dispatcherTransactionStore.updateTransaction(
-          dispatcherTransactionId,
-          dispatcherTransaction
-        )
-      ]));
     }
 
     toResolve.push([...incomerStateToUpdate.values()].map(

diff --git a/src/class/eventManagement/incomer.class.ts b/src/class/eventManagement/incomer.class.ts
@@ -694,7 +694,7 @@ export class Incomer <
                 published: true,
                 resolved: true
               }
-            } as Transaction<"incomer">)
+            } as Transaction<"incomer">, transactionId)
           ])
         ]);