Fix unlisted tracks in track upload challenge (#2382)

* Fix unlisted tracks in track upload challenge * PR revisions * Fix lint
AudiusProject · Jan 25, 2022 · d54f329 · d54f329
1 parent 1087b76
commit d54f329
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 0 deletions.
diff --git a/discovery-provider/integration_tests/challenges/test_track_upload_challenge.py b/discovery-provider/integration_tests/challenges/test_track_upload_challenge.py
@@ -91,6 +91,37 @@ def test_track_upload_challenge(app):
         updated_at=today,
     )
 
+    unlisted_track = Track(
+        blockhash="0x3",
+        blocknumber=30000001,
+        txhash="cba",
+        owner_id=1,
+        track_id=5,
+        route_id="5",
+        track_segments=[],
+        is_unlisted=True,
+        is_current=True,
+        is_delete=False,
+        created_at=today,
+        updated_at=today,
+    )
+
+    stem = Track(
+        blockhash="0x3",
+        blocknumber=30000001,
+        txhash="stem",
+        owner_id=1,
+        track_id=6,
+        route_id="6",
+        track_segments=[],
+        is_unlisted=False,
+        is_current=True,
+        is_delete=False,
+        created_at=today,
+        updated_at=today,
+        stem_of={"parent_track_id": 4, "category": "bass"},
+    )
+
     with db.scoped_session() as session:
         bus = ChallengeEventBus(redis_conn)
 
@@ -135,6 +166,21 @@ def test_track_upload_challenge(app):
         assert user_challenge.current_step_count == 1
         assert not user_challenge.is_complete
 
+        # Ensure unlisted tracks and stems are not counted
+        session.add(unlisted_track)
+        bus.dispatch(ChallengeEvent.track_upload, 30000001, 1)
+        session.add(stem)
+        bus.dispatch(ChallengeEvent.track_upload, 30000001, 1)
+        bus.flush()
+        bus.process_events(session)
+        user_challenge = track_upload_challenge_manager.get_user_challenge_state(
+            session, ["1"]
+        )[0]
+
+        # Ensure stem is not counted
+
+        assert user_challenge.current_step_count == 1
+
         # Process two more dummy events to reach the step count (i.e. 3) for completion
         session.add(track3)
         bus.dispatch(ChallengeEvent.track_upload, 30000001, 1)

diff --git a/discovery-provider/src/challenges/track_upload_challenge.py b/discovery-provider/src/challenges/track_upload_challenge.py
@@ -58,6 +58,8 @@ def _get_num_track_uploads_by_user(
                 Track.blocknumber >= block_number,
                 Track.is_current == True,
                 Track.is_delete == False,
+                Track.is_unlisted == False,
+                Track.stem_of == None,
             )
             .all()
         )