Changeset 945

Timestamp:

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

Author:

msteinbi

Message:

Implementation of UserRoleManager (#417)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Contracts/ApplicationConstants.cs (modified) (1 diff)
• HeuristicLab.Hive.Contracts/Interfaces/IUserRoleManager.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/ServerConsoleFacade.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/UserRoleManager.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Hive.Contracts/ApplicationConstants.cs

@@ -29 +29 @@
     public static string RESPONSE_CLIENT_RESOURCE_REMOVED = "Client.ResourceRemoved";
     public static string RESPONSE_CLIENT_RESOURCE_NOT_FOUND = "Client.ResourceNotFound";
+    public static string RESPONSE_CLIENT_PERMISSIONOWNER_DOESNT_EXIST = "Client.PermissionOwnerDoesntExist";
 
     public static string RESPONSE_COMMUNICATOR_HARDBEAT_RECEIVED = "Communicator.HeardbeatReceived";

trunk/sources/HeuristicLab.Hive.Contracts/Interfaces/IUserRoleManager.cs

@@ -25 +25 @@
     ResponseList<UserGroup> GetAllUserGroups();
     [OperationContract]
-    Response AddPermissionOwnerToGroup(long groupId, PermissionOwner permissionOwner);
+    Response AddUserToGroup(long groupId, long userId);
+    [OperationContract]
+    Response AddUserGroupToGroup(long groupId, long groupToAddId);
     [OperationContract]
     Response RemovePermissionOwnerFromGroup(long groupId, long userId);

trunk/sources/HeuristicLab.Hive.Server.Core/ServerConsoleFacade.cs

@@ -96 +96 @@
     }
 
-    public Response AddPermissionOwnerToGroup(long groupId, PermissionOwner permissionOwner) {
-      return userRoleManager.AddPermissionOwnerToGroup(groupId, permissionOwner);
+    public Response AddUserToGroup(long groupId, long userId) {
+      return userRoleManager.AddUserToGroup(groupId, userId);
+    }
+
+    public Response AddUserGroupToGroup(long groupId, long groupToAddId) {
+      return userRoleManager.AddUserGroupToGroup(groupId, groupToAddId);
     }
 

trunk/sources/HeuristicLab.Hive.Server.Core/UserRoleManager.cs

@@ -15 +15 @@
     IUserAdapter userAdapter;
     IUserGroupAdapter userGroupAdapter;
+    IPermissionOwnerAdapter permissionOwnerAdapter;
 
     public UserRoleManager() {
@@ -105 +106 @@
     }
 
-    public Response AddPermissionOwnerToGroup(long groupId, PermissionOwner permissionOwner) {
+    public Response AddUserToGroup(long groupId, long userId) {
       Response response = new Response();
 
-      if (permissionOwner.PermissionOwnerId != 0) {
+      User user = userAdapter.GetUserById(userId);
+      if (user == null) {
         response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_USERROLE_ID_MUST_NOT_BE_SET;
+        response.StatusMessage = ApplicationConstants.RESPONSE_USERROLE_USER_DOESNT_EXIST;
         return response;
       }
@@ -120 +122 @@
         return response;
       }
-      userGroup.Members.Add(permissionOwner);
+      userGroup.Members.Add(user);
       userGroupAdapter.UpdateUserGroup(userGroup);
 
       response.Success = true;
       response.StatusMessage = ApplicationConstants.RESPONSE_USERROLE_PERMISSIONOWNER_ADDED;
+
+      return response;
+    }
+
+    public Response AddUserGroupToGroup(long groupId, long groupToAddId) {
+      Response response = new Response();
 
       return response;