Base GETDto Initialization and Service Integration (pkyurkchiev#25)

MustyX23 · web-flow · commit 49e9b297d567 · 2024-11-30T11:33:04.000+02:00
* One Commit for all POST Dtos, Touch in Services also Controllers. It is urgent for merge.

* I missed that

* Integreate GETDtos for Services
diff --git a/GustoHub.API/GustoHub.API/Controllers/CategoriesController.cs b/GustoHub.API/GustoHub.API/Controllers/CategoriesController.cs
@@ -3,7 +3,7 @@
     using GustoHub.Data.Models;
     using Microsoft.AspNetCore.Mvc;
     using GustoHub.Services.Interfaces;
-    using GustoHub.Data.ViewModels;
+    using GustoHub.Data.ViewModels.POST;
 
     [Route("api/[controller]")]
     [ApiController]
diff --git a/GustoHub.API/GustoHub.API/Controllers/CustomerController.cs b/GustoHub.API/GustoHub.API/Controllers/CustomerController.cs
@@ -3,7 +3,7 @@
     using GustoHub.Data.Models;
     using Microsoft.AspNetCore.Mvc;
     using GustoHub.Services.Interfaces;
-    using GustoHub.Data.ViewModels;
+    using GustoHub.Data.ViewModels.POST;
 
     [Route("api/[controller]")]
     [ApiController]
diff --git a/GustoHub.API/GustoHub.API/Controllers/DishController.cs b/GustoHub.API/GustoHub.API/Controllers/DishController.cs
@@ -3,22 +3,30 @@
     using GustoHub.Data.Models;
     using Microsoft.AspNetCore.Mvc;
     using GustoHub.Services.Interfaces;
-    using GustoHub.Data.ViewModels;
+    using GustoHub.Data.ViewModels.POST;
 
     [Route("api/[controller]")]
     [ApiController]
     public class DishController : ControllerBase
     {
         private readonly IDishService dishService;
+        private readonly ICategoryService categoryService;
 
-        public DishController(IDishService dishService)
+        public DishController(
+            IDishService dishService,
+            ICategoryService categoryService)
         {
             this.dishService = dishService;
+            this.categoryService = categoryService;
         }
 
         [HttpPost]
         public async Task<IActionResult> PostDish([FromBody] POSTDishDto dishDto)
         {
+            if (!await categoryService.ExistsByIdAsync(dishDto.CategoryId))
+            {
+                return NotFound("Category not found!");
+            }
             string responseMessage = await dishService.AddAsync(dishDto);
             return Ok(responseMessage);
         }
diff --git a/GustoHub.API/GustoHub.API/Controllers/EmployeeController.cs b/GustoHub.API/GustoHub.API/Controllers/EmployeeController.cs
@@ -3,7 +3,7 @@
     using GustoHub.Data.Models;
     using Microsoft.AspNetCore.Mvc;
     using GustoHub.Services.Interfaces;
-    using GustoHub.Data.ViewModels;
+    using GustoHub.Data.ViewModels.POST;
 
     [Route("api/[controller]")]
     [ApiController]
diff --git a/GustoHub.API/GustoHub.API/Controllers/OrderController.cs b/GustoHub.API/GustoHub.API/Controllers/OrderController.cs
@@ -3,7 +3,7 @@
     using GustoHub.Data.Models;
     using Microsoft.AspNetCore.Mvc;
     using GustoHub.Services.Interfaces;
-    using GustoHub.Data.ViewModels;
+    using GustoHub.Data.ViewModels.POST;
 
     [Route("api/[controller]")]
     [ApiController]
diff --git a/GustoHub.API/GustoHub.API/Controllers/OrderDishController.cs b/GustoHub.API/GustoHub.API/Controllers/OrderDishController.cs
@@ -12,10 +12,17 @@ namespace GustoHub.API.Controllers
     public class OrderDishController : ControllerBase
     {
         private readonly IOrderDishService orderDishService;
+        private readonly IOrderService orderService;
+        private readonly IDishService dishService;
 
-        public OrderDishController(IOrderDishService orderDishService)
+        public OrderDishController(
+            IOrderDishService orderDishService,
+            IOrderService orderService,
+            IDishService dishService)
         {
             this.orderDishService = orderDishService;
+            this.orderService = orderService;
+            this.dishService = dishService;
         }
 
         [HttpPost]
@@ -24,6 +31,15 @@ public async Task<IActionResult> PostDishOrder
             [FromQuery] int dishId,
             [FromQuery] int quantity)
         {
+            if (!await orderService.ExistsByIdAsync(orderId))
+            {
+                return NotFound("Order not found!");
+            }
+            if (!await dishService.ExistsByIdAsync(dishId))
+            {
+                return NotFound("Dish not found!");
+            }
+
             string responseMessage = await orderDishService.AddDishToOrder(orderId, dishId, quantity);
             return Ok(responseMessage);
         }
diff --git a/GustoHub.API/GustoHub.Data.ViewModels/GET/GETCategoryDto.cs b/GustoHub.API/GustoHub.Data.ViewModels/GET/GETCategoryDto.cs
@@ -0,0 +1,14 @@
+﻿using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
+
+namespace GustoHub.Data.ViewModels.GET
+{
+    public class GETCategoryDto
+    {
+        public string Name { get; set; } = null!;
+
+        [JsonPropertyName("dishes")]
+        public List<GETDishDto> DishDtos { get; set; } = new List<GETDishDto>();
+
+    }
+}
diff --git a/GustoHub.API/GustoHub.Data.ViewModels/GET/GETCustomerDto.cs b/GustoHub.API/GustoHub.Data.ViewModels/GET/GETCustomerDto.cs
@@ -0,0 +1,15 @@
+﻿using System.ComponentModel.DataAnnotations;
+
+namespace GustoHub.Data.ViewModels.GET
+{
+    public class GETCustomerDto
+    {
+        public string Id { get; set; } = null!;
+
+        public string Name { get; set; } = null!;
+
+        public string Email { get; set; } = null!;
+
+        public string Phone { get; set; } = null!;
+    }
+}
diff --git a/GustoHub.API/GustoHub.Data.ViewModels/GET/GETDishDto.cs b/GustoHub.API/GustoHub.Data.ViewModels/GET/GETDishDto.cs
@@ -0,0 +1,13 @@
+﻿using System.ComponentModel.DataAnnotations;
+
+namespace GustoHub.Data.ViewModels.GET
+{
+    public class GETDishDto
+    {
+        public string Name { get; set; } = string.Empty!;
+
+        public string Price { get; set; } = string.Empty;
+
+        public int CategoryId { get; set; }
+    }
+}
diff --git a/GustoHub.API/GustoHub.Data.ViewModels/GET/GETEmployeeDto.cs b/GustoHub.API/GustoHub.Data.ViewModels/GET/GETEmployeeDto.cs
@@ -0,0 +1,15 @@
+﻿using System.ComponentModel.DataAnnotations;
+
+namespace GustoHub.Data.ViewModels.GET
+{
+    public class GETEmployeeDto
+    {
+        public string Name { get; set; } = string.Empty!;
+
+        public string Title { get; set; } = string.Empty!;
+
+        public string HireDate { get; set; } = string.Empty!;
+
+        public bool IsActive { get; set; }
+    }
+}
diff --git a/GustoHub.API/GustoHub.Data.ViewModels/GET/GETOrdersDto.cs b/GustoHub.API/GustoHub.Data.ViewModels/GET/GETOrdersDto.cs
@@ -0,0 +1,20 @@
+﻿using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+
+namespace GustoHub.Data.ViewModels.GET
+{
+    public class GETOrdersDto
+    {
+        public string Id { get; set; } = null!;
+        public string OrderDate { get; set; } = null!;
+
+        public string CompletionDate { get; set; } = null!;
+
+        public string TotalAmount { get; set; } = null!;
+
+        public string CustomerId { get; set; } = null!;
+
+        public string EmployeeId { get; set; } = null!;
+
+    }
+}
diff --git a/GustoHub.API/GustoHub.Data.ViewModels/POST/POSTCategoryDto.cs b/GustoHub.API/GustoHub.Data.ViewModels/POST/POSTCategoryDto.cs
@@ -0,0 +1,11 @@
+﻿namespace GustoHub.Data.ViewModels.POST
+{
+    using System.ComponentModel.DataAnnotations;
+
+    public class POSTCategoryDto
+    {
+        [Required]
+        [MaxLength(50, ErrorMessage = "Category name cannot be bigger then 50 symbols.")]
+        public string Name { get; set; } = string.Empty!;
+    }
+}
diff --git a/GustoHub.API/GustoHub.Data.ViewModels/POST/POSTCustomerDto.cs b/GustoHub.API/GustoHub.Data.ViewModels/POST/POSTCustomerDto.cs
@@ -0,0 +1,18 @@
+﻿namespace GustoHub.Data.ViewModels.POST
+{
+    using System.ComponentModel.DataAnnotations;
+
+    public class POSTCustomerDto
+    {
+        [Required]
+        [MaxLength(100, ErrorMessage = "Name cannot be bigger then 100 symbols.")]
+        public string Name { get; set; } = string.Empty!;
+
+        [Required]
+        [MaxLength(150, ErrorMessage = "Email cannot be bigger then 150 symbols.")]
+        public string Email { get; set; } = string.Empty!;
+
+        [MaxLength(15)]
+        public string Phone { get; set; } = string.Empty!;
+    }
+}
diff --git a/GustoHub.API/GustoHub.Data.ViewModels/POST/POSTDishDto.cs b/GustoHub.API/GustoHub.Data.ViewModels/POST/POSTDishDto.cs
@@ -0,0 +1,17 @@
+﻿namespace GustoHub.Data.ViewModels.POST
+{
+    using System.ComponentModel.DataAnnotations;
+
+    public class POSTDishDto
+    {
+        [Required]
+        [MaxLength(100)]
+        public string Name { get; set; } = string.Empty!;
+
+        [Required]
+        [Range(0, (double)decimal.MaxValue, ErrorMessage = "Minimum Price value cannot be less then zero.")]
+        public decimal Price { get; set; }
+
+        public int CategoryId { get; set; }
+    }
+}
diff --git a/GustoHub.API/GustoHub.Data.ViewModels/POST/POSTEmployeeDto.cs b/GustoHub.API/GustoHub.Data.ViewModels/POST/POSTEmployeeDto.cs
@@ -0,0 +1,19 @@
+﻿namespace GustoHub.Data.ViewModels.POST
+{
+    using System.ComponentModel.DataAnnotations;
+
+    public class POSTEmployeeDto
+    {
+        [Required]
+        [MaxLength(100, ErrorMessage = "Name cannot be bigger then 100 symbols.")]
+        public string Name { get; set; } = string.Empty!;
+
+        [Required]
+        [MaxLength(100, ErrorMessage = "Title cannot be bigger then 100 symbols.")]
+        public string Title { get; set; } = string.Empty!;
+
+        [Required(ErrorMessage = "Please enter a valid date! Example: 18/02/2024 23:30")]
+        [DisplayFormat(DataFormatString = "dd/MM/yyyy HH:mm")]
+        public string HireDate { get; set; } = null!;
+    }
+}
diff --git a/GustoHub.API/GustoHub.Data.ViewModels/POST/POSTOrderDishDto.cs b/GustoHub.API/GustoHub.Data.ViewModels/POST/POSTOrderDishDto.cs
@@ -0,0 +1,13 @@
+﻿namespace GustoHub.Data.ViewModels.POST
+{
+    using System.ComponentModel.DataAnnotations;
+
+    public class POSTOrderDishDto
+    {
+        [Required(ErrorMessage = "Id of order is required.")]
+        public int OrderId { get; set; }
+
+        [Required(ErrorMessage = "Id of dish is required.")]
+        public int DishId { get; set; }
+    }
+}
diff --git a/GustoHub.API/GustoHub.Data.ViewModels/POST/POSTOrderDto.cs b/GustoHub.API/GustoHub.Data.ViewModels/POST/POSTOrderDto.cs
@@ -0,0 +1,22 @@
+﻿namespace GustoHub.Data.ViewModels.POST
+{
+    using System.ComponentModel.DataAnnotations;
+
+    public class POSTOrderDto
+    {
+        [Required(ErrorMessage = "Please enter a valid date! Example: 18/02/2024 23:30")]
+        [DisplayFormat(DataFormatString = "dd/MM/yyyy HH:mm")]
+        public string OrderDate { get; set; } = null!;
+
+        [DisplayFormat(DataFormatString = "dd/MM/yyyy HH:mm")]
+        public string? CompletionDate { get; set; }
+
+        [Required]
+        [Range(0, (double)decimal.MaxValue, ErrorMessage = "Minimum TotalAmount value cannot be less then zero.")]
+        public decimal TotalAmount { get; set; }
+
+        public string CustomerId { get; set; } = null!;
+
+        public string EmployeeId { get; set; } = null!;
+    }
+}
diff --git a/GustoHub.API/GustoHub.Services/Interfaces/ICategoryService.cs b/GustoHub.API/GustoHub.Services/Interfaces/ICategoryService.cs
@@ -1,15 +1,16 @@
 ﻿namespace GustoHub.Services.Interfaces
 {
     using GustoHub.Data.Models;
-    using GustoHub.Data.ViewModels;
+    using GustoHub.Data.ViewModels.GET;
+    using GustoHub.Data.ViewModels.POST;
 
     public interface ICategoryService
     {
         Task<string> AddAsync(POSTCategoryDto category);
         Task<bool> ExistsByIdAsync(int categoryId);
-        Task<Category> GetByIdAsync(int categoryId);
-        Task<Category> GetByNameAsync(string categoryName);
-        Task<IEnumerable<Category>> AllAsync();
+        Task<GETCategoryDto?> GetByIdAsync(int categoryId);
+        Task<GETCategoryDto?> GetByNameAsync(string categoryName);
+        Task<IEnumerable<GETCategoryDto>> AllAsync();
         Task<string> Remove(int id);
     }
 }
diff --git a/GustoHub.API/GustoHub.Services/Interfaces/ICustomerService.cs b/GustoHub.API/GustoHub.Services/Interfaces/ICustomerService.cs
@@ -1,15 +1,16 @@
 ﻿namespace GustoHub.Services.Interfaces
 {
     using GustoHub.Data.Models;
-    using GustoHub.Data.ViewModels;
+    using GustoHub.Data.ViewModels.GET;
+    using GustoHub.Data.ViewModels.POST;
 
     public interface ICustomerService
     {
         Task<string> AddAsync(POSTCustomerDto customer);
         Task<bool> ExistsByIdAsync(Guid customerId);
-        Task<Customer> GetByIdAsync(Guid customerId);
-        Task<Customer> GetByNameAsync(string customerName);
-        Task<IEnumerable<Customer>> AllAsync();
+        Task<GETCustomerDto> GetByIdAsync(Guid customerId);
+        Task<GETCustomerDto> GetByNameAsync(string customerName);
+        Task<IEnumerable<GETCustomerDto>> AllAsync();
         Task<string> Remove(Guid customerId);
     }
 }
diff --git a/GustoHub.API/GustoHub.Services/Interfaces/IDishService.cs b/GustoHub.API/GustoHub.Services/Interfaces/IDishService.cs
@@ -1,15 +1,16 @@
 ﻿namespace GustoHub.Services.Interfaces
 {
     using GustoHub.Data.Models;
-    using GustoHub.Data.ViewModels;
+    using GustoHub.Data.ViewModels.GET;
+    using GustoHub.Data.ViewModels.POST;
 
     public interface IDishService
     {
         Task<string> AddAsync(POSTDishDto dish);
         Task<bool> ExistsByIdAsync(int dishId);
-        Task<Dish> GetByIdAsync(int dishId);
-        Task<Dish> GetByNameAsync(string dishName);
-        Task<IEnumerable<Dish>> AllAsync();
+        Task<GETDishDto> GetByIdAsync(int dishId);
+        Task<GETDishDto> GetByNameAsync(string dishName);
+        Task<IEnumerable<GETDishDto>> AllAsync();
         Task<string> Remove(int id);
     }
 }
diff --git a/GustoHub.API/GustoHub.Services/Interfaces/IEmployeeService.cs b/GustoHub.API/GustoHub.Services/Interfaces/IEmployeeService.cs
@@ -1,15 +1,16 @@
 ﻿namespace GustoHub.Services.Interfaces
 {
     using GustoHub.Data.Models;
-    using GustoHub.Data.ViewModels;
+    using GustoHub.Data.ViewModels.GET;
+    using GustoHub.Data.ViewModels.POST;
 
     public interface IEmployeeService
     {
         Task<string> AddAsync(POSTEmployeeDto employeeDto);
         Task<bool> ExistsByIdAsync(Guid employeeId);
-        Task<Employee> GetByIdAsync(Guid employeeId);
-        Task<Employee> GetByNameAsync(string employeeName);
-        Task<IEnumerable<Employee>> AllAsync();
+        Task<GETEmployeeDto> GetByIdAsync(Guid employeeId);
+        Task<GETEmployeeDto> GetByNameAsync(string employeeName);
+        Task<IEnumerable<GETEmployeeDto>> AllAsync();
         Task<string> Remove(Guid employeeId);
     }
 }
diff --git a/GustoHub.API/GustoHub.Services/Interfaces/IOrderService.cs b/GustoHub.API/GustoHub.Services/Interfaces/IOrderService.cs
@@ -1,15 +1,16 @@
 ﻿namespace GustoHub.Services.Interfaces
 {
     using GustoHub.Data.Models;
-    using GustoHub.Data.ViewModels;
+    using GustoHub.Data.ViewModels.GET;
+    using GustoHub.Data.ViewModels.POST;
 
     public interface IOrderService
     {
         Task<string> AddAsync(POSTOrderDto orderDto);
         Task<bool> ExistsByIdAsync(int orderId);
-        Task<Order> GetByIdAsync(int orderId);
-        Task<Order> GetByDateAsync(DateTime date);
-        Task<IEnumerable<Order>> AllAsync();
+        Task<GETOrdersDto> GetByIdAsync(int orderId);
+        Task<GETOrdersDto> GetByDateAsync(DateTime date);
+        Task<IEnumerable<GETOrdersDto>> AllAsync();
         Task<string> Remove(int id);
     }
 }
diff --git a/GustoHub.API/GustoHub.Services/Services/CategoryService.cs b/GustoHub.API/GustoHub.Services/Services/CategoryService.cs
diff --git a/GustoHub.API/GustoHub.Services/Services/CustomerService.cs b/GustoHub.API/GustoHub.Services/Services/CustomerService.cs
diff --git a/GustoHub.API/GustoHub.Services/Services/DishService.cs b/GustoHub.API/GustoHub.Services/Services/DishService.cs
diff --git a/GustoHub.API/GustoHub.Services/Services/EmployeeService.cs b/GustoHub.API/GustoHub.Services/Services/EmployeeService.cs
diff --git a/GustoHub.API/GustoHub.Services/Services/OrderService.cs b/GustoHub.API/GustoHub.Services/Services/OrderService.cs
