From 9292f3810f2ef881f2804f4b627e3c1d8b0bd6bd Mon Sep 17 00:00:00 2001
From: Cy Okeke <cokeke@bitwarden.com>
Date: Tue, 10 Jun 2025 13:16:38 +0100
Subject: [PATCH] Resolve the failing test

---
 .../Billing/Models/Sales/OrganizationSale.cs  | 55 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/src/Core/Billing/Models/Sales/OrganizationSale.cs b/src/Core/Billing/Models/Sales/OrganizationSale.cs
index 295acfb7ca..ee2015d8ee 100644
--- a/src/Core/Billing/Models/Sales/OrganizationSale.cs
+++ b/src/Core/Billing/Models/Sales/OrganizationSale.cs
@@ -45,7 +45,18 @@ public class OrganizationSale
 
     public static OrganizationSale From(
         Organization organization,
-        OrganizationUpgrade upgrade) => From(organization, (OrganizationSignup)upgrade);
+        OrganizationUpgrade upgrade)
+    {
+        var customerSetup = string.IsNullOrEmpty(organization.GatewayCustomerId) ? GetCustomerSetup(upgrade) : null;
+        var subscriptionSetup = GetSubscriptionSetup(upgrade);
+
+        return new OrganizationSale
+        {
+            Organization = organization,
+            CustomerSetup = customerSetup,
+            SubscriptionSetup = subscriptionSetup
+        };
+    }
 
     private static CustomerSetup GetCustomerSetup(OrganizationSignup signup)
     {
@@ -81,6 +92,22 @@ public class OrganizationSale
         return customerSetup;
     }
 
+    private static CustomerSetup GetCustomerSetup(OrganizationUpgrade upgrade)
+    {
+        return new CustomerSetup
+        {
+            TaxInformation = new TaxInformation(
+                upgrade.TaxInfo.BillingAddressCountry,
+                upgrade.TaxInfo.BillingAddressPostalCode,
+                upgrade.TaxInfo.TaxIdNumber,
+                upgrade.TaxInfo.TaxIdType,
+                upgrade.TaxInfo.BillingAddressLine1,
+                upgrade.TaxInfo.BillingAddressLine2,
+                upgrade.TaxInfo.BillingAddressCity,
+                upgrade.TaxInfo.BillingAddressState)
+        };
+    }
+
     private static SubscriptionSetup GetSubscriptionSetup(OrganizationSignup signup)
     {
         var passwordManagerOptions = new SubscriptionSetup.PasswordManager
@@ -116,4 +143,30 @@ public class OrganizationSale
 
         return subscriptionSetup;
     }
+
+    private static SubscriptionSetup GetSubscriptionSetup(OrganizationUpgrade upgrade)
+    {
+        var passwordManagerOptions = new SubscriptionSetup.PasswordManager
+        {
+            Seats = upgrade.AdditionalSeats,
+            Storage = upgrade.AdditionalStorageGb,
+            PremiumAccess = upgrade.PremiumAccessAddon
+        };
+
+        var secretsManagerOptions = upgrade.UseSecretsManager
+            ? new SubscriptionSetup.SecretsManager
+            {
+                Seats = upgrade.AdditionalSmSeats ?? 0,
+                ServiceAccounts = upgrade.AdditionalServiceAccounts
+            }
+            : null;
+
+        return new SubscriptionSetup
+        {
+            PlanType = upgrade.Plan,
+            PasswordManagerOptions = passwordManagerOptions,
+            SecretsManagerOptions = secretsManagerOptions,
+            SkipTrial = true // Upgrades should always skip trial
+        };
+    }
 }