Changeset 939 for trunk/sources/HeuristicLab.Hive.Server.ADODataAccess

Timestamp:

12/10/08 14:10:52 (16 years ago)

Author:

svonolfe

Message:

Fixed referential integrity between user and user group (#372)

Location:

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess

Files:

• PermissionOwnerAdapter.cs (modified) (1 diff)
• UserAdapter.cs (modified) (2 diffs)
• UserGroupAdapter.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/PermissionOwnerAdapter.cs

@@ -152 +152 @@
           if(row != null) {
             data.RemovePermissionOwnerRow(row);
-
+          
             return true;
           }

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/UserAdapter.cs

@@ -39 +39 @@
     private IPermissionOwnerAdapter permOwnerAdapter =
        ServiceLocator.GetPermissionOwnerAdapter();
+
+    private IUserGroupAdapter userGroupAdapter = null;
 
     public UserAdapter() {
@@ -150 +152 @@
 
         if (row != null) {
+          if (userGroupAdapter == null)
+            userGroupAdapter =
+              ServiceLocator.GetUserGroupAdapter();
+
+          ICollection<UserGroup> userGroups =
+            userGroupAdapter.MemberOf(user);
+
+          foreach (UserGroup group in userGroups) {
+            group.Members.Remove(user);
+            userGroupAdapter.UpdateUserGroup(group);
+          }
+
           data.RemoveHiveUserRow(row);
 

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/UserGroupAdapter.cs

@@ -28 +28 @@
 using HeuristicLab.Hive.Contracts.BusinessObjects;
 using System.Runtime.CompilerServices;
+using System.Data;
 
 namespace HeuristicLab.Hive.Server.ADODataAccess {
@@ -169 +170 @@
         foreach (dsHiveServer.PermissionOwner_UserGroupRow permOwnerUserGroupRow in
           userGroupRows) {
-          PermissionOwner permOwner = userGroup.Members.Single<PermissionOwner>(
-            p => p.PermissionOwnerId == permOwnerUserGroupRow.PermissionOwnerId);
+          PermissionOwner permOwner = null;
+
+          IEnumerable<PermissionOwner> permOwners =
+            from p in
+              userGroup.Members
+            where p.PermissionOwnerId == permOwnerUserGroupRow.PermissionOwnerId
+            select p;
+
+          if (permOwners.Count<PermissionOwner>() == 1)
+            permOwner = permOwners.First<PermissionOwner>();
 
           if (permOwner == null) {
@@ -234 +243 @@
 
       return allUserGroups;
+    }
+
+    public ICollection<UserGroup> MemberOf(PermissionOwner permOwner) {
+      ICollection<UserGroup> userGroups =
+        new List<UserGroup>();
+      
+      if (permOwner != null) {
+        IEnumerable<dsHiveServer.PermissionOwner_UserGroupRow> userGroupRows =
+         from userGroup in
+           permOwnerUserGroupData.AsEnumerable<dsHiveServer.PermissionOwner_UserGroupRow>()
+         where userGroup.PermissionOwnerId == permOwner.PermissionOwnerId
+         select userGroup;
+
+        foreach (dsHiveServer.PermissionOwner_UserGroupRow userGroupRow in
+          userGroupRows) {
+          UserGroup userGroup = 
+            GetUserGroupById(userGroupRow.UserGroupId);
+          userGroups.Add(userGroup);
+        }
+      }
+
+      return userGroups;
     }
 
@@ -249 +280 @@
             permOwnerUserGroupData) {
             if (permOwnerUserGroupRow.UserGroupId == group.PermissionOwnerId || 
-                permOwnerUserGroupRow.PermissionOwnerId == group.PermissionOwnerId) {
+              permOwnerUserGroupRow.PermissionOwnerId == group.PermissionOwnerId) {
               deleted.Add(permOwnerUserGroupRow);
             }