Fix some names and pakages

EasyMicroservices · Nov 22, 2023 · a8477df · a8477df
1 parent a797c9b
commit a8477df
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 50 deletions.
diff --git a/....SupportsMicroservice.ConsoleApp/EasyMicroservices.SupportsMicroservice.ConsoleApp.csproj b/....SupportsMicroservice.ConsoleApp/EasyMicroservices.SupportsMicroservice.ConsoleApp.csproj
@@ -7,10 +7,4 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="EasyMicroservices.Cores.AspCoreApi" Version="0.0.0.49" />
-    <PackageReference Include="EasyMicroservices.Cores.AspEntityFrameworkCoreApi" Version="0.0.0.49" />
-    <PackageReference Include="EasyMicroservices.Cores.Relational.EntityFrameworkCore" Version="0.0.0.49" />
-  </ItemGroup>
-
 </Project>
diff --git a/...Sharp/EasyMicroservices.SupportsMicroservice.Database/Database/Contexts/SupportContext.cs b/...Sharp/EasyMicroservices.SupportsMicroservice.Database/Database/Contexts/SupportContext.cs
@@ -17,7 +17,7 @@ public SupportContext(IEntityFrameworkCoreDatabaseBuilder builder) : base(builde
         public DbSet<TicketDepartmentEntity> TicketDepartments { get; set; }
         public DbSet<TicketEntity> Tickets { get; set; }
         public DbSet<TicketHistoryEntity> TicketHistories { get; set; }
-        public DbSet<TicketSupportTimeHistoryEntity> TicketSupportTimeHistoryHistories { get; set; }
+        public DbSet<TicketSupportTimeHistoryEntity> TicketSupportTimeHistories { get; set; }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {

diff --git a/...ices.SupportsMicroservice.Database/EasyMicroservices.SupportsMicroservice.Database.csproj b/...ices.SupportsMicroservice.Database/EasyMicroservices.SupportsMicroservice.Database.csproj
@@ -11,9 +11,6 @@
 
   <ItemGroup>
 	  <PackageReference Include="EasyMicroservices.Configuration" Version="0.0.0.2" />
-	  <PackageReference Include="EasyMicroservices.Cores.AspCoreApi" Version="0.0.0.49" />
-	  <PackageReference Include="EasyMicroservices.Cores.AspEntityFrameworkCoreApi" Version="0.0.0.49" />
-	  <PackageReference Include="EasyMicroservices.Cores.Relational.EntityFrameworkCore" Version="0.0.0.49" />
 	  <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
   </ItemGroup>
 	<ItemGroup>

diff --git a/...services.SupportsMicroservice.Domain/EasyMicroservices.SupportsMicroservice.Domain.csproj b/...services.SupportsMicroservice.Domain/EasyMicroservices.SupportsMicroservice.Domain.csproj
@@ -6,15 +6,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Folder Include="Contracts\Requests\Filters\" />
+    <Folder Include="Contracts  Requests\Filters\" />
     <Folder Include="Contracts\Responses\" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyMicroservices.Cores.AspCoreApi" Version="0.0.0.49" />
     <PackageReference Include="EasyMicroservices.Cores.AspEntityFrameworkCoreApi" Version="0.0.0.49" />
-    <PackageReference Include="EasyMicroservices.Cores.Database" Version="0.0.0.49" />
-    <PackageReference Include="EasyMicroservices.Cores.Relational.EntityFrameworkCore" Version="0.0.0.49" />
   </ItemGroup>
 
 </Project>
diff --git a/...services.SupportsMicroservice.Logics/EasyMicroservices.SupportsMicroservice.Logics.csproj b/...services.SupportsMicroservice.Logics/EasyMicroservices.SupportsMicroservice.Logics.csproj
@@ -6,10 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyMicroservices.Cores.AspCoreApi" Version="0.0.0.49" />
-    <PackageReference Include="EasyMicroservices.Cores.AspEntityFrameworkCoreApi" Version="0.0.0.49" />
-    <PackageReference Include="EasyMicroservices.Cores.Relational.EntityFrameworkCore" Version="0.0.0.49" />
-    <PackageReference Include="EasyMicroservices.Mapper.CompileTimeMapper" Version="0.0.0.6" />
+
     <PackageReference Include="EasyMicroservices.Mapper.SerializerMapper" Version="0.0.0.3" />
     <PackageReference Include="EasyMicroservices.Serialization.Newtonsoft.Json" Version="0.0.0.6" />
   </ItemGroup>

diff --git a/src/CSharp/EasyMicroservices.SupportsMicroservice.StartUp/DatabaseBuilder.cs b/src/CSharp/EasyMicroservices.SupportsMicroservice.StartUp/DatabaseBuilder.cs
@@ -20,8 +20,8 @@ public DatabaseBuilder(IConfiguration configuration)
 
         public void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
-            //optionsBuilder.UseInMemoryDatabase("CommentDatabase");
-            optionsBuilder.UseSqlServer(_configuration.GetConnectionString("local"));
+            optionsBuilder.UseInMemoryDatabase("SupportDatabase");
+            //optionsBuilder.UseSqlServer(_configuration.GetConnectionString("local"));
         }
     }
 }
diff --git a/...rvices.SupportsMicroservice.StartUp/EasyMicroservices.SupportsMicroservice.StartUp.csproj b/...rvices.SupportsMicroservice.StartUp/EasyMicroservices.SupportsMicroservice.StartUp.csproj
@@ -6,18 +6,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyMicroservices.Cores.AspCoreApi" Version="0.0.0.49" />
-    <PackageReference Include="EasyMicroservices.Cores.AspEntityFrameworkCoreApi" Version="0.0.0.49" />
-    <PackageReference Include="EasyMicroservices.Cores.Relational.EntityFrameworkCore" Version="0.0.0.49" />
-    <PackageReference Include="EasyMicroservices.WhiteLabelsMicroservice.Clients" Version="0.0.0.9" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.8" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
   </ItemGroup>
 
-	<ItemGroup>
-		<ProjectReference Include="..\EasyMicroservices.SupportsMicroservice.Services\EasyMicroservices.SupportsMicroservice.Services.csproj" />
-	</ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\EasyMicroservices.SupportsMicroservice.Logics\EasyMicroservices.SupportsMicroservice.Logics.csproj" />
+  </ItemGroup>
 
 
 </Project>
diff --git a/...roservices.SupportsMicroservice.Tests/EasyMicroservices.SupportsMicroservice.Tests.csproj b/...roservices.SupportsMicroservice.Tests/EasyMicroservices.SupportsMicroservice.Tests.csproj
@@ -10,9 +10,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyMicroservices.Cores.AspCoreApi" Version="0.0.0.49" />
-    <PackageReference Include="EasyMicroservices.Cores.AspEntityFrameworkCoreApi" Version="0.0.0.49" />
-    <PackageReference Include="EasyMicroservices.Cores.Relational.EntityFrameworkCore" Version="0.0.0.49" />
     <PackageReference Include="EasyMicroservices.Laboratory" Version="0.0.0.15" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="xunit" Version="2.6.2" />

diff --git a/src/CSharp/EasyMicroservices.SupportsMicroservice.WebApi/Controllers/DepartmentController.cs b/src/CSharp/EasyMicroservices.SupportsMicroservice.WebApi/Controllers/DepartmentController.cs
@@ -11,13 +11,11 @@ namespace EasyMicroservices.SupportsMicroservice.WebApi.Controllers
 {
     public class DepartmentController : SimpleQueryServiceController<DepartmentEntity, CreateDepartmentRequestContract, UpdateDepartmentRequestContract, DepartmentContract, long>
     {
-        private readonly IContractLogic<DepartmentEntity, CreateDepartmentRequestContract, UpdateDepartmentRequestContract, DepartmentContract, long> _contractlogic;
         public IUnitOfWork _uow;
 
         public DepartmentController(IUnitOfWork uow) : base(uow)
         {
             _uow = uow;
-            _contractlogic = uow.GetContractLogic<DepartmentEntity, CreateDepartmentRequestContract, UpdateDepartmentRequestContract, DepartmentContract, long>();
         }
     }
 }
diff --git a/...services.SupportsMicroservice.WebApi/EasyMicroservices.SupportsMicroservice.WebApi.csproj b/...services.SupportsMicroservice.WebApi/EasyMicroservices.SupportsMicroservice.WebApi.csproj
@@ -6,9 +6,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyMicroservices.Cores.AspCoreApi" Version="0.0.0.49" />
-    <PackageReference Include="EasyMicroservices.Cores.AspEntityFrameworkCoreApi" Version="0.0.0.49" />
-    <PackageReference Include="EasyMicroservices.Cores.Relational.EntityFrameworkCore" Version="0.0.0.49" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/CSharp/EasyMicroservices.SupportsMicroservice.sln b/src/CSharp/EasyMicroservices.SupportsMicroservice.sln
@@ -17,8 +17,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMicroservices.SupportsM
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMicroservices.SupportsMicroservice.Logics", "EasyMicroservices.SupportsMicroservice.Logics\EasyMicroservices.SupportsMicroservice.Logics.csproj", "{E8CBCF57-5CB3-48D6-AFB5-796AC5B6CEF0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMicroservices.SupportsMicroservice.Services", "EasyMicroservices.SupportsMicroservice.Services\EasyMicroservices.SupportsMicroservice.Services.csproj", "{44F3E28E-7E2D-4137-A4C7-A4A5FB2AB3F8}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMicroservices.SupportsMicroservice.StartUp", "EasyMicroservices.SupportsMicroservice.StartUp\EasyMicroservices.SupportsMicroservice.StartUp.csproj", "{65F43F5A-953C-4A6D-BE3F-5492FC69F3EB}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMicroservices.SupportsMicroservice.Database", "EasyMicroservices.SupportsMicroservice.Database\EasyMicroservices.SupportsMicroservice.Database.csproj", "{6B45CABC-0853-451A-BAD7-270DDE23F155}"
@@ -73,18 +71,6 @@ Global
 		{E8CBCF57-5CB3-48D6-AFB5-796AC5B6CEF0}.Release|x64.Build.0 = Release|Any CPU
 		{E8CBCF57-5CB3-48D6-AFB5-796AC5B6CEF0}.Release|x86.ActiveCfg = Release|Any CPU
 		{E8CBCF57-5CB3-48D6-AFB5-796AC5B6CEF0}.Release|x86.Build.0 = Release|Any CPU
-		{44F3E28E-7E2D-4137-A4C7-A4A5FB2AB3F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44F3E28E-7E2D-4137-A4C7-A4A5FB2AB3F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44F3E28E-7E2D-4137-A4C7-A4A5FB2AB3F8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{44F3E28E-7E2D-4137-A4C7-A4A5FB2AB3F8}.Debug|x64.Build.0 = Debug|Any CPU
-		{44F3E28E-7E2D-4137-A4C7-A4A5FB2AB3F8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{44F3E28E-7E2D-4137-A4C7-A4A5FB2AB3F8}.Debug|x86.Build.0 = Debug|Any CPU
-		{44F3E28E-7E2D-4137-A4C7-A4A5FB2AB3F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44F3E28E-7E2D-4137-A4C7-A4A5FB2AB3F8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44F3E28E-7E2D-4137-A4C7-A4A5FB2AB3F8}.Release|x64.ActiveCfg = Release|Any CPU
-		{44F3E28E-7E2D-4137-A4C7-A4A5FB2AB3F8}.Release|x64.Build.0 = Release|Any CPU
-		{44F3E28E-7E2D-4137-A4C7-A4A5FB2AB3F8}.Release|x86.ActiveCfg = Release|Any CPU
-		{44F3E28E-7E2D-4137-A4C7-A4A5FB2AB3F8}.Release|x86.Build.0 = Release|Any CPU
 		{65F43F5A-953C-4A6D-BE3F-5492FC69F3EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{65F43F5A-953C-4A6D-BE3F-5492FC69F3EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{65F43F5A-953C-4A6D-BE3F-5492FC69F3EB}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -141,7 +127,6 @@ Global
 		{6C20E582-6C19-4876-80DF-1657BE05E9C6} = {5095A63E-0C95-4352-8E6B-4586A9340BFB}
 		{854A3BAE-FA97-497B-A46D-0D64BB07A3D6} = {5095A63E-0C95-4352-8E6B-4586A9340BFB}
 		{E8CBCF57-5CB3-48D6-AFB5-796AC5B6CEF0} = {AAC7D1B4-C636-471D-8894-B1FA3D7995FB}
-		{44F3E28E-7E2D-4137-A4C7-A4A5FB2AB3F8} = {AAC7D1B4-C636-471D-8894-B1FA3D7995FB}
 		{65F43F5A-953C-4A6D-BE3F-5492FC69F3EB} = {AAC7D1B4-C636-471D-8894-B1FA3D7995FB}
 		{6B45CABC-0853-451A-BAD7-270DDE23F155} = {DD5CE7AE-185C-4AB5-A7AD-9CCB6051E804}
 		{3953230A-A3AC-414C-8A26-2E1D4605D270} = {DD5CE7AE-185C-4AB5-A7AD-9CCB6051E804}