fix #58 (#59)

Author: OlzhabaevSh

source/Diol/src/Diol.Wpf.Core/Features/EntityFrameworks/EntityFrameworkService.cs

@@ -2,6 +2,7 @@
 using Diol.Share.Features.EntityFrameworks;
 using Diol.Wpf.Core.Services;
 using Prism.Events;
+using System.Collections.Generic;
 
 namespace Diol.Wpf.Core.Features.EntityFrameworks
 {
@@ -13,6 +14,8 @@ public class EntityFrameworkService
         private readonly IStore<EntityFrameworkModel> store;
         private readonly IEventAggregator eventAggregator;
 
+        private readonly Dictionary<string, int> multipleQueries = new Dictionary<string, int>();
+
         /// <summary>
         /// Initializes a new instance of the <see cref="EntityFrameworkService"/> class.
         /// </summary>
@@ -33,6 +36,11 @@ public EntityFrameworkService(
         /// <returns>The Entity Framework model item with the specified key, or the default value if not found.</returns>
         public EntityFrameworkModel GetItemOrDefault(string key)
         {
+            if (this.multipleQueries.Count >= 128) 
+            {
+                this.multipleQueries.Clear();
+            }
+
             return this.store.GetItemOrDefault(key);
         }
 
@@ -69,6 +77,44 @@ public void Update(ConnectionOpeningDto dto)
         /// <param name="dto">The command executing DTO.</param>
         public void Update(CommandExecutingDto dto)
         {
+            if(!this.multipleQueries.ContainsKey(dto.CorrelationId))
+            {
+                this.multipleQueries.Add(dto.CorrelationId, 0);
+            }
+            else
+            {
+                this.multipleQueries[dto.CorrelationId]++;
+                var relationId = this.multipleQueries[dto.CorrelationId];
+
+                var correlationId = $"{dto.CorrelationId}_{relationId}";
+
+                var prevItem = this.store
+                    .GetItemOrDefault(dto.CorrelationId);
+
+                if (prevItem == null) 
+                {
+                    return;
+                }
+
+                var processId = prevItem.ConnectionOpening.ProcessId;
+                var processName = prevItem.ConnectionOpening.ProcessName;
+                var server = prevItem.ConnectionOpening.Server;
+                var databaseName = prevItem.ConnectionOpening.Database;
+
+                var createItem = new ConnectionOpeningDto() 
+                {
+                    CorrelationId = correlationId,
+                    ProcessId = processId,
+                    ProcessName = processName,
+                    Server = server,
+                    Database = databaseName,
+                };
+
+                this.Update(createItem);
+
+                dto.CorrelationId = correlationId;
+            }
+
             var item = this.store
                 .GetItemOrDefault(dto.CorrelationId);
 
@@ -92,6 +138,13 @@ public void Update(CommandExecutingDto dto)
         /// <param name="dto">The command executed DTO.</param>
         public void Update(CommandExecutedDto dto)
         {
+            if(this.multipleQueries.ContainsKey(dto.CorrelationId))
+            {
+                var relationId = this.multipleQueries[dto.CorrelationId];
+                var correlationId = relationId > 0 ? $"{dto.CorrelationId}_{relationId}" : dto.CorrelationId;
+                dto.CorrelationId = correlationId;
+            }
+
             var item = this.store
                 .GetItemOrDefault(dto.CorrelationId);