Merge pull request CactuseSecurity#3118 from SolidProgramming/issue_2692

Merge: Fixed connection object duplication

Author: tpurschke

roles/lib/files/FWO.Services/ModellingConnectionHandler.cs

@@ -1205,19 +1205,17 @@ public async Task<bool> Save(bool noCheck = false)
                 }
                 if (noCheck || CheckConn())
                 {
-                    if (!SrcReadOnly)
+                    if(!SrcReadOnly)
                     {
                         SyncSrcChanges();
                     }
-                    if (!DstReadOnly)
+                    if(!DstReadOnly)
                     {
                         SyncDstChanges();
                     }
-                    if (!SvcReadOnly)
-                    {
-                        SyncSvcChanges();
-                    }
+
                     ActConn.SyncState(DummyAppRole.Id);
+
                     if (AddMode)
                     {
                         await AddConnectionToDb();
@@ -1282,39 +1280,7 @@ private void SyncSrcChanges()
                 {
                     SrcAppRolesToDelete.Add(linkedDummyAR.Content);
                 }
-            }
-            foreach (var appServer in SrcAppServerToDelete)
-            {
-                ActConn.SourceAppServers.Remove(ActConn.SourceAppServers.FirstOrDefault(x => x.Content.Id == appServer.Id) ?? throw new Exception("Did not find app server."));
-            }
-            foreach (var appServer in SrcAppServerToAdd)
-            {
-                ActConn.SourceAppServers.Add(new ModellingAppServerWrapper() { Content = appServer });
-            }
-            foreach (var appRole in SrcAppRolesToDelete)
-            {
-                ActConn.SourceAppRoles.Remove(ActConn.SourceAppRoles.FirstOrDefault(x => x.Content.Id == appRole.Id) ?? throw new Exception("Did not find app role."));
-            }
-            foreach (var appRole in SrcAppRolesToAdd)
-            {
-                ActConn.SourceAppRoles.Add(new ModellingAppRoleWrapper() { Content = appRole });
-            }
-            foreach (var area in SrcAreasToDelete)
-            {
-                ActConn.SourceAreas.Remove(ActConn.SourceAreas.FirstOrDefault(x => x.Content.Id == area.Id) ?? throw new Exception("Did not find area."));
-            }
-            foreach (var area in SrcAreasToAdd)
-            {
-                ActConn.SourceAreas.Add(new ModellingNetworkAreaWrapper() { Content = area });
-            }
-            foreach (var nwGroup in SrcNwGroupsToDelete)
-            {
-                ActConn.SourceOtherGroups.Remove(ActConn.SourceOtherGroups.FirstOrDefault(x => x.Content.Id == nwGroup.Id) ?? throw new Exception("Did not find nwgroup."));
-            }
-            foreach (var nwGroup in SrcNwGroupsToAdd)
-            {
-                ActConn.SourceOtherGroups.Add(new ModellingNwGroupWrapper() { Content = nwGroup });
-            }
+            }            
         }
 
         private void SyncDstChanges()
@@ -1326,59 +1292,7 @@ private void SyncDstChanges()
                 {
                     DstAppRolesToDelete.Add(linkedDummyAR.Content);
                 }
-            }
-            foreach (var appServer in DstAppServerToDelete)
-            {
-                ActConn.DestinationAppServers.Remove(ActConn.DestinationAppServers.FirstOrDefault(x => x.Content.Id == appServer.Id) ?? throw new Exception("Did not find app server."));
-            }
-            foreach (var appServer in DstAppServerToAdd)
-            {
-                ActConn.DestinationAppServers.Add(new ModellingAppServerWrapper() { Content = appServer });
-            }
-            foreach (var appRole in DstAppRolesToDelete)
-            {
-                ActConn.DestinationAppRoles.Remove(ActConn.DestinationAppRoles.FirstOrDefault(x => x.Content.Id == appRole.Id) ?? throw new Exception("Did not find app role."));
-            }
-            foreach (var appRole in DstAppRolesToAdd)
-            {
-                ActConn.DestinationAppRoles.Add(new ModellingAppRoleWrapper() { Content = appRole });
-            }
-            foreach (var area in DstAreasToDelete)
-            {
-                ActConn.DestinationAreas.Remove(ActConn.DestinationAreas.FirstOrDefault(x => x.Content.Id == area.Id) ?? throw new Exception("Did not find area."));
-            }
-            foreach (var area in DstAreasToAdd)
-            {
-                ActConn.DestinationAreas.Add(new ModellingNetworkAreaWrapper() { Content = area });
-            }
-            foreach (var nwGroup in DstNwGroupsToDelete)
-            {
-                ActConn.DestinationOtherGroups.Remove(ActConn.DestinationOtherGroups.FirstOrDefault(x => x.Content.Id == nwGroup.Id) ?? throw new Exception("Did not find nwgroup."));
-            }
-            foreach (var nwGroup in DstNwGroupsToAdd)
-            {
-                ActConn.DestinationOtherGroups.Add(new ModellingNwGroupWrapper() { Content = nwGroup });
-            }
-        }
-
-        private void SyncSvcChanges()
-        {
-            foreach (var svc in SvcToDelete)
-            {
-                ActConn.Services.Remove(ActConn.Services.FirstOrDefault(x => x.Content.Id == svc.Id) ?? throw new Exception("Did not find service."));
-            }
-            foreach (var svc in SvcToAdd)
-            {
-                ActConn.Services.Add(new ModellingServiceWrapper() { Content = svc });
-            }
-            foreach (var svcGrp in SvcGrpToDelete)
-            {
-                ActConn.ServiceGroups.Remove(ActConn.ServiceGroups.FirstOrDefault(x => x.Content.Id == svcGrp.Id) ?? throw new Exception("Did not find service group."));
-            }
-            foreach (var svcGrp in SvcGrpToAdd)
-            {
-                ActConn.ServiceGroups.Add(new ModellingServiceGroupWrapper() { Content = svcGrp });
-            }
+            }           
         }
 
         private async Task AddConnectionToDb(bool propose = false)
@@ -1412,26 +1326,15 @@ await LogChange(ModellingTypes.ChangeType.Insert, ModellingTypes.ModObjectType.C
                         $"New {( ActConn.IsInterface ? "Interface" : "Connection" )}: {ActConn.Name}", AppId);
                     if (ActConn.UsedInterfaceId == null || ActConn.DstFromInterface)
                     {
-
-                        await AddNwObjects(ModellingAppServerWrapper.Resolve(ActConn.SourceAppServers).ToList(),
-                             ModellingAppRoleWrapper.Resolve(ActConn.SourceAppRoles).ToList(),
-                             ModellingNetworkAreaWrapper.Resolve(ActConn.SourceAreas).ToList(),
-                             ModellingNwGroupWrapper.Resolve(ActConn.SourceOtherGroups).ToList(),
-                             ModellingTypes.ConnectionField.Source);
+                        await AddNwObjects(SrcAppServerToAdd, SrcAppRolesToAdd, SrcAreasToAdd, SrcNwGroupsToAdd, ModellingTypes.ConnectionField.Source);
                     }
                     if (ActConn.UsedInterfaceId == null || ActConn.SrcFromInterface)
                     {
-                        //DstAppRolesToAdd.Add(ActConn.DestinationAppRoles.First().Content);
-                        await AddNwObjects(ModellingAppServerWrapper.Resolve(ActConn.DestinationAppServers).ToList(),
-                            ModellingAppRoleWrapper.Resolve(ActConn.DestinationAppRoles).ToList(),
-                            ModellingNetworkAreaWrapper.Resolve(ActConn.DestinationAreas).ToList(),
-                            ModellingNwGroupWrapper.Resolve(ActConn.DestinationOtherGroups).ToList(),
-                            ModellingTypes.ConnectionField.Destination);
+                        await AddNwObjects(DstAppServerToAdd, DstAppRolesToAdd, DstAreasToAdd, DstNwGroupsToAdd, ModellingTypes.ConnectionField.Destination);
                     }
                     if (ActConn.UsedInterfaceId == null)
                     {
-                        await AddSvcObjects(ModellingServiceWrapper.Resolve(ActConn.Services).ToList(),
-                            ModellingServiceGroupWrapper.Resolve(ActConn.ServiceGroups).ToList());
+                        await AddSvcObjects(SvcToAdd, SvcGrpToAdd);
                     }
                     ActConn.Creator = userConfig.User.Name;
                     ActConn.CreationDate = DateTime.Now;