Admin bug fixed when deleting user.

ActualProjectCode/DjangoProject/core/migrations/0002_profile_delete_user.py

-# Generated by Django 5.1.7 on 2025-03-21 09:51
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0001_initial'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Profile',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('role', models.CharField(choices=[('admin', 'Admin'), ('user', 'User'), ('ai_engineer', 'AI Engineer'), ('finance', 'Finance Team')], max_length=100)),
-                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.DeleteModel(
-            name='user',
-        ),
-    ]

ActualProjectCode/DjangoProject/core/migrations/0003_mlmodels.py

-# Generated by Django 5.1.7 on 2025-03-27 10:14
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0002_profile_delete_user'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='mlModels',
-            fields=[
-                ('modelID', models.AutoField(primary_key=True, serialize=False)),
-                ('userID', models.IntegerField()),
-                ('modelName', models.CharField(max_length=100)),
-            ],
-        ),
-    ]

ActualProjectCode/DjangoProject/core/migrations/0004_billings_interactions_records.py

-# Generated by Django 5.1.7 on 2025-03-27 10:38
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0003_mlmodels'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Billings',
-            fields=[
-                ('billingID', models.AutoField(primary_key=True, serialize=False)),
-                ('amount', models.FloatField()),
-                ('userID', models.IntegerField()),
-                ('companyName', models.CharField(max_length=100)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Interactions',
-            fields=[
-                ('interactionID', models.AutoField(primary_key=True, serialize=False)),
-                ('userID', models.IntegerField()),
-                ('date', models.DateTimeField()),
-                ('interaction', models.CharField(max_length=1000)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Records',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('userID', models.IntegerField()),
-                ('uploadedFile', models.FileField(upload_to='./records/')),
-                ('responseByML', models.CharField(max_length=100)),
-            ],
-        ),
-    ]

ActualProjectCode/DjangoProject/core/migrations/0005_rename_billings_billing_and_more.py

-# Generated by Django 5.1.7 on 2025-03-27 10:40
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0004_billings_interactions_records'),
-    ]
-
-    operations = [
-        migrations.RenameModel(
-            old_name='Billings',
-            new_name='Billing',
-        ),
-        migrations.RenameModel(
-            old_name='Interactions',
-            new_name='Interaction',
-        ),
-        migrations.RenameModel(
-            old_name='mlModels',
-            new_name='mlModel',
-        ),
-        migrations.RenameModel(
-            old_name='Records',
-            new_name='Record',
-        ),
-    ]

ActualProjectCode/DjangoProject/core/migrations/0006_record_chosenml.py

-# Generated by Django 5.1.7 on 2025-03-27 11:42
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0005_rename_billings_billing_and_more'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='record',
-            name='chosenML',
-            field=models.CharField(default='baseML', max_length=100),
-        ),
-    ]

ActualProjectCode/DjangoProject/core/migrations/0007_alter_record_chosenml.py

-# Generated by Django 5.1.7 on 2025-03-27 13:16
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0006_record_chosenml'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='record',
-            name='chosenML',
-            field=models.CharField(max_length=100),
-        ),
-    ]

ActualProjectCode/DjangoProject/core/migrations/0008_alter_record_chosenml_alter_record_responsebyml.py

-# Generated by Django 5.1.7 on 2025-03-27 15:04
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0007_alter_record_chosenml'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='record',
-            name='chosenML',
-            field=models.CharField(default='baseML', max_length=100),
-        ),
-        migrations.AlterField(
-            model_name='record',
-            name='responseByML',
-            field=models.CharField(default='PLACEHOLDER RESPONSE', max_length=100),
-        ),
-    ]

ActualProjectCode/DjangoProject/core/migrations/0009_remove_billing_userid_remove_interaction_userid_and_more.py

-# Generated by Django 5.1.7 on 2025-03-27 15:09
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('core', '0008_alter_record_chosenml_alter_record_responsebyml'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='billing',
-            name='userID',
-        ),
-        migrations.RemoveField(
-            model_name='interaction',
-            name='userID',
-        ),
-        migrations.RemoveField(
-            model_name='mlmodel',
-            name='userID',
-        ),
-        migrations.RemoveField(
-            model_name='record',
-            name='userID',
-        ),
-        migrations.AddField(
-            model_name='billing',
-            name='username',
-            field=models.CharField(default='company', max_length=100),
-        ),
-        migrations.AddField(
-            model_name='interaction',
-            name='username',
-            field=models.CharField(default='default', max_length=100),
-        ),
-        migrations.AddField(
-            model_name='mlmodel',
-            name='username',
-            field=models.CharField(default='default', max_length=100),
-        ),
-        migrations.AddField(
-            model_name='record',
-            name='username',
-            field=models.CharField(default='default', max_length=100),
-        ),
-    ]

ActualProjectCode/DjangoProject/core/views.py

@@ -89,17 +89,19 @@ def updateUsers(request, id):
         form=UpdateUser(request.POST, instance=user)
         if form.is_valid():
             form.save()
-            return redirect('profile')
+            return redirect('manageUsers')
 
     context = {'form': form}
     return render(request, 'modelForms/updateUsers.html', context)
 
 def deleteUsers(request, id):
-    user = Profile.objects.get(id=id)
+    user = Profile.objects.get(user_id=id)
+    user2 = User.objects.get(id=id)
     if request.method == 'POST':
         user.delete()
+        user2.delete()
         # because of how users are stored, we need to delete from both Profile and User
-        return('profile')
+        return redirect('manageUsers')
 
     context = {'user': user}
     return render(request, 'modelForms/deleteUsers.html', context)

ActualProjectCode/DjangoProject/templates/modelForms/deleteUsers.html

@@ -7,7 +7,7 @@
 
 <p> Are you sure you want to delete the account named "{{user.user}}"? </p>
 
-<form action="{% url 'deleteUsers' user.id %}" method="POST">
+<form action="{% url 'deleteUsers' user.user_id %}" method="POST">
     {% csrf_token %}
 
     <a href="{% url 'manageUsers' %}">Cancel</a>

ActualProjectCode/DjangoProject/templates/modelForms/manageUsers.html

@@ -13,7 +13,7 @@
             <p> Username -- {{ p.user }} </p>
             <p> Role -- {{ p.role }} </p>
             <p><a href="{% url 'updateUsers' p.id %}"> Update </a></p>
-            <p><a href="{% url 'deleteUsers' p.id %}">Delete </a></p>
+            <p><a href="{% url 'deleteUsers' p.user_id %}">Delete </a></p>
             <h1>-------------------------------------------------</h1>
         {% endfor %}