remove reduntant checks

dobromirts · dobromirts · commit 1e6adef52c7e · 2023-10-02T10:37:38.000+03:00
diff --git a/NorthwindCRUD/Controllers/CategoriesController.cs b/NorthwindCRUD/Controllers/CategoriesController.cs
@@ -26,7 +26,7 @@ public CategoriesController(CategoryService categoryService, ProductService prod
 
         [HttpGet]
         [Authorize]
-        public ActionResult<Models.Dtos.CategoryDto[]> GetAll()
+        public ActionResult<CategoryDto[]> GetAll()
         {
             try
             {
@@ -91,12 +91,7 @@ public ActionResult<ProductDto[]> GetProductsByCategoryId(int id)
             try
             {
                 var products = this.productService.GetAllByCategoryId(id);
-                if (products != null)
-                {
-                    return Ok(this.mapper.Map<ProductDb[], ProductDto[]>(products));
-                }
-
-                return NotFound();
+                return Ok(this.mapper.Map<ProductDb[], ProductDto[]>(products));
             }
             catch (Exception error)
             {
diff --git a/NorthwindCRUD/Controllers/CustomersController.cs b/NorthwindCRUD/Controllers/CustomersController.cs
@@ -69,12 +69,7 @@ public ActionResult<OrderDto[]> GetOrdersByCustomerId(string id)
             try
             {
                 var orders = this.orderService.GetOrdersByCustomerId(id);
-                if (orders != null)
-                {
-                    return Ok(this.mapper.Map<OrderDb[], OrderDto[]>(orders));
-                }
-
-                return NotFound();
+                return Ok(this.mapper.Map<OrderDb[], OrderDto[]>(orders));
             }
             catch (Exception error)
             {
diff --git a/NorthwindCRUD/Controllers/EmployeesController.cs b/NorthwindCRUD/Controllers/EmployeesController.cs
@@ -113,12 +113,7 @@ public ActionResult<OrderDto[]> GetOrdersByEmployeeId(int id)
             try
             {
                 var orders = this.ordersService.GetOrdersByEmployeeId(id);
-                if (orders != null)
-                {
-                    return Ok(this.mapper.Map<OrderDb[], OrderDto[]>(orders));
-                }
-
-                return NotFound();
+                return Ok(this.mapper.Map<OrderDb[], OrderDto[]>(orders));
             }
             catch (Exception error)
             {
@@ -134,12 +129,7 @@ public ActionResult<EmployeeDto[]> GetTeritoriesByEmployeeId(int id)
             try
             {
                 var teritories = this.employeeTerritoryService.GetTeritoriesByEmployeeId(id);
-                if (teritories != null)
-                {
-                    return Ok(this.mapper.Map<TerritoryDb[], TerritoryDto[]>(teritories));
-                }
-
-                return NotFound();
+                return Ok(this.mapper.Map<TerritoryDb[], TerritoryDto[]>(teritories));
             }
             catch (Exception error)
             {
diff --git a/NorthwindCRUD/Controllers/RegionsController.cs b/NorthwindCRUD/Controllers/RegionsController.cs
@@ -63,7 +63,7 @@ public ActionResult<RegionDto> GetById(int id)
             }
         }
 
-        [HttpGet("{id}/Territory")]
+        [HttpGet("{id}/Territories")]
         [Authorize]
         public ActionResult<CustomerDto> GetTerritoryByRegionId(int id)
         {
@@ -73,10 +73,7 @@ public ActionResult<CustomerDto> GetTerritoryByRegionId(int id)
                 if (region != null)
                 {
                     var territories = this.territoryService.GetTerritoriesByRegionId(id);
-                    if (territories != null)
-                    {
-                        return Ok(this.mapper.Map<TerritoryDb[], TerritoryDto[]>(territories));
-                    }
+                    return Ok(this.mapper.Map<TerritoryDb[], TerritoryDto[]>(territories));
                 }
 
                 return NotFound();
diff --git a/NorthwindCRUD/Controllers/ShippersController.cs b/NorthwindCRUD/Controllers/ShippersController.cs
@@ -70,12 +70,7 @@ public ActionResult<OrderDto[]> GetOrdersByShipperId(int id)
             try
             {
                 var orders = this.orderService.GetOrdersByShipperId(id);
-                if (orders != null)
-                {
-                    return Ok(this.mapper.Map<OrderDb[], OrderDto[]>(orders));
-                }
-
-                return NotFound();
+                return Ok(this.mapper.Map<OrderDb[], OrderDto[]>(orders));
             }
             catch (Exception error)
             {
diff --git a/NorthwindCRUD/Controllers/SuppliersController.cs b/NorthwindCRUD/Controllers/SuppliersController.cs
@@ -70,12 +70,7 @@ public ActionResult<ProductDto[]> GetProductsBySupplierId(int id)
             try
             {
                 var products = this.productService.GetAllBySupplierId(id);
-                if (products != null)
-                {
-                    return Ok(this.mapper.Map<ProductDb[], ProductDto[]>(products));
-                }
-
-                return NotFound();
+                return Ok(this.mapper.Map<ProductDb[], ProductDto[]>(products));
             }
             catch (Exception error)
             {
diff --git a/NorthwindCRUD/Controllers/TerritoriesController.cs b/NorthwindCRUD/Controllers/TerritoriesController.cs
@@ -72,13 +72,7 @@ public ActionResult<EmployeeDto[]> GetEmployeesByTerritory(string id)
             try
             {
                 var employees = this.employeeTerritoryService.GetEmployeesByTerritoryId(id);
-
-                if (employees != null)
-                {
-                    return Ok(this.mapper.Map<EmployeeDb[], EmployeeDto[]>(employees));
-                }
-
-                return NotFound();
+                return Ok(this.mapper.Map<EmployeeDb[], EmployeeDto[]>(employees));
             }
             catch (Exception error)
             {
@@ -98,7 +92,11 @@ public ActionResult<RegionDto[]> GetRegionByTerritory(string id)
                 {
                     var region = this.regionService.GetById(territory.RegionId);
 
-                    return Ok(this.mapper.Map<RegionDb, RegionDto>(region));
+                    if (region != null)
+                    {
+                        return Ok(this.mapper.Map<RegionDb, RegionDto>(region));
+                    }
+ 
                 }
 
                 return NotFound();
diff --git a/NorthwindCRUD/DataContext.cs b/NorthwindCRUD/DataContext.cs
@@ -38,17 +38,16 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .WithMany(c => c.Products);
 
             modelBuilder.Entity<ProductDb>()
-              .HasOne(p => p.Supplier)
-              .WithMany(c => c.Products);
+               .HasOne(p => p.Supplier)
+               .WithMany(c => c.Products);
 
             modelBuilder.Entity<CustomerDb>()
                 .HasOne(c => c.Address)
                 .WithMany(a => a.Customers);
 
-
             modelBuilder.Entity<OrderDb>()
-               .HasOne(o => o.ShipAddress)
-               .WithMany(a => a.Orders);
+                .HasOne(o => o.ShipAddress)
+                .WithMany(a => a.Orders);
 
             modelBuilder.Entity<OrderDb>()
                 .HasOne(o => o.Customer)
@@ -63,20 +62,20 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .OnDelete(DeleteBehavior.Restrict);
 
             modelBuilder.Entity<OrderDb>()
-              .HasOne(o => o.Shipper)
-              .WithMany(s => s.Orders);
+                .HasOne(o => o.Shipper)
+                .WithMany(s => s.Orders);
 
             modelBuilder.Entity<OrderDetailDb>()
-               .HasOne(od => od.Product)
-               .WithMany(p => p.Details);
+                .HasOne(od => od.Product)
+                .WithMany(p => p.Details);
 
             modelBuilder.Entity<OrderDetailDb>()
                 .HasOne(o => o.Order)
                 .WithMany(o => o.Details);
 
             modelBuilder.Entity<EmployeeDb>()
-               .HasOne(e => e.Address)
-               .WithMany(a => a.Employees);
+                .HasOne(e => e.Address)
+                .WithMany(a => a.Employees);
 
             modelBuilder.Entity<TerritoryDb>()
                 .HasOne(t => t.Region)
@@ -96,7 +95,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .HasKey(et => new { et.EmployeeId, et.TerritoryId });
 
             modelBuilder.Entity<OrderDetailDb>()
-               .HasKey(et => new { et.ProductId, et.OrderId });
+                .HasKey(et => new { et.ProductId, et.OrderId });
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public CategoriesController(CategoryService categoryService, ProductService prod`
`26`	`26`
`27`	`27`	`[HttpGet]`
`28`	`28`	`[Authorize]`
`29`		`- public ActionResult<Models.Dtos.CategoryDto[]> GetAll()`
	`29`	`+ public ActionResult<CategoryDto[]> GetAll()`
`30`	`30`	`{`
`31`	`31`	`try`
`32`	`32`	`{`
`@@ -91,12 +91,7 @@ public ActionResult<ProductDto[]> GetProductsByCategoryId(int id)`
`91`	`91`	`try`
`92`	`92`	`{`
`93`	`93`	`var products = this.productService.GetAllByCategoryId(id);`
`94`		`- if (products != null)`
`95`		`- {`
`96`		`- return Ok(this.mapper.Map<ProductDb[], ProductDto[]>(products));`
`97`		`- }`
`98`		`-`
`99`		`- return NotFound();`
	`94`	`+ return Ok(this.mapper.Map<ProductDb[], ProductDto[]>(products));`
`100`	`95`	`}`
`101`	`96`	`catch (Exception error)`
`102`	`97`	`{`
Original file line number	Diff line number	Diff line change
`@@ -69,12 +69,7 @@ public ActionResult<OrderDto[]> GetOrdersByCustomerId(string id)`
`69`	`69`	`try`
`70`	`70`	`{`
`71`	`71`	`var orders = this.orderService.GetOrdersByCustomerId(id);`
`72`		`- if (orders != null)`
`73`		`- {`
`74`		`- return Ok(this.mapper.Map<OrderDb[], OrderDto[]>(orders));`
`75`		`- }`
`76`		`-`
`77`		`- return NotFound();`
	`72`	`+ return Ok(this.mapper.Map<OrderDb[], OrderDto[]>(orders));`
`78`	`73`	`}`
`79`	`74`	`catch (Exception error)`
`80`	`75`	`{`
Original file line number	Diff line number	Diff line change
`@@ -113,12 +113,7 @@ public ActionResult<OrderDto[]> GetOrdersByEmployeeId(int id)`
`113`	`113`	`try`
`114`	`114`	`{`
`115`	`115`	`var orders = this.ordersService.GetOrdersByEmployeeId(id);`
`116`		`- if (orders != null)`
`117`		`- {`
`118`		`- return Ok(this.mapper.Map<OrderDb[], OrderDto[]>(orders));`
`119`		`- }`
`120`		`-`
`121`		`- return NotFound();`
	`116`	`+ return Ok(this.mapper.Map<OrderDb[], OrderDto[]>(orders));`
`122`	`117`	`}`
`123`	`118`	`catch (Exception error)`
`124`	`119`	`{`
`@@ -134,12 +129,7 @@ public ActionResult<EmployeeDto[]> GetTeritoriesByEmployeeId(int id)`
`134`	`129`	`try`
`135`	`130`	`{`
`136`	`131`	`var teritories = this.employeeTerritoryService.GetTeritoriesByEmployeeId(id);`
`137`		`- if (teritories != null)`
`138`		`- {`
`139`		`- return Ok(this.mapper.Map<TerritoryDb[], TerritoryDto[]>(teritories));`
`140`		`- }`
`141`		`-`
`142`		`- return NotFound();`
	`132`	`+ return Ok(this.mapper.Map<TerritoryDb[], TerritoryDto[]>(teritories));`
`143`	`133`	`}`
`144`	`134`	`catch (Exception error)`
`145`	`135`	`{`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public ActionResult<RegionDto> GetById(int id)`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`66`		`- [HttpGet("{id}/Territory")]`
	`66`	`+ [HttpGet("{id}/Territories")]`
`67`	`67`	`[Authorize]`
`68`	`68`	`public ActionResult<CustomerDto> GetTerritoryByRegionId(int id)`
`69`	`69`	`{`
`@@ -73,10 +73,7 @@ public ActionResult<CustomerDto> GetTerritoryByRegionId(int id)`
`73`	`73`	`if (region != null)`
`74`	`74`	`{`
`75`	`75`	`var territories = this.territoryService.GetTerritoriesByRegionId(id);`
`76`		`- if (territories != null)`
`77`		`- {`
`78`		`- return Ok(this.mapper.Map<TerritoryDb[], TerritoryDto[]>(territories));`
`79`		`- }`
	`76`	`+ return Ok(this.mapper.Map<TerritoryDb[], TerritoryDto[]>(territories));`
`80`	`77`	`}`
`81`	`78`
`82`	`79`	`return NotFound();`
Original file line number	Diff line number	Diff line change
`@@ -70,12 +70,7 @@ public ActionResult<OrderDto[]> GetOrdersByShipperId(int id)`
`70`	`70`	`try`
`71`	`71`	`{`
`72`	`72`	`var orders = this.orderService.GetOrdersByShipperId(id);`
`73`		`- if (orders != null)`
`74`		`- {`
`75`		`- return Ok(this.mapper.Map<OrderDb[], OrderDto[]>(orders));`
`76`		`- }`
`77`		`-`
`78`		`- return NotFound();`
	`73`	`+ return Ok(this.mapper.Map<OrderDb[], OrderDto[]>(orders));`
`79`	`74`	`}`
`80`	`75`	`catch (Exception error)`
`81`	`76`	`{`
Original file line number	Diff line number	Diff line change
`@@ -72,13 +72,7 @@ public ActionResult<EmployeeDto[]> GetEmployeesByTerritory(string id)`
`72`	`72`	`try`
`73`	`73`	`{`
`74`	`74`	`var employees = this.employeeTerritoryService.GetEmployeesByTerritoryId(id);`
`75`		`-`
`76`		`- if (employees != null)`
`77`		`- {`
`78`		`- return Ok(this.mapper.Map<EmployeeDb[], EmployeeDto[]>(employees));`
`79`		`- }`
`80`		`-`
`81`		`- return NotFound();`
	`75`	`+ return Ok(this.mapper.Map<EmployeeDb[], EmployeeDto[]>(employees));`
`82`	`76`	`}`
`83`	`77`	`catch (Exception error)`
`84`	`78`	`{`
`@@ -98,7 +92,11 @@ public ActionResult<RegionDto[]> GetRegionByTerritory(string id)`
`98`	`92`	`{`
`99`	`93`	`var region = this.regionService.GetById(territory.RegionId);`
`100`	`94`
`101`		`- return Ok(this.mapper.Map<RegionDb, RegionDto>(region));`
	`95`	`+ if (region != null)`
	`96`	`+ {`
	`97`	`+ return Ok(this.mapper.Map<RegionDb, RegionDto>(region));`
	`98`	`+ }`
	`99`	`+`
`102`	`100`	`}`
`103`	`101`
`104`	`102`	`return NotFound();`