From 36939ffc59769ede6802ab8cdbcae7da0a214c90 Mon Sep 17 00:00:00 2001
From: Gisle Aune <dev@gisle.me>
Date: Sat, 14 Jul 2018 19:14:56 +0200
Subject: [PATCH] Moved SessionResolver and UserResolver into resolvers/types
 package, updated references to it.

---
 resolver/session.go          | 26 +++++++-------------------
 resolver/types/session.go    | 16 ++++++++++++++++
 resolver/{ => types}/user.go |  2 +-
 3 files changed, 24 insertions(+), 20 deletions(-)
 create mode 100644 resolver/types/session.go
 rename resolver/{ => types}/user.go (95%)

diff --git a/resolver/session.go b/resolver/session.go
index 08f3a6d..28465bf 100644
--- a/resolver/session.go
+++ b/resolver/session.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"git.aiterp.net/rpdata/api/internal/session"
+	"git.aiterp.net/rpdata/api/resolver/types"
 )
 
 // LoginArgs is args
@@ -13,12 +14,12 @@ type LoginArgs struct {
 }
 
 // Session resolves query.session
-func (r *QueryResolver) Session(ctx context.Context) (*SessionResolver, error) {
-	return &SessionResolver{S: session.FromContext(ctx)}, nil
+func (r *QueryResolver) Session(ctx context.Context) (*types.SessionResolver, error) {
+	return &types.SessionResolver{S: session.FromContext(ctx)}, nil
 }
 
 // Login resolves mutation.login
-func (r *MutationResolver) Login(ctx context.Context, args *LoginArgs) (*SessionResolver, error) {
+func (r *MutationResolver) Login(ctx context.Context, args *LoginArgs) (*types.SessionResolver, error) {
 	session := session.FromContext(ctx)
 
 	err := session.Login(args.Username, args.Password)
@@ -26,26 +27,13 @@ func (r *MutationResolver) Login(ctx context.Context, args *LoginArgs) (*Session
 		return nil, err
 	}
 
-	return &SessionResolver{S: session}, nil
+	return &types.SessionResolver{S: session}, nil
 }
 
 // Logout resolves mutation.logout
-func (r *MutationResolver) Logout(ctx context.Context) (*SessionResolver, error) {
+func (r *MutationResolver) Logout(ctx context.Context) (*types.SessionResolver, error) {
 	session := session.FromContext(ctx)
 	session.Logout()
 
-	return &SessionResolver{S: session}, nil
-}
-
-// SessionResolver resolves Session
-type SessionResolver struct{ S *session.Session }
-
-// User resolves Session.user
-func (r *SessionResolver) User() *UserResolver {
-	user := r.S.User()
-	if user == nil {
-		return nil
-	}
-
-	return &UserResolver{U: user}
+	return &types.SessionResolver{S: session}, nil
 }
diff --git a/resolver/types/session.go b/resolver/types/session.go
new file mode 100644
index 0000000..8e95255
--- /dev/null
+++ b/resolver/types/session.go
@@ -0,0 +1,16 @@
+package types
+
+import "git.aiterp.net/rpdata/api/internal/session"
+
+// SessionResolver resolves Session
+type SessionResolver struct{ S *session.Session }
+
+// User resolves Session.user
+func (r *SessionResolver) User() *UserResolver {
+	user := r.S.User()
+	if user == nil {
+		return nil
+	}
+
+	return &UserResolver{U: user}
+}
diff --git a/resolver/user.go b/resolver/types/user.go
similarity index 95%
rename from resolver/user.go
rename to resolver/types/user.go
index 84bcdd0..290cbfe 100644
--- a/resolver/user.go
+++ b/resolver/types/user.go
@@ -1,4 +1,4 @@
-package resolver
+package types
 
 import "git.aiterp.net/rpdata/api/internal/session"