More improvements to user management

generic/migrations/0044_auto_20221114_2035.py

@@ -0,0 +1,32 @@
+# Generated by Django 3.2.13 on 2022-11-14 20:35
+
+from django.db import migrations
+
+
+def migrate_supervisors(apps, schema_editor):
+    UserProfile = apps.get_model("generic", "UserProfile")
+
+    for profile in UserProfile.objects.all():
+        if profile.supervisor_name and profile.supervisor_email:
+            Supervisor = apps.get_model("generic", "Supervisor")
+
+            s, created = Supervisor.objects.get_or_create(email=profile.supervisor_email, name=profile.supervisor_name)
+
+            if created:
+                s.save()
+
+            profile.supervisor = s
+
+            profile.save()
+
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('generic', '0043_alter_userprofile_supervisor'),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_supervisors)
+    ]

generic/migrations/0045_auto_20221114_2103.py

@@ -0,0 +1,21 @@
+# Generated by Django 3.2.13 on 2022-11-14 21:03
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('generic', '0044_auto_20221114_2035'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='userprofile',
+            name='supervisor_email',
+        ),
+        migrations.RemoveField(
+            model_name='userprofile',
+            name='supervisor_name',
+        ),
+    ]

generic/migrations/0046_auto_20221121_0955.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.13 on 2022-11-21 09:55
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('generic', '0045_auto_20221114_2103'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='ciduser',
+            name='supervisor_email',
+        ),
+        migrations.AddField(
+            model_name='ciduser',
+            name='supervisor',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='cid_user', to='generic.supervisor'),
+        ),
+    ]