keannu125/StudE-Backend
1
0
Fork 0
mirror of https://github.com/lemeow125/StudE-Backend.git synced 2025-06-28 16:25:44 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Major overhaul to subject model and serializers

Browse source
This commit is contained in:
Keannu Christian Bernasol 2023-07-26 23:32:03 +08:00
parent 0eff07a1ae
commit 0fd790505e
26 changed files with 199 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

4
stude/subjects/admin.py
View file

@ -1,6 +1,4 @@
from django.contrib import admin
from .models import Subject, SubjectCode, SubjectInstance
from .models import Subject
admin.site.register(Subject)
admin.site.register(SubjectInstance)
admin.site.register(SubjectCode)

22
stude/subjects/migrations/0001_initial.py
View file

@ -1,4 +1,4 @@
# Generated by Django 4.2.3 on 2023-07-26 03:53
# Generated by Django 4.2.3 on 2023-07-26 12:06
from django.conf import settings
from django.db import migrations, models
@ -10,10 +10,10 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
('courses', '0001_initial'),
('year_levels', '0001_initial'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('courses', '0001_initial'),
('semesters', '0001_initial'),
('year_levels', '0001_initial'),
]
operations = [
@ -21,25 +21,11 @@ class Migration(migrations.Migration):
name='Subject',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=64, unique=True)),
],
),
migrations.CreateModel(
name='SubjectCode',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=64)),
('code', models.CharField(max_length=16, unique=True)),
],
),
migrations.CreateModel(
name='SubjectInstance',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('code', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='subjects.subjectcode')),
('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.course')),
('semester', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='semesters.semester')),
('students', models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL)),
('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='subjects.subject')),
('year_level', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='year_levels.year_level')),
],
),

18
stude/subjects/migrations/0002_alter_subject_code.py Normal file
View file

@ -0,0 +1,18 @@
# Generated by Django 4.2.3 on 2023-07-26 12:08
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('subjects', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='subject',
name='code',
field=models.CharField(max_length=16),
),
]

57
stude/subjects/models.py
View file

@ -12,26 +12,10 @@ from semesters.models import Semester
class Subject(models.Model):
name = models.CharField(max_length=64, unique=True)
def __str__(self):
return f'{self.name}'
class SubjectCode(models.Model):
code = models.CharField(max_length=16, unique=True)
def __str__(self):
return self.code
class SubjectInstance(models.Model):
subject = models.ForeignKey(
'subjects.Subject', on_delete=models.CASCADE)
name = models.CharField(max_length=64)
students = models.ManyToManyField(
CustomUser, blank=True)
code = models.ForeignKey(
SubjectCode, on_delete=models.CASCADE)
code = models.CharField(max_length=16)
course = models.ForeignKey(
Course, on_delete=models.CASCADE)
year_level = models.ForeignKey(
@ -39,10 +23,11 @@ class SubjectInstance(models.Model):
semester = models.ForeignKey(
Semester, on_delete=models.CASCADE)
class Meta:
unique_together = ['name', 'course', 'year_level', 'semester']
def __str__(self):
return f'Subject: {self.name}({self.code}) - {self.course.shortname} - {self.year_level} - {self.semester}'
# Create subjects on initial migrate
@ -62,7 +47,6 @@ def populate_subjects(sender, **kwargs):
reader = csv.reader(csvfile)
next(reader) # Skip the header row
subject_count = 0
updated_subjects = 0
ignored_subjects = 0
existing_subjects = 0
for row in reader:
@ -98,41 +82,22 @@ def populate_subjects(sender, **kwargs):
semester = Semester.objects.filter(
name=subject_semester).first()
# If Subject exists
if (Subject.objects.filter(name=subject_name).exists()):
# If subject instance exists, skip over
if (SubjectInstance.objects.filter(subject__name=subject_name, year_level=year_level, semester=semester).exists()):
# print('Duplicate subject')
existing_subjects += 1
continue
# If no subject instance exists, create one
else:
SUBJECT = Subject.objects.filter(
name=subject_name).first()
SUBJECT_CODE, created = SubjectCode.objects.get_or_create(
code=subject_code)
SUBJECT_INSTANCE = SubjectInstance.objects.get_or_create(
subject=SUBJECT, course=course, year_level=year_level, semester=semester, code=SUBJECT_CODE)
updated_subjects += 1
# If subject exists, skip over
if (Subject.objects.filter(name=subject_name, course=course, year_level=year_level, semester=semester, code=subject_code).exists()):
# print('Duplicate subject')
existing_subjects += 1
continue
# If subject does not exist at all, then create new subject
else:
SUBJECT, created = Subject.objects.get_or_create(
name=subject_name,
)
SUBJECT_CODE, created = SubjectCode.objects.get_or_create(
code=subject_code)
SUBJECT_INSTANCE = SubjectInstance.objects.get_or_create(
subject=SUBJECT, course=course, year_level=year_level, semester=semester, code=SUBJECT_CODE)
name=subject_name, course=course, year_level=year_level, semester=semester, code=subject_code)
subject_count += 1
# Set the course, year level, and semester of the subject
print('Skipped', existing_subjects,
'already existing subjects')
print('Added', subject_count, 'subjects')
print('Updated', updated_subjects, 'subjects')
print('Ignored', ignored_subjects,
'subjects', '\n')

17
stude/subjects/serializers.py
View file

@ -1,22 +1,11 @@
from rest_framework import serializers
from .models import Subject, SubjectInstance, SubjectCode
from .models import Subject
from courses.models import Course
from year_levels.models import Year_Level
from semesters.models import Semester
class SubjectSerializer(serializers.ModelSerializer):
class Meta:
model = Subject
fields = '__all__'
class SubjectInstanceSerializer(serializers.ModelSerializer):
subject = serializers.SlugRelatedField(
queryset=SubjectCode.objects.all(), slug_field='name', allow_null=False)
code = serializers.SlugRelatedField(
queryset=SubjectCode.objects.all(), slug_field='code', allow_null=False)
year_level = serializers.SlugRelatedField(
queryset=Year_Level.objects.all(), slug_field='name', allow_null=True)
semester = serializers.SlugRelatedField(
@ -25,5 +14,5 @@ class SubjectInstanceSerializer(serializers.ModelSerializer):
queryset=Course.objects.all(), slug_field='name', allow_null=True)
class Meta:
model = SubjectInstance
fields = ('id', 'subject', 'code', 'course', 'year_level', 'semester')
model = Subject
fields = ('id', 'name', 'code', 'course', 'year_level', 'semester')

4
stude/subjects/urls.py
View file

@ -1,8 +1,8 @@
from django.urls import include, path
from .views import SubjectByCourseView, SubjectByCourseYearSemesterView, SubjectListView
from rest_framework import routers
from .views import SubjectByCourseView, SubjectByCourseYearSemesterView, SubjectListView, SubjectListAllView
urlpatterns = [
path('', SubjectListView.as_view()),
path('all', SubjectListAllView.as_view()),
path('<slug:course_slug>',
SubjectByCourseView.as_view()),
path('<slug:course_slug>/<slug:year_slug>/<slug:semester_slug>',

46
stude/subjects/views.py
View file

@ -1,37 +1,63 @@
from rest_framework import generics, viewsets
from .models import Subject, SubjectInstance
from .serializers import SubjectSerializer, SubjectInstanceSerializer
from .models import Subject
from .serializers import SubjectSerializer
from rest_framework.views import APIView
from rest_framework.response import Response
from rest_framework.permissions import IsAuthenticated
class SubjectListView(generics.ListAPIView):
class SubjectListAllView(generics.ListAPIView):
serializer_class = SubjectSerializer
queryset = Subject.objects.all()
class SubjectListView(generics.ListAPIView):
permission_classes = [IsAuthenticated]
queryset = Subject.objects.all()
serializer_class = SubjectSerializer
def get(self, request):
user = self.request.user
user_course = user.course
# If user is irregular, show all subjects in his/her course to choose from
if (user.irregular):
subjects = Subject.objects.filter(
course__name=user_course)
# Else, return subjects that match the user's student info (Year Level, Semster, Course)
else:
user_yearlevel = user.year_level
user_semester = user.semester
subjects = Subject.objects.filter(
course__name=user.course, year_level__name=user_yearlevel, semester__name=user_semester)
# Serialize the subjects
serializer = SubjectSerializer(subjects, many=True)
return Response(serializer.data)
class SubjectByCourseView(generics.ListAPIView):
queryset = SubjectInstance.objects.all()
serializer_class = SubjectInstanceSerializer
queryset = Subject.objects.all()
serializer_class = SubjectSerializer
def get(self, request, course_slug):
# Retrieve the subjects based on course slug
subjects = SubjectInstance.objects.filter(
subjects = Subject.objects.filter(
course__shortname=course_slug)
# Serialize the subjects
serializer = SubjectInstanceSerializer(subjects, many=True)
serializer = SubjectSerializer(subjects, many=True)
return Response(serializer.data)
class SubjectByCourseYearSemesterView(generics.ListAPIView):
queryset = SubjectInstance.objects.all()
queryset = Subject.objects.all()
serializer_class = SubjectSerializer
def get(self, request, course_slug, year_slug, semester_slug):
# Retrieve the subjects based on year level and semester slugs
subjects = SubjectInstance.objects.filter(
subjects = Subject.objects.filter(
course__shortname=course_slug, year_level__shortname=year_slug, semester__shortname=semester_slug)
# Serialize the subjects
serializer = SubjectInstanceSerializer(subjects, many=True)
serializer = SubjectSerializer(subjects, many=True)
return Response(serializer.data)