From feab9412dffe5772048aad29893c4cb01d566387 Mon Sep 17 00:00:00 2001 From: Michael Muré Date: Wed, 21 Nov 2018 18:56:12 +0100 Subject: WIP identity in git --- graphql/resolvers/person.go | 37 ------------------------------------- graphql/resolvers/root.go | 4 ---- 2 files changed, 41 deletions(-) delete mode 100644 graphql/resolvers/person.go (limited to 'graphql/resolvers') diff --git a/graphql/resolvers/person.go b/graphql/resolvers/person.go deleted file mode 100644 index bb4bcb0d..00000000 --- a/graphql/resolvers/person.go +++ /dev/null @@ -1,37 +0,0 @@ -package resolvers - -import ( - "context" - - "github.com/MichaelMure/git-bug/bug" -) - -type personResolver struct{} - -func (personResolver) Name(ctx context.Context, obj *bug.Person) (*string, error) { - if obj.Name == "" { - return nil, nil - } - return &obj.Name, nil -} - -func (personResolver) Email(ctx context.Context, obj *bug.Person) (*string, error) { - if obj.Email == "" { - return nil, nil - } - return &obj.Email, nil -} - -func (personResolver) Login(ctx context.Context, obj *bug.Person) (*string, error) { - if obj.Login == "" { - return nil, nil - } - return &obj.Login, nil -} - -func (personResolver) AvatarURL(ctx context.Context, obj *bug.Person) (*string, error) { - if obj.AvatarUrl == "" { - return nil, nil - } - return &obj.AvatarUrl, nil -} diff --git a/graphql/resolvers/root.go b/graphql/resolvers/root.go index d7bd6021..9b3a730b 100644 --- a/graphql/resolvers/root.go +++ b/graphql/resolvers/root.go @@ -32,10 +32,6 @@ func (RootResolver) Bug() graph.BugResolver { return &bugResolver{} } -func (r RootResolver) Person() graph.PersonResolver { - return &personResolver{} -} - func (RootResolver) CommentHistoryStep() graph.CommentHistoryStepResolver { return &commentHistoryStepResolver{} } -- cgit From 844616baf8dc628360942d57fd69f24e298e08da Mon Sep 17 00:00:00 2001 From: Michael Muré Date: Sat, 19 Jan 2019 16:01:06 +0100 Subject: identity: more progress and fixes --- graphql/resolvers/identity.go | 36 ++++++++++++++++++++++++++++++++++++ graphql/resolvers/root.go | 4 ++++ 2 files changed, 40 insertions(+) create mode 100644 graphql/resolvers/identity.go (limited to 'graphql/resolvers') diff --git a/graphql/resolvers/identity.go b/graphql/resolvers/identity.go new file mode 100644 index 00000000..cc68197f --- /dev/null +++ b/graphql/resolvers/identity.go @@ -0,0 +1,36 @@ +package resolvers + +import ( + "context" + + "github.com/MichaelMure/git-bug/identity" +) + +type identityResolver struct{} + +func (identityResolver) Name(ctx context.Context, obj *identity.Interface) (*string, error) { + return nilIfEmpty((*obj).Name()) +} + +func (identityResolver) Email(ctx context.Context, obj *identity.Interface) (*string, error) { + return nilIfEmpty((*obj).Email()) +} + +func (identityResolver) Login(ctx context.Context, obj *identity.Interface) (*string, error) { + return nilIfEmpty((*obj).Login()) +} + +func (identityResolver) DisplayName(ctx context.Context, obj *identity.Interface) (string, error) { + return (*obj).DisplayName(), nil +} + +func (identityResolver) AvatarURL(ctx context.Context, obj *identity.Interface) (*string, error) { + return nilIfEmpty((*obj).AvatarUrl()) +} + +func nilIfEmpty(s string) (*string, error) { + if s == "" { + return nil, nil + } + return &s, nil +} diff --git a/graphql/resolvers/root.go b/graphql/resolvers/root.go index 9b3a730b..cfdfe346 100644 --- a/graphql/resolvers/root.go +++ b/graphql/resolvers/root.go @@ -32,6 +32,10 @@ func (RootResolver) Bug() graph.BugResolver { return &bugResolver{} } +func (r RootResolver) Identity() graph.IdentityResolver { + return &identityResolver{} +} + func (RootResolver) CommentHistoryStep() graph.CommentHistoryStepResolver { return &commentHistoryStepResolver{} } -- cgit From ffe35fece1b1526949107f154abc21a1a02fc74d Mon Sep 17 00:00:00 2001 From: Michael Muré Date: Tue, 19 Feb 2019 00:10:40 +0100 Subject: identity: complete the graphql api --- graphql/resolvers/identity.go | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'graphql/resolvers') diff --git a/graphql/resolvers/identity.go b/graphql/resolvers/identity.go index cc68197f..d4f9bba2 100644 --- a/graphql/resolvers/identity.go +++ b/graphql/resolvers/identity.go @@ -8,6 +8,10 @@ import ( type identityResolver struct{} +func (identityResolver) ID(ctx context.Context, obj *identity.Interface) (string, error) { + return (*obj).Id(), nil +} + func (identityResolver) Name(ctx context.Context, obj *identity.Interface) (*string, error) { return nilIfEmpty((*obj).Name()) } @@ -28,6 +32,10 @@ func (identityResolver) AvatarURL(ctx context.Context, obj *identity.Interface) return nilIfEmpty((*obj).AvatarUrl()) } +func (identityResolver) IsProtected(ctx context.Context, obj *identity.Interface) (bool, error) { + return (*obj).IsProtected(), nil +} + func nilIfEmpty(s string) (*string, error) { if s == "" { return nil, nil -- cgit From e100ee9f10dd7f600b58bf3d24b36f9b286210d6 Mon Sep 17 00:00:00 2001 From: Michael Muré Date: Sun, 24 Feb 2019 12:58:04 +0100 Subject: github: fix 3 edge-case failures --- graphql/resolvers/mutation.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'graphql/resolvers') diff --git a/graphql/resolvers/mutation.go b/graphql/resolvers/mutation.go index ee79ce6b..be6956af 100644 --- a/graphql/resolvers/mutation.go +++ b/graphql/resolvers/mutation.go @@ -68,7 +68,7 @@ func (r mutationResolver) AddComment(ctx context.Context, repoRef *string, prefi return bug.Snapshot{}, err } - err = b.AddCommentWithFiles(message, files) + _, err = b.AddCommentWithFiles(message, files) if err != nil { return bug.Snapshot{}, err } @@ -89,7 +89,7 @@ func (r mutationResolver) ChangeLabels(ctx context.Context, repoRef *string, pre return bug.Snapshot{}, err } - _, err = b.ChangeLabels(added, removed) + _, _, err = b.ChangeLabels(added, removed) if err != nil { return bug.Snapshot{}, err } @@ -110,7 +110,7 @@ func (r mutationResolver) Open(ctx context.Context, repoRef *string, prefix stri return bug.Snapshot{}, err } - err = b.Open() + _, err = b.Open() if err != nil { return bug.Snapshot{}, err } @@ -131,7 +131,7 @@ func (r mutationResolver) Close(ctx context.Context, repoRef *string, prefix str return bug.Snapshot{}, err } - err = b.Close() + _, err = b.Close() if err != nil { return bug.Snapshot{}, err } @@ -152,7 +152,7 @@ func (r mutationResolver) SetTitle(ctx context.Context, repoRef *string, prefix return bug.Snapshot{}, err } - err = b.SetTitle(title) + _, err = b.SetTitle(title) if err != nil { return bug.Snapshot{}, err } -- cgit