feat: filters for tags

kubeshop · Aug 9, 2024 · 84cbc6c · 84cbc6c
1 parent e4d0708
commit 84cbc6c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/pkg/repository/testworkflow/filter.go b/pkg/repository/testworkflow/filter.go
@@ -16,10 +16,12 @@ type FilterImpl struct {
 	FPageSize   int
 	FTextSearch string
 	FSelector   string
+	FRunnerIds  []string
+	FTags       map[string]string
 }
 
 func NewExecutionsFilter() *FilterImpl {
-	result := FilterImpl{FPage: 0, FPageSize: PageDefaultLimit}
+	result := FilterImpl{FPage: 0, FPageSize: PageDefaultLimit, FTags: make(map[string]string)}
 	return &result
 }
 
@@ -130,3 +132,11 @@ func (f FilterImpl) TextSearch() string {
 func (f FilterImpl) Selector() string {
 	return f.FSelector
 }
+
+func (f FilterImpl) RunnerIds() []string {
+	return f.FRunnerIds
+}
+
+func (f FilterImpl) Tags() map[string]string {
+	return f.FTags
+}
diff --git a/pkg/repository/testworkflow/interface.go b/pkg/repository/testworkflow/interface.go
@@ -26,6 +26,8 @@ type Filter interface {
 	TextSearchDefined() bool
 	TextSearch() string
 	Selector() string
+	RunnerIds() []string
+	Tags() map[string]string
 }
 
 //go:generate mockgen -destination=./mock_repository.go -package=testworkflow "github.com/kubeshop/testkube/pkg/repository/testworkflow" Repository

diff --git a/pkg/repository/testworkflow/mongo.go b/pkg/repository/testworkflow/mongo.go
@@ -360,6 +360,17 @@ func composeQueryAndOpts(filter Filter) (bson.M, *options.FindOptions) {
 		}
 	}
 
+	if len(filter.RunnerIds()) > 0 {
+		query["runningcontext.runnerids"] = bson.M{"$in": filter.RunnerIds()}
+	}
+
+	// this one needs wildard index or changing the model to {k:X v:Y}
+	if len(filter.Tags()) > 0 {
+		for k, v := range filter.Tags() {
+			query["runningcontext.tags."+k] = v
+		}
+	}
+
 	opts.SetSkip(int64(filter.Page() * filter.PageSize()))
 	opts.SetLimit(int64(filter.PageSize()))
 	opts.SetSort(bson.D{{Key: "scheduledat", Value: -1}})