From c95903fd5c8c282921238760d737e7e1fa009879 Mon Sep 17 00:00:00 2001 From: dudu Date: Sun, 5 Feb 2023 16:54:26 +0800 Subject: [PATCH 1/7] test: add a test case for '/dapr/subscribe' --- .editorconfig | 288 ++++++++++++++++++ .../CqrsInjectorExtensions.cs | 18 +- ...Architecture.IntegrationTestProject.csproj | 2 + .../Program.cs | 14 +- ...blogs.Architecture.IntegrationTests.csproj | 44 +-- .../CqrsRouteMapperTests.cs | 1 + .../CustomModelBinderTests.cs | 2 +- .../DaprTests.cs | 25 ++ .../DddWebTestCollection.cs | 7 + .../DddWebTestFactory.cs | 8 + 10 files changed, 384 insertions(+), 25 deletions(-) create mode 100644 test/Cnblogs.Architecture.IntegrationTests/DaprTests.cs create mode 100644 test/Cnblogs.Architecture.IntegrationTests/DddWebTestCollection.cs create mode 100644 test/Cnblogs.Architecture.IntegrationTests/DddWebTestFactory.cs diff --git a/.editorconfig b/.editorconfig index 1015a4e..563f844 100644 --- a/.editorconfig +++ b/.editorconfig @@ -78,3 +78,291 @@ resharper_web_config_wrong_module_highlighting = warning indent_style = space indent_size = 4 tab_width = 4 + +#### C# Coding Conventions #### +[*.cs] + +# var preferences +csharp_style_var_elsewhere = false:silent +csharp_style_var_for_built_in_types = false:silent +csharp_style_var_when_type_is_apparent = false:silent + +# Expression-bodied members +csharp_style_expression_bodied_accessors = true:silent +csharp_style_expression_bodied_constructors = false:silent +csharp_style_expression_bodied_indexers = true:silent +csharp_style_expression_bodied_lambdas = true:suggestion +csharp_style_expression_bodied_local_functions = false:silent +csharp_style_expression_bodied_methods = false:silent +csharp_style_expression_bodied_operators = false:silent +csharp_style_expression_bodied_properties = true:silent + +# Pattern matching preferences +csharp_style_pattern_matching_over_as_with_null_check = true:suggestion +csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion +csharp_style_prefer_not_pattern = true:suggestion +csharp_style_prefer_pattern_matching = true:silent +csharp_style_prefer_switch_expression = true:suggestion + +# Null-checking preferences +csharp_style_conditional_delegate_call = true:suggestion + +# Modifier preferences +csharp_prefer_static_local_function = true:warning +csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:silent + +# Code-block preferences +csharp_prefer_braces = true:silent +csharp_prefer_simple_using_statement = true:suggestion + +# Expression-level preferences +csharp_prefer_simple_default_expression = true:suggestion +csharp_style_deconstructed_variable_declaration = true:suggestion +csharp_style_inlined_variable_declaration = true:suggestion +csharp_style_pattern_local_over_anonymous_function = true:suggestion +csharp_style_prefer_index_operator = true:suggestion +csharp_style_prefer_range_operator = true:suggestion +csharp_style_throw_expression = true:suggestion +csharp_style_unused_value_assignment_preference = discard_variable:suggestion +csharp_style_unused_value_expression_statement_preference = discard_variable:silent + +# 'using' directive preferences +csharp_using_directive_placement = outside_namespace:silent + +#### C# Formatting Rules #### + +# New line preferences +csharp_new_line_before_catch = true +csharp_new_line_before_else = true +csharp_new_line_before_finally = true +csharp_new_line_before_members_in_anonymous_types = true +csharp_new_line_before_members_in_object_initializers = true +csharp_new_line_before_open_brace = all +csharp_new_line_between_query_expression_clauses = true + +# Indentation preferences +csharp_indent_block_contents = true +csharp_indent_braces = false +csharp_indent_case_contents = true +csharp_indent_case_contents_when_block = true +csharp_indent_labels = one_less_than_current +csharp_indent_switch_labels = true + +# Space preferences +csharp_space_after_cast = false +csharp_space_after_colon_in_inheritance_clause = true +csharp_space_after_comma = true +csharp_space_after_dot = false +csharp_space_after_keywords_in_control_flow_statements = true +csharp_space_after_semicolon_in_for_statement = true +csharp_space_around_binary_operators = before_and_after +csharp_space_around_declaration_statements = false +csharp_space_before_colon_in_inheritance_clause = true +csharp_space_before_comma = false +csharp_space_before_dot = false +csharp_space_before_open_square_brackets = false +csharp_space_before_semicolon_in_for_statement = false +csharp_space_between_empty_square_brackets = false +csharp_space_between_method_call_empty_parameter_list_parentheses = false +csharp_space_between_method_call_name_and_opening_parenthesis = false +csharp_space_between_method_call_parameter_list_parentheses = false +csharp_space_between_method_declaration_empty_parameter_list_parentheses = false +csharp_space_between_method_declaration_name_and_open_parenthesis = false +csharp_space_between_method_declaration_parameter_list_parentheses = false +csharp_space_between_parentheses = false +csharp_space_between_square_brackets = false + +# Wrapping preferences +csharp_preserve_single_line_blocks = true +csharp_preserve_single_line_statements = true + +#### Naming styles #### +[*.{cs,vb}] + +# Naming rules + +dotnet_naming_rule.types_and_namespaces_should_be_pascalcase.severity = suggestion +dotnet_naming_rule.types_and_namespaces_should_be_pascalcase.symbols = types_and_namespaces +dotnet_naming_rule.types_and_namespaces_should_be_pascalcase.style = pascalcase + +dotnet_naming_rule.interfaces_should_be_ipascalcase.severity = suggestion +dotnet_naming_rule.interfaces_should_be_ipascalcase.symbols = interfaces +dotnet_naming_rule.interfaces_should_be_ipascalcase.style = ipascalcase + +dotnet_naming_rule.type_parameters_should_be_tpascalcase.severity = suggestion +dotnet_naming_rule.type_parameters_should_be_tpascalcase.symbols = type_parameters +dotnet_naming_rule.type_parameters_should_be_tpascalcase.style = tpascalcase + +dotnet_naming_rule.methods_should_be_pascalcase.severity = suggestion +dotnet_naming_rule.methods_should_be_pascalcase.symbols = methods +dotnet_naming_rule.methods_should_be_pascalcase.style = pascalcase + +dotnet_naming_rule.properties_should_be_pascalcase.severity = suggestion +dotnet_naming_rule.properties_should_be_pascalcase.symbols = properties +dotnet_naming_rule.properties_should_be_pascalcase.style = pascalcase + +dotnet_naming_rule.events_should_be_pascalcase.severity = suggestion +dotnet_naming_rule.events_should_be_pascalcase.symbols = events +dotnet_naming_rule.events_should_be_pascalcase.style = pascalcase + +dotnet_naming_rule.local_variables_should_be_camelcase.severity = suggestion +dotnet_naming_rule.local_variables_should_be_camelcase.symbols = local_variables +dotnet_naming_rule.local_variables_should_be_camelcase.style = camelcase + +dotnet_naming_rule.local_constants_should_be_camelcase.severity = suggestion +dotnet_naming_rule.local_constants_should_be_camelcase.symbols = local_constants +dotnet_naming_rule.local_constants_should_be_camelcase.style = camelcase + +dotnet_naming_rule.parameters_should_be_camelcase.severity = suggestion +dotnet_naming_rule.parameters_should_be_camelcase.symbols = parameters +dotnet_naming_rule.parameters_should_be_camelcase.style = camelcase + +dotnet_naming_rule.public_fields_should_be_pascalcase.severity = suggestion +dotnet_naming_rule.public_fields_should_be_pascalcase.symbols = public_fields +dotnet_naming_rule.public_fields_should_be_pascalcase.style = pascalcase + +dotnet_naming_rule.private_fields_should_be__camelcase.severity = suggestion +dotnet_naming_rule.private_fields_should_be__camelcase.symbols = private_fields +dotnet_naming_rule.private_fields_should_be__camelcase.style = _camelcase + +dotnet_naming_rule.private_static_fields_should_be_s_camelcase.severity = suggestion +dotnet_naming_rule.private_static_fields_should_be_s_camelcase.symbols = private_static_fields +dotnet_naming_rule.private_static_fields_should_be_s_camelcase.style = s_camelcase + +dotnet_naming_rule.public_constant_fields_should_be_pascalcase.severity = suggestion +dotnet_naming_rule.public_constant_fields_should_be_pascalcase.symbols = public_constant_fields +dotnet_naming_rule.public_constant_fields_should_be_pascalcase.style = pascalcase + +dotnet_naming_rule.private_constant_fields_should_be_pascalcase.severity = suggestion +dotnet_naming_rule.private_constant_fields_should_be_pascalcase.symbols = private_constant_fields +dotnet_naming_rule.private_constant_fields_should_be_pascalcase.style = pascalcase + +dotnet_naming_rule.public_static_readonly_fields_should_be_pascalcase.severity = suggestion +dotnet_naming_rule.public_static_readonly_fields_should_be_pascalcase.symbols = public_static_readonly_fields +dotnet_naming_rule.public_static_readonly_fields_should_be_pascalcase.style = pascalcase + +dotnet_naming_rule.private_static_readonly_fields_should_be_pascalcase.severity = suggestion +dotnet_naming_rule.private_static_readonly_fields_should_be_pascalcase.symbols = private_static_readonly_fields +dotnet_naming_rule.private_static_readonly_fields_should_be_pascalcase.style = pascalcase + +dotnet_naming_rule.enums_should_be_pascalcase.severity = suggestion +dotnet_naming_rule.enums_should_be_pascalcase.symbols = enums +dotnet_naming_rule.enums_should_be_pascalcase.style = pascalcase + +dotnet_naming_rule.local_functions_should_be_pascalcase.severity = suggestion +dotnet_naming_rule.local_functions_should_be_pascalcase.symbols = local_functions +dotnet_naming_rule.local_functions_should_be_pascalcase.style = pascalcase + +dotnet_naming_rule.non_field_members_should_be_pascalcase.severity = suggestion +dotnet_naming_rule.non_field_members_should_be_pascalcase.symbols = non_field_members +dotnet_naming_rule.non_field_members_should_be_pascalcase.style = pascalcase + +# Symbol specifications + +dotnet_naming_symbols.interfaces.applicable_kinds = interface +dotnet_naming_symbols.interfaces.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.interfaces.required_modifiers = + +dotnet_naming_symbols.enums.applicable_kinds = enum +dotnet_naming_symbols.enums.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.enums.required_modifiers = + +dotnet_naming_symbols.events.applicable_kinds = event +dotnet_naming_symbols.events.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.events.required_modifiers = + +dotnet_naming_symbols.methods.applicable_kinds = method +dotnet_naming_symbols.methods.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.methods.required_modifiers = + +dotnet_naming_symbols.properties.applicable_kinds = property +dotnet_naming_symbols.properties.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.properties.required_modifiers = + +dotnet_naming_symbols.public_fields.applicable_kinds = field +dotnet_naming_symbols.public_fields.applicable_accessibilities = public, internal +dotnet_naming_symbols.public_fields.required_modifiers = + +dotnet_naming_symbols.private_fields.applicable_kinds = field +dotnet_naming_symbols.private_fields.applicable_accessibilities = private, protected, protected_internal, private_protected +dotnet_naming_symbols.private_fields.required_modifiers = + +dotnet_naming_symbols.private_static_fields.applicable_kinds = field +dotnet_naming_symbols.private_static_fields.applicable_accessibilities = private, protected, protected_internal, private_protected +dotnet_naming_symbols.private_static_fields.required_modifiers = static + +dotnet_naming_symbols.types_and_namespaces.applicable_kinds = namespace, class, struct, interface, enum +dotnet_naming_symbols.types_and_namespaces.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.types_and_namespaces.required_modifiers = + +dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method +dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.non_field_members.required_modifiers = + +dotnet_naming_symbols.type_parameters.applicable_kinds = namespace +dotnet_naming_symbols.type_parameters.applicable_accessibilities = * +dotnet_naming_symbols.type_parameters.required_modifiers = + +dotnet_naming_symbols.private_constant_fields.applicable_kinds = field +dotnet_naming_symbols.private_constant_fields.applicable_accessibilities = private, protected, protected_internal, private_protected +dotnet_naming_symbols.private_constant_fields.required_modifiers = const + +dotnet_naming_symbols.local_variables.applicable_kinds = local +dotnet_naming_symbols.local_variables.applicable_accessibilities = local +dotnet_naming_symbols.local_variables.required_modifiers = + +dotnet_naming_symbols.local_constants.applicable_kinds = local +dotnet_naming_symbols.local_constants.applicable_accessibilities = local +dotnet_naming_symbols.local_constants.required_modifiers = const + +dotnet_naming_symbols.parameters.applicable_kinds = parameter +dotnet_naming_symbols.parameters.applicable_accessibilities = * +dotnet_naming_symbols.parameters.required_modifiers = + +dotnet_naming_symbols.public_constant_fields.applicable_kinds = field +dotnet_naming_symbols.public_constant_fields.applicable_accessibilities = public, internal +dotnet_naming_symbols.public_constant_fields.required_modifiers = const + +dotnet_naming_symbols.public_static_readonly_fields.applicable_kinds = field +dotnet_naming_symbols.public_static_readonly_fields.applicable_accessibilities = public, internal +dotnet_naming_symbols.public_static_readonly_fields.required_modifiers = readonly, static + +dotnet_naming_symbols.private_static_readonly_fields.applicable_kinds = field +dotnet_naming_symbols.private_static_readonly_fields.applicable_accessibilities = private, protected, protected_internal, private_protected +dotnet_naming_symbols.private_static_readonly_fields.required_modifiers = readonly, static + +dotnet_naming_symbols.local_functions.applicable_kinds = local_function +dotnet_naming_symbols.local_functions.applicable_accessibilities = * +dotnet_naming_symbols.local_functions.required_modifiers = + +# Naming styles + +dotnet_naming_style.pascalcase.required_prefix = +dotnet_naming_style.pascalcase.required_suffix = +dotnet_naming_style.pascalcase.word_separator = +dotnet_naming_style.pascalcase.capitalization = pascal_case + +dotnet_naming_style.ipascalcase.required_prefix = I +dotnet_naming_style.ipascalcase.required_suffix = +dotnet_naming_style.ipascalcase.word_separator = +dotnet_naming_style.ipascalcase.capitalization = pascal_case + +dotnet_naming_style.tpascalcase.required_prefix = T +dotnet_naming_style.tpascalcase.required_suffix = +dotnet_naming_style.tpascalcase.word_separator = +dotnet_naming_style.tpascalcase.capitalization = pascal_case + +dotnet_naming_style._camelcase.required_prefix = _ +dotnet_naming_style._camelcase.required_suffix = +dotnet_naming_style._camelcase.word_separator = +dotnet_naming_style._camelcase.capitalization = camel_case + +dotnet_naming_style.camelcase.required_prefix = +dotnet_naming_style.camelcase.required_suffix = +dotnet_naming_style.camelcase.word_separator = +dotnet_naming_style.camelcase.capitalization = camel_case + +dotnet_naming_style.s_camelcase.required_prefix = s_ +dotnet_naming_style.s_camelcase.required_suffix = +dotnet_naming_style.s_camelcase.word_separator = +dotnet_naming_style.s_camelcase.capitalization = camel_case \ No newline at end of file diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/CqrsInjectorExtensions.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/CqrsInjectorExtensions.cs index ffc2e07..525af5f 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/CqrsInjectorExtensions.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/CqrsInjectorExtensions.cs @@ -38,9 +38,21 @@ public static CqrsInjector AddDaprEventBus(this CqrsInjector cqrsInjector, Assem /// public static CqrsInjector AddDaprEventBus(this CqrsInjector cqrsInjector, string appName) { - cqrsInjector.Services.Configure(o => o.AppName = appName); - cqrsInjector.Services.AddControllers().AddDapr(); - cqrsInjector.Services.AddScoped(); + cqrsInjector.Services.AddDaprEventBus(appName); return cqrsInjector; } + + /// + /// Register DaprClient and IEventBus + /// + /// + /// app name used by event bus + /// + public static IServiceCollection AddDaprEventBus(this IServiceCollection services, string appName) + { + services.Configure(o => o.AppName = appName); + services.AddControllers().AddDapr(); + services.AddScoped(); + return services; + } } \ No newline at end of file diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj b/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj index fe3d98e..1610ac2 100644 --- a/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj +++ b/test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj @@ -6,6 +6,8 @@ + + diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs b/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs index 2cc2169..3f9ebdd 100644 --- a/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs +++ b/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs @@ -1,14 +1,21 @@ -using Cnblogs.Architecture.Ddd.Cqrs.AspNetCore; +using Cnblogs.Architecture.Ddd.Cqrs.AspNetCore; using Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection; +using Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr; +using Cnblogs.Architecture.Ddd.EventBus.Dapr; using Cnblogs.Architecture.IntegrationTestProject.Application.Commands; using Cnblogs.Architecture.IntegrationTestProject.Application.Queries; using Cnblogs.Architecture.IntegrationTestProject.Payloads; +using Cnblogs.Architecture.TestIntegrationEvents; + +const string appName = "test-web"; var builder = WebApplication.CreateBuilder(args); builder.Services.AddCqrs(typeof(Cnblogs.Architecture.IntegrationTestProject.Program).Assembly) .AddDefaultDateTimeAndRandomProvider(); +builder.Services.AddDaprEventBus(appName); builder.Services.AddControllers().AddCqrsModelBinderProvider(); + // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle builder.Services.AddCnblogsApiVersioning(); builder.Services.AddSwaggerGen(); @@ -22,11 +29,12 @@ app.UseSwaggerUI(); } -app.UseHttpsRedirection(); - app.UseAuthorization(); app.MapControllers(); + +app.Subscribe(appName); + var apis = app.NewVersionedApi(); var v1 = apis.MapGroup("/api/v{version:apiVersion}").HasApiVersion(1); v1.MapQuery("strings/{id:int}"); diff --git a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj index 41490f0..4f17551 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj +++ b/test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj @@ -1,22 +1,30 @@ - + - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - - - - + + + + + + + + + + + + diff --git a/test/Cnblogs.Architecture.IntegrationTests/CqrsRouteMapperTests.cs b/test/Cnblogs.Architecture.IntegrationTests/CqrsRouteMapperTests.cs index 68fd3a9..3a88abf 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/CqrsRouteMapperTests.cs +++ b/test/Cnblogs.Architecture.IntegrationTests/CqrsRouteMapperTests.cs @@ -3,6 +3,7 @@ using FluentAssertions; using Microsoft.AspNetCore.Mvc.Testing; +using System.Net.Http.Json; namespace Cnblogs.Architecture.IntegrationTests; diff --git a/test/Cnblogs.Architecture.IntegrationTests/CustomModelBinderTests.cs b/test/Cnblogs.Architecture.IntegrationTests/CustomModelBinderTests.cs index ccfae90..fa61fd2 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/CustomModelBinderTests.cs +++ b/test/Cnblogs.Architecture.IntegrationTests/CustomModelBinderTests.cs @@ -1,5 +1,5 @@ using System.Net; - +using System.Net.Http.Json; using Cnblogs.Architecture.Ddd.Infrastructure.Abstractions; using Cnblogs.Architecture.IntegrationTestProject; using FluentAssertions; diff --git a/test/Cnblogs.Architecture.IntegrationTests/DaprTests.cs b/test/Cnblogs.Architecture.IntegrationTests/DaprTests.cs new file mode 100644 index 0000000..2f07049 --- /dev/null +++ b/test/Cnblogs.Architecture.IntegrationTests/DaprTests.cs @@ -0,0 +1,25 @@ +using System.Net; +using FluentAssertions; + +namespace Cnblogs.Architecture.IntegrationTests; + +[Collection(DddWebTestCollection.Name)] +public class DaprTests +{ + private readonly HttpClient _httpClient; + + public DaprTests(DddWebTestFactory factory) + { + _httpClient = factory.CreateClient(); + } + + [Fact] + public async Task Dapr_subscribe_endpoint_is_ok() + { + var response = await _httpClient.GetAsync("/dapr/subscribe"); + response.StatusCode.Should().Be(HttpStatusCode.OK); + + var responseText = await response.Content.ReadAsStringAsync(); + responseText.Should().Contain("pubsub"); + } +} diff --git a/test/Cnblogs.Architecture.IntegrationTests/DddWebTestCollection.cs b/test/Cnblogs.Architecture.IntegrationTests/DddWebTestCollection.cs new file mode 100644 index 0000000..3ddac04 --- /dev/null +++ b/test/Cnblogs.Architecture.IntegrationTests/DddWebTestCollection.cs @@ -0,0 +1,7 @@ +namespace Cnblogs.Architecture.IntegrationTests; + +[CollectionDefinition(Name)] +public class DddWebTestCollection : ICollectionFixture +{ + public const string Name = nameof(DddWebTestCollection); +} diff --git a/test/Cnblogs.Architecture.IntegrationTests/DddWebTestFactory.cs b/test/Cnblogs.Architecture.IntegrationTests/DddWebTestFactory.cs new file mode 100644 index 0000000..784c68a --- /dev/null +++ b/test/Cnblogs.Architecture.IntegrationTests/DddWebTestFactory.cs @@ -0,0 +1,8 @@ +using Cnblogs.Architecture.IntegrationTestProject; +using Microsoft.AspNetCore.Mvc.Testing; + +namespace Cnblogs.Architecture.IntegrationTests; + +public class DddWebTestFactory : WebApplicationFactory +{ +} From 0a6ee875ef7587ef79be4c06e4af54af63a3e279 Mon Sep 17 00:00:00 2001 From: dudu Date: Sun, 5 Feb 2023 19:46:39 +0800 Subject: [PATCH 2/7] refactor: fix naming style violations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 沈星繁 --- test/Cnblogs.Architecture.IntegrationTests/DaprTests.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/Cnblogs.Architecture.IntegrationTests/DaprTests.cs b/test/Cnblogs.Architecture.IntegrationTests/DaprTests.cs index 2f07049..37b037a 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/DaprTests.cs +++ b/test/Cnblogs.Architecture.IntegrationTests/DaprTests.cs @@ -14,11 +14,13 @@ public DaprTests(DddWebTestFactory factory) } [Fact] - public async Task Dapr_subscribe_endpoint_is_ok() + public async Task Dapr_SubscribeEndpoint_OkAsync() { + // Act var response = await _httpClient.GetAsync("/dapr/subscribe"); - response.StatusCode.Should().Be(HttpStatusCode.OK); + // Assert + response.StatusCode.Should().Be(HttpStatusCode.OK); var responseText = await response.Content.ReadAsStringAsync(); responseText.Should().Contain("pubsub"); } From f95fd5f5e19ace1c9af90a6adbd3a4cccc19472e Mon Sep 17 00:00:00 2001 From: dudu Date: Sun, 5 Feb 2023 19:47:26 +0800 Subject: [PATCH 3/7] style: fix comments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 沈星繁 --- .../CqrsInjectorExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/CqrsInjectorExtensions.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/CqrsInjectorExtensions.cs index 525af5f..1d8c057 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/CqrsInjectorExtensions.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/CqrsInjectorExtensions.cs @@ -43,7 +43,7 @@ public static CqrsInjector AddDaprEventBus(this CqrsInjector cqrsInjector, strin } /// - /// Register DaprClient and IEventBus + /// Register and . /// /// /// app name used by event bus From 020da09eeb18dff8c2776adf2b9bcf298560110d Mon Sep 17 00:00:00 2001 From: dudu Date: Sun, 5 Feb 2023 19:48:46 +0800 Subject: [PATCH 4/7] style: fix comments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 沈星繁 --- .../CqrsInjectorExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/CqrsInjectorExtensions.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/CqrsInjectorExtensions.cs index 1d8c057..c279dda 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/CqrsInjectorExtensions.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/CqrsInjectorExtensions.cs @@ -46,7 +46,7 @@ public static CqrsInjector AddDaprEventBus(this CqrsInjector cqrsInjector, strin /// Register and . /// /// - /// app name used by event bus + /// The app name used when publishing integration events. /// public static IServiceCollection AddDaprEventBus(this IServiceCollection services, string appName) { From 76d8e27ff9baad66a7e2ceda3872d51ffc34d9c5 Mon Sep 17 00:00:00 2001 From: dudu Date: Sun, 5 Feb 2023 19:50:05 +0800 Subject: [PATCH 5/7] refactor: remove an unnecessary argument MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 沈星繁 --- test/Cnblogs.Architecture.IntegrationTestProject/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs b/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs index 3f9ebdd..797c03e 100644 --- a/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs +++ b/test/Cnblogs.Architecture.IntegrationTestProject/Program.cs @@ -33,7 +33,7 @@ app.MapControllers(); -app.Subscribe(appName); +app.Subscribe(); var apis = app.NewVersionedApi(); var v1 = apis.MapGroup("/api/v{version:apiVersion}").HasApiVersion(1); From 7b4badc7028d2f0ce1c6d2e44630971e30647439 Mon Sep 17 00:00:00 2001 From: dudu Date: Sun, 5 Feb 2023 19:51:23 +0800 Subject: [PATCH 6/7] style: order usings --- .../CqrsRouteMapperTests.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/Cnblogs.Architecture.IntegrationTests/CqrsRouteMapperTests.cs b/test/Cnblogs.Architecture.IntegrationTests/CqrsRouteMapperTests.cs index 3a88abf..532a7f5 100644 --- a/test/Cnblogs.Architecture.IntegrationTests/CqrsRouteMapperTests.cs +++ b/test/Cnblogs.Architecture.IntegrationTests/CqrsRouteMapperTests.cs @@ -1,9 +1,8 @@ -using Cnblogs.Architecture.Ddd.Infrastructure.Abstractions; +using System.Net.Http.Json; +using Cnblogs.Architecture.Ddd.Infrastructure.Abstractions; using Cnblogs.Architecture.IntegrationTestProject; using FluentAssertions; - using Microsoft.AspNetCore.Mvc.Testing; -using System.Net.Http.Json; namespace Cnblogs.Architecture.IntegrationTests; From 22974bb31e594dae62e74032fdbbc1d42429f42d Mon Sep 17 00:00:00 2001 From: dudu Date: Sun, 5 Feb 2023 20:01:07 +0800 Subject: [PATCH 7/7] refactor: move AddDaprEventBus to a separate class --- .../CqrsInjectorExtensions.cs | 17 ------------- ...DaprEventBusServiceCollectionExtensions.cs | 25 +++++++++++++++++++ 2 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/DaprEventBusServiceCollectionExtensions.cs diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/CqrsInjectorExtensions.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/CqrsInjectorExtensions.cs index c279dda..6ad6e77 100644 --- a/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/CqrsInjectorExtensions.cs +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/CqrsInjectorExtensions.cs @@ -1,8 +1,5 @@ using System.Reflection; - using Cnblogs.Architecture.Ddd.EventBus.Abstractions; -using Cnblogs.Architecture.Ddd.EventBus.Dapr; - using Microsoft.Extensions.DependencyInjection; namespace Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr; @@ -41,18 +38,4 @@ public static CqrsInjector AddDaprEventBus(this CqrsInjector cqrsInjector, strin cqrsInjector.Services.AddDaprEventBus(appName); return cqrsInjector; } - - /// - /// Register and . - /// - /// - /// The app name used when publishing integration events. - /// - public static IServiceCollection AddDaprEventBus(this IServiceCollection services, string appName) - { - services.Configure(o => o.AppName = appName); - services.AddControllers().AddDapr(); - services.AddScoped(); - return services; - } } \ No newline at end of file diff --git a/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/DaprEventBusServiceCollectionExtensions.cs b/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/DaprEventBusServiceCollectionExtensions.cs new file mode 100644 index 0000000..a370748 --- /dev/null +++ b/src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/DaprEventBusServiceCollectionExtensions.cs @@ -0,0 +1,25 @@ +using Cnblogs.Architecture.Ddd.EventBus.Abstractions; +using Cnblogs.Architecture.Ddd.EventBus.Dapr; +using Dapr.Client; + +namespace Microsoft.Extensions.DependencyInjection; + +/// +/// IServiceCollection extensions for DaprEventBus +/// +public static class DaprEventBusServiceCollectionExtensions +{ + /// + /// Register and . + /// + /// + /// The app name used when publishing integration events. + /// + public static IServiceCollection AddDaprEventBus(this IServiceCollection services, string appName) + { + services.Configure(o => o.AppName = appName); + services.AddControllers().AddDapr(); + services.AddScoped(); + return services; + } +}