From 99b13e27425824971342485b34942c89e59481e9 Mon Sep 17 00:00:00 2001
From: Aaron Po <apo2@uwo.ca>
Date: Wed, 11 Feb 2026 21:02:16 -0500
Subject: [PATCH] Refactor domain project structure and remove
 Domain.Validation project

---
 src/Core/API/API.Core/API.Core.csproj                |  2 +-
 src/Core/Core.slnx                                   |  3 +--
 src/Core/Database/Database.Seed/Database.Seed.csproj |  2 +-
 .../Domain.Validation/Domain.Validation.csproj       | 12 ------------
 .../Domain.Core.csproj => Domain.csproj}             |  2 +-
 .../Domain/{Domain.Core => }/Entities/UserAccount.cs |  0
 .../{Domain.Core => }/Entities/UserCredential.cs     |  0
 .../{Domain.Core => }/Entities/UserVerification.cs   |  0
 .../Repository.Core/Repository.Core.csproj           |  2 +-
 src/Core/Service/Service.Core/Service.Core.csproj    |  2 +-
 10 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 src/Core/Domain/Domain.Validation/Domain.Validation.csproj
 rename src/Core/Domain/{Domain.Core/Domain.Core.csproj => Domain.csproj} (81%)
 rename src/Core/Domain/{Domain.Core => }/Entities/UserAccount.cs (100%)
 rename src/Core/Domain/{Domain.Core => }/Entities/UserCredential.cs (100%)
 rename src/Core/Domain/{Domain.Core => }/Entities/UserVerification.cs (100%)

diff --git a/src/Core/API/API.Core/API.Core.csproj b/src/Core/API/API.Core/API.Core.csproj
index 0d83a68..55b89d1 100644
--- a/src/Core/API/API.Core/API.Core.csproj
+++ b/src/Core/API/API.Core/API.Core.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Domain\Domain.Core\Domain.Core.csproj" />
+    <ProjectReference Include="..\..\Domain\Domain.csproj" />
     <ProjectReference Include="..\..\Repository\Repository.Core\Repository.Core.csproj" />
     <ProjectReference Include="..\..\Service\Service.Core\Service.Core.csproj" />
   </ItemGroup>
diff --git a/src/Core/Core.slnx b/src/Core/Core.slnx
index 295ac8f..8555a8f 100644
--- a/src/Core/Core.slnx
+++ b/src/Core/Core.slnx
@@ -8,8 +8,7 @@
     <Project Path="Database/Database.Seed/Database.Seed.csproj" />
   </Folder>
   <Folder Name="/Domain/">
-    <Project Path="Domain/Domain.Core/Domain.Core.csproj" />
-    <Project Path="Domain/Domain.Validation/Domain.Validation.csproj" />
+    <Project Path="Domain/Domain.csproj" />
   </Folder>
   <Folder Name="/Repository/">
     <Project Path="Repository/Repository.Core/Repository.Core.csproj" />
diff --git a/src/Core/Database/Database.Seed/Database.Seed.csproj b/src/Core/Database/Database.Seed/Database.Seed.csproj
index 8d6121a..16493b5 100644
--- a/src/Core/Database/Database.Seed/Database.Seed.csproj
+++ b/src/Core/Database/Database.Seed/Database.Seed.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Domain\Domain.Core\Domain.Core.csproj" />
+    <ProjectReference Include="..\..\Domain\Domain.csproj" />
     <ProjectReference Include="..\..\Repository\Repository.Core\Repository.Core.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Core/Domain/Domain.Validation/Domain.Validation.csproj b/src/Core/Domain/Domain.Validation/Domain.Validation.csproj
deleted file mode 100644
index 7ee98f4..0000000
--- a/src/Core/Domain/Domain.Validation/Domain.Validation.csproj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-   <PropertyGroup>
-      <TargetFramework>net10.0</TargetFramework>
-      <ImplicitUsings>enable</ImplicitUsings>
-      <Nullable>enable</Nullable>
-      <RootNamespace>Domain.Validation</RootNamespace>
-   </PropertyGroup>
-
-   <ItemGroup>
-      <ProjectReference Include="..\Domain.Core\Domain.Core.csproj" />
-   </ItemGroup>
-</Project>
diff --git a/src/Core/Domain/Domain.Core/Domain.Core.csproj b/src/Core/Domain/Domain.csproj
similarity index 81%
rename from src/Core/Domain/Domain.Core/Domain.Core.csproj
rename to src/Core/Domain/Domain.csproj
index 00018cc..424ac3a 100644
--- a/src/Core/Domain/Domain.Core/Domain.Core.csproj
+++ b/src/Core/Domain/Domain.csproj
@@ -3,6 +3,6 @@
       <TargetFramework>net10.0</TargetFramework>
       <ImplicitUsings>enable</ImplicitUsings>
       <Nullable>enable</Nullable>
-      <RootNamespace>Domain.Core</RootNamespace>
+      <RootNamespace>Domain</RootNamespace>
    </PropertyGroup>
 </Project>
diff --git a/src/Core/Domain/Domain.Core/Entities/UserAccount.cs b/src/Core/Domain/Entities/UserAccount.cs
similarity index 100%
rename from src/Core/Domain/Domain.Core/Entities/UserAccount.cs
rename to src/Core/Domain/Entities/UserAccount.cs
diff --git a/src/Core/Domain/Domain.Core/Entities/UserCredential.cs b/src/Core/Domain/Entities/UserCredential.cs
similarity index 100%
rename from src/Core/Domain/Domain.Core/Entities/UserCredential.cs
rename to src/Core/Domain/Entities/UserCredential.cs
diff --git a/src/Core/Domain/Domain.Core/Entities/UserVerification.cs b/src/Core/Domain/Entities/UserVerification.cs
similarity index 100%
rename from src/Core/Domain/Domain.Core/Entities/UserVerification.cs
rename to src/Core/Domain/Entities/UserVerification.cs
diff --git a/src/Core/Repository/Repository.Core/Repository.Core.csproj b/src/Core/Repository/Repository.Core/Repository.Core.csproj
index 5878edc..6c69c3a 100644
--- a/src/Core/Repository/Repository.Core/Repository.Core.csproj
+++ b/src/Core/Repository/Repository.Core/Repository.Core.csproj
@@ -15,6 +15,6 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Domain\Domain.Core\Domain.Core.csproj" />
+    <ProjectReference Include="..\..\Domain\Domain.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Core/Service/Service.Core/Service.Core.csproj b/src/Core/Service/Service.Core/Service.Core.csproj
index 988104d..9ce9012 100644
--- a/src/Core/Service/Service.Core/Service.Core.csproj
+++ b/src/Core/Service/Service.Core/Service.Core.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Domain\Domain.Core\Domain.Core.csproj" />
+    <ProjectReference Include="..\..\Domain\Domain.csproj" />
     <ProjectReference Include="..\..\Repository\Repository.Core\Repository.Core.csproj" />
   </ItemGroup>
 </Project>