Ticket #92 : Fix BPMN EF project

Author: habarthierry-hue

src/CaseManagement.BPMN.Common/MessageToken.cs

@@ -5,10 +5,20 @@
 
 namespace CaseManagement.BPMN.Common
 {
+    [Serializable]
     public class MessageToken : ICloneable
     {
         public string Name { get; set; }
-        public JObject MessageContent { get; set; }
+        public string MessageContent { get; set; }
+
+        [field: NonSerialized]
+        public JObject JObjMessageContent
+        {
+            get
+            {
+                return string.IsNullOrWhiteSpace(MessageContent) ? new JObject() : JObject.Parse(MessageContent);
+            }
+        }
 
         private static MessageToken Deserialize(string json)
         {
@@ -42,7 +52,7 @@ public static MessageToken EmptyMessage()
             return new MessageToken();
         }
 
-        public static MessageToken NewMessage(string name, JObject content)
+        public static MessageToken NewMessage(string name, string content)
         {
             return new MessageToken
             {

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

@@ -19,7 +19,7 @@ public Task<ICollection<MessageToken>> Execute(ICollection<MessageToken> incomin
             {
                 { "city", "Bruxelles" },
                 { "degree", degree }
-            }));
+            }.ToString()));
             return Task.FromResult(result);
         }
     }

src/CaseManagement.BPMN.Host/Startup.cs

@@ -82,7 +82,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             app.UseSwagger();
             app.UseSwaggerUI(c =>
             {
-                c.SwaggerEndpoint("/swagger/v1/swagger.json", "CaseManagement API V1");
+                c.SwaggerEndpoint("/swagger/v1/swagger.json", "BPMN API V1");
             });
             app.UseAuthentication();
             app.UseCors("AllowAll");

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

@@ -1,7 +1,5 @@
 using CaseManagement.BPMN.Persistence.EF.Models;
 using Microsoft.EntityFrameworkCore;
-using System;
-using System.Threading.Tasks;
 
 namespace CaseManagement.BPMN.Persistence.EF
 {

src/CaseManagement.BPMN.Persistence.EF/Configuration/ExecutionPathModelConfiguration.cs

@@ -9,7 +9,7 @@ public class ExecutionPathModelConfiguration : IEntityTypeConfiguration<Executio
         public void Configure(EntityTypeBuilder<ExecutionPathModel> builder)
         {
             builder.HasKey(_ => _.Id);
-            builder.Property(_ => _.Id).ValueGeneratedOnAdd();
+            builder.Property(_ => _.Id).ValueGeneratedNever();
             builder.HasMany(_ => _.Pointers).WithOne().OnDelete(DeleteBehavior.Cascade);
         }
     }

src/CaseManagement.BPMN.Persistence.EF/Configuration/ExecutionPointerModelConfiguration.cs

@@ -9,7 +9,7 @@ public class ExecutionPointerModelConfiguration : IEntityTypeConfiguration<Execu
         public void Configure(EntityTypeBuilder<ExecutionPointerModel> builder)
         {
             builder.HasKey(_ => _.Id);
-            builder.Property(_ => _.Id).ValueGeneratedOnAdd();
+            builder.Property(_ => _.Id).ValueGeneratedNever();
             builder.Ignore(_ => _.Incoming);
             builder.Ignore(_ => _.Outgoing);
             builder.HasMany(_ => _.Tokens).WithOne().OnDelete(DeleteBehavior.Cascade);

src/CaseManagement.BPMN.Persistence.EF/DomainMapping/ProcessInstanceMapper.cs

@@ -21,6 +21,7 @@ public static ProcessInstanceAggregate ToDomain(this ProcessInstanceModel proces
                 CreateDateTime = processInstance.CreateDateTime,
                 ProcessFileName = processInstance.ProcessFileName,
                 Version = processInstance.Version,
+                NameIdentifier = processInstance.NameIdentifier,
                 UpdateDateTime = processInstance.UpdateDateTime,
                 Status = (ProcessInstanceStatus)processInstance.Status,
                 ElementInstances = new ConcurrentBag<FlowNodeInstance>(processInstance.ElementInstances.Select(_ => _.ToDomain()).ToList()),
@@ -85,7 +86,7 @@ public static StateTransitionNotification ToDomain(this StateTransitionTokenMode
         {
             return new StateTransitionNotification(stateTransition.Id.ToString())
             {
-                Content = stateTransition.SerializedContent == null ? null : JObject.Parse(stateTransition.SerializedContent),
+                Content = stateTransition.SerializedContent,
                 FlowNodeInstanceId = stateTransition.FlowNodeInstanceId,
                 State = stateTransition.State
             };
@@ -105,7 +106,7 @@ public static ExecutionPointer ToDomain(this ExecutionPointerModel executionPoin
         {
             return new ExecutionPointer
             {
-                Id = executionPointer.Id.ToString(),
+                Id = executionPointer.Id,
                 FlowNodeId = executionPointer.FlowNodeId,
                 IsActive = executionPointer.IsActive,
                 InstanceFlowNodeId = executionPointer.InstanceFlowNodeId,
@@ -118,7 +119,7 @@ public static MessageToken ToDomain(this MessageTokenModel messageToken)
         {
             return new MessageToken
             {
-                MessageContent = messageToken.SerializedContent == null ? null : JObject.Parse(messageToken.SerializedContent),
+                MessageContent = messageToken.SerializedContent,
                 Name = messageToken.Name
             };
         }
@@ -247,6 +248,7 @@ public static ExecutionPathModel ToModel(this ExecutionPath executionPath)
         {
             return new ExecutionPathModel
             {
+                Id = executionPath.Id,
                 CreateDateTime = executionPath.CreateDateTime,
                 Pointers = executionPath.Pointers.Select(_ => _.ToModel()).ToList()
             };
@@ -258,6 +260,7 @@ public static ExecutionPointerModel ToModel(this ExecutionPointer executionPoint
             tokens.AddRange(executionPointer.Outgoing.Select(_ => _.ToModel(MessageTokenDirections.OUTGOING)).ToList());
             return new ExecutionPointerModel
             {
+                Id = executionPointer.Id,
                 FlowNodeId = executionPointer.FlowNodeId,
                 IsActive = executionPointer.IsActive,
                 InstanceFlowNodeId = executionPointer.InstanceFlowNodeId,

src/CaseManagement.BPMN.Persistence.EF/Models/ExecutionPointerModel.cs

@@ -5,7 +5,7 @@ namespace CaseManagement.BPMN.Persistence.EF.Models
 {
     public class ExecutionPointerModel
     {
-        public long Id { get; set; }
+        public string Id { get; set; }
         public string ExecutionPathId { get; set; }
         public string InstanceFlowNodeId { get; set; }
         public string FlowNodeId { get; set; }

src/CaseManagement.BPMN.Persistence.EF/Models/ProcessInstanceModel.cs

@@ -9,6 +9,7 @@ public class ProcessInstanceModel
         public int Version { get; set; }
         public int Status { get; set; }
         public string ProcessFileId { get; set; }
+        public string NameIdentifier { get; set; }
         public string ProcessFileName { get; set; }
         public DateTime CreateDateTime { get; set; }
         public DateTime UpdateDateTime { get; set; }

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

@@ -38,25 +38,25 @@ public async Task<ProcessFileAggregate> Get(string id, CancellationToken token)
         public async Task<FindResponse<ProcessFileAggregate>> Find(FindProcessFilesParameter parameter, CancellationToken token)
         {
             IQueryable<ProcessFileModel> result = _dbContext.ProcessFiles.AsQueryable();
-            if (parameter.TakeLatest)
-            {
-                result = result.OrderByDescending(r => r.Version);
-                result = result.GroupBy(r => r.FileId).Select(r => r.First());
-            }
-
             if (MAPPING_PROCESSFILE_TO_PROPERTYNAME.ContainsKey(parameter.OrderBy))
             {
                 result = result.InvokeOrderBy(MAPPING_PROCESSFILE_TO_PROPERTYNAME[parameter.OrderBy], parameter.Order);
             }
 
             int totalLength = await result.CountAsync(token);
             result = result.Skip(parameter.StartIndex).Take(parameter.Count);
+            var content = await result.ToListAsync(token);
+            if (parameter.TakeLatest)
+            {
+                content = content.OrderByDescending(r => r.Version).GroupBy(r => r.FileId).Select(r => r.First()).ToList();
+            }
+
             return new FindResponse<ProcessFileAggregate>
             {
                 StartIndex = parameter.StartIndex,
                 Count = parameter.Count,
                 TotalLength = totalLength,
-                Content = (await result.ToListAsync(token)).Select(_ => _.ToDomain()).ToList()
+                Content = content.Select(_ => _.ToDomain()).ToList()
             };
         }
     }