upgrade org api

src/Core/Models/Api/Request/Organizations/OrganizationUpgradeRequestModel.cs

@@ -1,12 +1,30 @@
 using Bit.Core.Enums;
+using Bit.Core.Models.Business;
 using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Core.Models.Api
 {
     public class OrganizationUpgradeRequestModel
     {
+        [StringLength(50)]
+        public string BusinessName { get; set; }
         public PlanType PlanType { get; set; }
         [Range(0, double.MaxValue)]
         public short AdditionalSeats { get; set; }
+        [Range(0, 99)]
+        public short? AdditionalStorageGb { get; set; }
+        public bool PremiumAccessAddon { get; set; }
+
+        public OrganizationUpgrade ToOrganizationUpgrade()
+        {
+            return new OrganizationUpgrade
+            {
+                AdditionalSeats = AdditionalSeats,
+                AdditionalStorageGb = AdditionalStorageGb.GetValueOrDefault(),
+                BusinessName = BusinessName,
+                Plan = PlanType,
+                PremiumAccessAddon = PremiumAccessAddon
+            };
+        }
     }
 }

src/Core/Models/Business/OrganizationSignup.cs

@@ -3,19 +3,14 @@ using Bit.Core.Models.Table;
 
 namespace Bit.Core.Models.Business
 {
-    public class OrganizationSignup
+    public class OrganizationSignup : OrganizationUpgrade
     {
         public string Name { get; set; }
-        public string BusinessName { get; set; }
         public string BillingEmail { get; set; }
         public User Owner { get; set; }
         public string OwnerKey { get; set; }
-        public PlanType Plan { get; set; }
-        public short AdditionalSeats { get; set; }
-        public short AdditionalStorageGb { get; set; }
-        public bool PremiumAccessAddon { get; set; }
+        public string CollectionName { get; set; }
         public PaymentMethodType? PaymentMethodType { get; set; }
         public string PaymentToken { get; set; }
-        public string CollectionName { get; set; }
     }
 }

src/Core/Models/Business/OrganizationUpgrade.cs

@@ -0,0 +1,13 @@
+using Bit.Core.Enums;
+
+namespace Bit.Core.Models.Business
+{
+    public class OrganizationUpgrade
+    {
+        public string BusinessName { get; set; }
+        public PlanType Plan { get; set; }
+        public short AdditionalSeats { get; set; }
+        public short AdditionalStorageGb { get; set; }
+        public bool PremiumAccessAddon { get; set; }
+    }
+}