Merge pull request #103 from tyronbrand/http-client-collection-transa…

…ctions Transaction data added to FlowCollection
tyronbrand · Dec 2, 2022 · 7d06018 · 7d06018
2 parents 452c00b + 0281910
commit 7d06018
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/Flow.Net.Sdk.Client.Http/FlowApiConverter.cs b/src/Flow.Net.Sdk.Client.Http/FlowApiConverter.cs
@@ -59,7 +59,10 @@ public static FlowCollection ToFlowCollection(this Collection collection)
             };
 
             if (collection.Transactions != null)
+            {
                 flowCollection.TransactionIds = collection.Transactions?.Select(s => s.ToFlowTransactionId()).ToList();
+                flowCollection.Transactions = collection.Transactions?.Select(x => x.ToFlowTransactionResponse()).ToList();
+            }   
 
             return flowCollection;
         }
@@ -142,7 +145,7 @@ public static FlowTransactionResult ToFlowTransactionResult(this Transaction tra
 
             return new FlowTransactionResult
             {
-                BlockId = transaction.Reference_block_id,
+                BlockId = transaction.Result.Block_id,
                 ErrorMessage = transaction.Result.Error_message,
                 Status = (Core.TransactionStatus)Enum.Parse(typeof(Core.TransactionStatus), transaction.Result.Status.ToString()),
                 StatusCode = uint.Parse(transaction.Result.Status_code.ToString()),

diff --git a/src/Flow.Net.Sdk.Client.Http/FlowHttpClient.cs b/src/Flow.Net.Sdk.Client.Http/FlowHttpClient.cs
@@ -494,7 +494,7 @@ public async Task<FlowTransactionResponse> GetTransactionAsync(string transactio
         {
             try
             {
-                var response = await _flowApiV1.TransactionsAsync(transactionId, null, null, cancellationToken).ConfigureAwait(false);
+                var response = await _flowApiV1.TransactionsAsync(transactionId, new List<string> { "result" }, null, cancellationToken).ConfigureAwait(false);
                 return response.ToFlowTransactionResponse();
             }
             catch (Exception ex)

diff --git a/src/Flow.Net.Sdk.Core/Models/FlowCollection.cs b/src/Flow.Net.Sdk.Core/Models/FlowCollection.cs
@@ -6,5 +6,6 @@ public class FlowCollection
     {
         public string Id { get; set; }
         public IList<FlowTransactionId> TransactionIds { get; set; } = new List<FlowTransactionId>();
+        public IList<FlowTransactionResponse> Transactions { get; set; } = new List<FlowTransactionResponse>();
     }
 }