From 9409b55df5a9d437c8f118ddc64df4d7bb7e8d92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Thu, 26 Oct 2017 11:06:17 +0200
Subject: [PATCH] Merge migrations from master and supportBDS

- Add missing migrations
- Fix dependencies
- rename gestioncof -> cof
---
 cof/migrations/0009_delete_clipper.py         | 17 +++++++
 ...ustommail.py => 0010_delete_custommail.py} |  7 ++-
 cof/migrations/0011_longer_clippers.py        | 19 ++++++++
 cof/migrations/0011_remove_cofprofile_num.py  | 18 +++++++
 cof/migrations/0012_merge.py                  | 15 ++++++
 cof/migrations/0013_pei.py                    | 47 +++++++++++++++++++
 ...9_move_profile.py => 0014_move_profile.py} |  5 +-
 .../{0010_move_club.py => 0015_move_club.py}  |  2 +-
 ...{0011_move_event.py => 0016_move_event.py} |  2 +-
 ...petitcours.py => 0017_alter_petitcours.py} |  2 +-
 kfet/migrations/0059_create_generic.py        |  7 +--
 ...c_profiles.py => 0062_generic_profiles.py} |  4 +-
 kfet/models.py                                |  2 +-
 13 files changed, 131 insertions(+), 16 deletions(-)
 create mode 100644 cof/migrations/0009_delete_clipper.py
 rename cof/migrations/{0012_remove_clipper_custommail.py => 0010_delete_custommail.py} (65%)
 create mode 100644 cof/migrations/0011_longer_clippers.py
 create mode 100644 cof/migrations/0011_remove_cofprofile_num.py
 create mode 100644 cof/migrations/0012_merge.py
 create mode 100644 cof/migrations/0013_pei.py
 rename cof/migrations/{0009_move_profile.py => 0014_move_profile.py} (95%)
 rename cof/migrations/{0010_move_club.py => 0015_move_club.py} (97%)
 rename cof/migrations/{0011_move_event.py => 0016_move_event.py} (99%)
 rename cof/migrations/{0013_alter_petitcours.py => 0017_alter_petitcours.py} (96%)
 rename kfet/migrations/{0048_generic_profiles.py => 0062_generic_profiles.py} (88%)

diff --git a/cof/migrations/0009_delete_clipper.py b/cof/migrations/0009_delete_clipper.py
new file mode 100644
index 00000000..5d98de73
--- /dev/null
+++ b/cof/migrations/0009_delete_clipper.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cof', '0008_py3'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='Clipper',
+        ),
+    ]
diff --git a/cof/migrations/0012_remove_clipper_custommail.py b/cof/migrations/0010_delete_custommail.py
similarity index 65%
rename from cof/migrations/0012_remove_clipper_custommail.py
rename to cof/migrations/0010_delete_custommail.py
index 0c9e297c..55bd2d9d 100644
--- a/cof/migrations/0012_remove_clipper_custommail.py
+++ b/cof/migrations/0010_delete_custommail.py
@@ -1,16 +1,15 @@
+# -*- coding: utf-8 -*-
+
 from django.db import migrations
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('cof', '0011_move_event'),
+        ('cof', '0009_delete_clipper'),
     ]
 
     operations = [
-        migrations.DeleteModel(
-            name='Clipper',
-        ),
         migrations.DeleteModel(
             name='CustomMail',
         ),
diff --git a/cof/migrations/0011_longer_clippers.py b/cof/migrations/0011_longer_clippers.py
new file mode 100644
index 00000000..90f72352
--- /dev/null
+++ b/cof/migrations/0011_longer_clippers.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cof', '0010_delete_custommail'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='cofprofile',
+            name='login_clipper',
+            field=models.CharField(verbose_name='Login clipper', blank=True, max_length=32),
+        ),
+    ]
diff --git a/cof/migrations/0011_remove_cofprofile_num.py b/cof/migrations/0011_remove_cofprofile_num.py
new file mode 100644
index 00000000..37e2e93a
--- /dev/null
+++ b/cof/migrations/0011_remove_cofprofile_num.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cof', '0010_delete_custommail'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='cofprofile',
+            name='num',
+        ),
+    ]
diff --git a/cof/migrations/0012_merge.py b/cof/migrations/0012_merge.py
new file mode 100644
index 00000000..735a8400
--- /dev/null
+++ b/cof/migrations/0012_merge.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cof', '0011_remove_cofprofile_num'),
+        ('cof', '0011_longer_clippers'),
+    ]
+
+    operations = [
+    ]
diff --git a/cof/migrations/0013_pei.py b/cof/migrations/0013_pei.py
new file mode 100644
index 00000000..37cabb83
--- /dev/null
+++ b/cof/migrations/0013_pei.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cof', '0012_merge'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='cofprofile',
+            name='occupation',
+            field=models.CharField(
+                verbose_name='Occupation',
+                max_length=9,
+                default='1A',
+                choices=[
+                    ('exterieur', 'Extérieur'),
+                    ('1A', '1A'),
+                    ('2A', '2A'),
+                    ('3A', '3A'),
+                    ('4A', '4A'),
+                    ('archicube', 'Archicube'),
+                    ('doctorant', 'Doctorant'),
+                    ('CST', 'CST'),
+                    ('PEI', 'PEI')
+                ]),
+        ),
+        migrations.AlterField(
+            model_name='cofprofile',
+            name='type_cotiz',
+            field=models.CharField(
+                verbose_name='Type de cotisation',
+                max_length=9,
+                default='normalien',
+                choices=[
+                      ('etudiant', 'Normalien étudiant'),
+                      ('normalien', 'Normalien élève'),
+                      ('exterieur', 'Extérieur'),
+                      ('gratis', 'Gratuit')
+                ]),
+        ),
+    ]
diff --git a/cof/migrations/0009_move_profile.py b/cof/migrations/0014_move_profile.py
similarity index 95%
rename from cof/migrations/0009_move_profile.py
rename to cof/migrations/0014_move_profile.py
index d863e538..344b512c 100644
--- a/cof/migrations/0009_move_profile.py
+++ b/cof/migrations/0014_move_profile.py
@@ -61,8 +61,11 @@ class Migration(migrations.Migration):
     """
 
     dependencies = [
-        ('cof', '0008_py3'),
+        ('cof', '0013_pei'),
         ('gestion', '0002_create_cof_bds'),
+        # Migrate the K-Fêt app up to the pre-BDS state before performing the
+        # BDS-related stuff
+        ('kfet', '0061_add_perms_config'),
     ]
 
     operations = [
diff --git a/cof/migrations/0010_move_club.py b/cof/migrations/0015_move_club.py
similarity index 97%
rename from cof/migrations/0010_move_club.py
rename to cof/migrations/0015_move_club.py
index 349642fb..e220148c 100644
--- a/cof/migrations/0010_move_club.py
+++ b/cof/migrations/0015_move_club.py
@@ -42,7 +42,7 @@ class Migration(migrations.Migration):
     """
 
     dependencies = [
-        ('cof', '0009_move_profile'),
+        ('cof', '0014_move_profile'),
         ('gestion', '0002_create_cof_bds'),
     ]
 
diff --git a/cof/migrations/0011_move_event.py b/cof/migrations/0016_move_event.py
similarity index 99%
rename from cof/migrations/0011_move_event.py
rename to cof/migrations/0016_move_event.py
index 71750bf6..60e1bbf5 100644
--- a/cof/migrations/0011_move_event.py
+++ b/cof/migrations/0016_move_event.py
@@ -62,7 +62,7 @@ def event_to_gestion(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('cof', '0010_move_club'),
+        ('cof', '0015_move_club'),
         ('gestion', '0002_create_cof_bds'),
     ]
 
diff --git a/cof/migrations/0013_alter_petitcours.py b/cof/migrations/0017_alter_petitcours.py
similarity index 96%
rename from cof/migrations/0013_alter_petitcours.py
rename to cof/migrations/0017_alter_petitcours.py
index 288bdc0b..0d5d8707 100644
--- a/cof/migrations/0013_alter_petitcours.py
+++ b/cof/migrations/0017_alter_petitcours.py
@@ -9,7 +9,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('cof', '0012_remove_clipper_custommail'),
+        ('cof', '0016_move_event'),
     ]
 
     operations = [
diff --git a/kfet/migrations/0059_create_generic.py b/kfet/migrations/0059_create_generic.py
index 4f04770c..fbac3034 100644
--- a/kfet/migrations/0059_create_generic.py
+++ b/kfet/migrations/0059_create_generic.py
@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
+from django.db import migrations
 
 from kfet.auth import KFET_GENERIC_TRIGRAMME, KFET_GENERIC_USERNAME
 
@@ -16,7 +13,7 @@ def setup_kfet_generic_user(apps, schema_editor):
     See also setup_kfet_generic_user from kfet.auth.utils module.
     """
     User = apps.get_model('auth', 'User')
-    CofProfile = apps.get_model('gestioncof', 'CofProfile')
+    CofProfile = apps.get_model('cof', 'CofProfile')
     Account = apps.get_model('kfet', 'Account')
 
     user, _ = User.objects.update_or_create(
diff --git a/kfet/migrations/0048_generic_profiles.py b/kfet/migrations/0062_generic_profiles.py
similarity index 88%
rename from kfet/migrations/0048_generic_profiles.py
rename to kfet/migrations/0062_generic_profiles.py
index 260f5ce0..b80fe3e8 100644
--- a/kfet/migrations/0048_generic_profiles.py
+++ b/kfet/migrations/0062_generic_profiles.py
@@ -7,8 +7,8 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('cof', '0009_move_profile'),
-        ('kfet', '0047_auto_20170104_1528'),
+        ('cof', '0014_move_profile'),
+        ('kfet', '0061_add_perms_config'),
     ]
 
     operations = [
diff --git a/kfet/models.py b/kfet/models.py
index d1c37daf..8567fb42 100644
--- a/kfet/models.py
+++ b/kfet/models.py
@@ -35,7 +35,7 @@ class AccountManager(models.Manager):
 
     def get_queryset(self):
         """Always append related data to this Account."""
-        return super().get_queryset().select_related('cofprofile__user',
+        return super().get_queryset().select_related('profile__user',
                                                      'negative')
 
     def get_generic(self):