fix(gql): gql time marshaler

Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>
berty · Dec 11, 2018 · 0f0673c · 0f0673c
1 parent 02b784e
commit 0f0673c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/core/api/node/graphql/models/scalar.go b/core/api/node/graphql/models/scalar.go
@@ -72,7 +72,9 @@ func UnmarshalString(v interface{}) (string, error) {
 }
 
 func MarshalTime(t time.Time) graphql.Marshaler {
-	return graphql.MarshalTime(t)
+	return graphql.WriterFunc(func(w io.Writer) {
+		io.WriteString(w, strconv.Quote(t.String()))
+	})
 }
 
 func UnmarshalTime(v interface{}) (time.Time, error) {
@@ -84,9 +86,9 @@ func UnmarshalTime(v interface{}) (time.Time, error) {
 		if len(v) == 0 {
 			return time.Time{}, nil
 		}
-		return graphql.UnmarshalTime(v)
+		return time.Parse(time.RFC3339Nano, v)
 	default:
-		return graphql.UnmarshalTime(v)
+		return time.Time{}, errors.New("time should be RFC3339Nano formatted string")
 	}
 	return graphql.UnmarshalTime(v)
 }

diff --git a/core/api/node/graphql/resolver.go b/core/api/node/graphql/resolver.go
@@ -349,9 +349,9 @@ func (r *queryResolver) EventList(ctx context.Context, filter *p2p.Event, rawOnl
 		case "", "id":
 			cursor = n.ID
 		case "created_at":
-			cursor = n.CreatedAt.String()
+			cursor = n.CreatedAt.Format(time.RFC3339Nano)
 		case "updated_at":
-			cursor = n.UpdatedAt.String()
+			cursor = n.UpdatedAt.Format(time.RFC3339Nano)
 		}
 
 		output.Edges = append(output.Edges, &node.EventEdge{
@@ -432,9 +432,9 @@ func (r *queryResolver) ContactList(ctx context.Context, filter *entity.Contact,
 		case "", "id":
 			cursor = n.ID
 		case "created_at":
-			cursor = n.CreatedAt.String()
+			cursor = n.CreatedAt.Format(time.RFC3339Nano)
 		case "updated_at":
-			cursor = n.UpdatedAt.String()
+			cursor = n.UpdatedAt.Format(time.RFC3339Nano)
 		}
 
 		output.Edges = append(output.Edges, &node.ContactEdge{
@@ -503,9 +503,9 @@ func (r *queryResolver) ConversationList(ctx context.Context, filter *entity.Con
 		case "", "id":
 			cursor = n.ID
 		case "created_at":
-			cursor = n.CreatedAt.String()
+			cursor = n.CreatedAt.Format(time.RFC3339Nano)
 		case "updated_at":
-			cursor = n.UpdatedAt.String()
+			cursor = n.UpdatedAt.Format(time.RFC3339Nano)
 		}
 
 		output.Edges = append(output.Edges, &node.ConversationEdge{