Fixing FromServicesAttribute detection

Author: surgicalcoder

GoLive.Generator.ApiClientGenerator.Tests.WebApi/Controllers/YetAnotherController.cs

@@ -1,3 +1,5 @@
+using System.Net.Http;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 
 namespace GoLive.Generator.ApiClientGenerator.Tests.WebApi.Controllers;
@@ -35,4 +37,10 @@ public string HttpPatchTest()
     {
         return "Ok";
     }
+
+    [HttpGet]
+    public async Task<ActionResult> FromServiceTest(string Id, [FromServices] HttpContent TestItem)
+    {
+        return Ok();
+    }
 }

GoLive.Generator.ApiClientGenerator.Tests.WebApi/GeneratedApiClient.cs

@@ -1450,6 +1450,18 @@ public string HttpPatchTest_Url(QueryString queryString = default)
     {
         return $"/api/YetAnother/HttpPatchTest{queryString}";
     }
+
+    public async Task<Response> FromServiceTest(string Id, QueryString queryString = default, CancellationToken _token = default)
+    {
+        using var request = new HttpRequestMessage(HttpMethod.Get, $"/api/YetAnother/FromServiceTest/{Id}{queryString}");
+        using var result = await _client.SendAsync(request, _token);
+        return new Response(result.StatusCode, result.Headers);
+    }
+
+    public string FromServiceTest_Url(string Id, QueryString queryString = default)
+    {
+        return $"/api/YetAnother/FromServiceTest/{Id}{queryString}";
+    }
 }
 
 // JSON Source Generator

GoLive.Generator.ApiClientGenerator.Tests.WebApi/GeneratedApiClient.json

@@ -2033,6 +2033,39 @@
         "AllAttributes": [
           "Microsoft.AspNetCore.Mvc.HttpPatchAttribute"
         ]
+      },
+      {
+        "Name": "FromServiceTest",
+        "FullMethodName": "GoLive.Generator.ApiClientGenerator.Tests.WebApi.Controllers.YetAnotherController.FromServiceTest",
+        "Method": {
+          "Method": "GET"
+        },
+        "Route": "",
+        "RouteSetByAttributes": false,
+        "ReturnTypeName": null,
+        "ReturnTypeStruct": true,
+        "HasCustomFormatter": false,
+        "Mapping": [
+          {
+            "Key": "Id",
+            "Parameter": {
+              "FullTypeName": "string",
+              "GenericTypeName": null,
+              "HasDefaultValue": false,
+              "DefaultValue": null,
+              "Nullable": false,
+              "Attributes": [],
+              "SpecialType": 20,
+              "AllowedStringValues": null
+            }
+          }
+        ],
+        "Body": [],
+        "XmlComments": "",
+        "CalculatedURL": "/api/YetAnother/FromServiceTest/{Id}",
+        "AllAttributes": [
+          "Microsoft.AspNetCore.Mvc.HttpGetAttribute"
+        ]
       }
     ],
     "XmlComments": "",

GoLive.Generator.ApiClientGenerator.Tests.WebApi/GeneratedURLs.cs

@@ -294,4 +294,9 @@ public static string YetAnother_HttpPatchTest(QueryString queryString = default)
     {
         return $"/api/YetAnother/HttpPatchTest{queryString}";
     }
+
+    public static string YetAnother_FromServiceTest(string Id, QueryString queryString = default)
+    {
+        return $"/api/YetAnother/FromServiceTest/{Id}{queryString}";
+    }
 }

GoLive.Generator.ApiClientGenerator/Scanner.cs

@@ -203,7 +203,11 @@ private static IEnumerable<ActionRoute> ScanForActionMethods(SemanticModel model
                             )); })
                     .ToArray();
 
-                var bodyParameter = methodSymbol.Parameters.Where(t => !IsPrimitive(t.Type) || t.GetAttributes().Any(e => e.AttributeClass?.Name == "FromBodyAttribute"))
+                var bodyParameter = methodSymbol.Parameters
+                    .Where(t => !IsPrimitive(t.Type)
+                                && t.GetAttributes().All(e => e.AttributeClass?.ToDisplayString() != "Microsoft.AspNetCore.Mvc.FromServicesAttribute")
+                                || t.GetAttributes().Any(e => e.AttributeClass?.Name == "FromBodyAttribute")
+                                )
                     .Select(t => new ParameterMapping(getParameterName(t), new Parameter(
                         t.Type.ToString(), 
                         t.Type.OriginalDefinition is INamedTypeSymbol nts ? (nts.IsGenericType ? nts.ToDisplayString() : null  ) : null,