Skip to content
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

feat: adds search query for /keys #263

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat: adds search query for /keys #263

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9d1ee1
adds search query for /keys
kirtanchandak Mar 18, 2025
bc8d3fd
adds more readable query and tests for /keys?q
kirtanchandak Mar 19, 2025
056d1e9
changes count to COUNT
kirtanchandak Mar 20, 2025
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
42 changes: 25 additions & 17 deletions folksonomy/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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] = '', # Extract 'q' from the query parameters
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(

query = """
SELECT json_agg(j.j)::json FROM (
SELECT json_build_object(
'k',k,
'count',count(*),
'values',count(distinct(v))
) as j
'k', k,
'count', count(*),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
'count', count(*),
'count', COUNT(*),

'values', count(distinct v)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
'values', count(distinct v)
'values', COUNT(distinct v)

Copy link
Contributor Author

Choose a reason for hiding this comment

The 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
"""
query_params = [owner]

if q:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't you make it more readable like, this for example:

folksonomy_api/folksonomy/api.py

Line 355 in c3bc052

{f"AND k IN ({placeholders})" if keys_list else ""}

Having the all the query in one block can be easier to read and debug I guess.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know I have also done the same as you here:

folksonomy_api/folksonomy/api.py

Line 673 in c3bc052

if q:
but I'm still learning Python 😄

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

made it more readable and added tests too

query += " AND k ILIKE %s"
query_params.append(f"%{q}%")

query += "GROUP BY k ORDER BY count(*) DESC) as j;"

cur, timing = await db.db_exec(query, tuple(query_params))
out = await cur.fetchone()

return JSONResponse(
Expand Down
Loading