Merge branch 'refactor/rename-model-to-dto' into 'milestone-1'

refactor: rename models into dtos

See merge request !24

WebAPI/Controllers/AuthController.cs

@@ -5,7 +5,7 @@ using System.Text;
 using System.Security.Claims;
 using System.IdentityModel.Tokens.Jwt;
 using DataAccessLayer.Models;
-using WebAPI.Models;
+using WebAPI.DTOs;
 using DataAccessLayer.Data;
 
 namespace WebAPI.Controllers
@@ -27,7 +27,7 @@ namespace WebAPI.Controllers
         }
 
         [HttpPost("login")]
-        public async Task<IActionResult> Login([FromBody] LoginModel model)
+        public async Task<IActionResult> Login([FromBody] LoginDTO model)
         {
             var user = await _userManager.FindByNameAsync(model.Username);
             if (user == null || !await _userManager.CheckPasswordAsync(user, model.Password))
@@ -62,7 +62,7 @@ namespace WebAPI.Controllers
         }
 
         [HttpPost("register")]
-        public async Task<IActionResult> Register([FromBody] RegisterModel model)
+        public async Task<IActionResult> Register([FromBody] RegisterDTO model)
         {
             var user = new User
             {

WebAPI/Controllers/AuthorController.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using WebApi.Controllers;
-using WebAPI.Models;
+using WebAPI.DTOs;
 
 namespace WebAPI.Controllers
 {
@@ -33,13 +33,13 @@ namespace WebAPI.Controllers
                 return NotFound("No authors were found.");
             }
 
-            var authorModels = authors.Select(author => new AuthorModel
+            var authorDTOs = authors.Select(author => new AuthorDTO
             {
                 FirstName = author.FirstName,
                 LastName = author.LastName,
             }).ToList();
 
-            return Ok(authorModels);
+            return Ok(authorDTOs);
         }
 
         [HttpGet]
@@ -53,18 +53,18 @@ namespace WebAPI.Controllers
                 return BadRequest("Author was not found.");
             }
 
-            var authorModel = new AuthorModel
+            var authorDTO = new AuthorDTO
             {
                 FirstName = author.FirstName,
                 LastName = author.LastName
             };
 
-            return Ok(authorModel);
+            return Ok(authorDTO);
         }
 
         [HttpPost]
         [Route("create")]
-        public async Task<IActionResult> CreateAuthor(AuthorModel model)
+        public async Task<IActionResult> CreateAuthor(AuthorDTO model)
         {
             if (!ModelState.IsValid)
             {
@@ -87,7 +87,7 @@ namespace WebAPI.Controllers
 
         [HttpPut]
         [Route("{id}/update")]
-        public async Task<IActionResult> UpdateAuthor(int id, AuthorModel model)
+        public async Task<IActionResult> UpdateAuthor(int id, AuthorDTO model)
         {
             if (!ModelState.IsValid)
             {

WebAPI/Controllers/BookController.cs

@@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using WebApi.Controllers;
-using WebAPI.Models;
+using WebAPI.DTOs;
 
 namespace WebAPI.Controllers
 {
@@ -34,7 +34,7 @@ namespace WebAPI.Controllers
                 return NotFound("No books were found.");
             }
 
-            var bookModels = books.Select(book => new BookModel
+            var bookDTOs = books.Select(book => new BookDTO
             {
                 Name = book.Name,
                 Genre = book.Genre,
@@ -46,7 +46,7 @@ namespace WebAPI.Controllers
                 AuthorId = book.AuthorId
             }).ToList();
 
-            return Ok(bookModels);
+            return Ok(bookDTOs);
         }
 
         [HttpGet]
@@ -65,7 +65,7 @@ namespace WebAPI.Controllers
 
         [HttpPost]
         [Route("create")]
-        public async Task<IActionResult> CreateBook(BookModel model)
+        public async Task<IActionResult> CreateBook(BookDTO model)
         {
             if (!ModelState.IsValid)
             {
@@ -94,7 +94,7 @@ namespace WebAPI.Controllers
 
         [HttpPut]
         [Route("{id}/update")]
-        public async Task<IActionResult> UpdateBook(int id, BookModel model)
+        public async Task<IActionResult> UpdateBook(int id, BookDTO model)
         {
             if (!ModelState.IsValid)
             {
@@ -192,7 +192,7 @@ namespace WebAPI.Controllers
                 return NotFound("No books were found.");
             }
 
-            var result = filteredBooks.Select(book => new BookModel
+            var result = filteredBooks.Select(book => new BookDTO
             {
                 Name = book.Name,
                 Genre = book.Genre,

WebAPI/Controllers/OrderController.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using WebApi.Controllers;
-using WebAPI.Models.Order;
+using WebAPI.DTOs.Order;
 
 namespace WebAPI.Controllers
 {
@@ -35,10 +35,10 @@ namespace WebAPI.Controllers
                 return NotFound("No orders found for the given user.");
             }
 
-            var ordersModels = orders.Select(order => new OrderModel
+            var ordersDTOs = orders.Select(order => new OrderDTO
             {
                 UserId = order.UserId,
-                OrderItems = order.OrderItems.Select(item => new OrderItemModel
+                OrderItems = order.OrderItems.Select(item => new OrderItemDTO
                 {
                     BookId = item.BookId,
                     OrderId = item.OrderId,
@@ -48,7 +48,7 @@ namespace WebAPI.Controllers
                 }).ToList()
             }).ToList();
 
-            return Ok(ordersModels);
+            return Ok(ordersDTOs);
         }
 
         [HttpGet]
@@ -62,10 +62,10 @@ namespace WebAPI.Controllers
                 return BadRequest("Order was not found.");
             }
 
-            var orderModel = new OrderModel
+            var OrderDTO = new OrderDTO
             {
                 UserId = order.UserId,
-                OrderItems = order.OrderItems.Select(item => new OrderItemModel
+                OrderItems = order.OrderItems.Select(item => new OrderItemDTO
                 {
                     BookId = item.BookId,
                     OrderId = item.OrderId,
@@ -75,12 +75,12 @@ namespace WebAPI.Controllers
                 }).ToList()
             };
 
-            return Ok(orderModel);
+            return Ok(OrderDTO);
         }
 
         [HttpPost]
         [Route("create")]
-        public async Task<IActionResult> CreateOrder(OrderModel model)
+        public async Task<IActionResult> CreateOrder(OrderDTO model)
         {
             if (!ModelState.IsValid)
             {
@@ -106,7 +106,7 @@ namespace WebAPI.Controllers
 
         [HttpPut]
         [Route("{id}/update")]
-        public async Task<IActionResult> UpdateOrder(int id, OrderModel model)
+        public async Task<IActionResult> UpdateOrder(int id, OrderDTO model)
         {
             if (!ModelState.IsValid)
             {

WebAPI/Controllers/ReviewController.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using WebApi.Controllers;
-using WebAPI.Models;
+using WebAPI.DTOs;
 
 namespace WebAPI.Controllers
 {
@@ -32,7 +32,7 @@ namespace WebAPI.Controllers
             if (!reviews.Any())
                 return NotFound("No reviews were found.");
 
-            var reviewModels = reviews.Select(r => new ReviewModel
+            var reviewDTOs = reviews.Select(r => new ReviewDTO
             {
                 UserId = r.UserId ?? 0,
                 BookId = r.BookId,
@@ -40,7 +40,7 @@ namespace WebAPI.Controllers
                 Description = r.Description
             }).ToList();
 
-            return Ok(reviewModels);
+            return Ok(reviewDTOs);
         }
 
         [HttpGet]
@@ -55,7 +55,7 @@ namespace WebAPI.Controllers
             if (review == null)
                 return NotFound("Review not found.");
 
-            var reviewModel = new ReviewModel
+            var reviewDTO = new ReviewDTO
             {
                 UserId = review.UserId ?? 0,
                 BookId = review.BookId,
@@ -63,7 +63,7 @@ namespace WebAPI.Controllers
                 Description = review.Description
             };
 
-            return Ok(reviewModel);
+            return Ok(reviewDTO);
         }
 
         [HttpDelete]
@@ -82,7 +82,7 @@ namespace WebAPI.Controllers
 
         [HttpPost]
         [Route("create")]
-        public async Task<IActionResult> AddReview([FromBody] ReviewModel reviewModel)
+        public async Task<IActionResult> AddReview([FromBody] ReviewDTO reviewModel)
         {
             // TODO: add 'var userId = await GetUserId()' when the user is logged in at the next stage of the project
             var review = new Review
@@ -101,7 +101,7 @@ namespace WebAPI.Controllers
 
         [HttpPut]
         [Route("{id}/update")]
-        public async Task<IActionResult> UpdateReview(int id, [FromBody] ReviewModel reviewModel)
+        public async Task<IActionResult> UpdateReview(int id, [FromBody] ReviewDTO reviewModel)
         {
             var review = await _dbContext.Reviews.FindAsync(id);
             if (review == null)

WebAPI/Controllers/UserController.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using WebApi.Controllers;
-using WebAPI.Models;
+using WebAPI.DTOs;
 
 namespace WebAPI.Controllers
 {
@@ -37,12 +37,12 @@ namespace WebAPI.Controllers
                 return NotFound("User not found.");
             }
 
-            var userModel = new UserModel
+            var userDTO = new UserDTO
             {
                 FirstName = user.FirstName,
                 LastName = user.LastName,
                 Email = user.Email,
-                Address = new AddressModel
+                Address = new AddressDTO
                 {
                     PostCode = user.Address.PostCode,
                     City = user.Address.City,
@@ -51,7 +51,7 @@ namespace WebAPI.Controllers
                 }
             };
 
-            return Ok(userModel);
+            return Ok(userDTO);
         }
 
         [HttpGet]
@@ -62,12 +62,12 @@ namespace WebAPI.Controllers
                 .Include(u => u.Address)
                 .ToListAsync();
 
-            var userModels = users.Select(user => new UserModel
+            var userDTOs = users.Select(user => new UserDTO
             {
                 FirstName = user.FirstName,
                 LastName = user.LastName,
                 Email = user.Email,
-                Address = new AddressModel
+                Address = new AddressDTO
                 {
                     PostCode = user.Address.PostCode,
                     City = user.Address.City,
@@ -76,7 +76,7 @@ namespace WebAPI.Controllers
                 }
             }).ToList();
 
-            return Ok(userModels);
+            return Ok(userDTOs);
         }
 
     }

WebAPI/Controllers/WishlistController.cs

@@ -4,8 +4,8 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using WebApi.Controllers;
-using WebAPI.Models;
-using WebAPI.Models.Wishlist;
+using WebAPI.DTOs;
+using WebAPI.DTOs.Wishlist;
 
 namespace WebAPI.Controllers
 {
@@ -36,10 +36,10 @@ namespace WebAPI.Controllers
                 return NotFound("No wishlists found for the given user.");
             }
 
-            var wishListModels = wishLists.Select(wishList => new WishListModel
+            var WishListDTOs = wishLists.Select(wishList => new WishListDTO
             {
                 UserId = wishList.UserId,
-                WishListItems = wishList.WishListItems.Select(item => new WishListItemModel
+                WishListItems = wishList.WishListItems.Select(item => new WishListItemDTO
                 {
                     BookId = item.BookId,
                     WishlistId = item.WishlistId,
@@ -48,7 +48,7 @@ namespace WebAPI.Controllers
                 }).ToList()
             }).ToList();
 
-            return Ok(wishListModels);
+            return Ok(WishListDTOs);
         }
 
         [HttpGet]
@@ -62,10 +62,10 @@ namespace WebAPI.Controllers
                 return BadRequest("Wishlist was not found.");
             }
 
-            var wishListModel = new WishListModel
+            var WishListDTO = new WishListDTO
             {
                 UserId = wishList.UserId,
-                WishListItems = wishList.WishListItems.Select(item => new WishListItemModel
+                WishListItems = wishList.WishListItems.Select(item => new WishListItemDTO
                 {
                     BookId = item.BookId,
                     WishlistId = item.WishlistId,
@@ -74,12 +74,12 @@ namespace WebAPI.Controllers
                 }).ToList()
             };
 
-            return Ok(wishListModel);
+            return Ok(WishListDTO);
         }
 
         [HttpPost]
         [Route("create")]
-        public async Task<IActionResult> CreateWishList(WishListModel model)
+        public async Task<IActionResult> CreateWishList(WishListDTO model)
         {
             if (!ModelState.IsValid)
             {
@@ -103,7 +103,7 @@ namespace WebAPI.Controllers
 
         [HttpPut]
         [Route("{id}/update")]
-        public async Task<IActionResult> UpdateWishList(int id, WishListModel model)
+        public async Task<IActionResult> UpdateWishList(int id, WishListDTO model)
         {
             if (!ModelState.IsValid)
             {

WebAPI/Models/AddressModel.cs → WebAPI/DTOs/AddressDTO.cs

-namespace WebAPI.Models
+namespace WebAPI.DTOs
 {
-    public class AddressModel
+    public class AddressDTO
     {
         public int PostCode { get; set; }
         public string City { get; set; }

WebAPI/Models/AuthorModel.cs → WebAPI/DTOs/AuthorDTO.cs

-namespace WebAPI.Models
+namespace WebAPI.DTOs
 {
-    public class AuthorModel
+    public class AuthorDTO
     {
         public string FirstName { get; set; }
         public string LastName { get; set; }

WebAPI/Models/BookModel.cs → WebAPI/DTOs/BookDTO.cs

 using DataAccessLayer.Models.Enums;
 
-namespace WebAPI.Models
+namespace WebAPI.DTOs
 {
-    public class BookModel
+    public class BookDTO
     {
         public string Name { get; set; }
         public BookGenre Genre { get; set; }

WebAPI/Models/LoginModel.cs → WebAPI/DTOs/LoginDTO.cs

-namespace WebAPI.Models
+namespace WebAPI.DTOs
 {
-    public class LoginModel
+    public class LoginDTO
     {
         public string Username { get; set; }
         public string Password { get; set; }

WebAPI/Models/Order/OrderModel.cs → WebAPI/DTOs/Order/OrderDTO.cs

-namespace WebAPI.Models.Order
+namespace WebAPI.DTOs.Order
 {
-    public class OrderModel
+    public class OrderDTO
     {
         public int UserId { get; set; }
         public decimal FinalPrice { get; set; }
 
         public DateTime OrderDate { get; set; }
 
-        public List<OrderItemModel> OrderItems { get; set; } = new List<OrderItemModel>();
+        public List<OrderItemDTO> OrderItems { get; set; } = new List<OrderItemDTO>();
 
     }
 }

WebAPI/Models/Order/OrderItemModel.cs → WebAPI/DTOs/Order/OrderItemDTO.cs

-namespace WebAPI.Models.Order
+namespace WebAPI.DTOs.Order
 {
-    public class OrderItemModel
+    public class OrderItemDTO
     {
         public decimal Price { get; set; }
 

WebAPI/Models/RegisterModel.cs → WebAPI/DTOs/RegisterDTO.cs

-namespace WebAPI.Models
+namespace WebAPI.DTOs
 {
-    public class RegisterModel
+    public class RegisterDTO
     {
         public string Username { get; set; }
         public string FirstName { get; set; }

WebAPI/Models/ReviewModel.cs → WebAPI/DTOs/ReviewDTO.cs

-namespace WebAPI.Models
+namespace WebAPI.DTOs
 {
-    public class ReviewModel
+    public class ReviewDTO
     {
         public int UserId { get; set; }
         public int BookId { get; set; }

WebAPI/Models/UserModel.cs → WebAPI/DTOs/UserDTO.cs

-namespace WebAPI.Models
+namespace WebAPI.DTOs
 {
-    public class UserModel
+    public class UserDTO
     {
         public string FirstName { get; set; }
         public string LastName { get; set; }
         public string Email { get; set; }
-        public virtual AddressModel Address{ get; set; }
+        public virtual AddressDTO Address{ get; set; }
     }
 }

WebAPI/DTOs/Wishlist/WishlistDTO.cs

+using WebAPI.DTOs.Wishlist;
+
+namespace WebAPI.DTOs
+{
+    public class WishListDTO
+    {
+        public int UserId { get; set; }
+        public List<WishListItemDTO> WishListItems { get; set; } = new List<WishListItemDTO>();
+    }
+}
\ No newline at end of file

WebAPI/Models/Wishlist/WishlistItemModel.cs → WebAPI/DTOs/Wishlist/WishlistItemDTO.cs

-namespace WebAPI.Models.Wishlist
+namespace WebAPI.DTOs.Wishlist
 {
-    public class WishListItemModel
+    public class WishListItemDTO
     {
         public int WishlistId { get; set; }
         public int BookId { get; set; }

WebAPI/Models/Wishlist/WishlistModel.cs

-using WebAPI.Models.Wishlist;
-
-namespace WebAPI.Models
-{
-    public class WishListModel
-    {
-        public int UserId { get; set; }
-        public List<WishListItemModel> WishListItems { get; set; } = new List<WishListItemModel>();
-    }
-}
\ No newline at end of file