Added global Exception handler in Claims processor. Used DateTimeOffset

Author: humzamanzoor

ClaimsSolution.API/Dtos/RequestDtos/SubmitClaimRequestDto.cs

@@ -20,7 +20,7 @@ public class SubmitClaimRequestDto
         [Required(ErrorMessage = "IncidentDate is required")]
         [DataType(DataType.Date)]
         [CustomValidation(typeof(SubmitClaimRequestDto), nameof(ValidateIncidentDate))]
-        public DateTime IncidentDate { get; init; }
+        public DateTimeOffset IncidentDate { get; init; }
 
         [Required(ErrorMessage = "VehicleMake is required")]
         [StringLength(50, MinimumLength = 1,
@@ -32,14 +32,14 @@ public class SubmitClaimRequestDto
             ErrorMessage = "VehicleModel must be between 1 and 50 characters")]
         public string VehicleModel { get; init; } = string.Empty;
 
-        public static ValidationResult? ValidateIncidentDate(DateTime incidentDate, ValidationContext context)
+        public static ValidationResult? ValidateIncidentDate(DateTimeOffset incidentDate, ValidationContext context)
         {
             if (incidentDate == default)
             {
                 return new ValidationResult("IncidentDate cannot be empty");
             }
 
-            if (incidentDate.Date > DateTime.UtcNow.Date)
+            if (incidentDate.Date > DateTimeOffset.UtcNow.Date)
             {
                 return new ValidationResult("IncidentDate cannot be in the future");
             }

ClaimsSolution.API/Dtos/ResponseDtos/ClaimResponseDto.cs

@@ -5,10 +5,10 @@ public class ClaimResponseDto
         public Guid ClaimId { get; init; }
         public Guid UserId { get; init; }
         public string PhoneNumber { get; init; } = string.Empty;
-        public DateTime IncidentDate { get; init; }
+        public DateTimeOffset IncidentDate { get; init; }
         public string VehicleMake { get; init; } = string.Empty;
         public string VehicleModel { get; init; } = string.Empty;
         public string Status { get; init; } = string.Empty;
-        public DateTime CreatedAtUtc { get; init; }
+        public DateTimeOffset CreatedAtUtc { get; init; }
     }
 }

ClaimsSolution.API/Extensions/ApplicationBuilderExtensions.cs

@@ -33,7 +33,7 @@ public static IServiceCollection AddApplicationServices(this IServiceCollection
 
         public static WebApplication ConfigureMiddleware(this WebApplication app)
         {
-            app.UseMiddleware<GlobalExceptionHandlerMiddleware>();
+            app.UseMiddleware<ExceptionHandlingMiddleware>();
 
             app.UseSwagger();
             app.UseSwaggerUI();

…ware/GlobalExceptionHandlerMiddleware.cs …iddleware/ExceptionHandlingMiddleware.csClaimsSolution.API/Middleware/GlobalExceptionHandlerMiddleware.cs renamed to ClaimsSolution.API/Middleware/ExceptionHandlingMiddleware.cs ClaimsSolution.API/Middleware/GlobalExceptionHandlerMiddleware.cs renamed to ClaimsSolution.API/Middleware/ExceptionHandlingMiddleware.cs

@@ -1,11 +1,13 @@
+using ClaimsSolution.Common;
+
 namespace ClaimsSolution.API.Middleware
 {
-    public class GlobalExceptionHandlerMiddleware
+    public class ExceptionHandlingMiddleware
     {
         private readonly RequestDelegate _next;
-        private readonly ILogger<GlobalExceptionHandlerMiddleware> _logger;
+        private readonly ILogger<ExceptionHandlingMiddleware> _logger;
 
-        public GlobalExceptionHandlerMiddleware(RequestDelegate next, ILogger<GlobalExceptionHandlerMiddleware> logger)
+        public ExceptionHandlingMiddleware(RequestDelegate next, ILogger<ExceptionHandlingMiddleware> logger)
         {
             _next = next;
             _logger = logger;
@@ -19,7 +21,7 @@ public async Task InvokeAsync(HttpContext context)
             }
             catch (Exception ex)
             {
-                _logger.LogError($"An unhandled exception occurred: {ex.Message}\n{ex.StackTrace}");
+                _logger.LogError(ex, "");
                 await HandleExceptionAsync(context, ex);
             }
         }
@@ -29,8 +31,8 @@ private static Task HandleExceptionAsync(HttpContext context, Exception exceptio
             context.Response.ContentType = "application/json";
             var response = new ErrorResponse
             {
-                Message = $"An internal server error occurred. {exception.Message}",
                 StatusCode = StatusCodes.Status500InternalServerError,
+                Message = $"{Constants.UncaughtException}. {exception.Message}",
                 StackTrace = exception.StackTrace ?? string.Empty
             };
 

ClaimsSolution.API/Publishers/ClaimPublisher.cs

@@ -1,5 +1,6 @@
 using Azure.Storage.Queues;
 using ClaimsSolution.Common.Contracts;
+using ClaimsSolution.Common;    
 using System.Text;
 using System.Text.Json;
 
@@ -9,7 +10,7 @@ public class ClaimPublisher : IClaimPublisher
     {
         private readonly QueueServiceClient _queueServiceClient;
         private readonly ILogger<ClaimPublisher> _logger;
-        private const string QueueName = "claims-queue";
+        private const string ClaimsQueueName = Constants.Queues.ClaimsQueue;
 
         public ClaimPublisher(QueueServiceClient queueServiceClient, ILogger<ClaimPublisher> logger)
         {
@@ -19,7 +20,7 @@ public ClaimPublisher(QueueServiceClient queueServiceClient, ILogger<ClaimPublis
 
         public async Task PublishAsync(ClaimSubmittedMessage message, CancellationToken ct)
         {
-            var queueClient = _queueServiceClient.GetQueueClient(QueueName);
+            var queueClient = _queueServiceClient.GetQueueClient(ClaimsQueueName);
             await queueClient.CreateIfNotExistsAsync(cancellationToken: ct);
 
             var messageJson = JsonSerializer.Serialize(message);

ClaimsSolution.API/Services/ClaimService.cs

@@ -33,10 +33,10 @@ public async Task<SubmitClaimResponseDto> SubmitAsync(SubmitClaimRequestDto requ
                 UserId = request.UserId,
                 PhoneNumber = request.PhoneNumber.Trim(),
                 Ssn = request.Ssn.Trim(),
-                IncidentDate = request.IncidentDate.Date,
+                IncidentDate = request.IncidentDate,
                 VehicleMake = request.VehicleMake.Trim(),
                 VehicleModel = request.VehicleModel.Trim(),
-                SubmittedAtUtc = DateTime.UtcNow
+                SubmittedAtUtc = DateTimeOffset.UtcNow
             };
 
             _logger.LogInformation($"Publishing claim with ID {claimId} and Correlation ID {correlationId}");

ClaimsSolution.ClaimsProcessor/Functions/ProcessClaimFunction.cs

@@ -5,6 +5,7 @@
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Extensions.Logging;
 using System.Text.Json;
+using ClaimsSolution.Common;
 
 namespace ClaimsSolution.ClaimsProcessor.Functions
 {
@@ -13,6 +14,7 @@ public class ProcessClaimFunction
         private readonly ILogger<ProcessClaimFunction> _logger;
         private readonly IClaimRepository _claimRepository;
 
+
         public ProcessClaimFunction(ILogger<ProcessClaimFunction> logger, IClaimRepository claimRepository)
         {
             _logger = logger;
@@ -21,7 +23,7 @@ public ProcessClaimFunction(ILogger<ProcessClaimFunction> logger, IClaimReposito
 
         [Function(nameof(IngestClaims))]
         public async Task IngestClaims(
-            [QueueTrigger("claims-queue", Connection = "AzureWebJobsStorage")] QueueMessage message,
+            [QueueTrigger(Constants.Queues.ClaimsQueue, Connection = "AzureWebJobsStorage")] QueueMessage message,
             FunctionContext context)
         {
             var messageText = message.MessageText;
@@ -52,7 +54,7 @@ private async Task ProcessClaimAsync(ClaimSubmittedMessage claimMessage, Cancell
                 VehicleModel = claimMessage.VehicleModel,
                 Status = "Received",
                 CreatedAtUtc = claimMessage.SubmittedAtUtc,
-                UpdatedAtUtc = DateTime.UtcNow
+                UpdatedAtUtc = DateTimeOffset.UtcNow
             };
 
             await _claimRepository.AddClaimAsync(claimEntity, ct);

ClaimsSolution.ClaimsProcessor/Middlewares/ExceptionHandlingMiddleware.cs

@@ -0,0 +1,68 @@
+using ClaimsSolution.Common;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Azure.Functions.Worker;
+using Microsoft.Azure.Functions.Worker.Http;
+using Microsoft.Azure.Functions.Worker.Middleware;
+using Microsoft.Extensions.Logging;
+using System.Net;
+
+namespace ClaimsSolution.ClaimsProcessor.Middlewares
+{
+    internal sealed class ExceptionHandlingMiddleware : IFunctionsWorkerMiddleware
+    {
+        private readonly ILogger<ExceptionHandlingMiddleware> _logger;
+
+        public ExceptionHandlingMiddleware(ILogger<ExceptionHandlingMiddleware> logger)
+        {
+            _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        }
+
+        public async Task Invoke(FunctionContext context, FunctionExecutionDelegate next)
+        {
+            try
+            {
+                await next(context);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, Constants.UncaughtException);
+
+                var httpReqData = await context.GetHttpRequestDataAsync();
+
+                if (httpReqData != null)
+                {
+                    var newHttpResponse = httpReqData.CreateResponse(HttpStatusCode.InternalServerError);
+                    
+                    var errorResponse = new
+                    {
+                        statusCode = StatusCodes.Status500InternalServerError,
+                        message = $"{Constants.UncaughtException}. {ex.Message}",
+                        StackTrace = ex.StackTrace ?? string.Empty
+                    };
+
+                    await newHttpResponse.WriteAsJsonAsync(errorResponse);
+
+                    var invocationResult = context.GetInvocationResult();
+
+                    var httpOutputBindingFromMultipleOutputBindings = GetHttpOutputBindingFromMultipleOutputBinding(context);
+                    if (httpOutputBindingFromMultipleOutputBindings is not null)
+                    {
+                        httpOutputBindingFromMultipleOutputBindings.Value = newHttpResponse;
+                    }
+                    else
+                    {
+                        invocationResult.Value = newHttpResponse;
+                    }
+                }
+            }
+        }
+
+        private static OutputBindingData<HttpResponseData>? GetHttpOutputBindingFromMultipleOutputBinding(FunctionContext context)
+        {
+            var httpOutputBinding = context.GetOutputBindings<HttpResponseData>()
+                .FirstOrDefault(b => b.BindingType == "http" && b.Name != "$return");
+
+            return httpOutputBinding;
+        }
+    }
+}

ClaimsSolution.Common/Constants.cs

@@ -0,0 +1,13 @@
+namespace ClaimsSolution.Common
+{
+    public static class Constants
+    {
+        public const string X_REQUEST_ID = "X-Request-ID";
+        public const string UncaughtException = "An unexpected error occurred";
+
+        public static class Queues
+        {
+            public const string ClaimsQueue = "claims-queue";
+        }  
+    }
+}

ClaimsSolution.Common/Contracts/ClaimSubmittedMessage.cs

@@ -1,15 +1,15 @@
-namespace ClaimsSolution.Common.Contracts
-{
-    public class ClaimSubmittedMessage
+    namespace ClaimsSolution.Common.Contracts
     {
-        public Guid ClaimId { get; init; }
-        public Guid CorrelationId { get; init; }
-        public Guid UserId { get; init; }
-        public string PhoneNumber { get; init; } = string.Empty;
-        public string Ssn { get; init; } = string.Empty;
-        public DateTime IncidentDate { get; init; }
-        public string VehicleMake { get; init; } = string.Empty;
-        public string VehicleModel { get; init; } = string.Empty;
-        public DateTime SubmittedAtUtc { get; init; }
+        public class ClaimSubmittedMessage
+        {
+            public Guid ClaimId { get; init; }
+            public Guid CorrelationId { get; init; }
+            public Guid UserId { get; init; }
+            public string PhoneNumber { get; init; } = string.Empty;
+            public string Ssn { get; init; } = string.Empty;
+            public DateTimeOffset IncidentDate { get; init; }
+            public string VehicleMake { get; init; } = string.Empty;
+            public string VehicleModel { get; init; } = string.Empty;
+            public DateTimeOffset SubmittedAtUtc { get; init; }
+        }
     }
-}