Added functionality to User Manager

Step/Controllers/WebApi/UserController.cs

@@ -132,14 +132,21 @@ namespace Step.Controllers.WebApi
         public IHttpActionResult UpdateUserData(int userId, [FromBody] DTONewUserModel userData)
         {
             using (UsersController usersController = new UsersController())
-            {
-                if (usersController.FindByUsername(userData.Username) != null)
-                    return BadRequest();
-
-                // Update database with new user data
-                var user = usersController.UpdateUserData(userId, userData);
-
-                return Ok(user);
+            {
+                
+                UserModel user = usersController.FindById(userId);
+
+                if (user == null)
+                    return NotFound();
+                else
+                {
+                    if (user.Username != userData.Username)
+                    {
+                        if (usersController.FindByUsername(userData.Username) != null)
+                            return BadRequest();
+                    }
+                    return Ok(usersController.UpdateUserData(userId, userData));
+                }           
             }
         }