nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 23:52:50 -05:00
Code Activity

[PM-16684] Integrate Pricing Service behind FF (#5276)

Browse Source 
* Remove gRPC and convert PricingClient to HttpClient wrapper

* Add PlanType.GetProductTier extension

Many instances of StaticStore use are just to get the ProductTierType of a PlanType, but this can be derived from the PlanType itself without having to fetch the entire plan.

* Remove invocations of the StaticStore in non-Test code

* Deprecate StaticStore entry points

* Run dotnet format

* Matt's feedback

* Run dotnet format

* Rui's feedback

* Run dotnet format

* Replacements since approval

* Run dotnet format
This commit is contained in:
Alex Morask
2025-02-27 07:55:46 -05:00
committed by GitHub
parent bd66f06bd9
commit a2e665cb96
78 changed files with 1178 additions and 712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test/Billing.Test/Services/ProviderEventServiceTests.cs
View File

@ -1,14 +1,16 @@
using Bit.Billing.Services;
using Bit.Billing.Services.Implementations;
using Bit.Billing.Test.Utilities;
using Bit.Core.AdminConsole.Entities;
using Bit.Core.AdminConsole.Models.Data.Provider;
using Bit.Core.AdminConsole.Repositories;
using Bit.Core.Billing.Entities;
using Bit.Core.Billing.Enums;
using Bit.Core.Billing.Pricing;
using Bit.Core.Billing.Repositories;
using Bit.Core.Enums;
using Bit.Core.Repositories;
using Bit.Core.Utilities;
using Microsoft.Extensions.Logging;
using NSubstitute;
using Stripe;
using Xunit;
@ -17,6 +19,12 @@ namespace Bit.Billing.Test.Services;
public class ProviderEventServiceTests
{
private readonly IOrganizationRepository _organizationRepository =
Substitute.For<IOrganizationRepository>();
private readonly IPricingClient _pricingClient =
Substitute.For<IPricingClient>();
private readonly IProviderInvoiceItemRepository _providerInvoiceItemRepository =
Substitute.For<IProviderInvoiceItemRepository>();
@ -37,7 +45,8 @@ public class ProviderEventServiceTests
public ProviderEventServiceTests()
{
_providerEventService = new ProviderEventService(
Substitute.For<ILogger<ProviderEventService>>(),
_organizationRepository,
_pricingClient,
_providerInvoiceItemRepository,
_providerOrganizationRepository,
_providerPlanRepository,
@ -147,6 +156,12 @@ public class ProviderEventServiceTests
_providerOrganizationRepository.GetManyDetailsByProviderAsync(providerId).Returns(clients);
_organizationRepository.GetByIdAsync(client1Id)
.Returns(new Organization { PlanType = PlanType.TeamsMonthly });
_organizationRepository.GetByIdAsync(client2Id)
.Returns(new Organization { PlanType = PlanType.EnterpriseMonthly });
var providerPlans = new List<ProviderPlan>
{
new ()
@ -169,6 +184,11 @@ public class ProviderEventServiceTests
}
};
foreach (var providerPlan in providerPlans)
{
_pricingClient.GetPlanOrThrow(providerPlan.PlanType).Returns(StaticStore.GetPlan(providerPlan.PlanType));
}
_providerPlanRepository.GetByProviderId(providerId).Returns(providerPlans);
// Act