Revert "Update DN to use shortened rewards challenge IDs and specifiers (#9803)" (#10099)

Author: rickyrombo

packages/discovery-provider/ddl/utils/hashids.sql renamed to packages/discovery-provider/ddl/functions/hashids.sql

@@ -128,7 +128,6 @@ test_dir() {
 migrate() {
     create_migrations_table
 
-    migrate_dir "utils"
     migrate_dir "migrations"
     migrate_dir "functions"
 

packages/discovery-provider/ddl/migrations/0095_shorten_challenge_ids.sql

@@ -75,7 +75,7 @@ def setup_challenges(app):
             UserChallenge(
                 challenge_id="test_challenge_1",
                 user_id=1,
-                specifier="7eP5n",
+                specifier="1",
                 is_complete=False,
                 current_step_count=1,
                 amount=5,
@@ -84,7 +84,7 @@ def setup_challenges(app):
             UserChallenge(
                 challenge_id="test_challenge_1",
                 user_id=2,
-                specifier="ML51L",
+                specifier="2",
                 is_complete=True,
                 completed_at=TEST_BLOCK_DATETIME,
                 current_step_count=3,
@@ -95,7 +95,7 @@ def setup_challenges(app):
             UserChallenge(
                 challenge_id="test_challenge_1",
                 user_id=3,
-                specifier="lebQD",
+                specifier="3",
                 current_step_count=2,
                 is_complete=False,
                 amount=5,
@@ -104,7 +104,7 @@ def setup_challenges(app):
             UserChallenge(
                 challenge_id="test_challenge_2",
                 user_id=4,
-                specifier="ELKzn",
+                specifier="4",
                 is_complete=True,
                 completed_at=TEST_BLOCK_DATETIME,
                 amount=5,
@@ -113,7 +113,7 @@ def setup_challenges(app):
             UserChallenge(
                 challenge_id="test_challenge_1",
                 user_id=5,
-                specifier="pnagD",
+                specifier="5",
                 is_complete=False,
                 current_step_count=2,
                 amount=5,
@@ -182,7 +182,7 @@ def test_handle_event(app):
         expected = {
             "challenge_id": "test_challenge_1",
             "user_id": 1,
-            "specifier": "7eP5n",
+            "specifier": "1",
             "is_complete": False,
             "completed_at": None,
             "current_step_count": 1,
@@ -244,7 +244,7 @@ def test_handle_event(app):
             {
                 "challenge_id": "test_challenge_1",
                 "user_id": 1,
-                "specifier": "7eP5n",
+                "specifier": "1",
                 "is_complete": False,
                 "completed_at": None,
                 "current_step_count": 2,
@@ -256,7 +256,7 @@ def test_handle_event(app):
             {
                 "challenge_id": "test_challenge_1",
                 "user_id": 2,
-                "specifier": "ML51L",
+                "specifier": "2",
                 "is_complete": True,
                 "completed_at": TEST_BLOCK_DATETIME,
                 "current_step_count": 3,
@@ -268,7 +268,7 @@ def test_handle_event(app):
             {
                 "challenge_id": "test_challenge_1",
                 "user_id": 3,
-                "specifier": "lebQD",
+                "specifier": "3",
                 "is_complete": True,
                 "completed_at": TEST_BLOCK_DATETIME,
                 "current_step_count": 3,
@@ -280,7 +280,7 @@ def test_handle_event(app):
             {
                 "challenge_id": "test_challenge_1",
                 "user_id": 5,
-                "specifier": "pnagD",
+                "specifier": "5",
                 "is_complete": False,
                 "completed_at": None,
                 "current_step_count": 2,
@@ -292,7 +292,7 @@ def test_handle_event(app):
             {
                 "challenge_id": "test_challenge_1",
                 "user_id": 6,
-                "specifier": "AnlGe",
+                "specifier": "6",
                 "is_complete": False,
                 "completed_at": None,
                 "current_step_count": 1,
@@ -543,12 +543,12 @@ def test_catches_exceptions_in_single_processor(app):
         except:
             # pylint: disable=W0707
             raise Exception("Shouldn't have propogated error!")
-        challenge_1_state = correct_manager.get_user_challenge_state(session, ["7eP5n"])
+        challenge_1_state = correct_manager.get_user_challenge_state(session, ["1"])
         # Make sure that the 'correct_manager' still executes
         assert len(challenge_1_state) == 1
         assert challenge_1_state[0].current_step_count == 1
         # Make sure broken manager didn't do anything
-        challenge_2_state = broken_manager.get_user_challenge_state(session, ["7eP5n"])
+        challenge_2_state = broken_manager.get_user_challenge_state(session, ["1"])
         assert len(challenge_2_state) == 0
 
         # Try the other order
@@ -561,9 +561,9 @@ def test_catches_exceptions_in_single_processor(app):
         except:
             # pylint: disable=W0707
             raise Exception("Shouldn't have propogated error!")
-        challenge_1_state = correct_manager.get_user_challenge_state(session, ["7eP5n"])
+        challenge_1_state = correct_manager.get_user_challenge_state(session, ["1"])
         assert len(challenge_1_state) == 1
         assert challenge_1_state[0].current_step_count == 2
         # Make sure broken manager didn't do anything
-        challenge_2_state = broken_manager.get_user_challenge_state(session, ["7eP5n"])
+        challenge_2_state = broken_manager.get_user_challenge_state(session, ["1"])
         assert len(challenge_2_state) == 0

packages/discovery-provider/ddl/pg_migrate.sh

@@ -40,7 +40,7 @@ def test_connect_verified_challenge(app):
 
     with db.scoped_session() as session:
         bus = ChallengeEventBus(redis_conn)
-        session.query(Challenge).filter(Challenge.id == "v").update(
+        session.query(Challenge).filter(Challenge.id == "connect-verified").update(
             {"active": True, "starting_block": BLOCK_NUMBER}
         )
 
@@ -66,6 +66,6 @@ def test_connect_verified_challenge(app):
         session.flush()
 
         state = connect_verified_challenge_manager.get_user_challenge_state(
-            session, ["7eP5n"]
+            session, ["1"]
         )[0]
         assert state.is_complete

packages/discovery-provider/integration_tests/challenges/test_challenges.py

@@ -40,7 +40,7 @@ def test_first_playlist_challenge(app):
 
     with db.scoped_session() as session:
         bus = ChallengeEventBus(redis_conn)
-        session.query(Challenge).filter(Challenge.id == "fp").update(
+        session.query(Challenge).filter(Challenge.id == "first-playlist").update(
             {"active": True, "starting_block": BLOCK_NUMBER}
         )
 
@@ -67,7 +67,7 @@ def test_first_playlist_challenge(app):
         session.flush()
 
         state = first_playlist_challenge_manager.get_user_challenge_state(
-            session, ["7eP5n"]
+            session, ["1"]
         )[0]
 
         assert state.is_complete

packages/discovery-provider/integration_tests/challenges/test_connect_verified_challenge.py

@@ -40,7 +40,7 @@ def test_first_tip_challenge(app):
 
     with db.scoped_session() as session:
         bus = ChallengeEventBus(redis_conn)
-        session.query(Challenge).filter(Challenge.id == "ft").update(
+        session.query(Challenge).filter(Challenge.id == "send-first-tip").update(
             {"active": True, "starting_block": BLOCK_NUMBER}
         )
 
@@ -65,7 +65,7 @@ def test_first_tip_challenge(app):
         session.flush()
 
         state = send_first_tip_challenge_manager.get_user_challenge_state(
-            session, ["7eP5n"]
+            session, ["1"]
         )[0]
 
         assert state.is_complete

packages/discovery-provider/integration_tests/challenges/test_first_playlist_challenge.py

@@ -62,7 +62,7 @@ def setup_challenges(session):
     session.flush()
     session.add(user)
     session.flush()
-    session.query(Challenge).filter(Challenge.id == "l").update(
+    session.query(Challenge).filter(Challenge.id == "listen-streak").update(
         {"active": True, "starting_block": BLOCK_NUMBER}
     )
 
@@ -100,20 +100,20 @@ def dp(offset):
         scope_and_process(lambda: dp(0))
 
         state = listen_streak_challenge_manager.get_user_challenge_state(
-            session, ["7eP5n"]
+            session, ["1"]
         )[0]
         assert state.current_step_count == 1 and not state.is_complete
 
         scope_and_process(lambda: dp(1))
         state = listen_streak_challenge_manager.get_user_challenge_state(
-            session, ["7eP5n"]
+            session, ["1"]
         )[0]
         assert state.current_step_count == 2 and not state.is_complete
 
         # Make sure the step count resets if the user missed a day
         scope_and_process(lambda: dp(3))
         state = listen_streak_challenge_manager.get_user_challenge_state(
-            session, ["7eP5n"]
+            session, ["1"]
         )[0]
         assert state.current_step_count == 1 and not state.is_complete
 
@@ -124,14 +124,14 @@ def dp(offset):
         scope_and_process(lambda: dp(7))
         scope_and_process(lambda: dp(8))
         state = listen_streak_challenge_manager.get_user_challenge_state(
-            session, ["7eP5n"]
+            session, ["1"]
         )[0]
         assert state.current_step_count == 6 and not state.is_complete
 
         # Make sure that is_complete is set when step count hits 7
         scope_and_process(lambda: dp(9))
         state = listen_streak_challenge_manager.get_user_challenge_state(
-            session, ["7eP5n"]
+            session, ["1"]
         )[0]
         assert state.current_step_count == 7 and state.is_complete == True
 
@@ -147,9 +147,7 @@ def test_multiple_listens(app):
 
     with db.scoped_session() as session:
         setup_challenges(session)
-        state = listen_streak_challenge_manager.get_user_challenge_state(
-            session, ["7eP5n"]
-        )
+        state = listen_streak_challenge_manager.get_user_challenge_state(session, ["1"])
         # make sure empty to start
         assert len(state) == 0
 
@@ -159,12 +157,12 @@ def dp(offset):
         scope_and_process = make_scope_and_process(bus, session)
         scope_and_process(lambda: dp(1))
         state = listen_streak_challenge_manager.get_user_challenge_state(
-            session, ["7eP5n"]
+            session, ["1"]
         )[0]
         assert state.current_step_count == 1
         scope_and_process(lambda: (dp(2), dp(3), dp(4), dp(5)))
         state = listen_streak_challenge_manager.get_user_challenge_state(
-            session, ["7eP5n"]
+            session, ["1"]
         )[0]
         # This will actually "reset" the listen count, because
         # we dedupe multiple play events in a single call to process

packages/discovery-provider/integration_tests/challenges/test_first_tip_challenge.py

@@ -42,7 +42,7 @@ def test_mobile_install_challenge(app):
         bus = ChallengeEventBus(redis_conn)
 
         # set challenge as active for purposes of test
-        session.query(Challenge).filter(Challenge.id == "m").update(
+        session.query(Challenge).filter(Challenge.id == "mobile-install").update(
             {"active": True, "starting_block": BLOCK_NUMBER}
         )
         bus.register_listener(