Merge branch 'master' of https://github.com/MarcinZelent/ApartmentAdmin

1 files changed, 12 insertions, 12 deletions

diff --git a/ApartmentManager/HousingWebAPI/Controllers/UsersController.cs b/ApartmentManager/HousingWebAPI/Controllers/UsersController.cs
index af3ac1d..098c97a 100644
--- a/ApartmentManager/HousingWebAPI/Controllers/UsersController.cs
+++ b/ApartmentManager/HousingWebAPI/Controllers/UsersController.cs
@@ -23,18 +23,18 @@ namespace HousingWebApi.Controllers
         }
 
         // GET: api/Users/by-username/username
-        //[ResponseType(typeof(User))]
-        //[Route("api/Users/by-username/{username:string}")]
-        //public IHttpActionResult GetUserByUsername(string username)
-        //{
-        //    User user = db.Users.Find(username);
-        //    if (user == null)
-        //    {
-        //        return NotFound();
-        //    }
-
-        //    return Ok(user);
-        //}
+        [ResponseType(typeof(User))]
+        [Route("api/Users/by-username/{username}")]
+        public IHttpActionResult GetUserByUsername(string username)
+        {
+            User user = db.Users.SingleOrDefault(u => u.Username == username);
+            if (user == null)
+            {
+                return NotFound();
+            }
+
+            return Ok(user);
+        }
 
         // GET: api/Users/5
         [ResponseType(typeof(User))]