From d1db4d31cb800ae6e8ed7dbdce2ff0824cbe7066 Mon Sep 17 00:00:00 2001
From: Addison Beck <addisonbeck1@gmail.com>
Date: Tue, 26 Jul 2022 13:59:41 -0400
Subject: [PATCH] [fix] Address QA found defects for the Stripe Subscriptions
 admin tool (#2150)

* [fix] Clear the page on Stripe Subscription search change
[SG-404]

* [fix] Ensure page is null when selecting all Stripe Subscriptions for an action
[SG-404]

* [feat] Allow Stripe Subscriptions to be filtered by a test clock
[SG-404]
---
 src/Admin/Controllers/ToolsController.cs         |  6 ++++--
 src/Admin/Models/StripeSubscriptionsModel.cs     |  1 +
 src/Admin/Views/Tools/StripeSubscriptions.cshtml |  8 ++++++++
 .../Stripe/StripeSubscriptionListOptions.cs      |  8 ++++++++
 src/Core/Services/IStripeAdapter.cs              |  1 +
 .../Services/Implementations/StripeAdapter.cs    | 16 ++++++++++++++++
 6 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/Admin/Controllers/ToolsController.cs b/src/Admin/Controllers/ToolsController.cs
index 0f3023cee5..9a483c137b 100644
--- a/src/Admin/Controllers/ToolsController.cs
+++ b/src/Admin/Controllers/ToolsController.cs
@@ -453,6 +453,7 @@ namespace Bit.Admin.Controllers
             {
                 Items = subscriptions.Select(s => new StripeSubscriptionRowModel(s)).ToList(),
                 Prices = (await _stripeAdapter.PriceListAsync(new Stripe.PriceListOptions() { Limit = 100 })).Data,
+                TestClocks = await _stripeAdapter.TestClockListAsync(),
                 Filter = options
             };
             return View(model);
@@ -464,6 +465,7 @@ namespace Bit.Admin.Controllers
             if (!ModelState.IsValid)
             {
                 model.Prices = (await _stripeAdapter.PriceListAsync(new Stripe.PriceListOptions() { Limit = 100 })).Data;
+                model.TestClocks = await _stripeAdapter.TestClockListAsync();
                 return View(model);
             }
 
@@ -485,11 +487,11 @@ namespace Bit.Admin.Controllers
             }
             else
             {
-                if (model.Action == StripeSubscriptionsAction.PreviousPage)
+                if (model.Action == StripeSubscriptionsAction.PreviousPage || model.Action == StripeSubscriptionsAction.Search)
                 {
                     model.Filter.StartingAfter = null;
                 }
-                if (model.Action == StripeSubscriptionsAction.NextPage)
+                if (model.Action == StripeSubscriptionsAction.NextPage || model.Action == StripeSubscriptionsAction.Search)
                 {
                     model.Filter.EndingBefore = null;
                 }
diff --git a/src/Admin/Models/StripeSubscriptionsModel.cs b/src/Admin/Models/StripeSubscriptionsModel.cs
index 2596db9abd..3e30d63d50 100644
--- a/src/Admin/Models/StripeSubscriptionsModel.cs
+++ b/src/Admin/Models/StripeSubscriptionsModel.cs
@@ -30,6 +30,7 @@ namespace Bit.Admin.Models
         public StripeSubscriptionsAction Action { get; set; } = StripeSubscriptionsAction.Search;
         public string Message { get; set; }
         public List<Stripe.Price> Prices { get; set; }
+        public List<Stripe.TestHelpers.TestClock> TestClocks { get; set; }
         public StripeSubscriptionListOptions Filter { get; set; } = new StripeSubscriptionListOptions();
         public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
         {
diff --git a/src/Admin/Views/Tools/StripeSubscriptions.cshtml b/src/Admin/Views/Tools/StripeSubscriptions.cshtml
index 3f66e08019..8ba50072ea 100644
--- a/src/Admin/Views/Tools/StripeSubscriptions.cshtml
+++ b/src/Admin/Views/Tools/StripeSubscriptions.cshtml
@@ -112,6 +112,14 @@
                     {<option asp-selected='@Model.Filter.Price == @price.Id' value="@price.Id">@price.Id</option>}
                 </select>
             </div>
+            <div class="col-6">
+                <label asp-for="Filter.TestClock">Test Clock</label>
+                <select asp-for="Filter.TestClock" name="filter.TestClock" class="form-control mr-2">
+                    <option asp-selected="Model.Filter.TestClock == null" value="@null">All</option>
+                    @foreach (var clock in Model.TestClocks)
+                    {<option asp-selected='@Model.Filter.TestClock == @clock.Id' value="@clock.Id">@clock.Name</option>}
+                </select>
+            </div>
         </div>
         <div class="row col-12 d-flex justify-content-end my-3">
                 <button type="submit" class="btn btn-primary" title="Search" name="action" asp-for="Action" value="@StripeSubscriptionsAction.Search"><i class="fa fa-search"></i> Search</button>
diff --git a/src/Core/Models/Stripe/StripeSubscriptionListOptions.cs b/src/Core/Models/Stripe/StripeSubscriptionListOptions.cs
index 99d1f02c76..1672dc407c 100644
--- a/src/Core/Models/Stripe/StripeSubscriptionListOptions.cs
+++ b/src/Core/Models/Stripe/StripeSubscriptionListOptions.cs
@@ -27,6 +27,13 @@
         public Stripe.SubscriptionListOptions ToStripeApiOptions()
         {
             var stripeApiOptions = (Stripe.SubscriptionListOptions)this;
+
+            if (SelectAll)
+            {
+                stripeApiOptions.EndingBefore = null;
+                stripeApiOptions.StartingAfter = null;
+            }
+
             if (CurrentPeriodEndDate.HasValue)
             {
                 stripeApiOptions.CurrentPeriodEnd = new Stripe.DateRangeOptions()
@@ -35,6 +42,7 @@
                     GreaterThan = CurrentPeriodEndRange == "gt" ? CurrentPeriodEndDate : null
                 };
             }
+
             return stripeApiOptions;
         }
     }
diff --git a/src/Core/Services/IStripeAdapter.cs b/src/Core/Services/IStripeAdapter.cs
index 48a589fed6..ffb0e2a1c5 100644
--- a/src/Core/Services/IStripeAdapter.cs
+++ b/src/Core/Services/IStripeAdapter.cs
@@ -35,5 +35,6 @@ namespace Bit.Core.Services
         Task<Stripe.BankAccount> BankAccountCreateAsync(string customerId, Stripe.BankAccountCreateOptions options = null);
         Task<Stripe.BankAccount> BankAccountDeleteAsync(string customerId, string bankAccount, Stripe.BankAccountDeleteOptions options = null);
         Task<Stripe.StripeList<Stripe.Price>> PriceListAsync(Stripe.PriceListOptions options = null);
+        Task<List<Stripe.TestHelpers.TestClock>> TestClockListAsync();
     }
 }
diff --git a/src/Core/Services/Implementations/StripeAdapter.cs b/src/Core/Services/Implementations/StripeAdapter.cs
index cd7719fcce..eb467dd573 100644
--- a/src/Core/Services/Implementations/StripeAdapter.cs
+++ b/src/Core/Services/Implementations/StripeAdapter.cs
@@ -15,6 +15,7 @@ namespace Bit.Core.Services
         private readonly Stripe.CardService _cardService;
         private readonly Stripe.BankAccountService _bankAccountService;
         private readonly Stripe.PriceService _priceService;
+        private readonly Stripe.TestHelpers.TestClockService _testClockService;
 
         public StripeAdapter()
         {
@@ -29,6 +30,7 @@ namespace Bit.Core.Services
             _cardService = new Stripe.CardService();
             _bankAccountService = new Stripe.BankAccountService();
             _priceService = new Stripe.PriceService();
+            _testClockService = new Stripe.TestHelpers.TestClockService();
         }
 
         public Task<Stripe.Customer> CustomerCreateAsync(Stripe.CustomerCreateOptions options)
@@ -198,5 +200,19 @@ namespace Bit.Core.Services
         {
             return await _priceService.ListAsync(options);
         }
+
+        public async Task<List<Stripe.TestHelpers.TestClock>> TestClockListAsync()
+        {
+            var items = new List<Stripe.TestHelpers.TestClock>();
+            var options = new Stripe.TestHelpers.TestClockListOptions()
+            {
+                Limit = 100
+            };
+            await foreach (var i in _testClockService.ListAutoPagingAsync(options))
+            {
+                items.Add(i);
+            }
+            return items;
+        }
     }
 }