Merge branch 'main' into video_call_ui

Author: SameerIssa

backend/apps/lessons/tests.py

@@ -1,3 +1,76 @@
 from django.test import TestCase
+from django.urls import reverse
+from rest_framework.test import APITestCase
+from rest_framework import status
+from django.contrib.auth.models import User
+from apps.lessons.models import Assignment
 
 # Create your tests here.
+class AssignmentAPITests(APITestCase):
+    def setUp(self):
+        # Create a superuser for testing
+        self.user = User.objects.create_superuser(
+            username='testadmin', password='testpassword', email='test@test.com'
+        )
+
+        # Get access token
+        response = self.client.post(
+            reverse('token_obtain_pair'),  # Use the actual name of the URL if configured
+            {'username': 'testadmin', 'password': 'testpassword'},
+        )
+        self.access_token = response.data['access']
+
+        # Set authorization header
+        self.client.credentials(HTTP_AUTHORIZATION=f'Bearer {self.access_token}')
+
+        # Create an initial assignment for testing
+        self.assignment = Assignment.objects.create(
+            title="Initial Assignment",
+            description="Initial assignment description.",
+            assignment_type="HW",
+            deadline="2025-12-01T12:00:00Z",
+        )
+
+        # Define URLs
+        self.detail_url = reverse('assignment-detail', kwargs={'pk': self.assignment.pk})
+        self.create_url = reverse('assignment-create')
+
+        # hardcode?
+        # self.list_url = '/lessons/assignments/'
+        #self.detail_url = f'/lessons/assignments/{self.assignment.pk}/'
+        #self.create_url = '/lessons/assignments/create/'
+
+    # Test GET single assignment
+    def test_get_assignment(self):
+        response = self.client.get(self.detail_url)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['data']['title'], 'Initial Assignment')
+
+    # Test POST create new assignment
+    def test_create_assignment(self):
+        data = {
+            "title": "New Assignment",
+            "description": "This is a new assignment.",
+            "assignment_type": "HW",
+            "deadline": "2025-12-01T12:00:00Z"
+        }
+        response = self.client.post(self.create_url, data, format='json')
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+        self.assertEqual(response.data['data']['title'], 'New Assignment')
+
+    # Test PATCH update assignment
+    def test_update_assignment(self):
+        data = {"title": "Updated Title"}
+        response = self.client.patch(self.detail_url, data, format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['data']['title'], 'Updated Title')
+
+    # Test DELETE assignment
+    def test_delete_assignment(self):
+        response = self.client.delete(self.detail_url)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['status'], 'success')
+
+        # Verify it is deleted
+        response = self.client.get(self.detail_url)
+        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)

backend/apps/search/serializers.py

@@ -7,14 +7,19 @@ class TutorSearchResultSerializer(serializers.ModelSerializer):
     first_name = serializers.CharField(source="profile.user.first_name")
     last_name = serializers.CharField(source="profile.user.last_name")
     image_url = serializers.SerializerMethodField()  # Custom field to get the file URL
+    subjects = serializers.SerializerMethodField()
 
     # Specify the model and fields to be included in the serialized output
     class Meta:
         model = TutorProfile
-        fields = ["first_name", "last_name", "bio", "hourly_rate", "state", "city", "rating", "image_url"]
+        fields = ["first_name", "last_name", "bio", "hourly_rate", "state", "city", "rating", "image_url", "subjects"]
 
     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)
         return None  # Return None if there's no profile picture
+
+    def get_subjects(self, result_data):
+        # Extract only the titles of the subjects
+        return list(result_data.subjects.values_list("title", flat=True))

backend/apps/search/views.py

@@ -96,7 +96,7 @@ def get(self, request, format=None):
         # Perform search with 'what' term
         search_results = TutorProfile.objects.search(filtered_tutors, what)
         # Combine with partial_tutor_matches
-        partial_tutor_matches = TutorProfile.objects.filter(lookup_tutors_query)
+        partial_tutor_matches = filtered_tutors.filter(lookup_tutors_query) #changed now
         search_results = (search_results | partial_tutor_matches)
 
         try:

backend/apps/users/managers.py

@@ -1,5 +1,7 @@
 from django.db import models
 from watson import search
+from django.db.models import Prefetch
+from apps.search.models import Subject
 
 class ProfileManager(models.Manager):
 
@@ -76,7 +78,9 @@ def search(self, filtered_tutors, what):
 
     def get_result_data(self, search_results):
         # Use select_related to reduce queries and retrieve only the required fields
-        search_results = search_results.select_related('profile__user', 'profile').only(
+        search_results = search_results.select_related('profile__user', 'profile').prefetch_related(
+            Prefetch('subjects', queryset=Subject.objects.only('title'))
+        ).only(
             'profile__user__first_name',
             'profile__user__last_name',
             'bio',

backend/apps/users/views.py

@@ -4,6 +4,7 @@
 from django.contrib.auth import authenticate
 from django.http import JsonResponse, HttpResponse
 from django.middleware.csrf import get_token
+from .models import Profile
 from apps.users.models import Profile, TutorProfile
 from apps.uploads.models import UploadRecord, ProfilePicture
 from rest_framework import status
@@ -62,7 +63,9 @@ def register_profile(request):
   first_name = request.data["firstName"]
   last_name = request.data["lastName"]
   password = request.data["password"]
-  role = request.data["role"]  # Get the selected role
+  # TODO: replace "1" with "role" once that is handled by the frontend
+  # role = request.data["role"]  # Get the selected role
+  role = 3
   # Create user
   user = User.objects.create_user(
     username=username,
@@ -73,6 +76,7 @@ def register_profile(request):
   )
   # Create associated Profile
   profile = Profile.objects.create(user, role)
+  
 
   image=request.data.get("image") #For now, get an optional image
 
@@ -92,7 +96,6 @@ def register_profile(request):
       bio=request.data["bio"]
       hourly_rate=request.data["hourly_rate"]
       tutor = TutorProfile.objects.create(profile, city, state, bio, hourly_rate)
-
   return Response({"message": "User registered successfully"}, status=status.HTTP_201_CREATED)
 
 @api_view(['POST'])