Added More custom exceptions

ranahamid · Mar 17, 2022 · ce50eb0 · ce50eb0
1 parent ab40b16
commit ce50eb0
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 19 deletions.
diff --git a/HotelListing.API.Core/Contracts/IGenericRepository.cs b/HotelListing.API.Core/Contracts/IGenericRepository.cs
@@ -13,7 +13,7 @@ public interface IGenericRepository<T> where T : class
         Task<TResult> AddAsync<TSource, TResult>(TSource source);
         Task DeleteAsync(int id);
         Task UpdateAsync(T entity);
-        Task UpdateAsync<TSource>(int id, TSource source);
+        Task UpdateAsync<TSource>(int id, TSource source) where TSource : IBaseDto;
         Task<bool> Exists(int id);
     }
 }
diff --git a/HotelListing.API.Core/Exceptions/BadRequestException.cs b/HotelListing.API.Core/Exceptions/BadRequestException.cs
@@ -0,0 +1,10 @@
+namespace HotelListing.API.Core.Exceptions
+{
+    public class BadRequestException : ApplicationException
+    {
+        public BadRequestException(string message) : base(message)
+        {
+
+        }
+    }
+}
diff --git a/HotelListing.API.Core/Middleware/ExceptionMiddleware.cs b/HotelListing.API.Core/Middleware/ExceptionMiddleware.cs
@@ -46,6 +46,10 @@ private Task HandleExceptionAsync(HttpContext context, Exception ex)
                     statusCode = HttpStatusCode.NotFound;
                     errorDetails.ErrorType = "Not Found";
                     break;
+                case BadRequestException badRequestException:
+                    statusCode = HttpStatusCode.BadRequest;
+                    errorDetails.ErrorType = "Bad Request";
+                    break;
                 default:
                     break;
             }

diff --git a/HotelListing.API.Core/Models/Country/BaseCountryDto.cs b/HotelListing.API.Core/Models/Country/BaseCountryDto.cs
@@ -2,11 +2,11 @@
 
 namespace HotelListing.API.Core.Models.Country
 {
-    public abstract class BaseCountryDto
+    public abstract class BaseCountryDto : IBaseDto
     {
         [Required]
         public string Name { get; set; }
         public string ShortName { get; set; }
-
+        public int Id { get; set; }
     }
 }
diff --git a/HotelListing.API.Core/Models/Country/CountryDto.cs b/HotelListing.API.Core/Models/Country/CountryDto.cs
@@ -4,7 +4,6 @@ namespace HotelListing.API.Core.Models.Country
 {
     public class CountryDto : BaseCountryDto
     {
-        public int Id { get; set; }
         public List<HotelDto> Hotels { get; set; }
     }
 }
diff --git a/HotelListing.API.Core/Models/Country/GetCountryDto.cs b/HotelListing.API.Core/Models/Country/GetCountryDto.cs
@@ -4,6 +4,5 @@ namespace HotelListing.API.Core.Models.Country
 {
     public class GetCountryDto : BaseCountryDto
     {
-        public int Id { get; set; }
     }
 }
diff --git a/HotelListing.API.Core/Models/Country/UpdateCountryDto.cs b/HotelListing.API.Core/Models/Country/UpdateCountryDto.cs
@@ -2,6 +2,5 @@
 {
     public class UpdateCountryDto : BaseCountryDto
     {
-        public int Id { get; set; }
     }
 }
diff --git a/HotelListing.API.Core/Models/Hotel/BaseHotelDto.cs b/HotelListing.API.Core/Models/Hotel/BaseHotelDto.cs
@@ -2,7 +2,7 @@
 
 namespace HotelListing.API.Core.Models.Hotel
 {
-    public abstract class BaseHotelDto
+    public abstract class BaseHotelDto : IBaseDto
     {
         [Required]
         public string Name { get; set; }
@@ -15,5 +15,6 @@ public abstract class BaseHotelDto
         [Required]
         [Range(1, int.MaxValue)]
         public int CountryId { get; set; }
+        public int Id { get; set; }
     }
 }
diff --git a/HotelListing.API.Core/Models/Hotel/HotelDto.cs b/HotelListing.API.Core/Models/Hotel/HotelDto.cs
@@ -2,6 +2,5 @@
 {
     public class HotelDto : BaseHotelDto
     {
-        public int Id { get; set; }
     }
 }
diff --git a/HotelListing.API.Core/Models/IBaseDto.cs b/HotelListing.API.Core/Models/IBaseDto.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HotelListing.API.Core.Models
+{
+    public interface IBaseDto
+    {
+        int Id { get; set; }
+    }
+}
diff --git a/HotelListing.API.Core/Repository/GenericRepository.cs b/HotelListing.API.Core/Repository/GenericRepository.cs
@@ -8,6 +8,7 @@
 using Microsoft.Extensions.Configuration;
 using HotelListing.API.Core.Exceptions;
 using System.Diagnostics.Metrics;
+using HotelListing.API.Core.Models.Hotel;
 
 namespace HotelListing.API.Core.Repository
 {
@@ -115,8 +116,13 @@ public async Task UpdateAsync(T entity)
             await _context.SaveChangesAsync();
         }
 
-        public async Task UpdateAsync<TSource>(int id, TSource source)
+        public async Task UpdateAsync<TSource>(int id, TSource source) where TSource : IBaseDto
         {
+            if (id != source.Id)
+            {
+                throw new BadRequestException("Invalid Id used in request");
+            }
+
             var entity = await GetAsync(id);
 
             if(entity == null)

diff --git a/HotelListing.API/Controllers/CountriesController.cs b/HotelListing.API/Controllers/CountriesController.cs
@@ -61,11 +61,6 @@ public async Task<ActionResult<CountryDto>> GetCountry(int id)
         [Authorize]
         public async Task<IActionResult> PutCountry(int id, UpdateCountryDto updateCountryDto)
         {
-            if (id != updateCountryDto.Id)
-            {
-                return BadRequest("Invalid Record Id");
-            }
-
             try
             {
                 await _countriesRepository.UpdateAsync(id, updateCountryDto);

diff --git a/HotelListing.API/Controllers/HotelsController.cs b/HotelListing.API/Controllers/HotelsController.cs
@@ -59,11 +59,6 @@ public async Task<ActionResult<HotelDto>> GetHotel(int id)
         [HttpPut("{id}")]
         public async Task<IActionResult> PutHotel(int id, HotelDto hotelDto)
         {
-            if (id != hotelDto.Id)
-            {
-                return BadRequest("Invalid Id used in request");
-            }
-
             try
             {
                 await _hotelsRepository.UpdateAsync(id, hotelDto);