Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Commit b9e585b

Browse files
erjainerjain
authored
Merge pull request #2085 from erjain/update/payment-api
Commit to migrate payment api to WebApplicationBuilder
2 parents ee673d9 + 212343f commit b9e585b

File tree

5 files changed

+301
-193
lines changed

5 files changed

+301
-193
lines changed

‎src/Services/Payment/Payment.API/.editorconfig

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
###############################
2+
# Core EditorConfig Options #
3+
###############################
4+
root = true
5+
# All files
6+
[*]
7+
indent_style = space
8+
9+
# XML project files
10+
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
11+
indent_size = 2
12+
13+
# XML config files
14+
[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
15+
indent_size = 2
16+
17+
# Code files
18+
[*.{cs,csx,vb,vbx}]
19+
indent_size = 4
20+
insert_final_newline = true
21+
charset = utf-8-bom
22+
###############################
23+
# .NET Coding Conventions #
24+
###############################
25+
[*.{cs,vb}]
26+
# Organize usings
27+
dotnet_sort_system_directives_first = true
28+
# this. preferences
29+
dotnet_style_qualification_for_field = false:silent
30+
dotnet_style_qualification_for_property = false:silent
31+
dotnet_style_qualification_for_method = false:silent
32+
dotnet_style_qualification_for_event = false:silent
33+
# Language keywords vs BCL types preferences
34+
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
35+
dotnet_style_predefined_type_for_member_access = true:silent
36+
# Parentheses preferences
37+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
38+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
39+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
40+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
41+
# Modifier preferences
42+
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
43+
dotnet_style_readonly_field = true:suggestion
44+
# Expression-level preferences
45+
dotnet_style_object_initializer = true:suggestion
46+
dotnet_style_collection_initializer = true:suggestion
47+
dotnet_style_explicit_tuple_names = true:suggestion
48+
dotnet_style_null_propagation = true:suggestion
49+
dotnet_style_coalesce_expression = true:suggestion
50+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
51+
dotnet_style_prefer_inferred_tuple_names = true:suggestion
52+
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
53+
dotnet_style_prefer_auto_properties = true:silent
54+
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
55+
dotnet_style_prefer_conditional_expression_over_return = true:silent
56+
###############################
57+
# Naming Conventions #
58+
###############################
59+
# Style Definitions
60+
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
61+
# Use PascalCase for constant fields
62+
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
63+
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
64+
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
65+
dotnet_naming_symbols.constant_fields.applicable_kinds = field
66+
dotnet_naming_symbols.constant_fields.applicable_accessibilities = *
67+
dotnet_naming_symbols.constant_fields.required_modifiers = const
68+
###############################
69+
# C# Coding Conventions #
70+
###############################
71+
[*.cs]
72+
# var preferences
73+
csharp_style_var_for_built_in_types = true:silent
74+
csharp_style_var_when_type_is_apparent = true:silent
75+
csharp_style_var_elsewhere = true:silent
76+
# Expression-bodied members
77+
csharp_style_expression_bodied_methods = false:silent
78+
csharp_style_expression_bodied_constructors = false:silent
79+
csharp_style_expression_bodied_operators = false:silent
80+
csharp_style_expression_bodied_properties = true:silent
81+
csharp_style_expression_bodied_indexers = true:silent
82+
csharp_style_expression_bodied_accessors = true:silent
83+
# Pattern matching preferences
84+
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
85+
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
86+
# Null-checking preferences
87+
csharp_style_throw_expression = true:suggestion
88+
csharp_style_conditional_delegate_call = true:suggestion
89+
# Modifier preferences
90+
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
91+
# Expression-level preferences
92+
csharp_prefer_braces = true:silent
93+
csharp_style_deconstructed_variable_declaration = true:suggestion
94+
csharp_prefer_simple_default_expression = true:suggestion
95+
csharp_style_prefer_local_over_anonymous_function = true:suggestion
96+
csharp_style_inlined_variable_declaration = true:suggestion
97+
###############################
98+
# C# Formatting Rules #
99+
###############################
100+
# New line preferences
101+
csharp_new_line_before_open_brace = all
102+
csharp_new_line_before_else = true
103+
csharp_new_line_before_catch = true
104+
csharp_new_line_before_finally = true
105+
csharp_new_line_before_members_in_object_initializers = true
106+
csharp_new_line_before_members_in_anonymous_types = true
107+
csharp_new_line_between_query_expression_clauses = true
108+
# Indentation preferences
109+
csharp_indent_case_contents = true
110+
csharp_indent_switch_labels = true
111+
csharp_indent_labels = flush_left
112+
# Space preferences
113+
csharp_space_after_cast = false
114+
csharp_space_after_keywords_in_control_flow_statements = true
115+
csharp_space_between_method_call_parameter_list_parentheses = false
116+
csharp_space_between_method_declaration_parameter_list_parentheses = false
117+
csharp_space_between_parentheses = false
118+
csharp_space_before_colon_in_inheritance_clause = true
119+
csharp_space_after_colon_in_inheritance_clause = true
120+
csharp_space_around_binary_operators = before_and_after
121+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
122+
csharp_space_between_method_call_name_and_opening_parenthesis = false
123+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
124+
# Wrapping preferences
125+
csharp_preserve_single_line_statements = true
126+
csharp_preserve_single_line_blocks = true
127+
###############################
128+
# VB Coding Conventions #
129+
###############################
130+
[*.vb]
131+
# Modifier preferences
132+
visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion

‎src/Services/Payment/Payment.API/GlobalUsings.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@
2525
global using System.Threading.Tasks;
2626
global using System;
2727
global using System.IO;
28-
global using Microsoft.AspNetCore.Hosting;
28+
global using Microsoft.AspNetCore.Hosting;
29+
global using Microsoft.Extensions.Hosting;

‎src/Services/Payment/Payment.API/Payment.API.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,8 @@
3535
<ProjectReference Include="..\..\..\BuildingBlocks\EventBus\IntegrationEventLogEF\IntegrationEventLogEF.csproj" />
3636
</ItemGroup>
3737

38+
<ItemGroup>
39+
<None Include="C:\Tarun\github\erjain\dotnet-architecture\eShopOnContainers\src\Services\Payment\Payment.API\.editorconfig" />
40+
</ItemGroup>
41+
3842
</Project>

‎src/Services/Payment/Payment.API/Program.cs

Lines changed: 163 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,98 @@
1-
var configuration = GetConfiguration();
1+
var appName = "Payment.API";
2+
var builder = WebApplication.CreateBuilder(new WebApplicationOptions
3+
{
4+
Args = args,
5+
ApplicationName = typeof(Program).Assembly.FullName,
6+
ContentRootPath = Directory.GetCurrentDirectory()
7+
});
8+
if (builder.Configuration.GetValue<bool>("UseVault", false))
9+
{
10+
TokenCredential credential = new ClientSecretCredential(
11+
builder.Configuration["Vault:TenantId"],
12+
builder.Configuration["Vault:ClientId"],
13+
builder.Configuration["Vault:ClientSecret"]);
14+
builder.Configuration.AddAzureKeyVault(new Uri($"https://{builder.Configuration["Vault:Name"]}.vault.azure.net/"), credential);
15+
}
16+
builder.Configuration.SetBasePath(Directory.GetCurrentDirectory());
17+
builder.Configuration.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true);
18+
builder.Configuration.AddEnvironmentVariables();
19+
builder.WebHost.CaptureStartupErrors(false);
20+
builder.Host.UseSerilog(CreateSerilogLogger(builder.Configuration));
21+
builder.Services
22+
.AddCustomHealthCheck(builder.Configuration);
23+
builder.Services.Configure<PaymentSettings>(builder.Configuration);
24+
builder.Services.AddApplicationInsightsTelemetry(builder.Configuration);
25+
if (builder.Configuration.GetValue<bool>("AzureServiceBusEnabled"))
26+
{
27+
builder.Services.AddSingleton<IServiceBusPersisterConnection>(sp =>
28+
{
29+
var serviceBusConnectionString = builder.Configuration["EventBusConnection"];
30+
var subscriptionClientName = builder.Configuration["SubscriptionClientName"];
231

3-
Log.Logger = CreateSerilogLogger(configuration);
32+
return new DefaultServiceBusPersisterConnection(serviceBusConnectionString);
33+
});
34+
}
35+
else
36+
{
37+
builder.Services.AddSingleton<IRabbitMQPersistentConnection>(sp =>
38+
{
39+
var logger = sp.GetRequiredService<ILogger<DefaultRabbitMQPersistentConnection>>();
40+
var factory = new ConnectionFactory()
41+
{
42+
HostName = builder.Configuration["EventBusConnection"],
43+
DispatchConsumersAsync = true
44+
};
445

5-
try
46+
if (!string.IsNullOrEmpty(builder.Configuration["EventBusUserName"]))
47+
{
48+
factory.UserName = builder.Configuration["EventBusUserName"];
49+
}
50+
51+
if (!string.IsNullOrEmpty(builder.Configuration["EventBusPassword"]))
52+
{
53+
factory.Password = builder.Configuration["EventBusPassword"];
54+
}
55+
56+
var retryCount = 5;
57+
if (!string.IsNullOrEmpty(builder.Configuration["EventBusRetryCount"]))
58+
{
59+
retryCount = int.Parse(builder.Configuration["EventBusRetryCount"]);
60+
}
61+
62+
return new DefaultRabbitMQPersistentConnection(factory, logger, retryCount);
63+
});
64+
}
65+
RegisterEventBus(builder.Services);
66+
var app = builder.Build();
67+
if (app.Environment.IsDevelopment())
68+
{
69+
app.UseDeveloperExceptionPage();
70+
}
71+
else
72+
{
73+
app.UseExceptionHandler("/Home/Error");
74+
}
75+
var pathBase = app.Configuration["PATH_BASE"];
76+
if (!string.IsNullOrEmpty(pathBase))
677
{
7-
Log.Information("Configuring web host ({ApplicationContext})...", Program.AppName);
8-
var host = BuildWebHost(configuration, args);
78+
app.UsePathBase(pathBase);
79+
}
80+
ConfigureEventBus(app);
981

82+
app.UseRouting();
83+
app.MapHealthChecks("/hc", new HealthCheckOptions()
84+
{
85+
Predicate = _ => true,
86+
ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse
87+
});
88+
app.MapHealthChecks("/liveness", new HealthCheckOptions
89+
{
90+
Predicate = r => r.Name.Contains("self")
91+
});
92+
try
93+
{
1094
Log.Information("Starting web host ({ApplicationContext})...", Program.AppName);
11-
host.Run();
95+
await app.RunAsync();
1296

1397
return 0;
1498
}
@@ -22,15 +106,49 @@
22106
Log.CloseAndFlush();
23107
}
24108

109+
void RegisterEventBus(IServiceCollection services)
110+
{
111+
if (builder.Configuration.GetValue<bool>("AzureServiceBusEnabled"))
112+
{
113+
services.AddSingleton<IEventBus, EventBusServiceBus>(sp =>
114+
{
115+
var serviceBusPersisterConnection = sp.GetRequiredService<IServiceBusPersisterConnection>();
116+
var logger = sp.GetRequiredService<ILogger<EventBusServiceBus>>();
117+
var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
118+
string subscriptionName = builder.Configuration["SubscriptionClientName"];
119+
120+
return new EventBusServiceBus(serviceBusPersisterConnection, logger,
121+
eventBusSubcriptionsManager, sp, subscriptionName);
122+
});
123+
}
124+
else
125+
{
126+
services.AddSingleton<IEventBus, EventBusRabbitMQ>(sp =>
127+
{
128+
var subscriptionClientName = builder.Configuration["SubscriptionClientName"];
129+
var rabbitMQPersistentConnection = sp.GetRequiredService<IRabbitMQPersistentConnection>();
130+
var logger = sp.GetRequiredService<ILogger<EventBusRabbitMQ>>();
131+
var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
25132

26-
IWebHost BuildWebHost(IConfiguration configuration, string[] args) =>
27-
WebHost.CreateDefaultBuilder(args)
28-
.CaptureStartupErrors(false)
29-
.ConfigureAppConfiguration(x => x.AddConfiguration(configuration))
30-
.UseStartup<Startup>()
31-
.UseContentRoot(Directory.GetCurrentDirectory())
32-
.UseSerilog()
33-
.Build();
133+
var retryCount = 5;
134+
if (!string.IsNullOrEmpty(builder.Configuration["EventBusRetryCount"]))
135+
{
136+
retryCount = int.Parse(builder.Configuration["EventBusRetryCount"]);
137+
}
138+
139+
return new EventBusRabbitMQ(rabbitMQPersistentConnection, logger, sp, eventBusSubcriptionsManager, subscriptionClientName, retryCount);
140+
});
141+
}
142+
143+
services.AddTransient<OrderStatusChangedToStockConfirmedIntegrationEventHandler>();
144+
services.AddSingleton<IEventBusSubscriptionsManager, InMemoryEventBusSubscriptionsManager>();
145+
}
146+
147+
void ConfigureEventBus(IApplicationBuilder app)
148+
{
149+
var eventBus = app.ApplicationServices.GetRequiredService<IEventBus>();
150+
eventBus.Subscribe<OrderStatusChangedToStockConfirmedIntegrationEvent, OrderStatusChangedToStockConfirmedIntegrationEventHandler>();
151+
}
34152

35153
Serilog.ILogger CreateSerilogLogger(IConfiguration configuration)
36154
{
@@ -70,6 +188,35 @@ IConfiguration GetConfiguration()
70188

71189
public partial class Program
72190
{
73-
public static string Namespace = typeof(Startup).Namespace;
191+
public static string Namespace = typeof(Program).Assembly.GetName().Name;
74192
public static string AppName = Namespace.Substring(Namespace.LastIndexOf('.', Namespace.LastIndexOf('.') - 1) + 1);
75-
}
193+
}
194+
public static class CustomExtensionMethods
195+
{
196+
public static IServiceCollection AddCustomHealthCheck(this IServiceCollection services, IConfiguration configuration)
197+
{
198+
var hcBuilder = services.AddHealthChecks();
199+
200+
hcBuilder.AddCheck("self", () => HealthCheckResult.Healthy());
201+
202+
if (configuration.GetValue<bool>("AzureServiceBusEnabled"))
203+
{
204+
hcBuilder
205+
.AddAzureServiceBusTopic(
206+
configuration["EventBusConnection"],
207+
topicName: "eshop_event_bus",
208+
name: "payment-servicebus-check",
209+
tags: new string[] { "servicebus" });
210+
}
211+
else
212+
{
213+
hcBuilder
214+
.AddRabbitMQ(
215+
$"amqp://{configuration["EventBusConnection"]}",
216+
name: "payment-rabbitmqbus-check",
217+
tags: new string[] { "rabbitmqbus" });
218+
}
219+
220+
return services;
221+
}
222+
}

0 commit comments

Comments
 (0)