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

Timestamp:

12/04/08 16:35:24 (15 years ago)

Author:

msteinbi

Message:

Implementation of UserRoleManager (#417)

Location:

trunk/sources/HeuristicLab.Hive.Server.Core

Files:

• ClientCommunicator.cs (modified) (3 diffs)
• ClientManager.cs (modified) (2 diffs)
• HiveServerMessages.resx (modified) (1 diff)
• JobManager.cs (modified) (2 diffs)
• ServerConsoleFacade.cs (modified) (4 diffs)
• UserRoleManager.cs (modified) (3 diffs)

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

@@ -44 +44 @@
           if (client.State != State.offline) {
             response.Success = false;
-            response.StatusMessage = rm.GetString("UserAllreadyOnline");
+            response.StatusMessage = rm.GetString(ApplicationConstants.RESPONSE_LOGIN_USER_ALLREADY_ONLINE);
             break;
           } else
@@ -54 +54 @@
         clientAdapter.UpdateClient(clientInfo);
         response.Success = true;
-        response.StatusMessage = rm.GetString("LoginSuccess");
+        response.StatusMessage = rm.GetString(ApplicationConstants.RESPONSE_LOGIN_SUCCESS);
       }
 
@@ -97 +97 @@
                            
     public Response Logout(Guid clientId) {
-      bool clientRemoved = false;
-      foreach (ClientInfo client in clients) {
-        if (client.ClientId.Equals(clientId)) {
-          clients.Remove(client);
-          clientRemoved = true;
-        }
-      }
       Response response = new Response();
       
-      if (clientRemoved) {
-        response.Success = true;
-        response.StatusMessage = "Successfully logged out. Good bye";
-      } else {
+      ClientInfo client = clientAdapter.GetClientById(clientId);
+      if (client == null) {
         response.Success = false;
-        response.StatusMessage = "Sorry, but you weren't logged in";
+        response.StatusMessage = rm.GetString(ApplicationConstants.RESPONSE_LOGOUT_CLIENT_NOT_REGISTERED);
+        return response;
       }
+      client.State = State.offline;
+      clientAdapter.UpdateClient(client);
+
+      response.Success = true;
+      response.StatusMessage = rm.GetString(ApplicationConstants.RESPONSE_LOGOUT_SUCCESS);
+      
       return response;
     }

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

@@ -5 +5 @@
 using HeuristicLab.Hive.Contracts.Interfaces;
 using HeuristicLab.Hive.Contracts.BusinessObjects;
+using HeuristicLab.Hive.Contracts;
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -35 +36 @@
     #region IClientManager Members
 
-    public List<ClientInfo> GetAllClients() {
-      return clients;
+    public ResponseList<ClientInfo> GetAllClients() {
+      return null;
     }
 
-    public List<ClientGroup> GetAllClientGroups() {
-      return clientGroups;
+    public ResponseList<ClientGroup> GetAllClientGroups() {
+      return null;
     }
 
-    public List<UpTimeStatistics> GetAllUpTimeStatistics() {
-      return new List<UpTimeStatistics>();
+    public ResponseList<UpTimeStatistics> GetAllUpTimeStatistics() {
+      return null;
     }
 

trunk/sources/HeuristicLab.Hive.Server.Core/HiveServerMessages.resx

@@ -118 +118 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="LoginSuccess" xml:space="preserve">
+  <data name="Login.ClientNotRegistered" xml:space="preserve">
+    <value>Sorry this client was not registered yet</value>
+  </data>
+  <data name="Login.Success" xml:space="preserve">
     <value>The Login was successfull</value>
   </data>
-  <data name="UserAllreadyOnline" xml:space="preserve">
+  <data name="Logout.Success" xml:space="preserve">
+    <value>You where logged out successfully. Good bye</value>
+  </data>
+  <data name="Logout.UserAllreadyOnline" xml:space="preserve">
     <value>A User with this GUID is allready logged in</value>
   </data>

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

@@ -5 +5 @@
 using HeuristicLab.Hive.Contracts.Interfaces;
 using HeuristicLab.Hive.Contracts.BusinessObjects;
+using HeuristicLab.Hive.Contracts;
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -21 +22 @@
     }
 
-    public List<Job> GetAllJobs() {
-      return jobs;
+    public ResponseList<Job> GetAllJobs() {
+      return null;
     }
 

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

@@ -5 +5 @@
 using HeuristicLab.Hive.Contracts.Interfaces;
 using HeuristicLab.Hive.Contracts.BusinessObjects;
+using HeuristicLab.Hive.Contracts;
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -14 +15 @@
     #region IClientManager Members
 
-    public List<ClientInfo> GetAllClients() {
+    public ResponseList<ClientInfo> GetAllClients() {
       return clientManager.GetAllClients();
     }
 
-    public List<ClientGroup> GetAllClientGroups() {
+    public ResponseList<ClientGroup> GetAllClientGroups() {
       return clientManager.GetAllClientGroups();
     }
 
-    public List<UpTimeStatistics> GetAllUpTimeStatistics() {
+    public ResponseList<UpTimeStatistics> GetAllUpTimeStatistics() {
       return clientManager.GetAllUpTimeStatistics();
     }
@@ -30 +31 @@
     #region IJobManager Members
 
-    public List<HeuristicLab.Hive.Contracts.BusinessObjects.Job> GetAllJobs() {
+    public ResponseList<HeuristicLab.Hive.Contracts.BusinessObjects.Job> GetAllJobs() {
       return jobManager.GetAllJobs();
     }
@@ -38 +39 @@
     #region IUserRoleManager Members
 
-    public List<HeuristicLab.Hive.Contracts.BusinessObjects.User> GetAllUsers() {
+    public ResponseList<HeuristicLab.Hive.Contracts.BusinessObjects.User> GetAllUsers() {
       return userRoleManager.GetAllUsers();
     }
 
-    public void AddNewUser(User user) {
-      userRoleManager.AddNewUser(user);
+    public Response AddNewUser(User user) {
+      return userRoleManager.AddNewUser(user);
     }
 
-    public List<HeuristicLab.Hive.Contracts.BusinessObjects.UserGroup> GetAllUserGroups() {
+    public ResponseList<HeuristicLab.Hive.Contracts.BusinessObjects.UserGroup> GetAllUserGroups() {
       return userRoleManager.GetAllUserGroups();
     }
 
+    public Response RemoveUser(long userId) {
+      throw new NotImplementedException();
+    }
+
+    public Response AddNewUserGroup(UserGroup userGroup) {
+      throw new NotImplementedException();
+    }
+
+    public Response RemoveUserGroup(long groupId) {
+      throw new NotImplementedException();
+    }
+
+    public Response AddUserToGroup(long groupId, long userId) {
+      throw new NotImplementedException();
+    }
+
+    public Response RemoveUserFromGroup(long groupId, long userId) {
+      throw new NotImplementedException();
+    }
+
     #endregion
+
   }
 }

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

@@ -5 +5 @@
 using HeuristicLab.Hive.Contracts.Interfaces;
 using HeuristicLab.Hive.Contracts.BusinessObjects;
+using HeuristicLab.Hive.Server.Core.InternalInterfaces.DataAccess;
+using System.Resources;
+using System.Reflection;
+using HeuristicLab.Hive.Contracts;
 
 namespace HeuristicLab.Hive.Server.Core {
@@ -12 +16 @@
     List<UserGroup> userGroups;
 
+    IUserAdapter userAdapter;
+    ResourceManager rm;
+
     public UserRoleManager() {
+      userAdapter = ServiceLocator.GetUserAdapter();
+      rm = new ResourceManager("HiveServerMessages.resx", Assembly.GetExecutingAssembly()); 
+
       users = new List<User>();
       userGroups = new List<UserGroup>();
@@ -26 +36 @@
     #region IUserRoleManager Members
 
-    public List<User> GetAllUsers() {
-      return users;      
+    public ResponseList<User> GetAllUsers() {
+      return null;      
     }
 
-    public void AddNewUser(User user) {
+    public Response AddNewUser(User user) {
+      User dbUser = userAdapter.GetUserByName(user.Name);
 
+      return null;
     }
 
-    public List<UserGroup> GetAllUserGroups() {
-      return userGroups;
+    public ResponseList<UserGroup> GetAllUserGroups() {
+      return null;
+    }
+
+    public Response RemoveUser(long userId) {
+      return null;
+    }
+
+    public Response AddNewUserGroup(UserGroup userGroup) {
+      return null;
+    }
+
+    public Response RemoveUserGroup(long groupId) {
+      return null;
+    }
+
+    public Response AddUserToGroup(long groupId, long userId) {
+      throw new NotImplementedException();
+    }
+
+    public Response RemoveUserFromGroup(long groupId, long userId) {
+      throw new NotImplementedException();
     }