graphql: fix knot in the graphql/gqlgen usage

8 files changed, 61 insertions, 65 deletions

diff --git a/graphql/gqlgen.yml b/graphql/gqlgen.yml
index d0e579a2..19800bd9 100644
--- a/graphql/gqlgen.yml
+++ b/graphql/gqlgen.yml
@@ -1,16 +1,12 @@
 schema: schema.graphql
 exec:
-  filename: resolvers/gen_graph.go
+  filename: graph/gen_graph.go
 model:
   filename: models/gen_models.go
 
 models:
-  # Hack: here, we define the Repository model as a struct we control to trick gqlgen into
-  # generating an empty resolver instead of a struct with data
-  # Hopefully in the future, gqlgen support this case and we can clean that, as well as
-  # moving gen_graph.go into it's own package
   Repository:
-    model: github.com/MichaelMure/git-bug/graphql/resolvers.repoResolver
+    model: github.com/MichaelMure/git-bug/graphql/models.Repository
   Bug:
     model: github.com/MichaelMure/git-bug/bug.Snapshot
   Comment:
diff --git a/graphql/resolvers/gen_graph.go b/graphql/graph/gen_graph.go
index 409b7e42..386e9d01 100644
--- a/graphql/resolvers/gen_graph.go
+++ b/graphql/graph/gen_graph.go
@@ -1,6 +1,6 @@
 // Code generated by github.com/vektah/gqlgen, DO NOT EDIT.
 
-package resolvers
+package graph
 
 import (
 	"bytes"
@@ -40,11 +40,11 @@ type Resolvers interface {
 
 	LabelChangeOperation_date(ctx context.Context, obj *operations.LabelChangeOperation) (time.Time, error)
 
-	Query_defaultRepository(ctx context.Context) (*repoResolver, error)
-	Query_repository(ctx context.Context, id string) (*repoResolver, error)
+	Query_defaultRepository(ctx context.Context) (*models.Repository, error)
+	Query_repository(ctx context.Context, id string) (*models.Repository, error)
 
-	Repository_allBugs(ctx context.Context, obj *repoResolver, input models.ConnectionInput) (models.BugConnection, error)
-	Repository_bug(ctx context.Context, obj *repoResolver, prefix string) (*bug.Snapshot, error)
+	Repository_allBugs(ctx context.Context, obj *models.Repository, input models.ConnectionInput) (models.BugConnection, error)
+	Repository_bug(ctx context.Context, obj *models.Repository, prefix string) (*bug.Snapshot, error)
 
 	SetStatusOperation_date(ctx context.Context, obj *operations.SetStatusOperation) (time.Time, error)
 	SetStatusOperation_status(ctx context.Context, obj *operations.SetStatusOperation) (models.Status, error)
@@ -78,12 +78,12 @@ type LabelChangeOperationResolver interface {
 	Date(ctx context.Context, obj *operations.LabelChangeOperation) (time.Time, error)
 }
 type QueryResolver interface {
-	DefaultRepository(ctx context.Context) (*repoResolver, error)
-	Repository(ctx context.Context, id string) (*repoResolver, error)
+	DefaultRepository(ctx context.Context) (*models.Repository, error)
+	Repository(ctx context.Context, id string) (*models.Repository, error)
 }
 type RepositoryResolver interface {
-	AllBugs(ctx context.Context, obj *repoResolver, input models.ConnectionInput) (models.BugConnection, error)
-	Bug(ctx context.Context, obj *repoResolver, prefix string) (*bug.Snapshot, error)
+	AllBugs(ctx context.Context, obj *models.Repository, input models.ConnectionInput) (models.BugConnection, error)
+	Bug(ctx context.Context, obj *models.Repository, prefix string) (*bug.Snapshot, error)
 }
 type SetStatusOperationResolver interface {
 	Date(ctx context.Context, obj *operations.SetStatusOperation) (time.Time, error)
@@ -121,19 +121,19 @@ func (s shortMapper) LabelChangeOperation_date(ctx context.Context, obj *operati
 	return s.r.LabelChangeOperation().Date(ctx, obj)
 }
 
-func (s shortMapper) Query_defaultRepository(ctx context.Context) (*repoResolver, error) {
+func (s shortMapper) Query_defaultRepository(ctx context.Context) (*models.Repository, error) {
 	return s.r.Query().DefaultRepository(ctx)
 }
 
-func (s shortMapper) Query_repository(ctx context.Context, id string) (*repoResolver, error) {
+func (s shortMapper) Query_repository(ctx context.Context, id string) (*models.Repository, error) {
 	return s.r.Query().Repository(ctx, id)
 }
 
-func (s shortMapper) Repository_allBugs(ctx context.Context, obj *repoResolver, input models.ConnectionInput) (models.BugConnection, error) {
+func (s shortMapper) Repository_allBugs(ctx context.Context, obj *models.Repository, input models.ConnectionInput) (models.BugConnection, error) {
 	return s.r.Repository().AllBugs(ctx, obj, input)
 }
 
-func (s shortMapper) Repository_bug(ctx context.Context, obj *repoResolver, prefix string) (*bug.Snapshot, error) {
+func (s shortMapper) Repository_bug(ctx context.Context, obj *models.Repository, prefix string) (*bug.Snapshot, error) {
 	return s.r.Repository().Bug(ctx, obj, prefix)
 }
 
@@ -1215,7 +1215,7 @@ func (ec *executionContext) _Query_defaultRepository(ctx context.Context, field
 		if resTmp == nil {
 			return graphql.Null
 		}
-		res := resTmp.(*repoResolver)
+		res := resTmp.(*models.Repository)
 		if res == nil {
 			return graphql.Null
 		}
@@ -1259,7 +1259,7 @@ func (ec *executionContext) _Query_repository(ctx context.Context, field graphql
 		if resTmp == nil {
 			return graphql.Null
 		}
-		res := resTmp.(*repoResolver)
+		res := resTmp.(*models.Repository)
 		if res == nil {
 			return graphql.Null
 		}
@@ -1309,7 +1309,7 @@ func (ec *executionContext) _Query___type(ctx context.Context, field graphql.Col
 var repositoryImplementors = []string{"Repository"}
 
 // nolint: gocyclo, errcheck, gas, goconst
-func (ec *executionContext) _Repository(ctx context.Context, sel []query.Selection, obj *repoResolver) graphql.Marshaler {
+func (ec *executionContext) _Repository(ctx context.Context, sel []query.Selection, obj *models.Repository) graphql.Marshaler {
 	fields := graphql.CollectFields(ec.Doc, sel, repositoryImplementors, ec.Variables)
 
 	out := graphql.NewOrderedMap(len(fields))
@@ -1331,7 +1331,7 @@ func (ec *executionContext) _Repository(ctx context.Context, sel []query.Selecti
 	return out
 }
 
-func (ec *executionContext) _Repository_allBugs(ctx context.Context, field graphql.CollectedField, obj *repoResolver) graphql.Marshaler {
+func (ec *executionContext) _Repository_allBugs(ctx context.Context, field graphql.CollectedField, obj *models.Repository) graphql.Marshaler {
 	args := map[string]interface{}{}
 	var arg0 models.ConnectionInput
 	if tmp, ok := field.Args["input"]; ok {
@@ -1372,7 +1372,7 @@ func (ec *executionContext) _Repository_allBugs(ctx context.Context, field graph
 	})
 }
 
-func (ec *executionContext) _Repository_bug(ctx context.Context, field graphql.CollectedField, obj *repoResolver) graphql.Marshaler {
+func (ec *executionContext) _Repository_bug(ctx context.Context, field graphql.CollectedField, obj *models.Repository) graphql.Marshaler {
 	args := map[string]interface{}{}
 	var arg0 string
 	if tmp, ok := field.Args["prefix"]; ok {
diff --git a/graphql/handler.go b/graphql/handler.go
index d1906dda..0069ce44 100644
--- a/graphql/handler.go
+++ b/graphql/handler.go
@@ -3,6 +3,7 @@
 package graphql
 
 import (
+	"github.com/MichaelMure/git-bug/graphql/graph"
 	"github.com/MichaelMure/git-bug/graphql/resolvers"
 	"github.com/MichaelMure/git-bug/repository"
 	"github.com/vektah/gqlgen/handler"
@@ -10,9 +11,9 @@ import (
 )
 
 func NewHandler(repo repository.Repo) http.Handler {
-	backend := resolvers.NewRootResolver()
+	backend := resolvers.NewBackend()
 
 	backend.RegisterDefaultRepository(repo)
 
-	return handler.GraphQL(resolvers.NewExecutableSchema(backend))
+	return handler.GraphQL(graph.NewExecutableSchema(backend))
 }
diff --git a/graphql/models/models.go b/graphql/models/models.go
new file mode 100644
index 00000000..c492103c
--- /dev/null
+++ b/graphql/models/models.go
@@ -0,0 +1,8 @@
+package models
+
+import "github.com/MichaelMure/git-bug/cache"
+
+type Repository struct {
+	Cache cache.Cacher
+	Repo  cache.RepoCacher
+}
diff --git a/graphql/resolvers/bug.go b/graphql/resolvers/bug.go
index 246507c6..a895cdcd 100644
--- a/graphql/resolvers/bug.go
+++ b/graphql/resolvers/bug.go
@@ -3,14 +3,11 @@ package resolvers
 import (
 	"context"
 	"github.com/MichaelMure/git-bug/bug"
-	"github.com/MichaelMure/git-bug/cache"
 	"github.com/MichaelMure/git-bug/graphql/connections"
 	"github.com/MichaelMure/git-bug/graphql/models"
 )
 
-type bugResolver struct {
-	cache cache.Cacher
-}
+type bugResolver struct{}
 
 func (bugResolver) Status(ctx context.Context, obj *bug.Snapshot) (models.Status, error) {
 	return convertStatus(obj.Status)
diff --git a/graphql/resolvers/query.go b/graphql/resolvers/query.go
index cceca334..bca4806f 100644
--- a/graphql/resolvers/query.go
+++ b/graphql/resolvers/query.go
@@ -3,34 +3,35 @@ package resolvers
 import (
 	"context"
 	"github.com/MichaelMure/git-bug/cache"
+	"github.com/MichaelMure/git-bug/graphql/models"
 )
 
 type rootQueryResolver struct {
 	cache cache.Cacher
 }
 
-func (r rootQueryResolver) DefaultRepository(ctx context.Context) (*repoResolver, error) {
+func (r rootQueryResolver) DefaultRepository(ctx context.Context) (*models.Repository, error) {
 	repo, err := r.cache.DefaultRepo()
 
 	if err != nil {
 		return nil, err
 	}
 
-	return &repoResolver{
-		cache: r.cache,
-		repo:  repo,
+	return &models.Repository{
+		Cache: r.cache,
+		Repo:  repo,
 	}, nil
 }
 
-func (r rootQueryResolver) Repository(ctx context.Context, id string) (*repoResolver, error) {
+func (r rootQueryResolver) Repository(ctx context.Context, id string) (*models.Repository, error) {
 	repo, err := r.cache.ResolveRepo(id)
 
 	if err != nil {
 		return nil, err
 	}
 
-	return &repoResolver{
-		cache: r.cache,
-		repo:  repo,
+	return &models.Repository{
+		Cache: r.cache,
+		Repo:  repo,
 	}, nil
 }
diff --git a/graphql/resolvers/repo.go b/graphql/resolvers/repo.go
index 2031d7b6..26c5ebaa 100644
--- a/graphql/resolvers/repo.go
+++ b/graphql/resolvers/repo.go
@@ -3,20 +3,16 @@ package resolvers
 import (
 	"context"
 	"github.com/MichaelMure/git-bug/bug"
-	"github.com/MichaelMure/git-bug/cache"
 	"github.com/MichaelMure/git-bug/graphql/connections"
 	"github.com/MichaelMure/git-bug/graphql/models"
 )
 
-type repoResolver struct {
-	cache cache.Cacher
-	repo  cache.RepoCacher
-}
+type repoResolver struct{}
 
-func (repoResolver) AllBugs(ctx context.Context, obj *repoResolver, input models.ConnectionInput) (models.BugConnection, error) {
+func (repoResolver) AllBugs(ctx context.Context, obj *models.Repository, input models.ConnectionInput) (models.BugConnection, error) {
 
 	// Simply pass a []string with the ids to the pagination algorithm
-	source, err := obj.repo.AllBugIds()
+	source, err := obj.Repo.AllBugIds()
 
 	if err != nil {
 		return models.BugConnection{}, err
@@ -35,7 +31,7 @@ func (repoResolver) AllBugs(ctx context.Context, obj *repoResolver, input models
 		edges := make([]models.BugEdge, len(lazyBugEdges))
 
 		for i, lazyBugEdge := range lazyBugEdges {
-			b, err := obj.repo.ResolveBug(lazyBugEdge.Id)
+			b, err := obj.Repo.ResolveBug(lazyBugEdge.Id)
 
 			if err != nil {
 				return models.BugConnection{}, err
@@ -59,8 +55,8 @@ func (repoResolver) AllBugs(ctx context.Context, obj *repoResolver, input models
 	return connections.StringCon(source, edger, conMaker, input)
 }
 
-func (repoResolver) Bug(ctx context.Context, obj *repoResolver, prefix string) (*bug.Snapshot, error) {
-	b, err := obj.repo.ResolveBugPrefix(prefix)
+func (repoResolver) Bug(ctx context.Context, obj *models.Repository, prefix string) (*bug.Snapshot, error) {
+	b, err := obj.Repo.ResolveBugPrefix(prefix)
 
 	if err != nil {
 		return nil, err
diff --git a/graphql/resolvers/root.go b/graphql/resolvers/root.go
index e5f83060..f8ac67b1 100644
--- a/graphql/resolvers/root.go
+++ b/graphql/resolvers/root.go
@@ -2,52 +2,49 @@ package resolvers
 
 import (
 	"github.com/MichaelMure/git-bug/cache"
+	"github.com/MichaelMure/git-bug/graphql/graph"
 )
 
-type RootResolver struct {
+type Backend struct {
 	cache.RootCache
 }
 
-func NewRootResolver() *RootResolver {
-	return &RootResolver{
+func NewBackend() *Backend {
+	return &Backend{
 		RootCache: cache.NewCache(),
 	}
 }
 
-func (r RootResolver) Query() QueryResolver {
+func (r Backend) Query() graph.QueryResolver {
 	return &rootQueryResolver{
 		cache: &r.RootCache,
 	}
 }
 
-func (RootResolver) AddCommentOperation() AddCommentOperationResolver {
+func (Backend) AddCommentOperation() graph.AddCommentOperationResolver {
 	return &addCommentOperationResolver{}
 }
 
-func (r RootResolver) Bug() BugResolver {
-	return &bugResolver{
-		cache: &r.RootCache,
-	}
+func (r Backend) Bug() graph.BugResolver {
+	return &bugResolver{}
 }
 
-func (RootResolver) CreateOperation() CreateOperationResolver {
+func (Backend) CreateOperation() graph.CreateOperationResolver {
 	return &createOperationResolver{}
 }
 
-func (RootResolver) LabelChangeOperation() LabelChangeOperationResolver {
+func (Backend) LabelChangeOperation() graph.LabelChangeOperationResolver {
 	return &labelChangeOperation{}
 }
 
-func (r RootResolver) Repository() RepositoryResolver {
-	return &repoResolver{
-		cache: &r.RootCache,
-	}
+func (r Backend) Repository() graph.RepositoryResolver {
+	return &repoResolver{}
 }
 
-func (RootResolver) SetStatusOperation() SetStatusOperationResolver {
+func (Backend) SetStatusOperation() graph.SetStatusOperationResolver {
 	return &setStatusOperationResolver{}
 }
 
-func (RootResolver) SetTitleOperation() SetTitleOperationResolver {
+func (Backend) SetTitleOperation() graph.SetTitleOperationResolver {
 	return &setTitleOperationResolver{}
 }