Fix for subscription integration test and add support for CustomerId …

…property in SubscriptionResponse

src/Mollie.Api/Models/Subscription/Response/SubscriptionResponse.cs

@@ -91,6 +91,11 @@ public record SubscriptionResponse {
         /// </summary>
         public string? WebhookUrl { get; set; }
 
+        /// <summary>
+        /// The customer this subscription belongs to.
+        /// </summary>
+        public required string CustomerId { get; init; }
+
         /// <summary>
         /// The optional metadata you provided upon subscription creation. Metadata can for example be used to link a plan to a
         /// subscription.

tests/Mollie.Tests.Integration/Api/SubscriptionTests.cs

@@ -109,17 +109,15 @@ public async Task CanCancelSubscription() {
     [DefaultRetryFact]
     public async Task CanUpdateSubscription() {
         // Given
-        string customerId = await GetFirstCustomerWithValidMandate();
-        ListResponse<SubscriptionResponse> subscriptions = await _subscriptionClient.GetSubscriptionListAsync(customerId);
+        var activeSubscription = await GetActiveSubscription();
 
         // When
-        SubscriptionResponse subscriptionToUpdate = subscriptions.Items
-            .FirstOrDefault(s => s.Status != SubscriptionStatus.Canceled);
-        if (subscriptionToUpdate != null) {
+        if (activeSubscription != null) {
+            var customerId = activeSubscription.CustomerId;
             SubscriptionUpdateRequest request = new SubscriptionUpdateRequest() {
                 Description = $"Updated subscription {Guid.NewGuid()}"
             };
-            SubscriptionResponse response = await _subscriptionClient.UpdateSubscriptionAsync(customerId, subscriptionToUpdate.Id, request);
+            SubscriptionResponse response = await _subscriptionClient.UpdateSubscriptionAsync(customerId, activeSubscription.Id, request);
 
             // Then
             response.Description.Should().Be(request.Description);
@@ -163,6 +161,20 @@ private async Task<string> GetFirstCustomerWithValidMandate() {
         return null;
     }
 
+    private async Task<SubscriptionResponse?> GetActiveSubscription() {
+        ListResponse<CustomerResponse> customers = await _customerClient.GetCustomerListAsync();
+
+        foreach (CustomerResponse customer in customers.Items.OrderByDescending(x => x.CreatedAt)) {
+            ListResponse<SubscriptionResponse> subscriptions = await _subscriptionClient.GetSubscriptionListAsync(customer.Id);
+            var activeSubscription = subscriptions.Items.FirstOrDefault(x => x.Status == SubscriptionStatus.Active);
+            if (activeSubscription != null) {
+                return activeSubscription;
+            }
+        }
+
+        return null;
+    }
+
     public void Dispose()
     {
         _subscriptionClient?.Dispose();