Skip to content

Handle team filters for empty search #489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rbjornstad merged 1 commit into from
Jul 3, 2026
Merged

Handle team filters for empty search #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions internal/search/bleve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"github.com/nais/api/internal/graph/pagination"
"github.com/nais/api/internal/search/bleveext"
"github.com/nais/api/internal/search/searchsql"
"github.com/nais/api/internal/slug"
"github.com/sirupsen/logrus"
)

Expand Down Expand Up @@ -185,17 +186,13 @@ func (b *bleveSearcher) Search(ctx context.Context, page *pagination.Pagination,
term,
))
} else {
if len(slugs) == 0 {
if len(filter.Teams) > 0 {
queries = append(queries, teamDisjunctionQuery(filter.Teams))
} else if len(slugs) == 0 {
return pagination.NewConnection([]SearchNode{}, page, 0), nil
} else {
queries = append(queries, teamDisjunctionQuery(slugs))
}

userTeamsQuery := bleve.NewDisjunctionQuery()
for _, team := range slugs {
teamQ := bleve.NewTermQuery(team.String())
teamQ.FieldVal = "team"
userTeamsQuery.AddQuery(teamQ)
}
queries = append(queries, userTeamsQuery)
}

if len(filter.Types) > 0 {
Expand All @@ -208,20 +205,14 @@ func (b *bleveSearcher) Search(ctx context.Context, page *pagination.Pagination,
queries = append(queries, typesQuery)
}

if len(filter.Teams) > 0 {
teamQuery := bleve.NewDisjunctionQuery()
for _, team := range filter.Teams {
teamQ := bleve.NewTermQuery(team.String())
teamQ.FieldVal = "team"
teamQuery.AddQuery(teamQ)
}
queries = append(queries, teamQuery)
if filter.Query != "" && len(filter.Teams) > 0 {
queries = append(queries, teamDisjunctionQuery(filter.Teams))
}

var q query.Query = bleve.NewConjunctionQuery(queries...)

filteredByTeamOnly := len(filter.Types) == 1 && slices.Contains(filter.Types, "TEAM")
if len(slugs) > 0 && !filteredByTeamOnly {
if !filteredByTeamOnly && (len(slugs) > 0 || filter.Query == "") {
teamSlugs := make([]string, 0, len(slugs))
for _, slug := range slugs {
teamSlugs = append(teamSlugs, slug.String())
Expand Down Expand Up @@ -320,3 +311,13 @@ func defaultSearchKindBoost(kind SearchType) float64 {
return 1
}
}

func teamDisjunctionQuery(teams []slug.Slug) query.Query {
teamQuery := bleve.NewDisjunctionQuery()
for _, team := range teams {
teamQ := bleve.NewTermQuery(team.String())
teamQ.FieldVal = "team"
teamQuery.AddQuery(teamQ)
}
return teamQuery
}
62 changes: 62 additions & 0 deletions internal/search/bleve_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,68 @@ func TestSearchEmptyQueryAppliesTeamFilterWithinUserTeams(t *testing.T) {
assertSameElements(t, want, got)
}

func TestSearchEmptyQueryUsesTeamFilterAsScope(t *testing.T) {
searcher := newTestSearcher(t, []slug.Slug{"team-a"}, []Document{
newTestDocument("team-a", "TEAM", "team-a"),
newTestDocument("team-b", "TEAM", "team-b"),
newTestDocument("app-a", "APPLICATION", "app-a", withTeam("team-a")),
newTestDocument("app-b", "APPLICATION", "app-b", withTeam("team-b")),
})

result, err := searcher.Search(newTestContext(), newTestPage(t, 10), SearchFilter{
Query: "",
Teams: []slug.Slug{"team-b"},
})
if err != nil {
t.Fatal(err)
}

got := testNodeIDs(result.Nodes())
want := []string{"team-b", "app-b"}
assertSameElements(t, want, got)
}

func TestSearchEmptyQueryWithTeamFilterAppliesTypeFilter(t *testing.T) {
searcher := newTestSearcher(t, nil, []Document{
newTestDocument("team-b", "TEAM", "team-b"),
newTestDocument("app-b", "APPLICATION", "app-b", withTeam("team-b")),
newTestDocument("job-b", "JOB", "job-b", withTeam("team-b")),
})

result, err := searcher.Search(newTestContext(), newTestPage(t, 10), SearchFilter{
Query: "",
Teams: []slug.Slug{"team-b"},
Types: []SearchType{"APPLICATION"},
})
if err != nil {
t.Fatal(err)
}

got := testNodeIDs(result.Nodes())
want := []string{"app-b"}
assertEqual(t, want, got)
}

func TestSearchEmptyQueryWithTeamFilterRanksTeamsFirst(t *testing.T) {
searcher := newTestSearcher(t, nil, []Document{
newTestDocument("app-b", "APPLICATION", "app-b", withTeam("team-b")),
newTestDocument("job-b", "JOB", "job-b", withTeam("team-b")),
newTestDocument("team-b", "TEAM", "team-b"),
})

result, err := searcher.Search(newTestContext(), newTestPage(t, 10), SearchFilter{
Query: "",
Teams: []slug.Slug{"team-b"},
})
if err != nil {
t.Fatal(err)
}

got := testNodeIDs(result.Nodes())
want := []string{"team-b", "app-b", "job-b"}
assertEqual(t, want, got)
}

func TestSearchEmptyQueryWithoutUserTeamsReturnsNoDefaults(t *testing.T) {
searcher := newTestSearcher(t, nil, []Document{
newTestDocument("team-a", "TEAM", "team-a"),
Expand Down
Loading