refactor to new structure and fix memory leak

EasyMicroservices · Sep 28, 2023 · be3aca4 · be3aca4
1 parent df54946
commit be3aca4
Show file tree

Hide file tree

Showing 18 changed files with 51 additions and 450 deletions.
diff --git a/...Sharp/EasyMicroservices.ContentsMicroservice.Database/Database/Contexts/ContentContext.cs b/...Sharp/EasyMicroservices.ContentsMicroservice.Database/Database/Contexts/ContentContext.cs
@@ -1,30 +1,21 @@
 using EasyMicroservices.ContentsMicroservice.Database.Entities;
 using EasyMicroservices.Cores.Relational.EntityFrameworkCore;
+using EasyMicroservices.Cores.Relational.EntityFrameworkCore.Intrerfaces;
 using Microsoft.EntityFrameworkCore;
 using System;
 
 namespace EasyMicroservices.ContentsMicroservice.Database.Contexts
 {
     public class ContentContext : RelationalCoreContext
     {
-        IDatabaseBuilder _builder;
-        public ContentContext(IDatabaseBuilder builder)
+        public ContentContext(IEntityFrameworkCoreDatabaseBuilder builder) : base(builder)
         {
-            _builder = builder;
         }
 
         public DbSet<CategoryEntity> Categories { get; set; }
         public DbSet<ContentEntity> Contents { get; set; }
         public DbSet<LanguageEntity> Languages { get; set; }
 
-
-        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-        {
-            if (_builder != null)
-                _builder.OnConfiguring(optionsBuilder);
-            base.OnConfiguring(optionsBuilder);
-        }
-
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             base.OnModelCreating(modelBuilder);

diff --git a/src/CSharp/EasyMicroservices.ContentsMicroservice.Database/Database/IDatabaseBuilder.cs b/src/CSharp/EasyMicroservices.ContentsMicroservice.Database/Database/IDatabaseBuilder.cs
diff --git a/...ices.ContentsMicroservice.Database/EasyMicroservices.ContentsMicroservice.Database.csproj b/...ices.ContentsMicroservice.Database/EasyMicroservices.ContentsMicroservice.Database.csproj
@@ -12,8 +12,8 @@
 
   <ItemGroup>
 	  <PackageReference Include="EasyMicroservices.Configuration" Version="0.0.0.2" />
-	  <PackageReference Include="EasyMicroservices.Cores.Relational.EntityFrameworkCore" Version="0.0.0.20" />
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.10" />
+	  <!--<PackageReference Include="EasyMicroservices.Cores.Relational.EntityFrameworkCore" Version="0.0.0.23" />-->
+	  <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.11" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...services.ContentsMicroservice.Domain/EasyMicroservices.ContentsMicroservice.Domain.csproj b/...services.ContentsMicroservice.Domain/EasyMicroservices.ContentsMicroservice.Domain.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-	  <PackageReference Include="EasyMicroservices.Cores.Database" Version="0.0.0.32" />
+    <PackageReference Include="EasyMicroservices.Cores.AspEntityFrameworkCoreApi" Version="0.0.0.18" />
   </ItemGroup>
 
 </Project>
diff --git a/src/CSharp/EasyMicroservices.ContentsMicroservice.Logics/AppUnitOfWork.cs b/src/CSharp/EasyMicroservices.ContentsMicroservice.Logics/AppUnitOfWork.cs
diff --git a/...services.ContentsMicroservice.Logics/EasyMicroservices.ContentsMicroservice.Logics.csproj b/...services.ContentsMicroservice.Logics/EasyMicroservices.ContentsMicroservice.Logics.csproj
@@ -6,14 +6,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="EasyMicroservices.Cores.AspEntityFrameworkCoreApi" Version="0.0.0.12" />
     <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>
 
   <ItemGroup>
     <Folder Include="DatabaseLogics\" />
+    <Folder Include="Helpers\" />
+    <Folder Include="Interfaces\" />
     <Folder Include="Mappers\" />
   </ItemGroup>
 

diff --git a/src/CSharp/EasyMicroservices.ContentsMicroservice.Logics/Helpers/ApplicationManager.cs b/src/CSharp/EasyMicroservices.ContentsMicroservice.Logics/Helpers/ApplicationManager.cs
diff --git a/src/CSharp/EasyMicroservices.ContentsMicroservice.Logics/Interfaces/IDependencyManager.cs b/src/CSharp/EasyMicroservices.ContentsMicroservice.Logics/Interfaces/IDependencyManager.cs
diff --git a/src/CSharp/EasyMicroservices.ContentsMicroservice.StartUp/DatabaseBuilder.cs b/src/CSharp/EasyMicroservices.ContentsMicroservice.StartUp/DatabaseBuilder.cs
@@ -1,4 +1,5 @@
 using EasyMicroservices.ContentsMicroservice.Database;
+using EasyMicroservices.Cores.Relational.EntityFrameworkCore.Intrerfaces;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using System;
@@ -9,16 +10,18 @@
 
 namespace EasyMicroservices.ContentsMicroservice
 {
-    public class DatabaseBuilder : IDatabaseBuilder
+    public class DatabaseBuilder : IEntityFrameworkCoreDatabaseBuilder
     {
-        readonly IConfiguration config = new ConfigurationBuilder()
-        .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
-        .Build();
+        IConfiguration _configuration;
+        public DatabaseBuilder(IConfiguration configuration)
+        {
+            _configuration = configuration;
+        }
 
         public void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             optionsBuilder.UseInMemoryDatabase("ContentDatabase");
-            //optionsBuilder.UseSqlServer(config.GetConnectionString("local"));
+            //optionsBuilder.UseSqlServer(_configuration.GetConnectionString("local"));
         }
     }
 }
diff --git a/src/CSharp/EasyMicroservices.ContentsMicroservice.StartUp/DependencyManager.cs b/src/CSharp/EasyMicroservices.ContentsMicroservice.StartUp/DependencyManager.cs
diff --git a/...rvices.ContentsMicroservice.StartUp/EasyMicroservices.ContentsMicroservice.StartUp.csproj b/...rvices.ContentsMicroservice.StartUp/EasyMicroservices.ContentsMicroservice.StartUp.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="EasyMicroservices.WhiteLabelsMicroservice.Clients" Version="0.0.0.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.11" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
   </ItemGroup>

diff --git a/src/CSharp/EasyMicroservices.ContentsMicroservice.StartUp/StartUp.cs b/src/CSharp/EasyMicroservices.ContentsMicroservice.StartUp/StartUp.cs
diff --git a/src/CSharp/EasyMicroservices.ContentsMicroservice.StartUp/WhiteLabelManager.cs b/src/CSharp/EasyMicroservices.ContentsMicroservice.StartUp/WhiteLabelManager.cs