fix: incorrect join with specific combination of filters

Author: gfyrag

internal/storage/ledger/resource.go

@@ -62,21 +62,27 @@ type filter struct {
 
 type repositoryHandlerBuildContext[Opts any] struct {
 	ledgercontroller.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]
 	if !ok {
 		return false
 	}
+	if len(matchers) == 0 {
+		return true
+	}
+
 	for _, matcher := range matchers {
-		if !matcher(value) {
-			return false
+		for _, v := range value {
+			if matcher(v) {
+				return true
+			}
 		}
 	}
 
-	return true
+	return false
 }
 
 type repositoryHandler[Opts any] interface {
@@ -93,12 +99,12 @@ type resourceRepository[ResourceType, OptionsType any] struct {
 	ledger          ledger.Ledger
 }
 
-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.filters()
 	if err := builder.Walk(func(operator string, key string, value any) (err error) {
 
@@ -129,7 +135,7 @@ func (r *resourceRepository[ResourceType, OptionsType]) validateFilters(builder
 					return err
 				}
 			}
-			ret[property.name] = value
+			ret[property.name] = append(ret[property.name], value)
 			break
 		}
 

test/e2e/api_volumes_test.go

@@ -139,7 +139,7 @@ var _ = Context("Ledger accounts list API tests", func() {
 		})
 	})
 
-	When("Get Volumes and Balances Filter by address account", func() {
+	When("Get volumes and balances filter by partial address account", func() {
 		It("should be ok", func() {
 			response, err := GetVolumesWithBalances(
 				ctx,
@@ -167,6 +167,35 @@ var _ = Context("Ledger accounts list API tests", func() {
 		})
 	})
 
+	When("Get volumes and balances filter by partial account address and full address", func() {
+		It("should be ok", func() {
+			response, err := GetVolumesWithBalances(
+				ctx,
+				testServer.GetValue(),
+				operations.V2GetVolumesWithBalancesRequest{
+					InsertionDate: pointer.For(true),
+					RequestBody: map[string]interface{}{
+						"$or": []map[string]any{
+							{
+								"$match": map[string]any{
+									"account": "account:",
+								},
+							},
+							{
+								"$match": map[string]any{
+									"account": "world",
+								},
+							},
+						},
+					},
+					Ledger: "default",
+				},
+			)
+			Expect(err).ToNot(HaveOccurred())
+			Expect(response.Data).To(HaveLen(3))
+		})
+	})
+
 	When("Get Volumes and Balances Filter by address account a,d and end-time now effective", func() {
 		It("should be ok", func() {
 			response, err := GetVolumesWithBalances(