discours.io/core
5
0
Fork 0
Code Pull Requests Actions Projects Activity

cache-follower-fix

Browse Source
This commit is contained in:
Untone 2024-05-06 10:25:09 +03:00
parent 0d87d3d889
commit a5d99fa517
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resolvers/author.py
View File

@ -325,7 +325,8 @@ async def get_author_followers(_, _info, slug: str):
else: else:
logger.debug(f"@{slug} got followers cached") logger.debug(f"@{slug} got followers cached")
if isinstance(cached, str): if isinstance(cached, str):
return json.loads(cached) data = json.loads(cached)
return list(set(data))
except Exception as exc: except Exception as exc:
import traceback import traceback

4
resolvers/follower.py
View File

@ -59,8 +59,8 @@ async def follow(_, info, what, slug):
[author] = get_with_stat(select(Author).filter(Author.slug == slug)) [author] = get_with_stat(select(Author).filter(Author.slug == slug))
if author: if author:
author_dict = author.dict() author_dict = author.dict()
author_id = int(author_dict.get('id', 0)) author_id = int(author_dict.get("id", 0))
follows_ids = set(int(a.get('id')) for a in follows) follows_ids = set(int(a.get("id")) for a in follows)
if author_id not in follows_ids: if author_id not in follows_ids:
await cache_author(author_dict) await cache_author(author_dict)
await cache_author(follower_dict) await cache_author(follower_dict)

30
services/cache.py
View File

@ -16,17 +16,19 @@ async def cache_author(author: dict):
author_id = author.get("id") author_id = author.get("id")
payload = json.dumps(author, cls=CustomJSONEncoder) payload = json.dumps(author, cls=CustomJSONEncoder)
await redis.execute("SET", f'user:{author.get("user")}', payload) 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 <authors> list # update stat all field for followers' caches in <authors> list
followers_str = await redis.execute("GET", f'author:{author_id}:followers') followers_str = await redis.execute("GET", f"author:{author_id}:followers")
followers = [] followers = []
if isinstance(followers_str, str): if isinstance(followers_str, str):
followers = json.loads(followers_str) followers = json.loads(followers_str)
if isinstance(followers, list): if isinstance(followers, list):
for follower in followers: for follower in followers:
follower_follows_authors = [] 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): if isinstance(follower_follows_authors_str, str):
follower_follows_authors = json.loads(follower_follows_authors_str) follower_follows_authors = json.loads(follower_follows_authors_str)
c = 0 c = 0
@ -40,14 +42,16 @@ async def cache_author(author: dict):
follower_follows_authors.append(author) follower_follows_authors.append(author)
# update stat field for all authors' caches in <followers> list # update stat field for all authors' caches in <followers> 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 = [] follows_authors = []
if isinstance(follows_str, str): if isinstance(follows_str, str):
follows_authors = json.loads(follows_str) follows_authors = json.loads(follows_str)
if isinstance(follows_authors, list): if isinstance(follows_authors, list):
for followed_author in follows_authors: for followed_author in follows_authors:
followed_author_followers = [] 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): if isinstance(followed_author_followers_str, str):
followed_author_followers = json.loads(followed_author_followers_str) followed_author_followers = json.loads(followed_author_followers_str)
c = 0 c = 0
@ -59,7 +63,9 @@ async def cache_author(author: dict):
c += 1 c += 1
# author not found in the list, so add the new author with the updated stat field # author not found in the list, so add the new author with the updated stat field
followed_author_followers.append(author) 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): 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 = [] followers = []
if isinstance(followers_str, str): if isinstance(followers_str, str):
followers = json.loads(followers_str) followers = json.loads(followers_str)
if is_insert: if is_insert and not any([int(f["id"]) == author_id for f in followers]):
# Remove the entity from followers
followers = [e for e in followers if e["id"] != author_id]
else:
followers.append(follower) 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}") author_str = await redis.execute("GET", f"author:{follower_id}")
if isinstance(author_str, str): if isinstance(author_str, str):
author = json.loads(author_str) author = json.loads(author_str)
author["stat"]["followers"] = len(followers) author["stat"]["followers"] = len(followers)
await cache_author(author) 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 return followers