Sqash migration files

keystone_api/apps/allocations/migrations/0001_initial.py

@@ -1,7 +1,6 @@
-# Generated by Django 4.2.7 on 2024-02-25 14:43
+# Generated by Django 4.2.7 on 2024-02-26 08:33
 
 import apps.allocations.models
-from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -11,11 +10,19 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('users', '0003_alter_user_options_alter_user_managers_and_more'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
+        migrations.CreateModel(
+            name='Allocation',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('requested', models.PositiveIntegerField(verbose_name='Requested Service Units')),
+                ('awarded', models.PositiveIntegerField(blank=True, null=True, verbose_name='Awarded Service Units')),
+                ('final', models.PositiveIntegerField(blank=True, null=True, verbose_name='Final Usage')),
+            ],
+            bases=(apps.allocations.models.RGModelInterface, models.Model),
+        ),
         migrations.CreateModel(
             name='AllocationRequest',
             fields=[
@@ -26,7 +33,6 @@ class Migration(migrations.Migration):
                 ('approved', models.DateField(blank=True, null=True, verbose_name='Approval Date')),
                 ('active', models.DateField(blank=True, null=True, verbose_name='Active Date')),
                 ('expire', models.DateField(blank=True, null=True, verbose_name='Expiration Date')),
-                ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.researchgroup')),
             ],
             bases=(apps.allocations.models.RGModelInterface, models.Model),
         ),
@@ -60,19 +66,6 @@ class Migration(migrations.Migration):
                 ('private_comments', models.TextField(blank=True, max_length=1600, null=True)),
                 ('date_modified', models.DateTimeField(auto_now=True)),
                 ('request', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='allocations.allocationrequest')),
-                ('reviewer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-            bases=(apps.allocations.models.RGModelInterface, models.Model),
-        ),
-        migrations.CreateModel(
-            name='Allocation',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('requested', models.PositiveIntegerField(verbose_name='Requested Service Units')),
-                ('awarded', models.PositiveIntegerField(blank=True, null=True, verbose_name='Awarded Service Units')),
-                ('final', models.PositiveIntegerField(blank=True, null=True, verbose_name='Final Usage')),
-                ('cluster', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='allocations.cluster')),
-                ('request', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='allocations.allocationrequest')),
             ],
             bases=(apps.allocations.models.RGModelInterface, models.Model),
         ),

keystone_api/apps/allocations/migrations/0002_initial.py

@@ -0,0 +1,39 @@
+# Generated by Django 4.2.7 on 2024-02-26 08:33
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('allocations', '0001_initial'),
+        ('users', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='allocationrequestreview',
+            name='reviewer',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='allocationrequest',
+            name='group',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.researchgroup'),
+        ),
+        migrations.AddField(
+            model_name='allocation',
+            name='cluster',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='allocations.cluster'),
+        ),
+        migrations.AddField(
+            model_name='allocation',
+            name='request',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='allocations.allocationrequest'),
+        ),
+    ]

keystone_api/apps/users/migrations/0001_initial.py

@@ -1,7 +1,6 @@
-# Generated by Django 4.2.7 on 2024-01-17 12:02
+# Generated by Django 4.2.7 on 2024-02-26 08:33
 
 from django.conf import settings
-import django.contrib.auth.models
 import django.contrib.auth.validators
 from django.db import migrations, models
 import django.db.models.deletion
@@ -24,24 +23,19 @@ class Migration(migrations.Migration):
                 ('password', models.CharField(max_length=128, verbose_name='password')),
                 ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
                 ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
-                ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
-                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
-                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
-                ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
+                ('username', models.CharField(max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
                 ('first_name', models.CharField(max_length=150, verbose_name='first name')),
                 ('last_name', models.CharField(max_length=150, verbose_name='last name')),
                 ('email', models.EmailField(max_length=254, verbose_name='email address')),
+                ('is_active', models.BooleanField(default=True)),
+                ('is_staff', models.BooleanField(default=False, verbose_name='staff status')),
+                ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
                 ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
                 ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
             ],
             options={
-                'verbose_name': 'user',
-                'verbose_name_plural': 'users',
                 'abstract': False,
             },
-            managers=[
-                ('objects', django.contrib.auth.models.UserManager()),
-            ],
         ),
         migrations.CreateModel(
             name='ResearchGroup',