Merge branch 'main' into unit-tests-for-chat

Author: ashley-arellano

backend/apps/chat/consumers.py

@@ -34,6 +34,7 @@ async def receive(self, text_data):
         text_data_json = json.loads(text_data)
         if 'message' in text_data_json:
             message = text_data_json['message']
+
             try:
                 # Try to save the message
                 username, id, timestamp = await self.save_message(self.user_id, self.room_name, message)
@@ -58,6 +59,7 @@ async def receive(self, text_data):
                 await self.send(text_data=json.dumps({
                     "error": f"Chat room '{self.room_name}' not found. Message not saved."
                 }))
+
         # Typing status is received
         elif 'typing' in text_data_json:
             typing = text_data_json['typing']

backend/apps/chat/tests.py

@@ -3,6 +3,11 @@
 from rest_framework import status
 from rest_framework.test import APITestCase, APIClient
 from .models import Chat, Message
+from apps.chat.consumers import ChatConsumer
+
+def test_chat_consumer_init():
+    consumer = ChatConsumer()
+    assert consumer is not None
 
 class ChatAPITestCase(APITestCase):
 

backend/apps/users/migrations/0011_alter_studentprofile_emergency_contact_name_and_more.py

@@ -0,0 +1,29 @@
+# Generated by Django 5.1.6 on 2025-04-23 20:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('search', '0002_alter_subject_table'),
+        ('users', '0010_profile_date_of_birth_profile_phone_number_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='studentprofile',
+            name='emergency_contact_name',
+            field=models.CharField(default='Unknown', max_length=100),
+        ),
+        migrations.AlterField(
+            model_name='studentprofile',
+            name='emergency_contact_phone_number',
+            field=models.CharField(default='1234567890', max_length=15),
+        ),
+        migrations.AlterField(
+            model_name='studentprofile',
+            name='preferred_subjects',
+            field=models.ManyToManyField(blank=True, to='search.subject'),
+        ),
+    ]

backend/apps/users/migrations/0012_alter_tutorprofile_hourly_rate.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.6 on 2025-04-23 20:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0011_alter_studentprofile_emergency_contact_name_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='tutorprofile',
+            name='hourly_rate',
+            field=models.DecimalField(decimal_places=2, default=0.0, max_digits=6),
+        ),
+    ]

backend/apps/users/migrations/0013_alter_studentprofile_parent_profile.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.1.6 on 2025-04-23 21:28
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0012_alter_tutorprofile_hourly_rate'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='studentprofile',
+            name='parent_profile',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='users.parentprofile'),
+        ),
+    ]

backend/apps/users/models.py

@@ -50,7 +50,7 @@ class TutorProfile(models.Model):
     state = models.CharField(max_length=2, default="NA")
 
     bio = models.TextField(blank=True)
-    hourly_rate = models.DecimalField(max_digits=6, decimal_places=2)
+    hourly_rate = models.DecimalField(max_digits=6, decimal_places=2, default= 0.00)
 
     subjects = models.ManyToManyField(to="search.Subject")
     rating = models.DecimalField(max_digits=2, decimal_places=1, default=1.0)
@@ -99,12 +99,21 @@ def __str__(self):
 class StudentProfile(models.Model):
     profile = models.OneToOneField(Profile, on_delete=models.CASCADE)
     # also including a reference to the parent profile
-    parent_profile = models.OneToOneField(ParentProfile, on_delete=models.CASCADE)
+    parent_profile = models.ForeignKey(ParentProfile, on_delete=models.CASCADE)
     # https://stackoverflow.com/questions/849142/how-to-limit-the-maximum-value-of-a-numeric-field-in-a-django-model
     grade_level = models.IntegerField(default=1, validators=[MaxValueValidator(12),MinValueValidator(1)])
-    preferred_subjects = models.ManyToManyField(to="search.Subject")
-    emergency_contact_name = models.CharField(max_length=100)
-    emergency_contact_phone_number = models.CharField(max_length=15)
+    preferred_subjects = models.ManyToManyField(
+        to="search.Subject",
+        blank=True
+    )
+    emergency_contact_name = models.CharField(
+        max_length=100,
+        default = "Unknown"
+    )
+    emergency_contact_phone_number = models.CharField(
+        max_length=15,
+        default = "1234567890"
+    )
 
     def clean(self):
         if self.profile.role != self.profile.STUDENT:

backend/apps/users/tests.py

@@ -1,11 +1,117 @@
 from django.contrib.auth.models import User
 from django.test import TestCase
-from django.urls import reverse
-from rest_framework.test import APIClient
+from rest_framework.test import APIClient, APITestCase
 from rest_framework import status
 from .models import Profile, StudentProfile, TutorProfile, ParentProfile
 from rest_framework_simplejwt.tokens import RefreshToken
 
+# https://chatgpt.com/share/6804498e-2dfc-8005-8b02-d78afdc354ae
+class UserRegistrationTests(APITestCase):
+    def test_register_student_profile(self):
+        parent_profile = User.objects.create_user(username="parentuser", password="pass123")
+        parent_profile_instance = ParentProfile.objects.create(profile=Profile.objects.create(user=parent_profile, role=Profile.PARENT))
+
+        url = "/users/register/"  # make sure you have this in urls.py
+        data = {
+            "country": "US",
+            "username": "studentuser",
+            "email": "student@example.com",
+            "firstName": "Student",
+            "lastName": "User",
+            "password": "testpassword",
+            "role": 3,
+            "parent_profile": parent_profile_instance.id,
+            "grade_level": 5,
+            "preferred_subjects": [],
+            "emergency_contact_name": "Parent User",
+            "emergency_contact_phone_number": "5555555555"
+        }
+        response = self.client.post(url, data, format='json')
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+        self.assertTrue(User.objects.filter(username="studentuser").exists())
+        self.assertTrue(Profile.objects.filter(user__username="studentuser").exists())
+        self.assertTrue(StudentProfile.objects.filter(profile__user__username="studentuser").exists())
+
+    def test_register_tutor_profile(self):
+        url = "/users/register/"
+        data = {
+            "country": "US",
+            "username": "tutoruser",
+            "email": "tutor@example.com",
+            "firstName": "Tutor",
+            "lastName": "User",
+            "password": "testpassword",
+            "role": 1,
+            "city": "New York",
+            "state": "NY",
+            "bio": "I love teaching.",
+            "hourly_rate": "40.00"
+        }
+        response = self.client.post(url, data, format='json')
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+        self.assertTrue(User.objects.filter(username="tutoruser").exists())
+        self.assertTrue(TutorProfile.objects.filter(profile__user__username="tutoruser").exists())
+
+    def test_register_parent_profile(self):
+        url = "/users/register/"
+        data = {
+            "country": "US",
+            "username": "parentuser2",
+            "email": "parent2@example.com",
+            "firstName": "Parent",
+            "lastName": "User",
+            "password": "testpassword",
+            "role": 2,
+        }
+        response = self.client.post(url, data, format='json')
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+        self.assertTrue(User.objects.filter(username="parentuser2").exists())
+        self.assertTrue(ParentProfile.objects.filter(profile__user__username="parentuser2").exists())
+
+
+class UserProfileViewTests(APITestCase):
+    def setUp(self):
+        # Student user
+        student_user = User.objects.create_user(username="student", password="password")
+        student_profile = Profile.objects.create(user=student_user, role=Profile.STUDENT)
+        parent_user = User.objects.create_user(username="parent", password="password")
+        parent_profile = Profile.objects.create(user=parent_user, role=Profile.PARENT)
+        parent_profile_instance = ParentProfile.objects.create(profile=parent_profile)
+        StudentProfile.objects.create(
+            profile=student_profile,
+            parent_profile=parent_profile_instance,
+            grade_level=6,
+            emergency_contact_name="Test Parent",
+            emergency_contact_phone_number="1112223333"
+        )
+        self.student_user = student_user
+        # api
+        self.client = APIClient()
+        self.login_url = "/users/login/"
+        response = self.client.post(self.login_url, {"username": "student", "password": "password"})
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.refresh_token = response.json().get("refreshToken")
+        self.access_token = response.json().get("accessToken")
+        self.client.credentials(HTTP_AUTHORIZATION=f"Bearer {self.access_token}")
+
+    def test_get_student_profile(self):
+        url = "/users/user-profile/"  # replace with your actual path name
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertIn('grade_level', response.data)
+
+    def test_patch_student_profile(self):
+        url = "/users/user-profile/"  # replace with your actual path name
+        response = self.client.patch(url, {'grade_level': 8}, format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['grade_level'], 8)
+
+    def test_profile_not_found(self):
+        Profile.objects.filter(user=self.student_user).delete()  # force no profile
+        url = "/users/user-profile/"
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
+
 class UserAPITestCase(TestCase):
     def setUp(self):
         """Set up test data and API client."""

backend/apps/users/views.py

@@ -8,6 +8,7 @@
 from apps.users.models import Profile, TutorProfile, ParentProfile, StudentProfile
 from apps.uploads.models import UploadRecord, ProfilePicture
 from rest_framework import status
+from apps.search.models import Subject
 from rest_framework.response import Response
 from rest_framework.permissions import AllowAny, IsAuthenticated
 from rest_framework_simplejwt.tokens import RefreshToken
@@ -63,14 +64,15 @@ def logout_view(request):
 @permission_classes([AllowAny])
 def register_profile(request):
   country = request.data["country"]
-  username = request.data["displayName"]
+  username = request.data["username"]
   email = request.data["email"]
   first_name = request.data["firstName"]
   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 = Profile.STUDENT
+  role = request.data.get("role")  # Get the selected role
+  if not role:
+      role = Profile.TUTOR
+
   # Create user
   user = User.objects.create_user(
     username=username,
@@ -81,8 +83,6 @@ def register_profile(request):
   )
   # Create associated Profile
   profile = Profile.objects.create(user, role)
-  
-
   image=request.data.get("image") #For now, get an optional image
 
   # Store optional profile picture
@@ -97,31 +97,48 @@ def register_profile(request):
 
   # Create Tutor Profile if role is Tutor
   if int(profile.role) == Profile.TUTOR:
-      city=request.data["city"]
-      state=request.data["state"]
-      bio=request.data["bio"]
-      hourly_rate=request.data["hourly_rate"]
+      city=request.data.get("city") or "Unknown"
+      state=request.data.get("state") or "NA"
+      bio=request.data.get("bio")
+      if not bio:
+        bio = ""
+      hourly_rate=request.data.get("hourly_rate") or 0.00
       tutor = TutorProfile.objects.create(profile=profile, city=city, state=state, bio=bio, hourly_rate=hourly_rate)
   # otherwise, check if parent
   elif int(profile.role) == Profile.PARENT:
       parent = ParentProfile.objects.create(profile=profile)
   # otherwise, student
   else:
-      parent_profile = request.data["parent_profile"]
-      grade_level = request.data["grade_level"]
-      preferred_subjects = request.data["preferred_subjects"]
-      emergency_contact_name = request.data["emergency_contact_name"]
-      emergency_contact_phone_number = request.data["emergency_contact_phone_number"]
-      parent_profile_id = request.data["parent_profile"]
-      parent_profile_instance = ParentProfile.objects.get(id=parent_profile_id)
+      parent_profile = request.data.get("parent_profile")
+      grade_level = request.data.get("grade_level")
+      preferred_subjects = request.data.get("preferred_subjects")
+      grade_level = request.data.get("grade_level")
+      if not grade_level:
+          grade_level = 1  # same as the model default
+
+      emergency_contact_name = request.data.get("emergency_contact_name") or "Unknown"
+      emergency_contact_phone_number = request.data.get("emergency_contact_phone_number") or "1234567890"
+      parent_profile_id = request.data.get("parent_profile")
+      if parent_profile_id:
+        parent_profile_instance = ParentProfile.objects.get(id=parent_profile_id)
+
+      else:
+          parent_profile_instance = ParentProfile.objects.get(id=1) # for now
+
       student = StudentProfile.objects.create(
           profile=profile,
           parent_profile=parent_profile_instance,
           grade_level = grade_level,
-          preferred_subjects = preferred_subjects,
           emergency_contact_name = emergency_contact_name,
           emergency_contact_phone_number = emergency_contact_phone_number
       )
+      # For now, just to get sign up to work without full frontend + backend connection
+      if not preferred_subjects:
+            default_subjects = Subject.objects.filter(title__in=["Biology"])
+            student.preferred_subjects.set(default_subjects)
+      else:
+          student.preferred_subjects.set(preferred_subjects)
+
   return Response({"message": "User registered successfully"}, status=status.HTTP_201_CREATED)
 
 @api_view(['POST'])

backend/backend/settings.py

@@ -59,6 +59,7 @@
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
+    'django_extensions',
     "daphne",           #daphne has to be before django.contrib.staticfiles
     'django.contrib.staticfiles',
     "apps.api",         # our api app

backend/requirements.txt

@@ -23,6 +23,7 @@ pytest-django==4.8.0
 pytest-asyncio==0.23.5
 factory-boy==3.3.0
 coverage==7.5.0
+django-extensions==4.1
 
 # Dev dependencies
 pytest-cov==6.1.1