From 96a88e2478f1f926194bbe08667ceef367078378 Mon Sep 17 00:00:00 2001
From: Kuroshini <o.hayatov@id-east.ru>
Date: Wed, 5 Feb 2020 15:06:44 +0300
Subject: [PATCH] notification messages fix

---
 apps/account/tasks.py            | 37 ++++++++++++++++++++++++--------
 apps/establishment/views/back.py |  2 +-
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/apps/account/tasks.py b/apps/account/tasks.py
index fbaae1ce..86ec63f3 100644
--- a/apps/account/tasks.py
+++ b/apps/account/tasks.py
@@ -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}')
     message = user.invite_new_establishment_member_template(country_code, user.username,
                                                             subject, restaurant_name, user_role_id)
-    user.send_email(subject=subject,
-                    message=message,
-                    emails=None)
+    try:
+        user.send_email(subject=subject,
+                        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
@@ -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}')
     message = user.invite_establishment_member_template(country_code, user.username,
                                                         subject, restaurant_name, user_role_id)
-    user.send_email(subject=subject,
-                    message=message,
-                    emails=None)
+    try:
+        user.send_email(subject=subject,
+                        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
@@ -63,9 +76,15 @@ def team_role_revoked(user_id, country_code, restaurant_name):
     user = User.objects.get(id=user_id)
     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)
-    user.send_email(subject=subject,
-                    message=message,
-                    emails=None)
+    try:
+        user.send_email(subject=subject,
+                        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
diff --git a/apps/establishment/views/back.py b/apps/establishment/views/back.py
index ce032658..dc7618ca 100644
--- a/apps/establishment/views/back.py
+++ b/apps/establishment/views/back.py
@@ -943,7 +943,7 @@ class TeamMemberDeleteView(generics.DestroyAPIView):
     def perform_destroy(self, instance):
         instance.delete()
         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:
             team_role_revoked.delay(self.kwargs['user_id'], self.request.country_code, establishment.name)
         else: