chore: review comments

Author: tothandras

api/spec/packages/aip/src/common/parameters.tsp

@@ -132,28 +132,24 @@ model StringFieldFilterExact {
   "x-go-type-import",
   #{ path: "github.com/openmeterio/openmeter/api/v3/filters" }
 )
-model DateTimeFieldFilter {
-  /** Value strictly equals given RFC-3339 formatted timestamp in UTC. */
-  eq?: Shared.DateTime;
-
-  /** Value does not equal the given RFC-3339 formatted timestamp in UTC. */
-  neq?: Shared.DateTime;
-
-  /** Returns entities that match any of the comma-delimited RFC-3339 formatted timestamps. */
-  @encode(ArrayEncoding.commaDelimited)
-  oeq?: Shared.DateTime[];
+union DateTimeFieldFilter {
+  string: string,
+  object: {
+    /** Value strictly equals given RFC-3339 formatted timestamp in UTC. */
+    eq?: Shared.DateTime,
 
-  /** Value is less than the given RFC-3339 formatted timestamp in UTC. */
-  lt?: Shared.DateTime;
+    /** Value is less than the given RFC-3339 formatted timestamp in UTC. */
+    lt?: Shared.DateTime,
 
-  /** Value is less than or equal to the given RFC-3339 formatted timestamp in UTC. */
-  lte?: Shared.DateTime;
+    /** Value is less than or equal to the given RFC-3339 formatted timestamp in UTC. */
+    lte?: Shared.DateTime,
 
-  /** Value is greater than the given RFC-3339 formatted timestamp in UTC. */
-  gt?: Shared.DateTime;
+    /** Value is greater than the given RFC-3339 formatted timestamp in UTC. */
+    gt?: Shared.DateTime,
 
-  /** Value is greater than or equal to the given RFC-3339 formatted timestamp in UTC. */
-  gte?: Shared.DateTime;
+    /** Value is greater than or equal to the given RFC-3339 formatted timestamp in UTC. */
+    gte?: Shared.DateTime,
+  },
 }
 
 /**

api/v3/api.gen.go

@@ -12,14 +12,14 @@ import (
 // ConvertFilterString converts an API FilterString to the internal filter.FilterString.
 func ConvertFilterString(f FilterString) filter.FilterString {
 	out := filter.FilterString{
-		Eq:        f.Eq,
-		Ne:        f.Neq,
-		Exists:    f.Exists,
-		Contains:  f.Contains,
-		Gt:        f.Gt,
-		Gte:       f.Gte,
-		Lt:        f.Lt,
-		Lte:       f.Lte,
+		Eq:       f.Eq,
+		Ne:       f.Neq,
+		Exists:   f.Exists,
+		Contains: f.Contains,
+		Gt:       f.Gt,
+		Gte:      f.Gte,
+		Lt:       f.Lt,
+		Lte:      f.Lte,
 	}
 
 	if len(f.Oeq) > 0 {
@@ -138,8 +138,7 @@ func ConvertFilterDateTime(f FilterDateTime) (filter.FilterTime, error) {
 		if err != nil {
 			return out, fmt.Errorf("filter eq: %w", err)
 		}
-		// FilterTime has no Eq; use Gte as the closest approximation.
-		out.Gte = &t
+		out.Eq = &t
 	}
 
 	if f.Gt != nil {

api/v3/filters/convert.go

@@ -116,6 +116,16 @@ func TestConvertFilterNumeric(t *testing.T) {
 }
 
 func TestConvertFilterDateTime(t *testing.T) {
+	t.Run("eq maps to filter.FilterTime Eq", func(t *testing.T) {
+		out, err := ConvertFilterDateTime(FilterDateTime{
+			Eq: lo.ToPtr("2024-06-15T12:00:00Z"),
+		})
+		require.NoError(t, err)
+		require.NotNil(t, out.Eq)
+		assert.Equal(t, time.Date(2024, 6, 15, 12, 0, 0, 0, time.UTC), *out.Eq)
+		assert.Nil(t, out.Gte, "eq must not fall back to Gte")
+	})
+
 	t.Run("gt and lt", func(t *testing.T) {
 		out, err := ConvertFilterDateTime(FilterDateTime{
 			Gt: lo.ToPtr("2024-01-01T00:00:00Z"),
@@ -126,11 +136,26 @@ func TestConvertFilterDateTime(t *testing.T) {
 		assert.Equal(t, time.Date(2024, 12, 31, 23, 59, 59, 0, time.UTC), *out.Lt)
 	})
 
+	t.Run("gte and lte", func(t *testing.T) {
+		out, err := ConvertFilterDateTime(FilterDateTime{
+			Gte: lo.ToPtr("2024-01-01T00:00:00Z"),
+			Lte: lo.ToPtr("2024-12-31T23:59:59Z"),
+		})
+		require.NoError(t, err)
+		assert.Equal(t, time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC), *out.Gte)
+		assert.Equal(t, time.Date(2024, 12, 31, 23, 59, 59, 0, time.UTC), *out.Lte)
+	})
+
 	t.Run("invalid timestamp returns error", func(t *testing.T) {
 		_, err := ConvertFilterDateTime(FilterDateTime{Gt: lo.ToPtr("not-a-date")})
 		require.Error(t, err)
 	})
 
+	t.Run("invalid eq timestamp returns error", func(t *testing.T) {
+		_, err := ConvertFilterDateTime(FilterDateTime{Eq: lo.ToPtr("not-a-date")})
+		require.Error(t, err)
+	})
+
 	t.Run("nil returns nil", func(t *testing.T) {
 		out, err := ConvertFilterDateTimePtr(nil)
 		require.NoError(t, err)

api/v3/filters/convert_test.go

@@ -129,12 +129,6 @@ type FilterDateTime struct {
 	// Eq requires the field to match the provided value exactly.
 	Eq *string `json:"eq,omitempty"`
 
-	// Neq requires the field to not match the provided value.
-	Neq *string `json:"neq,omitempty"`
-
-	// Oeq requires the field to match any of the provided comma-separated values.
-	Oeq []string `json:"oeq,omitempty"`
-
 	// Gt requires the field to be greater than the provided value.
 	Gt *string `json:"gt,omitempty"`
 
@@ -151,8 +145,6 @@ type FilterDateTime struct {
 // IsEmpty returns true if no filter operator is set.
 func (f FilterDateTime) IsEmpty() bool {
 	return f.Eq == nil &&
-		f.Neq == nil &&
-		len(f.Oeq) == 0 &&
 		f.Gt == nil &&
 		f.Gte == nil &&
 		f.Lt == nil &&
@@ -167,8 +159,6 @@ func (f FilterDateTime) Validate(ctx context.Context, field string) error {
 
 	return validateMutuallyExclusiveFilters(ctx, field,
 		f.Eq != nil,
-		f.Neq != nil,
-		len(f.Oeq) > 0,
 		f.Gt != nil,
 		f.Gte != nil,
 		f.Lt != nil,