[NO LOGIC] [PM-21100] Organize billing organization code (#6099)

* [NO LOGIC] Organize Billing organization code

* Run dotnet format

src/Core/AdminConsole/Entities/Organization.cs

@@ -4,7 +4,7 @@ using System.Text.Json;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models;
 using Bit.Core.Billing.Enums;
-using Bit.Core.Billing.Models.Business;
+using Bit.Core.Billing.Organizations.Models;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Services;

src/Core/AdminConsole/Models/Data/Organizations/SelfHostedOrganizationDetails.cs

@@ -6,7 +6,7 @@ using Bit.Core.AdminConsole.Enums;
 using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs;
 using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Enums;
-using Bit.Core.Billing.Models.Business;
+using Bit.Core.Billing.Organizations.Models;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 

src/Core/AdminConsole/OrganizationFeatures/Organizations/CloudOrganizationSignUpCommand.cs

@@ -5,9 +5,9 @@ using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Enums;
 using Bit.Core.AdminConsole.Services;
 using Bit.Core.Billing.Enums;
-using Bit.Core.Billing.Models.Sales;
+using Bit.Core.Billing.Organizations.Models;
+using Bit.Core.Billing.Organizations.Services;
 using Bit.Core.Billing.Pricing;
-using Bit.Core.Billing.Services;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;

src/Core/AdminConsole/Services/IOrganizationService.cs

@@ -4,7 +4,7 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Models.Business;
 using Bit.Core.Auth.Enums;
-using Bit.Core.Billing.Models.Business;
+using Bit.Core.Billing.Organizations.Models;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;

src/Core/AdminConsole/Services/Implementations/OrganizationService.cs

@@ -20,7 +20,7 @@ using Bit.Core.Auth.Repositories;
 using Bit.Core.Billing.Constants;
 using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Extensions;
-using Bit.Core.Billing.Models.Business;
+using Bit.Core.Billing.Organizations.Models;
 using Bit.Core.Billing.Pricing;
 using Bit.Core.Billing.Services;
 using Bit.Core.Context;

src/Core/AdminConsole/Services/OrganizationFactory.cs

@@ -3,7 +3,7 @@ using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Licenses;
 using Bit.Core.Billing.Licenses.Extensions;
-using Bit.Core.Billing.Models.Business;
+using Bit.Core.Billing.Organizations.Models;
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 

src/Core/Billing/Extensions/ServiceCollectionExtensions.cs

@@ -1,9 +1,9 @@
 using Bit.Core.Billing.Caches;
 using Bit.Core.Billing.Caches.Implementations;
 using Bit.Core.Billing.Licenses.Extensions;
-using Bit.Core.Billing.OrganizationFeatures.OrganizationLicenses;
-using Bit.Core.Billing.OrganizationFeatures.OrganizationLicenses.Interfaces;
-using Bit.Core.Billing.OrganizationFeatures.OrganizationLicenses.SelfHosted;
+using Bit.Core.Billing.Organizations.Commands;
+using Bit.Core.Billing.Organizations.Queries;
+using Bit.Core.Billing.Organizations.Services;
 using Bit.Core.Billing.Payment;
 using Bit.Core.Billing.Pricing;
 using Bit.Core.Billing.Services;
@@ -37,8 +37,8 @@ public static class ServiceCollectionExtensions
 
     private static void AddOrganizationLicenseCommandsQueries(this IServiceCollection services)
     {
-        services.AddScoped<ICloudGetOrganizationLicenseQuery, CloudGetOrganizationLicenseQuery>();
-        services.AddScoped<ISelfHostedGetOrganizationLicenseQuery, SelfHostedGetOrganizationLicenseQuery>();
+        services.AddScoped<IGetCloudOrganizationLicenseQuery, GetCloudOrganizationLicenseQuery>();
+        services.AddScoped<IGetSelfHostedOrganizationLicenseQuery, GetSelfHostedOrganizationLicenseQuery>();
         services.AddScoped<IUpdateOrganizationLicenseCommand, UpdateOrganizationLicenseCommand>();
     }
 }

src/Core/Billing/OrganizationFeatures/OrganizationLicenses/Interfaces/IGetOrganizationLicenseQuery.cs

@@ -1,16 +0,0 @@
-using Bit.Core.AdminConsole.Entities;
-using Bit.Core.Billing.Models.Business;
-using Bit.Core.Entities;
-
-namespace Bit.Core.Billing.OrganizationFeatures.OrganizationLicenses.Interfaces;
-
-public interface ICloudGetOrganizationLicenseQuery
-{
-    Task<OrganizationLicense> GetLicenseAsync(Organization organization, Guid installationId,
-        int? version = null);
-}
-
-public interface ISelfHostedGetOrganizationLicenseQuery
-{
-    Task<OrganizationLicense> GetLicenseAsync(Organization organization, OrganizationConnection billingSyncConnection);
-}

src/Core/Billing/OrganizationFeatures/OrganizationLicenses/Interfaces/IUpdateOrganizationLicenseCommand.cs

@@ -1,13 +0,0 @@
-#nullable enable
-
-using Bit.Core.AdminConsole.Entities;
-using Bit.Core.Billing.Models.Business;
-using Bit.Core.Models.Data.Organizations;
-
-namespace Bit.Core.Billing.OrganizationFeatures.OrganizationLicenses.Interfaces;
-
-public interface IUpdateOrganizationLicenseCommand
-{
-    Task UpdateLicenseAsync(SelfHostedOrganizationDetails selfHostedOrganization,
-        OrganizationLicense license, Organization? currentOrganizationUsingLicenseKey);
-}

src/Core/Billing/Organizations/Commands/UpdateOrganizationLicenseCommand.cs

@@ -1,9 +1,6 @@
-#nullable enable
-
-using System.Text.Json;
+using System.Text.Json;
 using Bit.Core.AdminConsole.Entities;
-using Bit.Core.Billing.Models.Business;
-using Bit.Core.Billing.OrganizationFeatures.OrganizationLicenses.Interfaces;
+using Bit.Core.Billing.Organizations.Models;
 using Bit.Core.Billing.Services;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Data.Organizations;
@@ -11,7 +8,13 @@ using Bit.Core.Services;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Billing.OrganizationFeatures.OrganizationLicenses;
+namespace Bit.Core.Billing.Organizations.Commands;
+
+public interface IUpdateOrganizationLicenseCommand
+{
+    Task UpdateLicenseAsync(SelfHostedOrganizationDetails selfHostedOrganization,
+        OrganizationLicense license, Organization? currentOrganizationUsingLicenseKey);
+}
 
 public class UpdateOrganizationLicenseCommand : IUpdateOrganizationLicenseCommand
 {

src/Core/Billing/Organizations/Entities/OrganizationInstallation.cs

@@ -1,9 +1,7 @@
 using Bit.Core.Entities;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Billing.Entities;
-
-#nullable enable
+namespace Bit.Core.Billing.Organizations.Entities;
 
 public class OrganizationInstallation : ITableObject<Guid>
 {

src/Core/Billing/Organizations/Models/OrganizationLicense.cs

@@ -10,12 +10,13 @@ using System.Text.Json.Serialization;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Licenses.Extensions;
+using Bit.Core.Billing.Models.Business;
 using Bit.Core.Billing.Services;
 using Bit.Core.Enums;
 using Bit.Core.Models.Business;
 using Bit.Core.Settings;
 
-namespace Bit.Core.Billing.Models.Business;
+namespace Bit.Core.Billing.Organizations.Models;
 
 public class OrganizationLicense : ILicense
 {

src/Core/Billing/Organizations/Models/OrganizationMetadata.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Billing.Models;
+namespace Bit.Core.Billing.Organizations.Models;
 
 public record OrganizationMetadata(
     bool IsEligibleForSelfHost,

src/Core/Billing/Organizations/Models/OrganizationSale.cs

@@ -1,11 +1,11 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Billing.Constants;
+using Bit.Core.Billing.Models;
+using Bit.Core.Billing.Models.Sales;
 using Bit.Core.Billing.Tax.Models;
 using Bit.Core.Models.Business;
 
-namespace Bit.Core.Billing.Models.Sales;
-
-#nullable enable
+namespace Bit.Core.Billing.Organizations.Models;
 
 public class OrganizationSale
 {

src/Core/Billing/Organizations/Models/SponsorOrganizationSubscriptionUpdate.cs

@@ -4,7 +4,7 @@
 using Bit.Core.Models.Business;
 using Stripe;
 
-namespace Bit.Core.Billing.Models.Business;
+namespace Bit.Core.Billing.Organizations.Models;
 
 public class SponsorOrganizationSubscriptionUpdate : SubscriptionUpdate
 {

src/Core/Billing/Organizations/Queries/GetCloudOrganizationLicenseQuery.cs

@@ -3,8 +3,7 @@
 
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Repositories;
-using Bit.Core.Billing.Models.Business;
-using Bit.Core.Billing.OrganizationFeatures.OrganizationLicenses.Interfaces;
+using Bit.Core.Billing.Organizations.Models;
 using Bit.Core.Billing.Services;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
@@ -12,9 +11,15 @@ using Bit.Core.Models.Business;
 using Bit.Core.Platform.Installations;
 using Bit.Core.Services;
 
-namespace Bit.Core.Billing.OrganizationFeatures.OrganizationLicenses;
+namespace Bit.Core.Billing.Organizations.Queries;
 
-public class CloudGetOrganizationLicenseQuery : ICloudGetOrganizationLicenseQuery
+public interface IGetCloudOrganizationLicenseQuery
+{
+    Task<OrganizationLicense> GetLicenseAsync(Organization organization, Guid installationId,
+        int? version = null);
+}
+
+public class GetCloudOrganizationLicenseQuery : IGetCloudOrganizationLicenseQuery
 {
     private readonly IInstallationRepository _installationRepository;
     private readonly IPaymentService _paymentService;
@@ -22,7 +27,7 @@ public class CloudGetOrganizationLicenseQuery : ICloudGetOrganizationLicenseQuer
     private readonly IProviderRepository _providerRepository;
     private readonly IFeatureService _featureService;
 
-    public CloudGetOrganizationLicenseQuery(
+    public GetCloudOrganizationLicenseQuery(
         IInstallationRepository installationRepository,
         IPaymentService paymentService,
         ILicensingService licensingService,

src/Core/Billing/Organizations/Queries/GetSelfHostedOrganizationLicenseQuery.cs

@@ -2,8 +2,7 @@
 #nullable disable
 
 using Bit.Core.AdminConsole.Entities;
-using Bit.Core.Billing.Models.Business;
-using Bit.Core.Billing.OrganizationFeatures.OrganizationLicenses.Interfaces;
+using Bit.Core.Billing.Organizations.Models;
 using Bit.Core.Context;
 using Bit.Core.Entities;
 using Bit.Core.Exceptions;
@@ -13,13 +12,18 @@ using Bit.Core.Services;
 using Bit.Core.Settings;
 using Microsoft.Extensions.Logging;
 
-namespace Bit.Core.Billing.OrganizationFeatures.OrganizationLicenses.SelfHosted;
+namespace Bit.Core.Billing.Organizations.Queries;
 
-public class SelfHostedGetOrganizationLicenseQuery : BaseIdentityClientService, ISelfHostedGetOrganizationLicenseQuery
+public interface IGetSelfHostedOrganizationLicenseQuery
+{
+    Task<OrganizationLicense> GetLicenseAsync(Organization organization, OrganizationConnection billingSyncConnection);
+}
+
+public class GetSelfHostedOrganizationLicenseQuery : BaseIdentityClientService, IGetSelfHostedOrganizationLicenseQuery
 {
     private readonly IGlobalSettings _globalSettings;
 
-    public SelfHostedGetOrganizationLicenseQuery(IHttpClientFactory httpFactory, IGlobalSettings globalSettings, ILogger<SelfHostedGetOrganizationLicenseQuery> logger, ICurrentContext currentContext)
+    public GetSelfHostedOrganizationLicenseQuery(IHttpClientFactory httpFactory, IGlobalSettings globalSettings, ILogger<GetSelfHostedOrganizationLicenseQuery> logger, ICurrentContext currentContext)
         : base(
             httpFactory,
             globalSettings.Installation.ApiUri,

src/Core/Billing/Organizations/Repositories/IOrganizationInstallationRepository.cs

@@ -1,7 +1,7 @@
-using Bit.Core.Billing.Entities;
+using Bit.Core.Billing.Organizations.Entities;
 using Bit.Core.Repositories;
 
-namespace Bit.Core.Billing.Repositories;
+namespace Bit.Core.Billing.Organizations.Repositories;
 
 public interface IOrganizationInstallationRepository : IRepository<OrganizationInstallation, Guid>
 {

src/Core/Billing/Organizations/Services/IOrganizationBillingService.cs

@@ -1,11 +1,9 @@
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Billing.Models;
-using Bit.Core.Billing.Models.Sales;
+using Bit.Core.Billing.Organizations.Models;
 using Bit.Core.Billing.Tax.Models;
 
-namespace Bit.Core.Billing.Services;
-
-#nullable enable
+namespace Bit.Core.Billing.Organizations.Services;
 
 public interface IOrganizationBillingService
 {

src/Core/Billing/Organizations/Services/OrganizationBillingService.cs

@@ -5,7 +5,9 @@ using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Extensions;
 using Bit.Core.Billing.Models;
 using Bit.Core.Billing.Models.Sales;
+using Bit.Core.Billing.Organizations.Models;
 using Bit.Core.Billing.Pricing;
+using Bit.Core.Billing.Services;
 using Bit.Core.Billing.Tax.Models;
 using Bit.Core.Billing.Tax.Services;
 using Bit.Core.Enums;
@@ -16,14 +18,11 @@ using Bit.Core.Settings;
 using Braintree;
 using Microsoft.Extensions.Logging;
 using Stripe;
-
 using static Bit.Core.Billing.Utilities;
 using Customer = Stripe.Customer;
 using Subscription = Stripe.Subscription;
 
-namespace Bit.Core.Billing.Services.Implementations;
-
-#nullable enable
+namespace Bit.Core.Billing.Organizations.Services;
 
 public class OrganizationBillingService(
     IBraintreeGateway braintreeGateway,

src/Core/Billing/Services/ILicensingService.cs

@@ -3,6 +3,7 @@
 using System.Security.Claims;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Billing.Models.Business;
+using Bit.Core.Billing.Organizations.Models;
 using Bit.Core.Entities;
 using Bit.Core.Models.Business;
 

src/Core/Billing/Services/Implementations/LicensingService.cs

@@ -10,6 +10,7 @@ using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Billing.Licenses.Models;
 using Bit.Core.Billing.Licenses.Services;
 using Bit.Core.Billing.Models.Business;
+using Bit.Core.Billing.Organizations.Models;
 using Bit.Core.Entities;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;

src/Core/Billing/Services/NoopImplementations/NoopLicensingService.cs

@@ -3,6 +3,7 @@
 using System.Security.Claims;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Billing.Models.Business;
+using Bit.Core.Billing.Organizations.Models;
 using Bit.Core.Entities;
 using Bit.Core.Models.Business;
 using Bit.Core.Settings;

src/Core/OrganizationFeatures/OrganizationSubscriptions/UpgradeOrganizationPlanCommand.cs

@@ -8,9 +8,9 @@ using Bit.Core.AdminConsole.Repositories;
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Repositories;
 using Bit.Core.Billing.Enums;
-using Bit.Core.Billing.Models.Sales;
+using Bit.Core.Billing.Organizations.Models;
+using Bit.Core.Billing.Organizations.Services;
 using Bit.Core.Billing.Pricing;
-using Bit.Core.Billing.Services;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;

src/Core/Services/Implementations/StripePaymentService.cs

@@ -8,7 +8,7 @@ using Bit.Core.Billing.Constants;
 using Bit.Core.Billing.Enums;
 using Bit.Core.Billing.Extensions;
 using Bit.Core.Billing.Models;
-using Bit.Core.Billing.Models.Business;
+using Bit.Core.Billing.Organizations.Models;
 using Bit.Core.Billing.Pricing;
 using Bit.Core.Billing.Tax.Models;
 using Bit.Core.Billing.Tax.Requests;