From 097ee44131f5a511b6aea2b3bc578c700a2f9588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= <aurelien.delobelle@gmail.com>
Date: Tue, 17 Oct 2017 15:47:32 +0200
Subject: [PATCH] =?UTF-8?q?Organize=20migrations=20to=20avoid=20issues=20w?=
 =?UTF-8?q?ith=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…migrations already applied from master.
---
 kfet/auth/migrations/0001_initial.py          | 26 ---------
 .../0002_create_group_permission_models.py    | 54 +++++++++++++++++++
 ...ting_groups.py => 0003_existing_groups.py} |  2 +-
 ...missions.py => 0004_update_permissions.py} |  2 +-
 4 files changed, 56 insertions(+), 28 deletions(-)
 create mode 100644 kfet/auth/migrations/0002_create_group_permission_models.py
 rename kfet/auth/migrations/{0002_existing_groups.py => 0003_existing_groups.py} (92%)
 rename kfet/auth/migrations/{0003_update_permissions.py => 0004_update_permissions.py} (98%)

diff --git a/kfet/auth/migrations/0001_initial.py b/kfet/auth/migrations/0001_initial.py
index eb7ef049..061570a8 100644
--- a/kfet/auth/migrations/0001_initial.py
+++ b/kfet/auth/migrations/0001_initial.py
@@ -20,31 +20,5 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(verbose_name='ID', auto_created=True, serialize=False, primary_key=True)),
                 ('token', models.CharField(unique=True, max_length=50)),
             ],
-            options={
-                'default_permissions': (),
-            },
-        ),
-        migrations.CreateModel(
-            name='Group',
-            fields=[
-                ('group_ptr', models.OneToOneField(parent_link=True, serialize=False, primary_key=True, auto_created=True, to='auth.Group')),
-            ],
-            options={
-                'default_permissions': ('view', 'add', 'change'),
-                'verbose_name': 'Groupe',
-                'verbose_name_plural': 'Groupes',
-            },
-            bases=('auth.group',),
-        ),
-        migrations.CreateModel(
-            name='Permission',
-            fields=[
-            ],
-            options={
-                'verbose_name': 'Permission',
-                'verbose_name_plural': 'Permissions',
-                'proxy': True,
-            },
-            bases=('auth.permission',),
         ),
     ]
diff --git a/kfet/auth/migrations/0002_create_group_permission_models.py b/kfet/auth/migrations/0002_create_group_permission_models.py
new file mode 100644
index 00000000..bd79fdb0
--- /dev/null
+++ b/kfet/auth/migrations/0002_create_group_permission_models.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('kfetauth', '0001_initial'),
+    ]
+
+    operations = [
+        # See also `kfetauth.0004` migration which deletes already created
+        # permissions, if applicable.
+        migrations.AlterModelOptions(
+            name='genericteamtoken',
+            options={
+                'default_permissions': (),
+            },
+        ),
+        # See also `kfetauth.0003` migration which imports existing K-Fêt
+        # groups.
+        # See also `kfetauth.0004` migration which gives the default
+        # permissions to `Group` objects which have the deleted
+        # `kfet.manage_perms` permission.
+        migrations.CreateModel(
+            name='Group',
+            fields=[
+                ('group_ptr', models.OneToOneField(
+                    parent_link=True,
+                    serialize=False,
+                    primary_key=True,
+                    auto_created=True,
+                    to='auth.Group',
+                )),
+            ],
+            options={
+                'default_permissions': ('view', 'add', 'change'),
+                'verbose_name': 'Groupe',
+                'verbose_name_plural': 'Groupes',
+            },
+            bases=('auth.group',),
+        ),
+        migrations.CreateModel(
+            name='Permission',
+            fields=[
+            ],
+            options={
+                'verbose_name': 'Permission',
+                'verbose_name_plural': 'Permissions',
+                'proxy': True,
+            },
+            bases=('auth.permission',),
+        ),
+    ]
diff --git a/kfet/auth/migrations/0002_existing_groups.py b/kfet/auth/migrations/0003_existing_groups.py
similarity index 92%
rename from kfet/auth/migrations/0002_existing_groups.py
rename to kfet/auth/migrations/0003_existing_groups.py
index 7d0144f7..7ab2dd94 100644
--- a/kfet/auth/migrations/0002_existing_groups.py
+++ b/kfet/auth/migrations/0003_existing_groups.py
@@ -22,7 +22,7 @@ class Migration(migrations.Migration):
     """
 
     dependencies = [
-        ('kfetauth', '0001_initial'),
+        ('kfetauth', '0002_create_group_permission_models'),
         ('auth', '0006_require_contenttypes_0002'),
     ]
 
diff --git a/kfet/auth/migrations/0003_update_permissions.py b/kfet/auth/migrations/0004_update_permissions.py
similarity index 98%
rename from kfet/auth/migrations/0003_update_permissions.py
rename to kfet/auth/migrations/0004_update_permissions.py
index 168e21e7..7044fd28 100644
--- a/kfet/auth/migrations/0003_update_permissions.py
+++ b/kfet/auth/migrations/0004_update_permissions.py
@@ -70,7 +70,7 @@ class Migration(migrations.Migration):
     Data migration about permissions.
     """
     dependencies = [
-        ('kfetauth', '0002_existing_groups'),
+        ('kfetauth', '0003_existing_groups'),
         ('auth', '0006_require_contenttypes_0002'),
         ('contenttypes', '0002_remove_content_type_name'),
     ]