Merge pull request #70 from CurrencyCloud/sdknet-58_remove_partner_st…

…atus Removes partner_status usage from Conversions
CurrencyCloud · Feb 15, 2021 · 4ae78c1 · 4ae78c1
2 parents dfc2e9f + 00e4a1f
commit 4ae78c1
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 49 deletions.
diff --git a/Source/CurrencyCloud.Tests/Mock/Http/Recordings/Conversions.json b/Source/CurrencyCloud.Tests/Mock/Http/Recordings/Conversions.json
@@ -88,7 +88,6 @@
             "mid_market_rate": "0.7216",
             "core_rate": "0.7215",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.7215",
@@ -145,7 +144,6 @@
             "mid_market_rate": "0.7216",
             "core_rate": "0.7215",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.7215",
@@ -196,7 +194,6 @@
             "mid_market_rate": "0.7216",
             "core_rate": "0.7215",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.7215",
@@ -253,7 +250,6 @@
             "mid_market_rate": "0.7216",
             "core_rate": "0.7215",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.7215",
@@ -307,7 +303,6 @@
                 "mid_market_rate": "0.7216",
                 "core_rate": "0.7215",
                 "partner_rate": "",
-                "partner_status": "funds_arrived",
                 "partner_buy_amount": "0.00",
                 "partner_sell_amount": "0.00",
                 "client_rate": "0.7215",
@@ -376,7 +371,6 @@
             "mid_market_rate": "0.7216",
             "core_rate": "0.7215",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.7215",
@@ -429,7 +423,6 @@
                 "mid_market_rate": "0.7216",
                 "core_rate": "0.7215",
                 "partner_rate": "",
-                "partner_status": "funds_arrived",
                 "partner_buy_amount": "0.00",
                 "partner_sell_amount": "0.00",
                 "client_rate": "0.7215",
@@ -498,7 +491,6 @@
             "mid_market_rate": "0.7216",
             "core_rate": "0.7215",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.7215",
@@ -585,7 +577,6 @@
             "mid_market_rate": "0.7216",
             "core_rate": "0.7215",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.7215",
@@ -670,7 +661,6 @@
             "mid_market_rate": "0.7216",
             "core_rate": "0.7215",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.7215",
@@ -756,7 +746,6 @@
             "mid_market_rate": "0.7216",
             "core_rate": "0.7215",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.7215",
@@ -842,7 +831,6 @@
             "mid_market_rate": "0.7216",
             "core_rate": "0.7215",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.7215",
@@ -957,7 +945,6 @@
             "mid_market_rate": "0.8056",
             "core_rate": "0.8057",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.8057",
@@ -1057,7 +1044,6 @@
             "mid_market_rate": "0.8056",
             "core_rate": "0.8057",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.8057",
@@ -1157,7 +1143,6 @@
             "mid_market_rate": "0.8056",
             "core_rate": "0.8057",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.8057",
@@ -1461,7 +1446,6 @@
             "fixed_side": "buy",
             "core_rate": "0.8059",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.8059",

diff --git a/Source/CurrencyCloud.Tests/Mock/Http/Recordings/Payers.json b/Source/CurrencyCloud.Tests/Mock/Http/Recordings/Payers.json
@@ -87,7 +87,6 @@
             "mid_market_rate": "0.7216",
             "core_rate": "0.7215",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.7215",

diff --git a/Source/CurrencyCloud.Tests/Mock/Http/Recordings/Payments.json b/Source/CurrencyCloud.Tests/Mock/Http/Recordings/Payments.json
@@ -87,7 +87,6 @@
             "mid_market_rate": "0.7216",
             "core_rate": "0.7215",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.7215",
@@ -244,7 +243,6 @@
             "mid_market_rate": "0.7216",
             "core_rate": "0.7215",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.7215",
@@ -441,7 +439,6 @@
             "mid_market_rate": "0.7216",
             "core_rate": "0.7215",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.7215",
@@ -679,7 +676,6 @@
             "mid_market_rate": "0.7216",
             "core_rate": "0.7215",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.7215",
@@ -859,7 +855,6 @@
             "mid_market_rate": "0.7216",
             "core_rate": "0.7215",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.7215",
@@ -1100,7 +1095,6 @@
             "mid_market_rate": "0.7216",
             "core_rate": "0.7215",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.7215",
@@ -1312,7 +1306,6 @@
             "mid_market_rate": "0.7216",
             "core_rate": "0.7215",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.7215",
@@ -1523,7 +1516,6 @@
             "mid_market_rate": "0.7216",
             "core_rate": "0.7215",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.7215",

diff --git a/Source/CurrencyCloud.Tests/Mock/Http/Recordings/Transactions.json b/Source/CurrencyCloud.Tests/Mock/Http/Recordings/Transactions.json
@@ -87,7 +87,6 @@
             "mid_market_rate": "0.7216",
             "core_rate": "0.7215",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.7215",
@@ -269,7 +268,6 @@
             "mid_market_rate": "0.7216",
             "core_rate": "0.7215",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.7215",
@@ -450,7 +448,6 @@
             "mid_market_rate": "0.7216",
             "core_rate": "0.7215",
             "partner_rate": "",
-            "partner_status": "funds_arrived",
             "partner_buy_amount": "0.00",
             "partner_sell_amount": "0.00",
             "client_rate": "0.7215",

diff --git a/Source/CurrencyCloud/Entity/Conversion.cs b/Source/CurrencyCloud/Entity/Conversion.cs
@@ -45,12 +45,7 @@ public Conversion() { }
         /// The current status of the Conversion
         ///</summary>
         public string Status { get; set; }
-
-        ///<summary>
-        /// The partner status of the Conversion
-        ///</summary>
-        public string PartnerStatus { get; set; }
-
+
         ///<summary>
         /// Currency pair
         ///</summary>
@@ -167,7 +162,6 @@ public string ToJSON()
                     FixedSide,
                     CoreRate,
                     PartnerRate,
-                    PartnerStatus,
                     PartnerBuyAmount,
                     PartnerSellAmount,
                     ClientRate,
@@ -204,7 +198,6 @@ public override bool Equals(object obj)
                    SettlementDate == conversion.SettlementDate &&
                    ConversionDate == conversion.ConversionDate &&
                    Status == conversion.Status &&
-                   PartnerStatus == conversion.PartnerStatus &&
                    CurrencyPair == conversion.CurrencyPair &&
                    BuyCurrency == conversion.BuyCurrency &&
                    AccountId == conversion.AccountId &&

diff --git a/Source/CurrencyCloud/Entity/Find/ConversionFindParameters.cs b/Source/CurrencyCloud/Entity/Find/ConversionFindParameters.cs
@@ -16,12 +16,6 @@ public class ConversionFindParameters : FindParameters
         [Param]
         public string Status { get; set; }
 
-        ///<summary>
-        /// The partner status of the Conversion
-        ///</summary>
-        [Param]
-        public string PartnerStatus { get; set; }
-
         ///<summary>
         /// 3 character ISO 4217 currency code
         ///</summary>

diff --git a/Source/CurrencyCloud/Entity/ReportParameters.cs b/Source/CurrencyCloud/Entity/ReportParameters.cs
@@ -124,11 +124,7 @@ public sealed class ReportParameters
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
             [Param]
             public string ClientStatus { get; set; }
-
-            [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
-            [Param]
-            public string PartnerStatus { get; set; }
-
+
             [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
             [Param]
             public DateTime? ConversionDateFrom { get; set; }
@@ -182,7 +178,6 @@ public override bool Equals(object obj)
                        PartnerSellAmountFrom == reportParameters.PartnerSellAmountFrom &&
                        PartnerSellAmountTo == reportParameters.PartnerSellAmountTo &&
                        ClientStatus == reportParameters.ClientStatus &&
-                       PartnerStatus == reportParameters.PartnerStatus &&
                        ConversionDateFrom == reportParameters.ConversionDateFrom &&
                        ConversionDateTo == reportParameters.ConversionDateTo &&
                        SettlementDateFrom == reportParameters.SettlementDateFrom &&
@@ -223,7 +218,6 @@ public override int GetHashCode()
                     hashCode = (hashCode * 397) ^ PartnerSellAmountFrom.GetHashCode();
                     hashCode = (hashCode * 397) ^ PartnerSellAmountTo.GetHashCode();
                     hashCode = (hashCode * 397) ^ (ClientStatus != null ? ClientStatus.GetHashCode() : 0);
-                    hashCode = (hashCode * 397) ^ (PartnerStatus != null ? PartnerStatus.GetHashCode() : 0);
                     hashCode = (hashCode * 397) ^ ConversionDateFrom.GetHashCode();
                     hashCode = (hashCode * 397) ^ ConversionDateTo.GetHashCode();
                     hashCode = (hashCode * 397) ^ SettlementDateFrom.GetHashCode();