Merge branch 'dev' of github.com:team-kaleidoscope/DevHive into dev

1 files changed, 12 insertions, 4 deletions

diff --git a/API/Controllers/UserController.cs b/API/Controllers/UserController.cs
index b3da7fc..c2d6f2c 100644
--- a/API/Controllers/UserController.cs
+++ b/API/Controllers/UserController.cs
@@ -30,12 +30,20 @@ namespace API.Controllers
 		}
 
 		//Read
-		// [HttpGet]
+		[HttpGet]
+		public async Task<string> GetById(int id) 
+		{
+			return await this._service.GetUserById(id);
+		}
 
-		// //Update
-		// [HttpPut]
+		//Update
+		[HttpPut]
+		public async Task<HttpStatusCode> Update(int id, [FromBody] UserDTO userDTO)
+		{
+			return await this._service.UpdateUser(id, userDTO);
+		}
 
 		// //Delete
 		// [HttpDelete]
 	}
-}
\ No newline at end of file
+}