phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

notification messages fix

Browse Source
This commit is contained in:
Kuroshini 2020-02-05 15:06:44 +03:00
parent 6d556665e0
commit 96a88e2478
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
apps/account/tasks.py
View File

@ -40,9 +40,15 @@ def send_team_invite_to_new_user(user_id, country_code, user_role_id, restaurant
subject = _(f'GAULT&MILLAU INVITES YOU TO MANAGE {restaurant_name}') subject = _(f'GAULT&MILLAU INVITES YOU TO MANAGE {restaurant_name}')
message = user.invite_new_establishment_member_template(country_code, user.username, message = user.invite_new_establishment_member_template(country_code, user.username,
subject, restaurant_name, user_role_id) subject, restaurant_name, user_role_id)
user.send_email(subject=subject, try:
message=message, user.send_email(subject=subject,
emails=None) message=message,
emails=None)
except:
cur_frame = inspect.currentframe()
cal_frame = inspect.getouterframes(cur_frame, 2)
logger.error(f'METHOD_NAME: {cal_frame[1][3]}\n'
f'DETAIL: Exception occurred for user: {user_id}')
@shared_task @shared_task
@ -52,9 +58,16 @@ def send_team_invite_to_existing_user(user_id, country_code, user_role_id, resta
subject = _(f'GAULT&MILLAU INVITES YOU TO MANAGE {restaurant_name}') subject = _(f'GAULT&MILLAU INVITES YOU TO MANAGE {restaurant_name}')
message = user.invite_establishment_member_template(country_code, user.username, message = user.invite_establishment_member_template(country_code, user.username,
subject, restaurant_name, user_role_id) subject, restaurant_name, user_role_id)
user.send_email(subject=subject, try:
message=message, user.send_email(subject=subject,
emails=None) message=message,
emails=None)
except:
cur_frame = inspect.currentframe()
cal_frame = inspect.getouterframes(cur_frame, 2)
logger.error(f'METHOD_NAME: {cal_frame[1][3]}\n'
f'DETAIL: Exception occurred for user: {user_id}')
@shared_task @shared_task
@ -63,9 +76,15 @@ def team_role_revoked(user_id, country_code, restaurant_name):
user = User.objects.get(id=user_id) user = User.objects.get(id=user_id)
subject = _(f'Your GAULT&MILLAU privileges to manage {restaurant_name} have been revoked.') subject = _(f'Your GAULT&MILLAU privileges to manage {restaurant_name} have been revoked.')
message = user.establishment_team_role_revoked(country_code, user.username, subject, restaurant_name) message = user.establishment_team_role_revoked(country_code, user.username, subject, restaurant_name)
user.send_email(subject=subject, try:
message=message, user.send_email(subject=subject,
emails=None) message=message,
emails=None)
except:
cur_frame = inspect.currentframe()
cal_frame = inspect.getouterframes(cur_frame, 2)
logger.error(f'METHOD_NAME: {cal_frame[1][3]}\n'
f'DETAIL: Exception occurred for user: {user_id}')
@shared_task @shared_task

2
apps/establishment/views/back.py
View File

@ -943,7 +943,7 @@ class TeamMemberDeleteView(generics.DestroyAPIView):
def perform_destroy(self, instance): def perform_destroy(self, instance):
instance.delete() instance.delete()
from account.tasks import team_role_revoked from account.tasks import team_role_revoked
establishment = models.Establishment.objects.get(ok=self.kwargs['establishment_id']) establishment = models.Establishment.objects.get(pk=self.kwargs['establishment_id'])
if settings.USE_CELERY: if settings.USE_CELERY:
team_role_revoked.delay(self.kwargs['user_id'], self.request.country_code, establishment.name) team_role_revoked.delay(self.kwargs['user_id'], self.request.country_code, establishment.name)
else: else: