fix: allow checkpoint to be optional

db/deals.go

@@ -43,7 +43,7 @@ type FilterOptions struct {
 	Checkpoint   *string
 	IsOffline    *bool
 	TransferType *string
-	VerifiedDeal *bool
+	IsVerified   *bool
 }
 
 func (d *DealsDB) newDealDef(deal *types.ProviderDealState) *dealAccessor {
@@ -323,9 +323,9 @@ func withSearchFilter(filter FilterOptions) (string, []interface{}) {
 		whereArgs = append(whereArgs, *filter.TransferType)
 	}
 
-	if filter.VerifiedDeal != nil {
+	if filter.IsVerified != nil {
 		statements = append(statements, "VerifiedDeal = ?")
-		whereArgs = append(whereArgs, *filter.VerifiedDeal)
+		whereArgs = append(whereArgs, *filter.IsVerified)
 	}
 
 	if len(statements) == 0 {

db/deals_test.go

@@ -28,9 +28,9 @@ func ToFilterOptions(filters map[string]interface{}) *FilterOptions {
 	if ok {
 		filter.TransferType = &tt
 	}
-	vd, ok := filters["VerifiedDeal"].(bool)
+	vd, ok := filters["IsVerified"].(bool)
 	if ok {
-		filter.VerifiedDeal = &vd
+		filter.IsVerified = &vd
 	}
 
 	return filter

gql/resolver.go

@@ -115,7 +115,7 @@ type filterArgs struct {
 	Checkpoint   gqltypes.Checkpoint
 	IsOffline    graphql.NullBool
 	TransferType graphql.NullString
-	VerifiedDeal graphql.NullBool
+	IsVerified   graphql.NullBool
 }
 
 type dealsArgs struct {
@@ -143,11 +143,14 @@ func (r *resolver) Deals(ctx context.Context, args dealsArgs) (*dealListResolver
 		query = *args.Query.Value
 	}
 
-	filter := &db.FilterOptions{
-		Checkpoint:   &args.Filter.Checkpoint.String,
-		IsOffline:    args.Filter.IsOffline.Value,
-		TransferType: args.Filter.TransferType.Value,
-		VerifiedDeal: args.Filter.VerifiedDeal.Value,
+	var filter *db.FilterOptions
+	if args.Filter != nil {
+		filter = &db.FilterOptions{
+			Checkpoint:   args.Filter.Checkpoint.Value,
+			IsOffline:    args.Filter.IsOffline.Value,
+			TransferType: args.Filter.TransferType.Value,
+			IsVerified:   args.Filter.IsVerified.Value,
+		}
 	}
 
 	deals, count, more, err := r.dealList(ctx, query, filter, args.Cursor, offset, limit)

gql/schema.graphql

@@ -395,10 +395,10 @@ input StorageAskUpdate {
 }
 
 input DealFilter {
-  Checkpoint: Checkpoint!
+  Checkpoint: Checkpoint
   IsOffline: Boolean
   TransferType: String
-  VerifiedDeal: Boolean
+  IsVerified: Boolean
 }
 
 type RootQuery {

gql/types/checkpoint.go

@@ -1,13 +1,15 @@
 package types
 
 import (
+	"encoding/json"
 	"fmt"
 
 	"github.com/filecoin-project/boost/storagemarket/types/dealcheckpoints"
 )
 
 type Checkpoint struct {
-	String string
+	Value *string
+	Set   bool
 }
 
 // ImplementsGraphQLType maps this custom Go type
@@ -20,17 +22,32 @@ func (Checkpoint) ImplementsGraphQLType(name string) bool {
 //
 // This function will be called whenever you use the
 // Checkpoint scalar as an input
-func (n *Checkpoint) UnmarshalGraphQL(input interface{}) error {
-	cp, err := dealcheckpoints.FromString(input.(string))
-	n.String = cp.String()
-	return err
+func (cp *Checkpoint) UnmarshalGraphQL(input interface{}) error {
+	cp.Set = true
+
+	if input == nil {
+		return nil
+	}
+
+	switch v := input.(type) {
+	case string:
+		_, err := dealcheckpoints.FromString(input.(string))
+		if err != nil {
+			return fmt.Errorf("invalid Checkpoint value: %T", v)
+		}
+		cp.Value = &v
+		return nil
+	default:
+		return fmt.Errorf("wrong type for Checkpoint: %T", v)
+	}
 }
 
 // MarshalJSON is a custom marshaler for Checkpoint
 //
 // This function will be called whenever you
 // query for fields that use the Checkpoint type
-func (n Checkpoint) MarshalJSON() ([]byte, error) {
-	json := fmt.Sprintf(`{"__typename": "Checkpoint", "n": "%s"}`, n.String)
-	return []byte(json), nil
+func (cp Checkpoint) MarshalJSON() ([]byte, error) {
+	return json.Marshal(*cp.Value)
 }
+
+func (cp *Checkpoint) Nullable() {}