Add filters for project and tenant labels.

pkg/datastore/memory.go

@@ -70,8 +70,8 @@ func (m *memoryDatastore[E]) DeleteAll(ctx context.Context, ids ...string) error
 }
 
 // Find implements Storage.
-func (m *memoryDatastore[E]) Find(ctx context.Context, filter map[string]any, paging *v1.Paging) ([]E, *uint64, error) {
-	m.log.Debug("find", "entity", m.entity, "filter", filter)
+func (m *memoryDatastore[E]) Find(ctx context.Context, paging *v1.Paging, filters ...any) ([]E, *uint64, error) {
+	m.log.Debug("find", "entity", m.entity, "filter", filters)
 
 	m.lock.Lock()
 	defer m.lock.Unlock()

pkg/datastore/postgres.go

@@ -32,7 +32,7 @@ type Storage[E Entity] interface {
 	Get(ctx context.Context, id string) (E, error)
 	GetHistory(ctx context.Context, id string, at time.Time, ve E) error
 	GetHistoryCreated(ctx context.Context, id string, ve E) error
-	Find(ctx context.Context, filter map[string]any, paging *v1.Paging) ([]E, *uint64, error)
+	Find(ctx context.Context, paging *v1.Paging, filters ...any) ([]E, *uint64, error)
 }
 
 // Entity defines a database entity which is stored in jsonb format and with version information
@@ -370,14 +370,15 @@ func (ds *datastore[E]) DeleteAll(ctx context.Context, ids ...string) error {
 }
 
 // Find returns matching elements from the database
-func (ds *datastore[E]) Find(ctx context.Context, filter map[string]any, paging *v1.Paging) ([]E, *uint64, error) {
-	ds.log.Debug("find", "entity", ds.jsonField, "filter", filter)
+func (ds *datastore[E]) Find(ctx context.Context, paging *v1.Paging, filters ...any) ([]E, *uint64, error) {
+	ds.log.Debug("find", "entity", ds.jsonField, "filters", filters)
 	q := ds.sb.Select(ds.jsonField).
 		From(ds.tableName)
 
-	if len(filter) > 0 {
+	for _, filter := range filters {
 		q = q.Where(filter)
 	}
+
 	q = q.OrderBy("id")
 
 	// Add paging query if paging is defined

pkg/datastore/postgres_benchmark_test.go

@@ -90,7 +90,7 @@ func BenchmarkFindTenant(b *testing.B) {
 		f := make(map[string]any)
 		f["tenant ->> 'name'"] = "tenant-1"
 
-		t, _, err := ds.Find(context.Background(), f, nil)
+		t, _, err := ds.Find(context.Background(), nil, f)
 		require.NoError(b, err)
 		assert.NotNil(b, t)
 		assert.Len(b, t, 1)