Fix eagerLoading

Author: phortx

src/graphql/query-builder.ts

@@ -234,7 +234,7 @@ export default class QueryBuilder {
         context.logger.log('WARNING: field has neither parent nor related property. Fallback to attribute name', field);
       }
 
-      if (model.shouldEagerLoadRelation(field, relatedModel) &&
+      if (model.shouldEagerLoadRelation(name, field, relatedModel) &&
           !this.shouldRelationBeIgnored(model, relatedModel, ignoreRelations)) {
 
         const multiple: boolean = !(field instanceof context.components.BelongsTo ||

src/orm/model.ts

@@ -206,14 +206,20 @@ export default class Model {
    * @param {Model} relatedModel Related model
    * @returns {boolean}
    */
-  public shouldEagerLoadRelation (field: Field, relatedModel: Model): boolean {
+  public shouldEagerLoadRelation (fieldName: string, field: Field, relatedModel: Model): boolean {
     const context = Context.getInstance();
 
-    if (field instanceof context.components.HasOne || field instanceof context.components.BelongsTo) {
+    if (
+      field instanceof context.components.HasOne ||
+      field instanceof context.components.BelongsTo ||
+      field instanceof context.components.MorphOne
+    ) {
       return true;
     }
 
     const eagerLoadList: Array<String> = this.baseModel.eagerLoad || [];
-    return eagerLoadList.find((n) => n === relatedModel.singularName || n === relatedModel.pluralName) !== undefined;
+    return eagerLoadList.find((n) => {
+      return n === relatedModel.singularName || n === relatedModel.pluralName || n === fieldName;
+    }) !== undefined;
   }
 }

test/unit/Model.spec.js

@@ -136,19 +136,19 @@ describe('Model', () => {
   describe('.shouldEagerLoadRelation', () => {
     it('returns true if field is a belongsTo or hasOne relation', () => {
       const model = context.getModel('post');
-      expect(model.shouldEagerLoadRelation(model.fields.get('user'), context.getModel('user'))).toEqual(true);
+      expect(model.shouldEagerLoadRelation('user', model.fields.get('user'), context.getModel('user'))).toEqual(true);
 
       // TODO test hasOne
     });
 
     it('returns true if field is in the eagerLoad array', () => {
       const model = context.getModel('post');
-      expect(model.shouldEagerLoadRelation(model.fields.get('comments'), context.getModel('comment'))).toEqual(true);
+      expect(model.shouldEagerLoadRelation('post', model.fields.get('comments'), context.getModel('comment'))).toEqual(true);
     });
 
     it('returns false if field neither belongsTo/hasOne nor in the eagerLoad array', () => {
       const model = context.getModel('user');
-      expect(model.shouldEagerLoadRelation(model.fields.get('comments'), context.getModel('comment'))).toEqual(false);
+      expect(model.shouldEagerLoadRelation('user', model.fields.get('comments'), context.getModel('comment'))).toEqual(false);
     });
   });
 });