Merge pull request #1956 from Ich1goSan/feature/webhooks-api-refactoring

erjain · web-flow · commit efb39deea2a6 · 2022-09-02T14:24:31.000+05:30
minor refactoring of Webhooks.API
diff --git a/src/Services/Webhooks/Webhooks.API/Infrastructure/HttpGlobalExceptionFilter.cs b/src/Services/Webhooks/Webhooks.API/Infrastructure/HttpGlobalExceptionFilter.cs
@@ -2,18 +2,18 @@
 
 public class HttpGlobalExceptionFilter : IExceptionFilter
 {
-    private readonly IWebHostEnvironment env;
-    private readonly ILogger<HttpGlobalExceptionFilter> logger;
+    private readonly IWebHostEnvironment _env;
+    private readonly ILogger<HttpGlobalExceptionFilter> _logger;
 
     public HttpGlobalExceptionFilter(IWebHostEnvironment env, ILogger<HttpGlobalExceptionFilter> logger)
     {
-        this.env = env;
-        this.logger = logger;
+        _env = env;
+        _logger = logger;
     }
 
     public void OnException(ExceptionContext context)
     {
-        logger.LogError(new EventId(context.Exception.HResult),
+        _logger.LogError(new EventId(context.Exception.HResult),
             context.Exception,
             context.Exception.Message);
 
@@ -26,7 +26,7 @@ public void OnException(ExceptionContext context)
                 Detail = "Please refer to the errors property for additional details."
             };
 
-            problemDetails.Errors.Add("DomainValidations", new string[] { context.Exception.Message.ToString() });
+            problemDetails.Errors.Add("DomainValidations", new [] { context.Exception.Message });
 
             context.Result = new BadRequestObjectResult(problemDetails);
             context.HttpContext.Response.StatusCode = (int)HttpStatusCode.BadRequest;
@@ -35,12 +35,12 @@ public void OnException(ExceptionContext context)
         {
             var json = new JsonErrorResponse
             {
-                Messages = new[] { "An error ocurred." }
+                Messages = new[] { "An error occurred." }
             };
 
-            if (env.IsDevelopment())
+            if (_env.IsDevelopment())
             {
-                json.DeveloperMeesage = context.Exception;
+                json.DeveloperMessage = context.Exception;
             }
 
             context.Result = new InternalServerErrorObjectResult(json);
@@ -53,6 +53,6 @@ private class JsonErrorResponse
     {
         public string[] Messages { get; set; }
 
-        public object DeveloperMeesage { get; set; }
+        public object DeveloperMessage { get; set; }
     }
 }
diff --git a/src/Services/Webhooks/Webhooks.API/Services/GrantUrlTesterService.cs b/src/Services/Webhooks/Webhooks.API/Services/GrantUrlTesterService.cs
@@ -45,6 +45,6 @@ private bool CheckSameOrigin(string urlHook, string url)
 
         return firstUrl.Scheme == secondUrl.Scheme &&
             firstUrl.Port == secondUrl.Port &&
-            firstUrl.Host == firstUrl.Host;
+            firstUrl.Host == secondUrl.Host;
     }
 }
diff --git a/src/Services/Webhooks/Webhooks.API/Services/IdentityService.cs b/src/Services/Webhooks/Webhooks.API/Services/IdentityService.cs
@@ -2,7 +2,7 @@
 
 public class IdentityService : IIdentityService
 {
-    private IHttpContextAccessor _context;
+    private readonly IHttpContextAccessor _context;
 
     public IdentityService(IHttpContextAccessor context)
     {
diff --git a/src/Services/Webhooks/Webhooks.API/Startup.cs b/src/Services/Webhooks/Webhooks.API/Startup.cs
@@ -88,7 +88,7 @@ protected virtual void ConfigureEventBus(IApplicationBuilder app)
     }
 }
 
-static class CustomExtensionMethods
+internal static class CustomExtensionMethods
 {
     public static IServiceCollection AddAppInsight(this IServiceCollection services, IConfiguration configuration)
     {
@@ -171,53 +171,50 @@ public static IServiceCollection AddSwagger(this IServiceCollection services, IC
     public static IServiceCollection AddEventBus(this IServiceCollection services, IConfiguration configuration)
     {
         if (configuration.GetValue<bool>("AzureServiceBusEnabled"))
+        {
+            services.AddSingleton<IEventBus, EventBusServiceBus>(sp =>
             {
-                services.AddSingleton<IEventBus, EventBusServiceBus>(sp =>
-                {
-                    var serviceBusPersisterConnection = sp.GetRequiredService<IServiceBusPersisterConnection>();
-                    var iLifetimeScope = sp.GetRequiredService<ILifetimeScope>();
-                    var logger = sp.GetRequiredService<ILogger<EventBusServiceBus>>();
-                    var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
-                    string subscriptionName = configuration["SubscriptionClientName"];
-
-                    return new EventBusServiceBus(serviceBusPersisterConnection, logger,
-                        eventBusSubcriptionsManager, iLifetimeScope, subscriptionName);
-                });
+                var serviceBusPersisterConnection = sp.GetRequiredService<IServiceBusPersisterConnection>();
+                var iLifetimeScope = sp.GetRequiredService<ILifetimeScope>();
+                var logger = sp.GetRequiredService<ILogger<EventBusServiceBus>>();
+                var eventBusSubscriptionManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
+                string subscriptionName = configuration["SubscriptionClientName"];
+
+                return new EventBusServiceBus(serviceBusPersisterConnection, logger,
+                    eventBusSubscriptionManager, iLifetimeScope, subscriptionName);
+            });
 
-            }
-            else
+        }
+        else
+        {
+            services.AddSingleton<IEventBus, EventBusRabbitMQ>(sp =>
             {
-                services.AddSingleton<IEventBus, EventBusRabbitMQ>(sp =>
+                var subscriptionClientName = configuration["SubscriptionClientName"];
+                var rabbitMQPersistentConnection = sp.GetRequiredService<IRabbitMQPersistentConnection>();
+                var iLifetimeScope = sp.GetRequiredService<ILifetimeScope>();
+                var logger = sp.GetRequiredService<ILogger<EventBusRabbitMQ>>();
+                var eventBusSubscriptionManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
+
+                var retryCount = 5;
+                if (!string.IsNullOrEmpty(configuration["EventBusRetryCount"]))
                 {
-                    var subscriptionClientName = configuration["SubscriptionClientName"];
-                    var rabbitMQPersistentConnection = sp.GetRequiredService<IRabbitMQPersistentConnection>();
-                    var iLifetimeScope = sp.GetRequiredService<ILifetimeScope>();
-                    var logger = sp.GetRequiredService<ILogger<EventBusRabbitMQ>>();
-                    var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
-
-                    var retryCount = 5;
-                    if (!string.IsNullOrEmpty(configuration["EventBusRetryCount"]))
-                    {
-                        retryCount = int.Parse(configuration["EventBusRetryCount"]);
-                    }
+                    retryCount = int.Parse(configuration["EventBusRetryCount"]);
+                }
 
-                    return new EventBusRabbitMQ(rabbitMQPersistentConnection, logger, iLifetimeScope, eventBusSubcriptionsManager, subscriptionClientName, retryCount);
-                });
-            }
+                return new EventBusRabbitMQ(rabbitMQPersistentConnection, logger, iLifetimeScope, eventBusSubscriptionManager, subscriptionClientName, retryCount);
+            });
+        }
 
-            services.AddSingleton<IEventBusSubscriptionsManager, InMemoryEventBusSubscriptionsManager>();
-            services.AddTransient<ProductPriceChangedIntegrationEventHandler>();
-            services.AddTransient<OrderStatusChangedToShippedIntegrationEventHandler>();
-            services.AddTransient<OrderStatusChangedToPaidIntegrationEventHandler>();
+        services.AddSingleton<IEventBusSubscriptionsManager, InMemoryEventBusSubscriptionsManager>();
+        services.AddTransient<ProductPriceChangedIntegrationEventHandler>();
+        services.AddTransient<OrderStatusChangedToShippedIntegrationEventHandler>();
+        services.AddTransient<OrderStatusChangedToPaidIntegrationEventHandler>();
 
-            return services;
+        return services;
     }
 
     public static IServiceCollection AddCustomHealthCheck(this IServiceCollection services, IConfiguration configuration)
     {
-        var accountName = configuration.GetValue<string>("AzureStorageAccountName");
-        var accountKey = configuration.GetValue<string>("AzureStorageAccountKey");
-
         var hcBuilder = services.AddHealthChecks();
 
         hcBuilder

Original file line number	Diff line number	Diff line change
`@@ -2,18 +2,18 @@`
`2`	`2`
`3`	`3`	`public class HttpGlobalExceptionFilter : IExceptionFilter`
`4`	`4`	`{`
`5`		`- private readonly IWebHostEnvironment env;`
`6`		`- private readonly ILogger<HttpGlobalExceptionFilter> logger;`
	`5`	`+ private readonly IWebHostEnvironment _env;`
	`6`	`+ private readonly ILogger<HttpGlobalExceptionFilter> _logger;`
`7`	`7`
`8`	`8`	`public HttpGlobalExceptionFilter(IWebHostEnvironment env, ILogger<HttpGlobalExceptionFilter> logger)`
`9`	`9`	`{`
`10`		`- this.env = env;`
`11`		`- this.logger = logger;`
	`10`	`+ _env = env;`
	`11`	`+ _logger = logger;`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public void OnException(ExceptionContext context)`
`15`	`15`	`{`
`16`		`- logger.LogError(new EventId(context.Exception.HResult),`
	`16`	`+ _logger.LogError(new EventId(context.Exception.HResult),`
`17`	`17`	`context.Exception,`
`18`	`18`	`context.Exception.Message);`
`19`	`19`
`@@ -26,7 +26,7 @@ public void OnException(ExceptionContext context)`
`26`	`26`	`Detail = "Please refer to the errors property for additional details."`
`27`	`27`	`};`
`28`	`28`
`29`		`- problemDetails.Errors.Add("DomainValidations", new string[] { context.Exception.Message.ToString() });`
	`29`	`+ problemDetails.Errors.Add("DomainValidations", new [] { context.Exception.Message });`
`30`	`30`
`31`	`31`	`context.Result = new BadRequestObjectResult(problemDetails);`
`32`	`32`	`context.HttpContext.Response.StatusCode = (int)HttpStatusCode.BadRequest;`
`@@ -35,12 +35,12 @@ public void OnException(ExceptionContext context)`
`35`	`35`	`{`
`36`	`36`	`var json = new JsonErrorResponse`
`37`	`37`	`{`
`38`		`- Messages = new[] { "An error ocurred." }`
	`38`	`+ Messages = new[] { "An error occurred." }`
`39`	`39`	`};`
`40`	`40`
`41`		`- if (env.IsDevelopment())`
	`41`	`+ if (_env.IsDevelopment())`
`42`	`42`	`{`
`43`		`- json.DeveloperMeesage = context.Exception;`
	`43`	`+ json.DeveloperMessage = context.Exception;`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`context.Result = new InternalServerErrorObjectResult(json);`
`@@ -53,6 +53,6 @@ private class JsonErrorResponse`
`53`	`53`	`{`
`54`	`54`	`public string[] Messages { get; set; }`
`55`	`55`
`56`		`- public object DeveloperMeesage { get; set; }`
	`56`	`+ public object DeveloperMessage { get; set; }`
`57`	`57`	`}`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,6 @@ private bool CheckSameOrigin(string urlHook, string url)`
`45`	`45`
`46`	`46`	`return firstUrl.Scheme == secondUrl.Scheme &&`
`47`	`47`	`firstUrl.Port == secondUrl.Port &&`
`48`		`- firstUrl.Host == firstUrl.Host;`
	`48`	`+ firstUrl.Host == secondUrl.Host;`
`49`	`49`	`}`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`public class IdentityService : IIdentityService`
`4`	`4`	`{`
`5`		`- private IHttpContextAccessor _context;`
	`5`	`+ private readonly IHttpContextAccessor _context;`
`6`	`6`
`7`	`7`	`public IdentityService(IHttpContextAccessor context)`
`8`	`8`	`{`