Implements hacky, temporary solution to #13

anpete · Mar 18, 2016 · 669b8a0 · 669b8a0
1 parent d3f7abe
commit 669b8a0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/src/GrefQL/Query/FieldResolverFactory.cs b/src/GrefQL/Query/FieldResolverFactory.cs
@@ -331,21 +331,21 @@ private static IQueryable<TEntity> ApplyProjection<TEntity>(
             var entityParameterExpression = Expression.Parameter(entityClrType, "entity");
             var memberAssignments = new List<MemberAssignment>();
 
-            foreach (var selection in selectionSet)
+            foreach (var property 
+                in selectionSet
+                    .Select(s => entityType.FindProperty(s.Field.Name.ToPascalCase()))
+                    .Where(p => p != null)
+                    .Union(entityType.GetKeys().SelectMany(k => k.Properties))
+                    .Union(entityType.GetForeignKeys().SelectMany(fk => fk.Properties)))
             {
-                var property = entityType.FindProperty(selection.Field.Name.ToPascalCase());
-
-                if (property != null)
-                {
-                    memberAssignments.Add(
-                        Expression.Bind(
-                            entityTypeInfo.GetProperty(property.Name),
-                            Expression.Call(
-                                null,
-                                _efPropertyMethodInfo.MakeGenericMethod(property.ClrType),
-                                entityParameterExpression,
-                                Expression.Constant(property.Name))));
-                }
+                memberAssignments.Add(
+                    Expression.Bind(
+                        entityTypeInfo.GetProperty(property.Name),
+                        Expression.Call(
+                            null,
+                            _efPropertyMethodInfo.MakeGenericMethod(property.ClrType),
+                            entityParameterExpression,
+                            Expression.Constant(property.Name))));
             }
 
             var selector

diff --git a/test/GrefQL.Tests/ConcurrentQueryTest.cs b/test/GrefQL.Tests/ConcurrentQueryTest.cs
@@ -18,7 +18,6 @@ public void It_doesnt_throw_concurrency_error()
                 phone
                 orders {
                   orderId
-                  customerId
                   customer {
                     customerId
                   }

diff --git a/test/GrefQL.Tests/QueryTests.cs b/test/GrefQL.Tests/QueryTests.cs
@@ -179,9 +179,7 @@ public void Query_orders_with_customer()
                 {
                    orders(limit: 2) {
                       orderId
-                      customerId
                       customer {
-                          customerId
                           contactName
                       }
                    }