Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix(post-filter): harden post filter against edge cases

Adam Kaputaae615eebbc3
diff --git a/app/services/sqlstore/postgres/common.go b/app/services/sqlstore/postgres/common.go
index 49f94fb8c..4729ea014 100644
--- a/app/services/sqlstore/postgres/common.go
+++ b/app/services/sqlstore/postgres/common.go
@@ -2,6 +2,7 @@ package postgres
import (
"context"
+ "fmt"
"net/url"
"regexp"
"strings"
@@ -35,7 +36,7 @@ func MapLocaleToTSConfig(locale string) string {
return enum.MapLocaleToTSConfig(locale)
}
-func getViewData(query query.SearchPosts) (string, []enum.PostStatus, string) {
+func getViewData(query query.SearchPosts, tagsPlaceholder int) (string, []enum.PostStatus, string) {
var (
condition string
sort string
@@ -97,11 +98,14 @@ func getViewData(query query.SearchPosts) (string, []enum.PostStatus, string) {
}
if query.NoTagsOnly {
+ // NoTagsOnly takes precedence: combining "untagged" with specific tag
+ // filters produces contradictory SQL that always returns zero rows.
+ query.Tags = nil
condition += " AND tags = '{}'"
}
if len(query.Tags) > 0 {
- condition += " AND tags && $3"
+ condition += fmt.Sprintf(" AND tags && $%d", tagsPlaceholder)
}
return condition, statusFilters, sort
}
diff --git a/app/services/sqlstore/postgres/post.go b/app/services/sqlstore/postgres/post.go
index 887536026..e88588860 100644
--- a/app/services/sqlstore/postgres/post.go
+++ b/app/services/sqlstore/postgres/post.go
@@ -450,25 +450,30 @@ func searchPosts(ctx context.Context, q *query.SearchPosts) error {
score := fmt.Sprintf("ts_rank_cd(q.search, %s) + ts_rank_cd(q.search, %s)", tsQueryExpr, tsQuerySimple)
- whereParts := fmt.Sprintf(`q.search @@ %s OR q.search @@ %s`, tsQueryExpr, tsQuerySimple)
+ searchPredicate := fmt.Sprintf(`q.search @@ %s OR q.search @@ %s`, tsQueryExpr, tsQuerySimple)
+
+ condition, statuses, _ := getViewData(*q, 4)
+
+ if q.MyPostsOnly && user != nil {
+ condition += " AND user_id = " + strconv.Itoa(user.ID)
+ }
sql := fmt.Sprintf(`
SELECT * FROM (%s) AS q
- WHERE %s
+ WHERE (%s) %s
ORDER BY %s DESC
LIMIT %s
- `, innerQuery, whereParts, score, q.Limit)
- err = trx.Select(&posts, sql, tenant.ID, pq.Array([]enum.PostStatus{
- enum.PostOpen,
- enum.PostStarted,
- enum.PostPlanned,
- enum.PostCompleted,
- enum.PostDeclined,
- }), tsQuery)
+ `, innerQuery, searchPredicate, condition, score, q.Limit)
+
+ params := []interface{}{tenant.ID, pq.Array(statuses), tsQuery}
+ if len(q.Tags) > 0 && !q.NoTagsOnly {
+ params = append(params, pq.Array(q.Tags))
+ }
+ err = trx.Select(&posts, sql, params...)
} else {
- condition, statuses, sort := getViewData(*q)
+ condition, statuses, sort := getViewData(*q, 3)
- if q.MyPostsOnly {
+ if q.MyPostsOnly && user != nil {
condition += " AND user_id = " + strconv.Itoa(user.ID)
}
@@ -479,7 +484,7 @@ func searchPosts(ctx context.Context, q *query.SearchPosts) error {
LIMIT %s
`, innerQuery, condition, sort, q.Limit)
params := []interface{}{tenant.ID, pq.Array(statuses)}
- if len(q.Tags) > 0 {
+ if len(q.Tags) > 0 && !q.NoTagsOnly {
params = append(params, pq.Array(q.Tags))
}
err = trx.Select(&posts, sql, params...)
diff --git a/app/services/sqlstore/postgres/post_test.go b/app/services/sqlstore/postgres/post_test.go
index d59e4d4ed..61d0658e4 100644
--- a/app/services/sqlstore/postgres/post_test.go
+++ b/app/services/sqlstore/postgres/post_test.go
@@ -818,6 +818,113 @@ func TestGetPosts_Different_Statuses(t *testing.T) {
}
+func TestSearchPosts_RespectsFilters(t *testing.T) {
+ SetupDatabaseTest(t)
+ defer TeardownDatabaseTest()
+
+ openPost := &cmd.AddNewPost{Title: "kanban open ticket", Description: "first kanban post"}
+ startedPost := &cmd.AddNewPost{Title: "kanban started flow", Description: "second kanban post"}
+ completedPost := &cmd.AddNewPost{Title: "kanban completed item", Description: "third kanban post"}
+ openByJon := &cmd.AddNewPost{Title: "kanban open from jon", Description: "fourth kanban post"}
+ err := bus.Dispatch(aryaStarkCtx, openPost, completedPost)
+ Expect(err).IsNil()
+ err = bus.Dispatch(jonSnowCtx, startedPost, openByJon)
+ Expect(err).IsNil()
+
+ bus.MustDispatch(aryaStarkCtx,
+ &cmd.SetPostResponse{Post: startedPost.Result, Text: "Working on it", Status: enum.PostStarted},
+ &cmd.SetPostResponse{Post: completedPost.Result, Text: "Done", Status: enum.PostCompleted},
+ )
+
+ addBug := &cmd.AddNewTag{Name: "Bug", Color: "FF0000", IsPublic: true}
+ bus.MustDispatch(aryaStarkCtx, addBug)
+ bus.MustDispatch(aryaStarkCtx, &cmd.AssignTag{Tag: addBug.Result, Post: startedPost.Result})
+
+ bus.MustDispatch(aryaStarkCtx, &cmd.AddVote{Post: openPost.Result, User: aryaStark})
+
+ testCases := []struct {
+ name string
+ searchParams *query.SearchPosts
+ expectedCount int
+ expectedIDs []int
+ }{
+ {
+ name: "Default search excludes Completed and Declined",
+ searchParams: &query.SearchPosts{Query: "kanban"},
+ expectedCount: 3,
+ expectedIDs: []int{openPost.Result.ID, startedPost.Result.ID, openByJon.Result.ID},
+ },
+ {
+ name: "Search with explicit Completed status",
+ searchParams: &query.SearchPosts{
+ Query: "kanban",
+ Statuses: []enum.PostStatus{enum.PostCompleted},
+ },
+ expectedCount: 1,
+ expectedIDs: []int{completedPost.Result.ID},
+ },
+ {
+ name: "Search with explicit Open status",
+ searchParams: &query.SearchPosts{
+ Query: "kanban",
+ Statuses: []enum.PostStatus{enum.PostOpen},
+ },
+ expectedCount: 2,
+ expectedIDs: []int{openPost.Result.ID, openByJon.Result.ID},
+ },
+ {
+ name: "Search with tag filter",
+ searchParams: &query.SearchPosts{
+ Query: "kanban",
+ Tags: []string{addBug.Result.Slug},
+ },
+ expectedCount: 1,
+ expectedIDs: []int{startedPost.Result.ID},
+ },
+ {
+ name: "Search with MyVotesOnly",
+ searchParams: &query.SearchPosts{
+ Query: "kanban",
+ MyVotesOnly: true,
+ },
+ expectedCount: 1,
+ expectedIDs: []int{openPost.Result.ID},
+ },
+ {
+ name: "Search with MyPostsOnly",
+ searchParams: &query.SearchPosts{
+ Query: "kanban",
+ MyPostsOnly: true,
+ },
+ expectedCount: 1,
+ expectedIDs: []int{openPost.Result.ID},
+ },
+ {
+ name: "Search with NoTagsOnly",
+ searchParams: &query.SearchPosts{
+ Query: "kanban",
+ NoTagsOnly: true,
+ },
+ expectedCount: 2,
+ expectedIDs: []int{openPost.Result.ID, openByJon.Result.ID},
+ },
+ }
+
+ for _, tc := range testCases {
+ t.Run(tc.name, func(t *testing.T) {
+ err = bus.Dispatch(aryaStarkCtx, tc.searchParams)
+ Expect(err).IsNil()
+ Expect(tc.searchParams.Result).HasLen(tc.expectedCount)
+
+ foundIDs := make([]int, len(tc.searchParams.Result))
+ for i, post := range tc.searchParams.Result {
+ foundIDs[i] = post.ID
+ }
+ Expect(foundIDs).ContainsOnly(tc.expectedIDs)
+ })
+ }
+}
+
func TestPostStorage_IsReferenced(t *testing.T) {
SetupDatabaseTest(t)
defer TeardownDatabaseTest()
diff --git a/public/pages/Home/components/PostFilter.tsx b/public/pages/Home/components/PostFilter.tsx
index c1764011e..b3b49a10f 100644
--- a/public/pages/Home/components/PostFilter.tsx
+++ b/public/pages/Home/components/PostFilter.tsx
@@ -76,9 +76,20 @@ export const PostFilter = (props: PostFilterProps) => {
const handleChangeFilter = (item: OptionItem) => () => {
const exists = filterItems.find((i) => i.type === item.type && i.value === item.value)
- const newFilter = exists
- ? filterItems.filter((i) => !(i.type === item.type && i.value === item.value))
- : [...filterItems, { type: item.type, value: item.value }]
+ let newFilter: FilterItem[]
+ if (exists) {
+ newFilter = filterItems.filter((i) => !(i.type === item.type && i.value === item.value))
+ } else {
+ // "Untagged" and concrete tags are mutually exclusive — combining them
+ // produces an empty result set on the server.
+ let base = filterItems
+ if (item.type === "noTags") {
+ base = base.filter((i) => i.type !== "tag")
+ } else if (item.type === "tag") {
+ base = base.filter((i) => i.type !== "noTags")
+ }
+ newFilter = [...base, { type: item.type, value: item.value }]
+ }
props.filtersChanged(FilterItemsToFilterState(newFilter))
setQuery("")
diff --git a/public/pages/Home/components/PostsContainer.scss b/public/pages/Home/components/PostsContainer.scss
index 8f29a0906..6769b2546 100644
--- a/public/pages/Home/components/PostsContainer.scss
+++ b/public/pages/Home/components/PostsContainer.scss
@@ -6,6 +6,19 @@
grid-template-columns: 1fr 1fr 1fr 1fr;
row-gap: spacing(4);
margin-bottom: spacing(6);
+
+ &--searching {
+ @include media("md") {
+ grid-template-columns: auto 1fr;
+
+ .c-posts-container__filter-col {
+ grid-column: 1;
+ }
+ .c-posts-container__search-col {
+ grid-column: 2;
+ }
+ }
+ }
}
&__filter-col {
diff --git a/public/pages/Home/components/PostsContainer.tsx b/public/pages/Home/components/PostsContainer.tsx
index 1f98afdc1..507ab8b9f 100644
--- a/public/pages/Home/components/PostsContainer.tsx
+++ b/public/pages/Home/components/PostsContainer.tsx
@@ -161,21 +161,20 @@ export class PostsContainer extends React.Component<PostsContainerProps, PostsCo
public render() {
const showMoreLink = this.getShowMoreLink()
+ const headerClass = this.state.query ? "c-posts-container__header c-posts-container__header--searching" : "c-posts-container__header"
return (
<div className="c-posts-container">
- <div className="c-posts-container__header">
- {!this.state.query && (
- <div className="c-posts-container__filter-col">
- <PostFilter
- tags={this.props.tags}
- activeFilter={this.state.filterState}
- filtersChanged={this.handleFilterChanged}
- countPerStatus={this.props.countPerStatus}
- />
- <PostsSort onChange={this.handleSortChanged} value={this.state.view} />
- </div>
- )}
+ <div className={headerClass}>
+ <div className="c-posts-container__filter-col">
+ <PostFilter
+ tags={this.props.tags}
+ activeFilter={this.state.filterState}
+ filtersChanged={this.handleFilterChanged}
+ countPerStatus={this.props.countPerStatus}
+ />
+ {!this.state.query && <PostsSort onChange={this.handleSortChanged} value={this.state.view} />}
+ </div>
<div className="c-posts-container__search-col">
<Input
field="query"