Academics improvement

- added option to filter marks and attendance by GET params
- made academics models primary keys uneditable
- added subject semester and student current_sem validation to marks
- added branch names metadata view and route, for form choices

Author: anchithAcharya

api/academics/models.py

@@ -4,7 +4,7 @@
 from django.core.validators import MinValueValidator, MaxValueValidator
 
 class Branch(models.Model):
-	code = models.CharField(primary_key=True, max_length=10)
+	code = models.CharField(primary_key=True, max_length=10, editable=False)
 	name = models.CharField(max_length=100)
 	max_sems = models.IntegerField(default=8)
 
@@ -15,10 +15,10 @@ def __str__(self):
 		return self.name
 
 class Subject(models.Model):
-	code = models.CharField(max_length=10, primary_key=True)
+	code = models.CharField(max_length=10, primary_key=True, editable=False)
 	name = models.CharField(max_length=100)
 	branch = models.ForeignKey(Branch, on_delete=models.CASCADE)
-	semester = models.IntegerField(default=8)
+	semester = models.IntegerField()
 	credits = models.IntegerField()
 
 	def __str__(self):
@@ -82,6 +82,9 @@ def clean(self) -> None:
 				if marks[1] > total[1]:
 					errors[marks[0]] = f'Marks cannot be greater than total marks: {total[1]}.'
 
+		if self.subject.semester > self.student.current_sem:
+			errors['subject'] = f"Student current semester is {self.student.current_sem} but subject semester is {self.subject.semester}."
+
 		if errors:
 			raise ValidationError(errors)
 

api/academics/urls.py

@@ -1,8 +1,9 @@
-from academics.views import MarksViewSet, AttendanceViewSet
+from academics.views import MarksViewSet, AttendanceViewSet, get_branch_names
 
 from django.urls import path
 
 urlpatterns = [
+	path('metadata/branches', get_branch_names, name='get_branch_names'),
 	path('marks/', MarksViewSet.as_view({
 		'get': 'list',
 		'post': 'create'

api/academics/views.py

@@ -1,16 +1,47 @@
-from rest_framework import viewsets
-from academics.models import Marks, Attendance
+from rest_framework.decorators import api_view
+from rest_framework import viewsets, status
+from academics.models import Marks, Attendance, Branch
 from academics.serializers import MarksSerializer, AttendanceSerializer
+from rest_framework.response import Response
 from django.shortcuts import get_object_or_404
 from core.permissions import isAdmin, isStaff, isOwner
 
 
+@api_view(['GET'])
+def get_branch_names(request):
+	branches = Branch.objects.all()
+	branches = [(branch.code, branch.name) for branch in branches]
+	return Response(branches, status.HTTP_200_OK)
+
+
 class MarksViewSet(viewsets.ModelViewSet):
 	queryset = Marks.objects.all()
 	serializer_class = MarksSerializer
 	lookup_fields = ('student_id', 'subject_id')
 
 
+	def list(self, request, *args, **kwargs):
+		serializer = self.get_serializer(data=request.GET, partial=True)
+
+		if serializer.is_valid():
+			student = serializer.validated_data.get('student', {}).get('user', {}).get('id')
+			subject = serializer.validated_data.get('subject', {}).get('code')
+
+			queryset = self.filter_queryset(self.get_queryset())
+			if student: queryset = queryset.filter(student=student)
+			if subject: queryset = queryset.filter(subject=subject)
+
+			page = self.paginate_queryset(queryset)
+			if page is not None:
+				serializer = self.get_serializer(page, many=True)
+				return self.get_paginated_response(serializer.data)
+
+			serializer = self.get_serializer(queryset, many=True)
+			return Response(serializer.data)
+
+		else: return super().list(request, *args, **kwargs)
+
+
 	def get_object(self):
 		queryset = self.filter_queryset(self.get_queryset())
 
@@ -31,6 +62,28 @@ class AttendanceViewSet(viewsets.ModelViewSet):
 	lookup_fields = ('student_id', 'subject_id')
 
 
+	def list(self, request, *args, **kwargs):
+		serializer = self.get_serializer(data=request.GET, partial=True)
+
+		if serializer.is_valid():
+			student = serializer.validated_data.get('student', {}).get('user', {}).get('id')
+			subject = serializer.validated_data.get('subject', {}).get('code')
+
+			queryset = self.filter_queryset(self.get_queryset())
+			if student: queryset = queryset.filter(student=student)
+			if subject: queryset = queryset.filter(subject=subject)
+
+			page = self.paginate_queryset(queryset)
+			if page is not None:
+				serializer = self.get_serializer(page, many=True)
+				return self.get_paginated_response(serializer.data)
+
+			serializer = self.get_serializer(queryset, many=True)
+			return Response(serializer.data)
+
+		else: return super().list(request, *args, **kwargs)
+
+
 	def get_object(self):
 		queryset = self.filter_queryset(self.get_queryset())