[AC-1910] Allocate seats to a provider organization (#3936)

* Add endpoint to update a provider organization's seats for consolidated billing. * Fixed failing tests
2025-06-30 07:36:14 -05:00 · 2024-03-29 11:18:10 -04:00
parent c53e5eeab3
commit e2cb406a95
28 changed files with 1108 additions and 68 deletions
--- a/test/Api.Test/Billing/Controllers/ProviderBillingControllerTests.cs
+++ b/test/Api.Test/Billing/Controllers/ProviderBillingControllerTests.cs
@ -0,0 +1,130 @@
+using Bit.Api.Billing.Controllers;
+using Bit.Api.Billing.Models;
+using Bit.Core;
+using Bit.Core.Billing.Models;
+using Bit.Core.Billing.Queries;
+using Bit.Core.Context;
+using Bit.Core.Enums;
+using Bit.Core.Services;
+using Bit.Core.Utilities;
+using Bit.Test.Common.AutoFixture;
+using Bit.Test.Common.AutoFixture.Attributes;
+using Microsoft.AspNetCore.Http.HttpResults;
+using NSubstitute;
+using NSubstitute.ReturnsExtensions;
+using Stripe;
+using Xunit;
+
+namespace Bit.Api.Test.Billing.Controllers;
+
+[ControllerCustomize(typeof(ProviderBillingController))]
+[SutProviderCustomize]
+public class ProviderBillingControllerTests
+{
+    [Theory, BitAutoData]
+    public async Task GetSubscriptionAsync_FFDisabled_NotFound(
+        Guid providerId,
+        SutProvider<ProviderBillingController> sutProvider)
+    {
+        sutProvider.GetDependency<IFeatureService>().IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling)
+            .Returns(false);
+
+        var result = await sutProvider.Sut.GetSubscriptionAsync(providerId);
+
+        Assert.IsType<NotFound>(result);
+    }
+
+    [Theory, BitAutoData]
+    public async Task GetSubscriptionAsync_NotProviderAdmin_Unauthorized(
+        Guid providerId,
+        SutProvider<ProviderBillingController> sutProvider)
+    {
+        sutProvider.GetDependency<IFeatureService>().IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling)
+            .Returns(true);
+
+        sutProvider.GetDependency<ICurrentContext>().ProviderProviderAdmin(providerId)
+            .Returns(false);
+
+        var result = await sutProvider.Sut.GetSubscriptionAsync(providerId);
+
+        Assert.IsType<UnauthorizedHttpResult>(result);
+    }
+
+    [Theory, BitAutoData]
+    public async Task GetSubscriptionAsync_NoSubscriptionData_NotFound(
+        Guid providerId,
+        SutProvider<ProviderBillingController> sutProvider)
+    {
+        sutProvider.GetDependency<IFeatureService>().IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling)
+            .Returns(true);
+
+        sutProvider.GetDependency<ICurrentContext>().ProviderProviderAdmin(providerId)
+            .Returns(true);
+
+        sutProvider.GetDependency<IProviderBillingQueries>().GetSubscriptionData(providerId).ReturnsNull();
+
+        var result = await sutProvider.Sut.GetSubscriptionAsync(providerId);
+
+        Assert.IsType<NotFound>(result);
+    }
+
+    [Theory, BitAutoData]
+    public async Task GetSubscriptionAsync_OK(
+        Guid providerId,
+        SutProvider<ProviderBillingController> sutProvider)
+    {
+        sutProvider.GetDependency<IFeatureService>().IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling)
+            .Returns(true);
+
+        sutProvider.GetDependency<ICurrentContext>().ProviderProviderAdmin(providerId)
+            .Returns(true);
+
+        var configuredPlans = new List<ConfiguredProviderPlan>
+        {
+            new (Guid.NewGuid(), providerId, PlanType.TeamsMonthly, 50, 10, 30),
+            new (Guid.NewGuid(), providerId, PlanType.EnterpriseMonthly, 100, 0, 90)
+        };
+
+        var subscription = new Subscription
+        {
+            Status = "active",
+            CurrentPeriodEnd = new DateTime(2025, 1, 1),
+            Customer = new Customer { Discount = new Discount { Coupon = new Coupon { PercentOff = 10 } } }
+        };
+
+        var providerSubscriptionData = new ProviderSubscriptionData(
+            configuredPlans,
+            subscription);
+
+        sutProvider.GetDependency<IProviderBillingQueries>().GetSubscriptionData(providerId)
+            .Returns(providerSubscriptionData);
+
+        var result = await sutProvider.Sut.GetSubscriptionAsync(providerId);
+
+        Assert.IsType<Ok<ProviderSubscriptionDTO>>(result);
+
+        var providerSubscriptionDTO = ((Ok<ProviderSubscriptionDTO>)result).Value;
+
+        Assert.Equal(providerSubscriptionDTO.Status, subscription.Status);
+        Assert.Equal(providerSubscriptionDTO.CurrentPeriodEndDate, subscription.CurrentPeriodEnd);
+        Assert.Equal(providerSubscriptionDTO.DiscountPercentage, subscription.Customer!.Discount!.Coupon!.PercentOff);
+
+        var teamsPlan = StaticStore.GetPlan(PlanType.TeamsMonthly);
+        var providerTeamsPlan = providerSubscriptionDTO.Plans.FirstOrDefault(plan => plan.PlanName == teamsPlan.Name);
+        Assert.NotNull(providerTeamsPlan);
+        Assert.Equal(50, providerTeamsPlan.SeatMinimum);
+        Assert.Equal(10, providerTeamsPlan.PurchasedSeats);
+        Assert.Equal(30, providerTeamsPlan.AssignedSeats);
+        Assert.Equal(60 * teamsPlan.PasswordManager.SeatPrice, providerTeamsPlan.Cost);
+        Assert.Equal("Monthly", providerTeamsPlan.Cadence);
+
+        var enterprisePlan = StaticStore.GetPlan(PlanType.EnterpriseMonthly);
+        var providerEnterprisePlan = providerSubscriptionDTO.Plans.FirstOrDefault(plan => plan.PlanName == enterprisePlan.Name);
+        Assert.NotNull(providerEnterprisePlan);
+        Assert.Equal(100, providerEnterprisePlan.SeatMinimum);
+        Assert.Equal(0, providerEnterprisePlan.PurchasedSeats);
+        Assert.Equal(90, providerEnterprisePlan.AssignedSeats);
+        Assert.Equal(100 * enterprisePlan.PasswordManager.SeatPrice, providerEnterprisePlan.Cost);
+        Assert.Equal("Monthly", providerEnterprisePlan.Cadence);
+    }
+}
--- a/test/Api.Test/Billing/Controllers/ProviderOrganizationControllerTests.cs
+++ b/test/Api.Test/Billing/Controllers/ProviderOrganizationControllerTests.cs
@ -0,0 +1,168 @@
+using Bit.Api.Billing.Controllers;
+using Bit.Api.Billing.Models;
+using Bit.Core;
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Repositories;
+using Bit.Core.Billing.Commands;
+using Bit.Core.Context;
+using Bit.Core.Repositories;
+using Bit.Core.Services;
+using Bit.Infrastructure.EntityFramework.AdminConsole.Models.Provider;
+using Bit.Test.Common.AutoFixture;
+using Bit.Test.Common.AutoFixture.Attributes;
+using Microsoft.AspNetCore.Http.HttpResults;
+using NSubstitute;
+using NSubstitute.ReturnsExtensions;
+using Xunit;
+using ProviderOrganization = Bit.Core.AdminConsole.Entities.Provider.ProviderOrganization;
+
+namespace Bit.Api.Test.Billing.Controllers;
+
+[ControllerCustomize(typeof(ProviderOrganizationController))]
+[SutProviderCustomize]
+public class ProviderOrganizationControllerTests
+{
+    [Theory, BitAutoData]
+    public async Task UpdateAsync_FFDisabled_NotFound(
+        Guid providerId,
+        Guid providerOrganizationId,
+        UpdateProviderOrganizationRequestBody requestBody,
+        SutProvider<ProviderOrganizationController> sutProvider)
+    {
+        sutProvider.GetDependency<IFeatureService>().IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling)
+            .Returns(false);
+
+        var result = await sutProvider.Sut.UpdateAsync(providerId, providerOrganizationId, requestBody);
+
+        Assert.IsType<NotFound>(result);
+    }
+
+    [Theory, BitAutoData]
+    public async Task GetSubscriptionAsync_NotProviderAdmin_Unauthorized(
+        Guid providerId,
+        Guid providerOrganizationId,
+        UpdateProviderOrganizationRequestBody requestBody,
+        SutProvider<ProviderOrganizationController> sutProvider)
+    {
+        sutProvider.GetDependency<IFeatureService>().IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling)
+            .Returns(true);
+
+        sutProvider.GetDependency<ICurrentContext>().ProviderProviderAdmin(providerId)
+            .Returns(false);
+
+        var result = await sutProvider.Sut.UpdateAsync(providerId, providerOrganizationId, requestBody);
+
+        Assert.IsType<UnauthorizedHttpResult>(result);
+    }
+
+    [Theory, BitAutoData]
+    public async Task GetSubscriptionAsync_NoProvider_NotFound(
+        Guid providerId,
+        Guid providerOrganizationId,
+        UpdateProviderOrganizationRequestBody requestBody,
+        SutProvider<ProviderOrganizationController> sutProvider)
+    {
+        sutProvider.GetDependency<IFeatureService>().IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling)
+            .Returns(true);
+
+        sutProvider.GetDependency<ICurrentContext>().ProviderProviderAdmin(providerId)
+            .Returns(true);
+
+        sutProvider.GetDependency<IProviderRepository>().GetByIdAsync(providerId)
+            .ReturnsNull();
+
+        var result = await sutProvider.Sut.UpdateAsync(providerId, providerOrganizationId, requestBody);
+
+        Assert.IsType<NotFound>(result);
+    }
+
+    [Theory, BitAutoData]
+    public async Task GetSubscriptionAsync_NoProviderOrganization_NotFound(
+        Guid providerId,
+        Guid providerOrganizationId,
+        UpdateProviderOrganizationRequestBody requestBody,
+        Provider provider,
+        SutProvider<ProviderOrganizationController> sutProvider)
+    {
+        sutProvider.GetDependency<IFeatureService>().IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling)
+            .Returns(true);
+
+        sutProvider.GetDependency<ICurrentContext>().ProviderProviderAdmin(providerId)
+            .Returns(true);
+
+        sutProvider.GetDependency<IProviderRepository>().GetByIdAsync(providerId)
+            .Returns(provider);
+
+        sutProvider.GetDependency<IProviderOrganizationRepository>().GetByIdAsync(providerOrganizationId)
+            .ReturnsNull();
+
+        var result = await sutProvider.Sut.UpdateAsync(providerId, providerOrganizationId, requestBody);
+
+        Assert.IsType<NotFound>(result);
+    }
+
+    [Theory, BitAutoData]
+    public async Task GetSubscriptionAsync_NoOrganization_ServerError(
+        Guid providerId,
+        Guid providerOrganizationId,
+        UpdateProviderOrganizationRequestBody requestBody,
+        Provider provider,
+        ProviderOrganization providerOrganization,
+        SutProvider<ProviderOrganizationController> sutProvider)
+    {
+        sutProvider.GetDependency<IFeatureService>().IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling)
+            .Returns(true);
+
+        sutProvider.GetDependency<ICurrentContext>().ProviderProviderAdmin(providerId)
+            .Returns(true);
+
+        sutProvider.GetDependency<IProviderRepository>().GetByIdAsync(providerId)
+            .Returns(provider);
+
+        sutProvider.GetDependency<IProviderOrganizationRepository>().GetByIdAsync(providerOrganizationId)
+            .Returns(providerOrganization);
+
+        sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(providerOrganization.OrganizationId)
+            .ReturnsNull();
+
+        var result = await sutProvider.Sut.UpdateAsync(providerId, providerOrganizationId, requestBody);
+
+        Assert.IsType<ProblemHttpResult>(result);
+    }
+
+    [Theory, BitAutoData]
+    public async Task GetSubscriptionAsync_NoContent(
+        Guid providerId,
+        Guid providerOrganizationId,
+        UpdateProviderOrganizationRequestBody requestBody,
+        Provider provider,
+        ProviderOrganization providerOrganization,
+        Organization organization,
+        SutProvider<ProviderOrganizationController> sutProvider)
+    {
+        sutProvider.GetDependency<IFeatureService>().IsEnabled(FeatureFlagKeys.EnableConsolidatedBilling)
+            .Returns(true);
+
+        sutProvider.GetDependency<ICurrentContext>().ProviderProviderAdmin(providerId)
+            .Returns(true);
+
+        sutProvider.GetDependency<IProviderRepository>().GetByIdAsync(providerId)
+            .Returns(provider);
+
+        sutProvider.GetDependency<IProviderOrganizationRepository>().GetByIdAsync(providerOrganizationId)
+            .Returns(providerOrganization);
+
+        sutProvider.GetDependency<IOrganizationRepository>().GetByIdAsync(providerOrganization.OrganizationId)
+            .Returns(organization);
+
+        var result = await sutProvider.Sut.UpdateAsync(providerId, providerOrganizationId, requestBody);
+
+        await sutProvider.GetDependency<IAssignSeatsToClientOrganizationCommand>().Received(1)
+            .AssignSeatsToClientOrganization(
+                provider,
+                organization,
+                requestBody.AssignedSeats);
+
+        Assert.IsType<NoContent>(result);
+    }
+}