Fixed nullability issue in mapper (#3549)

ChilliCream · Apr 19, 2021 · 93d04a3 · 93d04a3
1 parent 994db75
commit 93d04a3
Show file tree

Hide file tree

Showing 4 changed files with 1,241 additions and 3 deletions.
diff --git a/...Generation/src/CodeGeneration.CSharp/Generators/TypeMapperGenerator_ComplexDataHandler.cs b/...Generation/src/CodeGeneration.CSharp/Generators/TypeMapperGenerator_ComplexDataHandler.cs
@@ -121,7 +121,7 @@ private IfBuilder GenerateComplexDataInterfaceIfClause(
                         block
                             .AddCode(IfBuilder
                                 .New()
-                                .SetCondition($"{matchedTypeName}.{prop.Name}.HasValue")
+                                .SetCondition($"!{matchedTypeName}.{prop.Name}.HasValue")
                                 .AddCode(ExceptionBuilder.New(TypeNames.ArgumentNullException)))
                             .AddEmptyLine();
 

diff --git a/...rawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/EntityOrIdGeneratorTests.cs b/...rawberryShake/CodeGeneration/test/CodeGeneration.CSharp.Tests/EntityOrIdGeneratorTests.cs
@@ -264,5 +264,53 @@ interface Bar {
                 ",
                 "extend schema @key(fields: \"id\")");
         }
+
+        [Fact]
+        public void NonNullableValueTypeId()
+        {
+            AssertResult(
+                @"
+                query GetFoo {
+                    foo {
+                        ... on Baz {
+                            id
+                        }
+                        ... on Quox {
+                            foo
+                        }
+                        ... on Baz2 {
+                            id
+                        }
+                        ... on Quox2 {
+                            foo
+                        }
+                    }
+                }
+                ",
+                @"
+                type Query {
+                    foo: [Bar]
+                }
+
+                type Baz {
+                    id: Int!
+                }
+
+                type Baz2 {
+                    id: Int!
+                }
+
+                type Quox {
+                    foo: Int!
+                }
+
+                type Quox2 {
+                    foo: Int!
+                }
+
+                union Bar = Baz | Quox | Baz2 | Quox2
+                ",
+                "extend schema @key(fields: \"id\")");
+        }
     }
 }