Fixed test errors on backend

Important changes to code:
Relationships Modified

Profile <---one to one -- profile picture ----> one to one ---> upload record

Removed profile field from upload record as a result which affects existing tests and requests. I believe that I have fixed all of them but there might have been some that I might have missed

Additionally, for the tests for uploads, I had to add jtw token for it to work.

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, "upload_record"):
-            return UploadRecord.objects.build_url(result_data.profile.upload_record)
+        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)
         return None  # Return None if there's no profile picture
 
     def get_subjects(self, result_data):

backend/apps/submissions/tests.py

@@ -29,7 +29,7 @@ def setUp(self):
             "version": 1,
             "asset_id": "sample_asset_id"
         }
-        self.upload_record = UploadRecord.objects.create(upload_data=self.upload_data, profile=self.profile)
+        self.upload_record = UploadRecord.objects.create(upload_data=self.upload_data)
 
         # Create submission
         self.submission = Submissions.objects.create(
@@ -426,7 +426,7 @@ def setUp(self):
             "version": 1,
             "asset_id": "sample_asset_id"
         }
-        self.file_record = UploadRecord.objects.create(self.upload_data, self.profile)
+        self.file_record = UploadRecord.objects.create(self.upload_data)
         self.quiz_submission = QuizSubmissions.objects.create(submission=self.submission)
 
         self.login_url = "/users/login/"

backend/apps/uploads/managers.py

@@ -5,10 +5,11 @@
 from cloudinary import CloudinaryImage
 
 class ProfilePictureManager(models.Manager):
-    def create(self, upload):
+    def create(self, profile, upload_record):
         # Create a new UploadRecord instance with the provided data
         profile_picture = self.model(
-                upload=upload
+                profile=profile,
+                upload=upload_record
             )
         # Save the instance to the database
         profile_picture.save()
@@ -26,7 +27,7 @@ def delete_upload(self, cloudinary_public_id):
         result = cloudinary.uploader.destroy(cloudinary_public_id, invalidate = True)
         return result
 
-    def create(self, upload_data, profile):
+    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')
         # Convert to datetime object
@@ -42,7 +43,6 @@ def create(self, upload_data, profile):
             cloudinary_public_id=upload_data["public_id"],
             version=upload_data["version"],
             asset_id=upload_data["asset_id"],
-            profile=profile
         )
         # Save the instance to the database
         upload_record.save()

backend/apps/uploads/migrations/0009_remove_uploadrecord_profile_profilepicture_profile.py

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

backend/apps/uploads/models.py

@@ -21,9 +21,6 @@ class UploadRecord(models.Model):
     version = models.PositiveBigIntegerField()
     asset_id = models.CharField(max_length=255)
 
-#     profile = models.OneToOneField(Profile, on_delete=models.CASCADE, related_name='upload_record')
-    profile = models.ForeignKey(Profile, on_delete=models.CASCADE, related_name='upload_record')
-
     # default = 1 for first user (for now)
     description = models.TextField(default="", blank=True, null=False)
 
@@ -35,6 +32,7 @@ def __str__(self):
 
 # 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

backend/apps/uploads/serializers.py

@@ -15,8 +15,7 @@ def get_file_url(self, upload):
         return UploadRecord.objects.build_url(upload)
 
 class UploadListSerializer(serializers.ModelSerializer):
-    assignment_id = serializers.PrimaryKeyRelatedField(source='assignment.id', read_only=True)
 
     class Meta:
         model = UploadRecord
-        fields = ['file_name', 'file_format', 'cloudinary_public_id', 'assignment_id']
+        fields = ['file_name', 'file_format', 'cloudinary_public_id']

backend/apps/uploads/tests.py

@@ -5,6 +5,7 @@
 from apps.users.models import Profile
 from django.contrib.auth import get_user_model
 from .serializers import UploadListSerializer
+from rest_framework_simplejwt.tokens import RefreshToken
 
 class UploadRecordViewTest(APITestCase):
     def setUp(self):
@@ -17,8 +18,6 @@ def setUp(self):
         self.version = 1234567890
         self.asset_id = "test-asset-id"
 
-        self.url = reverse('upload-list')
-
         self.fake_user = get_user_model().objects.create_user(
                     username='testuser',
                     password='password',
@@ -27,17 +26,25 @@ def setUp(self):
                     email='testuser@example.com'
                 )
         self.profile = Profile.objects.create(self.fake_user, 2)
+        self.token = self.get_jwt_token(self.fake_user)
+        self.client.credentials(HTTP_AUTHORIZATION=f'Bearer {self.token}')
+
+    def get_jwt_token(self, user):
+        refresh = RefreshToken.for_user(user)
+        return str(refresh.access_token)
 
     # Ensure that if there are no uploads,
     # the API returns a 404 error with the proper message.
     def test_get_uploads_empty(self):
-        response = self.client.get(self.url)
+        url = reverse('upload-list')
+        response = self.client.get(url)
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
         self.assertEqual(response.data, {'error': 'No uploads found'})
 
     # Test that the API returns a 200 status and
     # the correct serialized data when uploads exist.
     def test_get_uploads_success(self):
+        url = reverse('upload-list')
         # Create an example UploadRecord instance.
         upload_record = UploadRecord.objects.create(
             upload_data={
@@ -50,11 +57,10 @@ def test_get_uploads_success(self):
                 "version": self.version,
                 "asset_id": self.asset_id,
             },
-            profile=self.profile
         )
 
         # Perform the GET request
-        response = self.client.get(self.url)
+        response = self.client.get(url)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
         # Serialize the created object using the serializer

backend/apps/uploads/views.py

@@ -119,7 +119,7 @@ def post(self, request):
         upload_data = UploadRecord.objects.upload(file)
 
         # Use the manager method to save relevant metadata into database
-        UploadRecord.objects.create(upload_data, profile)
+        UploadRecord.objects.create(upload_data)
 
         return Response({'status': 'success'}, status=status.HTTP_200_OK)
     # Note: Tested this POST request by entering this into the command line

backend/apps/users/managers.py

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

backend/apps/users/views.py

@@ -84,10 +84,10 @@ def register_profile(request):
   if image:
     # Use the manager method to handle file upload
     upload_data = UploadRecord.objects.upload(image)
-
-    # Use the manager method to save relevant metadata into database
-    upload_record = UploadRecord.objects.create(upload_data, profile)
-    ProfilePicture.objects.create(upload_record)
+    # 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)
 
   # Create Tutor Profile if role is Tutor
   if int(profile.role) == Profile.TUTOR: