Fix ImmutableConverter.cs (#572)

* Update ImmutableConverter.cs

Swap properties and parameters in applicability check of ImmutableConverter.
This prevents properties from being lost when they are not all represented in the contructor as parameters.

* Add unit test

* Move test to base zo all serializers are covered

---------

Co-authored-by: Joris van Eijden <[email protected]>

Author: JorisVanEijden

src/GraphQL.Client.Serializer.SystemTextJson/ImmutableConverter.cs

@@ -19,31 +19,30 @@ public override bool CanConvert(Type typeToConvert)
         if (nullableUnderlyingType != null && nullableUnderlyingType.IsValueType)
             return false;
 
-        bool result;
         var constructors = typeToConvert.GetConstructors(BindingFlags.Public | BindingFlags.Instance);
         if (constructors.Length != 1)
         {
-            result = false;
+            return false;
         }
-        else
+
+        var constructor = constructors[0];
+        var parameters = constructor.GetParameters();
+
+        if (parameters.Length <= 0)
         {
-            var constructor = constructors[0];
-            var parameters = constructor.GetParameters();
+            return false;
+        }
 
-            if (parameters.Length > 0)
-            {
-                var properties = typeToConvert.GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
-                result = parameters
-                    .Select(parameter => properties.Any(p => NameOfPropertyAndParameter.Matches(p.Name, parameter.Name, typeToConvert.IsAnonymous())))
-                    .All(hasMatchingProperty => hasMatchingProperty);
-            }
-            else
-            {
-                result = false;
-            }
+        var properties = typeToConvert.GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+
+        if (properties.Length > parameters.Length)
+        {
+            return false;
         }
 
-        return result;
+        return properties
+            .Select(property => parameters.Any(parameter => NameOfPropertyAndParameter.Matches(property.Name, parameter.Name, typeToConvert.IsAnonymous())))
+            .All(hasMatchingParameter => hasMatchingParameter);
     }
 
     public override object Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)

tests/GraphQL.Client.Serializer.Tests/BaseSerializerTest.cs

@@ -190,4 +190,29 @@ public void CanSerializeNullableStruct()
 
         action.Should().NotThrow();
     }
+
+    [Fact]
+    public async Task CanDeserializeObjectWithBothConstructorAndProperties()
+    {
+        // Arrange
+        const string jsonString = @"{ ""data"": { ""property1"": ""value1"", ""property2"": ""value2"" } }";
+        var contentStream = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(jsonString));
+
+        // Act
+        var result = await ClientSerializer.DeserializeFromUtf8StreamAsync<WithConstructorAndProperties>(contentStream, default).ConfigureAwait(false);
+
+        // Assert
+        result.Data.Property1.Should().Be("value1");
+        result.Data.Property2.Should().Be("value2");
+    }
+
+    private class WithConstructorAndProperties
+    {
+        public WithConstructorAndProperties(string property2)
+        {
+            Property2 = property2;
+        }
+        public string? Property1 { get; set; }
+        public string Property2 { get; }
+    }
 }