Merge pull request #157 from WinkPascal/develop

bunq Update 28 | Update object naming, fix parsing and fix tests

Author: andrederoos

.gitignore

@@ -1,30 +1,6 @@
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff:
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/dictionaries
-
-# Sensitive or high-churn files:
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.xml
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-
-# Gradle:
-.idea/**/gradle.xml
-.idea/**/libraries
-
 # CMake
 cmake-build-debug/
 
-# Mongo Explorer plugin:
-.idea/**/mongoSettings.xml
-
 ## File-based project format:
 *.iws
 
@@ -33,15 +9,9 @@ cmake-build-debug/
 # IntelliJ
 /out/
 
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
 # JIRA plugin
 atlassian-ide-plugin.xml
 
-# Cursive Clojure plugin
-.idea/replstate.xml
-
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties
@@ -265,5 +235,11 @@ bunq.conf
 **/Tmp/
 bunq-test.conf
 config.json
-.idea/.idea.BunqSdk/.idea/preferred-vcs.xml
-.idea/.idea.BunqSdk/.idea/indexLayout.xml
+
+/BunqSdk.Tests/Resources/bunq-psd2-test.conf
+/BunqSdk.Tests/Resources/bunq-oauth-test.conf
+/BunqSdk.Tests/Resources/credentials.pfx
+/BunqSdk.Tests/Resources/chain.cert
+/BunqSdk.Tests/Resources/key.pem
+
+.idea

BunqSdk.Tests/BunqSdk.Tests.csproj

@@ -2,8 +2,8 @@
   <PropertyGroup>
     <RootNamespace>Bunq.Sdk.Tests</RootNamespace>
     <LangVersion>default</LangVersion>
-    <AssemblyName>BunqSdk.Tests.xunit.runner.json</AssemblyName>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <AssemblyName>BunqSdk.Tests</AssemblyName>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\BunqSdk\BunqSdk.csproj" />
@@ -26,7 +26,6 @@
     <Folder Include="Resources\NotificationUrlJsons" />
   </ItemGroup>
   <ItemGroup>
-    <None Remove="Resources\chain.cert" />
     <None Remove="Resources\bunq-psd2-test.conf" />
   </ItemGroup>
 </Project>

BunqSdk.Tests/BunqSdkTestBase.cs

@@ -68,7 +68,7 @@ public class BunqSdkTestBase
         private const string SpendingMoneyAmount = "50.00";
         private const string SpendingMoneyRequestDescription = "sdk c# test, thanks daddy.";
 
-        protected static MonetaryAccountBank SecondMonetaryAccountBank;
+        protected static MonetaryAccountBankApiObject SecondMonetaryAccountBank;
 
         /// <summary>
         /// Gets an Api Context, re-creates if needed and returns it.
@@ -78,7 +78,7 @@ protected static void SetUpTestCase()
             SetUpApiContext();
             SecondMonetaryAccountBank = SetUpSecondMonetaryAccount();
             RequestSpendingMoney();
-            Thread.Sleep(500); // ensure requests are auto accepted.
+            Thread.Sleep(1000); // Ensure requests are auto accepted.
             BunqContext.UserContext.RefreshUserContext();
         }
 
@@ -102,7 +102,7 @@ protected static ApiContext SetUpApiContext()
             return apiContext;
         }
 
-        private static SandboxUserPerson GenerateNewSandboxUserPerson()
+        private static SandboxUserPersonApiObject GenerateNewSandboxUserPerson()
         {
             var httpClient = new HttpClient();
             httpClient.DefaultRequestHeaders.Add("X-Bunq-Client-Request-Id", "unique");
@@ -118,42 +118,42 @@ private static SandboxUserPerson GenerateNewSandboxUserPerson()
             var responseString = requestTask.Result.Content.ReadAsStringAsync().Result;
             var responseJson = BunqJsonConvert.DeserializeObject<JObject>(responseString);
 
-            return BunqJsonConvert.DeserializeObject<SandboxUserPerson>(
+            return BunqJsonConvert.DeserializeObject<SandboxUserPersonApiObject>(
                 responseJson.First.First.First.First.First.ToString()
             );
         }
 
-        private static MonetaryAccountBank SetUpSecondMonetaryAccount()
+        private static MonetaryAccountBankApiObject SetUpSecondMonetaryAccount()
         {
-            var createdMonetaryAccountId = MonetaryAccountBank.Create(PaymentCurrency, MonetaryAccountDescription);
+            var createdMonetaryAccountId = MonetaryAccountBankApiObject.Create(PaymentCurrency, MonetaryAccountDescription);
 
-            return MonetaryAccountBank.Get(createdMonetaryAccountId.Value).Value;
+            return MonetaryAccountBankApiObject.Get(createdMonetaryAccountId.Value).Value;
         }
 
         private static void RequestSpendingMoney()
         {
-            RequestInquiry.Create(
-                new Amount(SpendingMoneyAmount, PaymentCurrency),
-                new Pointer(PointerTypeEmail, EmailSuggarDaddy),
+            RequestInquiryApiObject.Create(
+                new AmountObject(SpendingMoneyAmount, PaymentCurrency),
+                new PointerObject(PointerTypeEmail, EmailSuggarDaddy),
                 SpendingMoneyRequestDescription,
                 false
             );
 
-            RequestInquiry.Create(
-                new Amount(SpendingMoneyAmount, PaymentCurrency),
-                new Pointer(PointerTypeEmail, EmailSuggarDaddy),
+            RequestInquiryApiObject.Create(
+                new AmountObject(SpendingMoneyAmount, PaymentCurrency),
+                new PointerObject(PointerTypeEmail, EmailSuggarDaddy),
                 SpendingMoneyRequestDescription,
                 false,
                 SecondMonetaryAccountBank.Id
             );
         }
 
-        protected static Pointer GetPointerBravo()
+        protected static PointerObject GetPointerBravo()
         {
-            return new Pointer(PointerTypeEmail, EmailBravo);
+            return new PointerObject(PointerTypeEmail, EmailBravo);
         }
 
-        protected static Pointer GetAlias()
+        protected static PointerObject GetAlias()
         {
             var userContext = BunqContext.UserContext;
 

BunqSdk.Tests/Config.cs

@@ -34,27 +34,21 @@ public class Config
         private const string FIELD_COUNTER_ALIAS = "Alias";
         private const string FIELD_COUNTER_TYPE = "Type";
         private const string FIELD_TAB_USAGE_SINGLE = "TabUsageSingleTest";
-        private const string FIELD_CASH_REGISTER_ID = "CASH_REGISTER_ID";
-
-        public static int GetCashRegisterId()
-        {
-            return GetConfig()[FIELD_TAB_USAGE_SINGLE][FIELD_CASH_REGISTER_ID].ToObject<int>();
-        }
-
-        public static Pointer GetCounterPartyAliasOther()
+        
+        public static PointerObject GetCounterPartyAliasOther()
         {
             var alias = GetConfig()[FIELD_COUNTER_PARTY_OTHER][FIELD_COUNTER_ALIAS].ToString();
             var type = GetConfig()[FIELD_COUNTER_PARTY_OTHER][FIELD_COUNTER_TYPE].ToString();
 
-            return new Pointer(type, alias);
+            return new PointerObject(type, alias);
         }
 
-        public static Pointer GetCounterPartyAliasSelf()
+        public static PointerObject GetCounterPartyAliasSelf()
         {
             var alias = GetConfig()[FIELD_COUNTER_PARTY_SELF][FIELD_COUNTER_ALIAS].ToString();
             var type = GetConfig()[FIELD_COUNTER_PARTY_SELF][FIELD_COUNTER_TYPE].ToString();
 
-            return new Pointer(type, alias);
+            return new PointerObject(type, alias);
         }
 
         public static int GetSecondMonetaryAccountId()

BunqSdk.Tests/Context/Psd2ApiContextTest.cs

@@ -10,7 +10,7 @@
 namespace Bunq.Sdk.Tests.Context
 {
     [TestCaseOrderer("Bunq.Sdk.Tests.Util.TestPriorityOrderer", "Psd2ApiContextTest")]
-    public class Psd2ApiContextTest : IClassFixture<Psd2ApiContextTest>
+    public class Psd2ApiContextTest : BunqSdkTestBase, IClassFixture<Psd2ApiContextTest>
     {
         /// <summary>
         /// File constants.
@@ -48,13 +48,15 @@ public void TestCreatePsd2Context()
         [Fact, TestPriority(0)]
         public void TestCreateOauthClient()
         {
+            SetUpApiContext();
+            
             if (File.Exists(FILE_TEST_OAUTH))
             {
                 return;
             }
 
-            int clientId = OauthClient.Create().Value;
-            OauthClient oauthClient = OauthClient.Get(clientId).Value;
+            int clientId = OauthClientApiObject.Create().Value;
+            OauthClientApiObject oauthClient = OauthClientApiObject.Get(clientId).Value;
             Assert.NotNull(oauthClient);
 
             File.WriteAllText(

BunqSdk.Tests/Http/PaginationScenarioTest.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Threading;
 using Bunq.Sdk.Http;
 using Bunq.Sdk.Json;
 using Bunq.Sdk.Model.Generated.Endpoint;
@@ -26,19 +27,24 @@ public void TestApiScenarioPaymentListingWithPagination()
             SetUpTestCase();
 
             EnsureEnoughPayments();
-            var paymentsExpected = new List<Payment>(GetPaymentsRequired());
+            var paymentsExpected = new List<PaymentApiObject>(GetPaymentsRequired());
             var paginationCountOnly = new Pagination
             {
                 Count = PaymentListingPageSize
             };
-
+            
+            Thread.Sleep(1000); // Ensure request won't get rate limited.
             var responseLatest = ListPayments(paginationCountOnly.UrlParamsCountOnly);
+            
+            Thread.Sleep(1000); // Ensure request won't get rate limited.
             var paginationLatest = responseLatest.Pagination;
             var responsePrevious = ListPayments(paginationLatest.UrlParamsPreviousPage);
+            
+            Thread.Sleep(1000); // Ensure request won't get rate limited.
             var paginationPrevious = responsePrevious.Pagination;
             var responsePreviousNext = ListPayments(paginationPrevious.UrlParamsNextPage);
 
-            var paymentsActual = new List<Payment>();
+            var paymentsActual = new List<PaymentApiObject>();
             paymentsActual.AddRange(responsePreviousNext.Value);
             paymentsActual.AddRange(responsePrevious.Value);
             var paymentsExpectedSerialized = BunqJsonConvert.SerializeObject(paymentsExpected);
@@ -51,6 +57,7 @@ private static void EnsureEnoughPayments()
         {
             for (var i = NumberZero; i < GetPaymentsMissingCount(); ++i)
             {
+                Thread.Sleep(1000); // Time out to prevent rate limiting.
                 CreatePayment();
             }
         }
@@ -60,7 +67,7 @@ private static int GetPaymentsMissingCount()
             return PaymentRequiredCountMinimum - GetPaymentsRequired().Count;
         }
 
-        private static IList<Payment> GetPaymentsRequired()
+        private static IList<PaymentApiObject> GetPaymentsRequired()
         {
             var pagination = new Pagination
             {
@@ -70,14 +77,14 @@ private static IList<Payment> GetPaymentsRequired()
             return ListPayments(pagination.UrlParamsCountOnly).Value;
         }
 
-        private static BunqResponse<List<Payment>> ListPayments(IDictionary<string, string> urlParams)
+        private static BunqResponse<List<PaymentApiObject>> ListPayments(IDictionary<string, string> urlParams)
         {
-            return Payment.List(urlParams: urlParams);
+            return PaymentApiObject.List(urlParams: urlParams);
         }
 
         private static void CreatePayment()
         {
-            Payment.Create(new Amount(PaymentAmountEur, PaymentCurrency), GetPointerBravo(), PaymentDescription);
+            PaymentApiObject.Create(new AmountObject(PaymentAmountEur, PaymentCurrency), GetPointerBravo(), PaymentDescription);
         }
     }
 }

BunqSdk.Tests/Http/ResponseIdOnNotFoundRequestTest.cs

@@ -12,7 +12,7 @@ public void TestBadRequestWithResponseId()
             SetUpTestCase();
 
             var caughtException = Assert.Throws<NotFoundException>(
-                () => Payment.Get(0)
+                () => PaymentApiObject.Get(0)
             );
 
             Assert.NotNull(caughtException.ResponseId);

BunqSdk.Tests/Model/Core/NotificationFilterTest.cs

@@ -29,11 +29,11 @@ public void TestNotificationFilterUrlMonetaryAccount()
         {
             SetUpApiContext();
 
-            NotificationFilterUrl notificationFilter = GetNotificationFilterUrl();
-            List<NotificationFilterUrl> allCreatedNotificationFilter = NotificationFilterUrlMonetaryAccountInternal
+            NotificationFilterUrlObject notificationFilter = GetNotificationFilterUrl();
+            List<NotificationFilterUrlObject> allCreatedNotificationFilter = NotificationFilterUrlMonetaryAccountInternal
                 .CreateWithListResponse(
                     GetPrimaryMonetaryAccount().Id.Value,
-                    new List<NotificationFilterUrl>() {notificationFilter}
+                    new List<NotificationFilterUrlObject>() {notificationFilter}
                 ).Value;
 
             Assert.True(allCreatedNotificationFilter.Count == 1);
@@ -47,10 +47,10 @@ public void TestNotificationFilterUrlUser()
         {
             SetUpApiContext();
 
-            NotificationFilterUrl notificationFilter = GetNotificationFilterUrl();
-            List<NotificationFilterUrl> allCreatedNotificationFilter = NotificationFilterUrlUserInternal
+            NotificationFilterUrlObject notificationFilter = GetNotificationFilterUrl();
+            List<NotificationFilterUrlObject> allCreatedNotificationFilter = NotificationFilterUrlUserInternal
                 .CreateWithListResponse(
-                    new List<NotificationFilterUrl>() {notificationFilter}
+                    new List<NotificationFilterUrlObject>() {notificationFilter}
                 ).Value;
 
             Assert.True(allCreatedNotificationFilter.Count == 1);
@@ -64,50 +64,26 @@ public void TestNotificationFilterPushUser()
         {
             SetUpApiContext();
 
-            NotificationFilterPush notificationFilter = GetNotificationFilterPush();
-            List<NotificationFilterPush> allCreatedNotificationFilter = NotificationFilterPushUserInternal
+            NotificationFilterPushObject notificationFilter = GetNotificationFilterPush();
+            List<NotificationFilterPushObject> allCreatedNotificationFilter = NotificationFilterPushUserInternal
                 .CreateWithListResponse(
-                    new List<NotificationFilterPush>() {notificationFilter}
+                    new List<NotificationFilterPushObject>() {notificationFilter}
                 ).Value;
 
-            Assert.True(allCreatedNotificationFilter.Count == 1);
-        }
-
-        /// <summary>
-        /// Test clear all filters.
-        /// </summary>
-        [Fact]
-        public void TestNotificationFilterClear()
-        {
-            SetUpApiContext();
-
-            List<NotificationFilterPush> allCreatedNotificationFilterPushUser =
-                NotificationFilterPushUserInternal.CreateWithListResponse().Value;
-            List<NotificationFilterUrl> allCreatedNotificationFilterUrlUser =
-                NotificationFilterUrlUserInternal.CreateWithListResponse().Value;
-            List<NotificationFilterUrl> allCreatedNotificationFilterUrlMonetaryAccount =
-                NotificationFilterUrlMonetaryAccountInternal.CreateWithListResponse().Value;
-
-            Assert.Empty(allCreatedNotificationFilterPushUser);
-            Assert.Empty(allCreatedNotificationFilterUrlUser);
-            Assert.Empty(allCreatedNotificationFilterUrlMonetaryAccount);
-
-            Assert.StrictEqual(0, NotificationFilterPushUserInternal.List().Value.Count);
-            Assert.StrictEqual(0, NotificationFilterUrlUserInternal.List().Value.Count);
-            Assert.StrictEqual(0, NotificationFilterUrlMonetaryAccountInternal.List().Value.Count);
+            Assert.True(allCreatedNotificationFilter.Count > 1);
         }
 
-        private NotificationFilterUrl GetNotificationFilterUrl()
+        private NotificationFilterUrlObject GetNotificationFilterUrl()
         {
-            return new NotificationFilterUrl(FILTER_CATEGORY_MUTATION, FILTER_CALLBACK_URL);
+            return new NotificationFilterUrlObject(FILTER_CATEGORY_MUTATION, FILTER_CALLBACK_URL);
         }
 
-        private NotificationFilterPush GetNotificationFilterPush()
+        private NotificationFilterPushObject GetNotificationFilterPush()
         {
-            return new NotificationFilterPush(FILTER_CATEGORY_MUTATION);
+            return new NotificationFilterPushObject(FILTER_CATEGORY_MUTATION);
         }
 
-        private MonetaryAccountBank GetPrimaryMonetaryAccount()
+        private MonetaryAccountBankApiObject GetPrimaryMonetaryAccount()
         {
             return BunqContext.UserContext.PrimaryMonetaryAccountBank;
         }