Ticket #111: Finish to update EFCore configuration

Author: habarthierry-hue

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

@@ -28,17 +28,7 @@ public ProcessInstanceQueryRepository(BPMNDbContext dbContext)
 
         public async Task<ProcessInstanceResult> Get(string id, CancellationToken token)
         {
-            var result = await _dbContext.ProcessInstances
-                .AsNoTracking()
-                .Include(_ => _.ItemDefs)
-                .Include(_ => _.Interfaces).ThenInclude(_ => _.Operations)
-                .Include(_ => _.Messages)
-                .Include(_ => _.ElementDefs)
-                .Include(_ => _.SequenceFlows)
-                .Include(_ => _.ExecutionPathLst).ThenInclude(_ => _.Pointers).ThenInclude(_ => _.Tokens)
-                .Include(_ => _.StateTransitions)
-                .Include(_ => _.ElementInstances).ThenInclude(_ => _.ActivityStates)
-                .FirstOrDefaultAsync(_ => _.AggregateId == id, token);
+            var result = await _dbContext.ProcessInstances.FirstOrDefaultAsync(_ => _.AggregateId == id, token);
             if (result == null)
             {
                 return null;
@@ -49,16 +39,7 @@ public async Task<ProcessInstanceResult> Get(string id, CancellationToken token)
 
         public async Task<SearchResult<ProcessInstanceResult>> Find(FindProcessInstancesParameter parameter, CancellationToken token)
         {
-            IQueryable<ProcessInstanceAggregate> result = _dbContext.ProcessInstances
-                .AsNoTracking()
-                .Include(_ => _.ItemDefs)
-                .Include(_ => _.Interfaces).ThenInclude(_ => _.Operations)
-                .Include(_ => _.Messages)
-                .Include(_ => _.ElementDefs)
-                .Include(_ => _.SequenceFlows)
-                .Include(_ => _.ExecutionPathLst).ThenInclude(_ => _.Pointers).ThenInclude(_ => _.Tokens)
-                .Include(_ => _.StateTransitions)
-                .Include(_ => _.ElementInstances).ThenInclude(_ => _.ActivityStates);
+            IQueryable<ProcessInstanceAggregate> result = _dbContext.ProcessInstances;
             if (!string.IsNullOrEmpty(parameter.ProcessFileId))
             {
                 result = result.Where(_ => _.ProcessFileId == parameter.ProcessFileId);

src/CaseManagement.BPMN.SqlServer.Host/Startup.cs

@@ -48,12 +48,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"
                     }
                 };
@@ -69,7 +69,9 @@ public void ConfigureServices(IServiceCollection services)
             });
             services.AddBPMNStoreEF(opts =>
             {
-                opts.UseSqlServer(_configuration.GetConnectionString("db"), o => o.MigrationsAssembly(migrationsAssembly));
+                opts
+                    .UseSqlServer(_configuration.GetConnectionString("db"), o => o.MigrationsAssembly(migrationsAssembly))
+                    .UseLazyLoadingProxies();
             });
             services.AddSwaggerGen();
             services.Configure<ForwardedHeadersOptions>(options =>

src/CaseManagement.BPMN/BPMNServerOptions.cs

@@ -48,7 +48,7 @@ public BPMNServerOptions()
 "    </bpmndi:BPMNPlane>" +
 "  </bpmndi:BPMNDiagram>" +
 "</definitions>";
-            OAuthTokenEndpoint = "http://localhost:60001/token";
+            OAuthTokenEndpoint = "https://localhost:60000/token";
             ClientId = "bpmnClient";
             ClientSecret = "bpmnClientSecret";
         }

src/CaseManagement.BPMN/Domains/DelegateConfiguration/DelegateConfigurationAggregate.cs

@@ -35,8 +35,8 @@ public IEnumerable<BPMNTranslation> Descriptions
                 return Translations.Where(t => t.Type == DESCRIPTION);
             }
         }
-        public ICollection<BPMNTranslation> Translations { get; set; }
-        public ICollection<DelegateConfigurationRecord> Records { get; set; }
+        public virtual ICollection<BPMNTranslation> Translations { get; set; }
+        public virtual ICollection<DelegateConfigurationRecord> Records { get; set; }
 
         #endregion
 

src/CaseManagement.BPMN/Domains/ProcessInstance/Common/BPMNInterface.cs

@@ -24,7 +24,7 @@ public BPMNInterface()
         /// This attribute specifies operations that are defined as part of the Interface.
         /// An Interface has at least one Operation.
         /// </summary>
-        public ICollection<Operation> Operations { get; set; }
+        public virtual ICollection<Operation> Operations { get; set; }
 
         public object Clone()
         {

src/CaseManagement.BPMN/Domains/ProcessInstance/Executions/ExecutionPath.cs

@@ -15,7 +15,7 @@ public ExecutionPath()
         public string Id { get; set; }
         public DateTime CreateDateTime { get; set; }
         public ICollection<ExecutionPointer> ActivePointers => Pointers.Where(_ => _.IsActive).ToList();
-        public ICollection<ExecutionPointer> Pointers { get; set; }
+        public virtual ICollection<ExecutionPointer> Pointers { get; set; }
 
         public object Clone()
         {

src/CaseManagement.BPMN/Domains/ProcessInstance/Executions/ExecutionPointer.cs

@@ -31,7 +31,7 @@ public IEnumerable<MessageToken> Outgoing
                 return Tokens.Where(t => t.Type == MessageTokenTypes.OUTGOING);
             }
         }
-        public ICollection<MessageToken> Tokens { get; set; }
+        public virtual ICollection<MessageToken> Tokens { get; set; }
 
         public void AddIncoming(IEnumerable<MessageToken> tokens)
         {

src/CaseManagement.BPMN/Domains/ProcessInstance/FlowNodeInstance.cs

@@ -17,7 +17,7 @@ public FlowNodeInstance()
         public FlowNodeStates State { get; set; }
         public ActivityStates? ActivityState { get; set; }
         public Dictionary<string, string> Metadata { get; set; }
-        public ICollection<ActivityStateHistory> ActivityStates { get; set; }
+        public virtual ICollection<ActivityStateHistory> ActivityStates { get; set; }
 
         public object Clone()
         {

src/CaseManagement.BPMN/Domains/ProcessInstance/ProcessInstanceAggregate.cs

@@ -37,14 +37,14 @@ public ICollection<BaseFlowNode> ElementDefs
                 return SerializedElementDefs.Select(e => e.Deserialize()).ToList();
             }
         }
-        public ICollection<ItemDefinition> ItemDefs { get; set; }
-        public ICollection<BPMNInterface> Interfaces { get; set; }
-        public ICollection<Message> Messages { get; set; }
-        public ICollection<SerializedFlowNodeDefinition> SerializedElementDefs { get; set; }
-        public ICollection<SequenceFlow> SequenceFlows { get; set; }
-        public ICollection<FlowNodeInstance> ElementInstances { get; set; }
-        public ICollection<ExecutionPath> ExecutionPathLst { get; set; }
-        public ICollection<StateTransitionToken> StateTransitions { get; set; }
+        public virtual ICollection<ItemDefinition> ItemDefs { get; set; }
+        public virtual ICollection<BPMNInterface> Interfaces { get; set; }
+        public virtual ICollection<Message> Messages { get; set; }
+        public virtual ICollection<SerializedFlowNodeDefinition> SerializedElementDefs { get; set; }
+        public virtual ICollection<SequenceFlow> SequenceFlows { get; set; }
+        public virtual ICollection<FlowNodeInstance> ElementInstances { get; set; }
+        public virtual ICollection<ExecutionPath> ExecutionPathLst { get; set; }
+        public virtual ICollection<StateTransitionToken> StateTransitions { get; set; }
 
         #region Getters
 

src/CaseManagement.CMMN.Persistence.EF/EntityConfigurations/CaseEltInstanceConfiguration.cs

@@ -1,6 +1,7 @@
 using CaseManagement.CMMN.Domains;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Newtonsoft.Json;
 
 namespace CaseManagement.CMMN.Persistence.EF.EntityConfigurations
 {
@@ -13,11 +14,14 @@ public void Configure(EntityTypeBuilder<CaseEltInstance> builder)
             builder.Ignore(_ => _.ExitCriterions);
             builder.Ignore(_ => _.Incoming);
             builder.Ignore(_ => _.LatestTransition);
-            builder.HasOne(_ => _.ManualActivationRule).WithOne().OnDelete(DeleteBehavior.Cascade);
-            builder.HasOne(_ => _.RepetitionRule).WithOne().OnDelete(DeleteBehavior.Cascade);
             builder.HasMany(_ => _.TransitionHistories).WithOne().OnDelete(DeleteBehavior.Cascade);
-            builder.HasMany(_ => _.Children).WithOne().OnDelete(DeleteBehavior.Cascade);
+            builder.HasMany(_ => _.Children).WithOne();
             builder.HasMany(_ => _.Properties).WithOne().OnDelete(DeleteBehavior.Cascade);
+            builder.HasMany(_ => _.Criterias).WithOne().OnDelete(DeleteBehavior.Cascade);
+            builder.Property(_ => _.ManualActivationRule).HasConversion(v => JsonConvert.SerializeObject(v),
+                v => v == null ? new ManualActivationRule() : JsonConvert.DeserializeObject<ManualActivationRule>(v));
+            builder.Property(_ => _.RepetitionRule).HasConversion(v => JsonConvert.SerializeObject(v),
+                v => v == null ? new RepetitionRule() : JsonConvert.DeserializeObject<RepetitionRule>(v));
         }
     }
 }