Interface work

Author: joadan

…butes/GraphInterfacePropertyAttribute.cs …nt/Attributes/GraphInterfaceAttribute.cssrc/Linq2GraphQL.Client/Attributes/GraphInterfacePropertyAttribute.cs renamed to src/Linq2GraphQL.Client/Attributes/GraphInterfaceAttribute.cs src/Linq2GraphQL.Client/Attributes/GraphInterfacePropertyAttribute.cs renamed to src/Linq2GraphQL.Client/Attributes/GraphInterfaceAttribute.cs

@@ -1,7 +1,7 @@
 namespace Linq2GraphQL.Client;
 
 [AttributeUsage(AttributeTargets.Property | AttributeTargets.Method)]
-public class GraphInterfacePropertyAttribute : Attribute
+public class GraphInterfaceAttribute : Attribute
 {
 
 }

src/Linq2GraphQL.Client/Converters/InterfaceConverter.cs

@@ -56,8 +56,7 @@ public override void Write(
                     break;
                 default:
                     {
-                        var type = value.GetType();
-                        JsonSerializer.Serialize(writer, value, type, options);
+                        JsonSerializer.Serialize(writer, value, value.GetType(), options);
                         break;
                     }
             }

src/Linq2GraphQL.Client/Utilities.cs

@@ -72,7 +72,7 @@ private static void ParseExpressionInternal(Expression body, QueryNode parent)
 
     private static void ParseMethodCallExpression(QueryNode parent, MethodCallExpression methodCallExp)
     {
-        var grapInterfaceAttribute = methodCallExp.Method.GetCustomAttribute<GraphInterfacePropertyAttribute>();
+        var grapInterfaceAttribute = methodCallExp.Method.GetCustomAttribute<GraphInterfaceAttribute>();
         if (grapInterfaceAttribute != null)
         {
             var queryNode = new QueryNode(methodCallExp.Method, methodCallExp.Method.Name, null, true);

test/Linq2GraphQL.TestClient/Generated/Interfaces/IAnimal.cs

@@ -11,7 +11,7 @@ namespace Linq2GraphQL.TestClient;
 
 public static class IAnimalExtentions
 {
-    [GraphInterfaceProperty]
+    [GraphInterface]
     public static Pig Pig(this IAnimal animal)
     {
         if (animal.__TypeName == "Pig")
@@ -21,7 +21,7 @@ public static Pig Pig(this IAnimal animal)
         return null;
     }
 
-    [GraphInterfaceProperty]
+    [GraphInterface]
     public static Spider Spider(this IAnimal animal)
     {
         if (animal.__TypeName == "Spider")
@@ -44,8 +44,6 @@ internal class IAnimalConverter : InterfaceJsonConverter<IAnimal>
 }
 
 
-//[JsonConverter(typeof(InterfaceConverter<IAnimal__Concrete,  IAnimal>))]
-//[JsonConverter(typeof(InterfaceTypeConverter<IAnimal>))]
 [JsonConverter(typeof(IAnimalConverter))]
 public interface IAnimal
 {

test/Linq2GraphQL.Tests/QueryInterfaceTests.cs

@@ -32,7 +32,7 @@ public async Task Interface_QuerySubClass()
                 .Query
                 .Animals()
                 .Include(e => e.Nodes.Select(e => e.Pig()))
-                .Include(e => e.Nodes.Select(e => e.Spider()))
+                //.Include(e => e.Nodes.Select(e => e.Spider()))
                 .Select(e=> e.Nodes)
                 ;
 
@@ -45,6 +45,26 @@ public async Task Interface_QuerySubClass()
 
         }
 
+
+        [Fact]
+        public async Task Interface_Projection()
+        {
+            var query = sampleClient
+                .Query
+                .Animals()
+                .Include(e => e.Nodes.Select(e => e.Pig()))
+                .Include(e => e.Nodes.Select(e => e.Spider()))
+                .Select(e => e.Nodes.Select(f => new { Pig = f.Pig(), Spider = f.Spider() }));                
+
+
+            var request = await query.GetRequestAsync();
+            var result = await query.ExecuteAsync();
+
+            var baseType = query.BaseResult;
+            Assert.NotNull(result);
+
+        }
+
     }
 
 }