Merge pull request #378 from radixdlt/re-apply-get-transaction-stream…

…-fix Repeat SQL where clause for GetTransactionStream to ensure Postgres q…
radixdlt · Jul 31, 2023 · 1f9c9d1 · 1f9c9d1
2 parents 4f9c08d + a191e09
commit 1f9c9d1
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/RadixDlt.NetworkGateway.PostgresIntegration/Services/TransactionQuerier.cs b/src/RadixDlt.NetworkGateway.PostgresIntegration/Services/TransactionQuerier.cs
@@ -145,6 +145,7 @@ public async Task<TransactionPageWithoutTotal> GetTransactionStream(TransactionS
                     .Join(_dbContext.LedgerTransactionMarkers, sv => sv, ltm => ltm.StateVersion, (sv, ltm) => ltm)
                     .OfType<ManifestAddressLedgerTransactionMarker>()
                     .Where(maltm => maltm.OperationType == LedgerTransactionMarkerOperationType.AccountDepositedInto && maltm.EntityId == entityId)
+                    .Where(maltm => maltm.StateVersion <= upperStateVersion && maltm.StateVersion >= (lowerStateVersion ?? maltm.StateVersion))
                     .Select(maltm => maltm.StateVersion);
             }
         }
@@ -164,6 +165,7 @@ public async Task<TransactionPageWithoutTotal> GetTransactionStream(TransactionS
                     .Join(_dbContext.LedgerTransactionMarkers, sv => sv, ltm => ltm.StateVersion, (sv, ltm) => ltm)
                     .OfType<ManifestAddressLedgerTransactionMarker>()
                     .Where(maltm => maltm.OperationType == LedgerTransactionMarkerOperationType.AccountWithdrawnFrom && maltm.EntityId == entityId)
+                    .Where(maltm => maltm.StateVersion <= upperStateVersion && maltm.StateVersion >= (lowerStateVersion ?? maltm.StateVersion))
                     .Select(maltm => maltm.StateVersion);
             }
         }
@@ -183,6 +185,7 @@ public async Task<TransactionPageWithoutTotal> GetTransactionStream(TransactionS
                     .Join(_dbContext.LedgerTransactionMarkers, sv => sv, ltm => ltm.StateVersion, (sv, ltm) => ltm)
                     .OfType<ManifestAddressLedgerTransactionMarker>()
                     .Where(maltm => maltm.OperationType == LedgerTransactionMarkerOperationType.ResourceInUse && maltm.EntityId == entityId)
+                    .Where(maltm => maltm.StateVersion <= upperStateVersion && maltm.StateVersion >= (lowerStateVersion ?? maltm.StateVersion))
                     .Select(maltm => maltm.StateVersion);
             }
         }
@@ -200,6 +203,7 @@ public async Task<TransactionPageWithoutTotal> GetTransactionStream(TransactionS
                     .Join(_dbContext.LedgerTransactionMarkers, sv => sv, ltm => ltm.StateVersion, (sv, ltm) => ltm)
                     .OfType<AffectedGlobalEntityTransactionMarker>()
                     .Where(agetm => agetm.EntityId == entityId)
+                    .Where(agetm => agetm.StateVersion <= upperStateVersion && agetm.StateVersion >= (lowerStateVersion ?? agetm.StateVersion))
                     .Select(agetm => agetm.StateVersion);
             }
         }
@@ -244,6 +248,7 @@ public async Task<TransactionPageWithoutTotal> GetTransactionStream(TransactionS
                     .Join(_dbContext.LedgerTransactionMarkers, sv => sv, ltm => ltm.StateVersion, (sv, ltm) => ltm)
                     .OfType<EventLedgerTransactionMarker>()
                     .Where(eltm => eltm.EventType == eventType && eltm.EntityId == (eventEmitterEntityId ?? eltm.EntityId) && eltm.ResourceEntityId == (eventResourceEntityId ?? eltm.ResourceEntityId))
+                    .Where(eltm => eltm.StateVersion <= upperStateVersion && eltm.StateVersion >= (lowerStateVersion ?? eltm.StateVersion))
                     .Select(eltm => eltm.StateVersion);
             }
         }
@@ -269,6 +274,7 @@ public async Task<TransactionPageWithoutTotal> GetTransactionStream(TransactionS
                 .Join(_dbContext.LedgerTransactionMarkers, sv => sv, ltm => ltm.StateVersion, (sv, ltm) => ltm)
                 .OfType<OriginLedgerTransactionMarker>()
                 .Where(oltm => oltm.OriginType == originType)
+                .Where(oltm => oltm.StateVersion <= upperStateVersion && oltm.StateVersion >= (lowerStateVersion ?? oltm.StateVersion))
                 .Select(oltm => oltm.StateVersion);
         }