Merge pull request #133 from UNLV-CS472-672/Student-view-dashboard-functions

5th PR: Add Student Dashboard, Assignments, and File Upload Features

Author: FrankFurter123

.DS_Store

@@ -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_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/search/serializers.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/submissions/tests.py

@@ -5,10 +5,10 @@
 from cloudinary import CloudinaryImage
 
 class ProfilePictureManager(models.Manager):
-    def create(self, upload):
+    def create(self, profile):
         # Create a new UploadRecord instance with the provided data
         profile_picture = self.model(
-                upload=upload
+                profile=profile
             )
         # Save the instance to the database
         profile_picture.save()
@@ -26,7 +26,11 @@ 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 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')
         # Convert to datetime object
@@ -42,7 +46,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/managers.py

@@ -0,0 +1,33 @@
+# Generated by Django 5.1.6 on 2025-04-11 07:35
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('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',
+        ),
+        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'),
+        ),
+        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'),
+        ),
+    ]

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):
@@ -21,28 +36,12 @@ 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')
-
     # 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):
-    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

@@ -15,6 +15,7 @@ def get_file_url(self, upload):
         return UploadRecord.objects.build_url(upload)
 
 class UploadListSerializer(serializers.ModelSerializer):
+
     class Meta:
         model = UploadRecord
-        fields = ['file_name', 'file_format', 'cloudinary_public_id']
+        fields = ['file_name', 'file_format', 'cloudinary_public_id']

backend/apps/uploads/serializers.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/tests.py

@@ -15,7 +15,7 @@
 # Create your views here.
 
 class UploadDetailView(APIView):
-    permission_classes = []  # Debug only: No authentication required
+    permission_classes = [IsAuthenticated]
     # Specifies that the view should only accept JSON-formatted request bodies.
     parser_classes = (
             JSONParser,
@@ -89,7 +89,7 @@ def patch(self, request, cloudinary_public_id):
 
 
 class UploadListView(APIView):
-    permission_classes = []  # Debug only: No authentication required
+    permission_classes = [IsAuthenticated]
     # Specifies that the view can accept both multipart form data
     # and JSON-formatted request bodies.
     parser_classes = (
@@ -101,17 +101,12 @@ class UploadListView(APIView):
     # Uploading a new file
     def post(self, request):
         # request to get user
-        # user = request.user # once authentication is a thing
-
-        # Get the user model class (Debug only)
-        User = apps.get_model(settings.AUTH_USER_MODEL)
-
-        # Get the first user in the database (Debug only)
-        user = User.objects.first()
+        user = request.user  # Authenticated user object
+        profile = user.profile
 
         # Check if user exists
-        if not user:
-            return Response({'error': 'User not found'}, status=status.HTTP_404_NOT_FOUND)
+        if not profile:
+            return Response({'error': 'Profile not found'}, status=status.HTTP_404_NOT_FOUND)
 
         # request to get file to be uploaded
         file = request.data.get('file')
@@ -124,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, user)
+        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/uploads/views.py

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