From 00bde475d2112539b3c18a3142253f4850ba3c7c Mon Sep 17 00:00:00 2001
From: Sergey Nazarov <insight.appdev@gmail.com>
Date: Tue, 26 Mar 2024 10:14:38 +0300
Subject: [PATCH] Remove AppServices.Contracts

---
 Nocr.Users.sln                                           | 6 ------
 .../Nocr.Users.Api.Contracts.csproj                      | 4 ----
 .../Users/Dto/UserIdentityData.cs                        | 2 --
 src/Nocr.Users.Api.Contracts/Users/IUsersController.cs   | 1 -
 .../Users/UserIdentityType.cs                            | 2 +-
 .../Nocr.Users.AppServices.Contracts.csproj              | 9 ---------
 src/Nocr.Users.AppServices/Nocr.Users.AppServices.csproj | 1 -
 .../Users/Repositories/IUsersRepository.cs               | 2 +-
 .../Users/Repositories/InMemoryUsersRepository.cs        | 2 +-
 .../Users/Services/IUsersService.cs                      | 2 +-
 .../Users/Services/UsersService.cs                       | 2 +-
 src/Nocr.Users.AppServices/Users/UserIdentity.cs         | 2 +-
 src/Nocr.Users.Host/Controllers/UsersController.cs       | 2 +-
 13 files changed, 7 insertions(+), 30 deletions(-)
 rename src/{Nocr.Users.AppServices.Contracts => Nocr.Users.Api.Contracts}/Users/UserIdentityType.cs (65%)
 delete mode 100644 src/Nocr.Users.AppServices.Contracts/Nocr.Users.AppServices.Contracts.csproj

diff --git a/Nocr.Users.sln b/Nocr.Users.sln
index 23ac39a..47434f5 100644
--- a/Nocr.Users.sln
+++ b/Nocr.Users.sln
@@ -16,8 +16,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nocr.Users.Host", "src\Nocr
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nocr.Users.Api.Contracts", "src\Nocr.Users.Api.Contracts\Nocr.Users.Api.Contracts.csproj", "{4DDFB05F-DFC7-4BD6-B593-AD52CF1B002E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nocr.Users.AppServices.Contracts", "src\Nocr.Users.AppServices.Contracts\Nocr.Users.AppServices.Contracts.csproj", "{51DCF618-41C0-432A-8FD0-3EA3B70B375D}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -40,9 +38,5 @@ Global
 		{4DDFB05F-DFC7-4BD6-B593-AD52CF1B002E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4DDFB05F-DFC7-4BD6-B593-AD52CF1B002E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4DDFB05F-DFC7-4BD6-B593-AD52CF1B002E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{51DCF618-41C0-432A-8FD0-3EA3B70B375D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{51DCF618-41C0-432A-8FD0-3EA3B70B375D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{51DCF618-41C0-432A-8FD0-3EA3B70B375D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{51DCF618-41C0-432A-8FD0-3EA3B70B375D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/src/Nocr.Users.Api.Contracts/Nocr.Users.Api.Contracts.csproj b/src/Nocr.Users.Api.Contracts/Nocr.Users.Api.Contracts.csproj
index 336343d..f5671d9 100644
--- a/src/Nocr.Users.Api.Contracts/Nocr.Users.Api.Contracts.csproj
+++ b/src/Nocr.Users.Api.Contracts/Nocr.Users.Api.Contracts.csproj
@@ -10,8 +10,4 @@
       <PackageReference Include="RestEase" />
     </ItemGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\Nocr.Users.AppServices.Contracts\Nocr.Users.AppServices.Contracts.csproj" />
-    </ItemGroup>
-
 </Project>
diff --git a/src/Nocr.Users.Api.Contracts/Users/Dto/UserIdentityData.cs b/src/Nocr.Users.Api.Contracts/Users/Dto/UserIdentityData.cs
index be84ed3..97683b0 100644
--- a/src/Nocr.Users.Api.Contracts/Users/Dto/UserIdentityData.cs
+++ b/src/Nocr.Users.Api.Contracts/Users/Dto/UserIdentityData.cs
@@ -1,5 +1,3 @@
-using Nocr.Users.AppServices.Contracts.Users;
-
 namespace Nocr.Users.Api.Contracts.Users.Dto;
 
 public sealed class UserIdentityData
diff --git a/src/Nocr.Users.Api.Contracts/Users/IUsersController.cs b/src/Nocr.Users.Api.Contracts/Users/IUsersController.cs
index e888cce..86decf0 100644
--- a/src/Nocr.Users.Api.Contracts/Users/IUsersController.cs
+++ b/src/Nocr.Users.Api.Contracts/Users/IUsersController.cs
@@ -1,6 +1,5 @@
 using Nocr.Users.Api.Contracts.Users.Dto;
 using Nocr.Users.Api.Contracts.Users.Dto.Requests;
-using Nocr.Users.AppServices.Contracts.Users;
 using RestEase;
 
 namespace Nocr.Users.Api.Contracts.Users;
diff --git a/src/Nocr.Users.AppServices.Contracts/Users/UserIdentityType.cs b/src/Nocr.Users.Api.Contracts/Users/UserIdentityType.cs
similarity index 65%
rename from src/Nocr.Users.AppServices.Contracts/Users/UserIdentityType.cs
rename to src/Nocr.Users.Api.Contracts/Users/UserIdentityType.cs
index b312ba7..5434629 100644
--- a/src/Nocr.Users.AppServices.Contracts/Users/UserIdentityType.cs
+++ b/src/Nocr.Users.Api.Contracts/Users/UserIdentityType.cs
@@ -1,4 +1,4 @@
-namespace Nocr.Users.AppServices.Contracts.Users;
+namespace Nocr.Users.Api.Contracts.Users;
 
 public enum UserIdentityType
 {
diff --git a/src/Nocr.Users.AppServices.Contracts/Nocr.Users.AppServices.Contracts.csproj b/src/Nocr.Users.AppServices.Contracts/Nocr.Users.AppServices.Contracts.csproj
deleted file mode 100644
index 3a63532..0000000
--- a/src/Nocr.Users.AppServices.Contracts/Nocr.Users.AppServices.Contracts.csproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-</Project>
diff --git a/src/Nocr.Users.AppServices/Nocr.Users.AppServices.csproj b/src/Nocr.Users.AppServices/Nocr.Users.AppServices.csproj
index 1bd4ec1..b7146b5 100644
--- a/src/Nocr.Users.AppServices/Nocr.Users.AppServices.csproj
+++ b/src/Nocr.Users.AppServices/Nocr.Users.AppServices.csproj
@@ -10,7 +10,6 @@
     
     <ItemGroup>
       <ProjectReference Include="..\Nocr.Users.Api.Contracts\Nocr.Users.Api.Contracts.csproj" />
-      <ProjectReference Include="..\Nocr.Users.AppServices.Contracts\Nocr.Users.AppServices.Contracts.csproj" />
       <ProjectReference Include="..\Nocr.Users.Core\Nocr.Users.Core.csproj" />
     </ItemGroup>
 
diff --git a/src/Nocr.Users.AppServices/Users/Repositories/IUsersRepository.cs b/src/Nocr.Users.AppServices/Users/Repositories/IUsersRepository.cs
index 7696646..e04c971 100644
--- a/src/Nocr.Users.AppServices/Users/Repositories/IUsersRepository.cs
+++ b/src/Nocr.Users.AppServices/Users/Repositories/IUsersRepository.cs
@@ -1,4 +1,4 @@
-using Nocr.Users.AppServices.Contracts.Users;
+using Nocr.Users.Api.Contracts.Users;
 
 namespace Nocr.Users.AppServices.Users.Repositories;
 
diff --git a/src/Nocr.Users.AppServices/Users/Repositories/InMemoryUsersRepository.cs b/src/Nocr.Users.AppServices/Users/Repositories/InMemoryUsersRepository.cs
index 473c912..6d71113 100644
--- a/src/Nocr.Users.AppServices/Users/Repositories/InMemoryUsersRepository.cs
+++ b/src/Nocr.Users.AppServices/Users/Repositories/InMemoryUsersRepository.cs
@@ -1,4 +1,4 @@
-using Nocr.Users.AppServices.Contracts.Users;
+using Nocr.Users.Api.Contracts.Users;
 
 namespace Nocr.Users.AppServices.Users.Repositories;
 
diff --git a/src/Nocr.Users.AppServices/Users/Services/IUsersService.cs b/src/Nocr.Users.AppServices/Users/Services/IUsersService.cs
index 5d2e3be..1ce5968 100644
--- a/src/Nocr.Users.AppServices/Users/Services/IUsersService.cs
+++ b/src/Nocr.Users.AppServices/Users/Services/IUsersService.cs
@@ -1,5 +1,5 @@
+using Nocr.Users.Api.Contracts.Users;
 using Nocr.Users.Api.Contracts.Users.Dto;
-using Nocr.Users.AppServices.Contracts.Users;
 
 namespace Nocr.Users.AppServices.Users.Services;
 
diff --git a/src/Nocr.Users.AppServices/Users/Services/UsersService.cs b/src/Nocr.Users.AppServices/Users/Services/UsersService.cs
index efaf0e5..5852eb1 100644
--- a/src/Nocr.Users.AppServices/Users/Services/UsersService.cs
+++ b/src/Nocr.Users.AppServices/Users/Services/UsersService.cs
@@ -1,5 +1,5 @@
+using Nocr.Users.Api.Contracts.Users;
 using Nocr.Users.Api.Contracts.Users.Dto;
-using Nocr.Users.AppServices.Contracts.Users;
 using Nocr.Users.AppServices.Users.Repositories;
 
 namespace Nocr.Users.AppServices.Users.Services;
diff --git a/src/Nocr.Users.AppServices/Users/UserIdentity.cs b/src/Nocr.Users.AppServices/Users/UserIdentity.cs
index 0de861b..a3b081d 100644
--- a/src/Nocr.Users.AppServices/Users/UserIdentity.cs
+++ b/src/Nocr.Users.AppServices/Users/UserIdentity.cs
@@ -1,4 +1,4 @@
-using Nocr.Users.AppServices.Contracts.Users;
+using Nocr.Users.Api.Contracts.Users;
 
 namespace Nocr.Users.AppServices.Users;
 
diff --git a/src/Nocr.Users.Host/Controllers/UsersController.cs b/src/Nocr.Users.Host/Controllers/UsersController.cs
index 9926c55..9e6b486 100644
--- a/src/Nocr.Users.Host/Controllers/UsersController.cs
+++ b/src/Nocr.Users.Host/Controllers/UsersController.cs
@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
 using Nocr.Users.Api.Contracts;
+using Nocr.Users.Api.Contracts.Users;
 using Nocr.Users.Api.Contracts.Users.Dto;
 using Nocr.Users.Api.Contracts.Users.Dto.Requests;
-using Nocr.Users.AppServices.Contracts.Users;
 using Nocr.Users.AppServices.Users.Services;
 
 namespace Nocr.Users.Host.Controllers;