Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PM-14456] Return provider type when getting provider's subscription #4972

Merged
merged 3 commits into from
Nov 6, 2024
Merged

[PM-14456] Return provider type when getting provider's subscription #4972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04e9548
[PM-14456] Return provider type on GET /providers/{id}/billing/subscr…
jonashendrickx Nov 4, 2024
548e8c6
Merge branch 'main' into PM-14456-Return-provider-type-in-GET-provide…
jonashendrickx Nov 6, 2024
55dcd61
format
jonashendrickx Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Api/Billing/Controllers/ProviderBillingController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ public async Task<IResult> GetSubscriptionAsync([FromRoute] Guid providerId)
subscription,
providerPlans,
taxInformation,
subscriptionSuspension);
subscriptionSuspension,
provider);

return TypedResults.Ok(response);
}
Expand Down
13 changes: 9 additions & 4 deletions src/Api/Billing/Models/Responses/ProviderSubscriptionResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using Bit.Core.Billing.Entities;
using Bit.Core.AdminConsole.Entities.Provider;
using Bit.Core.AdminConsole.Enums.Provider;
using Bit.Core.Billing.Entities;
using Bit.Core.Billing.Enums;
using Bit.Core.Billing.Models;
using Bit.Core.Utilities;
Expand All @@ -15,7 +17,8 @@ public record ProviderSubscriptionResponse(
decimal AccountCredit,
TaxInformation TaxInformation,
DateTime? CancelAt,
SubscriptionSuspension Suspension)
SubscriptionSuspension Suspension,
ProviderType ProviderType)
{
private const string _annualCadence = "Annual";
private const string _monthlyCadence = "Monthly";
Expand All @@ -24,7 +27,8 @@ public static ProviderSubscriptionResponse From(
Subscription subscription,
ICollection<ProviderPlan> providerPlans,
TaxInformation taxInformation,
SubscriptionSuspension subscriptionSuspension)
SubscriptionSuspension subscriptionSuspension,
Provider provider)
{
var providerPlanResponses = providerPlans
.Where(providerPlan => providerPlan.IsConfigured())
Expand Down Expand Up @@ -56,7 +60,8 @@ public static ProviderSubscriptionResponse From(
accountCredit,
taxInformation,
subscription.CancelAt,
subscriptionSuspension);
subscriptionSuspension,
provider.Type);
}
}

Expand Down
Loading