removed Domain.Shared project

suxrobGM · Aug 29, 2023 · 204fa94 · 204fa94
1 parent fe29a9d
commit 204fa94
Show file tree

Hide file tree

Showing 36 changed files with 55 additions and 68 deletions.
diff --git a/Logistics.sln b/Logistics.sln
@@ -21,8 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Client", "src\Cli
 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.Domain.Shared", "src\Core\Logistics.Domain.Shared\Logistics.Domain.Shared.csproj", "{EF791BC5-B321-47DA-BDFF-29FA15547ACC}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Blazor", "src\Client\Logistics.Blazor\Logistics.Blazor.csproj", "{6FA09C6F-13C7-483F-8CEA-0FA1987A38C1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Logistics.Blazor.Tests", "test\Logistics.Blazor.Tests\Logistics.Blazor.Tests.csproj", "{C4ADD85D-28AD-4EF0-B93D-548516CE3A20}"
@@ -117,18 +115,6 @@ Global
 		{48AA06BC-140B-49B8-AD72-95B5FC6A2D4B}.Release|iPhone.Build.0 = Release|Any CPU
 		{48AA06BC-140B-49B8-AD72-95B5FC6A2D4B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{48AA06BC-140B-49B8-AD72-95B5FC6A2D4B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{EF791BC5-B321-47DA-BDFF-29FA15547ACC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF791BC5-B321-47DA-BDFF-29FA15547ACC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF791BC5-B321-47DA-BDFF-29FA15547ACC}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{EF791BC5-B321-47DA-BDFF-29FA15547ACC}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{EF791BC5-B321-47DA-BDFF-29FA15547ACC}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{EF791BC5-B321-47DA-BDFF-29FA15547ACC}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{EF791BC5-B321-47DA-BDFF-29FA15547ACC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EF791BC5-B321-47DA-BDFF-29FA15547ACC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EF791BC5-B321-47DA-BDFF-29FA15547ACC}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{EF791BC5-B321-47DA-BDFF-29FA15547ACC}.Release|iPhone.Build.0 = Release|Any CPU
-		{EF791BC5-B321-47DA-BDFF-29FA15547ACC}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{EF791BC5-B321-47DA-BDFF-29FA15547ACC}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{6FA09C6F-13C7-483F-8CEA-0FA1987A38C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6FA09C6F-13C7-483F-8CEA-0FA1987A38C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6FA09C6F-13C7-483F-8CEA-0FA1987A38C1}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@@ -277,7 +263,6 @@ Global
 		{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}
-		{EF791BC5-B321-47DA-BDFF-29FA15547ACC} = {45FFBEC0-FFF0-4964-A506-F326A76702CC}
 		{6FA09C6F-13C7-483F-8CEA-0FA1987A38C1} = {61325513-BB52-47A8-AFDD-755454AD71F8}
 		{C4ADD85D-28AD-4EF0-B93D-548516CE3A20} = {7B06ED10-5DDF-4EFB-9CD7-37B9415EDD3D}
 		{CEE34293-FC12-4E35-999C-EEDE063F8B25} = {45FFBEC0-FFF0-4964-A506-F326A76702CC}

diff --git a/src/Client/Logistics.DriverApp/App.xaml.cs b/src/Client/Logistics.DriverApp/App.xaml.cs
@@ -1,5 +1,4 @@
-using CommunityToolkit.Maui;
-using IdentityModel.OidcClient;
+using IdentityModel.OidcClient;
 using Logistics.DriverApp.Services.Authentication;
 using Microsoft.Extensions.Configuration;
 

diff --git a/src/Client/Logistics.DriverApp/Logistics.DriverApp.csproj b/src/Client/Logistics.DriverApp/Logistics.DriverApp.csproj
@@ -68,4 +68,17 @@
 	  <ProjectReference Include="..\Logistics.Client\Logistics.Client.csproj" />
 	</ItemGroup>
 
+	<ItemGroup>
+	  <MauiXaml Update="Views\AppShell.xaml">
+	    <SubType>Designer</SubType>
+	  </MauiXaml>
+	</ItemGroup>
+
+	<ItemGroup>
+	  <Compile Update="Views\AppShell.xaml.cs">
+	    <DependentUpon>AppShell.xaml</DependentUpon>
+	    <SubType>Code</SubType>
+	  </Compile>
+	</ItemGroup>
+
 </Project>
diff --git a/src/Client/Logistics.DriverApp/AppShell.xaml → ...t/Logistics.DriverApp/Views/AppShell.xaml b/src/Client/Logistics.DriverApp/AppShell.xaml → ...t/Logistics.DriverApp/Views/AppShell.xaml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <Shell
-    x:Class="Logistics.DriverApp.AppShell"
+    x:Class="Logistics.DriverApp.Views.AppShell"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:views="clr-namespace:Logistics.DriverApp.Views">

diff --git a/...ient/Logistics.DriverApp/AppShell.xaml.cs → ...ogistics.DriverApp/Views/AppShell.xaml.cs b/...ient/Logistics.DriverApp/AppShell.xaml.cs → ...ogistics.DriverApp/Views/AppShell.xaml.cs
@@ -1,4 +1,4 @@
-namespace Logistics.DriverApp;
+namespace Logistics.DriverApp.Views;
 
 public partial class AppShell : Shell
 {

diff --git a/src/Core/Logistics.Application.Admin/Commands/CreateTenant/CreateTenantCommand.cs b/src/Core/Logistics.Application.Admin/Commands/CreateTenant/CreateTenantCommand.cs
@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using Logistics.Domain.Shared.Constraints;
+using Logistics.Domain.Constraints;
 
 namespace Logistics.Application.Admin.Commands;
 

diff --git a/src/Core/Logistics.Application.Common/Logistics.Application.Common.csproj b/src/Core/Logistics.Application.Common/Logistics.Application.Common.csproj
@@ -17,7 +17,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\Shared\Logistics.Shared\Logistics.Shared.csproj" />
-    <ProjectReference Include="..\Logistics.Domain.Shared\Logistics.Domain.Shared.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Core/Logistics.Application.Tenant/Commands/CreateLoad/CreateLoadCommand.cs b/src/Core/Logistics.Application.Tenant/Commands/CreateLoad/CreateLoadCommand.cs
@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using Logistics.Domain.Shared.Constraints;
+using Logistics.Domain.Constraints;
 
 namespace Logistics.Application.Tenant.Commands;
 

diff --git a/src/Core/Logistics.Application.Tenant/Commands/UpdateLoad/UpdateLoadCommand.cs b/src/Core/Logistics.Application.Tenant/Commands/UpdateLoad/UpdateLoadCommand.cs
@@ -1,4 +1,6 @@
-namespace Logistics.Application.Tenant.Commands;
+using Logistics.Domain.Enums;
+
+namespace Logistics.Application.Tenant.Commands;
 
 public sealed class UpdateLoadCommand : RequestBase<ResponseResult>
 {

diff --git a/src/Core/Logistics.Application.Tenant/Queries/GetDrivers/GetDriversHandler.cs b/src/Core/Logistics.Application.Tenant/Queries/GetDrivers/GetDriversHandler.cs
@@ -1,4 +1,5 @@
-using Logistics.Models;
+using Logistics.Domain.Enums;
+using Logistics.Models;
 
 namespace Logistics.Application.Tenant.Queries;
 

diff --git a/src/Core/Logistics.Application.Tenant/Queries/GetOverallStats/GetOverallStatsHandler.cs b/src/Core/Logistics.Application.Tenant/Queries/GetOverallStats/GetOverallStatsHandler.cs
@@ -1,4 +1,5 @@
-using Logistics.Models;
+using Logistics.Domain.Enums;
+using Logistics.Models;
 
 namespace Logistics.Application.Tenant.Queries;
 

diff --git a/src/Core/Logistics.Application.Tenant/_Imports.cs b/src/Core/Logistics.Application.Tenant/_Imports.cs
@@ -1,12 +1,6 @@
-global using MediatR;
-global using Logistics.Application.Tenant.Commands;
-global using Logistics.Application.Tenant.Queries;
-global using Logistics.Application.Common;
-global using Logistics.Domain.Common;
+global using Logistics.Application.Common;
 global using Logistics.Domain.Entities;
 global using Logistics.Domain.Extensions;
 global using Logistics.Domain.Persistence;
 global using Logistics.Domain.Specifications;
-global using Logistics.Domain.ValueObjects;
-global using Logistics.Domain.Shared.Enums;
 global using Logistics.Shared;
diff --git a/src/Core/Logistics.DbMigrator/Services/FakeDataService.cs b/src/Core/Logistics.DbMigrator/Services/FakeDataService.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Identity;
+using Logistics.Domain.Enums;
+using Microsoft.AspNetCore.Identity;
 using Logistics.Domain.Persistence;
 
 namespace Logistics.DbMigrator.Services;

diff --git a/src/Core/Logistics.DbMigrator/Services/SeedDataService.cs b/src/Core/Logistics.DbMigrator/Services/SeedDataService.cs
@@ -1,4 +1,5 @@
 using System.Security.Claims;
+using Logistics.Domain.Enums;
 using Microsoft.AspNetCore.Identity;
 using Logistics.Shared.Policies;
 using CustomClaimTypes = Logistics.Shared.Claims.CustomClaimTypes;

diff --git a/src/Core/Logistics.DbMigrator/_Imports.cs b/src/Core/Logistics.DbMigrator/_Imports.cs
@@ -1,7 +1,5 @@
 global using Microsoft.EntityFrameworkCore;
-global using Logistics.Domain.Common;
 global using Logistics.Domain.Entities;
 global using Logistics.Domain.Services;
-global using Logistics.Domain.Shared.Enums;
 global using Logistics.Infrastructure.EF;
 global using Logistics.Infrastructure.EF.Data;
diff --git a/src/Core/Logistics.Domain.Shared/Enums/EnumType.cs b/src/Core/Logistics.Domain.Shared/Enums/EnumType.cs
diff --git a/src/Core/Logistics.Domain.Shared/Logistics.Domain.Shared.csproj b/src/Core/Logistics.Domain.Shared/Logistics.Domain.Shared.csproj
diff --git a/...s.Domain.Shared/Constraints/LoadConsts.cs → ...ogistics.Domain/Constraints/LoadConsts.cs b/...s.Domain.Shared/Constraints/LoadConsts.cs → ...ogistics.Domain/Constraints/LoadConsts.cs
@@ -1,4 +1,4 @@
-namespace Logistics.Domain.Shared.Constraints;
+namespace Logistics.Domain.Constraints;
 
 public static class LoadConsts
 {

diff --git a/...s.Domain.Shared/Constraints/RoleConsts.cs → ...ogistics.Domain/Constraints/RoleConsts.cs b/...s.Domain.Shared/Constraints/RoleConsts.cs → ...ogistics.Domain/Constraints/RoleConsts.cs
@@ -1,4 +1,4 @@
-namespace Logistics.Domain.Shared.Constraints;
+namespace Logistics.Domain.Constraints;
 
 public static class RoleConsts
 {

diff --git a/...Domain.Shared/Constraints/TenantConsts.cs → ...istics.Domain/Constraints/TenantConsts.cs b/...Domain.Shared/Constraints/TenantConsts.cs → ...istics.Domain/Constraints/TenantConsts.cs
@@ -1,4 +1,4 @@
-namespace Logistics.Domain.Shared.Constraints;
+namespace Logistics.Domain.Constraints;
 
 public static class TenantConsts
 {

diff --git a/...s.Domain.Shared/Constraints/UserConsts.cs → ...ogistics.Domain/Constraints/UserConsts.cs b/...s.Domain.Shared/Constraints/UserConsts.cs → ...ogistics.Domain/Constraints/UserConsts.cs
@@ -1,4 +1,4 @@
-namespace Logistics.Domain.Shared.Constraints;
+namespace Logistics.Domain.Constraints;
 
 public static class UserConsts
 {

diff --git a/src/Core/Logistics.Domain/Entities/AppRole.cs b/src/Core/Logistics.Domain/Entities/AppRole.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Identity;
+using Logistics.Domain.Constraints;
+using Microsoft.AspNetCore.Identity;
 
 namespace Logistics.Domain.Entities;
 

diff --git a/src/Core/Logistics.Domain/Entities/Load.cs b/src/Core/Logistics.Domain/Entities/Load.cs
@@ -1,4 +1,6 @@
-using Logistics.Domain.Events;
+using Logistics.Domain.Constraints;
+using Logistics.Domain.Enums;
+using Logistics.Domain.Events;
 
 namespace Logistics.Domain.Entities;
 

diff --git a/src/Core/Logistics.Domain/Entities/Tenant.cs b/src/Core/Logistics.Domain/Entities/Tenant.cs
@@ -1,4 +1,6 @@
-namespace Logistics.Domain.Entities;
+using Logistics.Domain.Constraints;
+
+namespace Logistics.Domain.Entities;
 
 public class Tenant : AuditableEntity
 {

diff --git a/src/Core/Logistics.Domain/Entities/TenantRole.cs b/src/Core/Logistics.Domain/Entities/TenantRole.cs
@@ -1,4 +1,6 @@
-namespace Logistics.Domain.Entities;
+using Logistics.Domain.Constraints;
+
+namespace Logistics.Domain.Entities;
 
 public class TenantRole : AuditableEntity, ITenantEntity
 {

diff --git a/src/Core/Logistics.Domain/Entities/TenantRoleClaim.cs b/src/Core/Logistics.Domain/Entities/TenantRoleClaim.cs
@@ -1,4 +1,5 @@
 using System.Security.Claims;
+using Logistics.Domain.Constraints;
 
 namespace Logistics.Domain.Entities;
 

diff --git a/src/Core/Logistics.Domain/Entities/User.cs b/src/Core/Logistics.Domain/Entities/User.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Identity;
+using Logistics.Domain.Constraints;
+using Microsoft.AspNetCore.Identity;
 
 namespace Logistics.Domain.Entities;
 

diff --git a/...Logistics.Domain.Shared/Enums/AppRoles.cs → src/Core/Logistics.Domain/Enums/AppRoles.cs b/...Logistics.Domain.Shared/Enums/AppRoles.cs → src/Core/Logistics.Domain/Enums/AppRoles.cs
@@ -1,4 +1,4 @@
-namespace Logistics.Domain.Shared.Enums;
+namespace Logistics.Domain.Enums;
 
 public static class AppRoles
 {

diff --git a/src/Core/Logistics.Domain/Enums/EnumType.cs b/src/Core/Logistics.Domain/Enums/EnumType.cs
@@ -0,0 +1,3 @@
+namespace Logistics.Domain.Enums;
+
+public record EnumType(string Value, string DisplayName);
diff --git a/...gistics.Domain.Shared/Enums/LoadStatus.cs → ...Core/Logistics.Domain/Enums/LoadStatus.cs b/...gistics.Domain.Shared/Enums/LoadStatus.cs → ...Core/Logistics.Domain/Enums/LoadStatus.cs
@@ -1,4 +1,4 @@
-namespace Logistics.Domain.Shared.Enums;
+namespace Logistics.Domain.Enums;
 
 public enum LoadStatus
 {

diff --git a/...istics.Domain.Shared/Enums/TenantRoles.cs → ...ore/Logistics.Domain/Enums/TenantRoles.cs b/...istics.Domain.Shared/Enums/TenantRoles.cs → ...ore/Logistics.Domain/Enums/TenantRoles.cs
@@ -1,4 +1,4 @@
-namespace Logistics.Domain.Shared.Enums;
+namespace Logistics.Domain.Enums;
 
 public static class TenantRoles
 {

diff --git a/src/Core/Logistics.Domain/Logistics.Domain.csproj b/src/Core/Logistics.Domain/Logistics.Domain.csproj
@@ -12,8 +12,5 @@
       <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="7.0.5" />
     </ItemGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\Logistics.Domain.Shared\Logistics.Domain.Shared.csproj" />
-    </ItemGroup>
 
 </Project>
diff --git a/src/Core/Logistics.Domain/_Imports.cs b/src/Core/Logistics.Domain/_Imports.cs
@@ -2,5 +2,3 @@
 global using System.ComponentModel.DataAnnotations;
 global using Logistics.Domain.Common;
 global using Logistics.Domain.Entities;
-global using Logistics.Domain.Shared.Constraints;
-global using Logistics.Domain.Shared.Enums;
diff --git a/src/Core/Logistics.Infrastructure.EF/Services/TenantDatabaseService.cs b/src/Core/Logistics.Infrastructure.EF/Services/TenantDatabaseService.cs
@@ -1,6 +1,7 @@
 using System.Data.Common;
 using System.Security.Claims;
 using System.Text.RegularExpressions;
+using Logistics.Domain.Enums;
 using Microsoft.Extensions.Logging;
 using Logistics.Shared.Policies;
 using Microsoft.Data.SqlClient;

diff --git a/src/Core/Logistics.Infrastructure.EF/_Imports.cs b/src/Core/Logistics.Infrastructure.EF/_Imports.cs
@@ -4,8 +4,6 @@
 global using Logistics.Domain.Options;
 global using Logistics.Domain.Services;
 global using Logistics.Domain.Persistence;
-global using Logistics.Domain.Shared;
-global using Logistics.Domain.Shared.Enums;
 global using Logistics.Infrastructure.EF.Data;
 global using Logistics.Infrastructure.EF.Options;
 global using Logistics.Infrastructure.EF.Helpers;
diff --git a/src/Server/Logistics.API/Controllers/TenantController.cs b/src/Server/Logistics.API/Controllers/TenantController.cs
@@ -1,4 +1,4 @@
-using Logistics.Domain.Shared.Enums;
+using Logistics.Domain.Enums;
 using Logistics.Models;
 
 namespace Logistics.API.Controllers;