Merge branch 'roomManagement-feature'

Author: Lyvia

Diff for: Zenergy/Zenergy/Controllers/AccountController.cs

@@ -73,6 +73,11 @@ public UserInfoViewModel GetUserInfo()
             };
         }
 
+
+        /// <summary>
+        /// Log out the current user.
+        /// </summary>
+        /// <returns></returns>
         // POST api/Account/Logout
         [Route("Logout")]
         public IHttpActionResult Logout()
@@ -325,6 +330,12 @@ public IEnumerable<ExternalLoginViewModel> GetExternalLogins(string returnUrl, b
             return logins;
         }
 
+
+        /// <summary>
+        /// Login the user.
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
         // POST api/Account/Register
         [AllowAnonymous]
         [Route("Register")]

Diff for: Zenergy/Zenergy/Controllers/ApiControllers/roomContentsController.cs

@@ -0,0 +1,164 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.Entity;
+using System.Data.Entity.Infrastructure;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using System.Web.Http;
+using System.Web.Http.Description;
+using Zenergy.Models;
+
+namespace Zenergy.Controllers.ApiControllers
+{
+    public class roomContentsController : ApiController
+    {
+        private ZenergyContext db = new ZenergyContext();
+
+
+        /// <summary>
+        /// Get all roomContents from the database.
+        /// </summary>
+        /// <returns></returns>
+        // GET: api/roomContents
+        public IQueryable<roomContent> GetroomContent()
+        {
+            return db.roomContent;
+        }
+        /// <summary>
+        /// Get the roomContent by id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        // GET: api/roomContents/5
+        [ResponseType(typeof(roomContent))]
+        public async Task<IHttpActionResult> GetroomContent(int id)
+        {
+            roomContent roomContent = await db.roomContent.FindAsync(id);
+            if (roomContent == null)
+            {
+                return NotFound();
+            }
+
+            return Ok(roomContent);
+        }
+
+
+        /// <summary>
+        /// Edit the roomContent which primary key is (roomId,accessoryId) with roomContent parameter.
+        /// </summary>
+        /// <param name="roomId"></param>
+        /// <param name="accessoryId"></param>
+        /// <param name="roomContent"></param>
+        /// <returns></returns>
+        // PUT: api/roomContents/5
+        [ResponseType(typeof(void))]
+        public async Task<IHttpActionResult> PutroomContent(int roomId,int accessoryId, roomContent roomContent)
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest(ModelState);
+            }
+
+            if (roomId != roomContent.roomId || accessoryId != roomContent.accessoryId)
+            {
+                return BadRequest();
+            }
+
+            db.Entry(roomContent).State = EntityState.Modified;
+
+            try
+            {
+                await db.SaveChangesAsync();
+            }
+            catch (DbUpdateConcurrencyException)
+            {
+                if (!roomContentExists(roomId, accessoryId))
+                {
+                    return NotFound();
+                }
+                else
+                {
+                    throw;
+                }
+            }
+
+            return StatusCode(HttpStatusCode.NoContent);
+        }
+
+
+        /// <summary>
+        /// Create the roomContent in the database.
+        /// </summary>
+        /// <param name="roomContent"></param>
+        /// <returns></returns>
+        // POST: api/roomContents
+        [ResponseType(typeof(roomContent))]
+        public async Task<IHttpActionResult> PostroomContent(roomContent roomContent)
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest(ModelState);
+            }
+
+            db.roomContent.Add(roomContent);
+
+            try
+            {
+                await db.SaveChangesAsync();
+            }
+            catch (DbUpdateException)
+            {
+                if (roomContentExists(roomContent.roomId, roomContent.accessoryId))
+                {
+                    return Conflict();
+                }
+                else
+                {
+                    throw;
+                }
+            }
+
+            return CreatedAtRoute("DefaultApi", new { id = roomContent.roomId }, roomContent);
+        }
+
+
+        /// <summary>
+        /// Delete the roomContent which primary key is (roomId,accessory).
+        /// </summary>
+        /// <param name="roomId"></param>
+        /// <param name="accessoryId"></param>
+        /// <returns></returns>
+        // DELETE: api/roomContents?roomId=2&accessoryId=1
+        [ResponseType(typeof(roomContent))]
+        public async Task<IHttpActionResult> DeleteroomContent(int roomId, int accessoryId)
+        {
+            roomContent roomContent = await db.roomContent.Where(rc => rc.roomId == roomId & rc.accessoryId == accessoryId).FirstAsync();
+            if (roomContent == null)
+            {
+                return NotFound();
+            }
+
+            db.roomContent.Remove(roomContent);
+            await db.SaveChangesAsync();
+
+            return Ok(roomContent);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                db.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        private bool roomContentExists(int roomId, int accessoryId)
+        {
+            return db.roomContent.Count(e => e.roomId == roomId && e.accessoryId == accessoryId) > 0;
+        }
+    }
+}

Diff for: Zenergy/Zenergy/Controllers/ApiControllers/roomsController.cs

@@ -19,12 +19,23 @@ public class roomsController : ApiController
     {
         private ZenergyContext db = new ZenergyContext();
 
+
+        /// <summary>
+        /// Get all the room from the database.
+        /// </summary>
+        /// <returns></returns>
         // GET: api/rooms
         public IQueryable<room> Getroom()
         {
             return db.room;
         }
 
+
+        /// <summary>
+        /// Get room by id.
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
         // GET: api/rooms/5
         [ResponseType(typeof(room))]
         public async Task<IHttpActionResult> Getroom(int id)
@@ -38,6 +49,13 @@ public async Task<IHttpActionResult> Getroom(int id)
             return Ok(room);
         }
 
+
+        /// <summary>
+        /// Edit the room which primary key is id using the room parameter.
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="room"></param>
+        /// <returns></returns>
         // PUT: api/rooms/5
         [ResponseType(typeof(void))]
         public async Task<IHttpActionResult> Putroom(int id, room room)
@@ -73,6 +91,12 @@ public async Task<IHttpActionResult> Putroom(int id, room room)
             return StatusCode(HttpStatusCode.NoContent);
         }
 
+
+        /// <summary>
+        /// Create room in the database.
+        /// </summary>
+        /// <param name="room"></param>
+        /// <returns></returns>
         // POST: api/rooms
         [ResponseType(typeof(room))]
         public async Task<IHttpActionResult> Postroom(room room)
@@ -88,6 +112,12 @@ public async Task<IHttpActionResult> Postroom(room room)
             return CreatedAtRoute("DefaultApi", new { id = room.roomId }, room);
         }
 
+
+        /// <summary>
+        /// Delete the room by id.
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
         // DELETE: api/rooms/5
         [ResponseType(typeof(room))]
         public async Task<IHttpActionResult> Deleteroom(int id)

Diff for: Zenergy/Zenergy/Controllers/ApiControllers/usersController.cs

@@ -24,13 +24,24 @@ public usersController()
             userServices = new UserServices(db);
         }
 
+
+        /// <summary>
+        /// Get all users.
+        /// </summary>
+        /// <returns></returns>
         // GET: api/users
         [Authorize]
         public IQueryable<user> Getuser()
         {
             return db.user;
         }
 
+
+        /// <summary>
+        /// Get user by id.
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
         // GET: api/users/5
         [ResponseType(typeof(user))]
         public async Task<IHttpActionResult> Getuser(int id)
@@ -44,8 +55,13 @@ public async Task<IHttpActionResult> Getuser(int id)
             return Ok(user);
         }
 
+
+        /// <summary>
+        /// Return all the users of a role.
+        /// </summary>
+        /// <param name="role"></param>
+        /// <returns></returns>
         // GET: api/users/findByRole
-        // Return all the users of a role
         [Route("api/users/findByRole")]
         [HttpGet]
         [ResponseType(typeof(user[]))]
@@ -76,6 +92,13 @@ public async Task<IHttpActionResult> FindByRole(string role) {
             return Ok(users);
         }
 
+
+        /// <summary>
+        /// Edit user.
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="user"></param>
+        /// <returns></returns>
         // PUT: api/users/5
         [ResponseType(typeof(void))]
         public async Task<IHttpActionResult> Putuser(int id, user user)
@@ -111,6 +134,12 @@ public async Task<IHttpActionResult> Putuser(int id, user user)
             return StatusCode(HttpStatusCode.NoContent);
         }
 
+
+        /// <summary>
+        /// Create user.
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns></returns>
         // POST: api/users
         [ResponseType(typeof(user))]
         public async Task<IHttpActionResult> Postuser(user user)
@@ -126,6 +155,12 @@ public async Task<IHttpActionResult> Postuser(user user)
             return CreatedAtRoute("DefaultApi", new { id = user.userId }, user);
         }
 
+
+        /// <summary>
+        /// Delete user by id.
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
         // DELETE: api/users/5
         [ResponseType(typeof(user))]
         public async Task<IHttpActionResult> Deleteuser(int id)

Diff for: Zenergy/Zenergy/Services/UserServices.cs

@@ -41,6 +41,13 @@ public async Task<user[]> getMembers()
             return await db.user.SqlQuery("SELECT usr.* FROM [user] usr INNER JOIN [member] role ON usr.userId = role.userId").ToArrayAsync();
         }
 
+
+        /// <summary>
+        /// Find user by mail and password.
+        /// </summary>
+        /// <param name="userMail"></param>
+        /// <param name="userPass"></param>
+        /// <returns></returns>
         public async Task<user> findByMailAndPassword(string userMail, string userPass)
         {
             try

Diff for: Zenergy/Zenergy/Zenergy.csproj

@@ -176,6 +176,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Controllers\ApiControllers\roomContentsController.cs" />
     <Compile Include="Controllers\ApiControllers\roomsController.cs" />
     <Compile Include="Controllers\ApiControllers\usersController.cs" />
     <Compile Include="Controllers\HomeController.cs" />