Popularity and recommendations fixes

listenbrainz/db/popularity.py

@@ -40,7 +40,7 @@ def get_inserts(self, message):
         values = [(r[self.entity_mbid], r["total_listen_count"], r["total_user_count"]) for r in message["data"]]
         return query, None, values
 
-    def get_indexes(self):
+    def get_indices(self):
         if self.mlhd:
             prefix = "mlhd_popularity"
         else:
@@ -58,10 +58,10 @@ class PopularityTopDataset(DatabaseDataset):
     def __init__(self, entity, mlhd):
         if mlhd:
             name = "mlhd_popularity_top_" + entity
-            table_name = "top_" + entity
+            table_name = "mlhd_top_" + entity
         else:
             name = "popularity_top_" + entity
-            table_name = "mlhd_top_" + entity
+            table_name = "top_" + entity
         super().__init__(name, table_name, "popularity")
         self.entity = entity
         self.entity_mbid = f"{entity}_mbid"
@@ -82,7 +82,7 @@ def get_inserts(self, message):
         values = [(r["artist_mbid"], r[self.entity_mbid], r["total_listen_count"], r["total_user_count"]) for r in message["data"]]
         return query, None, values
 
-    def get_indexes(self):
+    def get_indices(self):
         if self.mlhd:
             prefix = "mlhd_popularity_top"
         else:

listenbrainz/spark/handlers.py

@@ -22,6 +22,7 @@
 from listenbrainz.troi.daily_jams import run_post_recommendation_troi_bot
 from listenbrainz.troi.weekly_playlists import process_weekly_playlists, process_weekly_playlists_end
 from listenbrainz.troi.year_in_music import process_yim_playlists, process_yim_playlists_end
+from listenbrainz.webserver import db_conn
 
 TIME_TO_CONSIDER_STATS_AS_OLD = 20  # minutes
 TIME_TO_CONSIDER_RECOMMENDATIONS_AS_OLD = 7  # days
@@ -147,7 +148,7 @@ def handle_missing_musicbrainz_data(data):
     """ Insert user missing musicbrainz data i.e data submitted to ListenBrainz but not MusicBrainz.
     """
     user_id = data['user_id']
-    user = db_user.get(user_id)
+    user = db_user.get(db_conn, user_id)
 
     if not user:
         return
@@ -159,6 +160,7 @@ def handle_missing_musicbrainz_data(data):
 
     try:
         db_missing_musicbrainz_data.insert_user_missing_musicbrainz_data(
+            db_conn,
             user['id'],
             UserMissingMusicBrainzDataJson(missing_musicbrainz_data=missing_musicbrainz_data),
             source
@@ -213,7 +215,7 @@ def handle_recommendations(data):
     """ Take recommended recordings for a user and save it in the db.
     """
     user_id = data['user_id']
-    user = db_user.get(user_id)
+    user = db_user.get(db_conn, user_id)
     if not user:
         current_app.logger.info(f"Generated recommendations for a user that doesn't exist in the Postgres database: {user_id}")
         return
@@ -223,6 +225,7 @@ def handle_recommendations(data):
 
     try:
         db_recommendations_cf_recording.insert_user_recommendation(
+            db_conn,
             user_id,
             UserRecommendationsJson(**recommendations)
         )