Merge pull request #402 from radixdlt/metadata-fix

Fixed metadata count mismatch
radixdlt · Aug 16, 2023 · 311ebfa · 311ebfa
2 parents d9e44c0 + 157c28f
commit 311ebfa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/RadixDlt.NetworkGateway.GatewayApiSdk/Model/EntityMetadataCollection.cs b/src/RadixDlt.NetworkGateway.GatewayApiSdk/Model/EntityMetadataCollection.cs
@@ -68,5 +68,5 @@ namespace RadixDlt.NetworkGateway.GatewayApiSdk.Model;
 
 public partial class EntityMetadataCollection
 {
-    public static readonly EntityMetadataCollection Empty = new(items: new List<EntityMetadataItem>());
+    public static readonly EntityMetadataCollection Empty = new(totalCount: 0, items: new List<EntityMetadataItem>());
 }
diff --git a/src/RadixDlt.NetworkGateway.PostgresIntegration/Services/EntityStateQuerier.cs b/src/RadixDlt.NetworkGateway.PostgresIntegration/Services/EntityStateQuerier.cs
@@ -1058,8 +1058,12 @@ INNER JOIN LATERAL UNNEST(metadata_slice) WITH ORDINALITY AS metadata_join(id, o
             var value = ScryptoSborUtils.DecodeToGatewayMetadataItemValue(vm.Value, _networkConfigurationProvider.GetNetworkId());
             var stringRepresentation = ToolkitModel.RadixEngineToolkitUniffiMethods.ScryptoSborDecodeToStringRepresentation(vm.Value.ToList(), ToolkitModel.SerializationMode.PROGRAMMATIC, _networkConfigurationProvider.GetNetworkId(), null);
             var entityMetadataItemValue = new GatewayModel.EntityMetadataItemValue(vm.Value.ToHex(), new JRaw(stringRepresentation), value);
+            var items = result[vm.EntityId].Items;
 
-            result[vm.EntityId].Items.Add(new GatewayModel.EntityMetadataItem(vm.Key, entityMetadataItemValue, vm.IsLocked, vm.FromStateVersion));
+            if (items.Count < limit)
+            {
+                items.Add(new GatewayModel.EntityMetadataItem(vm.Key, entityMetadataItemValue, vm.IsLocked, vm.FromStateVersion));
+            }
         }
 
         foreach (var missing in entityIds.Except(result.Keys))
@@ -1125,6 +1129,7 @@ LIMIT 1
             var entityMetadataItemValue = new GatewayModel.EntityMetadataItemValue(mh.Value.ToHex(), new JRaw(stringRepresentation), value);
 
             result[mh.EntityId].Items.Add(new GatewayModel.EntityMetadataItem(mh.Key, entityMetadataItemValue, mh.IsLocked, mh.FromStateVersion));
+            result[mh.EntityId].TotalCount = result[mh.EntityId].TotalCount.HasValue ? result[mh.EntityId].TotalCount + 1 : 1;
         }
 
         foreach (var missing in entityIds.Except(result.Keys))