Skip to content

Commit 18d1464

Browse files
amorask-bitwardenamorask-bitwarden
authored
[PM-21099] (NO LOGIC) Organize Billing provider code (#5819)
* [NO LOGIC] Organize Billing provider code * Run dotnet format * Run dotnet format' * Fixed using after merge * Fixed test usings after merge
1 parent e994bf2 commit 18d1464

File tree

74 files changed

+143
-134
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+143
-134
lines changed

‎bitwarden_license/src/Commercial.Core/AdminConsole/Providers/CreateProviderCommand.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
using Bit.Core.AdminConsole.Providers.Interfaces;
44
using Bit.Core.AdminConsole.Repositories;
55
using Bit.Core.AdminConsole.Services;
6-
using Bit.Core.Billing.Entities;
76
using Bit.Core.Billing.Enums;
8-
using Bit.Core.Billing.Repositories;
7+
using Bit.Core.Billing.Providers.Entities;
8+
using Bit.Core.Billing.Providers.Repositories;
99
using Bit.Core.Enums;
1010
using Bit.Core.Exceptions;
1111
using Bit.Core.Repositories;

‎bitwarden_license/src/Commercial.Core/AdminConsole/Providers/RemoveOrganizationFromProviderCommand.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using Bit.Core.Billing.Constants;
88
using Bit.Core.Billing.Extensions;
99
using Bit.Core.Billing.Pricing;
10+
using Bit.Core.Billing.Providers.Services;
1011
using Bit.Core.Billing.Services;
1112
using Bit.Core.Enums;
1213
using Bit.Core.Exceptions;

‎bitwarden_license/src/Commercial.Core/AdminConsole/Services/ProviderService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
using Bit.Core.Billing.Enums;
1212
using Bit.Core.Billing.Models;
1313
using Bit.Core.Billing.Pricing;
14-
using Bit.Core.Billing.Services;
14+
using Bit.Core.Billing.Providers.Services;
1515
using Bit.Core.Context;
1616
using Bit.Core.Entities;
1717
using Bit.Core.Enums;

‎bitwarden_license/src/Commercial.Core/Billing/Models/ProviderClientInvoiceReportRow.cs renamed to ‎bitwarden_license/src/Commercial.Core/Billing/Providers/Models/ProviderClientInvoiceReportRow.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System.Globalization;
2-
using Bit.Core.Billing.Entities;
2+
using Bit.Core.Billing.Providers.Entities;
33
using CsvHelper.Configuration.Attributes;
44

5-
namespace Bit.Commercial.Core.Billing.Models;
5+
namespace Bit.Commercial.Core.Billing.Providers.Models;
66

77
public class ProviderClientInvoiceReportRow
88
{

‎bitwarden_license/src/Commercial.Core/Billing/BusinessUnitConverter.cs renamed to ‎bitwarden_license/src/Commercial.Core/Billing/Providers/Services/BusinessUnitConverter.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
using Bit.Core.AdminConsole.Repositories;
88
using Bit.Core.Billing;
99
using Bit.Core.Billing.Constants;
10-
using Bit.Core.Billing.Entities;
1110
using Bit.Core.Billing.Enums;
1211
using Bit.Core.Billing.Extensions;
1312
using Bit.Core.Billing.Pricing;
14-
using Bit.Core.Billing.Repositories;
13+
using Bit.Core.Billing.Providers.Entities;
14+
using Bit.Core.Billing.Providers.Repositories;
15+
using Bit.Core.Billing.Providers.Services;
1516
using Bit.Core.Billing.Services;
1617
using Bit.Core.Entities;
1718
using Bit.Core.Enums;
@@ -24,7 +25,7 @@
2425
using OneOf;
2526
using Stripe;
2627

27-
namespace Bit.Commercial.Core.Billing;
28+
namespace Bit.Commercial.Core.Billing.Providers.Services;
2829

2930
[RequireFeature(FeatureFlagKeys.PM18770_EnableOrganizationBusinessUnitConversion)]
3031
public class BusinessUnitConverter(

‎bitwarden_license/src/Commercial.Core/Billing/ProviderBillingService.cs renamed to ‎bitwarden_license/src/Commercial.Core/Billing/Providers/Services/ProviderBillingService.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using System.Globalization;
2-
using Bit.Commercial.Core.Billing.Models;
2+
using Bit.Commercial.Core.Billing.Providers.Models;
33
using Bit.Core;
44
using Bit.Core.AdminConsole.Entities;
55
using Bit.Core.AdminConsole.Entities.Provider;
@@ -8,14 +8,15 @@
88
using Bit.Core.Billing;
99
using Bit.Core.Billing.Caches;
1010
using Bit.Core.Billing.Constants;
11-
using Bit.Core.Billing.Entities;
1211
using Bit.Core.Billing.Enums;
1312
using Bit.Core.Billing.Extensions;
1413
using Bit.Core.Billing.Models;
1514
using Bit.Core.Billing.Pricing;
16-
using Bit.Core.Billing.Repositories;
15+
using Bit.Core.Billing.Providers.Entities;
16+
using Bit.Core.Billing.Providers.Models;
17+
using Bit.Core.Billing.Providers.Repositories;
18+
using Bit.Core.Billing.Providers.Services;
1719
using Bit.Core.Billing.Services;
18-
using Bit.Core.Billing.Services.Contracts;
1920
using Bit.Core.Billing.Tax.Models;
2021
using Bit.Core.Billing.Tax.Services;
2122
using Bit.Core.Enums;
@@ -28,12 +29,11 @@
2829
using CsvHelper;
2930
using Microsoft.Extensions.Logging;
3031
using Stripe;
31-
3232
using static Bit.Core.Billing.Utilities;
3333
using Customer = Stripe.Customer;
3434
using Subscription = Stripe.Subscription;
3535

36-
namespace Bit.Commercial.Core.Billing;
36+
namespace Bit.Commercial.Core.Billing.Providers.Services;
3737

3838
public class ProviderBillingService(
3939
IBraintreeGateway braintreeGateway,

‎bitwarden_license/src/Commercial.Core/Billing/ProviderPriceAdapter.cs renamed to ‎bitwarden_license/src/Commercial.Core/Billing/Providers/Services/ProviderPriceAdapter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using Bit.Core.Billing.Enums;
77
using Stripe;
88

9-
namespace Bit.Commercial.Core.Billing;
9+
namespace Bit.Commercial.Core.Billing.Providers.Services;
1010

1111
public static class ProviderPriceAdapter
1212
{

‎bitwarden_license/src/Commercial.Core/Utilities/ServiceCollectionExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using Bit.Commercial.Core.AdminConsole.Providers;
22
using Bit.Commercial.Core.AdminConsole.Services;
3-
using Bit.Commercial.Core.Billing;
3+
using Bit.Commercial.Core.Billing.Providers.Services;
44
using Bit.Core.AdminConsole.Providers.Interfaces;
55
using Bit.Core.AdminConsole.Services;
6-
using Bit.Core.Billing.Services;
6+
using Bit.Core.Billing.Providers.Services;
77
using Microsoft.Extensions.DependencyInjection;
88

99
namespace Bit.Commercial.Core.Utilities;

‎bitwarden_license/test/Commercial.Core.Test/AdminConsole/ProviderFeatures/RemoveOrganizationFromProviderCommandTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Bit.Core.Billing.Constants;
99
using Bit.Core.Billing.Enums;
1010
using Bit.Core.Billing.Pricing;
11+
using Bit.Core.Billing.Providers.Services;
1112
using Bit.Core.Billing.Services;
1213
using Bit.Core.Enums;
1314
using Bit.Core.Exceptions;

‎bitwarden_license/test/Commercial.Core.Test/AdminConsole/Services/ProviderServiceTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
using Bit.Core.Billing.Enums;
1212
using Bit.Core.Billing.Models;
1313
using Bit.Core.Billing.Pricing;
14-
using Bit.Core.Billing.Services;
14+
using Bit.Core.Billing.Providers.Services;
1515
using Bit.Core.Context;
1616
using Bit.Core.Entities;
1717
using Bit.Core.Enums;

‎bitwarden_license/test/Commercial.Core.Test/Billing/BusinessUnitConverterTests.cs renamed to ‎bitwarden_license/test/Commercial.Core.Test/Billing/Providers/BusinessUnitConverterTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#nullable enable
22
using System.Text;
3-
using Bit.Commercial.Core.Billing;
3+
using Bit.Commercial.Core.Billing.Providers.Services;
44
using Bit.Core.AdminConsole.Entities;
55
using Bit.Core.AdminConsole.Entities.Provider;
66
using Bit.Core.AdminConsole.Enums.Provider;
77
using Bit.Core.AdminConsole.Repositories;
88
using Bit.Core.Billing;
99
using Bit.Core.Billing.Constants;
10-
using Bit.Core.Billing.Entities;
1110
using Bit.Core.Billing.Enums;
1211
using Bit.Core.Billing.Pricing;
13-
using Bit.Core.Billing.Repositories;
12+
using Bit.Core.Billing.Providers.Entities;
13+
using Bit.Core.Billing.Providers.Repositories;
1414
using Bit.Core.Billing.Services;
1515
using Bit.Core.Entities;
1616
using Bit.Core.Enums;
@@ -25,7 +25,7 @@
2525
using Stripe;
2626
using Xunit;
2727

28-
namespace Bit.Commercial.Core.Test.Billing;
28+
namespace Bit.Commercial.Core.Test.Billing.Providers;
2929

3030
public class BusinessUnitConverterTests
3131
{

‎bitwarden_license/test/Commercial.Core.Test/Billing/ProviderBillingServiceTests.cs renamed to ‎bitwarden_license/test/Commercial.Core.Test/Billing/Providers/ProviderBillingServiceTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Globalization;
22
using System.Net;
3-
using Bit.Commercial.Core.Billing;
4-
using Bit.Commercial.Core.Billing.Models;
3+
using Bit.Commercial.Core.Billing.Providers.Models;
4+
using Bit.Commercial.Core.Billing.Providers.Services;
55
using Bit.Core;
66
using Bit.Core.AdminConsole.Entities;
77
using Bit.Core.AdminConsole.Entities.Provider;
@@ -10,13 +10,13 @@
1010
using Bit.Core.AdminConsole.Repositories;
1111
using Bit.Core.Billing.Caches;
1212
using Bit.Core.Billing.Constants;
13-
using Bit.Core.Billing.Entities;
1413
using Bit.Core.Billing.Enums;
1514
using Bit.Core.Billing.Models;
1615
using Bit.Core.Billing.Pricing;
17-
using Bit.Core.Billing.Repositories;
16+
using Bit.Core.Billing.Providers.Entities;
17+
using Bit.Core.Billing.Providers.Models;
18+
using Bit.Core.Billing.Providers.Repositories;
1819
using Bit.Core.Billing.Services;
19-
using Bit.Core.Billing.Services.Contracts;
2020
using Bit.Core.Billing.Tax.Services;
2121
using Bit.Core.Entities;
2222
using Bit.Core.Enums;
@@ -40,7 +40,7 @@
4040
using PaymentMethod = Stripe.PaymentMethod;
4141
using Subscription = Stripe.Subscription;
4242

43-
namespace Bit.Commercial.Core.Test.Billing;
43+
namespace Bit.Commercial.Core.Test.Billing.Providers;
4444

4545
[SutProviderCustomize]
4646
public class ProviderBillingServiceTests

‎bitwarden_license/test/Commercial.Core.Test/Billing/ProviderPriceAdapterTests.cs renamed to ‎bitwarden_license/test/Commercial.Core.Test/Billing/Providers/ProviderPriceAdapterTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
using Bit.Commercial.Core.Billing;
1+
using Bit.Commercial.Core.Billing.Providers.Services;
22
using Bit.Core.AdminConsole.Entities.Provider;
33
using Bit.Core.AdminConsole.Enums.Provider;
44
using Bit.Core.Billing.Enums;
55
using Stripe;
66
using Xunit;
77

8-
namespace Bit.Commercial.Core.Test.Billing;
8+
namespace Bit.Commercial.Core.Test.Billing.Providers;
99

1010
public class ProviderPriceAdapterTests
1111
{

‎bitwarden_license/test/Commercial.Core.Test/Billing/TaxServiceTests.cs renamed to ‎bitwarden_license/test/Commercial.Core.Test/Billing/Tax/TaxServiceTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Bit.Test.Common.AutoFixture.Attributes;
44
using Xunit;
55

6-
namespace Bit.Commercial.Core.Test.Billing;
6+
namespace Bit.Commercial.Core.Test.Billing.Tax;
77

88
[SutProviderCustomize]
99
public class TaxServiceTests

‎src/Admin/AdminConsole/Controllers/OrganizationsController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
using Bit.Core.Billing.Enums;
1212
using Bit.Core.Billing.Extensions;
1313
using Bit.Core.Billing.Pricing;
14-
using Bit.Core.Billing.Services;
14+
using Bit.Core.Billing.Providers.Services;
1515
using Bit.Core.Context;
1616
using Bit.Core.Enums;
1717
using Bit.Core.Models.OrganizationConnectionConfigs;

‎src/Admin/AdminConsole/Controllers/ProvidersController.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
using Bit.Core.AdminConsole.Repositories;
1111
using Bit.Core.AdminConsole.Services;
1212
using Bit.Core.Billing.Constants;
13-
using Bit.Core.Billing.Entities;
1413
using Bit.Core.Billing.Enums;
1514
using Bit.Core.Billing.Extensions;
1615
using Bit.Core.Billing.Pricing;
17-
using Bit.Core.Billing.Repositories;
18-
using Bit.Core.Billing.Services;
19-
using Bit.Core.Billing.Services.Contracts;
16+
using Bit.Core.Billing.Providers.Entities;
17+
using Bit.Core.Billing.Providers.Models;
18+
using Bit.Core.Billing.Providers.Repositories;
19+
using Bit.Core.Billing.Providers.Services;
2020
using Bit.Core.Enums;
2121
using Bit.Core.Exceptions;
2222
using Bit.Core.Repositories;

‎src/Admin/AdminConsole/Models/ProviderEditModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
using Bit.Core.AdminConsole.Entities.Provider;
33
using Bit.Core.AdminConsole.Enums.Provider;
44
using Bit.Core.AdminConsole.Models.Data.Provider;
5-
using Bit.Core.Billing.Entities;
65
using Bit.Core.Billing.Enums;
6+
using Bit.Core.Billing.Providers.Entities;
77
using Bit.Core.Enums;
88
using Bit.SharedWeb.Utilities;
99

‎src/Admin/AdminConsole/Models/ProviderViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
using Bit.Core.AdminConsole.Entities.Provider;
33
using Bit.Core.AdminConsole.Enums.Provider;
44
using Bit.Core.AdminConsole.Models.Data.Provider;
5-
using Bit.Core.Billing.Entities;
65
using Bit.Core.Billing.Enums;
6+
using Bit.Core.Billing.Providers.Entities;
77

88
namespace Bit.Admin.AdminConsole.Models;
99

‎src/Admin/Billing/Controllers/BusinessUnitConversionController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using Bit.Core.AdminConsole.Entities.Provider;
88
using Bit.Core.AdminConsole.Enums.Provider;
99
using Bit.Core.AdminConsole.Repositories;
10-
using Bit.Core.Billing.Services;
10+
using Bit.Core.Billing.Providers.Services;
1111
using Bit.Core.Exceptions;
1212
using Bit.Core.Repositories;
1313
using Bit.Core.Utilities;

‎src/Admin/Billing/Controllers/MigrateProvidersController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using Bit.Admin.Billing.Models;
22
using Bit.Admin.Enums;
33
using Bit.Admin.Utilities;
4-
using Bit.Core.Billing.Migration.Models;
5-
using Bit.Core.Billing.Migration.Services;
4+
using Bit.Core.Billing.Providers.Migration.Models;
5+
using Bit.Core.Billing.Providers.Migration.Services;
66
using Bit.Core.Utilities;
77
using Microsoft.AspNetCore.Authorization;
88
using Microsoft.AspNetCore.Mvc;

‎src/Admin/Billing/Models/ProviderPlanViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Bit.Core.Billing.Entities;
1+
using Bit.Core.Billing.Providers.Entities;
22

33
namespace Bit.Admin.Billing.Models;
44

‎src/Admin/Billing/Views/MigrateProviders/Details.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@using System.Text.Json
2-
@model Bit.Core.Billing.Migration.Models.ProviderMigrationResult
2+
@model Bit.Core.Billing.Providers.Migration.Models.ProviderMigrationResult
33
@{
44
ViewData["Title"] = "Results";
55
}

‎src/Admin/Billing/Views/MigrateProviders/Results.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@model Bit.Core.Billing.Migration.Models.ProviderMigrationResult[]
1+
@model Bit.Core.Billing.Providers.Migration.Models.ProviderMigrationResult[]
22
@{
33
ViewData["Title"] = "Results";
44
}

‎src/Admin/Startup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using Microsoft.Extensions.DependencyInjection.Extensions;
1111
using Bit.Admin.Services;
1212
using Bit.Core.Billing.Extensions;
13-
using Bit.Core.Billing.Migration;
13+
using Bit.Core.Billing.Providers.Migration;
1414

1515
#if !OSS
1616
using Bit.Commercial.Core.Utilities;

‎src/Api/AdminConsole/Controllers/OrganizationsController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
using Bit.Core.Billing.Enums;
2626
using Bit.Core.Billing.Extensions;
2727
using Bit.Core.Billing.Pricing;
28-
using Bit.Core.Billing.Services;
28+
using Bit.Core.Billing.Providers.Services;
2929
using Bit.Core.Context;
3030
using Bit.Core.Enums;
3131
using Bit.Core.Exceptions;

‎src/Api/AdminConsole/Controllers/ProviderClientsController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using Bit.Api.Billing.Models.Requests;
33
using Bit.Core.AdminConsole.Repositories;
44
using Bit.Core.AdminConsole.Services;
5-
using Bit.Core.Billing.Services;
5+
using Bit.Core.Billing.Providers.Services;
66
using Bit.Core.Context;
77
using Bit.Core.Enums;
88
using Bit.Core.Models.Business;

‎src/Api/Billing/Controllers/OrganizationBillingController.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Bit.Core.Billing.Models;
99
using Bit.Core.Billing.Models.Sales;
1010
using Bit.Core.Billing.Pricing;
11+
using Bit.Core.Billing.Providers.Services;
1112
using Bit.Core.Billing.Services;
1213
using Bit.Core.Billing.Tax.Models;
1314
using Bit.Core.Context;

‎src/Api/Billing/Controllers/ProviderBillingController.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
using Bit.Api.Billing.Models.Requests;
22
using Bit.Api.Billing.Models.Responses;
3-
using Bit.Commercial.Core.Billing;
3+
using Bit.Commercial.Core.Billing.Providers.Services;
44
using Bit.Core;
55
using Bit.Core.AdminConsole.Repositories;
6-
using Bit.Core.Billing.Models;
76
using Bit.Core.Billing.Pricing;
8-
using Bit.Core.Billing.Repositories;
7+
using Bit.Core.Billing.Providers.Models;
8+
using Bit.Core.Billing.Providers.Repositories;
9+
using Bit.Core.Billing.Providers.Services;
910
using Bit.Core.Billing.Services;
1011
using Bit.Core.Billing.Tax.Models;
1112
using Bit.Core.Context;

‎src/Api/Billing/Models/Responses/ProviderSubscriptionResponse.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Bit.Core.AdminConsole.Enums.Provider;
33
using Bit.Core.Billing.Enums;
44
using Bit.Core.Billing.Models;
5+
using Bit.Core.Billing.Providers.Models;
56
using Bit.Core.Billing.Tax.Models;
67
using Stripe;
78

‎src/Billing/Services/Implementations/ProviderEventService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using Bit.Billing.Constants;
22
using Bit.Core.AdminConsole.Repositories;
3-
using Bit.Core.Billing.Entities;
43
using Bit.Core.Billing.Pricing;
5-
using Bit.Core.Billing.Repositories;
4+
using Bit.Core.Billing.Providers.Entities;
5+
using Bit.Core.Billing.Providers.Repositories;
66
using Bit.Core.Enums;
77
using Bit.Core.Repositories;
88
using Stripe;

0 commit comments

Comments
 (0)