From b226d02aca763397b4d790852c7814ea42502653 Mon Sep 17 00:00:00 2001 From: Raymond Jacobson Date: Mon, 23 Dec 2024 15:27:44 -0800 Subject: [PATCH] Revert "[PAY-3705] Fix search playlists expanding tracks (#10780)" This reverts commit 531efe173c8c67ded423ee3359721389671dc24a. --- packages/discovery-provider/src/queries/get_feed_es.py | 8 ++------ packages/discovery-provider/src/queries/query_helpers.py | 6 ++---- packages/discovery-provider/src/utils/elasticdsl.py | 6 ++---- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/packages/discovery-provider/src/queries/get_feed_es.py b/packages/discovery-provider/src/queries/get_feed_es.py index e49ba20d05c..a8ef8f92066 100644 --- a/packages/discovery-provider/src/queries/get_feed_es.py +++ b/packages/discovery-provider/src/queries/get_feed_es.py @@ -305,15 +305,11 @@ def get_feed_es(args, limit=10, offset=0): # batch populate gated track and collection metadata db = get_db_read_replica() with db.scoped_session() as session: - _populate_gated_content_metadata( - session, sorted_feed, current_user["user_id"], include_playlist_tracks=True - ) + _populate_gated_content_metadata(session, sorted_feed, current_user["user_id"]) # populate metadata + remove extra fields from items sorted_feed = [ - populate_track_or_playlist_metadata_es( - item, current_user, include_playlist_tracks=True - ) + populate_track_or_playlist_metadata_es(item, current_user) for item in sorted_feed ] diff --git a/packages/discovery-provider/src/queries/query_helpers.py b/packages/discovery-provider/src/queries/query_helpers.py index 9dd958fa5c8..2bd88688f10 100644 --- a/packages/discovery-provider/src/queries/query_helpers.py +++ b/packages/discovery-provider/src/queries/query_helpers.py @@ -737,9 +737,7 @@ def get_content_url_with_mirrors( } -def _populate_gated_content_metadata( - session, entities, current_user_id, include_playlist_tracks=False -): +def _populate_gated_content_metadata(session, entities, current_user_id): """Checks if `current_user_id` has access to each entity and populates relevant fields. Responsible for populating the `access` field of both tracks and playlists. @@ -859,7 +857,7 @@ def getContentId(metadata): ] = has_download_access for entity in entities: - if "playlist_id" in entity and "tracks" in entity and include_playlist_tracks: + if "playlist_id" in entity and "tracks" in entity: _populate_gated_content_metadata(session, entity["tracks"], current_user_id) content_id = getContentId(entity) if content_id not in gated_content_ids: diff --git a/packages/discovery-provider/src/utils/elasticdsl.py b/packages/discovery-provider/src/utils/elasticdsl.py index 07692408c9d..6ffd6748872 100644 --- a/packages/discovery-provider/src/utils/elasticdsl.py +++ b/packages/discovery-provider/src/utils/elasticdsl.py @@ -71,9 +71,7 @@ def populate_user_metadata_es(user, current_user): return omit_indexed_fields(user) -def populate_track_or_playlist_metadata_es( - item, current_user, include_playlist_tracks=False -): +def populate_track_or_playlist_metadata_es(item, current_user): if current_user: my_id = current_user["user_id"] item["has_current_user_reposted"] = my_id in item.get("reposted_by", []) @@ -85,7 +83,7 @@ def populate_track_or_playlist_metadata_es( item["followee_reposts"] = item.get("followee_reposts", []) item["followee_saves"] = item.get("followee_saves", []) - if "playlist_id" in item and "tracks" in item and include_playlist_tracks: + if "playlist_id" in item and "tracks" in item: item["tracks"] = [ populate_track_or_playlist_metadata_es(track, current_user) for track in item["tracks"]