diff --git a/Logistics.sln b/Logistics.sln index c8c36e639..bac4de7eb 100644 --- a/Logistics.sln +++ b/Logistics.sln @@ -3,31 +3,29 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.1.31903.286 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{45FFBEC0-FFF0-4964-A506-F326A76702CC}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{61325513-BB52-47A8-AFDD-755454AD71F8}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{7B06ED10-5DDF-4EFB-9CD7-37B9415EDD3D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Domain", "src\Core\Logistics.Domain\Logistics.Domain.csproj", "{E92A6E55-158F-48CE-9774-6E81DB77F81C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Domain", "src\Server\Logistics.Domain\Logistics.Domain.csproj", "{E92A6E55-158F-48CE-9774-6E81DB77F81C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Application.Tenant", "src\Core\Logistics.Application.Tenant\Logistics.Application.Tenant.csproj", "{53B069CE-0FEB-4191-B82D-BCE01159AE90}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Application.Tenant", "src\Server\Logistics.Application.Tenant\Logistics.Application.Tenant.csproj", "{53B069CE-0FEB-4191-B82D-BCE01159AE90}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Infrastructure.EF", "src\Core\Logistics.Infrastructure.EF\Logistics.Infrastructure.EF.csproj", "{0646E83A-CB9F-458A-BD84-8F2AE768CB91}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Infrastructure.EF", "src\Server\Logistics.Infrastructure.EF\Logistics.Infrastructure.EF.csproj", "{0646E83A-CB9F-458A-BD84-8F2AE768CB91}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{F47DBB17-4146-4B24-9E95-5CE0DF59BF35}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Client", "src\Client\Logistics.Client\Logistics.Client.csproj", "{A2272F96-50F5-40EA-88E7-15EA8EEE1022}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.HttpClient", "src\Client\Logistics.HttpClient\Logistics.HttpClient.csproj", "{A2272F96-50F5-40EA-88E7-15EA8EEE1022}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.API", "src\Server\Logistics.API\Logistics.API.csproj", "{48AA06BC-140B-49B8-AD72-95B5FC6A2D4B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Application.Admin", "src\Core\Logistics.Application.Admin\Logistics.Application.Admin.csproj", "{CEE34293-FC12-4E35-999C-EEDE063F8B25}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Application.Admin", "src\Server\Logistics.Application.Admin\Logistics.Application.Admin.csproj", "{CEE34293-FC12-4E35-999C-EEDE063F8B25}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Application.Core", "src\Core\Logistics.Application.Core\Logistics.Application.Core.csproj", "{77D09657-5BE2-4462-AE24-39612759625A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Application.Core", "src\Server\Logistics.Application.Core\Logistics.Application.Core.csproj", "{77D09657-5BE2-4462-AE24-39612759625A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.IdentityServer", "src\Server\Logistics.IdentityServer\Logistics.IdentityServer.csproj", "{CCDB0C07-4270-4253-B91A-9EB9FCDC8A05}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.DbMigrator", "src\Core\Logistics.DbMigrator\Logistics.DbMigrator.csproj", "{F40A53FD-29ED-4D8A-A2CE-E7D08FFFA54F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.DbMigrator", "src\Server\Logistics.DbMigrator\Logistics.DbMigrator.csproj", "{F40A53FD-29ED-4D8A-A2CE-E7D08FFFA54F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Application.Admin.Tests", "test\Logistics.Application.Admin.Tests\Logistics.Application.Admin.Tests.csproj", "{566AE1D3-A3AE-40CC-A781-95B342E6CD88}" EndProject @@ -41,7 +39,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Shared.Models", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Shared.Consts", "src\Shared\Logistics.Shared.Consts\Logistics.Shared.Consts.csproj", "{EF45EFF1-E88C-4EB7-9505-C1A26377E118}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Mappings", "src\Core\Logistics.Mappings\Logistics.Mappings.csproj", "{999E7EC8-AE07-4FD9-8BF2-A1B92C7122F2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Mappings", "src\Server\Logistics.Mappings\Logistics.Mappings.csproj", "{999E7EC8-AE07-4FD9-8BF2-A1B92C7122F2}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.AdminApp", "src\Client\Logistics.AdminApp\Logistics.AdminApp.csproj", "{81DAEA98-B520-4F4A-9FDF-FA378A7D6579}" EndProject @@ -263,22 +261,22 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {E92A6E55-158F-48CE-9774-6E81DB77F81C} = {45FFBEC0-FFF0-4964-A506-F326A76702CC} - {53B069CE-0FEB-4191-B82D-BCE01159AE90} = {45FFBEC0-FFF0-4964-A506-F326A76702CC} - {0646E83A-CB9F-458A-BD84-8F2AE768CB91} = {45FFBEC0-FFF0-4964-A506-F326A76702CC} {A2272F96-50F5-40EA-88E7-15EA8EEE1022} = {61325513-BB52-47A8-AFDD-755454AD71F8} {48AA06BC-140B-49B8-AD72-95B5FC6A2D4B} = {F47DBB17-4146-4B24-9E95-5CE0DF59BF35} - {CEE34293-FC12-4E35-999C-EEDE063F8B25} = {45FFBEC0-FFF0-4964-A506-F326A76702CC} - {77D09657-5BE2-4462-AE24-39612759625A} = {45FFBEC0-FFF0-4964-A506-F326A76702CC} {CCDB0C07-4270-4253-B91A-9EB9FCDC8A05} = {F47DBB17-4146-4B24-9E95-5CE0DF59BF35} - {F40A53FD-29ED-4D8A-A2CE-E7D08FFFA54F} = {45FFBEC0-FFF0-4964-A506-F326A76702CC} {566AE1D3-A3AE-40CC-A781-95B342E6CD88} = {7B06ED10-5DDF-4EFB-9CD7-37B9415EDD3D} {920DFC2D-23C4-4662-BE89-1784DB7DC72F} = {61325513-BB52-47A8-AFDD-755454AD71F8} {1DBE287E-B5F8-4213-BF68-B7932AE641F6} = {D5694866-E7F1-4837-90DA-06CC062C35D4} {01EAEDA9-AD0A-457E-AACC-33F4B4EC27CC} = {D5694866-E7F1-4837-90DA-06CC062C35D4} {EF45EFF1-E88C-4EB7-9505-C1A26377E118} = {D5694866-E7F1-4837-90DA-06CC062C35D4} - {999E7EC8-AE07-4FD9-8BF2-A1B92C7122F2} = {45FFBEC0-FFF0-4964-A506-F326A76702CC} {81DAEA98-B520-4F4A-9FDF-FA378A7D6579} = {61325513-BB52-47A8-AFDD-755454AD71F8} + {CEE34293-FC12-4E35-999C-EEDE063F8B25} = {F47DBB17-4146-4B24-9E95-5CE0DF59BF35} + {77D09657-5BE2-4462-AE24-39612759625A} = {F47DBB17-4146-4B24-9E95-5CE0DF59BF35} + {53B069CE-0FEB-4191-B82D-BCE01159AE90} = {F47DBB17-4146-4B24-9E95-5CE0DF59BF35} + {F40A53FD-29ED-4D8A-A2CE-E7D08FFFA54F} = {F47DBB17-4146-4B24-9E95-5CE0DF59BF35} + {E92A6E55-158F-48CE-9774-6E81DB77F81C} = {F47DBB17-4146-4B24-9E95-5CE0DF59BF35} + {0646E83A-CB9F-458A-BD84-8F2AE768CB91} = {F47DBB17-4146-4B24-9E95-5CE0DF59BF35} + {999E7EC8-AE07-4FD9-8BF2-A1B92C7122F2} = {F47DBB17-4146-4B24-9E95-5CE0DF59BF35} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C75A7F7A-4BBD-445A-9FCC-B0D18AAA404B} diff --git a/scripts/add-migration.bat b/scripts/add-migration.cmd similarity index 94% rename from scripts/add-migration.bat rename to scripts/add-migration.cmd index 29c73a503..ccda90e3f 100644 --- a/scripts/add-migration.bat +++ b/scripts/add-migration.cmd @@ -1,6 +1,6 @@ @echo off title Create Migrations -cd ../src/Core/Logistics.Infrastructure.EF +cd ../src/Server/Logistics.Infrastructure.EF call :CreateMigration "master database" "MasterDbContext" "Master" call :CreateMigration "tenant database" "TenantDbContext" "Tenant" diff --git a/scripts/run-adminapp.bat b/scripts/run-adminapp.cmd similarity index 100% rename from scripts/run-adminapp.bat rename to scripts/run-adminapp.cmd diff --git a/scripts/run-api.bat b/scripts/run-api.cmd similarity index 100% rename from scripts/run-api.bat rename to scripts/run-api.cmd diff --git a/scripts/run-identity.bat b/scripts/run-identity.cmd similarity index 100% rename from scripts/run-identity.bat rename to scripts/run-identity.cmd diff --git a/scripts/run-officeapp.bat b/scripts/run-officeapp.cmd similarity index 100% rename from scripts/run-officeapp.bat rename to scripts/run-officeapp.cmd diff --git a/scripts/seed-databases.bat b/scripts/seed-databases.bat deleted file mode 100644 index a4290e555..000000000 --- a/scripts/seed-databases.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off -title Seed Databases -dotnet run --project ../src/Core/Logistics.DbMigrator diff --git a/scripts/seed-databases.cmd b/scripts/seed-databases.cmd new file mode 100644 index 000000000..784907653 --- /dev/null +++ b/scripts/seed-databases.cmd @@ -0,0 +1,3 @@ +@echo off +title Seed Databases +dotnet run --project ../src/Server/Logistics.DbMigrator diff --git a/src/Client/Logistics.AdminApp/Components/Pages/PageBase.cs b/src/Client/Logistics.AdminApp/Components/Pages/PageBase.cs index b0d1b3e8e..772e308fb 100644 --- a/src/Client/Logistics.AdminApp/Components/Pages/PageBase.cs +++ b/src/Client/Logistics.AdminApp/Components/Pages/PageBase.cs @@ -1,4 +1,4 @@ -using Logistics.Client; +using Logistics.HttpClient; using Logistics.Shared; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.WebAssembly.Authentication; diff --git a/src/Client/Logistics.AdminApp/Components/Pages/Subscription/EditSubscription.razor.cs b/src/Client/Logistics.AdminApp/Components/Pages/Subscription/EditSubscription.razor.cs index c16f12623..77f6c50c1 100644 --- a/src/Client/Logistics.AdminApp/Components/Pages/Subscription/EditSubscription.razor.cs +++ b/src/Client/Logistics.AdminApp/Components/Pages/Subscription/EditSubscription.razor.cs @@ -1,4 +1,4 @@ -using Logistics.Client.Models; +using Logistics.HttpClient.Models; using Logistics.Shared; using Logistics.Shared.Consts; using Logistics.Shared.Models; diff --git a/src/Client/Logistics.AdminApp/Components/Pages/Subscription/EditSubscriptionPlan.razor.cs b/src/Client/Logistics.AdminApp/Components/Pages/Subscription/EditSubscriptionPlan.razor.cs index 14dec6bde..ccbf094ed 100644 --- a/src/Client/Logistics.AdminApp/Components/Pages/Subscription/EditSubscriptionPlan.razor.cs +++ b/src/Client/Logistics.AdminApp/Components/Pages/Subscription/EditSubscriptionPlan.razor.cs @@ -1,4 +1,4 @@ -using Logistics.Client.Models; +using Logistics.HttpClient.Models; using Logistics.Shared.Models; using Microsoft.AspNetCore.Components; diff --git a/src/Client/Logistics.AdminApp/Components/Pages/Tenant/EditTenant.razor.cs b/src/Client/Logistics.AdminApp/Components/Pages/Tenant/EditTenant.razor.cs index 675c97880..ac632e132 100644 --- a/src/Client/Logistics.AdminApp/Components/Pages/Tenant/EditTenant.razor.cs +++ b/src/Client/Logistics.AdminApp/Components/Pages/Tenant/EditTenant.razor.cs @@ -1,4 +1,4 @@ -using Logistics.Client.Models; +using Logistics.HttpClient.Models; using Logistics.Shared.Consts.Policies; using Logistics.Shared.Models; using Microsoft.AspNetCore.Authorization; diff --git a/src/Client/Logistics.AdminApp/Logistics.AdminApp.csproj b/src/Client/Logistics.AdminApp/Logistics.AdminApp.csproj index 0974713b1..9db4cc830 100644 --- a/src/Client/Logistics.AdminApp/Logistics.AdminApp.csproj +++ b/src/Client/Logistics.AdminApp/Logistics.AdminApp.csproj @@ -15,6 +15,6 @@ - + diff --git a/src/Client/Logistics.AdminApp/Program.cs b/src/Client/Logistics.AdminApp/Program.cs index 9c0d2520d..3b6d8d5d9 100644 --- a/src/Client/Logistics.AdminApp/Program.cs +++ b/src/Client/Logistics.AdminApp/Program.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using Logistics.AdminApp.Components; using Logistics.AdminApp.Authorization; -using Logistics.Client; +using Logistics.HttpClient; using Microsoft.AspNetCore.Authorization; using Radzen; @@ -10,7 +10,7 @@ builder.RootComponents.Add("#app"); builder.RootComponents.Add("head::after"); -builder.Services.AddWebApiClient(builder.Configuration); +builder.Services.AddApiHttpClient(builder.Configuration); builder.Services.AddAuthorizationCore(); builder.Services.AddRadzenComponents(); builder.Services.AddScoped(); diff --git a/src/Client/Logistics.DriverApp/Logistics.DriverApp.csproj b/src/Client/Logistics.DriverApp/Logistics.DriverApp.csproj index de2672e56..ad2e92a00 100644 --- a/src/Client/Logistics.DriverApp/Logistics.DriverApp.csproj +++ b/src/Client/Logistics.DriverApp/Logistics.DriverApp.csproj @@ -75,7 +75,7 @@ - + diff --git a/src/Client/Logistics.DriverApp/Services/Authentication/AuthService.cs b/src/Client/Logistics.DriverApp/Services/Authentication/AuthService.cs index fb051787f..aed379df9 100644 --- a/src/Client/Logistics.DriverApp/Services/Authentication/AuthService.cs +++ b/src/Client/Logistics.DriverApp/Services/Authentication/AuthService.cs @@ -19,7 +19,7 @@ public class AuthService : IAuthService ITokenStorage tokenStorage) { #if DEBUG - options.HttpClientFactory = (_) => new HttpClient(InsecureHttpsClient.GetPlatformMessageHandler()); + options.HttpClientFactory = (_) => new System.Net.Http.HttpClient(InsecureHttpsClient.GetPlatformMessageHandler()); #endif _oidcClient = new OidcClient(options); _oidcClient.Options.Browser = browser; diff --git a/src/Client/Logistics.DriverApp/Services/LocationTracking/LocationTracker.cs b/src/Client/Logistics.DriverApp/Services/LocationTracking/LocationTracker.cs index 0847cd707..4385359dc 100644 --- a/src/Client/Logistics.DriverApp/Services/LocationTracking/LocationTracker.cs +++ b/src/Client/Logistics.DriverApp/Services/LocationTracking/LocationTracker.cs @@ -1,4 +1,4 @@ -using Logistics.Client.Options; +using Logistics.HttpClient.Options; using Logistics.DriverApp.Services.Authentication; using Logistics.Shared.Models; using Microsoft.AspNetCore.SignalR.Client; diff --git a/src/Client/Logistics.DriverApp/Setup.cs b/src/Client/Logistics.DriverApp/Setup.cs index eb07db9da..53875871a 100644 --- a/src/Client/Logistics.DriverApp/Setup.cs +++ b/src/Client/Logistics.DriverApp/Setup.cs @@ -26,7 +26,7 @@ public static MauiAppBuilder ConfigureServices(this MauiAppBuilder builder) ?? throw new NullReferenceException("Could not get OidcClient form the appsettings.json file"); services.AddSingleton(oidcOptions); - services.AddWebApiClient(configuration); + services.AddApiHttpClient(configuration); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); diff --git a/src/Client/Logistics.DriverApp/_Imports.cs b/src/Client/Logistics.DriverApp/_Imports.cs index c42133e49..1252557a2 100644 --- a/src/Client/Logistics.DriverApp/_Imports.cs +++ b/src/Client/Logistics.DriverApp/_Imports.cs @@ -3,6 +3,6 @@ global using Logistics.DriverApp.Helpers; global using Logistics.DriverApp.Views; global using Logistics.DriverApp.ViewModels; -global using Logistics.Client; -global using Logistics.Client.Models; +global using Logistics.HttpClient; +global using Logistics.HttpClient.Models; global using Logistics.Shared; \ No newline at end of file diff --git a/src/Client/Logistics.Client/Abstractions/IApiClient.cs b/src/Client/Logistics.HttpClient/Abstractions/IApiClient.cs similarity index 79% rename from src/Client/Logistics.Client/Abstractions/IApiClient.cs rename to src/Client/Logistics.HttpClient/Abstractions/IApiClient.cs index 2b0c6c8c1..d27119eb6 100644 --- a/src/Client/Logistics.Client/Abstractions/IApiClient.cs +++ b/src/Client/Logistics.HttpClient/Abstractions/IApiClient.cs @@ -1,6 +1,6 @@ -using Logistics.Client.Abstractions; +using Logistics.HttpClient.Abstractions; -namespace Logistics.Client; +namespace Logistics.HttpClient; public interface IApiClient : ILoadApi, diff --git a/src/Client/Logistics.Client/Abstractions/IDriverApi.cs b/src/Client/Logistics.HttpClient/Abstractions/IDriverApi.cs similarity index 75% rename from src/Client/Logistics.Client/Abstractions/IDriverApi.cs rename to src/Client/Logistics.HttpClient/Abstractions/IDriverApi.cs index 4b7ab7c93..fdba0fce8 100644 --- a/src/Client/Logistics.Client/Abstractions/IDriverApi.cs +++ b/src/Client/Logistics.HttpClient/Abstractions/IDriverApi.cs @@ -1,7 +1,7 @@ -using Logistics.Client.Models; +using Logistics.HttpClient.Models; using Logistics.Shared; -namespace Logistics.Client.Abstractions; +namespace Logistics.HttpClient.Abstractions; public interface IDriverApi { diff --git a/src/Client/Logistics.Client/Abstractions/IEmployeeApi.cs b/src/Client/Logistics.HttpClient/Abstractions/IEmployeeApi.cs similarity index 83% rename from src/Client/Logistics.Client/Abstractions/IEmployeeApi.cs rename to src/Client/Logistics.HttpClient/Abstractions/IEmployeeApi.cs index 654c482ce..4c4dc3956 100644 --- a/src/Client/Logistics.Client/Abstractions/IEmployeeApi.cs +++ b/src/Client/Logistics.HttpClient/Abstractions/IEmployeeApi.cs @@ -1,8 +1,8 @@ -using Logistics.Client.Models; +using Logistics.HttpClient.Models; using Logistics.Shared; using Logistics.Shared.Models; -namespace Logistics.Client.Abstractions; +namespace Logistics.HttpClient.Abstractions; public interface IEmployeeApi { diff --git a/src/Client/Logistics.Client/Abstractions/ILoadApi.cs b/src/Client/Logistics.HttpClient/Abstractions/ILoadApi.cs similarity index 84% rename from src/Client/Logistics.Client/Abstractions/ILoadApi.cs rename to src/Client/Logistics.HttpClient/Abstractions/ILoadApi.cs index 184cbe782..7983be7eb 100644 --- a/src/Client/Logistics.Client/Abstractions/ILoadApi.cs +++ b/src/Client/Logistics.HttpClient/Abstractions/ILoadApi.cs @@ -1,8 +1,8 @@ -using Logistics.Client.Models; +using Logistics.HttpClient.Models; using Logistics.Shared; using Logistics.Shared.Models; -namespace Logistics.Client.Abstractions; +namespace Logistics.HttpClient.Abstractions; public interface ILoadApi { diff --git a/src/Client/Logistics.Client/Abstractions/IStatsApi.cs b/src/Client/Logistics.HttpClient/Abstractions/IStatsApi.cs similarity index 79% rename from src/Client/Logistics.Client/Abstractions/IStatsApi.cs rename to src/Client/Logistics.HttpClient/Abstractions/IStatsApi.cs index d4a6f3c30..3cffbf7ab 100644 --- a/src/Client/Logistics.Client/Abstractions/IStatsApi.cs +++ b/src/Client/Logistics.HttpClient/Abstractions/IStatsApi.cs @@ -1,8 +1,8 @@ -using Logistics.Client.Models; +using Logistics.HttpClient.Models; using Logistics.Shared; using Logistics.Shared.Models; -namespace Logistics.Client.Abstractions; +namespace Logistics.HttpClient.Abstractions; public interface IStatsApi { diff --git a/src/Client/Logistics.Client/Abstractions/ISubscriptionApi.cs b/src/Client/Logistics.HttpClient/Abstractions/ISubscriptionApi.cs similarity index 90% rename from src/Client/Logistics.Client/Abstractions/ISubscriptionApi.cs rename to src/Client/Logistics.HttpClient/Abstractions/ISubscriptionApi.cs index 82ac40f98..4c3bff38f 100644 --- a/src/Client/Logistics.Client/Abstractions/ISubscriptionApi.cs +++ b/src/Client/Logistics.HttpClient/Abstractions/ISubscriptionApi.cs @@ -1,8 +1,8 @@ -using Logistics.Client.Models; +using Logistics.HttpClient.Models; using Logistics.Shared; using Logistics.Shared.Models; -namespace Logistics.Client.Abstractions; +namespace Logistics.HttpClient.Abstractions; public interface ISubscriptionApi { diff --git a/src/Client/Logistics.Client/Abstractions/ITenantApi.cs b/src/Client/Logistics.HttpClient/Abstractions/ITenantApi.cs similarity index 82% rename from src/Client/Logistics.Client/Abstractions/ITenantApi.cs rename to src/Client/Logistics.HttpClient/Abstractions/ITenantApi.cs index 9fde0bff4..0da7a59b9 100644 --- a/src/Client/Logistics.Client/Abstractions/ITenantApi.cs +++ b/src/Client/Logistics.HttpClient/Abstractions/ITenantApi.cs @@ -1,8 +1,8 @@ -using Logistics.Client.Models; +using Logistics.HttpClient.Models; using Logistics.Shared; using Logistics.Shared.Models; -namespace Logistics.Client.Abstractions; +namespace Logistics.HttpClient.Abstractions; public interface ITenantApi { diff --git a/src/Client/Logistics.Client/Abstractions/ITruckApi.cs b/src/Client/Logistics.HttpClient/Abstractions/ITruckApi.cs similarity index 83% rename from src/Client/Logistics.Client/Abstractions/ITruckApi.cs rename to src/Client/Logistics.HttpClient/Abstractions/ITruckApi.cs index f906be6c3..4e5d73e8a 100644 --- a/src/Client/Logistics.Client/Abstractions/ITruckApi.cs +++ b/src/Client/Logistics.HttpClient/Abstractions/ITruckApi.cs @@ -1,8 +1,8 @@ -using Logistics.Client.Models; +using Logistics.HttpClient.Models; using Logistics.Shared; using Logistics.Shared.Models; -namespace Logistics.Client.Abstractions; +namespace Logistics.HttpClient.Abstractions; public interface ITruckApi { diff --git a/src/Client/Logistics.Client/Abstractions/IUserApi.cs b/src/Client/Logistics.HttpClient/Abstractions/IUserApi.cs similarity index 80% rename from src/Client/Logistics.Client/Abstractions/IUserApi.cs rename to src/Client/Logistics.HttpClient/Abstractions/IUserApi.cs index cf3d63b92..a9692c252 100644 --- a/src/Client/Logistics.Client/Abstractions/IUserApi.cs +++ b/src/Client/Logistics.HttpClient/Abstractions/IUserApi.cs @@ -1,8 +1,8 @@ -using Logistics.Client.Models; +using Logistics.HttpClient.Models; using Logistics.Shared; using Logistics.Shared.Models; -namespace Logistics.Client.Abstractions; +namespace Logistics.HttpClient.Abstractions; public interface IUserApi { diff --git a/src/Client/Logistics.Client/Constants/LoadConsts.cs b/src/Client/Logistics.HttpClient/Constants/LoadConsts.cs similarity index 82% rename from src/Client/Logistics.Client/Constants/LoadConsts.cs rename to src/Client/Logistics.HttpClient/Constants/LoadConsts.cs index 5b39a8a23..35961e617 100644 --- a/src/Client/Logistics.Client/Constants/LoadConsts.cs +++ b/src/Client/Logistics.HttpClient/Constants/LoadConsts.cs @@ -1,4 +1,4 @@ -namespace Logistics.Client.Constants; +namespace Logistics.HttpClient.Constants; internal static class LoadConsts { diff --git a/src/Client/Logistics.Client/Constants/TenantConsts.cs b/src/Client/Logistics.HttpClient/Constants/TenantConsts.cs similarity index 79% rename from src/Client/Logistics.Client/Constants/TenantConsts.cs rename to src/Client/Logistics.HttpClient/Constants/TenantConsts.cs index d7c7e3f00..ed99284c2 100644 --- a/src/Client/Logistics.Client/Constants/TenantConsts.cs +++ b/src/Client/Logistics.HttpClient/Constants/TenantConsts.cs @@ -1,4 +1,4 @@ -namespace Logistics.Client.Constants; +namespace Logistics.HttpClient.Constants; internal static class TenantConsts { diff --git a/src/Client/Logistics.Client/Exceptions/ApiException.cs b/src/Client/Logistics.HttpClient/Exceptions/ApiException.cs similarity index 83% rename from src/Client/Logistics.Client/Exceptions/ApiException.cs rename to src/Client/Logistics.HttpClient/Exceptions/ApiException.cs index 6d006b7dd..d2d9b8efa 100644 --- a/src/Client/Logistics.Client/Exceptions/ApiException.cs +++ b/src/Client/Logistics.HttpClient/Exceptions/ApiException.cs @@ -1,4 +1,4 @@ -namespace Logistics.Client.Exceptions; +namespace Logistics.HttpClient.Exceptions; [Serializable] public class ApiException : Exception diff --git a/src/Client/Logistics.Client/Exceptions/ErrorData.cs b/src/Client/Logistics.HttpClient/Exceptions/ErrorData.cs similarity index 60% rename from src/Client/Logistics.Client/Exceptions/ErrorData.cs rename to src/Client/Logistics.HttpClient/Exceptions/ErrorData.cs index b5e5d866a..f733e778c 100644 --- a/src/Client/Logistics.Client/Exceptions/ErrorData.cs +++ b/src/Client/Logistics.HttpClient/Exceptions/ErrorData.cs @@ -1,4 +1,4 @@ -namespace Logistics.Client.Exceptions; +namespace Logistics.HttpClient.Exceptions; internal class ErrorData { diff --git a/src/Client/Logistics.Client/Implementations/ApiClient.cs b/src/Client/Logistics.HttpClient/Implementations/ApiClient.cs similarity index 98% rename from src/Client/Logistics.Client/Implementations/ApiClient.cs rename to src/Client/Logistics.HttpClient/Implementations/ApiClient.cs index 3062ccb1a..ae5d93cc6 100644 --- a/src/Client/Logistics.Client/Implementations/ApiClient.cs +++ b/src/Client/Logistics.HttpClient/Implementations/ApiClient.cs @@ -1,11 +1,11 @@ using System.IdentityModel.Tokens.Jwt; -using Logistics.Client.Exceptions; -using Logistics.Client.Models; using Logistics.Shared.Models; -using Logistics.Client.Options; +using Logistics.HttpClient.Exceptions; +using Logistics.HttpClient.Models; +using Logistics.HttpClient.Options; using Logistics.Shared; -namespace Logistics.Client.Implementations; +namespace Logistics.HttpClient.Implementations; internal class ApiClient : GenericApiClient, IApiClient { diff --git a/src/Client/Logistics.Client/Implementations/GenericApiClient.cs b/src/Client/Logistics.HttpClient/Implementations/GenericApiClient.cs similarity index 94% rename from src/Client/Logistics.Client/Implementations/GenericApiClient.cs rename to src/Client/Logistics.HttpClient/Implementations/GenericApiClient.cs index 4bc108b57..9f748fd27 100644 --- a/src/Client/Logistics.Client/Implementations/GenericApiClient.cs +++ b/src/Client/Logistics.HttpClient/Implementations/GenericApiClient.cs @@ -2,14 +2,14 @@ using System.Net.Http.Headers; using System.Text; using System.Text.Json; -using Logistics.Client.Exceptions; -using Logistics.Client.Utils; +using Logistics.HttpClient.Exceptions; +using Logistics.HttpClient.Utils; -namespace Logistics.Client.Implementations; +namespace Logistics.HttpClient.Implementations; internal class GenericApiClient { - private readonly HttpClient _httpClient; + private readonly System.Net.Http.HttpClient _httpClient; private readonly JsonSerializerOptions _serializerOptions; public GenericApiClient(string host) @@ -30,11 +30,11 @@ public GenericApiClient(string host) ServerCertificateCustomValidationCallback = (_, _, _, _) => true }; - _httpClient = new HttpClient(handler) { BaseAddress = new Uri(host) }; + _httpClient = new System.Net.Http.HttpClient(handler) { BaseAddress = new Uri(host) }; } catch (PlatformNotSupportedException) { - _httpClient = new HttpClient { BaseAddress = new Uri(host) }; + _httpClient = new System.Net.Http.HttpClient { BaseAddress = new Uri(host) }; } } diff --git a/src/Client/Logistics.Client/Logistics.Client.csproj b/src/Client/Logistics.HttpClient/Logistics.HttpClient.csproj similarity index 100% rename from src/Client/Logistics.Client/Logistics.Client.csproj rename to src/Client/Logistics.HttpClient/Logistics.HttpClient.csproj diff --git a/src/Client/Logistics.Client/Models/ConfirmLoadStatus.cs b/src/Client/Logistics.HttpClient/Models/ConfirmLoadStatus.cs similarity index 83% rename from src/Client/Logistics.Client/Models/ConfirmLoadStatus.cs rename to src/Client/Logistics.HttpClient/Models/ConfirmLoadStatus.cs index 6324a3a5e..73b8bd125 100644 --- a/src/Client/Logistics.Client/Models/ConfirmLoadStatus.cs +++ b/src/Client/Logistics.HttpClient/Models/ConfirmLoadStatus.cs @@ -1,6 +1,6 @@ using Logistics.Shared.Consts; -namespace Logistics.Client.Models; +namespace Logistics.HttpClient.Models; public class ConfirmLoadStatus { diff --git a/src/Client/Logistics.Client/Models/CreateEmployee.cs b/src/Client/Logistics.HttpClient/Models/CreateEmployee.cs similarity index 72% rename from src/Client/Logistics.Client/Models/CreateEmployee.cs rename to src/Client/Logistics.HttpClient/Models/CreateEmployee.cs index 202360d58..e22189bda 100644 --- a/src/Client/Logistics.Client/Models/CreateEmployee.cs +++ b/src/Client/Logistics.HttpClient/Models/CreateEmployee.cs @@ -1,4 +1,4 @@ -namespace Logistics.Client.Models; +namespace Logistics.HttpClient.Models; public record CreateEmployee { diff --git a/src/Client/Logistics.Client/Models/CreateLoad.cs b/src/Client/Logistics.HttpClient/Models/CreateLoad.cs similarity index 88% rename from src/Client/Logistics.Client/Models/CreateLoad.cs rename to src/Client/Logistics.HttpClient/Models/CreateLoad.cs index 01ac0f209..38afe98c7 100644 --- a/src/Client/Logistics.Client/Models/CreateLoad.cs +++ b/src/Client/Logistics.HttpClient/Models/CreateLoad.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; -using Logistics.Client.Constants; +using Logistics.HttpClient.Constants; -namespace Logistics.Client.Models; +namespace Logistics.HttpClient.Models; public record CreateLoad { diff --git a/src/Client/Logistics.Client/Models/CreateSubscription.cs b/src/Client/Logistics.HttpClient/Models/CreateSubscription.cs similarity index 84% rename from src/Client/Logistics.Client/Models/CreateSubscription.cs rename to src/Client/Logistics.HttpClient/Models/CreateSubscription.cs index 2ad4c9e8c..8e3f082b4 100644 --- a/src/Client/Logistics.Client/Models/CreateSubscription.cs +++ b/src/Client/Logistics.HttpClient/Models/CreateSubscription.cs @@ -1,6 +1,6 @@ using Logistics.Shared.Consts; -namespace Logistics.Client.Models; +namespace Logistics.HttpClient.Models; public class CreateSubscription { diff --git a/src/Client/Logistics.Client/Models/CreateSubscriptionPlan.cs b/src/Client/Logistics.HttpClient/Models/CreateSubscriptionPlan.cs similarity index 79% rename from src/Client/Logistics.Client/Models/CreateSubscriptionPlan.cs rename to src/Client/Logistics.HttpClient/Models/CreateSubscriptionPlan.cs index e78469794..f080f1e5d 100644 --- a/src/Client/Logistics.Client/Models/CreateSubscriptionPlan.cs +++ b/src/Client/Logistics.HttpClient/Models/CreateSubscriptionPlan.cs @@ -1,4 +1,4 @@ -namespace Logistics.Client.Models; +namespace Logistics.HttpClient.Models; public class CreateSubscriptionPlan { diff --git a/src/Client/Logistics.Client/Models/CreateTenant.cs b/src/Client/Logistics.HttpClient/Models/CreateTenant.cs similarity index 77% rename from src/Client/Logistics.Client/Models/CreateTenant.cs rename to src/Client/Logistics.HttpClient/Models/CreateTenant.cs index eb35c10ab..78fa6330c 100644 --- a/src/Client/Logistics.Client/Models/CreateTenant.cs +++ b/src/Client/Logistics.HttpClient/Models/CreateTenant.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; -using Logistics.Client.Constants; +using Logistics.HttpClient.Constants; -namespace Logistics.Client.Models; +namespace Logistics.HttpClient.Models; public record CreateTenant { diff --git a/src/Client/Logistics.Client/Models/CreateTruck.cs b/src/Client/Logistics.HttpClient/Models/CreateTruck.cs similarity index 83% rename from src/Client/Logistics.Client/Models/CreateTruck.cs rename to src/Client/Logistics.HttpClient/Models/CreateTruck.cs index ec04bfc90..13381e3ca 100644 --- a/src/Client/Logistics.Client/Models/CreateTruck.cs +++ b/src/Client/Logistics.HttpClient/Models/CreateTruck.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Logistics.Client.Models; +namespace Logistics.HttpClient.Models; public record CreateTruck { diff --git a/src/Client/Logistics.Client/Models/GetDailyGrossesQuery.cs b/src/Client/Logistics.HttpClient/Models/GetDailyGrossesQuery.cs similarity index 92% rename from src/Client/Logistics.Client/Models/GetDailyGrossesQuery.cs rename to src/Client/Logistics.HttpClient/Models/GetDailyGrossesQuery.cs index 442159906..fbba419ed 100644 --- a/src/Client/Logistics.Client/Models/GetDailyGrossesQuery.cs +++ b/src/Client/Logistics.HttpClient/Models/GetDailyGrossesQuery.cs @@ -1,4 +1,4 @@ -namespace Logistics.Client.Models; +namespace Logistics.HttpClient.Models; public class GetDailyGrossesQuery : IntervalQuery { diff --git a/src/Client/Logistics.Client/Models/GetLoadsQuery.cs b/src/Client/Logistics.HttpClient/Models/GetLoadsQuery.cs similarity index 96% rename from src/Client/Logistics.Client/Models/GetLoadsQuery.cs rename to src/Client/Logistics.HttpClient/Models/GetLoadsQuery.cs index 5a080c80a..0348ae505 100644 --- a/src/Client/Logistics.Client/Models/GetLoadsQuery.cs +++ b/src/Client/Logistics.HttpClient/Models/GetLoadsQuery.cs @@ -1,7 +1,7 @@ using System.Globalization; using Logistics.Shared; -namespace Logistics.Client.Models; +namespace Logistics.HttpClient.Models; public class GetLoadsQuery : SearchableQuery { diff --git a/src/Client/Logistics.Client/Models/GetMonthlyGrossesQuery.cs b/src/Client/Logistics.HttpClient/Models/GetMonthlyGrossesQuery.cs similarity index 62% rename from src/Client/Logistics.Client/Models/GetMonthlyGrossesQuery.cs rename to src/Client/Logistics.HttpClient/Models/GetMonthlyGrossesQuery.cs index 68d687969..6db650e9d 100644 --- a/src/Client/Logistics.Client/Models/GetMonthlyGrossesQuery.cs +++ b/src/Client/Logistics.HttpClient/Models/GetMonthlyGrossesQuery.cs @@ -1,4 +1,4 @@ -namespace Logistics.Client.Models; +namespace Logistics.HttpClient.Models; public class GetMonthlyGrossesQuery : GetDailyGrossesQuery { diff --git a/src/Client/Logistics.Client/Models/GetTruckQuery.cs b/src/Client/Logistics.HttpClient/Models/GetTruckQuery.cs similarity index 93% rename from src/Client/Logistics.Client/Models/GetTruckQuery.cs rename to src/Client/Logistics.HttpClient/Models/GetTruckQuery.cs index 2e828fc24..1bc612ead 100644 --- a/src/Client/Logistics.Client/Models/GetTruckQuery.cs +++ b/src/Client/Logistics.HttpClient/Models/GetTruckQuery.cs @@ -1,4 +1,4 @@ -namespace Logistics.Client.Models; +namespace Logistics.HttpClient.Models; public class GetTruckQuery { diff --git a/src/Client/Logistics.Client/Models/IntervalQuery.cs b/src/Client/Logistics.HttpClient/Models/IntervalQuery.cs similarity index 92% rename from src/Client/Logistics.Client/Models/IntervalQuery.cs rename to src/Client/Logistics.HttpClient/Models/IntervalQuery.cs index 0ed967577..c1fb4dd67 100644 --- a/src/Client/Logistics.Client/Models/IntervalQuery.cs +++ b/src/Client/Logistics.HttpClient/Models/IntervalQuery.cs @@ -1,6 +1,6 @@ using System.Globalization; -namespace Logistics.Client.Models; +namespace Logistics.HttpClient.Models; public abstract class IntervalQuery { diff --git a/src/Client/Logistics.Client/Models/SetDeviceToken.cs b/src/Client/Logistics.HttpClient/Models/SetDeviceToken.cs similarity index 73% rename from src/Client/Logistics.Client/Models/SetDeviceToken.cs rename to src/Client/Logistics.HttpClient/Models/SetDeviceToken.cs index 8b1966fbb..388a78068 100644 --- a/src/Client/Logistics.Client/Models/SetDeviceToken.cs +++ b/src/Client/Logistics.HttpClient/Models/SetDeviceToken.cs @@ -1,4 +1,4 @@ -namespace Logistics.Client.Models; +namespace Logistics.HttpClient.Models; public class SetDeviceToken { diff --git a/src/Client/Logistics.Client/Models/UpdateEmployee.cs b/src/Client/Logistics.HttpClient/Models/UpdateEmployee.cs similarity index 54% rename from src/Client/Logistics.Client/Models/UpdateEmployee.cs rename to src/Client/Logistics.HttpClient/Models/UpdateEmployee.cs index e7ccf95a5..49ebaf3ea 100644 --- a/src/Client/Logistics.Client/Models/UpdateEmployee.cs +++ b/src/Client/Logistics.HttpClient/Models/UpdateEmployee.cs @@ -1,4 +1,4 @@ -namespace Logistics.Client.Models; +namespace Logistics.HttpClient.Models; public record UpdateEmployee : CreateEmployee { diff --git a/src/Client/Logistics.Client/Models/UpdateLoad.cs b/src/Client/Logistics.HttpClient/Models/UpdateLoad.cs similarity index 92% rename from src/Client/Logistics.Client/Models/UpdateLoad.cs rename to src/Client/Logistics.HttpClient/Models/UpdateLoad.cs index fd0f014ea..4a655f53a 100644 --- a/src/Client/Logistics.Client/Models/UpdateLoad.cs +++ b/src/Client/Logistics.HttpClient/Models/UpdateLoad.cs @@ -1,6 +1,6 @@ using Logistics.Shared.Consts; -namespace Logistics.Client.Models; +namespace Logistics.HttpClient.Models; public record UpdateLoad { diff --git a/src/Client/Logistics.Client/Models/UpdateLoadProximity.cs b/src/Client/Logistics.HttpClient/Models/UpdateLoadProximity.cs similarity index 80% rename from src/Client/Logistics.Client/Models/UpdateLoadProximity.cs rename to src/Client/Logistics.HttpClient/Models/UpdateLoadProximity.cs index 09c128852..f2399dabf 100644 --- a/src/Client/Logistics.Client/Models/UpdateLoadProximity.cs +++ b/src/Client/Logistics.HttpClient/Models/UpdateLoadProximity.cs @@ -1,4 +1,4 @@ -namespace Logistics.Client.Models; +namespace Logistics.HttpClient.Models; public class UpdateLoadProximity { diff --git a/src/Client/Logistics.Client/Models/UpdateSubscription.cs b/src/Client/Logistics.HttpClient/Models/UpdateSubscription.cs similarity index 86% rename from src/Client/Logistics.Client/Models/UpdateSubscription.cs rename to src/Client/Logistics.HttpClient/Models/UpdateSubscription.cs index e843cc6b6..3e33830e9 100644 --- a/src/Client/Logistics.Client/Models/UpdateSubscription.cs +++ b/src/Client/Logistics.HttpClient/Models/UpdateSubscription.cs @@ -1,6 +1,6 @@ using Logistics.Shared.Consts; -namespace Logistics.Client.Models; +namespace Logistics.HttpClient.Models; public class UpdateSubscription { diff --git a/src/Client/Logistics.Client/Models/UpdateSubscriptionPlan.cs b/src/Client/Logistics.HttpClient/Models/UpdateSubscriptionPlan.cs similarity index 82% rename from src/Client/Logistics.Client/Models/UpdateSubscriptionPlan.cs rename to src/Client/Logistics.HttpClient/Models/UpdateSubscriptionPlan.cs index 8a64d6750..a91ef604d 100644 --- a/src/Client/Logistics.Client/Models/UpdateSubscriptionPlan.cs +++ b/src/Client/Logistics.HttpClient/Models/UpdateSubscriptionPlan.cs @@ -1,4 +1,4 @@ -namespace Logistics.Client.Models; +namespace Logistics.HttpClient.Models; public class UpdateSubscriptionPlan { diff --git a/src/Client/Logistics.Client/Models/UpdateTenant.cs b/src/Client/Logistics.HttpClient/Models/UpdateTenant.cs similarity index 79% rename from src/Client/Logistics.Client/Models/UpdateTenant.cs rename to src/Client/Logistics.HttpClient/Models/UpdateTenant.cs index 9288797d6..dc2402f0e 100644 --- a/src/Client/Logistics.Client/Models/UpdateTenant.cs +++ b/src/Client/Logistics.HttpClient/Models/UpdateTenant.cs @@ -1,4 +1,4 @@ -namespace Logistics.Client.Models; +namespace Logistics.HttpClient.Models; public record UpdateTenant { diff --git a/src/Client/Logistics.Client/Models/UpdateTruck.cs b/src/Client/Logistics.HttpClient/Models/UpdateTruck.cs similarity index 78% rename from src/Client/Logistics.Client/Models/UpdateTruck.cs rename to src/Client/Logistics.HttpClient/Models/UpdateTruck.cs index bbbba0d7f..c0fcce53b 100644 --- a/src/Client/Logistics.Client/Models/UpdateTruck.cs +++ b/src/Client/Logistics.HttpClient/Models/UpdateTruck.cs @@ -1,4 +1,4 @@ -namespace Logistics.Client.Models; +namespace Logistics.HttpClient.Models; public record UpdateTruck { diff --git a/src/Client/Logistics.Client/Models/UpdateUser.cs b/src/Client/Logistics.HttpClient/Models/UpdateUser.cs similarity index 82% rename from src/Client/Logistics.Client/Models/UpdateUser.cs rename to src/Client/Logistics.HttpClient/Models/UpdateUser.cs index 3f03c0361..db314c7e5 100644 --- a/src/Client/Logistics.Client/Models/UpdateUser.cs +++ b/src/Client/Logistics.HttpClient/Models/UpdateUser.cs @@ -1,4 +1,4 @@ -namespace Logistics.Client.Models; +namespace Logistics.HttpClient.Models; public record UpdateUser { diff --git a/src/Client/Logistics.Client/Options/ApiClientOptions.cs b/src/Client/Logistics.HttpClient/Options/ApiClientOptions.cs similarity index 73% rename from src/Client/Logistics.Client/Options/ApiClientOptions.cs rename to src/Client/Logistics.HttpClient/Options/ApiClientOptions.cs index c7539ac38..9648fd732 100644 --- a/src/Client/Logistics.Client/Options/ApiClientOptions.cs +++ b/src/Client/Logistics.HttpClient/Options/ApiClientOptions.cs @@ -1,4 +1,4 @@ -namespace Logistics.Client.Options; +namespace Logistics.HttpClient.Options; public class ApiClientOptions { diff --git a/src/Client/Logistics.Client/Registrar.cs b/src/Client/Logistics.HttpClient/Registrar.cs similarity index 67% rename from src/Client/Logistics.Client/Registrar.cs rename to src/Client/Logistics.HttpClient/Registrar.cs index 7200bc936..9337976eb 100644 --- a/src/Client/Logistics.Client/Registrar.cs +++ b/src/Client/Logistics.HttpClient/Registrar.cs @@ -1,13 +1,13 @@ -using Logistics.Client.Implementations; -using Logistics.Client.Options; +using Logistics.HttpClient.Implementations; +using Logistics.HttpClient.Options; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -namespace Logistics.Client; +namespace Logistics.HttpClient; public static class Registrar { - public static IServiceCollection AddWebApiClient( + public static IServiceCollection AddApiHttpClient( this IServiceCollection services, IConfiguration configuration, string sectionName = "ApiClient") @@ -15,22 +15,22 @@ public static class Registrar var options = configuration.GetSection(sectionName).Get(); if (options != null) { - services.AddWebApiClient(options); + services.AddApiHttpClient(options); } return services; } - public static IServiceCollection AddWebApiClient( + public static IServiceCollection AddApiHttpClient( this IServiceCollection services, Action configure) { var options = new ApiClientOptions(); configure(options); - return services.AddWebApiClient(options); + return services.AddApiHttpClient(options); } - public static IServiceCollection AddWebApiClient( + public static IServiceCollection AddApiHttpClient( this IServiceCollection services, ApiClientOptions options) { @@ -38,4 +38,4 @@ public static class Registrar services.AddScoped(); return services; } -} \ No newline at end of file +} diff --git a/src/Client/Logistics.Client/Utils/QueryUtils.cs b/src/Client/Logistics.HttpClient/Utils/QueryUtils.cs similarity index 96% rename from src/Client/Logistics.Client/Utils/QueryUtils.cs rename to src/Client/Logistics.HttpClient/Utils/QueryUtils.cs index 7906019bb..52d5cc56a 100644 --- a/src/Client/Logistics.Client/Utils/QueryUtils.cs +++ b/src/Client/Logistics.HttpClient/Utils/QueryUtils.cs @@ -1,7 +1,7 @@ using System.Text; using System.Web; -namespace Logistics.Client.Utils; +namespace Logistics.HttpClient.Utils; internal static class QueryUtils { diff --git a/src/Core/Logistics.Application.Tenant/Logistics.Application.Tenant.csproj b/src/Core/Logistics.Application.Tenant/Logistics.Application.Tenant.csproj deleted file mode 100644 index 93d294b36..000000000 --- a/src/Core/Logistics.Application.Tenant/Logistics.Application.Tenant.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - net8.0 - enable - enable - Logistics.Application.Tenant - 12 - - - - - - - - - - - - - - - diff --git a/src/Server/Logistics.API/Logistics.API.csproj b/src/Server/Logistics.API/Logistics.API.csproj index 9f07ac644..a5b1f0860 100644 --- a/src/Server/Logistics.API/Logistics.API.csproj +++ b/src/Server/Logistics.API/Logistics.API.csproj @@ -18,9 +18,9 @@ - - - + + + diff --git a/src/Core/Logistics.Application.Admin/Commands/Subscription/CreateSubscription/CreateSubscriptionCommand.cs b/src/Server/Logistics.Application.Admin/Commands/Subscription/CreateSubscription/CreateSubscriptionCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Subscription/CreateSubscription/CreateSubscriptionCommand.cs rename to src/Server/Logistics.Application.Admin/Commands/Subscription/CreateSubscription/CreateSubscriptionCommand.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Subscription/CreateSubscription/CreateSubscriptionHandler.cs b/src/Server/Logistics.Application.Admin/Commands/Subscription/CreateSubscription/CreateSubscriptionHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Subscription/CreateSubscription/CreateSubscriptionHandler.cs rename to src/Server/Logistics.Application.Admin/Commands/Subscription/CreateSubscription/CreateSubscriptionHandler.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Subscription/CreateSubscription/CreateSubscriptionValidator.cs b/src/Server/Logistics.Application.Admin/Commands/Subscription/CreateSubscription/CreateSubscriptionValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Subscription/CreateSubscription/CreateSubscriptionValidator.cs rename to src/Server/Logistics.Application.Admin/Commands/Subscription/CreateSubscription/CreateSubscriptionValidator.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Subscription/CreateSubscriptionPlan/CreateSubscriptionPlanCommand.cs b/src/Server/Logistics.Application.Admin/Commands/Subscription/CreateSubscriptionPlan/CreateSubscriptionPlanCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Subscription/CreateSubscriptionPlan/CreateSubscriptionPlanCommand.cs rename to src/Server/Logistics.Application.Admin/Commands/Subscription/CreateSubscriptionPlan/CreateSubscriptionPlanCommand.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Subscription/CreateSubscriptionPlan/CreateSubscriptionPlanHandler.cs b/src/Server/Logistics.Application.Admin/Commands/Subscription/CreateSubscriptionPlan/CreateSubscriptionPlanHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Subscription/CreateSubscriptionPlan/CreateSubscriptionPlanHandler.cs rename to src/Server/Logistics.Application.Admin/Commands/Subscription/CreateSubscriptionPlan/CreateSubscriptionPlanHandler.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Subscription/CreateSubscriptionPlan/CreateSubscriptionPlanValidator.cs b/src/Server/Logistics.Application.Admin/Commands/Subscription/CreateSubscriptionPlan/CreateSubscriptionPlanValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Subscription/CreateSubscriptionPlan/CreateSubscriptionPlanValidator.cs rename to src/Server/Logistics.Application.Admin/Commands/Subscription/CreateSubscriptionPlan/CreateSubscriptionPlanValidator.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Subscription/DeleteSubscription/DeleteSubscriptionCommand.cs b/src/Server/Logistics.Application.Admin/Commands/Subscription/DeleteSubscription/DeleteSubscriptionCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Subscription/DeleteSubscription/DeleteSubscriptionCommand.cs rename to src/Server/Logistics.Application.Admin/Commands/Subscription/DeleteSubscription/DeleteSubscriptionCommand.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Subscription/DeleteSubscription/DeleteSubscriptionHandler.cs b/src/Server/Logistics.Application.Admin/Commands/Subscription/DeleteSubscription/DeleteSubscriptionHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Subscription/DeleteSubscription/DeleteSubscriptionHandler.cs rename to src/Server/Logistics.Application.Admin/Commands/Subscription/DeleteSubscription/DeleteSubscriptionHandler.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Subscription/DeleteSubscription/DeleteSubscriptionValidator.cs b/src/Server/Logistics.Application.Admin/Commands/Subscription/DeleteSubscription/DeleteSubscriptionValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Subscription/DeleteSubscription/DeleteSubscriptionValidator.cs rename to src/Server/Logistics.Application.Admin/Commands/Subscription/DeleteSubscription/DeleteSubscriptionValidator.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Subscription/DeleteSubscriptionPlan/DeleteSubscriptionPlanCommand.cs b/src/Server/Logistics.Application.Admin/Commands/Subscription/DeleteSubscriptionPlan/DeleteSubscriptionPlanCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Subscription/DeleteSubscriptionPlan/DeleteSubscriptionPlanCommand.cs rename to src/Server/Logistics.Application.Admin/Commands/Subscription/DeleteSubscriptionPlan/DeleteSubscriptionPlanCommand.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Subscription/DeleteSubscriptionPlan/DeleteSubscriptionPlanHandler.cs b/src/Server/Logistics.Application.Admin/Commands/Subscription/DeleteSubscriptionPlan/DeleteSubscriptionPlanHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Subscription/DeleteSubscriptionPlan/DeleteSubscriptionPlanHandler.cs rename to src/Server/Logistics.Application.Admin/Commands/Subscription/DeleteSubscriptionPlan/DeleteSubscriptionPlanHandler.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Subscription/DeleteSubscriptionPlan/DeleteSubscriptionPlanValidator.cs b/src/Server/Logistics.Application.Admin/Commands/Subscription/DeleteSubscriptionPlan/DeleteSubscriptionPlanValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Subscription/DeleteSubscriptionPlan/DeleteSubscriptionPlanValidator.cs rename to src/Server/Logistics.Application.Admin/Commands/Subscription/DeleteSubscriptionPlan/DeleteSubscriptionPlanValidator.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Subscription/UpdateSubscription/UpdateSubscriptionCommand.cs b/src/Server/Logistics.Application.Admin/Commands/Subscription/UpdateSubscription/UpdateSubscriptionCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Subscription/UpdateSubscription/UpdateSubscriptionCommand.cs rename to src/Server/Logistics.Application.Admin/Commands/Subscription/UpdateSubscription/UpdateSubscriptionCommand.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Subscription/UpdateSubscription/UpdateSubscriptionHandler.cs b/src/Server/Logistics.Application.Admin/Commands/Subscription/UpdateSubscription/UpdateSubscriptionHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Subscription/UpdateSubscription/UpdateSubscriptionHandler.cs rename to src/Server/Logistics.Application.Admin/Commands/Subscription/UpdateSubscription/UpdateSubscriptionHandler.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Subscription/UpdateSubscription/UpdateSubscriptionValidator.cs b/src/Server/Logistics.Application.Admin/Commands/Subscription/UpdateSubscription/UpdateSubscriptionValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Subscription/UpdateSubscription/UpdateSubscriptionValidator.cs rename to src/Server/Logistics.Application.Admin/Commands/Subscription/UpdateSubscription/UpdateSubscriptionValidator.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Subscription/UpdateSubscriptionPlan/UpdateSubscriptionPlanCommand.cs b/src/Server/Logistics.Application.Admin/Commands/Subscription/UpdateSubscriptionPlan/UpdateSubscriptionPlanCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Subscription/UpdateSubscriptionPlan/UpdateSubscriptionPlanCommand.cs rename to src/Server/Logistics.Application.Admin/Commands/Subscription/UpdateSubscriptionPlan/UpdateSubscriptionPlanCommand.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Subscription/UpdateSubscriptionPlan/UpdateSubscriptionPlanHandler.cs b/src/Server/Logistics.Application.Admin/Commands/Subscription/UpdateSubscriptionPlan/UpdateSubscriptionPlanHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Subscription/UpdateSubscriptionPlan/UpdateSubscriptionPlanHandler.cs rename to src/Server/Logistics.Application.Admin/Commands/Subscription/UpdateSubscriptionPlan/UpdateSubscriptionPlanHandler.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Subscription/UpdateSubscriptionPlan/UpdateSubscriptionPlanValidator.cs b/src/Server/Logistics.Application.Admin/Commands/Subscription/UpdateSubscriptionPlan/UpdateSubscriptionPlanValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Subscription/UpdateSubscriptionPlan/UpdateSubscriptionPlanValidator.cs rename to src/Server/Logistics.Application.Admin/Commands/Subscription/UpdateSubscriptionPlan/UpdateSubscriptionPlanValidator.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Tenant/CreateTenant/CreateTenantCommand.cs b/src/Server/Logistics.Application.Admin/Commands/Tenant/CreateTenant/CreateTenantCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Tenant/CreateTenant/CreateTenantCommand.cs rename to src/Server/Logistics.Application.Admin/Commands/Tenant/CreateTenant/CreateTenantCommand.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Tenant/CreateTenant/CreateTenantHandler.cs b/src/Server/Logistics.Application.Admin/Commands/Tenant/CreateTenant/CreateTenantHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Tenant/CreateTenant/CreateTenantHandler.cs rename to src/Server/Logistics.Application.Admin/Commands/Tenant/CreateTenant/CreateTenantHandler.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Tenant/CreateTenant/CreateTenantValidator.cs b/src/Server/Logistics.Application.Admin/Commands/Tenant/CreateTenant/CreateTenantValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Tenant/CreateTenant/CreateTenantValidator.cs rename to src/Server/Logistics.Application.Admin/Commands/Tenant/CreateTenant/CreateTenantValidator.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Tenant/DeleteTenant/DeleteTenantCommand.cs b/src/Server/Logistics.Application.Admin/Commands/Tenant/DeleteTenant/DeleteTenantCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Tenant/DeleteTenant/DeleteTenantCommand.cs rename to src/Server/Logistics.Application.Admin/Commands/Tenant/DeleteTenant/DeleteTenantCommand.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Tenant/DeleteTenant/DeleteTenantHandler.cs b/src/Server/Logistics.Application.Admin/Commands/Tenant/DeleteTenant/DeleteTenantHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Tenant/DeleteTenant/DeleteTenantHandler.cs rename to src/Server/Logistics.Application.Admin/Commands/Tenant/DeleteTenant/DeleteTenantHandler.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Tenant/DeleteTenant/DeleteTenantValidator.cs b/src/Server/Logistics.Application.Admin/Commands/Tenant/DeleteTenant/DeleteTenantValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Tenant/DeleteTenant/DeleteTenantValidator.cs rename to src/Server/Logistics.Application.Admin/Commands/Tenant/DeleteTenant/DeleteTenantValidator.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Tenant/UpdateTenant/UpdateTenantCommand.cs b/src/Server/Logistics.Application.Admin/Commands/Tenant/UpdateTenant/UpdateTenantCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Tenant/UpdateTenant/UpdateTenantCommand.cs rename to src/Server/Logistics.Application.Admin/Commands/Tenant/UpdateTenant/UpdateTenantCommand.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Tenant/UpdateTenant/UpdateTenantHandler.cs b/src/Server/Logistics.Application.Admin/Commands/Tenant/UpdateTenant/UpdateTenantHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Tenant/UpdateTenant/UpdateTenantHandler.cs rename to src/Server/Logistics.Application.Admin/Commands/Tenant/UpdateTenant/UpdateTenantHandler.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/Tenant/UpdateTenant/UpdateTenantValidator.cs b/src/Server/Logistics.Application.Admin/Commands/Tenant/UpdateTenant/UpdateTenantValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/Tenant/UpdateTenant/UpdateTenantValidator.cs rename to src/Server/Logistics.Application.Admin/Commands/Tenant/UpdateTenant/UpdateTenantValidator.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/User/RemoveRoleFromUser/RemoveRoleFromUserCommand.cs b/src/Server/Logistics.Application.Admin/Commands/User/RemoveRoleFromUser/RemoveRoleFromUserCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/User/RemoveRoleFromUser/RemoveRoleFromUserCommand.cs rename to src/Server/Logistics.Application.Admin/Commands/User/RemoveRoleFromUser/RemoveRoleFromUserCommand.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/User/RemoveRoleFromUser/RemoveRoleFromUserHandler.cs b/src/Server/Logistics.Application.Admin/Commands/User/RemoveRoleFromUser/RemoveRoleFromUserHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/User/RemoveRoleFromUser/RemoveRoleFromUserHandler.cs rename to src/Server/Logistics.Application.Admin/Commands/User/RemoveRoleFromUser/RemoveRoleFromUserHandler.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/User/RemoveRoleFromUser/RemoveRoleFromUserValidator.cs b/src/Server/Logistics.Application.Admin/Commands/User/RemoveRoleFromUser/RemoveRoleFromUserValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/User/RemoveRoleFromUser/RemoveRoleFromUserValidator.cs rename to src/Server/Logistics.Application.Admin/Commands/User/RemoveRoleFromUser/RemoveRoleFromUserValidator.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/User/UpdateUser/UpdateUserCommand.cs b/src/Server/Logistics.Application.Admin/Commands/User/UpdateUser/UpdateUserCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/User/UpdateUser/UpdateUserCommand.cs rename to src/Server/Logistics.Application.Admin/Commands/User/UpdateUser/UpdateUserCommand.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/User/UpdateUser/UpdateUserHandler.cs b/src/Server/Logistics.Application.Admin/Commands/User/UpdateUser/UpdateUserHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/User/UpdateUser/UpdateUserHandler.cs rename to src/Server/Logistics.Application.Admin/Commands/User/UpdateUser/UpdateUserHandler.cs diff --git a/src/Core/Logistics.Application.Admin/Commands/User/UpdateUser/UpdateUserValidator.cs b/src/Server/Logistics.Application.Admin/Commands/User/UpdateUser/UpdateUserValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Commands/User/UpdateUser/UpdateUserValidator.cs rename to src/Server/Logistics.Application.Admin/Commands/User/UpdateUser/UpdateUserValidator.cs diff --git a/src/Core/Logistics.Application.Admin/Logistics.Application.Admin.csproj b/src/Server/Logistics.Application.Admin/Logistics.Application.Admin.csproj similarity index 100% rename from src/Core/Logistics.Application.Admin/Logistics.Application.Admin.csproj rename to src/Server/Logistics.Application.Admin/Logistics.Application.Admin.csproj diff --git a/src/Core/Logistics.Application.Admin/Queries/GetAppRoles/GetAppRolesHandler.cs b/src/Server/Logistics.Application.Admin/Queries/GetAppRoles/GetAppRolesHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/GetAppRoles/GetAppRolesHandler.cs rename to src/Server/Logistics.Application.Admin/Queries/GetAppRoles/GetAppRolesHandler.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/GetAppRoles/GetAppRolesQuery.cs b/src/Server/Logistics.Application.Admin/Queries/GetAppRoles/GetAppRolesQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/GetAppRoles/GetAppRolesQuery.cs rename to src/Server/Logistics.Application.Admin/Queries/GetAppRoles/GetAppRolesQuery.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/GetAppRoles/GetAppRolesValidator.cs b/src/Server/Logistics.Application.Admin/Queries/GetAppRoles/GetAppRolesValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/GetAppRoles/GetAppRolesValidator.cs rename to src/Server/Logistics.Application.Admin/Queries/GetAppRoles/GetAppRolesValidator.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscription/GetSubscriptionHandler.cs b/src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscription/GetSubscriptionHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscription/GetSubscriptionHandler.cs rename to src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscription/GetSubscriptionHandler.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscription/GetSubscriptionQuery.cs b/src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscription/GetSubscriptionQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscription/GetSubscriptionQuery.cs rename to src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscription/GetSubscriptionQuery.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscription/GetSubscriptionValidator.cs b/src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscription/GetSubscriptionValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscription/GetSubscriptionValidator.cs rename to src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscription/GetSubscriptionValidator.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlan/GetSubscriptionPlanHandler.cs b/src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlan/GetSubscriptionPlanHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlan/GetSubscriptionPlanHandler.cs rename to src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlan/GetSubscriptionPlanHandler.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlan/GetSubscriptionPlanQuery.cs b/src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlan/GetSubscriptionPlanQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlan/GetSubscriptionPlanQuery.cs rename to src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlan/GetSubscriptionPlanQuery.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlan/GetSubscriptionPlanValidator.cs b/src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlan/GetSubscriptionPlanValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlan/GetSubscriptionPlanValidator.cs rename to src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlan/GetSubscriptionPlanValidator.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlans/GetSubscriptionPlansHandler.cs b/src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlans/GetSubscriptionPlansHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlans/GetSubscriptionPlansHandler.cs rename to src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlans/GetSubscriptionPlansHandler.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlans/GetSubscriptionPlansQuery.cs b/src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlans/GetSubscriptionPlansQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlans/GetSubscriptionPlansQuery.cs rename to src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlans/GetSubscriptionPlansQuery.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlans/GetSubscriptionPlansValidator.cs b/src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlans/GetSubscriptionPlansValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlans/GetSubscriptionPlansValidator.cs rename to src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscriptionPlans/GetSubscriptionPlansValidator.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscriptions/GetSubscriptionsHandler.cs b/src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscriptions/GetSubscriptionsHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscriptions/GetSubscriptionsHandler.cs rename to src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscriptions/GetSubscriptionsHandler.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscriptions/GetSubscriptionsQuery.cs b/src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscriptions/GetSubscriptionsQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscriptions/GetSubscriptionsQuery.cs rename to src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscriptions/GetSubscriptionsQuery.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscriptions/GetSubscriptionsValidator.cs b/src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscriptions/GetSubscriptionsValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/Subscription/GetSubscriptions/GetSubscriptionsValidator.cs rename to src/Server/Logistics.Application.Admin/Queries/Subscription/GetSubscriptions/GetSubscriptionsValidator.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/Tenant/GetTenant/GetTenantHandler.cs b/src/Server/Logistics.Application.Admin/Queries/Tenant/GetTenant/GetTenantHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/Tenant/GetTenant/GetTenantHandler.cs rename to src/Server/Logistics.Application.Admin/Queries/Tenant/GetTenant/GetTenantHandler.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/Tenant/GetTenant/GetTenantQuery.cs b/src/Server/Logistics.Application.Admin/Queries/Tenant/GetTenant/GetTenantQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/Tenant/GetTenant/GetTenantQuery.cs rename to src/Server/Logistics.Application.Admin/Queries/Tenant/GetTenant/GetTenantQuery.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/Tenant/GetTenant/GetTenantValidator.cs b/src/Server/Logistics.Application.Admin/Queries/Tenant/GetTenant/GetTenantValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/Tenant/GetTenant/GetTenantValidator.cs rename to src/Server/Logistics.Application.Admin/Queries/Tenant/GetTenant/GetTenantValidator.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/Tenant/GetTenants/GetTenantsHandler.cs b/src/Server/Logistics.Application.Admin/Queries/Tenant/GetTenants/GetTenantsHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/Tenant/GetTenants/GetTenantsHandler.cs rename to src/Server/Logistics.Application.Admin/Queries/Tenant/GetTenants/GetTenantsHandler.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/Tenant/GetTenants/GetTenantsQuery.cs b/src/Server/Logistics.Application.Admin/Queries/Tenant/GetTenants/GetTenantsQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/Tenant/GetTenants/GetTenantsQuery.cs rename to src/Server/Logistics.Application.Admin/Queries/Tenant/GetTenants/GetTenantsQuery.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/Tenant/GetTenants/GetTenantsValidator.cs b/src/Server/Logistics.Application.Admin/Queries/Tenant/GetTenants/GetTenantsValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/Tenant/GetTenants/GetTenantsValidator.cs rename to src/Server/Logistics.Application.Admin/Queries/Tenant/GetTenants/GetTenantsValidator.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/User/GetUserById/GetUserByIdHandler.cs b/src/Server/Logistics.Application.Admin/Queries/User/GetUserById/GetUserByIdHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/User/GetUserById/GetUserByIdHandler.cs rename to src/Server/Logistics.Application.Admin/Queries/User/GetUserById/GetUserByIdHandler.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/User/GetUserById/GetUserByIdQuery.cs b/src/Server/Logistics.Application.Admin/Queries/User/GetUserById/GetUserByIdQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/User/GetUserById/GetUserByIdQuery.cs rename to src/Server/Logistics.Application.Admin/Queries/User/GetUserById/GetUserByIdQuery.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/User/GetUserById/GetUserByIdValidator.cs b/src/Server/Logistics.Application.Admin/Queries/User/GetUserById/GetUserByIdValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/User/GetUserById/GetUserByIdValidator.cs rename to src/Server/Logistics.Application.Admin/Queries/User/GetUserById/GetUserByIdValidator.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/User/GetUserJoinedOrganizations/GetUserJoinedOrganizationsHandler.cs b/src/Server/Logistics.Application.Admin/Queries/User/GetUserJoinedOrganizations/GetUserJoinedOrganizationsHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/User/GetUserJoinedOrganizations/GetUserJoinedOrganizationsHandler.cs rename to src/Server/Logistics.Application.Admin/Queries/User/GetUserJoinedOrganizations/GetUserJoinedOrganizationsHandler.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/User/GetUserJoinedOrganizations/GetUserJoinedOrganizationsQuery.cs b/src/Server/Logistics.Application.Admin/Queries/User/GetUserJoinedOrganizations/GetUserJoinedOrganizationsQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/User/GetUserJoinedOrganizations/GetUserJoinedOrganizationsQuery.cs rename to src/Server/Logistics.Application.Admin/Queries/User/GetUserJoinedOrganizations/GetUserJoinedOrganizationsQuery.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/User/GetUserJoinedOrganizations/GetUserJoinedOrganizationsValidator.cs b/src/Server/Logistics.Application.Admin/Queries/User/GetUserJoinedOrganizations/GetUserJoinedOrganizationsValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/User/GetUserJoinedOrganizations/GetUserJoinedOrganizationsValidator.cs rename to src/Server/Logistics.Application.Admin/Queries/User/GetUserJoinedOrganizations/GetUserJoinedOrganizationsValidator.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/User/GetUsers/GetUsersHandler.cs b/src/Server/Logistics.Application.Admin/Queries/User/GetUsers/GetUsersHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/User/GetUsers/GetUsersHandler.cs rename to src/Server/Logistics.Application.Admin/Queries/User/GetUsers/GetUsersHandler.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/User/GetUsers/GetUsersQuery.cs b/src/Server/Logistics.Application.Admin/Queries/User/GetUsers/GetUsersQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/User/GetUsers/GetUsersQuery.cs rename to src/Server/Logistics.Application.Admin/Queries/User/GetUsers/GetUsersQuery.cs diff --git a/src/Core/Logistics.Application.Admin/Queries/User/GetUsers/GetUsersValidator.cs b/src/Server/Logistics.Application.Admin/Queries/User/GetUsers/GetUsersValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Queries/User/GetUsers/GetUsersValidator.cs rename to src/Server/Logistics.Application.Admin/Queries/User/GetUsers/GetUsersValidator.cs diff --git a/src/Core/Logistics.Application.Admin/Registrar.cs b/src/Server/Logistics.Application.Admin/Registrar.cs similarity index 100% rename from src/Core/Logistics.Application.Admin/Registrar.cs rename to src/Server/Logistics.Application.Admin/Registrar.cs diff --git a/src/Core/Logistics.Application.Core/Behaviours/UnhandledExceptionBehaviour.cs b/src/Server/Logistics.Application.Core/Behaviours/UnhandledExceptionBehaviour.cs similarity index 100% rename from src/Core/Logistics.Application.Core/Behaviours/UnhandledExceptionBehaviour.cs rename to src/Server/Logistics.Application.Core/Behaviours/UnhandledExceptionBehaviour.cs diff --git a/src/Core/Logistics.Application.Core/Behaviours/ValidationBehaviour.cs b/src/Server/Logistics.Application.Core/Behaviours/ValidationBehaviour.cs similarity index 100% rename from src/Core/Logistics.Application.Core/Behaviours/ValidationBehaviour.cs rename to src/Server/Logistics.Application.Core/Behaviours/ValidationBehaviour.cs diff --git a/src/Core/Logistics.Application.Core/Logistics.Application.Core.csproj b/src/Server/Logistics.Application.Core/Logistics.Application.Core.csproj similarity index 100% rename from src/Core/Logistics.Application.Core/Logistics.Application.Core.csproj rename to src/Server/Logistics.Application.Core/Logistics.Application.Core.csproj diff --git a/src/Core/Logistics.Application.Core/Registrar.cs b/src/Server/Logistics.Application.Core/Registrar.cs similarity index 100% rename from src/Core/Logistics.Application.Core/Registrar.cs rename to src/Server/Logistics.Application.Core/Registrar.cs diff --git a/src/Core/Logistics.Application.Core/RequestHandler.cs b/src/Server/Logistics.Application.Core/RequestHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Core/RequestHandler.cs rename to src/Server/Logistics.Application.Core/RequestHandler.cs diff --git a/src/Core/Logistics.Application.Core/Services/ICaptchaService.cs b/src/Server/Logistics.Application.Core/Services/ICaptchaService.cs similarity index 100% rename from src/Core/Logistics.Application.Core/Services/ICaptchaService.cs rename to src/Server/Logistics.Application.Core/Services/ICaptchaService.cs diff --git a/src/Core/Logistics.Application.Core/Services/IEmailSender.cs b/src/Server/Logistics.Application.Core/Services/IEmailSender.cs similarity index 100% rename from src/Core/Logistics.Application.Core/Services/IEmailSender.cs rename to src/Server/Logistics.Application.Core/Services/IEmailSender.cs diff --git a/src/Core/Logistics.Application.Core/Services/Implementations/GoogleRecaptchaOptions.cs b/src/Server/Logistics.Application.Core/Services/Implementations/GoogleRecaptchaOptions.cs similarity index 100% rename from src/Core/Logistics.Application.Core/Services/Implementations/GoogleRecaptchaOptions.cs rename to src/Server/Logistics.Application.Core/Services/Implementations/GoogleRecaptchaOptions.cs diff --git a/src/Core/Logistics.Application.Core/Services/Implementations/GoogleRecaptchaService.cs b/src/Server/Logistics.Application.Core/Services/Implementations/GoogleRecaptchaService.cs similarity index 100% rename from src/Core/Logistics.Application.Core/Services/Implementations/GoogleRecaptchaService.cs rename to src/Server/Logistics.Application.Core/Services/Implementations/GoogleRecaptchaService.cs diff --git a/src/Core/Logistics.Application.Core/Services/Implementations/SmtpEmailSender.cs b/src/Server/Logistics.Application.Core/Services/Implementations/SmtpEmailSender.cs similarity index 100% rename from src/Core/Logistics.Application.Core/Services/Implementations/SmtpEmailSender.cs rename to src/Server/Logistics.Application.Core/Services/Implementations/SmtpEmailSender.cs diff --git a/src/Core/Logistics.Application.Core/Services/Implementations/SmtpOptions.cs b/src/Server/Logistics.Application.Core/Services/Implementations/SmtpOptions.cs similarity index 100% rename from src/Core/Logistics.Application.Core/Services/Implementations/SmtpOptions.cs rename to src/Server/Logistics.Application.Core/Services/Implementations/SmtpOptions.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Customer/CreateCustomer/CreateCustomerCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Customer/CreateCustomer/CreateCustomerCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Customer/CreateCustomer/CreateCustomerCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Customer/CreateCustomer/CreateCustomerCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Customer/CreateCustomer/CreateCustomerHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Customer/CreateCustomer/CreateCustomerHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Customer/CreateCustomer/CreateCustomerHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Customer/CreateCustomer/CreateCustomerHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Customer/CreateCustomer/CreateCustomerValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Customer/CreateCustomer/CreateCustomerValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Customer/CreateCustomer/CreateCustomerValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Customer/CreateCustomer/CreateCustomerValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Customer/DeleteCustomer/DeleteCustomerCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Customer/DeleteCustomer/DeleteCustomerCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Customer/DeleteCustomer/DeleteCustomerCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Customer/DeleteCustomer/DeleteCustomerCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Customer/DeleteCustomer/DeleteCustomerHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Customer/DeleteCustomer/DeleteCustomerHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Customer/DeleteCustomer/DeleteCustomerHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Customer/DeleteCustomer/DeleteCustomerHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Customer/DeleteCustomer/DeleteCustomerValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Customer/DeleteCustomer/DeleteCustomerValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Customer/DeleteCustomer/DeleteCustomerValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Customer/DeleteCustomer/DeleteCustomerValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Customer/UpdateCustomer/UpdateCustomerCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Customer/UpdateCustomer/UpdateCustomerCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Customer/UpdateCustomer/UpdateCustomerCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Customer/UpdateCustomer/UpdateCustomerCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Customer/UpdateCustomer/UpdateCustomerHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Customer/UpdateCustomer/UpdateCustomerHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Customer/UpdateCustomer/UpdateCustomerHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Customer/UpdateCustomer/UpdateCustomerHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Customer/UpdateCustomer/UpdateCustomerValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Customer/UpdateCustomer/UpdateCustomerValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Customer/UpdateCustomer/UpdateCustomerValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Customer/UpdateCustomer/UpdateCustomerValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Employee/CreateEmployee/CreateEmployeeCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Employee/CreateEmployee/CreateEmployeeCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Employee/CreateEmployee/CreateEmployeeCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Employee/CreateEmployee/CreateEmployeeCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Employee/CreateEmployee/CreateEmployeeHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Employee/CreateEmployee/CreateEmployeeHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Employee/CreateEmployee/CreateEmployeeHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Employee/CreateEmployee/CreateEmployeeHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Employee/CreateEmployee/CreateEmployeeValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Employee/CreateEmployee/CreateEmployeeValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Employee/CreateEmployee/CreateEmployeeValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Employee/CreateEmployee/CreateEmployeeValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Employee/DeleteEmployee/DeleteEmployeeCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Employee/DeleteEmployee/DeleteEmployeeCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Employee/DeleteEmployee/DeleteEmployeeCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Employee/DeleteEmployee/DeleteEmployeeCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Employee/DeleteEmployee/DeleteEmployeeHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Employee/DeleteEmployee/DeleteEmployeeHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Employee/DeleteEmployee/DeleteEmployeeHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Employee/DeleteEmployee/DeleteEmployeeHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Employee/DeleteEmployee/DeleteEmployeeValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Employee/DeleteEmployee/DeleteEmployeeValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Employee/DeleteEmployee/DeleteEmployeeValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Employee/DeleteEmployee/DeleteEmployeeValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Employee/RemoveRoleFromEmployee/RemoveRoleFromEmployeeCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Employee/RemoveRoleFromEmployee/RemoveRoleFromEmployeeCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Employee/RemoveRoleFromEmployee/RemoveRoleFromEmployeeCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Employee/RemoveRoleFromEmployee/RemoveRoleFromEmployeeCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Employee/RemoveRoleFromEmployee/RemoveRoleFromEmployeeHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Employee/RemoveRoleFromEmployee/RemoveRoleFromEmployeeHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Employee/RemoveRoleFromEmployee/RemoveRoleFromEmployeeHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Employee/RemoveRoleFromEmployee/RemoveRoleFromEmployeeHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Employee/RemoveRoleFromEmployee/RemoveRoleFromEmployeeValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Employee/RemoveRoleFromEmployee/RemoveRoleFromEmployeeValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Employee/RemoveRoleFromEmployee/RemoveRoleFromEmployeeValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Employee/RemoveRoleFromEmployee/RemoveRoleFromEmployeeValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Employee/SetDriverDeviceToken/SetDriverDeviceTokenCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Employee/SetDriverDeviceToken/SetDriverDeviceTokenCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Employee/SetDriverDeviceToken/SetDriverDeviceTokenCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Employee/SetDriverDeviceToken/SetDriverDeviceTokenCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Employee/SetDriverDeviceToken/SetDriverDeviceTokenHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Employee/SetDriverDeviceToken/SetDriverDeviceTokenHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Employee/SetDriverDeviceToken/SetDriverDeviceTokenHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Employee/SetDriverDeviceToken/SetDriverDeviceTokenHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Employee/SetDriverDeviceToken/SetDriverDeviceTokenValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Employee/SetDriverDeviceToken/SetDriverDeviceTokenValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Employee/SetDriverDeviceToken/SetDriverDeviceTokenValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Employee/SetDriverDeviceToken/SetDriverDeviceTokenValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Employee/UpdateEmployee/UpdateEmployeeCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Employee/UpdateEmployee/UpdateEmployeeCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Employee/UpdateEmployee/UpdateEmployeeCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Employee/UpdateEmployee/UpdateEmployeeCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Employee/UpdateEmployee/UpdateEmployeeHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Employee/UpdateEmployee/UpdateEmployeeHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Employee/UpdateEmployee/UpdateEmployeeHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Employee/UpdateEmployee/UpdateEmployeeHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Employee/UpdateEmployee/UpdateEmployeeValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Employee/UpdateEmployee/UpdateEmployeeValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Employee/UpdateEmployee/UpdateEmployeeValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Employee/UpdateEmployee/UpdateEmployeeValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Invoice/CreateInvoice/CreateInvoiceCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Invoice/CreateInvoice/CreateInvoiceCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Invoice/CreateInvoice/CreateInvoiceCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Invoice/CreateInvoice/CreateInvoiceCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Invoice/CreateInvoice/CreateInvoiceHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Invoice/CreateInvoice/CreateInvoiceHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Invoice/CreateInvoice/CreateInvoiceHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Invoice/CreateInvoice/CreateInvoiceHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Invoice/CreateInvoice/CreateInvoiceValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Invoice/CreateInvoice/CreateInvoiceValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Invoice/CreateInvoice/CreateInvoiceValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Invoice/CreateInvoice/CreateInvoiceValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Invoice/DeleteInvoice/DeleteInvoiceCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Invoice/DeleteInvoice/DeleteInvoiceCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Invoice/DeleteInvoice/DeleteInvoiceCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Invoice/DeleteInvoice/DeleteInvoiceCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Invoice/DeleteInvoice/DeleteInvoiceHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Invoice/DeleteInvoice/DeleteInvoiceHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Invoice/DeleteInvoice/DeleteInvoiceHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Invoice/DeleteInvoice/DeleteInvoiceHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Invoice/DeleteInvoice/DeleteInvoiceValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Invoice/DeleteInvoice/DeleteInvoiceValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Invoice/DeleteInvoice/DeleteInvoiceValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Invoice/DeleteInvoice/DeleteInvoiceValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Invoice/UpdateInvoice/UpdateInvoiceCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Invoice/UpdateInvoice/UpdateInvoiceCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Invoice/UpdateInvoice/UpdateInvoiceCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Invoice/UpdateInvoice/UpdateInvoiceCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Invoice/UpdateInvoice/UpdateInvoiceHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Invoice/UpdateInvoice/UpdateInvoiceHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Invoice/UpdateInvoice/UpdateInvoiceHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Invoice/UpdateInvoice/UpdateInvoiceHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Invoice/UpdateInvoice/UpdateInvoiceValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Invoice/UpdateInvoice/UpdateInvoiceValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Invoice/UpdateInvoice/UpdateInvoiceValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Invoice/UpdateInvoice/UpdateInvoiceValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Load/ConfirmLoadStatus/ConfirmLoadStatusCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Load/ConfirmLoadStatus/ConfirmLoadStatusCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Load/ConfirmLoadStatus/ConfirmLoadStatusCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Load/ConfirmLoadStatus/ConfirmLoadStatusCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Load/ConfirmLoadStatus/ConfirmLoadStatusHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Load/ConfirmLoadStatus/ConfirmLoadStatusHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Load/ConfirmLoadStatus/ConfirmLoadStatusHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Load/ConfirmLoadStatus/ConfirmLoadStatusHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Load/ConfirmLoadStatus/ConfirmLoadStatusValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Load/ConfirmLoadStatus/ConfirmLoadStatusValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Load/ConfirmLoadStatus/ConfirmLoadStatusValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Load/ConfirmLoadStatus/ConfirmLoadStatusValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Load/CreateLoad/CreateLoadCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Load/CreateLoad/CreateLoadCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Load/CreateLoad/CreateLoadCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Load/CreateLoad/CreateLoadCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Load/CreateLoad/CreateLoadHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Load/CreateLoad/CreateLoadHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Load/CreateLoad/CreateLoadHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Load/CreateLoad/CreateLoadHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Load/CreateLoad/CreateLoadValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Load/CreateLoad/CreateLoadValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Load/CreateLoad/CreateLoadValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Load/CreateLoad/CreateLoadValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Load/DeleteLoad/DeleteLoadCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Load/DeleteLoad/DeleteLoadCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Load/DeleteLoad/DeleteLoadCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Load/DeleteLoad/DeleteLoadCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Load/DeleteLoad/DeleteLoadHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Load/DeleteLoad/DeleteLoadHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Load/DeleteLoad/DeleteLoadHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Load/DeleteLoad/DeleteLoadHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Load/DeleteLoad/DeleteLoadValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Load/DeleteLoad/DeleteLoadValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Load/DeleteLoad/DeleteLoadValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Load/DeleteLoad/DeleteLoadValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Load/UpdateLoad/UpdateLoadCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Load/UpdateLoad/UpdateLoadCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Load/UpdateLoad/UpdateLoadCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Load/UpdateLoad/UpdateLoadCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Load/UpdateLoad/UpdateLoadHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Load/UpdateLoad/UpdateLoadHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Load/UpdateLoad/UpdateLoadHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Load/UpdateLoad/UpdateLoadHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Load/UpdateLoad/UpdateLoadValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Load/UpdateLoad/UpdateLoadValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Load/UpdateLoad/UpdateLoadValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Load/UpdateLoad/UpdateLoadValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Load/UpdateLoadProximity/UpdateLoadProximityCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Load/UpdateLoadProximity/UpdateLoadProximityCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Load/UpdateLoadProximity/UpdateLoadProximityCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Load/UpdateLoadProximity/UpdateLoadProximityCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Load/UpdateLoadProximity/UpdateLoadProximityHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Load/UpdateLoadProximity/UpdateLoadProximityHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Load/UpdateLoadProximity/UpdateLoadProximityHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Load/UpdateLoadProximity/UpdateLoadProximityHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Load/UpdateLoadProximity/UpdateLoadProximityValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Load/UpdateLoadProximity/UpdateLoadProximityValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Load/UpdateLoadProximity/UpdateLoadProximityValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Load/UpdateLoadProximity/UpdateLoadProximityValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Payment/CreatePayment/CreatePaymentCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Payment/CreatePayment/CreatePaymentCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Payment/CreatePayment/CreatePaymentCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Payment/CreatePayment/CreatePaymentCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Payment/CreatePayment/CreatePaymentHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Payment/CreatePayment/CreatePaymentHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Payment/CreatePayment/CreatePaymentHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Payment/CreatePayment/CreatePaymentHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Payment/CreatePayment/CreatePaymentValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Payment/CreatePayment/CreatePaymentValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Payment/CreatePayment/CreatePaymentValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Payment/CreatePayment/CreatePaymentValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Payment/DeletePayment/DeletePaymentCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Payment/DeletePayment/DeletePaymentCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Payment/DeletePayment/DeletePaymentCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Payment/DeletePayment/DeletePaymentCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Payment/DeletePayment/DeletePaymentHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Payment/DeletePayment/DeletePaymentHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Payment/DeletePayment/DeletePaymentHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Payment/DeletePayment/DeletePaymentHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Payment/DeletePayment/DeletePaymentValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Payment/DeletePayment/DeletePaymentValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Payment/DeletePayment/DeletePaymentValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Payment/DeletePayment/DeletePaymentValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Payment/ProcessPayment/ProcessPaymentCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Payment/ProcessPayment/ProcessPaymentCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Payment/ProcessPayment/ProcessPaymentCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Payment/ProcessPayment/ProcessPaymentCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Payment/ProcessPayment/ProcessPaymentHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Payment/ProcessPayment/ProcessPaymentHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Payment/ProcessPayment/ProcessPaymentHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Payment/ProcessPayment/ProcessPaymentHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Payment/ProcessPayment/ProcessPaymentValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Payment/ProcessPayment/ProcessPaymentValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Payment/ProcessPayment/ProcessPaymentValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Payment/ProcessPayment/ProcessPaymentValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Payment/UpdatePayment/UpdatePaymentCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Payment/UpdatePayment/UpdatePaymentCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Payment/UpdatePayment/UpdatePaymentCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Payment/UpdatePayment/UpdatePaymentCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Payment/UpdatePayment/UpdatePaymentHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Payment/UpdatePayment/UpdatePaymentHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Payment/UpdatePayment/UpdatePaymentHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Payment/UpdatePayment/UpdatePaymentHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Payment/UpdatePayment/UpdatePaymentValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Payment/UpdatePayment/UpdatePaymentValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Payment/UpdatePayment/UpdatePaymentValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Payment/UpdatePayment/UpdatePaymentValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Payroll/CreatePayroll/CreatePayrollCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Payroll/CreatePayroll/CreatePayrollCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Payroll/CreatePayroll/CreatePayrollCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Payroll/CreatePayroll/CreatePayrollCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Payroll/CreatePayroll/CreatePayrollHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Payroll/CreatePayroll/CreatePayrollHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Payroll/CreatePayroll/CreatePayrollHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Payroll/CreatePayroll/CreatePayrollHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Payroll/CreatePayroll/CreatePayrollValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Payroll/CreatePayroll/CreatePayrollValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Payroll/CreatePayroll/CreatePayrollValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Payroll/CreatePayroll/CreatePayrollValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Payroll/DeletePayroll/DeletePayrollCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Payroll/DeletePayroll/DeletePayrollCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Payroll/DeletePayroll/DeletePayrollCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Payroll/DeletePayroll/DeletePayrollCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Payroll/DeletePayroll/DeletePayrollHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Payroll/DeletePayroll/DeletePayrollHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Payroll/DeletePayroll/DeletePayrollHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Payroll/DeletePayroll/DeletePayrollHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Payroll/DeletePayroll/DeletePayrollValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Payroll/DeletePayroll/DeletePayrollValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Payroll/DeletePayroll/DeletePayrollValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Payroll/DeletePayroll/DeletePayrollValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Payroll/UpdatePayroll/UpdatePayrollCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Payroll/UpdatePayroll/UpdatePayrollCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Payroll/UpdatePayroll/UpdatePayrollCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Payroll/UpdatePayroll/UpdatePayrollCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Payroll/UpdatePayroll/UpdatePayrollHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Payroll/UpdatePayroll/UpdatePayrollHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Payroll/UpdatePayroll/UpdatePayrollHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Payroll/UpdatePayroll/UpdatePayrollHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Payroll/UpdatePayroll/UpdatePayrollValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Payroll/UpdatePayroll/UpdatePayrollValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Payroll/UpdatePayroll/UpdatePayrollValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Payroll/UpdatePayroll/UpdatePayrollValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Truck/CreateTruck/CreateTruckCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Truck/CreateTruck/CreateTruckCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Truck/CreateTruck/CreateTruckCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Truck/CreateTruck/CreateTruckCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Truck/CreateTruck/CreateTruckHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Truck/CreateTruck/CreateTruckHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Truck/CreateTruck/CreateTruckHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Truck/CreateTruck/CreateTruckHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Truck/CreateTruck/CreateTruckValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Truck/CreateTruck/CreateTruckValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Truck/CreateTruck/CreateTruckValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Truck/CreateTruck/CreateTruckValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Truck/DeleteTruck/DeleteTruckCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Truck/DeleteTruck/DeleteTruckCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Truck/DeleteTruck/DeleteTruckCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Truck/DeleteTruck/DeleteTruckCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Truck/DeleteTruck/DeleteTruckHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Truck/DeleteTruck/DeleteTruckHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Truck/DeleteTruck/DeleteTruckHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Truck/DeleteTruck/DeleteTruckHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Truck/DeleteTruck/DeleteTruckValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Truck/DeleteTruck/DeleteTruckValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Truck/DeleteTruck/DeleteTruckValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Truck/DeleteTruck/DeleteTruckValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Truck/SetTruckGeolocation/SetTruckGeolocationCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Truck/SetTruckGeolocation/SetTruckGeolocationCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Truck/SetTruckGeolocation/SetTruckGeolocationCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Truck/SetTruckGeolocation/SetTruckGeolocationCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Truck/SetTruckGeolocation/SetTruckGeolocationHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Truck/SetTruckGeolocation/SetTruckGeolocationHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Truck/SetTruckGeolocation/SetTruckGeolocationHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Truck/SetTruckGeolocation/SetTruckGeolocationHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Truck/UpdateTruck/UpdateTruckCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/Truck/UpdateTruck/UpdateTruckCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Truck/UpdateTruck/UpdateTruckCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/Truck/UpdateTruck/UpdateTruckCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Truck/UpdateTruck/UpdateTruckHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/Truck/UpdateTruck/UpdateTruckHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Truck/UpdateTruck/UpdateTruckHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/Truck/UpdateTruck/UpdateTruckHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/Truck/UpdateTruck/UpdateTruckValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/Truck/UpdateTruck/UpdateTruckValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/Truck/UpdateTruck/UpdateTruckValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/Truck/UpdateTruck/UpdateTruckValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/UpdateNotification/UpdateNotificationCommand.cs b/src/Server/Logistics.Application.Tenant/Commands/UpdateNotification/UpdateNotificationCommand.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/UpdateNotification/UpdateNotificationCommand.cs rename to src/Server/Logistics.Application.Tenant/Commands/UpdateNotification/UpdateNotificationCommand.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/UpdateNotification/UpdateNotificationHandler.cs b/src/Server/Logistics.Application.Tenant/Commands/UpdateNotification/UpdateNotificationHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/UpdateNotification/UpdateNotificationHandler.cs rename to src/Server/Logistics.Application.Tenant/Commands/UpdateNotification/UpdateNotificationHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Commands/UpdateNotification/UpdateNotificationValidator.cs b/src/Server/Logistics.Application.Tenant/Commands/UpdateNotification/UpdateNotificationValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Commands/UpdateNotification/UpdateNotificationValidator.cs rename to src/Server/Logistics.Application.Tenant/Commands/UpdateNotification/UpdateNotificationValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Extensions/PushNotificationExtensions.cs b/src/Server/Logistics.Application.Tenant/Extensions/PushNotificationExtensions.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Extensions/PushNotificationExtensions.cs rename to src/Server/Logistics.Application.Tenant/Extensions/PushNotificationExtensions.cs diff --git a/src/Server/Logistics.Application.Tenant/Logistics.Application.Tenant.csproj b/src/Server/Logistics.Application.Tenant/Logistics.Application.Tenant.csproj new file mode 100644 index 000000000..d1958f678 --- /dev/null +++ b/src/Server/Logistics.Application.Tenant/Logistics.Application.Tenant.csproj @@ -0,0 +1,23 @@ + + + + net8.0 + enable + enable + Logistics.Application.Tenant + 12 + + + + + + + + + + + + + + + diff --git a/src/Core/Logistics.Application.Tenant/Queries/Customer/GetCustomerById/GetCustomerByIdHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/Customer/GetCustomerById/GetCustomerByIdHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Customer/GetCustomerById/GetCustomerByIdHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/Customer/GetCustomerById/GetCustomerByIdHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Customer/GetCustomerById/GetCustomerByIdQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/Customer/GetCustomerById/GetCustomerByIdQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Customer/GetCustomerById/GetCustomerByIdQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/Customer/GetCustomerById/GetCustomerByIdQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Customer/GetCustomerById/GetCustomerByIdValidator.cs b/src/Server/Logistics.Application.Tenant/Queries/Customer/GetCustomerById/GetCustomerByIdValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Customer/GetCustomerById/GetCustomerByIdValidator.cs rename to src/Server/Logistics.Application.Tenant/Queries/Customer/GetCustomerById/GetCustomerByIdValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Customer/GetCustomers/GetCustomersHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/Customer/GetCustomers/GetCustomersHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Customer/GetCustomers/GetCustomersHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/Customer/GetCustomers/GetCustomersHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Customer/GetCustomers/GetCustomersQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/Customer/GetCustomers/GetCustomersQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Customer/GetCustomers/GetCustomersQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/Customer/GetCustomers/GetCustomersQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Customer/GetCustomers/GetCustomersValidator.cs b/src/Server/Logistics.Application.Tenant/Queries/Customer/GetCustomers/GetCustomersValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Customer/GetCustomers/GetCustomersValidator.cs rename to src/Server/Logistics.Application.Tenant/Queries/Customer/GetCustomers/GetCustomersValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Employee/GetEmployeeById/GetEmployeeByIdHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/Employee/GetEmployeeById/GetEmployeeByIdHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Employee/GetEmployeeById/GetEmployeeByIdHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/Employee/GetEmployeeById/GetEmployeeByIdHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Employee/GetEmployeeById/GetEmployeeByIdQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/Employee/GetEmployeeById/GetEmployeeByIdQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Employee/GetEmployeeById/GetEmployeeByIdQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/Employee/GetEmployeeById/GetEmployeeByIdQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Employee/GetEmployeeById/GetEmployeeByIdValidator.cs b/src/Server/Logistics.Application.Tenant/Queries/Employee/GetEmployeeById/GetEmployeeByIdValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Employee/GetEmployeeById/GetEmployeeByIdValidator.cs rename to src/Server/Logistics.Application.Tenant/Queries/Employee/GetEmployeeById/GetEmployeeByIdValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Employee/GetEmployees/GetEmployeesHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/Employee/GetEmployees/GetEmployeesHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Employee/GetEmployees/GetEmployeesHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/Employee/GetEmployees/GetEmployeesHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Employee/GetEmployees/GetEmployeesQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/Employee/GetEmployees/GetEmployeesQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Employee/GetEmployees/GetEmployeesQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/Employee/GetEmployees/GetEmployeesQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Employee/GetEmployees/GetEmployeesValidator.cs b/src/Server/Logistics.Application.Tenant/Queries/Employee/GetEmployees/GetEmployeesValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Employee/GetEmployees/GetEmployeesValidator.cs rename to src/Server/Logistics.Application.Tenant/Queries/Employee/GetEmployees/GetEmployeesValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/GetNotifications/GetNotificationsHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/GetNotifications/GetNotificationsHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/GetNotifications/GetNotificationsHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/GetNotifications/GetNotificationsHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/GetNotifications/GetNotificationsQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/GetNotifications/GetNotificationsQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/GetNotifications/GetNotificationsQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/GetNotifications/GetNotificationsQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/GetNotifications/GetNotificationsValidator.cs b/src/Server/Logistics.Application.Tenant/Queries/GetNotifications/GetNotificationsValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/GetNotifications/GetNotificationsValidator.cs rename to src/Server/Logistics.Application.Tenant/Queries/GetNotifications/GetNotificationsValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/GetTenantRoles/GetTenantRolesHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/GetTenantRoles/GetTenantRolesHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/GetTenantRoles/GetTenantRolesHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/GetTenantRoles/GetTenantRolesHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/GetTenantRoles/GetTenantRolesQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/GetTenantRoles/GetTenantRolesQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/GetTenantRoles/GetTenantRolesQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/GetTenantRoles/GetTenantRolesQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/GetTenantRoles/GetTenantRolesValidator.cs b/src/Server/Logistics.Application.Tenant/Queries/GetTenantRoles/GetTenantRolesValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/GetTenantRoles/GetTenantRolesValidator.cs rename to src/Server/Logistics.Application.Tenant/Queries/GetTenantRoles/GetTenantRolesValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Invoice/GetInvoiceById/GetInvoiceByIdHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/Invoice/GetInvoiceById/GetInvoiceByIdHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Invoice/GetInvoiceById/GetInvoiceByIdHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/Invoice/GetInvoiceById/GetInvoiceByIdHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Invoice/GetInvoiceById/GetInvoiceByIdQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/Invoice/GetInvoiceById/GetInvoiceByIdQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Invoice/GetInvoiceById/GetInvoiceByIdQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/Invoice/GetInvoiceById/GetInvoiceByIdQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Invoice/GetInvoiceById/GetInvoiceByIdValidator.cs b/src/Server/Logistics.Application.Tenant/Queries/Invoice/GetInvoiceById/GetInvoiceByIdValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Invoice/GetInvoiceById/GetInvoiceByIdValidator.cs rename to src/Server/Logistics.Application.Tenant/Queries/Invoice/GetInvoiceById/GetInvoiceByIdValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Invoice/GetInvoices/GetInvoicesHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/Invoice/GetInvoices/GetInvoicesHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Invoice/GetInvoices/GetInvoicesHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/Invoice/GetInvoices/GetInvoicesHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Invoice/GetInvoices/GetInvoicesQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/Invoice/GetInvoices/GetInvoicesQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Invoice/GetInvoices/GetInvoicesQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/Invoice/GetInvoices/GetInvoicesQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Invoice/GetInvoices/GetInvoicesValidator.cs b/src/Server/Logistics.Application.Tenant/Queries/Invoice/GetInvoices/GetInvoicesValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Invoice/GetInvoices/GetInvoicesValidator.cs rename to src/Server/Logistics.Application.Tenant/Queries/Invoice/GetInvoices/GetInvoicesValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Load/GetLoadById/GetLoadByIdHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/Load/GetLoadById/GetLoadByIdHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Load/GetLoadById/GetLoadByIdHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/Load/GetLoadById/GetLoadByIdHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Load/GetLoadById/GetLoadByIdQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/Load/GetLoadById/GetLoadByIdQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Load/GetLoadById/GetLoadByIdQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/Load/GetLoadById/GetLoadByIdQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Load/GetLoadById/GetLoadByIdValidator.cs b/src/Server/Logistics.Application.Tenant/Queries/Load/GetLoadById/GetLoadByIdValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Load/GetLoadById/GetLoadByIdValidator.cs rename to src/Server/Logistics.Application.Tenant/Queries/Load/GetLoadById/GetLoadByIdValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Load/GetLoads/GetLoadsHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/Load/GetLoads/GetLoadsHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Load/GetLoads/GetLoadsHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/Load/GetLoads/GetLoadsHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Load/GetLoads/GetLoadsQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/Load/GetLoads/GetLoadsQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Load/GetLoads/GetLoadsQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/Load/GetLoads/GetLoadsQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Load/GetLoads/GetLoadsValidator.cs b/src/Server/Logistics.Application.Tenant/Queries/Load/GetLoads/GetLoadsValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Load/GetLoads/GetLoadsValidator.cs rename to src/Server/Logistics.Application.Tenant/Queries/Load/GetLoads/GetLoadsValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Payment/GetPaymentById/GetPaymentByIdHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/Payment/GetPaymentById/GetPaymentByIdHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Payment/GetPaymentById/GetPaymentByIdHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/Payment/GetPaymentById/GetPaymentByIdHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Payment/GetPaymentById/GetPaymentByIdQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/Payment/GetPaymentById/GetPaymentByIdQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Payment/GetPaymentById/GetPaymentByIdQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/Payment/GetPaymentById/GetPaymentByIdQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Payment/GetPaymentById/GetPaymentByIdValidator.cs b/src/Server/Logistics.Application.Tenant/Queries/Payment/GetPaymentById/GetPaymentByIdValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Payment/GetPaymentById/GetPaymentByIdValidator.cs rename to src/Server/Logistics.Application.Tenant/Queries/Payment/GetPaymentById/GetPaymentByIdValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Payment/GetPayments/GetPaymentsHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/Payment/GetPayments/GetPaymentsHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Payment/GetPayments/GetPaymentsHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/Payment/GetPayments/GetPaymentsHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Payment/GetPayments/GetPaymentsQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/Payment/GetPayments/GetPaymentsQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Payment/GetPayments/GetPaymentsQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/Payment/GetPayments/GetPaymentsQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Payment/GetPayments/GetPaymentsValidator.cs b/src/Server/Logistics.Application.Tenant/Queries/Payment/GetPayments/GetPaymentsValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Payment/GetPayments/GetPaymentsValidator.cs rename to src/Server/Logistics.Application.Tenant/Queries/Payment/GetPayments/GetPaymentsValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Payroll/CalculatePayroll/CalculatePayrollHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/Payroll/CalculatePayroll/CalculatePayrollHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Payroll/CalculatePayroll/CalculatePayrollHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/Payroll/CalculatePayroll/CalculatePayrollHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Payroll/CalculatePayroll/CalculatePayrollQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/Payroll/CalculatePayroll/CalculatePayrollQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Payroll/CalculatePayroll/CalculatePayrollQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/Payroll/CalculatePayroll/CalculatePayrollQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Payroll/CalculatePayroll/CalculatePayrollValidator.cs b/src/Server/Logistics.Application.Tenant/Queries/Payroll/CalculatePayroll/CalculatePayrollValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Payroll/CalculatePayroll/CalculatePayrollValidator.cs rename to src/Server/Logistics.Application.Tenant/Queries/Payroll/CalculatePayroll/CalculatePayrollValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Payroll/GetPayrollById/GetPayrollByIdHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/Payroll/GetPayrollById/GetPayrollByIdHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Payroll/GetPayrollById/GetPayrollByIdHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/Payroll/GetPayrollById/GetPayrollByIdHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Payroll/GetPayrollById/GetPayrollByIdQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/Payroll/GetPayrollById/GetPayrollByIdQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Payroll/GetPayrollById/GetPayrollByIdQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/Payroll/GetPayrollById/GetPayrollByIdQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Payroll/GetPayrollById/GetPayrollByIdValidator.cs b/src/Server/Logistics.Application.Tenant/Queries/Payroll/GetPayrollById/GetPayrollByIdValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Payroll/GetPayrollById/GetPayrollByIdValidator.cs rename to src/Server/Logistics.Application.Tenant/Queries/Payroll/GetPayrollById/GetPayrollByIdValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Payroll/GetPayrolls/GetPayrollsHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/Payroll/GetPayrolls/GetPayrollsHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Payroll/GetPayrolls/GetPayrollsHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/Payroll/GetPayrolls/GetPayrollsHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Payroll/GetPayrolls/GetPayrollsQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/Payroll/GetPayrolls/GetPayrollsQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Payroll/GetPayrolls/GetPayrollsQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/Payroll/GetPayrolls/GetPayrollsQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Payroll/GetPayrolls/GetPayrollsValidator.cs b/src/Server/Logistics.Application.Tenant/Queries/Payroll/GetPayrolls/GetPayrollsValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Payroll/GetPayrolls/GetPayrollsValidator.cs rename to src/Server/Logistics.Application.Tenant/Queries/Payroll/GetPayrolls/GetPayrollsValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Stats/GetCompanyStats/GetCompanyStatsHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/Stats/GetCompanyStats/GetCompanyStatsHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Stats/GetCompanyStats/GetCompanyStatsHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/Stats/GetCompanyStats/GetCompanyStatsHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Stats/GetCompanyStats/GetCompanyStatsQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/Stats/GetCompanyStats/GetCompanyStatsQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Stats/GetCompanyStats/GetCompanyStatsQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/Stats/GetCompanyStats/GetCompanyStatsQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Stats/GetDailyGrosses/GetDailyGrossesHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/Stats/GetDailyGrosses/GetDailyGrossesHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Stats/GetDailyGrosses/GetDailyGrossesHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/Stats/GetDailyGrosses/GetDailyGrossesHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Stats/GetDailyGrosses/GetDailyGrossesQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/Stats/GetDailyGrosses/GetDailyGrossesQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Stats/GetDailyGrosses/GetDailyGrossesQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/Stats/GetDailyGrosses/GetDailyGrossesQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Stats/GetDailyGrosses/GetDailyGrossesValidator.cs b/src/Server/Logistics.Application.Tenant/Queries/Stats/GetDailyGrosses/GetDailyGrossesValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Stats/GetDailyGrosses/GetDailyGrossesValidator.cs rename to src/Server/Logistics.Application.Tenant/Queries/Stats/GetDailyGrosses/GetDailyGrossesValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Stats/GetDriverStats/GetDriverStatsHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/Stats/GetDriverStats/GetDriverStatsHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Stats/GetDriverStats/GetDriverStatsHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/Stats/GetDriverStats/GetDriverStatsHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Stats/GetDriverStats/GetDriverStatsQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/Stats/GetDriverStats/GetDriverStatsQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Stats/GetDriverStats/GetDriverStatsQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/Stats/GetDriverStats/GetDriverStatsQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Stats/GetDriverStats/GetDriverStatsValidator.cs b/src/Server/Logistics.Application.Tenant/Queries/Stats/GetDriverStats/GetDriverStatsValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Stats/GetDriverStats/GetDriverStatsValidator.cs rename to src/Server/Logistics.Application.Tenant/Queries/Stats/GetDriverStats/GetDriverStatsValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Stats/GetMonthlyGrosses/GetMonthlyGrossesHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/Stats/GetMonthlyGrosses/GetMonthlyGrossesHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Stats/GetMonthlyGrosses/GetMonthlyGrossesHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/Stats/GetMonthlyGrosses/GetMonthlyGrossesHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Stats/GetMonthlyGrosses/GetMonthlyGrossesQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/Stats/GetMonthlyGrosses/GetMonthlyGrossesQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Stats/GetMonthlyGrosses/GetMonthlyGrossesQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/Stats/GetMonthlyGrosses/GetMonthlyGrossesQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Stats/GetMonthlyGrosses/GetMonthlyGrossesValidator.cs b/src/Server/Logistics.Application.Tenant/Queries/Stats/GetMonthlyGrosses/GetMonthlyGrossesValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Stats/GetMonthlyGrosses/GetMonthlyGrossesValidator.cs rename to src/Server/Logistics.Application.Tenant/Queries/Stats/GetMonthlyGrosses/GetMonthlyGrossesValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Stats/GetTrucksStatsList/GetTruckStatsListHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/Stats/GetTrucksStatsList/GetTruckStatsListHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Stats/GetTrucksStatsList/GetTruckStatsListHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/Stats/GetTrucksStatsList/GetTruckStatsListHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Stats/GetTrucksStatsList/GetTruckStatsListValidator.cs b/src/Server/Logistics.Application.Tenant/Queries/Stats/GetTrucksStatsList/GetTruckStatsListValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Stats/GetTrucksStatsList/GetTruckStatsListValidator.cs rename to src/Server/Logistics.Application.Tenant/Queries/Stats/GetTrucksStatsList/GetTruckStatsListValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Stats/GetTrucksStatsList/GetTrucksStatsListQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/Stats/GetTrucksStatsList/GetTrucksStatsListQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Stats/GetTrucksStatsList/GetTrucksStatsListQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/Stats/GetTrucksStatsList/GetTrucksStatsListQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Truck/GetTruck/GetTruckHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/Truck/GetTruck/GetTruckHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Truck/GetTruck/GetTruckHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/Truck/GetTruck/GetTruckHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Truck/GetTruck/GetTruckQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/Truck/GetTruck/GetTruckQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Truck/GetTruck/GetTruckQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/Truck/GetTruck/GetTruckQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Truck/GetTruck/GetTruckValidator.cs b/src/Server/Logistics.Application.Tenant/Queries/Truck/GetTruck/GetTruckValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Truck/GetTruck/GetTruckValidator.cs rename to src/Server/Logistics.Application.Tenant/Queries/Truck/GetTruck/GetTruckValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Truck/GetTruckDrivers/GetTruckDriversHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/Truck/GetTruckDrivers/GetTruckDriversHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Truck/GetTruckDrivers/GetTruckDriversHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/Truck/GetTruckDrivers/GetTruckDriversHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Truck/GetTruckDrivers/GetTruckDriversQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/Truck/GetTruckDrivers/GetTruckDriversQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Truck/GetTruckDrivers/GetTruckDriversQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/Truck/GetTruckDrivers/GetTruckDriversQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Truck/GetTruckDrivers/GetTruckDriversValidator.cs b/src/Server/Logistics.Application.Tenant/Queries/Truck/GetTruckDrivers/GetTruckDriversValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Truck/GetTruckDrivers/GetTruckDriversValidator.cs rename to src/Server/Logistics.Application.Tenant/Queries/Truck/GetTruckDrivers/GetTruckDriversValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Truck/GetTrucks/GetTrucksHandler.cs b/src/Server/Logistics.Application.Tenant/Queries/Truck/GetTrucks/GetTrucksHandler.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Truck/GetTrucks/GetTrucksHandler.cs rename to src/Server/Logistics.Application.Tenant/Queries/Truck/GetTrucks/GetTrucksHandler.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Truck/GetTrucks/GetTrucksQuery.cs b/src/Server/Logistics.Application.Tenant/Queries/Truck/GetTrucks/GetTrucksQuery.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Truck/GetTrucks/GetTrucksQuery.cs rename to src/Server/Logistics.Application.Tenant/Queries/Truck/GetTrucks/GetTrucksQuery.cs diff --git a/src/Core/Logistics.Application.Tenant/Queries/Truck/GetTrucks/GetTrucksValidator.cs b/src/Server/Logistics.Application.Tenant/Queries/Truck/GetTrucks/GetTrucksValidator.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Queries/Truck/GetTrucks/GetTrucksValidator.cs rename to src/Server/Logistics.Application.Tenant/Queries/Truck/GetTrucks/GetTrucksValidator.cs diff --git a/src/Core/Logistics.Application.Tenant/Registrar.cs b/src/Server/Logistics.Application.Tenant/Registrar.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Registrar.cs rename to src/Server/Logistics.Application.Tenant/Registrar.cs diff --git a/src/Core/Logistics.Application.Tenant/Services/INotificationService.cs b/src/Server/Logistics.Application.Tenant/Services/INotificationService.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Services/INotificationService.cs rename to src/Server/Logistics.Application.Tenant/Services/INotificationService.cs diff --git a/src/Core/Logistics.Application.Tenant/Services/IPayrollService.cs b/src/Server/Logistics.Application.Tenant/Services/IPayrollService.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Services/IPayrollService.cs rename to src/Server/Logistics.Application.Tenant/Services/IPayrollService.cs diff --git a/src/Core/Logistics.Application.Tenant/Services/IPushNotificationService.cs b/src/Server/Logistics.Application.Tenant/Services/IPushNotificationService.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Services/IPushNotificationService.cs rename to src/Server/Logistics.Application.Tenant/Services/IPushNotificationService.cs diff --git a/src/Core/Logistics.Application.Tenant/Services/PayrollService.cs b/src/Server/Logistics.Application.Tenant/Services/PayrollService.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Services/PayrollService.cs rename to src/Server/Logistics.Application.Tenant/Services/PayrollService.cs diff --git a/src/Core/Logistics.Application.Tenant/Services/PushNotificationService.cs b/src/Server/Logistics.Application.Tenant/Services/PushNotificationService.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/Services/PushNotificationService.cs rename to src/Server/Logistics.Application.Tenant/Services/PushNotificationService.cs diff --git a/src/Core/Logistics.Application.Tenant/_Imports.cs b/src/Server/Logistics.Application.Tenant/_Imports.cs similarity index 100% rename from src/Core/Logistics.Application.Tenant/_Imports.cs rename to src/Server/Logistics.Application.Tenant/_Imports.cs diff --git a/src/Core/Logistics.DbMigrator/Core/CompanyEmployees.cs b/src/Server/Logistics.DbMigrator/Core/CompanyEmployees.cs similarity index 100% rename from src/Core/Logistics.DbMigrator/Core/CompanyEmployees.cs rename to src/Server/Logistics.DbMigrator/Core/CompanyEmployees.cs diff --git a/src/Core/Logistics.DbMigrator/Core/DateRangeGenerator.cs b/src/Server/Logistics.DbMigrator/Core/DateRangeGenerator.cs similarity index 100% rename from src/Core/Logistics.DbMigrator/Core/DateRangeGenerator.cs rename to src/Server/Logistics.DbMigrator/Core/DateRangeGenerator.cs diff --git a/src/Core/Logistics.DbMigrator/Core/PayrollGenerator.cs b/src/Server/Logistics.DbMigrator/Core/PayrollGenerator.cs similarity index 100% rename from src/Core/Logistics.DbMigrator/Core/PayrollGenerator.cs rename to src/Server/Logistics.DbMigrator/Core/PayrollGenerator.cs diff --git a/src/Core/Logistics.DbMigrator/Data/PopulateFakeData.cs b/src/Server/Logistics.DbMigrator/Data/PopulateFakeData.cs similarity index 100% rename from src/Core/Logistics.DbMigrator/Data/PopulateFakeData.cs rename to src/Server/Logistics.DbMigrator/Data/PopulateFakeData.cs diff --git a/src/Core/Logistics.DbMigrator/Data/SeedData.cs b/src/Server/Logistics.DbMigrator/Data/SeedData.cs similarity index 100% rename from src/Core/Logistics.DbMigrator/Data/SeedData.cs rename to src/Server/Logistics.DbMigrator/Data/SeedData.cs diff --git a/src/Core/Logistics.DbMigrator/Extensions/RandomExtensions.cs b/src/Server/Logistics.DbMigrator/Extensions/RandomExtensions.cs similarity index 100% rename from src/Core/Logistics.DbMigrator/Extensions/RandomExtensions.cs rename to src/Server/Logistics.DbMigrator/Extensions/RandomExtensions.cs diff --git a/src/Core/Logistics.DbMigrator/Logistics.DbMigrator.csproj b/src/Server/Logistics.DbMigrator/Logistics.DbMigrator.csproj similarity index 100% rename from src/Core/Logistics.DbMigrator/Logistics.DbMigrator.csproj rename to src/Server/Logistics.DbMigrator/Logistics.DbMigrator.csproj diff --git a/src/Core/Logistics.DbMigrator/Program.cs b/src/Server/Logistics.DbMigrator/Program.cs similarity index 100% rename from src/Core/Logistics.DbMigrator/Program.cs rename to src/Server/Logistics.DbMigrator/Program.cs diff --git a/src/Core/Logistics.DbMigrator/Properties/launchSettings.json b/src/Server/Logistics.DbMigrator/Properties/launchSettings.json similarity index 100% rename from src/Core/Logistics.DbMigrator/Properties/launchSettings.json rename to src/Server/Logistics.DbMigrator/Properties/launchSettings.json diff --git a/src/Core/Logistics.DbMigrator/appsettings.json b/src/Server/Logistics.DbMigrator/appsettings.json similarity index 100% rename from src/Core/Logistics.DbMigrator/appsettings.json rename to src/Server/Logistics.DbMigrator/appsettings.json diff --git a/src/Core/Logistics.DbMigrator/fakeDataset.json b/src/Server/Logistics.DbMigrator/fakeDataset.json similarity index 100% rename from src/Core/Logistics.DbMigrator/fakeDataset.json rename to src/Server/Logistics.DbMigrator/fakeDataset.json diff --git a/src/Core/Logistics.Domain/Constraints/LoadConsts.cs b/src/Server/Logistics.Domain/Constraints/LoadConsts.cs similarity index 100% rename from src/Core/Logistics.Domain/Constraints/LoadConsts.cs rename to src/Server/Logistics.Domain/Constraints/LoadConsts.cs diff --git a/src/Core/Logistics.Domain/Constraints/TenantConsts.cs b/src/Server/Logistics.Domain/Constraints/TenantConsts.cs similarity index 100% rename from src/Core/Logistics.Domain/Constraints/TenantConsts.cs rename to src/Server/Logistics.Domain/Constraints/TenantConsts.cs diff --git a/src/Core/Logistics.Domain/Core/AuditableEntity.cs b/src/Server/Logistics.Domain/Core/AuditableEntity.cs similarity index 100% rename from src/Core/Logistics.Domain/Core/AuditableEntity.cs rename to src/Server/Logistics.Domain/Core/AuditableEntity.cs diff --git a/src/Core/Logistics.Domain/Core/Entity.cs b/src/Server/Logistics.Domain/Core/Entity.cs similarity index 100% rename from src/Core/Logistics.Domain/Core/Entity.cs rename to src/Server/Logistics.Domain/Core/Entity.cs diff --git a/src/Core/Logistics.Domain/Core/IAuditableEntity.cs b/src/Server/Logistics.Domain/Core/IAuditableEntity.cs similarity index 100% rename from src/Core/Logistics.Domain/Core/IAuditableEntity.cs rename to src/Server/Logistics.Domain/Core/IAuditableEntity.cs diff --git a/src/Core/Logistics.Domain/Core/IDomainEvent.cs b/src/Server/Logistics.Domain/Core/IDomainEvent.cs similarity index 100% rename from src/Core/Logistics.Domain/Core/IDomainEvent.cs rename to src/Server/Logistics.Domain/Core/IDomainEvent.cs diff --git a/src/Core/Logistics.Domain/Core/IDomainEventHandler.cs b/src/Server/Logistics.Domain/Core/IDomainEventHandler.cs similarity index 100% rename from src/Core/Logistics.Domain/Core/IDomainEventHandler.cs rename to src/Server/Logistics.Domain/Core/IDomainEventHandler.cs diff --git a/src/Core/Logistics.Domain/Core/IEntity.cs b/src/Server/Logistics.Domain/Core/IEntity.cs similarity index 100% rename from src/Core/Logistics.Domain/Core/IEntity.cs rename to src/Server/Logistics.Domain/Core/IEntity.cs diff --git a/src/Core/Logistics.Domain/Core/ITenantEntity.cs b/src/Server/Logistics.Domain/Core/ITenantEntity.cs similarity index 100% rename from src/Core/Logistics.Domain/Core/ITenantEntity.cs rename to src/Server/Logistics.Domain/Core/ITenantEntity.cs diff --git a/src/Core/Logistics.Domain/Entities/AppRole.cs b/src/Server/Logistics.Domain/Entities/AppRole.cs similarity index 100% rename from src/Core/Logistics.Domain/Entities/AppRole.cs rename to src/Server/Logistics.Domain/Entities/AppRole.cs diff --git a/src/Core/Logistics.Domain/Entities/Customer.cs b/src/Server/Logistics.Domain/Entities/Customer.cs similarity index 100% rename from src/Core/Logistics.Domain/Entities/Customer.cs rename to src/Server/Logistics.Domain/Entities/Customer.cs diff --git a/src/Core/Logistics.Domain/Entities/Employee.cs b/src/Server/Logistics.Domain/Entities/Employee.cs similarity index 100% rename from src/Core/Logistics.Domain/Entities/Employee.cs rename to src/Server/Logistics.Domain/Entities/Employee.cs diff --git a/src/Core/Logistics.Domain/Entities/EmployeeTenantRole.cs b/src/Server/Logistics.Domain/Entities/EmployeeTenantRole.cs similarity index 100% rename from src/Core/Logistics.Domain/Entities/EmployeeTenantRole.cs rename to src/Server/Logistics.Domain/Entities/EmployeeTenantRole.cs diff --git a/src/Core/Logistics.Domain/Entities/Invoice.cs b/src/Server/Logistics.Domain/Entities/Invoice.cs similarity index 100% rename from src/Core/Logistics.Domain/Entities/Invoice.cs rename to src/Server/Logistics.Domain/Entities/Invoice.cs diff --git a/src/Core/Logistics.Domain/Entities/Load.cs b/src/Server/Logistics.Domain/Entities/Load.cs similarity index 100% rename from src/Core/Logistics.Domain/Entities/Load.cs rename to src/Server/Logistics.Domain/Entities/Load.cs diff --git a/src/Core/Logistics.Domain/Entities/Notification.cs b/src/Server/Logistics.Domain/Entities/Notification.cs similarity index 100% rename from src/Core/Logistics.Domain/Entities/Notification.cs rename to src/Server/Logistics.Domain/Entities/Notification.cs diff --git a/src/Core/Logistics.Domain/Entities/Payment.cs b/src/Server/Logistics.Domain/Entities/Payment.cs similarity index 100% rename from src/Core/Logistics.Domain/Entities/Payment.cs rename to src/Server/Logistics.Domain/Entities/Payment.cs diff --git a/src/Core/Logistics.Domain/Entities/Payroll.cs b/src/Server/Logistics.Domain/Entities/Payroll.cs similarity index 100% rename from src/Core/Logistics.Domain/Entities/Payroll.cs rename to src/Server/Logistics.Domain/Entities/Payroll.cs diff --git a/src/Core/Logistics.Domain/Entities/Subscription.cs b/src/Server/Logistics.Domain/Entities/Subscription.cs similarity index 100% rename from src/Core/Logistics.Domain/Entities/Subscription.cs rename to src/Server/Logistics.Domain/Entities/Subscription.cs diff --git a/src/Core/Logistics.Domain/Entities/SubscriptionPayment.cs b/src/Server/Logistics.Domain/Entities/SubscriptionPayment.cs similarity index 100% rename from src/Core/Logistics.Domain/Entities/SubscriptionPayment.cs rename to src/Server/Logistics.Domain/Entities/SubscriptionPayment.cs diff --git a/src/Core/Logistics.Domain/Entities/SubscriptionPlan.cs b/src/Server/Logistics.Domain/Entities/SubscriptionPlan.cs similarity index 100% rename from src/Core/Logistics.Domain/Entities/SubscriptionPlan.cs rename to src/Server/Logistics.Domain/Entities/SubscriptionPlan.cs diff --git a/src/Core/Logistics.Domain/Entities/Tenant.cs b/src/Server/Logistics.Domain/Entities/Tenant.cs similarity index 100% rename from src/Core/Logistics.Domain/Entities/Tenant.cs rename to src/Server/Logistics.Domain/Entities/Tenant.cs diff --git a/src/Core/Logistics.Domain/Entities/TenantRole.cs b/src/Server/Logistics.Domain/Entities/TenantRole.cs similarity index 100% rename from src/Core/Logistics.Domain/Entities/TenantRole.cs rename to src/Server/Logistics.Domain/Entities/TenantRole.cs diff --git a/src/Core/Logistics.Domain/Entities/TenantRoleClaim.cs b/src/Server/Logistics.Domain/Entities/TenantRoleClaim.cs similarity index 100% rename from src/Core/Logistics.Domain/Entities/TenantRoleClaim.cs rename to src/Server/Logistics.Domain/Entities/TenantRoleClaim.cs diff --git a/src/Core/Logistics.Domain/Entities/Truck.cs b/src/Server/Logistics.Domain/Entities/Truck.cs similarity index 100% rename from src/Core/Logistics.Domain/Entities/Truck.cs rename to src/Server/Logistics.Domain/Entities/Truck.cs diff --git a/src/Core/Logistics.Domain/Entities/User.cs b/src/Server/Logistics.Domain/Entities/User.cs similarity index 100% rename from src/Core/Logistics.Domain/Entities/User.cs rename to src/Server/Logistics.Domain/Entities/User.cs diff --git a/src/Core/Logistics.Domain/Events/Handlers/NewLoadCreatedHandler.cs b/src/Server/Logistics.Domain/Events/Handlers/NewLoadCreatedHandler.cs similarity index 100% rename from src/Core/Logistics.Domain/Events/Handlers/NewLoadCreatedHandler.cs rename to src/Server/Logistics.Domain/Events/Handlers/NewLoadCreatedHandler.cs diff --git a/src/Core/Logistics.Domain/Events/NewLoadCreatedEvent.cs b/src/Server/Logistics.Domain/Events/NewLoadCreatedEvent.cs similarity index 100% rename from src/Core/Logistics.Domain/Events/NewLoadCreatedEvent.cs rename to src/Server/Logistics.Domain/Events/NewLoadCreatedEvent.cs diff --git a/src/Core/Logistics.Domain/Extensions/DateTimeExtensions.cs b/src/Server/Logistics.Domain/Extensions/DateTimeExtensions.cs similarity index 100% rename from src/Core/Logistics.Domain/Extensions/DateTimeExtensions.cs rename to src/Server/Logistics.Domain/Extensions/DateTimeExtensions.cs diff --git a/src/Core/Logistics.Domain/Extensions/EnumerableExtensions.cs b/src/Server/Logistics.Domain/Extensions/EnumerableExtensions.cs similarity index 100% rename from src/Core/Logistics.Domain/Extensions/EnumerableExtensions.cs rename to src/Server/Logistics.Domain/Extensions/EnumerableExtensions.cs diff --git a/src/Core/Logistics.Domain/Extensions/QueryableExtensions.cs b/src/Server/Logistics.Domain/Extensions/QueryableExtensions.cs similarity index 100% rename from src/Core/Logistics.Domain/Extensions/QueryableExtensions.cs rename to src/Server/Logistics.Domain/Extensions/QueryableExtensions.cs diff --git a/src/Core/Logistics.Domain/Logistics.Domain.csproj b/src/Server/Logistics.Domain/Logistics.Domain.csproj similarity index 100% rename from src/Core/Logistics.Domain/Logistics.Domain.csproj rename to src/Server/Logistics.Domain/Logistics.Domain.csproj diff --git a/src/Core/Logistics.Domain/Options/TenantsDatabaseOptions.cs b/src/Server/Logistics.Domain/Options/TenantsDatabaseOptions.cs similarity index 100% rename from src/Core/Logistics.Domain/Options/TenantsDatabaseOptions.cs rename to src/Server/Logistics.Domain/Options/TenantsDatabaseOptions.cs diff --git a/src/Core/Logistics.Domain/Persistence/IMasterRepository.cs b/src/Server/Logistics.Domain/Persistence/IMasterRepository.cs similarity index 100% rename from src/Core/Logistics.Domain/Persistence/IMasterRepository.cs rename to src/Server/Logistics.Domain/Persistence/IMasterRepository.cs diff --git a/src/Core/Logistics.Domain/Persistence/IMasterUnityOfWork.cs b/src/Server/Logistics.Domain/Persistence/IMasterUnityOfWork.cs similarity index 100% rename from src/Core/Logistics.Domain/Persistence/IMasterUnityOfWork.cs rename to src/Server/Logistics.Domain/Persistence/IMasterUnityOfWork.cs diff --git a/src/Core/Logistics.Domain/Persistence/IRepository.cs b/src/Server/Logistics.Domain/Persistence/IRepository.cs similarity index 100% rename from src/Core/Logistics.Domain/Persistence/IRepository.cs rename to src/Server/Logistics.Domain/Persistence/IRepository.cs diff --git a/src/Core/Logistics.Domain/Persistence/ITenantRepository.cs b/src/Server/Logistics.Domain/Persistence/ITenantRepository.cs similarity index 100% rename from src/Core/Logistics.Domain/Persistence/ITenantRepository.cs rename to src/Server/Logistics.Domain/Persistence/ITenantRepository.cs diff --git a/src/Core/Logistics.Domain/Persistence/ITenantUnityOfWork.cs b/src/Server/Logistics.Domain/Persistence/ITenantUnityOfWork.cs similarity index 100% rename from src/Core/Logistics.Domain/Persistence/ITenantUnityOfWork.cs rename to src/Server/Logistics.Domain/Persistence/ITenantUnityOfWork.cs diff --git a/src/Core/Logistics.Domain/Registrar.cs b/src/Server/Logistics.Domain/Registrar.cs similarity index 100% rename from src/Core/Logistics.Domain/Registrar.cs rename to src/Server/Logistics.Domain/Registrar.cs diff --git a/src/Core/Logistics.Domain/Services/ITenantDatabaseService.cs b/src/Server/Logistics.Domain/Services/ITenantDatabaseService.cs similarity index 100% rename from src/Core/Logistics.Domain/Services/ITenantDatabaseService.cs rename to src/Server/Logistics.Domain/Services/ITenantDatabaseService.cs diff --git a/src/Core/Logistics.Domain/Services/ITenantService.cs b/src/Server/Logistics.Domain/Services/ITenantService.cs similarity index 100% rename from src/Core/Logistics.Domain/Services/ITenantService.cs rename to src/Server/Logistics.Domain/Services/ITenantService.cs diff --git a/src/Core/Logistics.Domain/Services/IUserService.cs b/src/Server/Logistics.Domain/Services/IUserService.cs similarity index 100% rename from src/Core/Logistics.Domain/Services/IUserService.cs rename to src/Server/Logistics.Domain/Services/IUserService.cs diff --git a/src/Core/Logistics.Domain/Services/UpdateUserData.cs b/src/Server/Logistics.Domain/Services/UpdateUserData.cs similarity index 100% rename from src/Core/Logistics.Domain/Services/UpdateUserData.cs rename to src/Server/Logistics.Domain/Services/UpdateUserData.cs diff --git a/src/Core/Logistics.Domain/Specifications/BaseSpecification.cs b/src/Server/Logistics.Domain/Specifications/BaseSpecification.cs similarity index 100% rename from src/Core/Logistics.Domain/Specifications/BaseSpecification.cs rename to src/Server/Logistics.Domain/Specifications/BaseSpecification.cs diff --git a/src/Core/Logistics.Domain/Specifications/FilterEmployeesByRole.cs b/src/Server/Logistics.Domain/Specifications/FilterEmployeesByRole.cs similarity index 100% rename from src/Core/Logistics.Domain/Specifications/FilterEmployeesByRole.cs rename to src/Server/Logistics.Domain/Specifications/FilterEmployeesByRole.cs diff --git a/src/Core/Logistics.Domain/Specifications/FilterInvoicesByInterval.cs b/src/Server/Logistics.Domain/Specifications/FilterInvoicesByInterval.cs similarity index 100% rename from src/Core/Logistics.Domain/Specifications/FilterInvoicesByInterval.cs rename to src/Server/Logistics.Domain/Specifications/FilterInvoicesByInterval.cs diff --git a/src/Core/Logistics.Domain/Specifications/FilterLoadsByDeliveryDate.cs b/src/Server/Logistics.Domain/Specifications/FilterLoadsByDeliveryDate.cs similarity index 100% rename from src/Core/Logistics.Domain/Specifications/FilterLoadsByDeliveryDate.cs rename to src/Server/Logistics.Domain/Specifications/FilterLoadsByDeliveryDate.cs diff --git a/src/Core/Logistics.Domain/Specifications/FilterPaymentsByInterval.cs b/src/Server/Logistics.Domain/Specifications/FilterPaymentsByInterval.cs similarity index 100% rename from src/Core/Logistics.Domain/Specifications/FilterPaymentsByInterval.cs rename to src/Server/Logistics.Domain/Specifications/FilterPaymentsByInterval.cs diff --git a/src/Core/Logistics.Domain/Specifications/FilterPayrollsByEmployeeId.cs b/src/Server/Logistics.Domain/Specifications/FilterPayrollsByEmployeeId.cs similarity index 100% rename from src/Core/Logistics.Domain/Specifications/FilterPayrollsByEmployeeId.cs rename to src/Server/Logistics.Domain/Specifications/FilterPayrollsByEmployeeId.cs diff --git a/src/Core/Logistics.Domain/Specifications/GetDrivers.cs b/src/Server/Logistics.Domain/Specifications/GetDrivers.cs similarity index 100% rename from src/Core/Logistics.Domain/Specifications/GetDrivers.cs rename to src/Server/Logistics.Domain/Specifications/GetDrivers.cs diff --git a/src/Core/Logistics.Domain/Specifications/GetEmployeeLoads.cs b/src/Server/Logistics.Domain/Specifications/GetEmployeeLoads.cs similarity index 100% rename from src/Core/Logistics.Domain/Specifications/GetEmployeeLoads.cs rename to src/Server/Logistics.Domain/Specifications/GetEmployeeLoads.cs diff --git a/src/Core/Logistics.Domain/Specifications/GetEmployeesById.cs b/src/Server/Logistics.Domain/Specifications/GetEmployeesById.cs similarity index 100% rename from src/Core/Logistics.Domain/Specifications/GetEmployeesById.cs rename to src/Server/Logistics.Domain/Specifications/GetEmployeesById.cs diff --git a/src/Core/Logistics.Domain/Specifications/GetPayrolls.cs b/src/Server/Logistics.Domain/Specifications/GetPayrolls.cs similarity index 100% rename from src/Core/Logistics.Domain/Specifications/GetPayrolls.cs rename to src/Server/Logistics.Domain/Specifications/GetPayrolls.cs diff --git a/src/Core/Logistics.Domain/Specifications/GetSubscriptionPlans.cs b/src/Server/Logistics.Domain/Specifications/GetSubscriptionPlans.cs similarity index 100% rename from src/Core/Logistics.Domain/Specifications/GetSubscriptionPlans.cs rename to src/Server/Logistics.Domain/Specifications/GetSubscriptionPlans.cs diff --git a/src/Core/Logistics.Domain/Specifications/GetSubscriptions.cs b/src/Server/Logistics.Domain/Specifications/GetSubscriptions.cs similarity index 100% rename from src/Core/Logistics.Domain/Specifications/GetSubscriptions.cs rename to src/Server/Logistics.Domain/Specifications/GetSubscriptions.cs diff --git a/src/Core/Logistics.Domain/Specifications/ISpecification.cs b/src/Server/Logistics.Domain/Specifications/ISpecification.cs similarity index 100% rename from src/Core/Logistics.Domain/Specifications/ISpecification.cs rename to src/Server/Logistics.Domain/Specifications/ISpecification.cs diff --git a/src/Core/Logistics.Domain/Specifications/SearchAppRoles.cs b/src/Server/Logistics.Domain/Specifications/SearchAppRoles.cs similarity index 100% rename from src/Core/Logistics.Domain/Specifications/SearchAppRoles.cs rename to src/Server/Logistics.Domain/Specifications/SearchAppRoles.cs diff --git a/src/Core/Logistics.Domain/Specifications/SearchCustomers.cs b/src/Server/Logistics.Domain/Specifications/SearchCustomers.cs similarity index 100% rename from src/Core/Logistics.Domain/Specifications/SearchCustomers.cs rename to src/Server/Logistics.Domain/Specifications/SearchCustomers.cs diff --git a/src/Core/Logistics.Domain/Specifications/SearchEmployees.cs b/src/Server/Logistics.Domain/Specifications/SearchEmployees.cs similarity index 100% rename from src/Core/Logistics.Domain/Specifications/SearchEmployees.cs rename to src/Server/Logistics.Domain/Specifications/SearchEmployees.cs diff --git a/src/Core/Logistics.Domain/Specifications/SearchLoads.cs b/src/Server/Logistics.Domain/Specifications/SearchLoads.cs similarity index 100% rename from src/Core/Logistics.Domain/Specifications/SearchLoads.cs rename to src/Server/Logistics.Domain/Specifications/SearchLoads.cs diff --git a/src/Core/Logistics.Domain/Specifications/SearchTenantRoles.cs b/src/Server/Logistics.Domain/Specifications/SearchTenantRoles.cs similarity index 100% rename from src/Core/Logistics.Domain/Specifications/SearchTenantRoles.cs rename to src/Server/Logistics.Domain/Specifications/SearchTenantRoles.cs diff --git a/src/Core/Logistics.Domain/Specifications/SearchTenants.cs b/src/Server/Logistics.Domain/Specifications/SearchTenants.cs similarity index 100% rename from src/Core/Logistics.Domain/Specifications/SearchTenants.cs rename to src/Server/Logistics.Domain/Specifications/SearchTenants.cs diff --git a/src/Core/Logistics.Domain/Specifications/SearchTrucks.cs b/src/Server/Logistics.Domain/Specifications/SearchTrucks.cs similarity index 100% rename from src/Core/Logistics.Domain/Specifications/SearchTrucks.cs rename to src/Server/Logistics.Domain/Specifications/SearchTrucks.cs diff --git a/src/Core/Logistics.Domain/Specifications/SearchUsers.cs b/src/Server/Logistics.Domain/Specifications/SearchUsers.cs similarity index 100% rename from src/Core/Logistics.Domain/Specifications/SearchUsers.cs rename to src/Server/Logistics.Domain/Specifications/SearchUsers.cs diff --git a/src/Core/Logistics.Domain/ValueObjects/Address.cs b/src/Server/Logistics.Domain/ValueObjects/Address.cs similarity index 100% rename from src/Core/Logistics.Domain/ValueObjects/Address.cs rename to src/Server/Logistics.Domain/ValueObjects/Address.cs diff --git a/src/Server/Logistics.IdentityServer/Logistics.IdentityServer.csproj b/src/Server/Logistics.IdentityServer/Logistics.IdentityServer.csproj index fe2102da9..0a36fc77b 100644 --- a/src/Server/Logistics.IdentityServer/Logistics.IdentityServer.csproj +++ b/src/Server/Logistics.IdentityServer/Logistics.IdentityServer.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/src/Core/Logistics.Infrastructure.EF/Builder/IInfrastructureBuilder.cs b/src/Server/Logistics.Infrastructure.EF/Builder/IInfrastructureBuilder.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Builder/IInfrastructureBuilder.cs rename to src/Server/Logistics.Infrastructure.EF/Builder/IInfrastructureBuilder.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Builder/InfrastructureBuilder.cs b/src/Server/Logistics.Infrastructure.EF/Builder/InfrastructureBuilder.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Builder/InfrastructureBuilder.cs rename to src/Server/Logistics.Infrastructure.EF/Builder/InfrastructureBuilder.cs diff --git a/src/Core/Logistics.Infrastructure.EF/ConnectionStrings.cs b/src/Server/Logistics.Infrastructure.EF/ConnectionStrings.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/ConnectionStrings.cs rename to src/Server/Logistics.Infrastructure.EF/ConnectionStrings.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Data/MasterDbContext.cs b/src/Server/Logistics.Infrastructure.EF/Data/MasterDbContext.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Data/MasterDbContext.cs rename to src/Server/Logistics.Infrastructure.EF/Data/MasterDbContext.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Data/MasterDbContextFactory.cs b/src/Server/Logistics.Infrastructure.EF/Data/MasterDbContextFactory.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Data/MasterDbContextFactory.cs rename to src/Server/Logistics.Infrastructure.EF/Data/MasterDbContextFactory.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Data/TenantDbContext.cs b/src/Server/Logistics.Infrastructure.EF/Data/TenantDbContext.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Data/TenantDbContext.cs rename to src/Server/Logistics.Infrastructure.EF/Data/TenantDbContext.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Data/TenantDbContextFactory.cs b/src/Server/Logistics.Infrastructure.EF/Data/TenantDbContextFactory.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Data/TenantDbContextFactory.cs rename to src/Server/Logistics.Infrastructure.EF/Data/TenantDbContextFactory.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Exceptions/InvalidTenantException.cs b/src/Server/Logistics.Infrastructure.EF/Exceptions/InvalidTenantException.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Exceptions/InvalidTenantException.cs rename to src/Server/Logistics.Infrastructure.EF/Exceptions/InvalidTenantException.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Helpers/DbContextHelpers.cs b/src/Server/Logistics.Infrastructure.EF/Helpers/DbContextHelpers.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Helpers/DbContextHelpers.cs rename to src/Server/Logistics.Infrastructure.EF/Helpers/DbContextHelpers.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Interceptors/AuditableEntitySaveChangesInterceptor.cs b/src/Server/Logistics.Infrastructure.EF/Interceptors/AuditableEntitySaveChangesInterceptor.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Interceptors/AuditableEntitySaveChangesInterceptor.cs rename to src/Server/Logistics.Infrastructure.EF/Interceptors/AuditableEntitySaveChangesInterceptor.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Interceptors/DispatchDomainEventsInterceptor.cs b/src/Server/Logistics.Infrastructure.EF/Interceptors/DispatchDomainEventsInterceptor.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Interceptors/DispatchDomainEventsInterceptor.cs rename to src/Server/Logistics.Infrastructure.EF/Interceptors/DispatchDomainEventsInterceptor.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Logistics.Infrastructure.EF.csproj b/src/Server/Logistics.Infrastructure.EF/Logistics.Infrastructure.EF.csproj similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Logistics.Infrastructure.EF.csproj rename to src/Server/Logistics.Infrastructure.EF/Logistics.Infrastructure.EF.csproj diff --git a/src/Core/Logistics.Infrastructure.EF/Migrations/Master/20240105025909_Version_0001.Designer.cs b/src/Server/Logistics.Infrastructure.EF/Migrations/Master/20240105025909_Version_0001.Designer.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Migrations/Master/20240105025909_Version_0001.Designer.cs rename to src/Server/Logistics.Infrastructure.EF/Migrations/Master/20240105025909_Version_0001.Designer.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Migrations/Master/20240105025909_Version_0001.cs b/src/Server/Logistics.Infrastructure.EF/Migrations/Master/20240105025909_Version_0001.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Migrations/Master/20240105025909_Version_0001.cs rename to src/Server/Logistics.Infrastructure.EF/Migrations/Master/20240105025909_Version_0001.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Migrations/Master/MasterDbContextModelSnapshot.cs b/src/Server/Logistics.Infrastructure.EF/Migrations/Master/MasterDbContextModelSnapshot.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Migrations/Master/MasterDbContextModelSnapshot.cs rename to src/Server/Logistics.Infrastructure.EF/Migrations/Master/MasterDbContextModelSnapshot.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Migrations/Tenant/20240105025928_Version_0001.Designer.cs b/src/Server/Logistics.Infrastructure.EF/Migrations/Tenant/20240105025928_Version_0001.Designer.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Migrations/Tenant/20240105025928_Version_0001.Designer.cs rename to src/Server/Logistics.Infrastructure.EF/Migrations/Tenant/20240105025928_Version_0001.Designer.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Migrations/Tenant/20240105025928_Version_0001.cs b/src/Server/Logistics.Infrastructure.EF/Migrations/Tenant/20240105025928_Version_0001.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Migrations/Tenant/20240105025928_Version_0001.cs rename to src/Server/Logistics.Infrastructure.EF/Migrations/Tenant/20240105025928_Version_0001.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Migrations/Tenant/TenantDbContextModelSnapshot.cs b/src/Server/Logistics.Infrastructure.EF/Migrations/Tenant/TenantDbContextModelSnapshot.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Migrations/Tenant/TenantDbContextModelSnapshot.cs rename to src/Server/Logistics.Infrastructure.EF/Migrations/Tenant/TenantDbContextModelSnapshot.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Options/MasterDbContextOptions.cs b/src/Server/Logistics.Infrastructure.EF/Options/MasterDbContextOptions.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Options/MasterDbContextOptions.cs rename to src/Server/Logistics.Infrastructure.EF/Options/MasterDbContextOptions.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Options/TenantDbContextOptions.cs b/src/Server/Logistics.Infrastructure.EF/Options/TenantDbContextOptions.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Options/TenantDbContextOptions.cs rename to src/Server/Logistics.Infrastructure.EF/Options/TenantDbContextOptions.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Persistence/MasterRepository.cs b/src/Server/Logistics.Infrastructure.EF/Persistence/MasterRepository.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Persistence/MasterRepository.cs rename to src/Server/Logistics.Infrastructure.EF/Persistence/MasterRepository.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Persistence/MasterUnitOfWork.cs b/src/Server/Logistics.Infrastructure.EF/Persistence/MasterUnitOfWork.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Persistence/MasterUnitOfWork.cs rename to src/Server/Logistics.Infrastructure.EF/Persistence/MasterUnitOfWork.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Persistence/Repository.cs b/src/Server/Logistics.Infrastructure.EF/Persistence/Repository.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Persistence/Repository.cs rename to src/Server/Logistics.Infrastructure.EF/Persistence/Repository.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Persistence/SpecificationEvaluator.cs b/src/Server/Logistics.Infrastructure.EF/Persistence/SpecificationEvaluator.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Persistence/SpecificationEvaluator.cs rename to src/Server/Logistics.Infrastructure.EF/Persistence/SpecificationEvaluator.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Persistence/TenantRepository.cs b/src/Server/Logistics.Infrastructure.EF/Persistence/TenantRepository.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Persistence/TenantRepository.cs rename to src/Server/Logistics.Infrastructure.EF/Persistence/TenantRepository.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Persistence/TenantUnitOfWork.cs b/src/Server/Logistics.Infrastructure.EF/Persistence/TenantUnitOfWork.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Persistence/TenantUnitOfWork.cs rename to src/Server/Logistics.Infrastructure.EF/Persistence/TenantUnitOfWork.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Registrar.cs b/src/Server/Logistics.Infrastructure.EF/Registrar.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Registrar.cs rename to src/Server/Logistics.Infrastructure.EF/Registrar.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Services/TenantDatabaseService.cs b/src/Server/Logistics.Infrastructure.EF/Services/TenantDatabaseService.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Services/TenantDatabaseService.cs rename to src/Server/Logistics.Infrastructure.EF/Services/TenantDatabaseService.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Services/TenantService.cs b/src/Server/Logistics.Infrastructure.EF/Services/TenantService.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Services/TenantService.cs rename to src/Server/Logistics.Infrastructure.EF/Services/TenantService.cs diff --git a/src/Core/Logistics.Infrastructure.EF/Services/UserService.cs b/src/Server/Logistics.Infrastructure.EF/Services/UserService.cs similarity index 100% rename from src/Core/Logistics.Infrastructure.EF/Services/UserService.cs rename to src/Server/Logistics.Infrastructure.EF/Services/UserService.cs diff --git a/src/Core/Logistics.Mappings/AddressMapper.cs b/src/Server/Logistics.Mappings/AddressMapper.cs similarity index 100% rename from src/Core/Logistics.Mappings/AddressMapper.cs rename to src/Server/Logistics.Mappings/AddressMapper.cs diff --git a/src/Core/Logistics.Mappings/CustomerMapper.cs b/src/Server/Logistics.Mappings/CustomerMapper.cs similarity index 100% rename from src/Core/Logistics.Mappings/CustomerMapper.cs rename to src/Server/Logistics.Mappings/CustomerMapper.cs diff --git a/src/Core/Logistics.Mappings/EmployeeMapper.cs b/src/Server/Logistics.Mappings/EmployeeMapper.cs similarity index 100% rename from src/Core/Logistics.Mappings/EmployeeMapper.cs rename to src/Server/Logistics.Mappings/EmployeeMapper.cs diff --git a/src/Core/Logistics.Mappings/InvoiceMapper.cs b/src/Server/Logistics.Mappings/InvoiceMapper.cs similarity index 100% rename from src/Core/Logistics.Mappings/InvoiceMapper.cs rename to src/Server/Logistics.Mappings/InvoiceMapper.cs diff --git a/src/Core/Logistics.Mappings/LoadMapper.cs b/src/Server/Logistics.Mappings/LoadMapper.cs similarity index 100% rename from src/Core/Logistics.Mappings/LoadMapper.cs rename to src/Server/Logistics.Mappings/LoadMapper.cs diff --git a/src/Core/Logistics.Mappings/Logistics.Mappings.csproj b/src/Server/Logistics.Mappings/Logistics.Mappings.csproj similarity index 100% rename from src/Core/Logistics.Mappings/Logistics.Mappings.csproj rename to src/Server/Logistics.Mappings/Logistics.Mappings.csproj diff --git a/src/Core/Logistics.Mappings/NotificationMapper.cs b/src/Server/Logistics.Mappings/NotificationMapper.cs similarity index 100% rename from src/Core/Logistics.Mappings/NotificationMapper.cs rename to src/Server/Logistics.Mappings/NotificationMapper.cs diff --git a/src/Core/Logistics.Mappings/PaymentMapper.cs b/src/Server/Logistics.Mappings/PaymentMapper.cs similarity index 100% rename from src/Core/Logistics.Mappings/PaymentMapper.cs rename to src/Server/Logistics.Mappings/PaymentMapper.cs diff --git a/src/Core/Logistics.Mappings/PayrollMapper.cs b/src/Server/Logistics.Mappings/PayrollMapper.cs similarity index 100% rename from src/Core/Logistics.Mappings/PayrollMapper.cs rename to src/Server/Logistics.Mappings/PayrollMapper.cs diff --git a/src/Core/Logistics.Mappings/SubscriptionMapper.cs b/src/Server/Logistics.Mappings/SubscriptionMapper.cs similarity index 100% rename from src/Core/Logistics.Mappings/SubscriptionMapper.cs rename to src/Server/Logistics.Mappings/SubscriptionMapper.cs diff --git a/src/Core/Logistics.Mappings/SubscriptionPaymentMapper.cs b/src/Server/Logistics.Mappings/SubscriptionPaymentMapper.cs similarity index 100% rename from src/Core/Logistics.Mappings/SubscriptionPaymentMapper.cs rename to src/Server/Logistics.Mappings/SubscriptionPaymentMapper.cs diff --git a/src/Core/Logistics.Mappings/SubscriptionPlanMapper.cs b/src/Server/Logistics.Mappings/SubscriptionPlanMapper.cs similarity index 100% rename from src/Core/Logistics.Mappings/SubscriptionPlanMapper.cs rename to src/Server/Logistics.Mappings/SubscriptionPlanMapper.cs diff --git a/src/Core/Logistics.Mappings/TenantMapper.cs b/src/Server/Logistics.Mappings/TenantMapper.cs similarity index 100% rename from src/Core/Logistics.Mappings/TenantMapper.cs rename to src/Server/Logistics.Mappings/TenantMapper.cs diff --git a/src/Core/Logistics.Mappings/TruckMapper.cs b/src/Server/Logistics.Mappings/TruckMapper.cs similarity index 100% rename from src/Core/Logistics.Mappings/TruckMapper.cs rename to src/Server/Logistics.Mappings/TruckMapper.cs diff --git a/src/Core/Logistics.Mappings/UserMapper.cs b/src/Server/Logistics.Mappings/UserMapper.cs similarity index 100% rename from src/Core/Logistics.Mappings/UserMapper.cs rename to src/Server/Logistics.Mappings/UserMapper.cs diff --git a/test/Logistics.Application.Admin.Tests/Logistics.Application.Admin.Tests.csproj b/test/Logistics.Application.Admin.Tests/Logistics.Application.Admin.Tests.csproj index c6075d0aa..ff2b72759 100644 --- a/test/Logistics.Application.Admin.Tests/Logistics.Application.Admin.Tests.csproj +++ b/test/Logistics.Application.Admin.Tests/Logistics.Application.Admin.Tests.csproj @@ -21,7 +21,7 @@ - +