Revert "[PM-25379] Refactor org metadata (#6418)" (#6439)

This reverts commit 3bef57259d.

test/Api.Test/Billing/Controllers/OrganizationBillingControllerTests.cs

@@ -1,4 +1,5 @@
 using Bit.Api.Billing.Controllers;
+using Bit.Api.Billing.Models.Responses;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Billing.Models;
 using Bit.Core.Billing.Organizations.Models;
@@ -52,16 +53,19 @@ public class OrganizationBillingControllerTests
     {
         sutProvider.GetDependency<ICurrentContext>().OrganizationUser(organizationId).Returns(true);
         sutProvider.GetDependency<IOrganizationBillingService>().GetMetadata(organizationId)
-            .Returns(new OrganizationMetadata(true, 10));
+            .Returns(new OrganizationMetadata(true, true, true, true, true, true, true, null, null, null, 0));
 
         var result = await sutProvider.Sut.GetMetadataAsync(organizationId);
 
-        Assert.IsType<Ok<OrganizationMetadata>>(result);
+        Assert.IsType<Ok<OrganizationMetadataResponse>>(result);
 
-        var response = ((Ok<OrganizationMetadata>)result).Value;
+        var response = ((Ok<OrganizationMetadataResponse>)result).Value;
 
+        Assert.True(response.IsEligibleForSelfHost);
+        Assert.True(response.IsManaged);
         Assert.True(response.IsOnSecretsManagerStandalone);
-        Assert.Equal(10, response.OrganizationOccupiedSeats);
+        Assert.True(response.IsSubscriptionUnpaid);
+        Assert.True(response.HasSubscription);
     }
 
     [Theory, BitAutoData]

test/Core.Test/Billing/Organizations/Queries/GetOrganizationMetadataQueryTests.cs

@@ -1,369 +0,0 @@
-using Bit.Core.AdminConsole.Entities;
-using Bit.Core.Billing.Constants;
-using Bit.Core.Billing.Enums;
-using Bit.Core.Billing.Organizations.Models;
-using Bit.Core.Billing.Organizations.Queries;
-using Bit.Core.Billing.Pricing;
-using Bit.Core.Billing.Services;
-using Bit.Core.Models.Data.Organizations.OrganizationUsers;
-using Bit.Core.Repositories;
-using Bit.Core.Settings;
-using Bit.Core.Utilities;
-using Bit.Test.Common.AutoFixture;
-using Bit.Test.Common.AutoFixture.Attributes;
-using NSubstitute;
-using NSubstitute.ReturnsExtensions;
-using Stripe;
-using Xunit;
-
-namespace Bit.Core.Test.Billing.Organizations.Queries;
-
-[SutProviderCustomize]
-public class GetOrganizationMetadataQueryTests
-{
-    [Theory, BitAutoData]
-    public async Task Run_NullOrganization_ReturnsNull(
-        SutProvider<GetOrganizationMetadataQuery> sutProvider)
-    {
-        var result = await sutProvider.Sut.Run(null);
-
-        Assert.Null(result);
-    }
-
-    [Theory, BitAutoData]
-    public async Task Run_SelfHosted_ReturnsDefault(
-        Organization organization,
-        SutProvider<GetOrganizationMetadataQuery> sutProvider)
-    {
-        sutProvider.GetDependency<IGlobalSettings>().SelfHosted.Returns(true);
-
-        var result = await sutProvider.Sut.Run(organization);
-
-        Assert.Equal(OrganizationMetadata.Default, result);
-    }
-
-    [Theory, BitAutoData]
-    public async Task Run_NoGatewaySubscriptionId_ReturnsDefaultWithOccupiedSeats(
-        Organization organization,
-        SutProvider<GetOrganizationMetadataQuery> sutProvider)
-    {
-        organization.GatewaySubscriptionId = null;
-
-        sutProvider.GetDependency<IGlobalSettings>().SelfHosted.Returns(false);
-        sutProvider.GetDependency<IOrganizationRepository>()
-            .GetOccupiedSeatCountByOrganizationIdAsync(organization.Id)
-            .Returns(new OrganizationSeatCounts { Users = 10, Sponsored = 0 });
-
-        var result = await sutProvider.Sut.Run(organization);
-
-        Assert.NotNull(result);
-        Assert.False(result.IsOnSecretsManagerStandalone);
-        Assert.Equal(10, result.OrganizationOccupiedSeats);
-    }
-
-    [Theory, BitAutoData]
-    public async Task Run_NullCustomer_ReturnsDefaultWithOccupiedSeats(
-        Organization organization,
-        SutProvider<GetOrganizationMetadataQuery> sutProvider)
-    {
-        organization.GatewaySubscriptionId = "sub_123";
-
-        sutProvider.GetDependency<IGlobalSettings>().SelfHosted.Returns(false);
-        sutProvider.GetDependency<IOrganizationRepository>()
-            .GetOccupiedSeatCountByOrganizationIdAsync(organization.Id)
-            .Returns(new OrganizationSeatCounts { Users = 5, Sponsored = 0 });
-
-        sutProvider.GetDependency<ISubscriberService>()
-            .GetCustomer(organization, Arg.Is<CustomerGetOptions>(options =>
-                options.Expand.Contains("discount.coupon.applies_to")))
-            .ReturnsNull();
-
-        var result = await sutProvider.Sut.Run(organization);
-
-        Assert.NotNull(result);
-        Assert.False(result.IsOnSecretsManagerStandalone);
-        Assert.Equal(5, result.OrganizationOccupiedSeats);
-    }
-
-    [Theory, BitAutoData]
-    public async Task Run_NullSubscription_ReturnsDefaultWithOccupiedSeats(
-        Organization organization,
-        SutProvider<GetOrganizationMetadataQuery> sutProvider)
-    {
-        organization.GatewaySubscriptionId = "sub_123";
-
-        var customer = new Customer();
-
-        sutProvider.GetDependency<IGlobalSettings>().SelfHosted.Returns(false);
-        sutProvider.GetDependency<IOrganizationRepository>()
-            .GetOccupiedSeatCountByOrganizationIdAsync(organization.Id)
-            .Returns(new OrganizationSeatCounts { Users = 7, Sponsored = 0 });
-
-        sutProvider.GetDependency<ISubscriberService>()
-            .GetCustomer(organization, Arg.Is<CustomerGetOptions>(options =>
-                options.Expand.Contains("discount.coupon.applies_to")))
-            .Returns(customer);
-
-        sutProvider.GetDependency<ISubscriberService>()
-            .GetSubscription(organization)
-            .ReturnsNull();
-
-        var result = await sutProvider.Sut.Run(organization);
-
-        Assert.NotNull(result);
-        Assert.False(result.IsOnSecretsManagerStandalone);
-        Assert.Equal(7, result.OrganizationOccupiedSeats);
-    }
-
-    [Theory, BitAutoData]
-    public async Task Run_WithSecretsManagerStandaloneCoupon_ReturnsMetadataWithFlag(
-        Organization organization,
-        SutProvider<GetOrganizationMetadataQuery> sutProvider)
-    {
-        organization.GatewaySubscriptionId = "sub_123";
-        organization.PlanType = PlanType.EnterpriseAnnually;
-
-        var productId = "product_123";
-        var customer = new Customer
-        {
-            Discount = new Discount
-            {
-                Coupon = new Coupon
-                {
-                    Id = StripeConstants.CouponIDs.SecretsManagerStandalone,
-                    AppliesTo = new CouponAppliesTo
-                    {
-                        Products = [productId]
-                    }
-                }
-            }
-        };
-
-        var subscription = new Subscription
-        {
-            Items = new StripeList<SubscriptionItem>
-            {
-                Data =
-                [
-                    new SubscriptionItem
-                    {
-                        Plan = new Plan
-                        {
-                            ProductId = productId
-                        }
-                    }
-                ]
-            }
-        };
-
-        sutProvider.GetDependency<IGlobalSettings>().SelfHosted.Returns(false);
-        sutProvider.GetDependency<IOrganizationRepository>()
-            .GetOccupiedSeatCountByOrganizationIdAsync(organization.Id)
-            .Returns(new OrganizationSeatCounts { Users = 15, Sponsored = 0 });
-
-        sutProvider.GetDependency<ISubscriberService>()
-            .GetCustomer(organization, Arg.Is<CustomerGetOptions>(options =>
-                options.Expand.Contains("discount.coupon.applies_to")))
-            .Returns(customer);
-
-        sutProvider.GetDependency<ISubscriberService>()
-            .GetSubscription(organization)
-            .Returns(subscription);
-
-        sutProvider.GetDependency<IPricingClient>()
-            .GetPlanOrThrow(organization.PlanType)
-            .Returns(StaticStore.GetPlan(organization.PlanType));
-
-        var result = await sutProvider.Sut.Run(organization);
-
-        Assert.NotNull(result);
-        Assert.True(result.IsOnSecretsManagerStandalone);
-        Assert.Equal(15, result.OrganizationOccupiedSeats);
-    }
-
-    [Theory, BitAutoData]
-    public async Task Run_WithoutSecretsManagerStandaloneCoupon_ReturnsMetadataWithoutFlag(
-        Organization organization,
-        SutProvider<GetOrganizationMetadataQuery> sutProvider)
-    {
-        organization.GatewaySubscriptionId = "sub_123";
-        organization.PlanType = PlanType.TeamsAnnually;
-
-        var customer = new Customer
-        {
-            Discount = null
-        };
-
-        var subscription = new Subscription
-        {
-            Items = new StripeList<SubscriptionItem>
-            {
-                Data =
-                [
-                    new SubscriptionItem
-                    {
-                        Plan = new Plan
-                        {
-                            ProductId = "product_123"
-                        }
-                    }
-                ]
-            }
-        };
-
-        sutProvider.GetDependency<IGlobalSettings>().SelfHosted.Returns(false);
-        sutProvider.GetDependency<IOrganizationRepository>()
-            .GetOccupiedSeatCountByOrganizationIdAsync(organization.Id)
-            .Returns(new OrganizationSeatCounts { Users = 20, Sponsored = 0 });
-
-        sutProvider.GetDependency<ISubscriberService>()
-            .GetCustomer(organization, Arg.Is<CustomerGetOptions>(options =>
-                options.Expand.Contains("discount.coupon.applies_to")))
-            .Returns(customer);
-
-        sutProvider.GetDependency<ISubscriberService>()
-            .GetSubscription(organization)
-            .Returns(subscription);
-
-        sutProvider.GetDependency<IPricingClient>()
-            .GetPlanOrThrow(organization.PlanType)
-            .Returns(StaticStore.GetPlan(organization.PlanType));
-
-        var result = await sutProvider.Sut.Run(organization);
-
-        Assert.NotNull(result);
-        Assert.False(result.IsOnSecretsManagerStandalone);
-        Assert.Equal(20, result.OrganizationOccupiedSeats);
-    }
-
-    [Theory, BitAutoData]
-    public async Task Run_CouponDoesNotApplyToSubscriptionProducts_ReturnsFalseForStandaloneFlag(
-        Organization organization,
-        SutProvider<GetOrganizationMetadataQuery> sutProvider)
-    {
-        organization.GatewaySubscriptionId = "sub_123";
-        organization.PlanType = PlanType.EnterpriseAnnually;
-
-        var customer = new Customer
-        {
-            Discount = new Discount
-            {
-                Coupon = new Coupon
-                {
-                    Id = StripeConstants.CouponIDs.SecretsManagerStandalone,
-                    AppliesTo = new CouponAppliesTo
-                    {
-                        Products = ["different_product_id"]
-                    }
-                }
-            }
-        };
-
-        var subscription = new Subscription
-        {
-            Items = new StripeList<SubscriptionItem>
-            {
-                Data =
-                [
-                    new SubscriptionItem
-                    {
-                        Plan = new Plan
-                        {
-                            ProductId = "product_123"
-                        }
-                    }
-                ]
-            }
-        };
-
-        sutProvider.GetDependency<IGlobalSettings>().SelfHosted.Returns(false);
-        sutProvider.GetDependency<IOrganizationRepository>()
-            .GetOccupiedSeatCountByOrganizationIdAsync(organization.Id)
-            .Returns(new OrganizationSeatCounts { Users = 12, Sponsored = 0 });
-
-        sutProvider.GetDependency<ISubscriberService>()
-            .GetCustomer(organization, Arg.Is<CustomerGetOptions>(options =>
-                options.Expand.Contains("discount.coupon.applies_to")))
-            .Returns(customer);
-
-        sutProvider.GetDependency<ISubscriberService>()
-            .GetSubscription(organization)
-            .Returns(subscription);
-
-        sutProvider.GetDependency<IPricingClient>()
-            .GetPlanOrThrow(organization.PlanType)
-            .Returns(StaticStore.GetPlan(organization.PlanType));
-
-        var result = await sutProvider.Sut.Run(organization);
-
-        Assert.NotNull(result);
-        Assert.False(result.IsOnSecretsManagerStandalone);
-        Assert.Equal(12, result.OrganizationOccupiedSeats);
-    }
-
-    [Theory, BitAutoData]
-    public async Task Run_PlanDoesNotSupportSecretsManager_ReturnsFalseForStandaloneFlag(
-        Organization organization,
-        SutProvider<GetOrganizationMetadataQuery> sutProvider)
-    {
-        organization.GatewaySubscriptionId = "sub_123";
-        organization.PlanType = PlanType.FamiliesAnnually;
-
-        var productId = "product_123";
-        var customer = new Customer
-        {
-            Discount = new Discount
-            {
-                Coupon = new Coupon
-                {
-                    Id = StripeConstants.CouponIDs.SecretsManagerStandalone,
-                    AppliesTo = new CouponAppliesTo
-                    {
-                        Products = [productId]
-                    }
-                }
-            }
-        };
-
-        var subscription = new Subscription
-        {
-            Items = new StripeList<SubscriptionItem>
-            {
-                Data =
-                [
-                    new SubscriptionItem
-                    {
-                        Plan = new Plan
-                        {
-                            ProductId = productId
-                        }
-                    }
-                ]
-            }
-        };
-
-        sutProvider.GetDependency<IGlobalSettings>().SelfHosted.Returns(false);
-        sutProvider.GetDependency<IOrganizationRepository>()
-            .GetOccupiedSeatCountByOrganizationIdAsync(organization.Id)
-            .Returns(new OrganizationSeatCounts { Users = 8, Sponsored = 0 });
-
-        sutProvider.GetDependency<ISubscriberService>()
-            .GetCustomer(organization, Arg.Is<CustomerGetOptions>(options =>
-                options.Expand.Contains("discount.coupon.applies_to")))
-            .Returns(customer);
-
-        sutProvider.GetDependency<ISubscriberService>()
-            .GetSubscription(organization)
-            .Returns(subscription);
-
-        sutProvider.GetDependency<IPricingClient>()
-            .GetPlanOrThrow(organization.PlanType)
-            .Returns(StaticStore.GetPlan(organization.PlanType));
-
-        var result = await sutProvider.Sut.Run(organization);
-
-        Assert.NotNull(result);
-        Assert.False(result.IsOnSecretsManagerStandalone);
-        Assert.Equal(8, result.OrganizationOccupiedSeats);
-    }
-}

test/Core.Test/Billing/Services/OrganizationBillingServiceTests.cs

@@ -96,10 +96,6 @@ public class OrganizationBillingServiceTests
         sutProvider.GetDependency<IPricingClient>().GetPlanOrThrow(organization.PlanType)
             .Returns(StaticStore.GetPlan(organization.PlanType));
 
-        sutProvider.GetDependency<IOrganizationRepository>()
-            .GetOccupiedSeatCountByOrganizationIdAsync(organization.Id)
-            .Returns(new OrganizationSeatCounts { Users = 1, Sponsored = 0 });
-
         var subscriberService = sutProvider.GetDependency<ISubscriberService>();
 
         // Set up subscriber service to return null for customer
@@ -114,7 +110,13 @@ public class OrganizationBillingServiceTests
 
         Assert.NotNull(metadata);
         Assert.False(metadata!.IsOnSecretsManagerStandalone);
-        Assert.Equal(1, metadata.OrganizationOccupiedSeats);
+        Assert.False(metadata.HasSubscription);
+        Assert.False(metadata.IsSubscriptionUnpaid);
+        Assert.False(metadata.HasOpenInvoice);
+        Assert.False(metadata.IsSubscriptionCanceled);
+        Assert.Null(metadata.InvoiceDueDate);
+        Assert.Null(metadata.InvoiceCreatedDate);
+        Assert.Null(metadata.SubPeriodEndDate);
     }
 
     #endregion