fix caterories and customers endpoints

Author: dobromirts

NorthwindCRUD/Controllers/CategoriesController.cs

@@ -12,12 +12,14 @@ namespace NorthwindCRUD.Controllers
     public class CategoriesController : ControllerBase
     {
         private readonly CategoryService categoryService;
+        private readonly ProductService productService;
         private readonly IMapper mapper;
         private readonly ILogger logger;
 
-        public CategoriesController(CategoryService categoryService, IMapper mapper, ILogger logger)
+        public CategoriesController(CategoryService categoryService, ProductService productService, IMapper mapper, ILogger logger)
         {
             this.categoryService = categoryService;
+            this.productService = productService;
             this.mapper = mapper;
             this.logger = logger;   
         }
@@ -88,10 +90,10 @@ public ActionResult<ProductDto[]> GetProductsByCategoryId(int id)
         {
             try
             {
-                var category = this.categoryService.GetById(id);
-                if (category != null)
+                var products = this.productService.GetAllByCategoryId(id);
+                if (products != null)
                 {
-                    return Ok(this.mapper.Map<ProductDb[], ProductDto[]>(category.Products.ToArray()));
+                    return Ok(this.mapper.Map<ProductDb[], ProductDto[]>(products));
                 }
 
                 return NotFound();

NorthwindCRUD/Controllers/CustomersController.cs

@@ -69,7 +69,7 @@ public ActionResult<OrderDto[]> GetOrdersByCustomerId(string id)
                 var customer = this.customerService.GetById(id);
                 if (customer != null)
                 {
-                    return Ok(this.mapper.Map<OrderDb[], OrderDto>(customer.Orders.ToArray()));
+                    return Ok(this.mapper.Map<OrderDb[], OrderDto[]>(customer.Orders.ToArray()));
                 }
 
                 return NotFound();

NorthwindCRUD/Services/CustomerService.cs

@@ -25,6 +25,7 @@ public CustomerDb GetById(string id)
         {
             return this.dataContext.Customers
                 .Include(c => c.Address)
+                .Include(c => c.Orders.Where(o => o.CustomerId == id)) 
                 .FirstOrDefault(c => c.CustomerId == id);
         }
 

NorthwindCRUD/Services/ProductService.cs

@@ -22,6 +22,11 @@ public ProductDb[] GetAll()
             return this.dataContext.Products.ToArray();
         }
 
+        public ProductDb[] GetAllByCategoryId(int id)
+        {
+            return this.dataContext.Products.Where(p => p.CategoryId == id).ToArray();
+        }
+
         public ProductDb GetById(int id)
         {
             return this.dataContext.Products.FirstOrDefault(p => p.ProductId == id);