Skip to content

Commit c80a606

Browse files
authored
Merge pull request #19 from chris-ramon/issue-11
`{domain/gql`}: Isolate gql utils for separation.
2 parents 80176b3 + 99a694e commit c80a606

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

domain/gql/fields/fields.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55

66
"github.com/chris-ramon/golang-scaffolding/domain/auth/mappers"
77
"github.com/chris-ramon/golang-scaffolding/domain/gql/types"
8+
"github.com/chris-ramon/golang-scaffolding/domain/gql/util"
89
usersMappers "github.com/chris-ramon/golang-scaffolding/domain/users/mappers"
910
"github.com/chris-ramon/golang-scaffolding/pkg/ctxutil"
1011
)
@@ -21,7 +22,7 @@ var CurrentUserField = &graphql.Field{
2122
Name: "CurrentUser",
2223
Type: types.CurrentUserType,
2324
Resolve: func(p graphql.ResolveParams) (interface{}, error) {
24-
srvs, err := servicesFromResolveParams(p)
25+
srvs, err := util.ServicesFromResolveParams(p)
2526
if err != nil {
2627
return nil, err
2728
}
@@ -54,17 +55,17 @@ var AuthUserField = &graphql.Field{
5455
},
5556
},
5657
Resolve: func(p graphql.ResolveParams) (interface{}, error) {
57-
srvs, err := servicesFromResolveParams(p)
58+
srvs, err := util.ServicesFromResolveParams(p)
5859
if err != nil {
5960
return nil, err
6061
}
6162

62-
username, err := fieldFromArgs[string](p.Args, "username")
63+
username, err := util.FieldFromArgs[string](p.Args, "username")
6364
if err != nil {
6465
return nil, err
6566
}
6667

67-
password, err := fieldFromArgs[string](p.Args, "password")
68+
password, err := util.FieldFromArgs[string](p.Args, "password")
6869
if err != nil {
6970
return nil, err
7071
}
@@ -82,7 +83,7 @@ var UsersField = &graphql.Field{
8283
Name: "Users",
8384
Type: graphql.NewList(types.UserType),
8485
Resolve: func(p graphql.ResolveParams) (interface{}, error) {
85-
srvs, err := servicesFromResolveParams(p)
86+
srvs, err := util.ServicesFromResolveParams(p)
8687
if err != nil {
8788
return nil, err
8889
}

domain/gql/fields/util.go renamed to domain/gql/util/util.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package fields
1+
package util
22

33
import (
44
"errors"
@@ -8,7 +8,7 @@ import (
88
"github.com/chris-ramon/golang-scaffolding/domain/internal/services"
99
)
1010

11-
func servicesFromResolveParams(p graphql.ResolveParams) (*services.Services, error) {
11+
func ServicesFromResolveParams(p graphql.ResolveParams) (*services.Services, error) {
1212
rootValue := p.Info.RootValue.(map[string]interface{})
1313
srvs, ok := rootValue["services"].(*services.Services)
1414

@@ -19,7 +19,7 @@ func servicesFromResolveParams(p graphql.ResolveParams) (*services.Services, err
1919
return srvs, nil
2020
}
2121

22-
func fieldFromArgs[T any](args map[string]interface{}, fieldName string) (T, error) {
22+
func FieldFromArgs[T any](args map[string]interface{}, fieldName string) (T, error) {
2323
field, ok := args[fieldName].(T)
2424

2525
if !ok {

0 commit comments

Comments
 (0)