Added CA and Stylecop rules to NorthwindCRUD project.

NorthwindCRUD.Tests/CategroyServiceFixture.cs

@@ -14,8 +14,8 @@ public void ShouldCreateCategory()
             Assert.IsNotNull(createdCategory);
             createdCategory = DataHelper2.CategoryService.GetById(createdCategory.CategoryId);
 
-            Assert.AreEqual(category.Name, createdCategory.Name);
-            Assert.AreEqual(category.Description, createdCategory.Description);
+            Assert.AreEqual(category.Name, createdCategory?.Name);
+            Assert.AreEqual(category.Description, createdCategory?.Description);
         }
 
         [TestMethod]
@@ -32,6 +32,7 @@ public void ShouldUpdateCategory()
 
             Assert.IsNotNull(updatedCategory);
             updatedCategory = DataHelper2.CategoryService.GetById(updatedCategory.CategoryId);
+            Assert.IsNotNull(updatedCategory);
             Assert.AreNotEqual(orignalName, updatedCategory.Name);
             Assert.AreNotEqual(orignalDescription, updatedCategory.Description);
             Assert.AreEqual(createdCategory.Name, updatedCategory.Name);

NorthwindCRUD.Tests/CustomerServiceFixture.cs

@@ -14,6 +14,7 @@ public void ShouldCreateCustomer()
             Assert.AreEqual(customer, createdCustomer, "Customers instances should be the same since we are over the same context");
 
             createdCustomer = DataHelper2.CustomerService.GetById(createdCustomer.CustomerId);
+            Assert.IsNotNull(createdCustomer);
             Assert.AreNotEqual(customer, createdCustomer, "Customer instances should be different");
 
             Assert.AreEqual(customer.CompanyName, createdCustomer.CompanyName);

NorthwindCRUD.Tests/EmployeeServiceFixture.cs

@@ -14,10 +14,11 @@ public void ShouldCreateEmployee()
             var createdEmployee = DataHelper.EmployeeService.Create(employee);
 
             Assert.IsNotNull(createdEmployee);
-            var newEmployee = DataHelper2.EmployeeService.GetById(createdEmployee.EmployeeId);
-            Assert.AreEqual(employee.FirstName, newEmployee.FirstName);
-            Assert.AreEqual(employee.LastName, newEmployee.LastName);
-            Assert.AreEqual(employee.Title, newEmployee.Title);
+            createdEmployee = DataHelper2.EmployeeService.GetById(createdEmployee.EmployeeId);
+            Assert.IsNotNull(createdEmployee);
+            Assert.AreEqual(employee.FirstName, createdEmployee.FirstName);
+            Assert.AreEqual(employee.LastName, createdEmployee.LastName);
+            Assert.AreEqual(employee.Title, createdEmployee.Title);
         }
 
         [TestMethod]
@@ -32,7 +33,7 @@ public void ShouldUpdateEmployee()
 
             Assert.IsNotNull(updatedEmployee);
             updatedEmployee = DataHelper2.EmployeeService.GetById(updatedEmployee.EmployeeId);
-
+            Assert.IsNotNull(updatedEmployee);
             Assert.AreNotEqual(originalTitle, updatedEmployee.Title);
             Assert.AreEqual(createdEmployee.Title, updatedEmployee.Title);
         }

NorthwindCRUD.Tests/OrderServiceFixture.cs

@@ -20,6 +20,8 @@ public void ShouldCreateOrder()
 
             Assert.IsNotNull(createdOrder);
             createdOrder = DataHelper2.OrderService.GetById(createdOrder.OrderId);
+            Assert.IsNotNull(createdOrder);
+
             Assert.AreEqual(order.OrderId, createdOrder.OrderId);
             Assert.AreEqual(order.CustomerId, createdOrder.CustomerId);
             Assert.AreEqual(order.EmployeeId, createdOrder.EmployeeId);
@@ -39,6 +41,7 @@ public void ShouldUpdateOrder()
 
             Assert.IsNotNull(updatedOrder);
             updatedOrder = DataHelper2.OrderService.GetById(updatedOrder.OrderId);
+            Assert.IsNotNull(updatedOrder);
             Assert.AreNotEqual(originalCustomerId, updatedOrder.CustomerId);
             Assert.AreNotEqual(originalEmployeeId, updatedOrder.EmployeeId);
             Assert.AreEqual(order.CustomerId, updatedOrder.CustomerId);

NorthwindCRUD.Tests/ProductServiceFixture.cs

@@ -13,7 +13,7 @@ public void ShouldCreateProduct()
 
             Assert.IsNotNull(createdProduct);
             createdProduct = DataHelper2.ProductService.GetById(createdProduct.ProductId);
-
+            Assert.IsNotNull(createdProduct);
             Assert.AreEqual(product.UnitPrice, createdProduct.UnitPrice);
             Assert.AreEqual(product.UnitsInStock, createdProduct.UnitsInStock);
         }
@@ -31,7 +31,7 @@ public void ShouldUpdateProduct()
 
             Assert.IsNotNull(updatedProduct);
             updatedProduct = DataHelper2.ProductService.GetById(updatedProduct.ProductId);
-
+            Assert.IsNotNull(updatedProduct);
             Assert.AreNotEqual(originaUnitPrice, updatedProduct.UnitPrice);
             Assert.AreNotEqual(originaUnitsInStock, updatedProduct.UnitsInStock);
 

NorthwindCRUD.Tests/RegionServiceFixture.cs

@@ -15,6 +15,7 @@ public void ShouldCreateRegion()
 
             Assert.IsNotNull(createdRegion);
             createdRegion = DataHelper2.RegionService.GetById(createdRegion.RegionId);
+            Assert.IsNotNull(createdRegion);
             Assert.AreEqual(region.RegionId, createdRegion.RegionId);
             Assert.AreEqual(region.RegionDescription, createdRegion.RegionDescription);
         }
@@ -30,6 +31,7 @@ public void ShouldUpdateRegion()
 
             Assert.IsNotNull(updatedRegion);
             updatedRegion = DataHelper2.RegionService.GetById(updatedRegion.RegionId);
+            Assert.IsNotNull(updatedRegion);
             Assert.AreNotEqual(originalRegionDescription, updatedRegion.RegionDescription);
             Assert.AreEqual(region.RegionDescription, updatedRegion.RegionDescription);
         }

NorthwindCRUD.Tests/ShipperServiceFixture.cs

@@ -14,6 +14,7 @@ public void ShouldCreateShipper()
 
             Assert.IsNotNull(createdShipper);
             createdShipper = DataHelper2.ShipperService.GetById(createdShipper.ShipperId);
+            Assert.IsNotNull(createdShipper);
             Assert.AreEqual(shipper.ShipperId, createdShipper.ShipperId);
             Assert.AreEqual(shipper.CompanyName, createdShipper.CompanyName);
             Assert.AreEqual(shipper.Phone, createdShipper.Phone);
@@ -34,6 +35,7 @@ public void ShouldUpdateShipper()
 
             Assert.IsNotNull(updatedShipper);
             updatedShipper = DataHelper2.ShipperService.GetById(updatedShipper.ShipperId);
+            Assert.IsNotNull(updatedShipper);
             Assert.AreNotEqual(originalCompanyName, updatedShipper.CompanyName);
             Assert.AreNotEqual(originalPhone, updatedShipper.Phone);
             Assert.AreEqual(shipper.CompanyName, updatedShipper.CompanyName);

NorthwindCRUD.Tests/SupplierServiceFixture.cs

@@ -15,7 +15,7 @@ public void ShouldCreateSupplier()
 
             Assert.IsNotNull(createdSupplier);
             createdSupplier = DataHelper2.SupplierService.GetById(createdSupplier.SupplierId);
-
+            Assert.IsNotNull(createdSupplier);
             Assert.AreEqual(supplier.SupplierId, createdSupplier.SupplierId);
             Assert.AreEqual(supplier.CompanyName, createdSupplier.CompanyName);
             Assert.AreEqual(supplier.ContactName, createdSupplier.ContactName);
@@ -35,9 +35,9 @@ public void ShouldUpdateSupplier()
             supplier.ContactTitle = "Updated Title";
 
             var updatedSupplier = DataHelper.SupplierService.Update(supplier);
-
             Assert.IsNotNull(updatedSupplier);
             updatedSupplier = DataHelper2.SupplierService.GetById(updatedSupplier.SupplierId);
+            Assert.IsNotNull(updatedSupplier);
             Assert.AreEqual(supplier.CompanyName, updatedSupplier.CompanyName);
             Assert.AreEqual(supplier.ContactName, updatedSupplier.ContactName);
             Assert.AreEqual(supplier.ContactTitle, updatedSupplier.ContactTitle);

NorthwindCRUD.Tests/TerritoryServiceFixture.cs

@@ -14,7 +14,7 @@ public void ShouldCreateTerritory()
 
             Assert.IsNotNull(createdTerritory);
             createdTerritory = DataHelper2.TerritoryService.GetById(createdTerritory.TerritoryId);
-
+            Assert.IsNotNull(createdTerritory);
             Assert.AreEqual(territory.TerritoryId, createdTerritory.TerritoryId);
             Assert.AreEqual(territory.TerritoryDescription, createdTerritory.TerritoryDescription);
             Assert.AreEqual(territory.RegionId, createdTerritory.RegionId);
@@ -32,8 +32,8 @@ public void ShouldUpdateTerritory()
             var updatedTerritory = DataHelper.TerritoryService.Update(createdTerritory);
 
             Assert.IsNotNull(updatedTerritory);
-
             updatedTerritory = DataHelper2.TerritoryService.GetById(updatedTerritory.TerritoryId);
+            Assert.IsNotNull(updatedTerritory);
             Assert.AreNotEqual(originalTerritoryDescription, updatedTerritory.TerritoryDescription);
             Assert.AreEqual(createdTerritory.TerritoryDescription, updatedTerritory.TerritoryDescription);
         }

NorthwindCRUD/Controllers/AuthController.cs

@@ -15,7 +15,7 @@ public class AuthController : Controller
         private readonly AuthService authService;
         private readonly IMapper mapper;
         private readonly ILogger logger;
-        
+
         public AuthController(IConfiguration configuration, AuthService authService, IMapper mapper, ILogger logger)
         {
             this.configuration = configuration;
@@ -38,6 +38,7 @@ public ActionResult<string> Login(LoginDto userModel)
 
                         return Ok(token);
                     }
+
                     return BadRequest("Email or password are not correct!");
                 }
 
@@ -75,7 +76,6 @@ public ActionResult<string> Register(RegisterDto userModel)
                     {
                         var token = this.authService.GenerateJwtToken(user.Email);
                         return Ok(token);
-
                     }
 
                     return BadRequest("Email or password are not correct!");

NorthwindCRUD/Controllers/CategoriesController.cs

@@ -21,7 +21,7 @@ public CategoriesController(CategoryService categoryService, ProductService prod
             this.categoryService = categoryService;
             this.productService = productService;
             this.mapper = mapper;
-            this.logger = logger;   
+            this.logger = logger;
         }
 
         [HttpGet]
@@ -30,14 +30,13 @@ public ActionResult<CategoryDto[]> GetAll()
             try
             {
                 var categories = this.categoryService.GetAll();
-                return base.Ok(this.mapper.Map<CategoryDb[], CategoryDto[]>(categories));
+                return Ok(this.mapper.Map<CategoryDb[], CategoryDto[]>(categories));
             }
             catch (Exception error)
             {
                 logger.LogError(error.Message);
                 return StatusCode(500);
             }
-
         }
 
         [HttpGet("{id}")]
@@ -48,7 +47,7 @@ public ActionResult<CategoryDto> GetById(int id)
                 var category = this.categoryService.GetById(id);
                 if (category != null)
                 {
-                    return base.Ok(this.mapper.Map<CategoryDb, CategoryDto>(category));
+                    return Ok(this.mapper.Map<CategoryDb, CategoryDto>(category));
                 }
 
                 return NotFound();
@@ -60,7 +59,6 @@ public ActionResult<CategoryDto> GetById(int id)
             }
         }
 
-
         [HttpGet("{id}/Details")]
         public ActionResult<CategoryDetailsDto> GetDetailsById(int id)
         {
@@ -131,7 +129,7 @@ public ActionResult<CategoryDto> Update(CategoryDto model)
 
                     if (category != null)
                     {
-                        return base.Ok(this.mapper.Map<CategoryDb, CategoryDto>(category));
+                        return Ok(this.mapper.Map<CategoryDb, CategoryDto>(category));
                     }
 
                     return NotFound();
@@ -155,7 +153,7 @@ public ActionResult<CategoryDto> Delete(int id)
                 var category = this.categoryService.Delete(id);
                 if (category != null)
                 {
-                    return base.Ok(this.mapper.Map<CategoryDb, CategoryDto>(category));
+                    return Ok(this.mapper.Map<CategoryDb, CategoryDto>(category));
                 }
 
                 return NotFound();

NorthwindCRUD/Controllers/EmployeesController.cs

@@ -123,6 +123,11 @@ public ActionResult<EmployeeDto[]> GetTeritoriesByEmployeeId(int id)
             try
             {
                 var teritories = this.employeeTerritoryService.GetTeritoriesByEmployeeId(id);
+                if (teritories == null)
+                {
+                    return NotFound($"No territories for employee {id}");
+                }
+
                 return Ok(this.mapper.Map<TerritoryDb[], TerritoryDto[]>(teritories));
             }
             catch (Exception error)
@@ -144,6 +149,7 @@ public ActionResult<EmployeeTerritoryDto> AddTerritoryToEmployee(EmployeeTerrito
                     var employeeTerrirtory = this.employeeTerritoryService.AddTerritoryToEmployee(mappedModel);
                     return Ok(this.mapper.Map<EmployeeTerritoryDb, EmployeeTerritoryDto>(employeeTerrirtory));
                 }
+
                 return BadRequest(ModelState);
             }
             catch (InvalidOperationException exception)

NorthwindCRUD/Controllers/OrdersController.cs

@@ -93,7 +93,7 @@ public ActionResult<CustomerDto> GetCustomerByOrderId(int id)
             try
             {
                 var order = this.orderService.GetById(id);
-                if (order != null)
+                if (order != null && order.CustomerId != null)
                 {
                     var customer = this.customerService.GetById(order.CustomerId);
 
@@ -161,7 +161,6 @@ public ActionResult<CustomerDto> GetShipperByOrderId(int id)
             }
         }
 
-
         [HttpGet("{id}/Products")]
         public ActionResult<ProductDto[]> GetProductsByOrderId(int id)
         {

NorthwindCRUD/Controllers/ProductsController.cs

@@ -25,7 +25,7 @@ public ProductsController(ProductService productService, CategoryService categor
             this.orderService = orderService;
             this.supplierService = supplierService;
             this.mapper = mapper;
-            this.logger = logger;   
+            this.logger = logger;
         }
 
         [HttpGet]
@@ -41,7 +41,6 @@ public ActionResult<ProductDto[]> GetAll()
                 logger.LogError(error.Message);
                 return StatusCode(500);
             }
-
         }
 
         [HttpGet("{id}")]
@@ -76,7 +75,7 @@ public ActionResult<CategoryDto> GetCategoryByProductId(int id)
 
                     if (category != null)
                     {
-                        return Ok(this.mapper.Map<CategoryDb , CategoryDto>(category));
+                        return Ok(this.mapper.Map<CategoryDb, CategoryDto>(category));
                     }
                 }
 

NorthwindCRUD/Controllers/RegionsController.cs

@@ -38,7 +38,6 @@ public ActionResult<RegionDto[]> GetAll()
                 logger.LogError(error.Message);
                 return StatusCode(500);
             }
-
         }
 
         [HttpGet("{id}")]
@@ -90,8 +89,8 @@ public ActionResult<RegionDto> Create(RegionDto model)
                 if (ModelState.IsValid)
                 {
                     var mappedModel = this.mapper.Map<RegionDto, RegionDb>(model);
-                    var Region = this.regionService.Create(mappedModel);
-                    return Ok(this.mapper.Map<RegionDb, RegionDto>(Region));
+                    var region = this.regionService.Create(mappedModel);
+                    return Ok(this.mapper.Map<RegionDb, RegionDto>(region));
                 }
 
                 return BadRequest(ModelState);

NorthwindCRUD/Controllers/SalesController.cs

@@ -1,12 +1,12 @@
-namespace NorthwindCRUD.Controllers
-{
-    using AutoMapper;
-    using Microsoft.AspNetCore.Authorization;
-    using Microsoft.AspNetCore.Mvc;
-    using NorthwindCRUD.Models.Dtos;
-    using NorthwindCRUD.Services;
-    using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
+using AutoMapper;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using NorthwindCRUD.Models.Dtos;
+using NorthwindCRUD.Services;
 
+namespace NorthwindCRUD.Controllers
+{
     [ApiController]
     [Route("[controller]")]
     public class SalesController : ControllerBase
@@ -26,7 +26,8 @@ public SalesController(SalesService salesService, IMapper mapper, ILogger logger
         [Authorize]
         public ActionResult<SalesDto[]> GetSalesByCategoryAndYear([FromQuery] [Required] string categoryName, [FromQuery] int? orderYear = null)
         {
-            try {
+            try
+            {
                 var response = this.salesService.GetSalesDataByCategoryAndYear(categoryName, orderYear);
                 return Ok(response);
             }
@@ -43,7 +44,6 @@ public ActionResult<SalesDto[]> GetSalesByCountry(
             [FromQuery] [Required] string startDate,
             [FromQuery] [Required] string endDate)
         {
-
             try
             {
                 var salesData = this.salesService.RetrieveSalesDataByCountry(startDate, endDate, country);
@@ -73,7 +73,6 @@ public ActionResult<SalesDto[]> GetSalesByYear(
             [FromQuery] int startMounth,
             [FromQuery] int endMounth)
         {
-
             try
             {
                 var salesData = this.salesService.RetrieveSalesDataByYear(year, startMounth, endMounth);

NorthwindCRUD/Controllers/ShippersController.cs

@@ -38,7 +38,6 @@ public ActionResult<ShipperDto[]> GetAll()
                 logger.LogError(error.Message);
                 return StatusCode(500);
             }
-
         }
 
         [HttpGet("{id}")]

NorthwindCRUD/Controllers/SuppliersController.cs

@@ -38,7 +38,6 @@ public ActionResult<SupplierDto[]> GetAll()
                 logger.LogError(error.Message);
                 return StatusCode(500);
             }
-
         }
 
         [HttpGet("{id}")]