-
-
Notifications
You must be signed in to change notification settings - Fork 29
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.
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
feat: adds search query for /keys #263
Merged
CharlesNepote
merged 3 commits into
openfoodfacts:main
from
kirtanchandak:feat/search-keys
Mar 21, 2025
Merged
Changes from 2 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -605,30 +605,38 @@ async def product_tag_delete(response: Response, | |||||
|
||||||
|
||||||
@app.get("/keys", response_model=List[KeyStats]) | ||||||
async def keys_list(response: Response, | ||||||
owner='', | ||||||
user: User = Depends(get_current_user)): | ||||||
async def keys_list( | ||||||
response: Response, | ||||||
q: Optional[str] = '', | ||||||
owner: str = '', | ||||||
user: User = Depends(get_current_user) | ||||||
): | ||||||
""" | ||||||
Get the list of keys with statistics | ||||||
Get the list of keys with statistics, with an optional search filter. | ||||||
|
||||||
The keys list can be restricted to private tags from some owner | ||||||
""" | ||||||
check_owner_user(user, owner, allow_anonymous=True) | ||||||
cur, timing = await db.db_exec( | ||||||
""" | ||||||
SELECT json_agg(j.j)::json FROM( | ||||||
|
||||||
search_filter = f"AND k ILIKE %s" if q else "" | ||||||
query = f""" | ||||||
SELECT json_agg(j)::json FROM ( | ||||||
SELECT json_build_object( | ||||||
'k',k, | ||||||
'count',count(*), | ||||||
'values',count(distinct(v)) | ||||||
) as j | ||||||
'k', k, | ||||||
'count', count(*), | ||||||
'values', count(distinct v) | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. made the change |
||||||
) AS j | ||||||
FROM folksonomy | ||||||
WHERE owner=%s | ||||||
GROUP BY k | ||||||
ORDER BY count(*) DESC) as j; | ||||||
""", | ||||||
(owner,) | ||||||
) | ||||||
WHERE owner = %s | ||||||
{search_filter} | ||||||
GROUP BY k | ||||||
ORDER BY count(*) DESC | ||||||
) AS j; | ||||||
""" | ||||||
|
||||||
query_params = [owner] + ([f"%{q}%"] if q else []) | ||||||
|
||||||
cur, timing = await db.db_exec(query, tuple(query_params)) | ||||||
out = await cur.fetchone() | ||||||
|
||||||
return JSONResponse( | ||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.