Merge branch 'feature/news-subscription' into develop

apps/news/tasks.py

@@ -9,25 +9,32 @@ from django.template.loader import get_template, render_to_string
 
 from main.models import SiteSettings
 from news import models
-from notification.models import Subscriber
+from notification.models import Subscribe
 
 
 @shared_task
 def send_email_with_news(news_ids):
-    subscribers = Subscriber.objects.all()
+    subscribes = Subscribe.objects.all() \
+        .prefetch_related('subscriber') \
+        .prefetch_related('subscription_type')
     sent_news = models.News.objects.filter(id__in=news_ids)
 
     htmly = get_template(settings.NEWS_EMAIL_TEMPLATE)
     year = datetime.now().year
 
-    socials = list(SiteSettings.objects.with_country())
+    socials = list(SiteSettings.objects.with_country().select_related('country'))
     socials = dict(zip(map(lambda social: social.country.code, socials), socials))
 
-    for subscriber in subscribers:
+    for subscribe in subscribes.filter(unsubscribe_date=None):
-        socials_for_subscriber = socials.get(subscriber.country_code)
+        country = subscribe.subscription_type.country
+
+        if country is None:
+            continue
+
+        socials_for_subscriber = socials.get(country.code)
+        subscriber = subscribe.subscriber
+
         try:
-            # TODO: вот тут надо учесть, подписки на какие страны есть у юзера активные (нулл время отписки) и не посылать лишнего
-            # TODO: обрати внимание на кол-во запросов в БД плс. они пишутся в консоль
             for new in sent_news:
                 context = {
                     "title": new.title.get(subscriber.locale),

apps/notification/migrations/0009_subscriptiontype_country.py

@@ -0,0 +1,20 @@
+# Generated by Django 2.2.7 on 2019-12-31 01:31
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('location', '0033_merge_20191224_0920'),
+        ('notification', '0008_remove_subscribe_state'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='subscriptiontype',
+            name='country',
+            field=models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='location.Country', verbose_name='Country'),
+        ),
+    ]

apps/notification/migrations/0010_auto_20191231_0135.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.2.7 on 2019-12-31 01:35
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('notification', '0009_subscriptiontype_country'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='subscriptiontype',
+            name='country',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.PROTECT, to='location.Country', verbose_name='country'),
+        ),
+    ]

apps/notification/models.py

@@ -6,6 +6,7 @@ from django.utils.timezone import now
 from django.utils.translation import ugettext_lazy as _
 
 from account.models import User
+from location.models import Country
 from utils.methods import generate_string_code
 from utils.models import ProjectBaseMixin, TJSONField, TranslatedFieldsMixin
 
@@ -15,7 +16,9 @@ class SubscriptionType(ProjectBaseMixin, TranslatedFieldsMixin):
     name = TJSONField(blank=True, null=True, default=None,
                       verbose_name=_('name'),
                       help_text='{"en-GB":"some text"}')
-    # TODO: не хватает связи со страной. ForeignKey
+    country = models.ForeignKey(Country, on_delete=models.PROTECT,
+                                blank=True, null=True, default=None,
+                                verbose_name=_('country'))
 
 
 # todo: associate user & subscriber after users registration
@@ -127,10 +130,6 @@ class Subscriber(ProjectBaseMixin):
         query = f'?code={self.update_code}'
         return f'{schema}://{site_domain}{url}{query}'
 
-    @property
-    def subscribe_objects(self):
-        return Subscribe.objects.filter(subscriber=self)
-
 
 class Subscribe(ProjectBaseMixin):
     """Subscribe model."""

apps/notification/serializers/common.py

@@ -2,6 +2,7 @@
 from django.utils.translation import ugettext_lazy as _
 from rest_framework import serializers
 
+from location.serializers import CountrySimpleSerializer
 from notification import models
 from utils.methods import get_user_ip
 from utils.serializers import TranslatedField
@@ -11,6 +12,7 @@ class SubscriptionTypeSerializer(serializers.ModelSerializer):
     """Subscription type serializer."""
 
     name_translated = TranslatedField()
+    country = CountrySimpleSerializer()
 
     class Meta:
         """Meta class."""
@@ -20,6 +22,7 @@ class SubscriptionTypeSerializer(serializers.ModelSerializer):
             'id',
             'index_name',
             'name_translated',
+            'country',
         )
 
 
@@ -80,7 +83,7 @@ class SubscribeObjectSerializer(serializers.ModelSerializer):
         """Meta class."""
 
         model = models.Subscriber
-        fields = ()
+        fields = ('subscriber', )
         read_only_fields = ('subscribe_date', 'unsubscribe_date',)
 
 
@@ -88,8 +91,7 @@ class SubscribeSerializer(serializers.ModelSerializer):
     """Subscribe serializer."""
 
     email = serializers.EmailField(required=False, source='send_to')
-    subscription_types = SubscriptionTypeSerializer(read_only=True, source='subscription_types_set')
+    subscription_types = SubscriptionTypeSerializer(many=True, read_only=True)
-    subscribe_objects = SubscribeObjectSerializer(read_only=True)
 
     class Meta:
         """Meta class."""
@@ -99,5 +101,4 @@ class SubscribeSerializer(serializers.ModelSerializer):
             'email',
             'subscription_types',
             'link_to_unsubscribe',
-            'subscribe_objects',
         )

apps/notification/tests.py

@@ -80,7 +80,7 @@ class NotificationSubscribeInfoTestCase(APITestCase):
 class NotificationUnsubscribeAuthUserTestCase(BaseTestCase):
 
     def test_unsubscribe_auth_user(self):
-        Subscriber.objects.create(user=self.user, email=self.email, state=1)
+        Subscriber.objects.create(user=self.user, email=self.email)
 
         self.test_data = {
             "email": self.email
@@ -174,7 +174,7 @@ class NotificationManySubscribeTestCase(APITestCase):
         test_data = {
             'email': self.email,
             'subscription_types_pk': [
-                self.test_subscribe_type
+                self.test_subscribe_type.id
             ]
         }
 
@@ -183,6 +183,12 @@ class NotificationManySubscribeTestCase(APITestCase):
         self.assertEqual(response.json()["email"], test_data["email"])
 
     def test_unsubscribe(self):
+        self.username = 'sedragurda'
+        self.password = 'sedragurdaredips19'
+        self.email = 'sedragurda@desoz.com'
+        self.user = User.objects.create_user(
+            username=self.username, email=self.email, password=self.password)
+
         test_data = {
             "email": self.email
         }

apps/notification/views/common.py

@@ -28,7 +28,6 @@ class SubscribeInfoView(generics.RetrieveAPIView):
 class SubscribeInfoAuthUserView(generics.ListAPIView):
     """Subscribe info auth user view."""
 
-    # TODO: тут пользователь должен видеть свои подписки. проверь плс, что работает
     permission_classes = (permissions.IsAuthenticated,)
     serializer_class = serializers.SubscribeSerializer