diff --git a/resolvers/author.py b/resolvers/author.py index 771e3de9..3b181463 100644 --- a/resolvers/author.py +++ b/resolvers/author.py @@ -325,7 +325,8 @@ async def get_author_followers(_, _info, slug: str): else: logger.debug(f"@{slug} got followers cached") if isinstance(cached, str): - return json.loads(cached) + data = json.loads(cached) + return list(set(data)) except Exception as exc: import traceback diff --git a/resolvers/follower.py b/resolvers/follower.py index 85115154..d542d9b5 100644 --- a/resolvers/follower.py +++ b/resolvers/follower.py @@ -59,8 +59,8 @@ async def follow(_, info, what, slug): [author] = get_with_stat(select(Author).filter(Author.slug == slug)) if author: author_dict = author.dict() - author_id = int(author_dict.get('id', 0)) - follows_ids = set(int(a.get('id')) for a in follows) + author_id = int(author_dict.get("id", 0)) + follows_ids = set(int(a.get("id")) for a in follows) if author_id not in follows_ids: await cache_author(author_dict) await cache_author(follower_dict) diff --git a/services/cache.py b/services/cache.py index 169332ed..7d0aa5eb 100644 --- a/services/cache.py +++ b/services/cache.py @@ -16,17 +16,19 @@ async def cache_author(author: dict): author_id = author.get("id") payload = json.dumps(author, cls=CustomJSONEncoder) await redis.execute("SET", f'user:{author.get("user")}', payload) - await redis.execute("SET", f'author:{author_id}', payload) + await redis.execute("SET", f"author:{author_id}", payload) # update stat all field for followers' caches in list - followers_str = await redis.execute("GET", f'author:{author_id}:followers') + followers_str = await redis.execute("GET", f"author:{author_id}:followers") followers = [] if isinstance(followers_str, str): followers = json.loads(followers_str) if isinstance(followers, list): for follower in followers: follower_follows_authors = [] - follower_follows_authors_str = await redis.execute("GET", f'author:{author_id}:follows-authors') + follower_follows_authors_str = await redis.execute( + "GET", f"author:{author_id}:follows-authors" + ) if isinstance(follower_follows_authors_str, str): follower_follows_authors = json.loads(follower_follows_authors_str) c = 0 @@ -40,14 +42,16 @@ async def cache_author(author: dict): follower_follows_authors.append(author) # update stat field for all authors' caches in list - follows_str = await redis.execute("GET", f'author:{author_id}:follows-authors') + follows_str = await redis.execute("GET", f"author:{author_id}:follows-authors") follows_authors = [] if isinstance(follows_str, str): follows_authors = json.loads(follows_str) if isinstance(follows_authors, list): for followed_author in follows_authors: followed_author_followers = [] - followed_author_followers_str = await redis.execute("GET", f'author:{author_id}:followers') + followed_author_followers_str = await redis.execute( + "GET", f"author:{author_id}:followers" + ) if isinstance(followed_author_followers_str, str): followed_author_followers = json.loads(followed_author_followers_str) c = 0 @@ -59,7 +63,9 @@ async def cache_author(author: dict): c += 1 # author not found in the list, so add the new author with the updated stat field followed_author_followers.append(author) - await redis.execute("SET", f'author:{author_id}:followers', followed_author_followers) + await redis.execute( + "SET", f"author:{author_id}:followers", followed_author_followers + ) async def cache_follows(follower: dict, entity_type: str, entity: dict, is_insert=True): @@ -103,18 +109,18 @@ async def cache_follower(follower: dict, author: dict, is_insert=True): followers = [] if isinstance(followers_str, str): followers = json.loads(followers_str) - if is_insert: - # Remove the entity from followers - followers = [e for e in followers if e["id"] != author_id] - else: + if is_insert and not any([int(f["id"]) == author_id for f in followers]): followers.append(follower) - payload = json.dumps(followers, cls=CustomJSONEncoder) - await redis.execute("SET", redis_key, payload) author_str = await redis.execute("GET", f"author:{follower_id}") if isinstance(author_str, str): author = json.loads(author_str) author["stat"]["followers"] = len(followers) await cache_author(author) + else: + followers = list(set([e for e in followers if int(e["id"]) != author_id])) + + payload = json.dumps(followers, cls=CustomJSONEncoder) + await redis.execute("SET", redis_key, payload) return followers