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

notifications logic update (#93)

Browse Source 
Co-authored-by: Igor Lobanov <igor.lobanov@onetwotrip.com>
This commit is contained in:
Ilya Y 2023-10-16 11:16:01 +03:00 committed by GitHub
parent 6c8d6c978c
commit aa7ce6bc6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.py
View File

@ -77,15 +77,13 @@ routes = [
] ]
app = Starlette( app = Starlette(
debug=True,
on_startup=[start_up], on_startup=[start_up],
on_shutdown=[shutdown], on_shutdown=[shutdown],
middleware=middleware, middleware=middleware,
routes=routes, routes=routes,
) )
app.mount("/", GraphQL( app.mount("/", GraphQL(
schema, schema
debug=True
)) ))
dev_app = Starlette( dev_app = Starlette(

19
services/notifications/notification_service.py
View File

@ -27,11 +27,12 @@ def user_to_user_data(user):
} }
def update_prev_notification(notification, user): def update_prev_notification(notification, user, reaction):
notification_data = json.loads(notification.data) notification_data = json.loads(notification.data)
notification_data["users"] = [u for u in notification_data["users"] if u['id'] != user.id] notification_data["users"] = [u for u in notification_data["users"] if u['id'] != user.id]
notification_data["users"].append(user_to_user_data(user)) notification_data["users"].append(user_to_user_data(user))
notification_data["reactionIds"].append(reaction.id)
notification.data = json.dumps(notification_data, ensure_ascii=False) notification.data = json.dumps(notification_data, ensure_ascii=False)
notification.seen = False notification.seen = False
@ -60,16 +61,18 @@ class NewReactionNotificator:
Notification.user == shout.createdBy, Notification.user == shout.createdBy,
Notification.type == NotificationType.NEW_REPLY, Notification.type == NotificationType.NEW_REPLY,
Notification.shout == shout.id, Notification.shout == shout.id,
Notification.reaction == parent_reaction.id Notification.reaction == parent_reaction.id,
Notification.seen == False
) )
).first() ).first()
if prev_new_reply_notification: if prev_new_reply_notification:
update_prev_notification(prev_new_reply_notification, user) update_prev_notification(prev_new_reply_notification, user, reaction)
else: else:
reply_notification_data = json.dumps({ reply_notification_data = json.dumps({
"shout": shout_to_shout_data(shout), "shout": shout_to_shout_data(shout),
"users": [user_to_user_data(user)] "users": [user_to_user_data(user)],
"reactionIds": [reaction.id]
}, ensure_ascii=False) }, ensure_ascii=False)
reply_notification = Notification.create(**{ reply_notification = Notification.create(**{
@ -91,16 +94,18 @@ class NewReactionNotificator:
and_( and_(
Notification.user == shout.createdBy, Notification.user == shout.createdBy,
Notification.type == NotificationType.NEW_COMMENT, Notification.type == NotificationType.NEW_COMMENT,
Notification.shout == shout.id Notification.shout == shout.id,
Notification.seen == False
) )
).first() ).first()
if prev_new_comment_notification: if prev_new_comment_notification:
update_prev_notification(prev_new_comment_notification, user) update_prev_notification(prev_new_comment_notification, user, reaction)
else: else:
notification_data_string = json.dumps({ notification_data_string = json.dumps({
"shout": shout_to_shout_data(shout), "shout": shout_to_shout_data(shout),
"users": [user_to_user_data(user)] "users": [user_to_user_data(user)],
"reactionIds": [reaction.id]
}, ensure_ascii=False) }, ensure_ascii=False)
author_notification = Notification.create(**{ author_notification = Notification.create(**{