Added user management

Step.Database/Controllers/UsersController.cs

@@ -142,7 +142,7 @@ namespace Step.Database.Controllers
             }
         }
 
-        public List<DTOMessageUserModel> GetUserList()
+        public List<DTOMessageUserModel> GetMessageUserList()
         {
             List<DTOMessageUserModel> userList = new List<DTOMessageUserModel>();
 
@@ -157,5 +157,58 @@ namespace Step.Database.Controllers
 
             return userList;
         }
+
+        #region User Manager
+
+        public List<DTOUserModel> GetUserList()
+        {
+            using (MachinesUsersController machineController = new MachinesUsersController())
+            {
+                List<DTORoleModel> roles = machineController.GetRolesList();
+
+                // Find user by Id with Role object included
+                var tmpUser = dbCtx
+                    .Users
+                    .ToList();
+
+                return tmpUser
+                    .Select(x => new DTOUserModel() // Return DTOUserModel
+                    {
+                        Id = x.UserId,
+                        Username = x.Username,
+                        FirstName = x.FirstName,
+                        LastName = x.LastName,
+                        Language = x.Language,
+                        Role = machineController.GetUserRoleData(MachineConfig.MachineId, x.UserId)
+                    }).ToList();
+            }
+        }
+
+        public DTOUserModel UpdateUserData(int userId, DTONewUserModel userData)
+        {
+            UserModel user = FindById(userId);
+
+            if (user != null)
+            {
+                user.FirstName = userData.FirstName;
+                user.LastName = userData.LastName;
+                user.Username = userData.Username;
+
+                dbCtx.SaveChanges();
+            }
+
+            return GetUserInfo(userId);
+        }
+
+        public DTOUserModel UpdateUserRole(int userId, int roleId)
+        {
+            using (MachinesUsersController machineController = new MachinesUsersController())
+            {
+                machineController.UpdateUserRole(MachineConfig.MachineId, userId, roleId);
+            }
+
+            return GetUserInfo(userId);
+        }
+        #endregion User Manager
     }
 }