replace multiple includes

Author: dobromirts

NorthwindCRUD/Controllers/CustomersController.cs

@@ -12,12 +12,14 @@
     public class CustomersController : Controller
     {
         private readonly CustomerService customerService;
+        private readonly OrderService orderService;
         private readonly IMapper mapper;
         private readonly ILogger logger;
 
-        public CustomersController(CustomerService customerService, IMapper mapper, ILogger logger)
+        public CustomersController(CustomerService customerService, OrderService orderService, IMapper mapper, ILogger logger)
         {
             this.customerService = customerService;
+            this.orderService = orderService;
             this.mapper = mapper;
             this.logger = logger;
         }
@@ -66,10 +68,10 @@ public ActionResult<OrderDto[]> GetOrdersByCustomerId(string id)
         {
             try
             {
-                var customer = this.customerService.GetById(id);
-                if (customer != null)
+                var orders = this.orderService.GetOrdersByCustomerId(id);
+                if (orders != null)
                 {
-                    return Ok(this.mapper.Map<OrderDb[], OrderDto[]>(customer.Orders.ToArray()));
+                    return Ok(this.mapper.Map<OrderDb[], OrderDto[]>(orders));
                 }
 
                 return NotFound();

NorthwindCRUD/Controllers/EmployeesController.cs

@@ -12,12 +12,16 @@
     public class EmployeesController : Controller
     {
         private readonly EmployeeService employeeService;
+        private readonly EmployeeTerritoryService employeeTerritoryService;
+        private readonly OrderService ordersService;
         private readonly IMapper mapper;
         private readonly ILogger logger;
 
-        public EmployeesController(EmployeeService employeeService, IMapper mapper, ILogger logger)
+        public EmployeesController(EmployeeService employeeService, EmployeeTerritoryService employeeTerritoryService, OrderService ordersService, IMapper mapper, ILogger logger)
         {
             this.employeeService = employeeService;
+            this.employeeTerritoryService = employeeTerritoryService;
+            this.ordersService = ordersService;
             this.mapper = mapper;
             this.logger = logger;
         }
@@ -108,10 +112,10 @@ public ActionResult<OrderDto[]> GetOrdersByEmployeeId(int id)
         {
             try
             {
-                var employee = this.employeeService.GetById(id);
-                if (employee != null)
+                var orders = this.ordersService.GetOrdersByEmployeeId(id);
+                if (orders != null)
                 {
-                    return Ok(this.mapper.Map<OrderDb[], OrderDto[]>(employee.Orders.ToArray()));
+                    return Ok(this.mapper.Map<OrderDb[], OrderDto[]>(orders));
                 }
 
                 return NotFound();
@@ -129,11 +133,9 @@ public ActionResult<EmployeeDto[]> GetTeritoriesByEmployeeId(int id)
         {
             try
             {
-                var employee = this.employeeService.GetById(id);
-                if (employee != null)
+                var teritories = this.employeeTerritoryService.GetTeritoriesByEmployeeId(id);
+                if (teritories != null)
                 {
-                    var teritories = employee.EmployeesTerritories.Select(et => et.Territory).ToArray();
-
                     return Ok(this.mapper.Map<TerritoryDb[], TerritoryDto[]>(teritories));
                 }
 
@@ -146,6 +148,28 @@ public ActionResult<EmployeeDto[]> GetTeritoriesByEmployeeId(int id)
             }
         }
 
+        [HttpPost("Teritory")]
+        [Authorize]
+        public ActionResult<EmployeeTerritoryDto> AddTerritoryToEmployee(EmployeeTerritoryDto model)
+        {
+            try
+            {
+                if (ModelState.IsValid)
+                {
+                    var mappedModel = this.mapper.Map<EmployeeTerritoryDto, EmployeeTerritoryDb>(model);
+                    var employeeTerrirtory = this.employeeTerritoryService.AddTerritoryToEmployee(mappedModel);
+                    return Ok(this.mapper.Map<EmployeeTerritoryDb, EmployeeTerritoryDto>(employeeTerrirtory));
+                }
+
+                return NotFound();
+            }
+            catch (Exception error)
+            {
+                logger.LogError(error.Message);
+                return StatusCode(500);
+            }
+        }
+
         [HttpPost]
         [Authorize]
         public ActionResult<EmployeeDto> Create(EmployeeDto model)

NorthwindCRUD/Controllers/OrdersController.cs

@@ -13,12 +13,20 @@
     public class OrdersController : ControllerBase
     {
         private readonly OrderService orderService;
+        private readonly EmployeeService employeeService;
+        private readonly CustomerService customerService;
+        private readonly ShipperService shipperService;
+        private readonly ProductService productService;
         private readonly IMapper mapper;
         private readonly ILogger logger;
 
-        public OrdersController(OrderService orderService, IMapper mapper, ILogger logger)
+        public OrdersController(OrderService orderService, EmployeeService employeeService, CustomerService customerService, ShipperService shipperService, ProductService productService, IMapper mapper, ILogger logger)
         {
             this.orderService = orderService;
+            this.employeeService = employeeService;
+            this.customerService = customerService;
+            this.shipperService = shipperService;
+            this.productService = productService;
             this.mapper = mapper;
             this.logger = logger;
         }
@@ -91,11 +99,11 @@ public ActionResult<CustomerDto> GetCustomerByOrderId(int id)
                 var order = this.orderService.GetById(id);
                 if (order != null)
                 {
-                    var customer = order.Customer;
+                    var customer = this.customerService.GetById(order.CustomerId);
 
                     if (customer != null)
                     {
-                        return Ok(this.mapper.Map<CustomerDb, CustomerDto>(customer));
+                        return this.mapper.Map<CustomerDb, CustomerDto>(customer);
                     }
                 }
 
@@ -117,8 +125,7 @@ public ActionResult<CustomerDto> GetEmployeeByOrderId(int id)
                 var order = this.orderService.GetById(id);
                 if (order != null)
                 {
-                    var employee = order.Employee;
-
+                    var employee = this.employeeService.GetById(order.EmployeeId);
                     if (employee != null)
                     {
                         return Ok(this.mapper.Map<EmployeeDb, EmployeeDto>(employee));
@@ -143,7 +150,7 @@ public ActionResult<CustomerDto> GetShipperByOrderId(int id)
                 var order = this.orderService.GetById(id);
                 if (order != null)
                 {
-                    var shipper = order.Shipper;
+                    var shipper = this.shipperService.GetById(order.ShipVia);
 
                     if (shipper != null)
                     {
@@ -170,9 +177,14 @@ public ActionResult<ProductDto[]> GetProductsByOrderId(int id)
                 var order = this.orderService.GetById(id);
                 if (order != null)
                 {
-                    var products = order.Details.Select(o => o.Product).ToArray();
+                    var productIds = order.Details.Select(o => o.ProductId).ToArray();
+                    var products = this.productService.GetProductsByIds(productIds);
 
-                    return Ok(this.mapper.Map<ProductDb[], ProductDto[]>(products));
+                    if (products != null)
+                    {
+                        var productDtos = this.mapper.Map<ProductDb[], ProductDto[]>(products);
+                        return Ok(productDtos);
+                    }
                 }
 
                 return NotFound();

NorthwindCRUD/Controllers/ProductsController.cs

@@ -13,12 +13,18 @@ namespace NorthwindCRUD.Controllers
     public class ProductsController : ControllerBase
     {
         private readonly ProductService productService;
+        private readonly CategoryService categoryService;
+        private readonly OrderService orderService;
+        private readonly SupplierService supplierService;
         private readonly IMapper mapper;
         private readonly ILogger logger;
 
-        public ProductsController(ProductService productService, IMapper mapper, ILogger logger)
+        public ProductsController(ProductService productService, CategoryService categoryService, OrderService orderService, SupplierService supplierService, IMapper mapper, ILogger logger)
         {
             this.productService = productService;
+            this.categoryService = categoryService;
+            this.orderService = orderService;
+            this.supplierService = supplierService;
             this.mapper = mapper;
             this.logger = logger;   
         }
@@ -70,7 +76,7 @@ public ActionResult<CategoryDto> GetCategoryByProductId(int id)
                 var product = this.productService.GetById(id);
                 if (product != null)
                 {
-                    var category = product.Category;
+                    var category = this.categoryService.GetById(product.CategoryId);
 
                     if (category != null)
                     {
@@ -96,7 +102,8 @@ public ActionResult<OrderDetailDto[]> GetOrderDetailsByProductId(int id)
                 var product = this.productService.GetById(id);
                 if (product != null)
                 {
-                    return Ok(this.mapper.Map<OrderDetailDb[], OrderDetailDto>(product.Details.ToArray()));
+                    var orderDetails = this.orderService.GetOrderDetailsByProductId(id);
+                    return Ok(this.mapper.Map<OrderDetailDb[], OrderDetailDto[]>(orderDetails));
                 }
 
                 return NotFound();
@@ -117,7 +124,7 @@ public ActionResult<SupplierDto> GetSupplierByProductId(int id)
                 var product = this.productService.GetById(id);
                 if (product != null)
                 {
-                    var supplier = product.Supplier;
+                    var supplier = this.supplierService.GetById(product.SupplierId);
 
                     if (supplier != null)
                     {

NorthwindCRUD/Controllers/RegionsController.cs

@@ -13,12 +13,14 @@
     public class RegionsController : ControllerBase
     {
         private readonly RegionService regionService;
+        private readonly TerritoryService territoryService;
         private readonly IMapper mapper;
         private readonly ILogger logger;
 
-        public RegionsController(RegionService regionService, IMapper mapper, ILogger logger)
+        public RegionsController(RegionService regionService, TerritoryService territoryService, IMapper mapper, ILogger logger)
         {
             this.regionService = regionService;
+            this.territoryService = territoryService;
             this.mapper = mapper;
             this.logger = logger;
         }
@@ -70,7 +72,11 @@ public ActionResult<CustomerDto> GetTerritoryByRegionId(int id)
                 var region = this.regionService.GetById(id);
                 if (region != null)
                 {
-                    return Ok(this.mapper.Map<TerritoryDb[], TerritoryDto[]>(region.Territories.ToArray()));
+                    var territories = this.territoryService.GetTerritoriesByRegionId(id);
+                    if (territories != null)
+                    {
+                        return Ok(this.mapper.Map<TerritoryDb[], TerritoryDto[]>(territories));
+                    }
                 }
 
                 return NotFound();

NorthwindCRUD/Controllers/ShippersController.cs

@@ -12,13 +12,15 @@
     [Route("[controller]")]
     public class ShippersController : ControllerBase
     {
-        private readonly ShipperService ShipperService;
+        private readonly ShipperService shipperService;
+        private readonly OrderService orderService;
         private readonly IMapper mapper;
         private readonly ILogger logger;
 
-        public ShippersController(ShipperService ShipperService, IMapper mapper, ILogger logger)
+        public ShippersController(ShipperService shipperService, OrderService orderService, IMapper mapper, ILogger logger)
         {
-            this.ShipperService = ShipperService;
+            this.shipperService = shipperService;
+            this.orderService = orderService;
             this.mapper = mapper;
             this.logger = logger;
         }
@@ -29,8 +31,8 @@ public ActionResult<ShipperDto[]> GetAll()
         {
             try
             {
-                var Shippers = this.ShipperService.GetAll();
-                return Ok(this.mapper.Map<ShipperDb[], ShipperDto[]>(Shippers));
+                var shippers = this.shipperService.GetAll();
+                return Ok(this.mapper.Map<ShipperDb[], ShipperDto[]>(shippers));
             }
             catch (Exception error)
             {
@@ -46,7 +48,7 @@ public ActionResult<ShipperDto> GetById(int id)
         {
             try
             {
-                var category = this.ShipperService.GetById(id);
+                var category = this.shipperService.GetById(id);
                 if (category != null)
                 {
                     return Ok(this.mapper.Map<ShipperDb, ShipperDto>(category));
@@ -67,10 +69,10 @@ public ActionResult<OrderDto[]> GetOrdersByShipperId(int id)
         {
             try
             {
-                var shipper = this.ShipperService.GetById(id);
-                if (shipper != null)
+                var orders = this.orderService.GetOrdersByShipperId(id);
+                if (orders != null)
                 {
-                    return Ok(this.mapper.Map<OrderDb[], OrderDto[]>(shipper.Orders.ToArray()));
+                    return Ok(this.mapper.Map<OrderDb[], OrderDto[]>(orders));
                 }
 
                 return NotFound();
@@ -91,7 +93,7 @@ public ActionResult<ShipperDto> Create(ShipperDto model)
                 if (ModelState.IsValid)
                 {
                     var mappedModel = this.mapper.Map<ShipperDto, ShipperDb>(model);
-                    var shipper = this.ShipperService.Create(mappedModel);
+                    var shipper = this.shipperService.Create(mappedModel);
                     return Ok(this.mapper.Map<ShipperDb, ShipperDto>(shipper));
                 }
 
@@ -113,7 +115,7 @@ public ActionResult<ShipperDto> Update(ShipperDto model)
                 if (ModelState.IsValid)
                 {
                     var mappedModel = this.mapper.Map<ShipperDto, ShipperDb>(model);
-                    var shipper = this.ShipperService.Update(mappedModel);
+                    var shipper = this.shipperService.Update(mappedModel);
 
                     if (shipper != null)
                     {
@@ -138,7 +140,7 @@ public ActionResult<ShipperDto> Delete(int id)
         {
             try
             {
-                var shipper = this.ShipperService.Delete(id);
+                var shipper = this.shipperService.Delete(id);
                 if (shipper != null)
                 {
                     return Ok(this.mapper.Map<ShipperDb, ShipperDto>(shipper));

NorthwindCRUD/Controllers/SuppliersController.cs

@@ -13,12 +13,14 @@
     public class SuppliersController : ControllerBase
     {
         private readonly SupplierService supplierService;
+        private readonly ProductService productService;
         private readonly IMapper mapper;
         private readonly ILogger logger;
 
-        public SuppliersController(SupplierService SupplierService, IMapper mapper, ILogger logger)
+        public SuppliersController(SupplierService supplierService, ProductService productService, IMapper mapper, ILogger logger)
         {
-            this.supplierService = SupplierService;
+            this.supplierService = supplierService;
+            this.productService = productService;
             this.mapper = mapper;
             this.logger = logger;
         }
@@ -67,10 +69,10 @@ public ActionResult<ProductDto[]> GetProductsBySupplierId(int id)
         {
             try
             {
-                var supplier = this.supplierService.GetById(id);
-                if (supplier != null)
+                var products = this.productService.GetAllBySupplierId(id);
+                if (products != null)
                 {
-                    return Ok(this.mapper.Map<ProductDb[], ProductDto[]>(supplier.Products.ToArray()));
+                    return Ok(this.mapper.Map<ProductDb[], ProductDto[]>(products));
                 }
 
                 return NotFound();

NorthwindCRUD/Controllers/TerritoriesController.cs

@@ -14,13 +14,15 @@ public class TerritoriesController : ControllerBase
     {
         private readonly TerritoryService territoryService;
         private readonly RegionService regionService;
+        private readonly EmployeeTerritoryService employeeTerritoryService;
         private readonly IMapper mapper;
         private readonly ILogger logger;
 
-        public TerritoriesController(TerritoryService territoryService, RegionService regionService, IMapper mapper, ILogger logger)
+        public TerritoriesController(TerritoryService territoryService, EmployeeTerritoryService employeeTerritoryService, RegionService regionService, IMapper mapper, ILogger logger)
         {
             this.territoryService = territoryService;
             this.regionService = regionService;
+            this.employeeTerritoryService = employeeTerritoryService;
             this.mapper = mapper;
             this.logger = logger;
         }
@@ -69,12 +71,10 @@ public ActionResult<EmployeeDto[]> GetEmployeesByTerritory(string id)
         {
             try
             {
-                var territory = this.territoryService.GetById(id);
+                var employees = this.employeeTerritoryService.GetEmployeesByTerritoryId(id);
 
-                if (territory != null)
+                if (employees != null)
                 {
-                    var employees = territory.EmployeesTerritories.Select(et => et.Employee).ToArray();
-
                     return Ok(this.mapper.Map<EmployeeDb[], EmployeeDto[]>(employees));
                 }