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

Fix issues with test && recreate migrations

Browse Source
This commit is contained in:
Kuroshini 2019-09-24 12:06:11 +03:00
parent 2cc0d01d79
commit d224c77a01
15 changed files with 79 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
apps/collection/migrations/0012_collection_slug.py
View File

@ -1,34 +0,0 @@
# Generated by Django 2.2.4 on 2019-09-23 12:55
from django.db import migrations
import django_extensions.db.fields
from collection.models import Collection
def migrate_data_forward(apps, schema_editor):
for instance in Collection.objects.all():
print("Generating slug for %s" % instance)
instance.save() # Will trigger slug update
def migrate_data_backward(apps, schema_editor):
pass
class Migration(migrations.Migration):
dependencies = [
('collection', '0011_auto_20190920_1059'),
]
operations = [
migrations.AddField(
model_name='collection',
name='slug',
field=django_extensions.db.fields.AutoSlugField(blank=True, editable=True, populate_from=['name', 'pk'], db_index=True, verbose_name='Collection slug'),
),
migrations.RunPython(
migrate_data_forward,
migrate_data_backward,
),
]

38
apps/collection/migrations/0013_auto_20190923_1505.py
View File

@ -1,38 +0,0 @@
# Generated by Django 2.2.4 on 2019-09-23 15:05
from django.core.validators import EMPTY_VALUES
from django.db import migrations, models
from collection.models import Collection
def migrate_data_forward(apps, schema_editor):
for instance in Collection.objects.all():
if instance.slug in EMPTY_VALUES:
instance.slug = None
instance.save(update_fields=['slug'])
def migrate_data_backward(apps, schema_editor):
pass
class Migration(migrations.Migration):
dependencies = [
('collection', '0012_collection_slug'),
]
operations = [
migrations.AlterField(
model_name='collection',
name='slug',
field=models.SlugField(null=True, verbose_name='Collection slug'),
),
migrations.RunPython(
migrate_data_forward,
migrate_data_backward,
),
migrations.AlterField(
model_name='collection',
name='slug',
field=models.SlugField(null=True, unique=True, verbose_name='Collection slug'),
),
]

18
apps/collection/migrations/0013_collection_slug.py Normal file
View File

@ -0,0 +1,18 @@
# Generated by Django 2.2.4 on 2019-09-24 08:06
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('collection', '0012_auto_20190923_1340'),
]
operations = [
migrations.AddField(
model_name='collection',
name='slug',
field=models.SlugField(null=True, unique=True, verbose_name='Collection slug'),
),
]

13
apps/collection/tests.py
View File

@ -20,11 +20,11 @@ class BaseTestCase(APITestCase):
self.newsletter = True
self.user = User.objects.create_user(
username=self.username, email=self.email, password=self.password)
#get tokkens
tokkens = User.create_jwt_tokens(self.user)
#get tokens
tokens = User.create_jwt_tokens(self.user)
self.client.cookies = SimpleCookie(
{'access_token': tokkens.get('access_token'),
'refresh_token': tokkens.get('refresh_token'),
{'access_token': tokens.get('access_token'),
'refresh_token': tokens.get('refresh_token'),
'country_code': 'en'})
@ -51,11 +51,12 @@ class CollectionDetailTests(BaseTestCase):
is_publish=True,
start=datetime.now(pytz.utc),
end=datetime.now(pytz.utc),
country=country
country=country,
slug='test-collection-slug',
)
def test_collection_detail_Read(self):
response = self.client.get(f'/api/web/collections/{self.collection.id}/establishments/?country_code=en',
response = self.client.get(f'/api/web/collections/{self.collection.slug}/establishments/?country_code=en',
format='json')
self.assertEqual(response.status_code, status.HTTP_200_OK)

33
apps/establishment/migrations/0029_establishment_slug.py
View File

@ -1,33 +0,0 @@
# Generated by Django 2.2.4 on 2019-09-23 12:55
from django.db import migrations
import django_extensions.db.fields
from establishment.models import Establishment
def migrate_data_forward(apps, schema_editor):
for instance in Establishment.objects.all():
print("Generating slug for %s" % instance)
instance.save() # Will trigger slug update
def migrate_data_backward(apps, schema_editor):
pass
class Migration(migrations.Migration):
dependencies = [
('establishment', '0028_auto_20190920_1205'),
]
operations = [
migrations.AddField(
model_name='establishment',
name='slug',
field=django_extensions.db.fields.AutoSlugField(blank=True, editable=True, populate_from=['name'], db_index=True, verbose_name='Establishment slug'),
),
migrations.RunPython(
migrate_data_forward,
migrate_data_backward,
),
]

39
apps/establishment/migrations/0030_auto_20190923_1505.py
View File

@ -1,39 +0,0 @@
# Generated by Django 2.2.4 on 2019-09-23 15:05
from django.core.validators import EMPTY_VALUES
from django.db import migrations, models
from establishment.models import Establishment
def migrate_data_forward(apps, schema_editor):
for instance in Establishment.objects.all():
if instance.slug in EMPTY_VALUES:
instance.slug = None
instance.save(update_fields=['slug'])
def migrate_data_backward(apps, schema_editor):
pass
class Migration(migrations.Migration):
dependencies = [
('establishment', '0029_establishment_slug'),
]
operations = [
migrations.AlterField(
model_name='establishment',
name='slug',
field=models.SlugField(null=True, verbose_name='Establishment slug'),
),
migrations.RunPython(
migrate_data_forward,
migrate_data_backward,
),
migrations.AlterField(
model_name='establishment',
name='slug',
field=models.SlugField(unique=True, null=True, verbose_name='Establishment slug'),
),
]

18
apps/establishment/migrations/0031_establishment_slug.py Normal file
View File

@ -0,0 +1,18 @@
# Generated by Django 2.2.4 on 2019-09-24 08:06
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('establishment', '0030_auto_20190923_1340'),
]
operations = [
migrations.AddField(
model_name='establishment',
name='slug',
field=models.SlugField(null=True, unique=True, verbose_name='Establishment slug'),
),
]

6
apps/establishment/tests.py
View File

@ -29,13 +29,15 @@ class BaseTestCase(APITestCase):
class EstablishmentTests(BaseTestCase):
def test_establishment_CRUD(self):
response = self.client.get('/api/back/establishments/', format='json')
params = {'page': 1, 'page_size': 1,}
response = self.client.get('/api/back/establishments/', params, format='json')
self.assertEqual(response.status_code, status.HTTP_200_OK)
data = {
'name': 'Test establishment',
'type_id': self.establishment_type.id,
'is_publish': True
'is_publish': True,
'slug': 'test-establishment-slug',
}
response = self.client.post('/api/back/establishments/', data=data, format='json')

1
apps/favorites/tests.py
View File

@ -38,7 +38,6 @@ class BaseTestCase(APITestCase):
use_subtypes=False)
self.test_establishment = Establishment.objects.create(name="test establishment",
name_transliterated="test-establishment",
description={"en-GB": "description of test establishment"},
establishment_type=self.test_establishment_type,
is_publish=True)

33
apps/news/migrations/0010_news_slug.py
View File

@ -1,33 +0,0 @@
# Generated by Django 2.2.4 on 2019-09-23 12:55
from django.db import migrations
import django_extensions.db.fields
from news.models import News
def migrate_data_forward(apps, schema_editor):
for instance in News.objects.all():
print("Generating slug for %s" % instance)
instance.save() # Will trigger slug update
def migrate_data_backward(apps, schema_editor):
pass
class Migration(migrations.Migration):
dependencies = [
('news', '0009_auto_20190901_1032'),
]
operations = [
migrations.AddField(
model_name='news',
name='slug',
field=django_extensions.db.fields.AutoSlugField(blank=True, editable=True, populate_from=['title'], db_index=True, verbose_name='News slug'),
),
migrations.RunPython(
migrate_data_forward,
migrate_data_backward,
),
]

38
apps/news/migrations/0011_auto_20190923_1505.py
View File

@ -1,38 +0,0 @@
# Generated by Django 2.2.4 on 2019-09-23 15:05
from django.core.validators import EMPTY_VALUES
from django.db import migrations, models
from news.models import News
def migrate_data_forward(apps, schema_editor):
for instance in News.objects.all():
if instance.slug in EMPTY_VALUES:
instance.slug = None
instance.save(update_fields=['slug'])
def migrate_data_backward(apps, schema_editor):
pass
class Migration(migrations.Migration):
dependencies = [
('news', '0010_news_slug'),
]
operations = [
migrations.AlterField(
model_name='news',
name='slug',
field=models.SlugField(null=True, verbose_name='News slug'),
),
migrations.RunPython(
migrate_data_forward,
migrate_data_backward,
),
migrations.AlterField(
model_name='news',
name='slug',
field=models.SlugField(null=True, unique=True, verbose_name='News slug'),
),
]

25
apps/news/migrations/0013_auto_20190924_0806.py Normal file
View File

@ -0,0 +1,25 @@
# Generated by Django 2.2.4 on 2019-09-24 08:06
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('gallery', '0001_initial'),
('news', '0012_auto_20190923_1416'),
]
operations = [
migrations.AddField(
model_name='news',
name='image',
field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='gallery.Image', verbose_name='News image'),
),
migrations.AddField(
model_name='news',
name='slug',
field=models.SlugField(null=True, unique=True, verbose_name='News slug'),
),
]

11
apps/news/tests.py
View File

@ -1,8 +1,8 @@
from http.cookies import SimpleCookie
from django.test import TestCase
from rest_framework.test import APITestCase
from rest_framework import status
from datetime import datetime, timedelta
from news.models import NewsType, News
from account.models import User
@ -24,8 +24,9 @@ class BaseTestCase(APITestCase):
self.test_news_type = NewsType.objects.create(name="Test news type")
self.test_news = News.objects.create(created_by=self.user, modified_by=self.user, title={"en-GB": "Test news"},
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)
playlist=1, start=datetime.now() + timedelta(hours=-2),
end=datetime.now() + timedelta(hours=2),
is_publish=True, slug='test-news-slug',)
class NewsTestCase(BaseTestCase):
@ -35,10 +36,10 @@ class NewsTestCase(BaseTestCase):
self.assertEqual(response.status_code, status.HTTP_200_OK)
def test_news_detail(self):
response = self.client.get(f"/api/web/news/{self.test_news.id}/")
response = self.client.get(f"/api/web/news/{self.test_news.slug}/")
self.assertEqual(response.status_code, status.HTTP_200_OK)
def test_news_type_list(self):
response = self.client.get("/api/web/news/type/")
response = self.client.get("/api/web/news/types/")
self.assertEqual(response.status_code, status.HTTP_200_OK)

1
apps/news/urls/back.py
View File

@ -8,4 +8,5 @@ urlpatterns = [
path('', views.NewsBackOfficeLCView.as_view(), name='list-create'),
path('<int:pk>/', views.NewsBackOfficeRUDView.as_view(),
name='retrieve-update-destroy'),
path('types/', views.NewsTypeListView.as_view(), name='type-news'),
]

1
apps/news/views.py
View File

@ -20,7 +20,6 @@ class NewsMixinView:
class NewsListView(NewsMixinView, generics.ListAPIView):
"""News list view."""
filter_class = filters.NewsListFilterSet