fix(autodoc): don't override GroupName if it's already specified

src/Tochka.JsonRpc.ApiExplorer/JsonRpcDescriptionProvider.cs

@@ -62,7 +62,10 @@ public void OnProvidersExecuting(ApiDescriptionProviderContext context)
             var serializerMetadata = actionDescriptor.EndpointMetadata.Get<JsonRpcSerializerOptionsAttribute>();
             var serializerOptionsProviderType = serializerMetadata?.ProviderType;
 
-            description.GroupName = ApiExplorerUtils.GetDocumentName(ApiExplorerConstants.DefaultDocumentName, serializerOptionsProviderType);
+            if (string.IsNullOrWhiteSpace(description.GroupName))
+            {
+                description.GroupName = ApiExplorerUtils.GetDocumentName(ApiExplorerConstants.DefaultDocumentName, serializerOptionsProviderType);
+            }
 
             description.HttpMethod = HttpMethods.Post;
             description.RelativePath += $"#{methodMetadata.Method}";

src/Tochka.JsonRpc.Client/Extensions.cs

@@ -14,7 +14,7 @@ namespace Tochka.JsonRpc.Client;
 public static class Extensions
 {
     /// <summary>
-    /// Register JSON-RPC client as <typeparamref name="TClient"/>
+    /// Register JSON-RPC client as <typeparamref name="TClient" />
     /// </summary>
     /// <param name="services">The <see cref="IServiceCollection" /> to add the service to</param>
     /// <typeparam name="TClient">Type of JSON-RPC client</typeparam>
@@ -26,7 +26,7 @@ public static IHttpClientBuilder AddJsonRpcClient<TClient, TImplementation>(this
         AddJsonRpcClient<TClient, TImplementation>(services, static (_, _) => { });
 
     /// <summary>
-    /// Register JSON-RPC client as <typeparamref name="TClient"/> and configure internal <see cref="HttpClient" />
+    /// Register JSON-RPC client as <typeparamref name="TClient" /> and configure internal <see cref="HttpClient" />
     /// </summary>
     /// <param name="services">The <see cref="IServiceCollection" /> to add the service to</param>
     /// <param name="configureClient">Delegate used to configure internal <see cref="HttpClient" /></param>
@@ -71,5 +71,7 @@ public static IHttpClientBuilder AddJsonRpcClient<TClient>(this IServiceCollecti
     /// <summary>
     /// Register handler to log outgoing requests
     /// </summary>
-    public static IHttpClientBuilder WithJsonRpcRequestLogging(this IHttpClientBuilder httpClientBuilder) => httpClientBuilder.AddHttpMessageHandler<JsonRpcRequestLoggingHandler>();
+    [ExcludeFromCodeCoverage(Justification = "it's almost impossible to test AddHttpMessageHandler")]
+    public static IHttpClientBuilder WithJsonRpcRequestLogging(this IHttpClientBuilder httpClientBuilder) =>
+        httpClientBuilder.AddHttpMessageHandler<JsonRpcRequestLoggingHandler>();
 }

src/Tochka.JsonRpc.Server/Extensions/DependencyInjectionExtensions.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using Asp.Versioning;
+using Asp.Versioning.ApiExplorer;
 using Asp.Versioning.ApplicationModels;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Builder;
@@ -60,6 +61,10 @@ public static IServiceCollection AddJsonRpcServer(this IServiceCollection servic
                 options.FormatGroupName = static (name, version) => $"{name}_{version}";
             });
         services.TryAddEnumerable(ServiceDescriptor.Singleton<IApiControllerSpecification, JsonRpcControllerSpecification>());
+
+        // required for correct autodocs document names if ApiExplorerSettingsAttribute with custom GroupName is used
+        services.Replace(ServiceDescriptor.Singleton<IApiVersionDescriptionProvider, DefaultApiVersionDescriptionProvider>());
+
         services.AddSingleton<JsonRpcMarkerService>();
         return services;
     }

src/tests/Tochka.JsonRpc.ApiExplorer.Tests/JsonRpcDescriptionProviderTests.cs

@@ -117,6 +117,25 @@ public void OnProvidersExecuting_ValidDescriptor_UpdateDescriptionProperties()
         description.Properties[ApiExplorerConstants.MethodNameProperty] = Method;
     }
 
+    [Test]
+    public void OnProvidersExecuting_GroupNameAlreadySpecified_DontOverrideGroupName()
+    {
+        var groupName = "group-name";
+        var context = GetContext();
+        context.Results.First().ActionDescriptor.EndpointMetadata.Add(new JsonRpcMethodAttribute(Method));
+        context.Results.First().GroupName = groupName;
+        typeEmitterMock.Setup(static e => e.CreateRequestType(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Type>(), It.IsAny<IReadOnlyDictionary<string, Type>>(), It.IsAny<Type?>()))
+            .Returns(Mock.Of<Type>);
+        typeEmitterMock.Setup(static e => e.CreateResponseType(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Type>(), It.IsAny<Type?>()))
+            .Returns(Mock.Of<Type>);
+
+        descriptionProvider.OnProvidersExecuting(context);
+
+        context.Results.Should().HaveCount(1);
+        var description = context.Results.Single();
+        description.GroupName.Should().Be(groupName);
+    }
+
     [Test]
     public void OnProvidersExecuting_HasCustomSerializer_UseSerializer()
     {

src/tests/Tochka.JsonRpc.OpenRpc.Tests.Integration/IntegrationTests.cs

@@ -44,4 +44,16 @@ public async Task GetDocument_ReturnsAllMethods(string method)
         var methods = responseJson.RootElement.GetProperty("methods").EnumerateArray().ToArray();
         methods.Should().Contain(m => m.GetProperty("name").GetString() == method);
     }
+
+    [Test]
+    public async Task GetDocument_AttributeWithCustomGroup_ReturnAllCustomGroupMethods()
+    {
+        var response = await ApiClient.GetAsync("/openrpc/custom_v1.json");
+
+        var responseContent = await response.Content.ReadAsStringAsync();
+        var responseJson = JsonDocument.Parse(responseContent);
+        response.StatusCode.Should().Be(HttpStatusCode.OK);
+        var methods = responseJson.RootElement.GetProperty("methods").EnumerateArray().ToArray();
+        methods.Should().OnlyContain(static m => m.GetProperty("name").GetString() == "custom_group");
+    }
 }

src/tests/Tochka.JsonRpc.Server.Tests/Extensions/DependencyInjectionExtensionsTests.cs

@@ -48,13 +48,14 @@ public void AddJsonRpcServer_RegisterServices()
         result.Remove((typeof(IJsonRpcRequestValidator), typeof(JsonRpcRequestValidator), ServiceLifetime.Singleton)).Should().BeTrue();
         result.Remove((typeof(IJsonRpcErrorFactory), typeof(JsonRpcErrorFactory), ServiceLifetime.Singleton)).Should().BeTrue();
         result.Remove((typeof(IApiControllerSpecification), typeof(JsonRpcControllerSpecification), ServiceLifetime.Singleton)).Should().BeTrue();
+        result.Remove((typeof(IApiVersionDescriptionProvider), typeof(DefaultApiVersionDescriptionProvider), ServiceLifetime.Singleton)).Should().BeTrue();
         result.Remove((typeof(JsonRpcMarkerService), typeof(JsonRpcMarkerService), ServiceLifetime.Singleton)).Should().BeTrue();
         // one of services registered by calling AddApiVersioning
         result.Remove((typeof(IApiVersionSetBuilderFactory), typeof(DefaultApiVersionSetBuilderFactory), ServiceLifetime.Singleton)).Should().BeTrue();
         // one of services registered by calling AddApiVersioning.AddMvc
         result.Remove((typeof(IControllerNameConvention), typeof(DefaultControllerNameConvention), ServiceLifetime.Singleton)).Should().BeTrue();
         // one of services registered by calling AddApiVersioning.AddApiExplorer
-        result.Remove((typeof(IApiVersionDescriptionProvider), null, ServiceLifetime.Singleton)).Should().BeTrue();
+        result.Remove((typeof(IApiVersionDescriptionProviderFactory), null, ServiceLifetime.Transient)).Should().BeTrue();
     }
 
     [Test]

src/tests/Tochka.JsonRpc.Swagger.Tests.Integration/IntegrationTests.cs

@@ -36,6 +36,7 @@ internal class IntegrationTests : IntegrationTestsBase<Program>
     [TestCase("jsonrpc_v1", "/api/jsonrpc#return_error_from_factory")]
     [TestCase("jsonrpc_v1", "/api/jsonrpc#return_mvc_error")]
     [TestCase("jsonrpc_v1", "/api/jsonrpc#error_throw_as_response_exception")]
+    [TestCase("custom_v1", "/api/jsonrpc#custom_group")]
     public async Task GetDocument_ReturnsAllMethods(string document, string path)
     {
         var response = await ApiClient.GetAsync($"/swagger/{document}/swagger.json");

src/tests/Tochka.JsonRpc.Tests.WebApplication/Controllers/CustomGroupNameJsonRpcController.cs

@@ -0,0 +1,10 @@
+using Microsoft.AspNetCore.Mvc;
+using Tochka.JsonRpc.Server;
+
+namespace Tochka.JsonRpc.Tests.WebApplication.Controllers;
+
+[ApiExplorerSettings(GroupName = "custom")]
+public class CustomGroupNameJsonRpcController : JsonRpcControllerBase
+{
+    public bool CustomGroup() => true;
+}

src/tests/Tochka.JsonRpc.Tests.WebApplication/Program.cs

@@ -1,6 +1,8 @@
 using System.Reflection;
+using Asp.Versioning.ApiExplorer;
 using Microsoft.OpenApi.Models;
 using Tochka.JsonRpc.OpenRpc;
+using Tochka.JsonRpc.OpenRpc.Models;
 using Tochka.JsonRpc.Server.Extensions;
 using Tochka.JsonRpc.Server.Serialization;
 using Tochka.JsonRpc.Server.Settings;
@@ -23,25 +25,30 @@
 builder.Services.AddSingleton<IJsonSerializerOptionsProvider, KebabCaseUpperJsonSerializerOptionsProvider>();
 
 builder.Services.AddSwaggerWithJsonRpc(Assembly.GetExecutingAssembly()); // swagger for json-rpc
-builder.Services.AddSwaggerGen(static c => // swagger for REST
+builder.Services.ConfigureSwaggerGen(static c => // swagger for REST
 {
     c.SwaggerDoc("rest", new OpenApiInfo { Title = "RESTful API", Version = "v1" });
+    c.SwaggerDoc("custom_v1", new OpenApiInfo { Title = "Custom group", Version = "v1" });
 });
 
 builder.Services.AddOpenRpc(Assembly.GetExecutingAssembly()); // OpenRpc
+builder.Services.Configure<OpenRpcOptions>(static o => o.OpenRpcDoc("custom_v1", new OpenRpcInfo("Custom group", "v1")));
 
 // auth
 builder.Services.AddAuthentication(AuthConstants.SchemeName)
     .AddScheme<ApiAuthenticationOptions, ApiAuthenticationHandler>(AuthConstants.SchemeName, null);
 builder.Services.AddAuthorization();
 
+builder.Services.AddSingleton<IApiVersionDescriptionProvider, DefaultApiVersionDescriptionProvider>();
+
 var app = builder.Build();
 
 app.UseAuthentication();
 app.UseSwaggerUI(c =>
 {
     c.JsonRpcSwaggerEndpoints(app.Services); // register json-rpc in swagger UI
     c.SwaggerEndpoint("/swagger/rest/swagger.json", "RESTful"); // register REST in swagger UI
+    c.SwaggerEndpoint("/swagger/custom_v1/swagger.json", "Custom group");
 });
 app.UseJsonRpc();
 app.UseRouting();