fix: handle multiple filter values for same field in $or queries (#1186)

* test: add e2e test for account_array column error with $or filter

This test reproduces a bug where using $or with both exact addresses
and partial addresses combined with PIT causes "column account_array
does not exist" SQL error.

The bug occurs because validateFilters only stores ONE value per field
name, so the last address in the $or iteration overwrites previous ones.

* fix: handle multiple filter values for same field in $or queries

The validateFilters function was storing only ONE value per field name,
causing issues when using $or with multiple address filters.

When the iteration order made an exact address the last one processed,
needAddressSegments became false, but ResolveFilter still generated
filters on account_array for partial addresses, causing SQL error
"column account_array does not exist".

Changes:
- Change filters map from map[string]any to map[string][]any
- Modify validateFilters to append values instead of overwriting
- Modify UseFilter to return true if at least one value matches

* test: add e2e test for aggregated balances with $or filter

This test covers the same bug pattern as volumes: using $or with
both exact addresses and partial addresses combined with PIT could
cause "column accounts_address_array does not exist" error.

Author: flemzord

internal/storage/common/resource.go

@@ -73,21 +73,32 @@ func (s EntitySchema) GetFieldByNameOrAlias(name string) (string, *Field) {
 
 type RepositoryHandlerBuildContext[Opts any] struct {
 	ResourceQuery[Opts]
-	filters map[string]any
+	filters map[string][]any
 }
 
 func (ctx RepositoryHandlerBuildContext[Opts]) UseFilter(v string, matchers ...func(value any) bool) bool {
-	value, ok := ctx.filters[v]
+	values, ok := ctx.filters[v]
 	if !ok {
 		return false
 	}
-	for _, matcher := range matchers {
-		if !matcher(value) {
-			return false
+	if len(matchers) == 0 {
+		return true
+	}
+	// Return true if at least one value matches all matchers
+	for _, value := range values {
+		allMatch := true
+		for _, matcher := range matchers {
+			if !matcher(value) {
+				allMatch = false
+				break
+			}
+		}
+		if allMatch {
+			return true
 		}
 	}
 
-	return true
+	return false
 }
 
 type RepositoryHandler[Opts any] interface {
@@ -102,12 +113,12 @@ type ResourceRepository[ResourceType, OptionsType any] struct {
 	resourceHandler RepositoryHandler[OptionsType]
 }
 
-func (r *ResourceRepository[ResourceType, OptionsType]) validateFilters(builder query.Builder) (map[string]any, error) {
+func (r *ResourceRepository[ResourceType, OptionsType]) validateFilters(builder query.Builder) (map[string][]any, error) {
 	if builder == nil {
 		return nil, nil
 	}
 
-	ret := make(map[string]any)
+	ret := make(map[string][]any)
 	properties := r.resourceHandler.Schema().Fields
 	if err := builder.Walk(func(operator string, key string, value any) (err error) {
 
@@ -128,7 +139,7 @@ func (r *ResourceRepository[ResourceType, OptionsType]) validateFilters(builder
 				return NewErrInvalidQuery("invalid value '%v' for property '%s': %s", value, name, err)
 			}
 
-			ret[name] = value
+			ret[name] = append(ret[name], value)
 
 			return nil
 		}

test/e2e/api_balances_aggregated_test.go

@@ -213,5 +213,36 @@ var _ = Context("Ledger engine tests", func() {
 
 			Expect(response.V2AggregateBalancesResponse.Data).To(HaveLen(0))
 		})
+		// Test case to reproduce bug: column "accounts_address_array" does not exist
+		// This happens when using $or with both exact addresses AND partial addresses with PIT
+		It("should be ok when aggregating with PIT and $or filter mixing exact and partial addresses", func(specContext SpecContext) {
+			// This test reproduces the same bug as in volumes:
+			// Using $or with exact addresses and partial addresses combined with PIT
+			// could cause "column accounts_address_array does not exist" error
+			response, err := Wait(specContext, DeferClient(testServer)).Ledger.V2.GetBalancesAggregated(
+				ctx,
+				operations.V2GetBalancesAggregatedRequest{
+					Ledger: "default",
+					Pit:    pointer.For(now),
+					RequestBody: map[string]interface{}{
+						"$or": []any{
+							map[string]any{
+								"$match": map[string]any{
+									"address": "bank:", // partial address - requires accounts_address_array
+								},
+							},
+							map[string]any{
+								"$match": map[string]any{
+									"address": "world", // exact address - does NOT require accounts_address_array
+								},
+							},
+						},
+					},
+				},
+			)
+			Expect(err).ToNot(HaveOccurred())
+			// bank1 + bank2 + world all have USD/2, total should be aggregated
+			Expect(response.V2AggregateBalancesResponse.Data).To(HaveLen(1))
+		})
 	})
 })

test/e2e/api_volumes_test.go

@@ -296,4 +296,42 @@ var _ = Context("Ledger accounts list API tests", func() {
 			}
 		})
 	})
+
+	// Test case to reproduce bug: column "account_array" does not exist (SQLSTATE 42703)
+	// This happens when using $or with both exact addresses AND partial addresses with PIT
+	When("Get volumes with PIT and $or filter mixing exact and partial addresses", func() {
+		It("should not fail with account_array column error", func(specContext SpecContext) {
+			// This test reproduces the bug where using $or with:
+			// - exact addresses (e.g., "account:user1")
+			// - partial addresses (e.g., "account:")
+			// combined with PIT causes "column account_array does not exist" error
+			//
+			// The bug occurs because validateFilters only stores ONE value per field name,
+			// so if the last address in the $or is exact, needAddressSegments becomes false,
+			// but ResolveFilter still generates filters on account_array for partial addresses.
+			response, err := Wait(specContext, DeferClient(testServer)).Ledger.V2.GetVolumesWithBalances(
+				ctx,
+				operations.V2GetVolumesWithBalancesRequest{
+					EndTime: pointer.For(now),
+					RequestBody: map[string]interface{}{
+						"$or": []any{
+							map[string]any{
+								"$match": map[string]any{
+									"account": "account:", // partial address - requires account_array
+								},
+							},
+							map[string]any{
+								"$match": map[string]any{
+									"account": "bank", // exact address - does NOT require account_array
+								},
+							},
+						},
+					},
+					Ledger: "default",
+				},
+			)
+			Expect(err).ToNot(HaveOccurred())
+			Expect(response.V2VolumesWithBalanceCursorResponse.Cursor.Data).To(HaveLen(3)) // account:user1, account:user2, bank
+		})
+	})
 })