From ac8356c7d18da921a21081da672264bff5440361 Mon Sep 17 00:00:00 2001
From: Kuroshini <o.hayatov@id-east.ru>
Date: Fri, 27 Sep 2019 19:03:30 +0300
Subject: [PATCH] Fix some test && routes && add migration

---
 apps/favorites/tests.py                  |  2 +-
 apps/news/migrations/0019_news_author.py | 18 ++++++++++++++++++
 apps/news/models.py                      |  2 +-
 apps/news/tests.py                       |  2 +-
 apps/utils/tests.py                      |  2 +-
 5 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 apps/news/migrations/0019_news_author.py

diff --git a/apps/favorites/tests.py b/apps/favorites/tests.py
index 208cf0db..99b01444 100644
--- a/apps/favorites/tests.py
+++ b/apps/favorites/tests.py
@@ -27,7 +27,7 @@ class BaseTestCase(APITestCase):
                                              news_type=self.test_news_type,
                                              description={"en-GB": "Description test news"},
                                              playlist=1, start="2020-12-03 12:00:00", end="2020-12-13 12:00:00",
-                                             is_publish=True)
+                                             state=News.PUBLISHED, slug='test-news')
 
         self.test_content_type = ContentType.objects.get(app_label="news", model="news")
 
diff --git a/apps/news/migrations/0019_news_author.py b/apps/news/migrations/0019_news_author.py
new file mode 100644
index 00000000..41985255
--- /dev/null
+++ b/apps/news/migrations/0019_news_author.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.4 on 2019-09-27 15:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('news', '0018_merge_20190927_1432'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='news',
+            name='author',
+            field=models.CharField(blank=True, default=None, max_length=255, null=True, verbose_name='Author'),
+        ),
+    ]
diff --git a/apps/news/models.py b/apps/news/models.py
index 2c6229be..e6967d00 100644
--- a/apps/news/models.py
+++ b/apps/news/models.py
@@ -39,7 +39,7 @@ class NewsQuerySet(models.QuerySet):
         now = timezone.now()
         return self.filter(models.Q(models.Q(end__gte=now) |
                                     models.Q(end__isnull=True)),
-                           state__in=[self.model.PUBLISHED_STATES], start__lte=now)
+                           state__in=self.model.PUBLISHED_STATES, start__lte=now)
 
     def with_related(self):
         """Return qs with related objects."""
diff --git a/apps/news/tests.py b/apps/news/tests.py
index 7d6724d7..2e24ac45 100644
--- a/apps/news/tests.py
+++ b/apps/news/tests.py
@@ -26,7 +26,7 @@ class BaseTestCase(APITestCase):
                                              news_type=self.test_news_type, description={"en-GB": "Description test news"},
                                              playlist=1, start=datetime.now() + timedelta(hours=-2),
                                              end=datetime.now() + timedelta(hours=2),
-                                             is_publish=True, slug='test-news-slug',)
+                                             state=News.PUBLISHED, slug='test-news-slug',)
 
 
 class NewsTestCase(BaseTestCase):
diff --git a/apps/utils/tests.py b/apps/utils/tests.py
index 4adc2f1e..10af2a92 100644
--- a/apps/utils/tests.py
+++ b/apps/utils/tests.py
@@ -54,9 +54,9 @@ class TranslateFieldTests(BaseTestCase):
             playlist=1,
             start=datetime.now(pytz.utc) + timedelta(hours=-13),
             end=datetime.now(pytz.utc) + timedelta(hours=13),
-            is_publish=True,
             news_type=self.news_type,
             slug='test',
+            state=News.PUBLISHED,
         )
 
     def test_model_field(self):