Ticket #111 : Change EFCore Configuration - BPMN

Author: habarthierry-hue

CaseManagement.sln

@@ -49,8 +49,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.BPMN.Tests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.Common.SqlServer", "src\CaseManagement.Common.SqlServer\CaseManagement.Common.SqlServer.csproj", "{4EB1F71A-2BC1-4E17-9B66-06F941F1AD8E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.BPMN.Common", "src\CaseManagement.BPMN.Common\CaseManagement.BPMN.Common.csproj", "{4B9657CB-5DA0-4B99-A49A-BB626947216F}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "03. HumanTasks", "03. HumanTasks", "{F1D09F77-52D3-46B7-B1FB-6FEAAE3BEB54}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CaseManagement.HumanTask", "src\CaseManagement.HumanTask\CaseManagement.HumanTask.csproj", "{7F498C8B-81B7-421E-917B-F2B1143BD900}"
@@ -145,10 +143,6 @@ Global
 		{4EB1F71A-2BC1-4E17-9B66-06F941F1AD8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4EB1F71A-2BC1-4E17-9B66-06F941F1AD8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4EB1F71A-2BC1-4E17-9B66-06F941F1AD8E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4B9657CB-5DA0-4B99-A49A-BB626947216F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B9657CB-5DA0-4B99-A49A-BB626947216F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B9657CB-5DA0-4B99-A49A-BB626947216F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4B9657CB-5DA0-4B99-A49A-BB626947216F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7F498C8B-81B7-421E-917B-F2B1143BD900}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7F498C8B-81B7-421E-917B-F2B1143BD900}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7F498C8B-81B7-421E-917B-F2B1143BD900}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -224,7 +218,6 @@ Global
 		{46F4E3E4-E5D8-47DB-BCB5-339CFAAF8408} = {BFF5EF7E-750D-4A02-8EA6-E296D3A97266}
 		{EF871DF5-4F12-41E5-92BA-C1BEACF0EBA6} = {A632EFC3-730B-46D7-B669-91962DFA8947}
 		{4EB1F71A-2BC1-4E17-9B66-06F941F1AD8E} = {BFF5EF7E-750D-4A02-8EA6-E296D3A97266}
-		{4B9657CB-5DA0-4B99-A49A-BB626947216F} = {905BDF27-841C-47C1-AB38-E666A582489A}
 		{7F498C8B-81B7-421E-917B-F2B1143BD900} = {F1D09F77-52D3-46B7-B1FB-6FEAAE3BEB54}
 		{9711CF4C-B393-401E-A8D2-E261097D3679} = {A632EFC3-730B-46D7-B669-91962DFA8947}
 		{E80EB5E5-2399-41FF-A479-852CC85B32F9} = {F1D09F77-52D3-46B7-B1FB-6FEAAE3BEB54}

logos/submit.svg

@@ -1,4 +1,4 @@
-using CaseManagement.BPMN.Common;
+using CaseManagement.BPMN.Domains;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;

src/CaseManagement.BPMN.AspNetCore/BPMNJobServerHostedService.cs

@@ -1,6 +1,6 @@
 // Copyright (c) SimpleIdServer. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
-using CaseManagement.BPMN.AspNetCore;
+using CaseManagement.BPMN.AspNetCore.Apis;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -32,7 +32,9 @@ public Startup(IHostingEnvironment env, IConfiguration configuration)
         public void ConfigureServices(IServiceCollection services)
         {
             var files = Directory.EnumerateFiles(Path.Combine(Directory.GetCurrentDirectory(), "Bpmns"), "*.bpmn").ToList();
-            services.AddMvc(opts => opts.EnableEndpointRouting = false).AddNewtonsoftJson();
+            services
+                .AddMvc(opts => opts.EnableEndpointRouting = false)
+                .AddNewtonsoftJson();
             services.AddAuthentication(options =>
             {
                 options.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
@@ -45,12 +47,12 @@ public void ConfigureServices(IServiceCollection services)
                     IssuerSigningKey = ExtractKey("openid_puk.txt"),
                     ValidAudiences = new List<string>
                     {
-                        "http://localhost:60000",
+                        "https://localhost:60000",
                         "https://simpleidserver.northeurope.cloudapp.azure.com/openid"
                     },
                     ValidIssuers = new List<string>
                     {
-                        "http://localhost:60000",
+                        "https://localhost:60000",
                         "https://simpleidserver.northeurope.cloudapp.azure.com/openid"
                     }
                 };
@@ -59,7 +61,6 @@ public void ConfigureServices(IServiceCollection services)
             services.AddCors(options => options.AddPolicy("AllowAll", p => p.AllowAnyOrigin()
                 .AllowAnyMethod()
                 .AllowAnyHeader()));
-            services.AddHostedService<BPMNJobServerHostedService>();
             services.AddProcessJobServer(callbackServerOpts: opts =>
             {
                 opts.WSHumanTaskAPI = "http://localhost:60006";

src/CaseManagement.BPMN.Host/Delegates/GetWeatherInformationDelegate.cs

@@ -1,4 +1,4 @@
-using CaseManagement.BPMN.Persistence.EF.Models;
+using CaseManagement.BPMN.Domains;
 using Microsoft.EntityFrameworkCore;
 
 namespace CaseManagement.BPMN.Persistence.EF
@@ -7,8 +7,8 @@ public class BPMNDbContext : DbContext
     {
         public BPMNDbContext(DbContextOptions<BPMNDbContext> dbContextOptions) : base(dbContextOptions) { }
 
-        public DbSet<ProcessInstanceModel> ProcessInstances { get; set; }
-        public DbSet<ProcessFileModel> ProcessFiles { get; set; }   
+        public DbSet<ProcessInstanceAggregate> ProcessInstances { get; set; }
+        public DbSet<ProcessFileAggregate> ProcessFiles { get; set; }   
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {

src/CaseManagement.BPMN.Host/Startup.cs

@@ -16,6 +16,7 @@
   </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>
 </Project>

src/CaseManagement.BPMN.Persistence.EF/BPMNDbContext.cs

@@ -0,0 +1,15 @@
+using CaseManagement.BPMN.Domains;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace CaseManagement.BPMN.Persistence.EF.Configuration
+{
+    public class ActivityStateHistoryConfiguration : IEntityTypeConfiguration<ActivityStateHistory>
+    {
+        public void Configure(EntityTypeBuilder<ActivityStateHistory> builder)
+        {
+            builder.Property<int>("Id").ValueGeneratedOnAdd();
+            builder.HasKey("Id");
+        }
+    }
+}

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

@@ -0,0 +1,16 @@
+using CaseManagement.BPMN.Domains;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace CaseManagement.BPMN.Persistence.EF.Configuration
+{
+    public class BPMNInterfaceConfiguration : IEntityTypeConfiguration<BPMNInterface>
+    {
+        public void Configure(EntityTypeBuilder<BPMNInterface> builder)
+        {
+            builder.Property<int>("Id").ValueGeneratedOnAdd();
+            builder.HasKey("Id");
+            builder.HasMany(_ => _.Operations).WithOne().OnDelete(DeleteBehavior.Cascade);
+        }
+    }
+}