Merge 14521ac into 644ade1

generator/plugins/dataloader/field_renderers.go

@@ -21,13 +21,22 @@ func (r *fieldsRenderer) RenderFields(o graphql.OutputObject, ctx graphql.BodyCo
 		"gqlPkg": func() string {
 			return ctx.Importer.New(graphql.GraphqlPkgPath)
 		},
+		"multierrorPkg": func() string {
+			return ctx.Importer.New("github.com/hashicorp/go-multierror")
+		},
 		"loadersPkg": func() string {
 			return ctx.Importer.New(r.dataLoader.Pkg)
 		},
-		"graphqlOutputLoaderTypeName": func(ctx graphql.BodyContext, dataLoaderName string) string {
-			dataLoaderConfig := r.dataLoader.Loaders[dataLoaderName]
+		"graphqlOutputLoaderTypeName": func(ctx graphql.BodyContext, dataLoaderFieldConfig graphql.DataLoaderField) string {
+			dataLoaderConfig := r.dataLoader.Loaders[dataLoaderFieldConfig.DataLoaderName]
+
+			resolver := dataLoaderConfig.OutputGraphqlType
+
+			if dataLoaderFieldConfig.KeyFieldSlice {
+				resolver = graphql.GqlListTypeResolver(resolver)
+			}
 
-			return dataLoaderConfig.OutputGraphqlType(ctx)
+			return resolver(ctx)
 		},
 	}
 

generator/plugins/dataloader/templates/output_object_fields.gohtml

@@ -1,23 +1,41 @@
 {{- /*gotype: github.com/EGT-Ukraine/go2gql/generator/plugins/graphql.RenderFieldsContext*/ -}}
 {{ range $field := $.OutputObject.DataLoaderFields -}}
-    {{$.OutputObject.VariableName}}.AddFieldConfig("{{$field.Name}}", &{{gqlPkg}}.Field{
-        Name:        "{{$field.Name}}",
-        Description: "",
-        Type:        {{graphqlOutputLoaderTypeName $.ObjectContext $field.DataLoaderName}},
-        Resolve: func(p graphql.ResolveParams) (interface{}, error) {
-            parent := p.Source.(*{{goType $.OutputObject.GoType}})
-
-            loaders := {{loadersPkg}}.GetDataLoadersFromContext(p.Context)
-
-            if loaders == nil {
-                return nil, errors.New("Data loaders not found in context. Call loaders.GetContextWithLoaders")
-            }
-
-            thunk := loaders.{{$field.DataLoaderName}}Loader.LoadThunk(parent.{{$field.NormalizedParentKeyFieldName}})
-
-            return func() (interface{}, error) {
-                return thunk()
-            }, nil
-        },
-    })
+	{{$.OutputObject.VariableName}}.AddFieldConfig("{{$field.Name}}", &{{gqlPkg}}.Field{
+		Name:		"{{$field.Name}}",
+		Description: "",
+		Type:		{{graphqlOutputLoaderTypeName $.ObjectContext $field}},
+		Resolve: func(p graphql.ResolveParams) (interface{}, error) {
+			parent := p.Source.(*{{goType $.OutputObject.GoType}})
+
+			loaders := {{loadersPkg}}.GetDataLoadersFromContext(p.Context)
+
+			if loaders == nil {
+				return nil, errors.New("Data loaders not found in context. Call loaders.GetContextWithLoaders")
+			}
+
+			{{if $field.KeyFieldSlice}}
+			thunk := loaders.{{$field.DataLoaderName}}Loader.LoadAllThunk(parent.{{$field.NormalizedParentKeyFieldName}})
+
+			return func() (interface{}, error) {
+				var loaderErrors error
+
+				result, errs := thunk()
+
+				for _, err := range errs {
+					if err != nil {
+						loaderErrors = {{multierrorPkg}}.Append(loaderErrors, err)
+					}
+				}
+
+				return result, loaderErrors
+			}, nil
+			{{else}}
+			thunk := loaders.{{$field.DataLoaderName}}Loader.LoadThunk(parent.{{$field.NormalizedParentKeyFieldName}})
+
+			return func() (interface{}, error) {
+				return thunk()
+			}, nil
+			{{end}}
+		},
+	})
 {{ end -}}

generator/plugins/graphql/models.go

@@ -95,6 +95,7 @@ type DataLoaderField struct {
 	Name                         string
 	Type                         string
 	ParentKeyFieldName           string
+	KeyFieldSlice                bool
 	NormalizedParentKeyFieldName string
 	DataLoaderName               string
 }