From 6297ec5826bcca812b73427de78f1a25ddb37dc2 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Sun, 1 Jul 2018 18:26:33 +0300 Subject: [PATCH] Fix https://sentry.lil.school/lil/backend/issues/13/ --- apps/user/models.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/apps/user/models.py b/apps/user/models.py index e3b0cc7b..7391b0c8 100644 --- a/apps/user/models.py +++ b/apps/user/models.py @@ -135,18 +135,11 @@ def send_user_info_to_mixpanel(sender, instance=None, created=False, **kwargs): @receiver(post_save, sender=User) def auto_create_subscription(sender, instance=None, created=False, **kwargs): - try: - es = EmailSubscription.objects.get(email=instance.email) - if not hasattr(instance, 'email_subscription'): - es.user = instance - es.save() - except EmailSubscription.DoesNotExist: - instance.email_subscription = EmailSubscription.objects.create( - user=instance, - email=instance.email, - ) + if created: + es, created = EmailSubscription.objects.get_or_create(email=instance.email) + es.user = instance + es.save() instance.email_subscription.categories.set(SubscriptionCategory.objects.filter(auto_add=True)) - instance.save() class AuthorRequestManager(models.Manager):