Ticket #111: Update EFCore configuration

Author: habarthierry-hue

src/CaseManagement.BPMN.Persistence.EF/CaseManagement.BPMN.Persistence.EF.csproj

@@ -16,7 +16,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.3" />"
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.3" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
 </Project>

src/CaseManagement.CMMN.AspNetCore/CMMNJobServerHostedService.cs

@@ -126,9 +126,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddCors(options => options.AddPolicy("AllowAll", p => p.AllowAnyOrigin()
                 .AllowAnyMethod()
                 .AllowAnyHeader()));
-            services.AddHostedService<CMMNJobServerHostedService>();
-            services.AddCaseApi();
-            services.AddCaseJobServer(callback: opt =>
+            services.AddCaseApi(callback: opt =>
             {
                 opt.CallbackUrl = "http://localhost:60005/case-plan-instances/{id}/complete/{eltId}";
                 opt.WSHumanTaskAPI = "http://localhost:60006";

src/CaseManagement.CMMN.Host/Startup.cs

@@ -13,12 +13,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="5.0.3" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="DomainMapping\" />
-    <Folder Include="Persistence\" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="..\..\key.snk" Link="key.snk" />
   </ItemGroup>

src/CaseManagement.CMMN.Persistence.EF/CaseManagement.CMMN.Persistence.EF.csproj

@@ -1,34 +1,17 @@
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
+using CaseManagement.CMMN.Domains;
+using Microsoft.EntityFrameworkCore;
 
 namespace CaseManagement.CMMN.Persistence.EF
 {
     public class CaseManagementDbContext : DbContext
     {
-        private SemaphoreSlim _semaphoreSlim = new SemaphoreSlim(1, 1);
-
         public CaseManagementDbContext(DbContextOptions<CaseManagementDbContext> dbContextOptions) : base(dbContextOptions) { }
 
-        internal async Task<DbContextLock> Lock()
-        {
-            await _semaphoreSlim.WaitAsync();
-            return new DbContextLock(_semaphoreSlim);
-        }
-
-        public virtual DbSet<Models.RoleClaimModel> Claims { get; set; }
-        public virtual DbSet<Models.RoleModel> Roles { get; set; }
-        public virtual DbSet<Models.CaseFileModel> CaseFiles { get; set; }
-        public virtual DbSet<Models.CasePlanInstanceModel> CasePlanInstances { get; set; }
-        public virtual DbSet<Models.CasePlanModel> CasePlans { get; set; }
-        public virtual DbSet<Models.CaseWorkerTaskModel> CaseWorkers { get; set; }
-        public virtual DbSet<Models.QueueMessageModel> QueueMessageLst { get; set; }
-        public virtual DbSet<Models.ScheduledMessageModel> ScheduledMessageLst { get; set; }
-        public virtual DbSet<Models.SubscriptionModel> SubscriptionLst { get; set; }
-        public virtual DbSet<Models.CasePlanInstanceFileItemModel> CasePlanInstanceFileItemLst { get; set; }
-        public virtual DbSet<Models.CasePlanInstanceWorkerTaskModel> CasePlanInstanceWorkerTaskLst { get; set; }
-        public virtual DbSet<Models.CasePlanElementInstanceModel> CasePlanElementInstanceLst { get; set; }
+        public virtual DbSet<CaseFileAggregate> CaseFiles { get; set; }
+        public virtual DbSet<CasePlanInstanceAggregate> CasePlanInstances { get; set; }
+        public virtual DbSet<CasePlanAggregate> CasePlans { get; set; }
+        public virtual DbSet<CaseWorkerTaskAggregate> CaseWorkers { get; set; }
+        public virtual DbSet<Subscription> SubscriptionLst { get; set; }
 
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
@@ -37,19 +20,4 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.ApplyConfigurationsFromAssembly(GetType().Assembly);
         }
     }
-
-    internal class DbContextLock : IDisposable
-    {
-        private readonly SemaphoreSlim _semaphoreSlim;
-
-        public DbContextLock(SemaphoreSlim semaphoreSlim)
-        {
-            _semaphoreSlim = semaphoreSlim;
-        }
-
-        public void Dispose()
-        {
-            _semaphoreSlim.Release();
-        }
-    }
 }