Changeset 937 for trunk/sources/HeuristicLab.Hive.Server.Core

Timestamp:

12/10/08 13:47:17 (16 years ago)

Author:

msteinbi

Message:

Implementation of UserRoleManager (#417)

Location:

trunk/sources/HeuristicLab.Hive.Server.Core

Files:

• ClientManager.cs (modified) (2 diffs)
• UserRoleManager.cs (modified) (3 diffs)

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

@@ -43 +43 @@
       clientGroups = new List<ClientGroup>();
 
-      ClientGroup cg = new ClientGroup { ResourceId = 4, Name = "SuperGroup", ClientGroupId = 1 };
+      ClientGroup cg = new ClientGroup { ResourceId = 4, Name = "SuperGroup" };
       cg.Resources = new List<Resource>();
 
@@ -78 +78 @@
 
     public Response AddClientGroup(ClientGroup clientGroup) {
-      throw new NotImplementedException();
+      Response response = new Response();
+
+      ClientGroup clientGroupFromDb = clientGroupAdapter.GetClientGroupById(clientGroup.ResourceId);
+      
+
+      return response;
     }
 

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

@@ -37 +37 @@
       Response response = new Response();
 
-      User dbUser = userAdapter.GetUserByName(user.Name);
-      if (dbUser != null) {
+      if (user.PermissionOwnerId != null) {
         response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_USERROLE_USER_EXISTS_ALLREADY;
+        response.StatusMessage = ApplicationConstants.RESPONSE_USERROLE_ID_MUST_NOT_BE_SET;
         return response;
       }
@@ -77 +76 @@
     public Response AddNewUserGroup(UserGroup userGroup) {
       Response response = new Response();
-
-      UserGroup userGroupFromDb = userGroupAdapter.GetUserGroupById(userGroup.PermissionOwnerId);
-      if (userGroupFromDb != null) {
+      
+      if (userGroup.PermissionOwnerId != null) {
         response.Success = false;
-        response.StatusMessage = ApplicationConstants.RESPONSE_USERROLE_USERGROUP_EXISTS_ALLREADY;
+        response.StatusMessage = ApplicationConstants.RESPONSE_USERROLE_ID_MUST_NOT_BE_SET;
         return response;
       }
@@ -109 +107 @@
     public Response AddPermissionOwnerToGroup(long groupId, PermissionOwner permissionOwner) {
       Response response = new Response();
-      
+
+      if (permissionOwner.PermissionOwnerId != null) {
+        response.Success = false;
+        response.StatusMessage = ApplicationConstants.RESPONSE_USERROLE_ID_MUST_NOT_BE_SET;
+        return response;
+      }
+
       UserGroup userGroup = userGroupAdapter.GetUserGroupById(groupId);
       if (userGroup == null) {