Skip to content

Remove duplicate queries in tag search #2020

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
merged 2 commits into from
Nov 3, 2021
Merged

Remove duplicate queries in tag search #2020

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a1d424
Remove duplicate queries
jowlee Nov 1, 2021
a2eb4d3
Lint fix
jowlee Nov 3, 2021
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
64 changes: 7 additions & 57 deletions discovery-provider/src/queries/search_queries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
search_user_name_exact_match_boost,
user_handle_exact_match_boost,
)
from src.models import Track, RepostType, Save, SaveType, Follow
from src.utils import helpers
from src.models import RepostType, Save, SaveType, Follow
from src.utils.db_session import get_db_read_replica
from src.queries import response_name_constants
from src.queries.get_unpopulated_users import get_unpopulated_users
Expand Down Expand Up @@ -125,10 +124,6 @@ def search_tags():
if searchKind in [SearchKind.all, SearchKind.tracks]:
# Query saved tracks for the current user that contain this tag
track_ids = [track["track_id"] for track in results["tracks"]]
track_play_counts = {
track["track_id"]: track[response_name_constants.play_count]
for track in results["tracks"]
}

saves_query = (
session.query(Save.save_item_id)
Expand All @@ -141,40 +136,9 @@ def search_tags():
)
.all()
)
saved_track_ids = [i[0] for i in saves_query]
saved_tracks = (
session.query(Track)
.filter(
Track.is_current == True,
Track.is_delete == False,
Track.is_unlisted == False,
Track.stem_of == None,
Track.track_id.in_(saved_track_ids),
)
.all()
)
saved_tracks = helpers.query_result_to_list(saved_tracks)
for saved_track in saved_tracks:
saved_track_id = saved_track["track_id"]
saved_track[response_name_constants.play_count] = track_play_counts.get(
saved_track_id, 0
)
saved_tracks = populate_track_metadata(
session, saved_track_ids, saved_tracks, current_user_id
)

# Sort and paginate
play_count_sorted_saved_tracks = sorted(
saved_tracks,
key=lambda i: i[response_name_constants.play_count],
reverse=True,
)

play_count_sorted_saved_tracks = play_count_sorted_saved_tracks[
slice(offset, offset + limit, 1)
]

results["saved_tracks"] = play_count_sorted_saved_tracks
saved_track_ids = {i[0] for i in saves_query}
saved_tracks = list(filter(lambda track: track["track_id"] in saved_track_ids, results["tracks"]))
results["saved_tracks"] = saved_tracks

if searchKind in [SearchKind.all, SearchKind.users]:
# Query followed users that have referenced this tag
Expand All @@ -189,23 +153,9 @@ def search_tags():
)
.all()
)
followed_user_ids = [i[0] for i in followed_user_query]
followed_users = get_unpopulated_users(session, followed_user_ids)
followed_users = populate_user_metadata(
session, followed_user_ids, followed_users, current_user_id
)

followed_users_followee_sorted = sorted(
followed_users,
key=lambda i: i[response_name_constants.follower_count],
reverse=True,
)

followed_users_followee_sorted = followed_users_followee_sorted[
slice(offset, offset + limit, 1)
]

results["followed_users"] = followed_users_followee_sorted
followed_user_ids = {i[0] for i in followed_user_query}
followed_users = list(filter(lambda user: user["user_id"] in followed_user_ids, results["users"]))
results["followed_users"] = followed_users

return api_helpers.success_response(results)

Expand Down