Bugfix #41: Fix field type determination

Author: phortx

src/graphql/query-builder.ts

@@ -172,9 +172,8 @@ export default class QueryBuilder {
         const isForeignKey = model.skipField(key);
         const skipFieldDueId = (key === 'id' || isForeignKey) && !allowIdFields;
 
-        const schema = Context.getInstance().schema!;
-        const type = schema.getType(model.singularName + (filter ? 'Filter' : ''));
-        const schemaField = type ? (filter ? type.inputFields! : type.fields!).find(f => f.name === key) : null;
+        let schemaField: GraphQLField | undefined = this.findSchemaFieldForArgument(key, field, model, filter);
+
         const isConnectionField = schemaField && Schema.getTypeNameOfField(schemaField).endsWith('TypeConnection');
 
         // Ignore null fields, ids and connections
@@ -253,6 +252,30 @@ export default class QueryBuilder {
     }
   }
 
+  private static findSchemaFieldForArgument (
+    name: String, field: GraphQLField | null, model: Model, isFilter: boolean
+  ): GraphQLField | undefined {
+
+    const schema = Context.getInstance().schema!;
+    let schemaField: GraphQLField | undefined;
+
+    if (field) {
+      schemaField = field.args.find(f => f.name === name);
+
+      if (!schemaField) {
+        Context.getInstance().logger.warn(`Could find the argument with name ${name} for the mutation/query ${field.name}`);
+      }
+    } else {
+      // We try to find the FilterType or at least the Type this query belongs to.
+      const type = schema.getType(model.singularName + (isFilter ? 'Filter' : ''));
+
+      // Next we try to find the field from the type
+      schemaField = type ? (isFilter ? type.inputFields! : type.fields!).find(f => f.name === name) : undefined;
+    }
+
+    return schemaField;
+  }
+
   /**
    * Generates the fields for all related models.
    *

test/integration/VuexORMGraphQL.spec.js

@@ -447,14 +447,14 @@ query UnpublishedPosts($userId: ID!, $id: ID!) {
       const post = Post.find(1);
 
       const request = await recordGraphQLRequest(async () => {
-        await post.$mutate({name: 'upvotePost', args: { captchaToken: '15' }});
+        await Post.mutate({name: 'upvotePost', args: { captchaToken: '15', postId: post.id }});
       });
 
       expect(request.variables.captchaToken).toEqual('15');
-      expect(request.variables.id).toEqual(post.id);
+      expect(request.variables.postId).toEqual(post.id);
       expect(request.query).toEqual(`
-mutation UpvotePost($captchaToken: String!, $id: ID!) {
-  upvotePost(captchaToken: $captchaToken, id: $id) {
+mutation UpvotePost($captchaToken: String!, $postId: ID!) {
+  upvotePost(captchaToken: $captchaToken, postId: $postId) {
     id
     content
     title

test/support/mock-schema.js

@@ -51,7 +51,7 @@ export const typeDefs = `
     updateTariffOption(id: ID!, tariffOption: TariffOptionInput!): TariffOption!
     updateTariff(id: ID!, tariff: TariffInput!): Tariff!
     
-    upvotePost(captchaToken: String!, id: ID!): Post!
+    upvotePost(captchaToken: String!, postId: ID!): Post!
     sendSms(to: String!, text: String!): SmsStatus!
     reorderItems(id: ID!, itemIds: [ID]!): PostTypeConnection
   }
@@ -612,7 +612,7 @@ export const resolvers = {
   Mutation: {
     // Customs
 
-    upvotePost: (parent, { captchaToken, id }) => findOne(Post, posts, id),
+    upvotePost: (parent, { captchaToken, postId }) => findOne(Post, posts, postId),
     sendSms: (parent, { to, text }) => ({ delivered: true }),