From c78c6a67b1398a51e4eaa6a3dc1217856012e6cd Mon Sep 17 00:00:00 2001 From: dormantman Date: Wed, 22 Jan 2020 17:15:49 +0300 Subject: [PATCH] Fixed subscriptions unsubscribe --- apps/notification/views/common.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/apps/notification/views/common.py b/apps/notification/views/common.py index b6584394..a0534d13 100644 --- a/apps/notification/views/common.py +++ b/apps/notification/views/common.py @@ -46,14 +46,13 @@ class SubscribeInfoAuthUserView(generics.RetrieveAPIView): def get_object(self): user = self.request.user - if user.is_authenticated: - subscriber = models.Subscriber.objects.filter(user=user).first() + subscriber = models.Subscriber.objects.filter(user=user).first() - if subscriber is None: - subscriber = models.Subscriber.objects.make_subscriber( - email=user.email, user=user, ip_address=get_user_ip(self.request), - country_code=self.request.country_code, locale=self.request.locale - ) + if subscriber is None: + subscriber = models.Subscriber.objects.make_subscriber( + email=user.email, user=user, ip_address=get_user_ip(self.request), + country_code=self.request.country_code, locale=self.request.locale + ) else: return get_object_or_404(models.Subscriber, user=user) @@ -86,7 +85,7 @@ class UnsubscribeAuthUserView(generics.GenericAPIView): def patch(self, request, *args, **kw): user = request.user - obj = get_object_or_404(models.Subscriber, user=user) + obj = models.Subscriber.objects.filter(user=user).first() obj.unsubscribe(request.query_params) serializer = self.get_serializer(instance=obj) return Response(data=serializer.data)