From 00e4a1f357ba0b80eb296fbe8e042c500b1e4bb6 Mon Sep 17 00:00:00 2001 From: jonathancouchman Date: Fri, 12 Feb 2021 14:38:40 +0000 Subject: [PATCH] Removes partner_status usage from COnversions --- .../Mock/Http/Recordings/Conversions.json | 16 ---------------- .../Mock/Http/Recordings/Payers.json | 1 - .../Mock/Http/Recordings/Payments.json | 8 -------- .../Mock/Http/Recordings/Transactions.json | 3 --- Source/CurrencyCloud/Entity/Conversion.cs | 9 +-------- .../Entity/Find/ConversionFindParameters.cs | 6 ------ Source/CurrencyCloud/Entity/ReportParameters.cs | 8 +------- 7 files changed, 2 insertions(+), 49 deletions(-) diff --git a/Source/CurrencyCloud.Tests/Mock/Http/Recordings/Conversions.json b/Source/CurrencyCloud.Tests/Mock/Http/Recordings/Conversions.json index 4b2b909..dc766a5 100644 --- 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 index 32d2d9d..457546a 100644 --- 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 index 0e002c4..65da57d 100644 --- 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 index aaf5410..21eca29 100644 --- 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 index e1d0c79..cce34a4 100644 --- a/Source/CurrencyCloud/Entity/Conversion.cs +++ b/Source/CurrencyCloud/Entity/Conversion.cs @@ -45,12 +45,7 @@ public Conversion() { } /// The current status of the Conversion /// public string Status { get; set; } - - /// - /// The partner status of the Conversion - /// - public string PartnerStatus { get; set; } - + /// /// Currency pair /// @@ -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 index a33bc56..6e2df0f 100644 --- 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; } - /// - /// The partner status of the Conversion - /// - [Param] - public string PartnerStatus { get; set; } - /// /// 3 character ISO 4217 currency code /// diff --git a/Source/CurrencyCloud/Entity/ReportParameters.cs b/Source/CurrencyCloud/Entity/ReportParameters.cs index 7efbcdc..bd54304 100644 --- 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();