From 3a163a96d7e3176e8b328c01e9a157215f4f5bef Mon Sep 17 00:00:00 2001 From: Conner Turnbull Date: Tue, 10 Jun 2025 11:45:33 -0400 Subject: [PATCH] Moved license models over to billing folder --- .../Response/Organizations/OrganizationResponseModel.cs | 1 + src/Api/Billing/Controllers/AccountsController.cs | 1 + src/Api/Billing/Controllers/OrganizationsController.cs | 1 + src/Api/Controllers/LicensesController.cs | 2 +- .../SelfHosted/SelfHostedOrganizationLicensesController.cs | 2 +- src/Api/Models/Response/SubscriptionResponseModel.cs | 3 ++- src/Core/AdminConsole/Entities/Organization.cs | 2 +- .../Data/Organizations/SelfHostedOrganizationDetails.cs | 2 +- src/Core/AdminConsole/Services/IOrganizationService.cs | 1 + .../Services/Implementations/OrganizationService.cs | 2 ++ src/Core/{ => Billing/Licenses}/Enums/LicenseType.cs | 2 +- src/Core/Billing/Licenses/Extensions/LicenseExtensions.cs | 3 ++- .../Business => Billing/Licenses/Models}/BaseLicense.cs | 4 ++-- .../{Models/Business => Billing/Licenses/Models}/ILicense.cs | 4 ++-- .../Licenses/Models}/OrganizationLicense.cs | 2 +- .../Business => Billing/Licenses/Models}/UserLicense.cs | 3 ++- .../Implementations/OrganizationLicenseClaimsFactory.cs | 2 +- .../Services/Implementations/UserLicenseClaimsFactory.cs | 2 +- .../Cloud/CloudGetOrganizationLicenseQuery.cs | 2 ++ .../Interfaces/IGetOrganizationLicenseQuery.cs | 2 +- .../Interfaces/IUpdateOrganizationLicenseCommand.cs | 2 +- .../SelfHosted/SelfHostedGetOrganizationLicenseQuery.cs | 2 +- .../OrganizationLicenses/UpdateOrganizationLicenseCommand.cs | 2 +- src/Core/Services/ILicensingService.cs | 1 + src/Core/Services/IUserService.cs | 1 + src/Core/Services/Implementations/UserService.cs | 2 ++ src/Core/Services/NoopImplementations/NoopLicensingService.cs | 1 + .../Controllers/OrganizationConnectionsControllerTests.cs | 2 +- test/Api.Test/Utilities/ApiHelpersTests.cs | 2 +- .../Models/Data/SelfHostedOrganizationDetailsTests.cs | 2 +- .../Core.Test/AutoFixture/OrganizationLicenseCustomization.cs | 2 +- .../Models/Business/OrganizationLicenseFileFixtures.cs | 2 +- test/Core.Test/Models/Business/OrganizationLicenseTests.cs | 2 +- .../CloudGetOrganizationLicenseQueryTests.cs | 2 ++ .../SelfHostedGetOrganizationLicenseQueryTests.cs | 2 +- .../UpdateOrganizationLicenseCommandTests.cs | 4 ++-- test/Core.Test/Services/LicensingServiceTests.cs | 2 +- test/Core.Test/Services/UserServiceTests.cs | 2 +- 38 files changed, 48 insertions(+), 30 deletions(-) rename src/Core/{ => Billing/Licenses}/Enums/LicenseType.cs (61%) rename src/Core/{Models/Business => Billing/Licenses/Models}/BaseLicense.cs (93%) rename src/Core/{Models/Business => Billing/Licenses/Models}/ILicense.cs (82%) rename src/Core/{Models/Business => Billing/Licenses/Models}/OrganizationLicense.cs (98%) rename src/Core/{Models/Business => Billing/Licenses/Models}/UserLicense.cs (96%) diff --git a/src/Api/AdminConsole/Models/Response/Organizations/OrganizationResponseModel.cs b/src/Api/AdminConsole/Models/Response/Organizations/OrganizationResponseModel.cs index 95754598b9..aa1bb76827 100644 --- a/src/Api/AdminConsole/Models/Response/Organizations/OrganizationResponseModel.cs +++ b/src/Api/AdminConsole/Models/Response/Organizations/OrganizationResponseModel.cs @@ -2,6 +2,7 @@ using Bit.Api.Models.Response; using Bit.Core.AdminConsole.Entities; using Bit.Core.Billing.Enums; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Models.Api; using Bit.Core.Models.Business; using Bit.Core.Models.StaticStore; diff --git a/src/Api/Billing/Controllers/AccountsController.cs b/src/Api/Billing/Controllers/AccountsController.cs index 10d386641d..bbd0f0df34 100644 --- a/src/Api/Billing/Controllers/AccountsController.cs +++ b/src/Api/Billing/Controllers/AccountsController.cs @@ -4,6 +4,7 @@ using Bit.Api.Models.Request.Accounts; using Bit.Api.Models.Response; using Bit.Api.Utilities; using Bit.Core.Auth.UserFeatures.TwoFactorAuth.Interfaces; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Billing.Models; using Bit.Core.Billing.Services; using Bit.Core.Exceptions; diff --git a/src/Api/Billing/Controllers/OrganizationsController.cs b/src/Api/Billing/Controllers/OrganizationsController.cs index c8a3c20c91..13b13a144a 100644 --- a/src/Api/Billing/Controllers/OrganizationsController.cs +++ b/src/Api/Billing/Controllers/OrganizationsController.cs @@ -7,6 +7,7 @@ using Bit.Api.Models.Response; using Bit.Core.AdminConsole.Entities; using Bit.Core.Billing.Constants; using Bit.Core.Billing.Entities; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Billing.Models; using Bit.Core.Billing.Pricing; using Bit.Core.Billing.Repositories; diff --git a/src/Api/Controllers/LicensesController.cs b/src/Api/Controllers/LicensesController.cs index 1c00589201..49f82e13a7 100644 --- a/src/Api/Controllers/LicensesController.cs +++ b/src/Api/Controllers/LicensesController.cs @@ -1,8 +1,8 @@ using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Context; using Bit.Core.Exceptions; using Bit.Core.Models.Api.OrganizationLicenses; -using Bit.Core.Models.Business; using Bit.Core.OrganizationFeatures.OrganizationLicenses.Interfaces; using Bit.Core.Repositories; using Bit.Core.Services; diff --git a/src/Api/Controllers/SelfHosted/SelfHostedOrganizationLicensesController.cs b/src/Api/Controllers/SelfHosted/SelfHostedOrganizationLicensesController.cs index ed501c41da..9979be5272 100644 --- a/src/Api/Controllers/SelfHosted/SelfHostedOrganizationLicensesController.cs +++ b/src/Api/Controllers/SelfHosted/SelfHostedOrganizationLicensesController.cs @@ -2,10 +2,10 @@ using Bit.Api.Models.Request; using Bit.Api.Models.Request.Organizations; using Bit.Api.Utilities; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Context; using Bit.Core.Enums; using Bit.Core.Exceptions; -using Bit.Core.Models.Business; using Bit.Core.Models.OrganizationConnectionConfigs; using Bit.Core.OrganizationFeatures.OrganizationLicenses.Interfaces; using Bit.Core.Repositories; diff --git a/src/Api/Models/Response/SubscriptionResponseModel.cs b/src/Api/Models/Response/SubscriptionResponseModel.cs index c7aae1dec2..93bc3f6b27 100644 --- a/src/Api/Models/Response/SubscriptionResponseModel.cs +++ b/src/Api/Models/Response/SubscriptionResponseModel.cs @@ -1,4 +1,5 @@ -using Bit.Core.Entities; +using Bit.Core.Billing.Licenses.Models; +using Bit.Core.Entities; using Bit.Core.Models.Api; using Bit.Core.Models.Business; using Bit.Core.Utilities; diff --git a/src/Core/AdminConsole/Entities/Organization.cs b/src/Core/AdminConsole/Entities/Organization.cs index 274c7f8ddb..1dedb29679 100644 --- a/src/Core/AdminConsole/Entities/Organization.cs +++ b/src/Core/AdminConsole/Entities/Organization.cs @@ -4,9 +4,9 @@ using System.Text.Json; using Bit.Core.Auth.Enums; using Bit.Core.Auth.Models; using Bit.Core.Billing.Enums; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Entities; using Bit.Core.Enums; -using Bit.Core.Models.Business; using Bit.Core.Services; using Bit.Core.Utilities; diff --git a/src/Core/AdminConsole/Models/Data/Organizations/SelfHostedOrganizationDetails.cs b/src/Core/AdminConsole/Models/Data/Organizations/SelfHostedOrganizationDetails.cs index a6ad47f829..85748db447 100644 --- a/src/Core/AdminConsole/Models/Data/Organizations/SelfHostedOrganizationDetails.cs +++ b/src/Core/AdminConsole/Models/Data/Organizations/SelfHostedOrganizationDetails.cs @@ -3,9 +3,9 @@ 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.Licenses.Models; using Bit.Core.Entities; using Bit.Core.Enums; -using Bit.Core.Models.Business; namespace Bit.Core.Models.Data.Organizations; diff --git a/src/Core/AdminConsole/Services/IOrganizationService.cs b/src/Core/AdminConsole/Services/IOrganizationService.cs index 5fe68bd22e..ced74f485a 100644 --- a/src/Core/AdminConsole/Services/IOrganizationService.cs +++ b/src/Core/AdminConsole/Services/IOrganizationService.cs @@ -2,6 +2,7 @@ using Bit.Core.AdminConsole.Entities; using Bit.Core.AdminConsole.Models.Business; using Bit.Core.Auth.Enums; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Models.Business; diff --git a/src/Core/AdminConsole/Services/Implementations/OrganizationService.cs b/src/Core/AdminConsole/Services/Implementations/OrganizationService.cs index aba05cedbe..827a4ca1b9 100644 --- a/src/Core/AdminConsole/Services/Implementations/OrganizationService.cs +++ b/src/Core/AdminConsole/Services/Implementations/OrganizationService.cs @@ -17,7 +17,9 @@ using Bit.Core.Auth.Repositories; using Bit.Core.Billing.Constants; using Bit.Core.Billing.Enums; using Bit.Core.Billing.Extensions; +using Bit.Core.Billing.Licenses.Enums; using Bit.Core.Billing.Licenses.Extensions; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Billing.Pricing; using Bit.Core.Context; using Bit.Core.Entities; diff --git a/src/Core/Enums/LicenseType.cs b/src/Core/Billing/Licenses/Enums/LicenseType.cs similarity index 61% rename from src/Core/Enums/LicenseType.cs rename to src/Core/Billing/Licenses/Enums/LicenseType.cs index 90ca0d7a68..671b51b5ca 100644 --- a/src/Core/Enums/LicenseType.cs +++ b/src/Core/Billing/Licenses/Enums/LicenseType.cs @@ -1,4 +1,4 @@ -namespace Bit.Core.Enums; +namespace Bit.Core.Billing.Licenses.Enums; public enum LicenseType : byte { diff --git a/src/Core/Billing/Licenses/Extensions/LicenseExtensions.cs b/src/Core/Billing/Licenses/Extensions/LicenseExtensions.cs index 9b4cfb84ae..635b857bc6 100644 --- a/src/Core/Billing/Licenses/Extensions/LicenseExtensions.cs +++ b/src/Core/Billing/Licenses/Extensions/LicenseExtensions.cs @@ -6,8 +6,9 @@ using System.Text; using Bit.Core.AdminConsole.Entities; using Bit.Core.Billing.Enums; using Bit.Core.Billing.Licenses.Attributes; +using Bit.Core.Billing.Licenses.Enums; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Entities; -using Bit.Core.Enums; using Bit.Core.Models.Business; using Bit.Core.Settings; using Bit.Core.Utilities; diff --git a/src/Core/Models/Business/BaseLicense.cs b/src/Core/Billing/Licenses/Models/BaseLicense.cs similarity index 93% rename from src/Core/Models/Business/BaseLicense.cs rename to src/Core/Billing/Licenses/Models/BaseLicense.cs index 8645d97182..d37aa735c0 100644 --- a/src/Core/Models/Business/BaseLicense.cs +++ b/src/Core/Billing/Licenses/Models/BaseLicense.cs @@ -1,8 +1,8 @@ using System.Text.Json.Serialization; using Bit.Core.Billing.Licenses.Attributes; -using Bit.Core.Enums; +using Bit.Core.Billing.Licenses.Enums; -namespace Bit.Core.Models.Business; +namespace Bit.Core.Billing.Licenses.Models; public abstract class BaseLicense : ILicense { diff --git a/src/Core/Models/Business/ILicense.cs b/src/Core/Billing/Licenses/Models/ILicense.cs similarity index 82% rename from src/Core/Models/Business/ILicense.cs rename to src/Core/Billing/Licenses/Models/ILicense.cs index 8be52bd87f..c0ba556e0c 100644 --- a/src/Core/Models/Business/ILicense.cs +++ b/src/Core/Billing/Licenses/Models/ILicense.cs @@ -1,6 +1,6 @@ -using Bit.Core.Enums; +using Bit.Core.Billing.Licenses.Enums; -namespace Bit.Core.Models.Business; +namespace Bit.Core.Billing.Licenses.Models; public interface ILicense { diff --git a/src/Core/Models/Business/OrganizationLicense.cs b/src/Core/Billing/Licenses/Models/OrganizationLicense.cs similarity index 98% rename from src/Core/Models/Business/OrganizationLicense.cs rename to src/Core/Billing/Licenses/Models/OrganizationLicense.cs index b93b8ffaf4..38cc4ef3c9 100644 --- a/src/Core/Models/Business/OrganizationLicense.cs +++ b/src/Core/Billing/Licenses/Models/OrganizationLicense.cs @@ -2,7 +2,7 @@ using Bit.Core.Billing.Enums; using Bit.Core.Billing.Licenses.Attributes; -namespace Bit.Core.Models.Business; +namespace Bit.Core.Billing.Licenses.Models; public class OrganizationLicense : BaseLicense { diff --git a/src/Core/Models/Business/UserLicense.cs b/src/Core/Billing/Licenses/Models/UserLicense.cs similarity index 96% rename from src/Core/Models/Business/UserLicense.cs rename to src/Core/Billing/Licenses/Models/UserLicense.cs index 4ba37eab55..d688c5831f 100644 --- a/src/Core/Models/Business/UserLicense.cs +++ b/src/Core/Billing/Licenses/Models/UserLicense.cs @@ -2,9 +2,10 @@ using Bit.Core.Billing.Licenses.Attributes; using Bit.Core.Billing.Licenses.Extensions; using Bit.Core.Entities; +using Bit.Core.Models.Business; using Bit.Core.Services; -namespace Bit.Core.Models.Business; +namespace Bit.Core.Billing.Licenses.Models; public class UserLicense : BaseLicense { diff --git a/src/Core/Billing/Licenses/Services/Implementations/OrganizationLicenseClaimsFactory.cs b/src/Core/Billing/Licenses/Services/Implementations/OrganizationLicenseClaimsFactory.cs index 4df71e418f..c36b270eca 100644 --- a/src/Core/Billing/Licenses/Services/Implementations/OrganizationLicenseClaimsFactory.cs +++ b/src/Core/Billing/Licenses/Services/Implementations/OrganizationLicenseClaimsFactory.cs @@ -1,9 +1,9 @@ using System.Globalization; using System.Security.Claims; using Bit.Core.AdminConsole.Entities; +using Bit.Core.Billing.Licenses.Enums; using Bit.Core.Billing.Licenses.Extensions; using Bit.Core.Billing.Licenses.Models; -using Bit.Core.Enums; namespace Bit.Core.Billing.Licenses.Services.Implementations; diff --git a/src/Core/Billing/Licenses/Services/Implementations/UserLicenseClaimsFactory.cs b/src/Core/Billing/Licenses/Services/Implementations/UserLicenseClaimsFactory.cs index 079fbb3857..8691a7bb1c 100644 --- a/src/Core/Billing/Licenses/Services/Implementations/UserLicenseClaimsFactory.cs +++ b/src/Core/Billing/Licenses/Services/Implementations/UserLicenseClaimsFactory.cs @@ -1,9 +1,9 @@ using System.Globalization; using System.Security.Claims; +using Bit.Core.Billing.Licenses.Enums; using Bit.Core.Billing.Licenses.Extensions; using Bit.Core.Billing.Licenses.Models; using Bit.Core.Entities; -using Bit.Core.Enums; namespace Bit.Core.Billing.Licenses.Services.Implementations; diff --git a/src/Core/OrganizationFeatures/OrganizationLicenses/Cloud/CloudGetOrganizationLicenseQuery.cs b/src/Core/OrganizationFeatures/OrganizationLicenses/Cloud/CloudGetOrganizationLicenseQuery.cs index 4ced39c171..4c6d1eff26 100644 --- a/src/Core/OrganizationFeatures/OrganizationLicenses/Cloud/CloudGetOrganizationLicenseQuery.cs +++ b/src/Core/OrganizationFeatures/OrganizationLicenses/Cloud/CloudGetOrganizationLicenseQuery.cs @@ -1,6 +1,8 @@ using Bit.Core.AdminConsole.Entities; using Bit.Core.AdminConsole.Repositories; +using Bit.Core.Billing.Licenses.Enums; using Bit.Core.Billing.Licenses.Extensions; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Enums; using Bit.Core.Exceptions; using Bit.Core.Models.Business; diff --git a/src/Core/OrganizationFeatures/OrganizationLicenses/Interfaces/IGetOrganizationLicenseQuery.cs b/src/Core/OrganizationFeatures/OrganizationLicenses/Interfaces/IGetOrganizationLicenseQuery.cs index 312b80a466..9a76c26ce8 100644 --- a/src/Core/OrganizationFeatures/OrganizationLicenses/Interfaces/IGetOrganizationLicenseQuery.cs +++ b/src/Core/OrganizationFeatures/OrganizationLicenses/Interfaces/IGetOrganizationLicenseQuery.cs @@ -1,6 +1,6 @@ using Bit.Core.AdminConsole.Entities; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Entities; -using Bit.Core.Models.Business; namespace Bit.Core.OrganizationFeatures.OrganizationLicenses.Interfaces; diff --git a/src/Core/OrganizationFeatures/OrganizationLicenses/Interfaces/IUpdateOrganizationLicenseCommand.cs b/src/Core/OrganizationFeatures/OrganizationLicenses/Interfaces/IUpdateOrganizationLicenseCommand.cs index 78f590e59f..5d525c5e58 100644 --- a/src/Core/OrganizationFeatures/OrganizationLicenses/Interfaces/IUpdateOrganizationLicenseCommand.cs +++ b/src/Core/OrganizationFeatures/OrganizationLicenses/Interfaces/IUpdateOrganizationLicenseCommand.cs @@ -1,7 +1,7 @@ #nullable enable using Bit.Core.AdminConsole.Entities; -using Bit.Core.Models.Business; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Models.Data.Organizations; namespace Bit.Core.OrganizationFeatures.OrganizationLicenses.Interfaces; diff --git a/src/Core/OrganizationFeatures/OrganizationLicenses/SelfHosted/SelfHostedGetOrganizationLicenseQuery.cs b/src/Core/OrganizationFeatures/OrganizationLicenses/SelfHosted/SelfHostedGetOrganizationLicenseQuery.cs index 89ea53fc20..ef1a08ccdf 100644 --- a/src/Core/OrganizationFeatures/OrganizationLicenses/SelfHosted/SelfHostedGetOrganizationLicenseQuery.cs +++ b/src/Core/OrganizationFeatures/OrganizationLicenses/SelfHosted/SelfHostedGetOrganizationLicenseQuery.cs @@ -1,9 +1,9 @@ using Bit.Core.AdminConsole.Entities; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Context; using Bit.Core.Entities; using Bit.Core.Exceptions; using Bit.Core.Models.Api.OrganizationLicenses; -using Bit.Core.Models.Business; using Bit.Core.Models.OrganizationConnectionConfigs; using Bit.Core.OrganizationFeatures.OrganizationLicenses.Interfaces; using Bit.Core.Services; diff --git a/src/Core/OrganizationFeatures/OrganizationLicenses/UpdateOrganizationLicenseCommand.cs b/src/Core/OrganizationFeatures/OrganizationLicenses/UpdateOrganizationLicenseCommand.cs index dee5686d41..77dbd893e0 100644 --- a/src/Core/OrganizationFeatures/OrganizationLicenses/UpdateOrganizationLicenseCommand.cs +++ b/src/Core/OrganizationFeatures/OrganizationLicenses/UpdateOrganizationLicenseCommand.cs @@ -3,8 +3,8 @@ using System.Text.Json; using Bit.Core.AdminConsole.Entities; using Bit.Core.Billing.Licenses.Extensions; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Exceptions; -using Bit.Core.Models.Business; using Bit.Core.Models.Data.Organizations; using Bit.Core.OrganizationFeatures.OrganizationLicenses.Interfaces; using Bit.Core.Services; diff --git a/src/Core/Services/ILicensingService.cs b/src/Core/Services/ILicensingService.cs index 2115e43085..4ee2d14832 100644 --- a/src/Core/Services/ILicensingService.cs +++ b/src/Core/Services/ILicensingService.cs @@ -2,6 +2,7 @@ using System.Security.Claims; using Bit.Core.AdminConsole.Entities; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Entities; using Bit.Core.Models.Business; diff --git a/src/Core/Services/IUserService.cs b/src/Core/Services/IUserService.cs index e63b4e3b87..8977902e65 100644 --- a/src/Core/Services/IUserService.cs +++ b/src/Core/Services/IUserService.cs @@ -2,6 +2,7 @@ using Bit.Core.AdminConsole.Entities; using Bit.Core.Auth.Enums; using Bit.Core.Auth.Models; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Models.Business; diff --git a/src/Core/Services/Implementations/UserService.cs b/src/Core/Services/Implementations/UserService.cs index 265adf59bf..2fedfb487a 100644 --- a/src/Core/Services/Implementations/UserService.cs +++ b/src/Core/Services/Implementations/UserService.cs @@ -15,7 +15,9 @@ using Bit.Core.Auth.Models; using Bit.Core.Auth.Models.Business.Tokenables; using Bit.Core.Auth.UserFeatures.TwoFactorAuth.Interfaces; using Bit.Core.Billing.Constants; +using Bit.Core.Billing.Licenses.Enums; using Bit.Core.Billing.Licenses.Extensions; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Billing.Models; using Bit.Core.Billing.Models.Sales; using Bit.Core.Billing.Services; diff --git a/src/Core/Services/NoopImplementations/NoopLicensingService.cs b/src/Core/Services/NoopImplementations/NoopLicensingService.cs index b181e61138..fb7823f3b9 100644 --- a/src/Core/Services/NoopImplementations/NoopLicensingService.cs +++ b/src/Core/Services/NoopImplementations/NoopLicensingService.cs @@ -2,6 +2,7 @@ using System.Security.Claims; using Bit.Core.AdminConsole.Entities; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Entities; using Bit.Core.Models.Business; using Bit.Core.Settings; diff --git a/test/Api.Test/AdminConsole/Controllers/OrganizationConnectionsControllerTests.cs b/test/Api.Test/AdminConsole/Controllers/OrganizationConnectionsControllerTests.cs index dff61aa2b4..bcc61f6bab 100644 --- a/test/Api.Test/AdminConsole/Controllers/OrganizationConnectionsControllerTests.cs +++ b/test/Api.Test/AdminConsole/Controllers/OrganizationConnectionsControllerTests.cs @@ -4,11 +4,11 @@ using Bit.Api.AdminConsole.Models.Request.Organizations; using Bit.Api.AdminConsole.Models.Response.Organizations; using Bit.Core.AdminConsole.Models.OrganizationConnectionConfigs; using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfaces; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Context; using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Exceptions; -using Bit.Core.Models.Business; using Bit.Core.Models.OrganizationConnectionConfigs; using Bit.Core.Repositories; using Bit.Core.Services; diff --git a/test/Api.Test/Utilities/ApiHelpersTests.cs b/test/Api.Test/Utilities/ApiHelpersTests.cs index 4013a2222a..b82cd2ad25 100644 --- a/test/Api.Test/Utilities/ApiHelpersTests.cs +++ b/test/Api.Test/Utilities/ApiHelpersTests.cs @@ -1,6 +1,6 @@ using System.Text; using Bit.Api.Utilities; -using Bit.Core.Models.Business; +using Bit.Core.Billing.Licenses.Models; using Microsoft.AspNetCore.Http; using NSubstitute; using Xunit; diff --git a/test/Core.Test/AdminConsole/Models/Data/SelfHostedOrganizationDetailsTests.cs b/test/Core.Test/AdminConsole/Models/Data/SelfHostedOrganizationDetailsTests.cs index f2fac4aceb..94eec74d67 100644 --- a/test/Core.Test/AdminConsole/Models/Data/SelfHostedOrganizationDetailsTests.cs +++ b/test/Core.Test/AdminConsole/Models/Data/SelfHostedOrganizationDetailsTests.cs @@ -5,9 +5,9 @@ using Bit.Core.Auth.Entities; using Bit.Core.Auth.Enums; using Bit.Core.Auth.Models.Data; using Bit.Core.Billing.Enums; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Entities; using Bit.Core.Enums; -using Bit.Core.Models.Business; using Bit.Core.Models.Data.Organizations; using Bit.Core.Test.AutoFixture; using Bit.Test.Common.AutoFixture.Attributes; diff --git a/test/Core.Test/AutoFixture/OrganizationLicenseCustomization.cs b/test/Core.Test/AutoFixture/OrganizationLicenseCustomization.cs index 66a7f52249..7c23049c25 100644 --- a/test/Core.Test/AutoFixture/OrganizationLicenseCustomization.cs +++ b/test/Core.Test/AutoFixture/OrganizationLicenseCustomization.cs @@ -1,5 +1,5 @@ using AutoFixture; -using Bit.Core.Models.Business; +using Bit.Core.Billing.Licenses.Models; using Bit.Test.Common.AutoFixture.Attributes; namespace Bit.Core.Test.AutoFixture; diff --git a/test/Core.Test/Models/Business/OrganizationLicenseFileFixtures.cs b/test/Core.Test/Models/Business/OrganizationLicenseFileFixtures.cs index 08771df06a..d135862c03 100644 --- a/test/Core.Test/Models/Business/OrganizationLicenseFileFixtures.cs +++ b/test/Core.Test/Models/Business/OrganizationLicenseFileFixtures.cs @@ -1,8 +1,8 @@ using System.Text.Json; using Bit.Core.AdminConsole.Entities; using Bit.Core.Billing.Enums; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Enums; -using Bit.Core.Models.Business; namespace Bit.Core.Test.Models.Business; diff --git a/test/Core.Test/Models/Business/OrganizationLicenseTests.cs b/test/Core.Test/Models/Business/OrganizationLicenseTests.cs index dbde330b74..0d40f5ac44 100644 --- a/test/Core.Test/Models/Business/OrganizationLicenseTests.cs +++ b/test/Core.Test/Models/Business/OrganizationLicenseTests.cs @@ -1,6 +1,6 @@ using System.Security.Claims; using Bit.Core.Billing.Licenses.Extensions; -using Bit.Core.Models.Business; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Settings; using Bit.Test.Common.AutoFixture.Attributes; using NSubstitute; diff --git a/test/Core.Test/OrganizationFeatures/OrganizationLicenses/CloudGetOrganizationLicenseQueryTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationLicenses/CloudGetOrganizationLicenseQueryTests.cs index d416f41883..f9d783d144 100644 --- a/test/Core.Test/OrganizationFeatures/OrganizationLicenses/CloudGetOrganizationLicenseQueryTests.cs +++ b/test/Core.Test/OrganizationFeatures/OrganizationLicenses/CloudGetOrganizationLicenseQueryTests.cs @@ -1,6 +1,8 @@ using Bit.Core.AdminConsole.Entities; using Bit.Core.AdminConsole.Entities.Provider; using Bit.Core.AdminConsole.Repositories; +using Bit.Core.Billing.Licenses.Enums; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Enums; using Bit.Core.Exceptions; using Bit.Core.Models.Business; diff --git a/test/Core.Test/OrganizationFeatures/OrganizationLicenses/SelfHostedGetOrganizationLicenseQueryTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationLicenses/SelfHostedGetOrganizationLicenseQueryTests.cs index 0e5b73d112..97a1a55a85 100644 --- a/test/Core.Test/OrganizationFeatures/OrganizationLicenses/SelfHostedGetOrganizationLicenseQueryTests.cs +++ b/test/Core.Test/OrganizationFeatures/OrganizationLicenses/SelfHostedGetOrganizationLicenseQueryTests.cs @@ -1,8 +1,8 @@ using System.Text.Json; using Bit.Core.AdminConsole.Entities; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Entities; using Bit.Core.Exceptions; -using Bit.Core.Models.Business; using Bit.Core.Models.OrganizationConnectionConfigs; using Bit.Core.OrganizationFeatures.OrganizationLicenses; using Bit.Core.Settings; diff --git a/test/Core.Test/OrganizationFeatures/OrganizationLicenses/UpdateOrganizationLicenseCommandTests.cs b/test/Core.Test/OrganizationFeatures/OrganizationLicenses/UpdateOrganizationLicenseCommandTests.cs index 854dd16440..077a9679af 100644 --- a/test/Core.Test/OrganizationFeatures/OrganizationLicenses/UpdateOrganizationLicenseCommandTests.cs +++ b/test/Core.Test/OrganizationFeatures/OrganizationLicenses/UpdateOrganizationLicenseCommandTests.cs @@ -1,7 +1,7 @@ using System.Security.Claims; using Bit.Core.AdminConsole.Entities; -using Bit.Core.Enums; -using Bit.Core.Models.Business; +using Bit.Core.Billing.Licenses.Enums; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Models.Data.Organizations; using Bit.Core.OrganizationFeatures.OrganizationLicenses; using Bit.Core.Services; diff --git a/test/Core.Test/Services/LicensingServiceTests.cs b/test/Core.Test/Services/LicensingServiceTests.cs index 3e8b1735e2..357e41b6c6 100644 --- a/test/Core.Test/Services/LicensingServiceTests.cs +++ b/test/Core.Test/Services/LicensingServiceTests.cs @@ -1,7 +1,7 @@ using System.Text.Json; using AutoFixture; using Bit.Core.AdminConsole.Entities; -using Bit.Core.Models.Business; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Services; using Bit.Core.Settings; using Bit.Core.Test.AutoFixture; diff --git a/test/Core.Test/Services/UserServiceTests.cs b/test/Core.Test/Services/UserServiceTests.cs index 9252d28588..46e3a0f86a 100644 --- a/test/Core.Test/Services/UserServiceTests.cs +++ b/test/Core.Test/Services/UserServiceTests.cs @@ -13,12 +13,12 @@ using Bit.Core.Auth.Enums; using Bit.Core.Auth.Models; using Bit.Core.Auth.Models.Business.Tokenables; using Bit.Core.Auth.UserFeatures.TwoFactorAuth.Interfaces; +using Bit.Core.Billing.Licenses.Models; using Bit.Core.Billing.Services; using Bit.Core.Context; using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Exceptions; -using Bit.Core.Models.Business; using Bit.Core.Models.Data.Organizations; using Bit.Core.Models.Data.Organizations.OrganizationUsers; using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces;