Fix dataloaders tests

example/main.go

@@ -45,6 +45,10 @@ func (Client) GetEmptiesMsg(ctx context.Context, in *example.Empty, opts ...grpc
 	return &example.Empty{}, nil
 }
 
+func (Client) ListSomeEntities(ctx context.Context, in *example.ListSomeEntitiesRequest, opts ...grpc.CallOption) (*example.ListSomeEntitiesResponse, error) {
+	return &example.ListSomeEntitiesResponse{}, nil
+}
+
 func main() {
 	schem, err := schema.GetExampleSchemaSchema(schema.ExampleSchemaSchemaClients{
 		ServiceExampleClient: Client{},

example/proto/example.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package example;
+package proto;
 
 import "google/protobuf/timestamp.proto";
 

generator/plugins/dataloader/config.go

@@ -9,6 +9,7 @@ type DataLoadersConfig struct {
 type ProviderConfig struct {
 	Name         string        `mapstructure:"name"`
 	WaitDuration time.Duration `mapstructure:"wait_duration_ms"`
+	Slice        bool
 }
 
 type FieldConfig struct {

generator/plugins/dataloader/data_loader_generator.go

@@ -57,14 +57,14 @@ func (p *LoaderGenerator) GenerateDataLoaders() error {
 
 	for _, dataLoader := range p.dataLoader.Loaders {
 		if err := p.generateLoaders(dataLoader.InputGoType, dataLoader.OutputGoType, dataLoader.Slice); err != nil {
-			return err
+			return errors.Wrapf(err, "failed to generate %s data loader", dataLoader.Config.Name)
 		}
 	}
 
 	return nil
 }
 
-func (p *LoaderGenerator) generateLoaders(requestGoType graphql.GoType, responseGoType graphql.GoType, slice bool) error {
+func (p *LoaderGenerator) generateLoaders(requestGoType graphql.GoType, responseGoType graphql.GoType, slice bool) (rerr error) {
 	keyType := requestGoType.ElemType.Kind.String()
 
 	var typeName string
@@ -74,6 +74,11 @@ func (p *LoaderGenerator) generateLoaders(requestGoType graphql.GoType, response
 	} else {
 		typeName = responseGoType.ElemType.Pkg + "." + responseGoType.ElemType.Name
 	}
+	defer func() {
+		if v := recover(); v != nil {
+			rerr = fmt.Errorf("failed to generate dataloader: %v", v)
+		}
+	}()
 
 	if err := generator.Generate(typeName, keyType, slice, true, p.dataLoader.OutputPath); err != nil {
 		return errors.Wrapf(err, "Failed to generate loader for '%s'", typeName)

generator/plugins/graphql/lib/pluginconfig/decoder.go

@@ -0,0 +1,20 @@
+package pluginconfig
+
+import "github.com/mitchellh/mapstructure"
+
+func Decode(input, output interface{}) error {
+	config := &mapstructure.DecoderConfig{
+		DecodeHook: mapstructure.ComposeDecodeHookFunc(
+			mapstructure.StringToTimeDurationHookFunc(),
+		),
+		Metadata: nil,
+		Result:   output,
+	}
+
+	decoder, err := mapstructure.NewDecoder(config)
+	if err != nil {
+		return err
+	}
+
+	return decoder.Decode(input)
+}

generator/plugins/proto2gql/dataloaders.go

@@ -62,6 +62,7 @@ func (g Proto2GraphQL) registerMethodDataLoader(name string, cfg DataLoaderConfi
 			Kind:     reflect.Slice,
 			ElemType: &responseCopy,
 		}
+		dataLoaderOutType = graphql.GqlListTypeResolver(dataLoaderOutType)
 	} else {
 		fetchCode = g.oneToOneDataLoaderFetchCode(file, cfg, method)
 	}

generator/plugins/proto2gql/plugin.go

@@ -10,6 +10,7 @@ import (
 	"github.com/EGT-Ukraine/go2gql/generator"
 	"github.com/EGT-Ukraine/go2gql/generator/plugins/dataloader"
 	"github.com/EGT-Ukraine/go2gql/generator/plugins/graphql"
+	"github.com/EGT-Ukraine/go2gql/generator/plugins/graphql/lib/pluginconfig"
 )
 
 const (
@@ -42,7 +43,7 @@ func (p *Plugin) Init(config *generator.GenerateConfig, plugins []generator.Plug
 		return errors.New("'dataloader' plugin is not installed")
 	}
 	cfg := new(Config)
-	err := mapstructure.Decode(config.PluginsConfigs[PluginConfigKey], cfg)
+	err := pluginconfig.Decode(config.PluginsConfigs[PluginConfigKey], cfg)
 	if err != nil {
 		return errors.Wrap(err, "failed to decode config")
 	}
@@ -70,6 +71,7 @@ func (p *Plugin) parseImports() error {
 
 		for _, config := range *configs {
 			var importFileDir = filepath.Dir(pluginsConfigsImports.Path)
+
 			var protoPath = filepath.Join(importFileDir, config.ProtoPath)
 
 			config.ProtoPath = protoPath

generator/plugins/swagger2gql/services.go

@@ -194,6 +194,7 @@ func (p *Plugin) addDataLoaderProvider(
 		OutputGoType:      responseGoType,
 		OutputGraphqlType: dataLoaderOutType,
 		Config:            dataLoaderProviderConfig,
+		Slice:             dataLoaderProviderConfig.Slice,
 	}
 
 	p.dataLoaderPlugin.AddLoader(dataLoaderProvider)

tests/dataloader/apis/category.proto

@@ -17,5 +17,6 @@ message CategoryListResponse {
 }
 
 message Category {
-    string name = 1;
+    uint64 id = 1;
+    string name = 2;
 }

tests/dataloader/apis/reviews.proto

@@ -7,22 +7,21 @@ option go_package = "github.com/EGT-Ukraine/go2gql/tests/dataloader/generated/cl
 import "google/protobuf/empty.proto";
 
 service ItemsReviewService {
-    rpc List (ListRequest) returns (ListResponse) {}
+    rpc List (ListRequest) returns (ListResponse) {
+    }
 }
 
 message ListRequest {
-    repeated int64 item_id  = 1;
+    repeated int64 item_id = 1;
 }
 
 message ListResponse {
-    repeated ItemReviews item_reviews = 1;
+    repeated Review reviews = 1;
 }
 
-message ItemReviews {
-    repeated Review item_review = 1;
-}
 
 message Review {
-    int64 id           = 1;
-    string text        = 2;
+    int64 id = 1;
+    int64 item_id = 2;
+    string text = 3;
 }

tests/dataloader/dataloader_test.go

@@ -47,9 +47,11 @@ func TestDataLoader(t *testing.T) {
 	categoryClient.EXPECT().List(gomock.Any(), gomock.Any()).Return(&apis.CategoryListResponse{
 		Categories: []*apis.Category{
 			{
+				Id:   12,
 				Name: "category 12",
 			},
 			{
+				Id:   11,
 				Name: "category 11",
 			},
 		},
@@ -118,12 +120,15 @@ func TestDataLoaderWithKeyFieldSlice(t *testing.T) {
 	categoryClient.EXPECT().List(gomock.Any(), gomock.Any()).Return(&apis.CategoryListResponse{
 		Categories: []*apis.Category{
 			{
+				Id:   12,
 				Name: "category 12",
 			},
 			{
+				Id:   11,
 				Name: "category 11",
 			},
 			{
+				Id:   15,
 				Name: "category 15",
 			},
 		},
@@ -236,14 +241,15 @@ func TestDataLoaderGetOne(t *testing.T) {
 	itemsClient := mock.NewMockItemsServiceClient(mockCtrl)
 	itemsClient.EXPECT().GetOne(gomock.Any(), gomock.Any()).Return(&apis.Item{
 		Name:       "item 1",
-		CategoryId: 12,
+		CategoryId: 1,
 	}, nil).AnyTimes()
 
 	categoryClient := mock.NewMockCategoryServiceClient(mockCtrl)
 
 	categoryClient.EXPECT().List(gomock.Any(), gomock.Any()).Return(&apis.CategoryListResponse{
 		Categories: []*apis.Category{
 			{
+				Id:   1,
 				Name: "category 1",
 			},
 		},
@@ -367,19 +373,17 @@ func TestDataLoaderWithProtoFieldUnwrapping(t *testing.T) {
 	itemsClient := mock.NewMockItemsServiceClient(mockCtrl)
 	itemsClient.EXPECT().GetOne(gomock.Any(), gomock.Any()).Return(&apis.Item{
 		Name:       "item 1",
+		Id:         1,
 		CategoryId: 12,
 	}, nil).AnyTimes()
 
 	reviewsClient := mock.NewMockItemsReviewServiceClient(mockCtrl)
 	reviewsClient.EXPECT().List(gomock.Any(), gomock.Any()).Return(&apis.ListResponse{
-		ItemReviews: []*apis.ItemReviews{
+		Reviews: []*apis.Review{
 			{
-				ItemReview: []*apis.Review{
-					{
-						Id:   456,
-						Text: "excellent item",
-					},
-				},
+				Id:     456,
+				ItemId: 1,
+				Text:   "excellent item",
 			},
 		},
 	}, nil).AnyTimes()