Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-21 12:05:42 +01:00
Code Issues Projects Releases Wiki Activity

Used PO ID instead of Org ID on accident (#4500)

Browse Source
This commit is contained in:
Alex Morask 2024-07-11 11:22:15 -04:00 committed by GitHub
parent cf8ec4ed41
commit a51e4c0a7c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Billing/Services/Implementations/ProviderEventService.cs
View File

@ -76,7 +76,7 @@ public class ProviderEventService(
ProviderId = parsedProviderId, ProviderId = parsedProviderId,
InvoiceId = invoice.Id, InvoiceId = invoice.Id,
InvoiceNumber = invoice.Number, InvoiceNumber = invoice.Number,
ClientId = client.Id, ClientId = client.OrganizationId,
ClientName = client.OrganizationName, ClientName = client.OrganizationName,
PlanName = client.Plan, PlanName = client.Plan,
AssignedSeats = client.Seats ?? 0, AssignedSeats = client.Seats ?? 0,

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

@ -169,10 +169,14 @@ public class ProviderEventServiceTests
_stripeFacade.GetSubscription(subscriptionId).Returns(subscription); _stripeFacade.GetSubscription(subscriptionId).Returns(subscription);
var client1Id = Guid.NewGuid();
var client2Id = Guid.NewGuid();
var clients = new List<ProviderOrganizationOrganizationDetails> var clients = new List<ProviderOrganizationOrganizationDetails>
{ {
new () new ()
{ {
OrganizationId = client1Id,
OrganizationName = "Client 1", OrganizationName = "Client 1",
Plan = "Teams (Monthly)", Plan = "Teams (Monthly)",
Seats = 50, Seats = 50,
@ -181,6 +185,7 @@ public class ProviderEventServiceTests
}, },
new () new ()
{ {
OrganizationId = client2Id,
OrganizationName = "Client 2", OrganizationName = "Client 2",
Plan = "Enterprise (Monthly)", Plan = "Enterprise (Monthly)",
Seats = 50, Seats = 50,
@ -228,6 +233,7 @@ public class ProviderEventServiceTests
options.InvoiceId == invoice.Id && options.InvoiceId == invoice.Id &&
options.InvoiceNumber == invoice.Number && options.InvoiceNumber == invoice.Number &&
options.ClientName == "Client 1" && options.ClientName == "Client 1" &&
options.ClientId == client1Id &&
options.PlanName == "Teams (Monthly)" && options.PlanName == "Teams (Monthly)" &&
options.AssignedSeats == 50 && options.AssignedSeats == 50 &&
options.UsedSeats == 30 && options.UsedSeats == 30 &&
@ -239,6 +245,7 @@ public class ProviderEventServiceTests
options.InvoiceId == invoice.Id && options.InvoiceId == invoice.Id &&
options.InvoiceNumber == invoice.Number && options.InvoiceNumber == invoice.Number &&
options.ClientName == "Client 2" && options.ClientName == "Client 2" &&
options.ClientId == client2Id &&
options.PlanName == "Enterprise (Monthly)" && options.PlanName == "Enterprise (Monthly)" &&
options.AssignedSeats == 50 && options.AssignedSeats == 50 &&
options.UsedSeats == 30 && options.UsedSeats == 30 &&