From ac1728de647d28ee50f83ac6bd7a6508892c794e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Hermida?= Date: Thu, 14 Jun 2018 09:20:27 +0200 Subject: [PATCH] Refactor migrations --- .../migrations/0060_auto_20180605_1042.py | 43 ----------------- ...606_1034.py => 0060_auto_20180614_0721.py} | 47 +++++++++++++++++-- .../migrations/0062_auto_20180606_1101.py | 33 ------------- .../migrations/0063_auto_20180606_1111.py | 32 ------------- .../migrations/0064_auto_20180606_1510.py | 27 ----------- .../migrations/0027_auto_20180605_1031.py | 20 -------- tests/integration/test_projects.py | 9 ++-- 7 files changed, 49 insertions(+), 162 deletions(-) delete mode 100644 taiga/projects/migrations/0060_auto_20180605_1042.py rename taiga/projects/migrations/{0061_auto_20180606_1034.py => 0060_auto_20180614_0721.py} (51%) delete mode 100644 taiga/projects/migrations/0062_auto_20180606_1101.py delete mode 100644 taiga/projects/migrations/0063_auto_20180606_1111.py delete mode 100644 taiga/projects/migrations/0064_auto_20180606_1510.py delete mode 100644 taiga/users/migrations/0027_auto_20180605_1031.py diff --git a/taiga/projects/migrations/0060_auto_20180605_1042.py b/taiga/projects/migrations/0060_auto_20180605_1042.py deleted file mode 100644 index 134f15bd..00000000 --- a/taiga/projects/migrations/0060_auto_20180605_1042.py +++ /dev/null @@ -1,43 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.2 on 2018-06-05 10:42 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('projects', '0059_auto_20170116_1633'), - ] - - operations = [ - migrations.CreateModel( - name='UserStoryDueDate', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=255, verbose_name='name')), - ('slug', models.SlugField(blank=True, max_length=255, verbose_name='slug')), - ('order', models.IntegerField(default=10, verbose_name='order')), - ('by_default', models.BooleanField(default=False, verbose_name='by default')), - ('color', models.CharField(default='#999999', max_length=20, verbose_name='color')), - ('days_to_due', models.IntegerField(blank=True, default=None, null=True, verbose_name='days to due')), - ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='us_duedates', to='projects.Project', verbose_name='project')), - ], - options={ - 'verbose_name': 'user story due date', - 'verbose_name_plural': 'user story due dates', - 'ordering': ['project', 'order', 'name'], - }, - ), - migrations.AddField( - model_name='project', - name='default_us_duedate', - field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='projects.UserStoryDueDate', verbose_name='default US duedate'), - ), - migrations.AlterUniqueTogether( - name='userstoryduedate', - unique_together=set([('project', 'slug'), ('project', 'name')]), - ), - ] diff --git a/taiga/projects/migrations/0061_auto_20180606_1034.py b/taiga/projects/migrations/0060_auto_20180614_0721.py similarity index 51% rename from taiga/projects/migrations/0061_auto_20180606_1034.py rename to taiga/projects/migrations/0060_auto_20180614_0721.py index 5ed52004..d93f6dbe 100644 --- a/taiga/projects/migrations/0061_auto_20180606_1034.py +++ b/taiga/projects/migrations/0060_auto_20180614_0721.py @@ -1,15 +1,17 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.2 on 2018-06-06 10:34 +# Generated by Django 1.11.2 on 2018-06-14 07:21 from __future__ import unicode_literals +import django.core.serializers.json from django.db import migrations, models import django.db.models.deletion +import taiga.base.db.models.fields.json class Migration(migrations.Migration): dependencies = [ - ('projects', '0060_auto_20180605_1042'), + ('projects', '0059_auto_20170116_1633'), ] operations = [ @@ -49,12 +51,49 @@ class Migration(migrations.Migration): 'ordering': ['project', 'order', 'name'], }, ), + migrations.CreateModel( + name='UserStoryDueDate', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255, verbose_name='name')), + ('slug', models.SlugField(blank=True, max_length=255, verbose_name='slug')), + ('order', models.IntegerField(default=10, verbose_name='order')), + ('by_default', models.BooleanField(default=False, verbose_name='by default')), + ('color', models.CharField(default='#999999', max_length=20, verbose_name='color')), + ('days_to_due', models.IntegerField(blank=True, default=None, null=True, verbose_name='days to due')), + ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='us_duedates', to='projects.Project', verbose_name='project')), + ], + options={ + 'verbose_name': 'user story due date', + 'verbose_name_plural': 'user story due dates', + 'ordering': ['project', 'order', 'name'], + }, + ), + migrations.AddField( + model_name='projecttemplate', + name='issue_duedates', + field=taiga.base.db.models.fields.json.JSONField(blank=True, encoder=django.core.serializers.json.DjangoJSONEncoder, null=True, verbose_name='issue duedates'), + ), + migrations.AddField( + model_name='projecttemplate', + name='task_duedates', + field=taiga.base.db.models.fields.json.JSONField(blank=True, encoder=django.core.serializers.json.DjangoJSONEncoder, null=True, verbose_name='task duedates'), + ), + migrations.AddField( + model_name='projecttemplate', + name='us_duedates', + field=taiga.base.db.models.fields.json.JSONField(blank=True, encoder=django.core.serializers.json.DjangoJSONEncoder, null=True, verbose_name='us duedates'), + ), + migrations.AlterUniqueTogether( + name='userstoryduedate', + unique_together=set([('project', 'slug'), ('project', 'name')]), + ), migrations.AlterUniqueTogether( name='taskduedate', - unique_together=set([('project', 'name'), ('project', 'slug')]), + unique_together=set([('project', 'slug'), ('project', 'name')]), ), migrations.AlterUniqueTogether( name='issueduedate', - unique_together=set([('project', 'name'), ('project', 'slug')]), + unique_together=set([('project', 'slug'), ('project', 'name')]), ), ] diff --git a/taiga/projects/migrations/0062_auto_20180606_1101.py b/taiga/projects/migrations/0062_auto_20180606_1101.py deleted file mode 100644 index 20ee151e..00000000 --- a/taiga/projects/migrations/0062_auto_20180606_1101.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.2 on 2018-06-06 11:01 -from __future__ import unicode_literals - -import django.core.serializers.json -from django.db import migrations, models -import django.db.models.deletion -import taiga.base.db.models.fields.json - - -class Migration(migrations.Migration): - - dependencies = [ - ('projects', '0061_auto_20180606_1034'), - ] - - operations = [ - migrations.AddField( - model_name='project', - name='default_issue_duedate', - field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='projects.IssueDueDate', verbose_name='default issue duedate'), - ), - migrations.AddField( - model_name='project', - name='default_task_duedate', - field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='projects.TaskDueDate', verbose_name='default task duedate'), - ), - migrations.AddField( - model_name='projecttemplate', - name='us_duedates', - field=taiga.base.db.models.fields.json.JSONField(blank=True, encoder=django.core.serializers.json.DjangoJSONEncoder, null=True, verbose_name='us statuses'), - ), - ] diff --git a/taiga/projects/migrations/0063_auto_20180606_1111.py b/taiga/projects/migrations/0063_auto_20180606_1111.py deleted file mode 100644 index 08ca017a..00000000 --- a/taiga/projects/migrations/0063_auto_20180606_1111.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.2 on 2018-06-06 11:11 -from __future__ import unicode_literals - -import django.core.serializers.json -from django.db import migrations -import taiga.base.db.models.fields.json - - -class Migration(migrations.Migration): - - dependencies = [ - ('projects', '0062_auto_20180606_1101'), - ] - - operations = [ - migrations.AddField( - model_name='projecttemplate', - name='issue_duedates', - field=taiga.base.db.models.fields.json.JSONField(blank=True, encoder=django.core.serializers.json.DjangoJSONEncoder, null=True, verbose_name='issue duedates'), - ), - migrations.AddField( - model_name='projecttemplate', - name='task_duedates', - field=taiga.base.db.models.fields.json.JSONField(blank=True, encoder=django.core.serializers.json.DjangoJSONEncoder, null=True, verbose_name='task duedates'), - ), - migrations.AlterField( - model_name='projecttemplate', - name='us_duedates', - field=taiga.base.db.models.fields.json.JSONField(blank=True, encoder=django.core.serializers.json.DjangoJSONEncoder, null=True, verbose_name='us duedates'), - ), - ] diff --git a/taiga/projects/migrations/0064_auto_20180606_1510.py b/taiga/projects/migrations/0064_auto_20180606_1510.py deleted file mode 100644 index 6aaa837a..00000000 --- a/taiga/projects/migrations/0064_auto_20180606_1510.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.2 on 2018-06-06 15:10 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('projects', '0063_auto_20180606_1111'), - ] - - operations = [ - migrations.RemoveField( - model_name='project', - name='default_issue_duedate', - ), - migrations.RemoveField( - model_name='project', - name='default_task_duedate', - ), - migrations.RemoveField( - model_name='project', - name='default_us_duedate', - ), - ] diff --git a/taiga/users/migrations/0027_auto_20180605_1031.py b/taiga/users/migrations/0027_auto_20180605_1031.py deleted file mode 100644 index 7382fcb5..00000000 --- a/taiga/users/migrations/0027_auto_20180605_1031.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.2 on 2018-06-05 10:31 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0026_auto_20180514_1513'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='read_new_terms', - field=models.BooleanField(default=False, verbose_name='new terms read'), - ), - ] diff --git a/tests/integration/test_projects.py b/tests/integration/test_projects.py index cc0e896a..bac49ebf 100644 --- a/tests/integration/test_projects.py +++ b/tests/integration/test_projects.py @@ -2355,7 +2355,8 @@ def test_prevent_delete_us_default_due_dates(client): project = f.create_project() f.MembershipFactory(user=project.owner, project=project, is_admin=True) - url = reverse('userstory-due-dates-detail', kwargs={"pk": 1}) + url = reverse('userstory-due-dates-detail', + kwargs={"pk": project.us_duedates.last().pk}) client.login(project.owner) response = client.json.delete(url) @@ -2428,7 +2429,8 @@ def test_prevent_delete_task_default_due_dates(client): project = f.create_project() f.MembershipFactory(user=project.owner, project=project, is_admin=True) - url = reverse('task-due-dates-detail', kwargs={"pk": 1}) + url = reverse('task-due-dates-detail', + kwargs={"pk": project.task_duedates.last().pk}) client.login(project.owner) response = client.json.delete(url) @@ -2501,7 +2503,8 @@ def test_prevent_delete_issue_default_due_dates(client): project = f.create_project() f.MembershipFactory(user=project.owner, project=project, is_admin=True) - url = reverse('issue-due-dates-detail', kwargs={"pk": 1}) + url = reverse('issue-due-dates-detail', + kwargs={"pk": project.issue_duedates.last().pk}) client.login(project.owner) response = client.json.delete(url)