Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions domain/gql/fields/fields.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

"github.com/chris-ramon/golang-scaffolding/domain/auth/mappers"
"github.com/chris-ramon/golang-scaffolding/domain/gql/types"
"github.com/chris-ramon/golang-scaffolding/domain/gql/util"
usersMappers "github.com/chris-ramon/golang-scaffolding/domain/users/mappers"
"github.com/chris-ramon/golang-scaffolding/pkg/ctxutil"
)
Expand All @@ -21,7 +22,7 @@ var CurrentUserField = &graphql.Field{
Name: "CurrentUser",
Type: types.CurrentUserType,
Resolve: func(p graphql.ResolveParams) (interface{}, error) {
srvs, err := servicesFromResolveParams(p)
srvs, err := util.ServicesFromResolveParams(p)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -54,17 +55,17 @@ var AuthUserField = &graphql.Field{
},
},
Resolve: func(p graphql.ResolveParams) (interface{}, error) {
srvs, err := servicesFromResolveParams(p)
srvs, err := util.ServicesFromResolveParams(p)
if err != nil {
return nil, err
}

username, err := fieldFromArgs[string](p.Args, "username")
username, err := util.FieldFromArgs[string](p.Args, "username")
if err != nil {
return nil, err
}

password, err := fieldFromArgs[string](p.Args, "password")
password, err := util.FieldFromArgs[string](p.Args, "password")
if err != nil {
return nil, err
}
Expand All @@ -82,7 +83,7 @@ var UsersField = &graphql.Field{
Name: "Users",
Type: graphql.NewList(types.UserType),
Resolve: func(p graphql.ResolveParams) (interface{}, error) {
srvs, err := servicesFromResolveParams(p)
srvs, err := util.ServicesFromResolveParams(p)
if err != nil {
return nil, err
}
Expand Down
6 changes: 3 additions & 3 deletions domain/gql/fields/util.go → domain/gql/util/util.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package fields
package util

import (
"errors"
Expand All @@ -8,7 +8,7 @@ import (
"github.com/chris-ramon/golang-scaffolding/domain/internal/services"
)

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

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

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

if !ok {
Expand Down