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

Change sending subscription searcher

Browse Source
This commit is contained in:
dormantman 2020-01-28 15:09:51 +03:00
parent 4c7088abbc
commit 3b7b778a8e
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/notification/models.py
View File

@ -133,7 +133,7 @@ class Subscriber(ProjectBaseMixin):
self.update_code = generate_string_code() self.update_code = generate_string_code()
return super(Subscriber, self).save(*args, **kwargs) return super(Subscriber, self).save(*args, **kwargs)
def unsubscribe(self, query: dict): def unsubscribe(self):
"""Unsubscribe user.""" """Unsubscribe user."""
self.subscribe_set.update( self.subscribe_set.update(
@ -147,9 +147,9 @@ class Subscriber(ProjectBaseMixin):
) )
if settings.USE_CELERY: if settings.USE_CELERY:
send_unsubscribe_email.delay(self.email) send_unsubscribe_email.delay(self.pk)
else: else:
send_unsubscribe_email(self.email) send_unsubscribe_email(self.pk)
@property @property
def send_to(self): def send_to(self):

4
apps/notification/serializers/common.py
View File

@ -90,9 +90,9 @@ class CreateAndUpdateSubscribeSerializer(serializers.ModelSerializer):
subscriber = models.Subscriber.objects.make_subscriber(**validated_data) subscriber = models.Subscriber.objects.make_subscriber(**validated_data)
if settings.USE_CELERY: if settings.USE_CELERY:
send_subscribes_update_email.delay(subscriber.email) send_subscribes_update_email.delay(subscriber.pk)
else: else:
send_subscribes_update_email(subscriber.email) send_subscribes_update_email(subscriber.pk)
return subscriber return subscriber

8
apps/notification/tasks.py
View File

@ -11,8 +11,8 @@ from django.utils.translation import gettext_lazy as _
@shared_task @shared_task
def send_subscribes_update_email(email): def send_subscribes_update_email(subscriber_id):
subscriber = models.Subscriber.objects.filter(email=email).first() subscriber = models.Subscriber.objects.get(pk=subscriber_id)
if subscriber is None: if subscriber is None:
return return
@ -53,8 +53,8 @@ def send_subscribes_update_email(email):
@shared_task @shared_task
def send_unsubscribe_email(email): def send_unsubscribe_email(subscriber_id):
subscriber = models.Subscriber.objects.filter(email=email).first() subscriber = models.Subscriber.objects.get(pk=subscriber_id)
if subscriber is None: if subscriber is None:
return return

4
apps/notification/views/common.py
View File

@ -70,7 +70,7 @@ class UnsubscribeView(generics.UpdateAPIView):
def put(self, request, *args, **kw): def put(self, request, *args, **kw):
obj = self.get_object() obj = self.get_object()
obj.unsubscribe(request.query_params) obj.unsubscribe()
serializer = self.get_serializer(instance=obj) serializer = self.get_serializer(instance=obj)
return Response(data=serializer.data) return Response(data=serializer.data)
@ -85,7 +85,7 @@ class UnsubscribeAuthUserView(generics.GenericAPIView):
def patch(self, request, *args, **kw): def patch(self, request, *args, **kw):
user = request.user user = request.user
obj = models.Subscriber.objects.filter(user=user).first() obj = models.Subscriber.objects.filter(user=user).first()
obj.unsubscribe(request.query_params) obj.unsubscribe()
serializer = self.get_serializer(instance=obj) serializer = self.get_serializer(instance=obj)
return Response(data=serializer.data) return Response(data=serializer.data)