Re-factored DAL Observables using EF Code First !!!!!!

4 files changed, 20 insertions, 45 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs
index 0325e42ee..687c30470 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/EventTypesViewVM.cs
@@ -29,7 +29,7 @@ namespace Tango.MachineStudio.DB.ViewModels
 
             foreach (var actionType in SelectedActions)
             {
-                if (SelectedEntity.EventTypesActions.ToList().Exists(x => x.ActionTypes == actionType.Entity))
+                if (SelectedEntity.EventTypesActions.ToList().Exists(x => x.ActionType == actionType.Entity))
                 {
                     actionType.IsSelected = true;
                 }
@@ -49,22 +49,16 @@ namespace Tango.MachineStudio.DB.ViewModels
         {
             base.OnBeforeEntitySave(mode, eventType);
 
+            Adapter.Context.EventTypesActions.RemoveRange(eventType.EventTypesActions);
+
             foreach (var actionType in SelectedActions)
             {
-                var eventTypeAction = eventType.EventTypesActions.SingleOrDefault(x => x.ActionTypes == actionType.Entity);
-
-                if (eventTypeAction != null && !actionType.IsSelected)
-                {
-                    eventTypeAction.Delete();
-                    continue;
-                }
-
                 if (actionType.IsSelected)
                 {
                     eventType.EventTypesActions.Add(new EventTypesAction()
                     {
-                        ActionTypes = actionType.Entity,
-                        EventTypes = eventType,
+                        ActionType = actionType.Entity,
+                        EventType = eventType,
                         ActionTypeGuid = actionType.Entity.Guid,
                         EventTypeGuid = eventType.Guid
                     });
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs
index 49bd18822..05171b09f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/LiquidTypesViewVM.cs
@@ -49,22 +49,16 @@ namespace Tango.MachineStudio.DB.ViewModels
         {
             base.OnBeforeEntitySave(mode, liquid);
 
+            Adapter.Context.LiquidTypesRmls.RemoveRange(liquid.LiquidTypesRmls);
+
             foreach (var rml in SelectedRmls)
             {
-                var liquidRml = liquid.LiquidTypesRmls.SingleOrDefault(x => x.Rml == rml.Entity);
-
-                if (liquidRml != null && !rml.IsSelected)
-                {
-                    liquidRml.Delete();
-                    continue;
-                }
-
                 if (rml.IsSelected)
                 {
                     liquid.LiquidTypesRmls.Add(new LiquidTypesRml()
                     {
                         Rml = rml.Entity,
-                        LiquidTypes = liquid,
+                        LiquidType = liquid,
                         RmlGuid = rml.Entity.Guid,
                         LiquidTypeGuid = liquid.Guid
                     });
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs
index 8ce95f736..50caf4c6d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/RolesViewVM.cs
@@ -50,16 +50,10 @@ namespace Tango.MachineStudio.DB.ViewModels
         {
             base.OnBeforeEntitySave(mode, role);
 
+            Adapter.Context.RolesPermissions.RemoveRange(role.RolesPermissions);
+
             foreach (var permission in SelectedPermissions)
             {
-                var rolePermission = role.RolesPermissions.SingleOrDefault(x => x.Permission == permission.Entity);
-
-                if (rolePermission != null && !permission.IsSelected)
-                {
-                    rolePermission.Delete();
-                    continue;
-                }
-
                 if (permission.IsSelected)
                 {
                     role.RolesPermissions.Add(new RolesPermission()
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs
index 044b8a88a..e338746ff 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/UsersViewVM.cs
@@ -50,26 +50,19 @@ namespace Tango.MachineStudio.DB.ViewModels
         {
             base.OnBeforeEntitySave(mode, user);
 
+            Adapter.Context.UsersRoles.RemoveRange(user.UsersRoles);
+
             foreach (var role in SelectedRoles)
             {
-                var userRole = user.UsersRoles.SingleOrDefault(x => x.Role == role.Entity);
-
-                if (userRole != null)
-                {
-                    userRole.Deleted = !role.IsSelected;
-                }
-                else
+                if (role.IsSelected)
                 {
-                    if (role.IsSelected)
+                    user.UsersRoles.Add(new UsersRole()
                     {
-                        user.UsersRoles.Add(new UsersRole()
-                        {
-                            Role = role.Entity,
-                            User = user,
-                            RoleGuid = role.Entity.Guid,
-                            UserGuid = user.Guid
-                        });
-                    }
+                        Role = role.Entity,
+                        User = user,
+                        RoleGuid = role.Entity.Guid,
+                        UserGuid = user.Guid
+                    });
                 }
             }
         }
@@ -80,7 +73,7 @@ namespace Tango.MachineStudio.DB.ViewModels
 
             if (EditEntity.Email != null)
             {
-                if (Adapter.Users.ToList().Exists(x => x != EditEntity && x.Email.ToLower() == EditEntity.Email.ToLower()))
+                if (Adapter.Users.ToList().Exists(x => x.Guid != EditEntity.Guid && x.Email.ToLower() == EditEntity.Email.ToLower()))
                 {
                     ValidationErrors.Add("Email already exist");
                 }