Add filters for dataversions

internal/graph/convert.go

@@ -6,31 +6,36 @@ import (
 	"github.com/DIMO-Network/fetch-api/pkg/eventrepo"
 	"github.com/DIMO-Network/fetch-api/pkg/grpc"
 	"google.golang.org/protobuf/types/known/timestamppb"
-	"google.golang.org/protobuf/types/known/wrapperspb"
 )
 
-// filterToSearchOptions converts GraphQL filter and tokenID to grpc.SearchOptions.
-func filterToSearchOptions(filter *model.CloudEventFilter, subject cloudevent.ERC721DID) *grpc.SearchOptions {
-	opts := &grpc.SearchOptions{
-		Subject: &wrapperspb.StringValue{Value: subject.String()},
+// filterToAdvancedSearchOptions converts a GraphQL filter and subject DID to grpc.AdvancedSearchOptions.
+func filterToAdvancedSearchOptions(filter *model.CloudEventFilter, subject cloudevent.ERC721DID) *grpc.AdvancedSearchOptions {
+	opts := &grpc.AdvancedSearchOptions{
+		Subject: &grpc.StringFilterOption{In: []string{subject.String()}},
 	}
 	if filter == nil {
 		return opts
 	}
 	if filter.ID != nil {
-		opts.Id = &wrapperspb.StringValue{Value: *filter.ID}
+		opts.Id = &grpc.StringFilterOption{In: []string{*filter.ID}}
 	}
 	if filter.Type != nil {
-		opts.Type = &wrapperspb.StringValue{Value: *filter.Type}
+		opts.Type = &grpc.StringFilterOption{In: []string{*filter.Type}}
 	}
+	// dataversion (exact) and dataversions (list) are merged into a single In filter.
+	var dvIn []string
 	if filter.Dataversion != nil {
-		opts.DataVersion = &wrapperspb.StringValue{Value: *filter.Dataversion}
+		dvIn = append(dvIn, *filter.Dataversion)
+	}
+	dvIn = append(dvIn, filter.Dataversions...)
+	if len(dvIn) > 0 {
+		opts.DataVersion = &grpc.StringFilterOption{In: dvIn}
 	}
 	if filter.Source != nil {
-		opts.Source = &wrapperspb.StringValue{Value: *filter.Source}
+		opts.Source = &grpc.StringFilterOption{In: []string{*filter.Source}}
 	}
 	if filter.Producer != nil {
-		opts.Producer = &wrapperspb.StringValue{Value: *filter.Producer}
+		opts.Producer = &grpc.StringFilterOption{In: []string{*filter.Producer}}
 	}
 	if filter.Before != nil {
 		opts.Before = timestamppb.New(*filter.Before)
@@ -41,6 +46,7 @@ func filterToSearchOptions(filter *model.CloudEventFilter, subject cloudevent.ER
 	return opts
 }
 
+
 const defaultLimit = 10
 
 // Preallocated empty slices for list resolvers to avoid allocating on sql.ErrNoRows.

internal/graph/resolver.go

@@ -47,14 +47,14 @@ func CheckVehicleRawDataByDID(ctx context.Context, did string) error {
 	return nil
 }
 
-// requireVehicleOptsByDID validates access by DID and returns search options for the vehicle.
-func (r *queryResolver) requireVehicleOptsByDID(ctx context.Context, did string, filter *model.CloudEventFilter) (*grpc.SearchOptions, error) {
+// requireVehicleOptsByDID validates access by DID and returns advanced search options for the vehicle.
+func (r *queryResolver) requireVehicleOptsByDID(ctx context.Context, did string, filter *model.CloudEventFilter) (*grpc.AdvancedSearchOptions, error) {
 	if err := CheckVehicleRawDataByDID(ctx, did); err != nil {
 		return nil, err
 	}
 	subject, err := cloudevent.DecodeERC721DID(did)
 	if err != nil {
 		return nil, fmt.Errorf("invalid DID: %w", err)
 	}
-	return filterToSearchOptions(filter, subject), nil
+	return filterToAdvancedSearchOptions(filter, subject), nil
 }

internal/graph/resolver_test.go

@@ -103,7 +103,7 @@ func TestRequireVehicleOptsByDID(t *testing.T) {
 		require.NoError(t, err)
 		require.NotNil(t, opts)
 		require.NotNil(t, opts.Subject)
-		assert.Equal(t, didStr, opts.Subject.Value)
+		assert.Equal(t, []string{didStr}, opts.Subject.In)
 	})
 
 	t.Run("applies filter to search options", func(t *testing.T) {
@@ -122,8 +122,8 @@ func TestRequireVehicleOptsByDID(t *testing.T) {
 		require.NoError(t, err)
 		require.NotNil(t, opts)
 		require.NotNil(t, opts.Type)
-		assert.Equal(t, "dimo.status", opts.Type.Value)
-		assert.Equal(t, didStr, opts.Subject.Value)
+		assert.Equal(t, []string{"dimo.status"}, opts.Type.In)
+		assert.Equal(t, []string{didStr}, opts.Subject.In)
 	})
 
 	t.Run("unauthorized when token does not match DID", func(t *testing.T) {

schema/base.graphqls

@@ -72,12 +72,14 @@ type CloudEventIndex {
 }
 
 """
-Filter for cloud event queries. 
+Filter for cloud event queries.
 """
 input CloudEventFilter {
   id: String
   type: String
   dataversion: String
+  """Filter by one or more dataversion values (OR logic)."""
+  dataversions: [String!]
   source: String
   producer: String
   before: Time