Skip to content

Commit

Permalink
[ONC-30] Fix playlist trending filters (#7809)
Browse files Browse the repository at this point in the history
  • Loading branch information
@raymondjacobson
raymondjacobson authored Mar 13, 2024
1 parent 7b49daf commit c966eae
Show file tree
Hide file tree
Showing 2 changed files with 215 additions and 7 deletions.
201 changes: 201 additions & 0 deletions packages/discovery-provider/integration_tests/queries/test_get_trending_playlists.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
import logging
from time import time

from integration_tests.utils import populate_mock_db
from src.queries.get_trending_playlists import _get_trending_playlists_with_session
from src.trending_strategies.BDNxn_trending_playlists_strategy import (
TrendingPlaylistsStrategyBDNxn,
)
from src.utils.db_session import get_db

logger = logging.getLogger(__name__)


def test_get_trending_playlists(app):
"""Tests that we can get trending playlists"""
with app.app_context():
db = get_db()

test_entities = {
"playlists": [
{
"playlist_id": 1,
"playlist_owner_id": 1,
"playlist_name": "playlist 1",
"description": "playlist 1",
"playlist_contents": {
"track_ids": [
{"track": 1, "time": round(time() * 1000)},
{"track": 2, "time": round(time() * 1000)},
{"track": 3, "time": round(time() * 1000)},
{"track": 4, "time": round(time() * 1000)},
{"track": 5, "time": round(time() * 1000)},
{"track": 6, "time": round(time() * 1000)},
]
},
},
{
"playlist_id": 2,
"playlist_owner_id": 2,
"playlist_name": "playlist 2",
"description": "playlist 2",
"playlist_contents": {
"track_ids": [
{"track": 5, "time": round(time() * 1000)},
{"track": 6, "time": round(time() * 1000)},
{"track": 7, "time": round(time() * 1000)},
{"track": 8, "time": round(time() * 1000)},
]
},
},
],
"users": [
{"user_id": 1},
{"user_id": 2},
{"user_id": 3},
{"user_id": 4},
{"user_id": 5},
],
"tracks": [
{"track_id": 1, "owner_id": 1},
{"track_id": 2, "owner_id": 1},
{"track_id": 3, "owner_id": 1},
{"track_id": 4, "owner_id": 2},
{"track_id": 5, "owner_id": 3},
{"track_id": 6, "owner_id": 4},
{"track_id": 7, "owner_id": 5},
{"track_id": 8, "owner_id": 5},
],
}
test_social_feature_entities = {
"reposts": [
{"repost_item_id": 1, "repost_type": "playlist", "user_id": 2},
{"repost_item_id": 2, "repost_type": "playlist", "user_id": 1},
{"repost_item_id": 2, "repost_type": "playlist", "user_id": 3},
],
"saves": [
{"save_item_id": 1, "save_type": "playlist", "user_id": 2},
{"save_item_id": 2, "save_type": "playlist", "user_id": 1},
],
"follows": [
{"follower_user_id": 1, "followee_user_id": 1},
{"follower_user_id": 2, "followee_user_id": 1},
{"follower_user_id": 3, "followee_user_id": 1},
{"follower_user_id": 4, "followee_user_id": 1},
{"follower_user_id": 5, "followee_user_id": 1},
{"follower_user_id": 1, "followee_user_id": 2},
{"follower_user_id": 2, "followee_user_id": 2},
{"follower_user_id": 3, "followee_user_id": 2},
{"follower_user_id": 4, "followee_user_id": 2},
{"follower_user_id": 5, "followee_user_id": 2},
],
}

populate_mock_db(db, test_entities)
populate_mock_db(db, test_social_feature_entities)

with db.scoped_session() as session:
res = _get_trending_playlists_with_session(
session,
{"time": "week", "offset": 0, "limit": 10},
TrendingPlaylistsStrategyBDNxn(),
use_request_context=False,
)
# Second playlist ranks above first with 1 more repost
assert res[0]["playlist_id"] == 2
assert res[1]["playlist_id"] == 1


def test_get_trending_playlists_filters(app):
"""Tests that invalid playlists are filtered"""
with app.app_context():
db = get_db()

test_entities = {
"playlists": [
# Playlist 1 has not enough unique owners represented
{
"playlist_id": 1,
"playlist_owner_id": 1,
"playlist_name": "playlist 1",
"description": "playlist 1",
"playlist_contents": {
"track_ids": [
{"track": 1, "time": round(time() * 1000)},
{"track": 2, "time": round(time() * 1000)},
{"track": 3, "time": round(time() * 1000)},
{"track": 4, "time": round(time() * 1000)},
{"track": 5, "time": round(time() * 1000)},
]
},
},
# Playlist 2 has not enough available tracks
{
"playlist_id": 2,
"playlist_owner_id": 2,
"playlist_name": "playlist 2",
"description": "playlist 2",
"playlist_contents": {
"track_ids": [
{"track": 5, "time": round(time() * 1000)},
{"track": 6, "time": round(time() * 1000)},
{"track": 7, "time": round(time() * 1000)},
{"track": 8, "time": round(time() * 1000)},
]
},
},
],
"users": [
{"user_id": 1},
{"user_id": 2},
{"user_id": 3},
{"user_id": 4},
{"user_id": 5},
],
"tracks": [
{"track_id": 1, "owner_id": 1},
{"track_id": 2, "owner_id": 1},
{"track_id": 3, "owner_id": 1},
{"track_id": 4, "owner_id": 2},
{"track_id": 5, "owner_id": 3},
{"track_id": 6, "owner_id": 4},
{"track_id": 7, "owner_id": 5, "is_delete": True},
{"track_id": 8, "owner_id": 5, "is_delete": True},
],
}
test_social_feature_entities = {
"reposts": [
{"repost_item_id": 1, "repost_type": "playlist", "user_id": 2},
{"repost_item_id": 2, "repost_type": "playlist", "user_id": 1},
{"repost_item_id": 2, "repost_type": "playlist", "user_id": 3},
],
"saves": [
{"save_item_id": 1, "save_type": "playlist", "user_id": 2},
{"save_item_id": 2, "save_type": "playlist", "user_id": 1},
],
"follows": [
{"follower_user_id": 1, "followee_user_id": 1},
{"follower_user_id": 2, "followee_user_id": 1},
{"follower_user_id": 3, "followee_user_id": 1},
{"follower_user_id": 4, "followee_user_id": 1},
{"follower_user_id": 5, "followee_user_id": 1},
{"follower_user_id": 1, "followee_user_id": 2},
{"follower_user_id": 2, "followee_user_id": 2},
{"follower_user_id": 3, "followee_user_id": 2},
{"follower_user_id": 4, "followee_user_id": 2},
{"follower_user_id": 5, "followee_user_id": 2},
],
}

populate_mock_db(db, test_entities)
populate_mock_db(db, test_social_feature_entities)

with db.scoped_session() as session:
res = _get_trending_playlists_with_session(
session,
{"time": "week", "offset": 0, "limit": 10},
TrendingPlaylistsStrategyBDNxn(),
use_request_context=False,
)
# No results, all filtered
assert len(res) == 0
21 changes: 14 additions & 7 deletions packages/discovery-provider/src/queries/get_trending_playlists.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,14 +225,21 @@ def wrapped():
results = []
for playlist in playlists:
playlist_owner_id = playlist["playlist_owner_id"]
track_owner_ids = list(
filter(
lambda owner_id: owner_id != playlist_owner_id,
map(lambda track: track["owner_id"], playlist["tracks"]),
)
)
if len(track_owner_ids) < 3:
unique_track_owner_ids = set()
valid_track_count = 0

for track in playlist["tracks"]:
is_delete = track["is_delete"]
if not is_delete:
valid_track_count += 1

owner_id = track["owner_id"]
if playlist_owner_id != owner_id:
unique_track_owner_ids.add(owner_id)

if len(unique_track_owner_ids) < 3 or valid_track_count < 3:
continue

results.append(playlist)

return (results, list(map(lambda playlist: playlist["playlist_id"], results)))
Expand Down

0 comments on commit c966eae

Please sign in to comment.