chors: divide domain project lib

mtai0524 · Nov 14, 2024 · 277bdc9 · 277bdc9
1 parent 489a0ff
commit 277bdc9
Show file tree

Hide file tree

Showing 32 changed files with 68 additions and 26 deletions.
diff --git a/NotaionWebApp/Notaion/Entities/Chat.cs → ...ionWebApp/Notaion.Domain/Entities/Chat.cs b/NotaionWebApp/Notaion/Entities/Chat.cs → ...ionWebApp/Notaion.Domain/Entities/Chat.cs
@@ -1,8 +1,8 @@
-using Notaion.Models;
+using Notaion.Domain.Models;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Notaion.Entities
+namespace Notaion.Domain.Entities
 {
     [Table("Chat")]
     public class Chat

diff --git a/...ionWebApp/Notaion/Entities/ChatPrivate.cs → ...pp/Notaion.Domain/Entities/ChatPrivate.cs b/...ionWebApp/Notaion/Entities/ChatPrivate.cs → ...pp/Notaion.Domain/Entities/ChatPrivate.cs
@@ -1,8 +1,8 @@
-using Notaion.Models;
-using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.ComponentModel.DataAnnotations;
+using Notaion.Domain.Models;
 
-namespace Notaion.Entities
+namespace Notaion.Domain.Entities
 {
     [Table("ChatPrivate")]
     public class ChatPrivate

diff --git a/NotaionWebApp/Notaion/Entities/FriendShip.cs → ...App/Notaion.Domain/Entities/FriendShip.cs b/NotaionWebApp/Notaion/Entities/FriendShip.cs → ...App/Notaion.Domain/Entities/FriendShip.cs
@@ -1,8 +1,8 @@
-using Notaion.Models;
+using Notaion.Domain.Models;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Notaion.Entities
+namespace Notaion.Domain.Entities
 {
     [Table("FriendShip")]
     public class FriendShip

diff --git a/NotaionWebApp/Notaion/Entities/Item.cs → ...ionWebApp/Notaion.Domain/Entities/Item.cs b/NotaionWebApp/Notaion/Entities/Item.cs → ...ionWebApp/Notaion.Domain/Entities/Item.cs
diff --git a/...onWebApp/Notaion/Entities/Notification.cs → ...p/Notaion.Domain/Entities/Notification.cs b/...onWebApp/Notaion/Entities/Notification.cs → ...p/Notaion.Domain/Entities/Notification.cs
diff --git a/NotaionWebApp/Notaion/Entities/Page.cs → ...ionWebApp/Notaion.Domain/Entities/Page.cs b/NotaionWebApp/Notaion/Entities/Page.cs → ...ionWebApp/Notaion.Domain/Entities/Page.cs
@@ -1,8 +1,8 @@
-using Notaion.Models;
+using Notaion.Domain.Models;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Notaion.Entities
+namespace Notaion.Domain.Entities
 {
     [Table("Page")]
     public class Page

diff --git a/...otaion/Models/AcceptFriendRequestModel.cs → ...Domain/Models/AcceptFriendRequestModel.cs b/...otaion/Models/AcceptFriendRequestModel.cs → ...Domain/Models/AcceptFriendRequestModel.cs
@@ -1,4 +1,5 @@
-namespace Notaion.Models
+namespace Notaion.Domain.Models
+
 {
     public class AcceptFriendRequestModel
     {

diff --git a/...pp/Notaion/Models/ChatPrivateViewModel.cs → ...ion.Domain/Models/ChatPrivateViewModel.cs b/...pp/Notaion/Models/ChatPrivateViewModel.cs → ...ion.Domain/Models/ChatPrivateViewModel.cs
@@ -1,4 +1,5 @@
-namespace Notaion.Models
+namespace Notaion.Domain.Models
+
 {
     public class ChatPrivateViewModel
     {

diff --git a/...ionWebApp/Notaion/Models/ChatViewModel.cs → ...pp/Notaion.Domain/Models/ChatViewModel.cs b/...ionWebApp/Notaion/Models/ChatViewModel.cs → ...pp/Notaion.Domain/Models/ChatViewModel.cs
@@ -1,4 +1,5 @@
-namespace Notaion.Models
+namespace Notaion.Domain.Models
+
 {
     public class ChatViewModel
     {

diff --git a/NotaionWebApp/Notaion/Models/CreatePage.cs → ...ebApp/Notaion.Domain/Models/CreatePage.cs b/NotaionWebApp/Notaion/Models/CreatePage.cs → ...ebApp/Notaion.Domain/Models/CreatePage.cs
@@ -1,4 +1,4 @@
-namespace Notaion.Models
+namespace Notaion.Domain.Models
 {
     public class CreatePage
     {

diff --git a/NotaionWebApp/Notaion/Models/SignInModel.cs → ...bApp/Notaion.Domain/Models/SignInModel.cs b/NotaionWebApp/Notaion/Models/SignInModel.cs → ...bApp/Notaion.Domain/Models/SignInModel.cs
diff --git a/NotaionWebApp/Notaion/Models/SignUpModel.cs → ...bApp/Notaion.Domain/Models/SignUpModel.cs b/NotaionWebApp/Notaion/Models/SignUpModel.cs → ...bApp/Notaion.Domain/Models/SignUpModel.cs
@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Notaion.Models
+namespace Notaion.Domain.Models
 {
     public class SignUpModel
     {

diff --git a/...pp/Notaion/Models/UpdatePageContentDto.cs → ...ion.Domain/Models/UpdatePageContentDto.cs b/...pp/Notaion/Models/UpdatePageContentDto.cs → ...ion.Domain/Models/UpdatePageContentDto.cs
@@ -1,4 +1,5 @@
-namespace Notaion.Models
+namespace Notaion.Domain.Models
+
 {
     public class UpdatePageContentDto
     {

diff --git a/NotaionWebApp/Notaion/Models/User.cs → NotaionWebApp/Notaion.Domain/Models/User.cs b/NotaionWebApp/Notaion/Models/User.cs → NotaionWebApp/Notaion.Domain/Models/User.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Identity;
 
-namespace Notaion.Models
+namespace Notaion.Domain.Models
 {
     public class User : IdentityUser
     {

diff --git a/NotaionWebApp/Notaion/Models/UserProfile.cs → ...bApp/Notaion.Domain/Models/UserProfile.cs b/NotaionWebApp/Notaion/Models/UserProfile.cs → ...bApp/Notaion.Domain/Models/UserProfile.cs
@@ -1,4 +1,4 @@
-namespace Notaion.Models
+namespace Notaion.Domain.Models
 {
     public class UserProfile
     {

diff --git a/NotaionWebApp/Notaion.Domain/Notaion.Domain.csproj b/NotaionWebApp/Notaion.Domain/Notaion.Domain.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.10" />
+  </ItemGroup>
+
+</Project>
diff --git a/NotaionWebApp/Notaion/Context/ApplicationDbContext.cs b/NotaionWebApp/Notaion/Context/ApplicationDbContext.cs
@@ -1,6 +1,8 @@
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Notaion.Domain.Entities;
+using Notaion.Domain.Models;
 using Notaion.Entities;
 using Notaion.Models;
 

diff --git a/NotaionWebApp/Notaion/Controllers/ApiAccountController.cs b/NotaionWebApp/Notaion/Controllers/ApiAccountController.cs
@@ -13,6 +13,7 @@
 using Microsoft.AspNetCore.SignalR;
 using Notaion.Hubs;
 using Notaion.Entities;
+using Notaion.Domain.Models;
 
 namespace WebAPI.Controllers
 {

diff --git a/NotaionWebApp/Notaion/Controllers/ChatController.cs b/NotaionWebApp/Notaion/Controllers/ChatController.cs
@@ -10,6 +10,8 @@
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.AspNetCore.Authorization;
+using Notaion.Domain.Models;
+using Notaion.Domain.Entities;
 
 namespace Notaion.Controllers
 {

diff --git a/NotaionWebApp/Notaion/Controllers/ChatPrivateController.cs b/NotaionWebApp/Notaion/Controllers/ChatPrivateController.cs
@@ -3,6 +3,8 @@
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.EntityFrameworkCore;
 using Notaion.Context;
+using Notaion.Domain.Entities;
+using Notaion.Domain.Models;
 using Notaion.Entities;
 using Notaion.Hubs;
 using Notaion.Models;

diff --git a/NotaionWebApp/Notaion/Controllers/FriendShipController.cs b/NotaionWebApp/Notaion/Controllers/FriendShipController.cs
@@ -3,6 +3,8 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Notaion.Context;
+using Notaion.Domain.Entities;
+using Notaion.Domain.Models;
 using Notaion.Entities;
 using Notaion.Models;
 

diff --git a/NotaionWebApp/Notaion/Controllers/PageController.cs b/NotaionWebApp/Notaion/Controllers/PageController.cs
@@ -2,6 +2,8 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Notaion.Context;
+using Notaion.Domain.Entities;
+using Notaion.Domain.Models;
 using Notaion.Entities;
 using Notaion.Models;
 using System.Security.Claims;

diff --git a/NotaionWebApp/Notaion/Migrations/ApplicationDbContextModelSnapshot.cs b/NotaionWebApp/Notaion/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -256,7 +256,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("Chat");
+                    b.ToTable("Chat", (string)null);
                 });
 
             modelBuilder.Entity("Notaion.Entities.ChatPrivate", b =>
@@ -289,7 +289,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("ChatPrivate");
+                    b.ToTable("ChatPrivate", (string)null);
                 });
 
             modelBuilder.Entity("Notaion.Entities.FriendShip", b =>
@@ -318,7 +318,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("SenderId");
 
-                    b.ToTable("FriendShip");
+                    b.ToTable("FriendShip", (string)null);
                 });
 
             modelBuilder.Entity("Notaion.Entities.Item", b =>
@@ -340,7 +340,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasKey("Id");
 
-                    b.ToTable("Items");
+                    b.ToTable("Items", (string)null);
                 });
 
             modelBuilder.Entity("Notaion.Entities.Notification", b =>
@@ -375,7 +375,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasKey("Id");
 
-                    b.ToTable("Notification");
+                    b.ToTable("Notification", (string)null);
                 });
 
             modelBuilder.Entity("Notaion.Entities.Page", b =>
@@ -405,7 +405,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.HasIndex("UserId");
 
-                    b.ToTable("Page");
+                    b.ToTable("Page", (string)null);
                 });
 
             modelBuilder.Entity("Notaion.Models.User", b =>

diff --git a/NotaionWebApp/Notaion/Notaion.csproj b/NotaionWebApp/Notaion/Notaion.csproj
@@ -29,4 +29,8 @@
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\Notaion.Domain\Notaion.Domain.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/NotaionWebApp/Notaion/Notaion.csproj.user b/NotaionWebApp/Notaion/Notaion.csproj.user
@@ -4,7 +4,7 @@
     <ActiveDebugProfile>https</ActiveDebugProfile>
     <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Common/Api</Controller_SelectedScaffolderCategoryPath>
-    <NameOfLastUsedPublishProfile>T:\notaion-backend\NotaionWebApp\Notaion\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>T:\notaion-backend\NotaionWebApp\Notaion\Properties\PublishProfiles\site8642-WebDeploy1.pubxml</NameOfLastUsedPublishProfile>
     <WebStackScaffolding_ControllerDialogWidth>650</WebStackScaffolding_ControllerDialogWidth>
     <WebStackScaffolding_IsLayoutPageSelected>True</WebStackScaffolding_IsLayoutPageSelected>
     <WebStackScaffolding_IsPartialViewSelected>False</WebStackScaffolding_IsPartialViewSelected>

diff --git a/NotaionWebApp/Notaion/Program.cs b/NotaionWebApp/Notaion/Program.cs
@@ -10,6 +10,7 @@
 using Microsoft.IdentityModel.Tokens;
 using Notaion.Configurations;
 using Notaion.Context;
+using Notaion.Domain.Models;
 using Notaion.Hubs;
 using Notaion.Models;
 using Notaion.Repositories;

diff --git a/NotaionWebApp/Notaion/Properties/PublishProfiles/FolderProfile1.pubxml.user b/NotaionWebApp/Notaion/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>T:\IIS_NOTAION</_PublishTargetUrl>
-    <History>True|2024-10-12T13:44:23.3664909Z||;</History>
+    <History>True|2024-10-28T12:02:12.6100652Z||;True|2024-10-12T20:44:23.3664909+07:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>
diff --git a/NotaionWebApp/Notaion/Properties/PublishProfiles/site8642-WebDeploy1.pubxml.user b/NotaionWebApp/Notaion/Properties/PublishProfiles/site8642-WebDeploy1.pubxml.user
@@ -7,7 +7,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
   <PropertyGroup>
     <TimeStampOfAssociatedLegacyPublishXmlFile />
     <EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA45ACkv6Ev0Gy7utx8HyVkgAAAAACAAAAAAAQZgAAAAEAACAAAABSm0dADuKEoSXI2PM3/C+djjsZNaNJvaNktK2zzOh0ZQAAAAAOgAAAAAIAACAAAAAaubSe329ikteIzbdUehSGkeEFWcMirIFoj/tBJlG3PCAAAAAaOwJII3B0tuPaPOzYnGrfQAgIQnX5FDaCdhlVr8BQDEAAAADxwckrnekLCzuMBtAKkP1cCWMOulRqdqFNLxcPxe9HXD/Y0JACDx7eUDw/7grdO/SQQKIkbvxPSZZdbFnGYkiS</EncryptedPassword>
-    <History>True|2024-10-08T10:12:03.4740526Z||;</History>
+    <History>True|2024-10-28T12:07:16.1054653Z||;True|2024-10-08T17:12:03.4740526+07:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>
diff --git a/NotaionWebApp/Notaion/Repositories/AccountRepository.cs b/NotaionWebApp/Notaion/Repositories/AccountRepository.cs
@@ -7,6 +7,7 @@
 using CloudinaryDotNet;
 using CloudinaryDotNet.Actions;
 using Notaion.Services;
+using Notaion.Domain.Models;
 
 namespace Notaion.Repositories
 {

diff --git a/NotaionWebApp/Notaion/Repositories/IAccountRepository.cs b/NotaionWebApp/Notaion/Repositories/IAccountRepository.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Identity;
+using Notaion.Domain.Models;
 using Notaion.Models;
 
 namespace Notaion.Repositories

diff --git a/NotaionWebApp/Notaion/Services/UserService.cs b/NotaionWebApp/Notaion/Services/UserService.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Identity;
 using Microsoft.EntityFrameworkCore;
 using Notaion.Context;
+using Notaion.Domain.Models;
 using Notaion.Models;
 
 namespace Notaion.Services

diff --git a/NotaionWebApp/NotionWebApp.sln b/NotaionWebApp/NotionWebApp.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 17.8.34511.84
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Notaion", "Notaion\Notaion.csproj", "{EF90AC04-F263-48D1-AC7F-50E4D835E8D6}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Notaion.Domain", "Notaion.Domain\Notaion.Domain.csproj", "{20E32AC7-43D6-450C-A848-22C0012BD4D9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
 		{EF90AC04-F263-48D1-AC7F-50E4D835E8D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EF90AC04-F263-48D1-AC7F-50E4D835E8D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EF90AC04-F263-48D1-AC7F-50E4D835E8D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{20E32AC7-43D6-450C-A848-22C0012BD4D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20E32AC7-43D6-450C-A848-22C0012BD4D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20E32AC7-43D6-450C-A848-22C0012BD4D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20E32AC7-43D6-450C-A848-22C0012BD4D9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE