feat: Use Reviews namespace

metabrainz · Sep 17, 2022 · 891fec5 · 891fec5
1 parent 692cc3d
commit 891fec5
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 15 deletions.
diff --git a/critiquebrainz/db/review.py b/critiquebrainz/db/review.py
@@ -410,9 +410,9 @@ def invalidate_ws_entity_cache(entity_id, entity_type, user_id):
     cache.delete(cache_keys_for_latest_reviews_key, namespace=REVIEW_CACHE_NAMESPACE)
 
     user = db_users.get_by_id(user_id)
-    username = user["musicbrainz_username"]
-    if username:
-        cache_keys_for_user_reviews_key = cache.gen_key('entity_api', entity_id, username, "user_reviews")
+    if 'musicbrainz_username' in user.keys() and user['musicbrainz_username']:
+        username = user["musicbrainz_username"]
+        cache_keys_for_user_reviews_key = cache.gen_key('entity_api', entity_id, username, "user_review")
         cache.delete(cache_keys_for_user_reviews_key, namespace=REVIEW_CACHE_NAMESPACE)
 
 

diff --git a/critiquebrainz/ws/artist/views.py b/critiquebrainz/ws/artist/views.py
@@ -238,7 +238,7 @@ def artist_entity_handler(artist_mbid):
     username = Parser.string('uri', 'username', optional=True)
     if username:
         user_review_cache_key = cache.gen_key('entity_api', artist['mbid'], username, "user_review")
-        user_review = cache.get(user_review_cache_key)
+        user_review = cache.get(user_review_cache_key, REVIEW_CACHE_NAMESPACE)
         if not user_review:
             user = db_users.get_by_mbid(username)
             if user:

diff --git a/critiquebrainz/ws/bb_author/views.py b/critiquebrainz/ws/bb_author/views.py
@@ -175,7 +175,7 @@ def author_entity_handler(author_bbid):
     username = Parser.string('uri', 'username', optional=True)
     if username:
         user_review_cache_key = cache.gen_key('entity_api', author['bbid'], username, "user_review")
-        user_review = cache.get(user_review_cache_key)
+        user_review = cache.get(user_review_cache_key, namespace=REVIEW_CACHE_NAMESPACE)
         if not user_review:
             user = db_users.get_by_mbid(username)
             if user:

diff --git a/critiquebrainz/ws/bb_edition_group/views.py b/critiquebrainz/ws/bb_edition_group/views.py
@@ -153,7 +153,7 @@ def edition_group_entity_handler(edition_group_bbid):
     username = Parser.string('uri', 'username', optional=True)
     if username:
         user_review_cache_key = cache.gen_key('entity_api', edition_group['bbid'], username, "user_review")
-        user_review = cache.get(user_review_cache_key)
+        user_review = cache.get(user_review_cache_key, REVIEW_CACHE_NAMESPACE)
         if not user_review:
             user = db_users.get_by_mbid(username)
             if user:

diff --git a/critiquebrainz/ws/bb_literary_work/views.py b/critiquebrainz/ws/bb_literary_work/views.py
@@ -173,7 +173,7 @@ def literary_work_entity_handler(literary_work_bbid):
     username = Parser.string('uri', 'username', optional=True)
     if username:
         user_review_cache_key = cache.gen_key('entity_api', literary_work['bbid'], username, "user_review")
-        user_review = cache.get(user_review_cache_key)
+        user_review = cache.get(user_review_cache_key, REVIEW_CACHE_NAMESPACE)
         if not user_review:
             user = db_users.get_by_mbid(username)
             if user:

diff --git a/critiquebrainz/ws/bb_series/views.py b/critiquebrainz/ws/bb_series/views.py
@@ -145,7 +145,7 @@ def series_entity_handler(series_bbid):
     username = Parser.string('uri', 'username', optional=True)
     if username:
         user_review_cache_key = cache.gen_key('entity_api', series['bbid'], username, "user_review")
-        user_review = cache.get(user_review_cache_key)
+        user_review = cache.get(user_review_cache_key, REVIEW_CACHE_NAMESPACE)
         if not user_review:
             user = db_users.get_by_mbid(username)
             if user:

diff --git a/critiquebrainz/ws/event/views.py b/critiquebrainz/ws/event/views.py
@@ -265,7 +265,7 @@ def event_entity_handler(event_mbid):
     username = Parser.string('uri', 'username', optional=True)
     if username:
         user_review_cache_key = cache.gen_key('entity_api', event['mbid'], username, "user_review")
-        user_review = cache.get(user_review_cache_key)
+        user_review = cache.get(user_review_cache_key, REVIEW_CACHE_NAMESPACE)
         if not user_review:
             user = db_users.get_by_mbid(username)
             if user:

diff --git a/critiquebrainz/ws/label/views.py b/critiquebrainz/ws/label/views.py
@@ -180,7 +180,7 @@ def label_entity_handler(label_mbid):
     username = Parser.string('uri', 'username', optional=True)
     if username:
         user_review_cache_key = cache.gen_key('entity_api', label['mbid'], username, "user_review")
-        user_review = cache.get(user_review_cache_key)
+        user_review = cache.get(user_review_cache_key, REVIEW_CACHE_NAMESPACE)
         if not user_review:
             user = db_users.get_by_mbid(username)
             if user:

diff --git a/critiquebrainz/ws/place/views.py b/critiquebrainz/ws/place/views.py
@@ -334,7 +334,7 @@ def place_entity_handler(place_mbid):
     username = Parser.string('uri', 'username', optional=True)
     if username:
         user_review_cache_key = cache.gen_key('entity_api', place['mbid'], username, "user_review")
-        user_review = cache.get(user_review_cache_key)
+        user_review = cache.get(user_review_cache_key, REVIEW_CACHE_NAMESPACE)
         if not user_review:
             user = db_users.get_by_mbid(username)
             if user:

diff --git a/critiquebrainz/ws/recording/views.py b/critiquebrainz/ws/recording/views.py
@@ -148,15 +148,15 @@ def recording_entity_handler(recording_mbid):
     username = Parser.string('uri', 'username', optional=True)
     if username:
         user_review_cache_key = cache.gen_key('entity_api', recording['mbid'], username, "user_review")
-        user_review = cache.get(user_review_cache_key)
+        user_review = cache.get(user_review_cache_key, REVIEW_CACHE_NAMESPACE)
         if not user_review:
             user = db_users.get_by_mbid(username)
             if user:
                 user_id = user['id']
 
                 user_review, _ = db_review.list_reviews(
                     entity_id=recording['mbid'],
-                    entity_type='label',
+                    entity_type='recording',
                     user_id=user_id
                 )
                 if user_review:

diff --git a/critiquebrainz/ws/release_group/views.py b/critiquebrainz/ws/release_group/views.py
@@ -161,7 +161,7 @@ def release_group_entity_handler(release_group_mbid):
     username = Parser.string('uri', 'username', optional=True)
     if username:
         user_review_cache_key = cache.gen_key('entity_api', release_group['mbid'], username, "user_review")
-        user_review = cache.get(user_review_cache_key)
+        user_review = cache.get(user_review_cache_key, REVIEW_CACHE_NAMESPACE)
         if not user_review:
             user = db_users.get_by_mbid(username)
             if user:

diff --git a/critiquebrainz/ws/work/views.py b/critiquebrainz/ws/work/views.py
@@ -224,7 +224,7 @@ def work_entity_handler(work_mbid):
     username = Parser.string('uri', 'username', optional=True)
     if username:
         user_review_cache_key = cache.gen_key('entity_api', work['mbid'], username, "user_review")
-        user_review = cache.get(user_review_cache_key)
+        user_review = cache.get(user_review_cache_key, REVIEW_CACHE_NAMESPACE)
         if not user_review:
             user = db_users.get_by_mbid(username)
             if user: