Merge pull request #150 from mwarzybok-sumoheavy/feature/SP-736

SP-736 Type Review: C#
bitpay · Feb 26, 2024 · 0371f2a · 0371f2a
2 parents 6f714fe + 4fb1b2c
commit 0371f2a
Show file tree

Hide file tree

Showing 9 changed files with 213 additions and 81 deletions.
diff --git a/BitPay/Models/Invoice/Invoice.cs b/BitPay/Models/Invoice/Invoice.cs
@@ -15,8 +15,7 @@ public class Invoice
     {
         private string _currency = "";
         private dynamic? _exchangeRates;
-        private dynamic? _refundAddresses;
-
+
         // Creates a minimal invoice request object.
         public Invoice(decimal price, string currency)
         {
@@ -187,13 +186,9 @@ public string Currency
         public string? ExceptionStatus { get; set; }
 
         [JsonProperty(PropertyName = "refundAddresses")]
-        public dynamic? RefundAddresses
-        {
-            get => _refundAddresses;
-            set => _refundAddresses = JsonConvert.DeserializeObject(value?.ToString(Formatting.None));
-        }
-
-        [JsonProperty(PropertyName = "refundAddressRequestPendin")]
+        public List<Dictionary<string, InvoiceRefundAddresses>>? RefundAddresses { get; set; }
+
+        [JsonProperty(PropertyName = "refundAddressRequestPending")]
         public bool? RefundAddressRequestPending { get; set; }
 
         [JsonProperty(PropertyName = "buyerProvidedEmail")]

diff --git a/BitPay/Models/Invoice/InvoiceRefundAddresses.cs b/BitPay/Models/Invoice/InvoiceRefundAddresses.cs
@@ -0,0 +1,30 @@
+// Copyright (c) 2019 BitPay.
+// All rights reserved.
+
+using System;
+
+using Newtonsoft.Json;
+
+namespace BitPay.Models.Invoice
+{
+    public class InvoiceRefundAddresses
+    {
+        public InvoiceRefundAddresses(string type, DateTime date)
+        {
+            Type = type;
+            Date = date;
+        }
+
+        [JsonProperty(PropertyName = "type")]
+        public string Type { get; set; }
+
+        [JsonProperty(PropertyName = "date")]
+        public DateTime Date { get; set; }
+
+        [JsonProperty(PropertyName = "tag")]
+        public int? Tag { get; set; }
+
+        [JsonProperty(PropertyName = "email")]
+        public string? Email { get; set; }
+    }
+}
diff --git a/BitPay/Models/Invoice/InvoiceWebhook.cs b/BitPay/Models/Invoice/InvoiceWebhook.cs
@@ -0,0 +1,67 @@
+// Copyright (c) 2019 BitPay.
+// All rights reserved.
+
+using System.Collections.Generic;
+using System.Numerics;
+
+using Newtonsoft.Json;
+
+namespace BitPay.Models.Invoice
+{
+    public class InvoiceWebhook
+    {
+        [JsonProperty(PropertyName = "id")]
+        public string? Id { get; set; }
+
+        [JsonProperty(PropertyName = "url")]
+        public string? Url { get; set; }
+
+        [JsonProperty(PropertyName = "posData")]
+        public string? PosData { get; set; }
+
+        [JsonProperty(PropertyName = "status")]
+        public string? Status { get; set; }
+
+        [JsonProperty(PropertyName = "price")]
+        public double? Price { get; set; }
+
+        [JsonProperty(PropertyName = "currency")]
+        public string? Currency { get; set; }
+
+        [JsonProperty(PropertyName = "invoiceTime")]
+        public string? InvoiceTime { get; set; }
+
+        [JsonProperty(PropertyName = "currencyTime")]
+        public string? CurrencyTime { get; set; }
+
+        [JsonProperty(PropertyName = "exceptionStatus")]
+        public string? ExceptionStatus { get; set; }
+
+        [JsonProperty(PropertyName = "buyerFields")]
+        public BuyerFields? BuyerFields { get; set; }
+
+        [JsonProperty(PropertyName = "paymentSubtotals")]
+        public Dictionary<string, BigInteger>? PaymentSubtotals { get; set; }
+
+        [JsonProperty(PropertyName = "paymentTotals")]
+        public Dictionary<string, BigInteger>? PaymentTotals { get; set; }
+
+        [JsonProperty(PropertyName = "exchangeRates")]
+        public Dictionary<string, Dictionary<string, decimal>>? ExchangeRates { get; set; }
+
+        [JsonProperty(PropertyName = "amountPaid")]
+        public double? AmountPaid { get; set; }
+
+        [JsonProperty(PropertyName = "orderId")]
+        public string? OrderId { get; set; }
+
+        [JsonProperty(PropertyName = "transactionCurrency")]
+        public string? TransactionCurrency { get; set; }
+
+        [JsonProperty(PropertyName = "inInvoiceId")]
+        public string? InInvoiceId { get; set; }
+
+        [JsonProperty(PropertyName = "inPaymentRequest")]
+        public string? InPaymentRequest { get; set; }
+    }
+}
diff --git a/BitPay/Models/Invoice/RefundWebhook.cs b/BitPay/Models/Invoice/RefundWebhook.cs
@@ -41,5 +41,29 @@ public class RefundWebhook
 
         [JsonProperty(PropertyName = "supportRequest")]
         public string? SupportRequest { get; set; }
+
+        [JsonProperty(PropertyName = "reference")]
+        public string? Reference { get; set; }
+
+        [JsonProperty(PropertyName = "guid")]
+        public string? ResourceGuid { get; set; }
+
+        [JsonProperty(PropertyName = "refundAddress")]
+        public string? RefundAddress { get; set; }
+
+        [JsonProperty(PropertyName = "type")]
+        public string? Type { get; set; }
+
+        [JsonProperty(PropertyName = "txid")]
+        public string? Txid { get; set; }
+
+        [JsonProperty(PropertyName = "transactionCurrency")]
+        public string? TransactionCurrency { get; set; }
+
+        [JsonProperty(PropertyName = "transactionAmount")]
+        public double? TransactionAmount { get; set; }
+
+        [JsonProperty(PropertyName = "transactionRefundFee")]
+        public double? TransactionRefundFee { get; set; }
     }
 }
diff --git a/BitPay/Models/Ledger/LedgerEntry.cs b/BitPay/Models/Ledger/LedgerEntry.cs
@@ -11,7 +11,7 @@ public class LedgerEntry
     {
         [JsonProperty(PropertyName = "type")] public string? Type { get; set; }
 
-        [JsonProperty(PropertyName = "amount")] public int? Amount { get; set; }
+        [JsonProperty(PropertyName = "amount")] public string? Amount { get; set; }
 
         [JsonProperty(PropertyName = "code")] public int? Code { get; set; }
 

diff --git a/BitPay/Models/Payout/PayoutTransaction.cs b/BitPay/Models/Payout/PayoutTransaction.cs
@@ -19,7 +19,7 @@ public class PayoutInstructionTransaction
         public DateTime? Date { get; set; }
 
         [JsonProperty(PropertyName = "confirmations")]
-        public string? Confirmations { get; set; }
+        public int? Confirmations { get; set; }
 
         public PayoutInstructionTransaction(decimal amount)
         {

diff --git a/BitPay/Models/Payout/PayoutWebhook.cs b/BitPay/Models/Payout/PayoutWebhook.cs
@@ -59,7 +59,14 @@ public class PayoutWebhook
 
         [JsonProperty(PropertyName = "transactions")]
         public List<InvoiceTransaction>? Transactions { get; set; }
-
 
+        [JsonProperty(PropertyName = "accountId")]
+        public string? AccountId { get; set; }
+
+        [JsonProperty(PropertyName = "dateExecuted")]
+        public DateTime? DateExecuted { get; set; }
+
+        [JsonProperty(PropertyName = "groupId")]
+        public string? GroupId { get; set; }
     }
 }