Fixed major issues with delete.cascade

New relationship:
User <--one to one <--- Profile <---one to one -- profile picture <---- one to one --- upload record

Had to change it this way to ensure upload record is deleted when user is deleted

Author: ashley-arellano

backend/apps/search/serializers.py

@@ -16,8 +16,8 @@ class Meta:
 
     def get_image_url(self, result_data):
         # Ensure that the profile and profile_picture exist before accessing them
-        if hasattr(result_data, "profile") and hasattr(result_data.profile, "profile_picture") and hasattr(result_data.profile.profile_picture, "upload"):
-            return UploadRecord.objects.build_url(result_data.profile.profile_picture.upload)
+        if hasattr(result_data, "profile") and hasattr(result_data.profile, "profile_picture") and hasattr(result_data.profile.profile_picture, "upload_record"):
+            return UploadRecord.objects.build_url(result_data.profile.profile_picture.upload_record)
         return None  # Return None if there's no profile picture
 
     def get_subjects(self, result_data):

backend/apps/uploads/managers.py

@@ -5,11 +5,10 @@
 from cloudinary import CloudinaryImage
 
 class ProfilePictureManager(models.Manager):
-    def create(self, profile, upload_record):
+    def create(self, profile):
         # Create a new UploadRecord instance with the provided data
         profile_picture = self.model(
-                profile=profile,
-                upload=upload_record
+                profile=profile
             )
         # Save the instance to the database
         profile_picture.save()
@@ -27,6 +26,10 @@ def delete_upload(self, cloudinary_public_id):
         result = cloudinary.uploader.destroy(cloudinary_public_id, invalidate = True)
         return result
 
+    def add_profile_picture(self, upload_record, profile_picture):
+        upload_record.profile_picture = profile_picture
+        upload_record.save(update_fields=['profile_picture'])
+
     def create(self, upload_data):
         # Replace 'Z' with '+00:00' for compatibility with fromisoformat
         compatible_created_at = upload_data['created_at'].replace('Z', '+00:00')

backend/apps/uploads/migrations/0008_alter_uploadrecord_profile.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.6 on 2025-04-10 23:20
+# Generated by Django 5.1.6 on 2025-04-11 07:35
 
 import django.db.models.deletion
 from django.db import migrations, models
@@ -7,11 +7,15 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('uploads', '0008_alter_uploadrecord_profile'),
+        ('uploads', '0007_alter_uploadrecord_profile'),
         ('users', '0009_alter_tutorprofile_rating'),
     ]
 
     operations = [
+        migrations.RemoveField(
+            model_name='profilepicture',
+            name='upload',
+        ),
         migrations.RemoveField(
             model_name='uploadrecord',
             name='profile',
@@ -21,4 +25,9 @@ class Migration(migrations.Migration):
             name='profile',
             field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='profile_picture', to='users.profile'),
         ),
+        migrations.AddField(
+            model_name='uploadrecord',
+            name='profile_picture',
+            field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='upload_record', to='uploads.profilepicture'),
+        ),
     ]

…record_profile_profilepicture_profile.py …remove_profilepicture_upload_and_more.pybackend/apps/uploads/migrations/0009_remove_uploadrecord_profile_profilepicture_profile.py renamed to backend/apps/uploads/migrations/0008_remove_profilepicture_upload_and_more.py backend/apps/uploads/migrations/0009_remove_uploadrecord_profile_profilepicture_profile.py renamed to backend/apps/uploads/migrations/0008_remove_profilepicture_upload_and_more.py

@@ -5,6 +5,21 @@
 from cloudinary.models import CloudinaryField
 from django.core.exceptions import ValidationError
 
+# A model that acts as a container for the profile picture of user
+class ProfilePicture(models.Model):
+    profile = models.OneToOneField(Profile, on_delete=models.CASCADE, related_name = "profile_picture", null = True) #changed
+    # Link the custom manager to the model
+    objects = ProfilePictureManager()
+
+    def save(self, *args, **kwargs):
+        # Always validate before saving
+        self.full_clean()
+        super().save(*args, **kwargs)
+
+    def __str__(self):
+        first_name = self.profile.user.first_name
+        return f"{first_name}'s profile picture"
+
 # https://blog.nonstopio.com/well-handling-of-cloudinary-with-python-drf-api-28271575e21f
 # Model that acts a container for all upload related information
 class UploadRecord(models.Model):
@@ -23,25 +38,10 @@ class UploadRecord(models.Model):
 
     # default = 1 for first user (for now)
     description = models.TextField(default="", blank=True, null=False)
+    profile_picture = models.OneToOneField(ProfilePicture, on_delete=models.CASCADE, related_name='upload_record', null = True)
 
     # Link the custom manager to the model
     objects = UploadRecordManager()
 
     def __str__(self):
-        return self.file_name
-
-# A model that acts as a container for the profile picture of user
-class ProfilePicture(models.Model):
-    profile = models.OneToOneField(Profile, on_delete=models.CASCADE, related_name = "profile_picture", null = True) #changed
-    upload = models.OneToOneField(UploadRecord, on_delete=models.CASCADE)
-
-    # Link the custom manager to the model
-    objects = ProfilePictureManager()
-
-    def save(self, *args, **kwargs):
-        # Always validate before saving
-        self.full_clean()
-        super().save(*args, **kwargs)
-
-    def __str__(self):
-        return self.upload.file_name
+        return self.file_name

backend/apps/uploads/models.py

@@ -87,6 +87,6 @@ def get_result_data(self, search_results):
             'hourly_rate',
             'state',
             'city',
-            'profile__profile_picture__upload' #changed
+            'profile__profile_picture__upload_record' #changed
         )
         return search_results

backend/apps/users/managers.py

@@ -64,7 +64,8 @@ def register_profile(request):
   last_name = request.data["lastName"]
   password = request.data["password"]
   # TODO: replace "1" with "role" once that is handled by the frontend
-  # role = request.data["role"]  # Get the selected role
+
+  #role = request.data["role"]  # Get the selected role
   role = 3
   # Create user
   user = User.objects.create_user(
@@ -82,12 +83,13 @@ def register_profile(request):
 
   # Store optional profile picture
   if image:
+    # Use the manager method to create and save profile picture
+    profile_picture = ProfilePicture.objects.create(profile)
     # Use the manager method to handle file upload
     upload_data = UploadRecord.objects.upload(image)
     # Use manager method to create and save metadata
     upload_record = UploadRecord.objects.create(upload_data)
-    # Use the manager method to create and save profile picture
-    ProfilePicture.objects.create(profile, upload_record)
+    UploadRecord.objects.add_profile_picture(upload_record, profile_picture)
 
   # Create Tutor Profile if role is Tutor
   if int(profile.role) == Profile.TUTOR: