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

2
stude/accounts/admin.py
View file

@ -30,7 +30,7 @@ class CustomUserAdmin(UserAdmin):
fieldsets = UserAdmin.fieldsets + (
(None, {'fields': ('student_id_number',
'year_level', 'semester', 'course', 'subjects', 'avatar', 'is_student', 'is_banned')}),
'year_level', 'semester', 'course', 'subjects', 'avatar', 'is_student', 'irregular')}),
)

6
stude/accounts/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
import accounts.models
import django.contrib.auth.models
@ -13,9 +13,9 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
('semesters', '0001_initial'),
('courses', '0001_initial'),
('auth', '0012_alter_user_first_name_max_length'),
('semesters', '0001_initial'),
]
operations = [
@ -35,7 +35,7 @@ class Migration(migrations.Migration):
('is_active', models.BooleanField(default=False)),
('is_student', models.BooleanField(default=True)),
('is_studying', models.BooleanField(default=False)),
('is_banned', models.BooleanField(default=False)),
('irregular', models.BooleanField(default=False)),
('student_id_number', models.CharField(max_length=16, validators=[accounts.models.validate_student_id])),
('avatar', models.ImageField(null=True, upload_to=accounts.models.CustomUser._get_upload_to)),
('course', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='courses.course')),

6
stude/accounts/migrations/0002_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.db import migrations, models
import django.db.models.deletion
@ -9,9 +9,9 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
('year_levels', '0001_initial'),
('subjects', '0001_initial'),
('accounts', '0001_initial'),
('year_levels', '0001_initial'),
('auth', '0012_alter_user_first_name_max_length'),
]
@ -19,7 +19,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='customuser',
name='subjects',
field=models.ManyToManyField(to='subjects.subjectinstance'),
field=models.ManyToManyField(to='subjects.subject'),
),
migrations.AddField(
model_name='customuser',

4
stude/accounts/models.py
View file

@ -34,7 +34,7 @@ class CustomUser(AbstractUser):
is_active = models.BooleanField(default=False)
is_student = models.BooleanField(default=True)
is_studying = models.BooleanField(default=False)
is_banned = models.BooleanField(default=False)
irregular = models.BooleanField(default=False)
student_id_number = models.CharField(
max_length=16, validators=[validate_student_id], null=False)
avatar = models.ImageField(upload_to=_get_upload_to, null=True)
@ -53,7 +53,7 @@ class CustomUser(AbstractUser):
on_delete=models.SET_NULL,
null=True
)
subjects = models.ManyToManyField('subjects.SubjectInstance')
subjects = models.ManyToManyField('subjects.Subject')
@property
def full_name(self):

40
stude/accounts/serializers.py
View file

@ -13,11 +13,25 @@ from year_levels.models import Year_Level
from semesters.models import Semester
from subjects.models import Subject
from django.contrib.gis.geos import Point
from django.utils.encoding import smart_str
# There can be multiple subject instances with the same name, only differing in course, year level, and semester. We filter them here
class SubjectSlugRelatedField(serializers.SlugRelatedField):
def to_internal_value(self, data):
user_course = self.context['request'].user.course
try:
subject = Subject.objects.get(name=data, course=user_course)
return subject
except Subject.DoesNotExist:
self.fail('does_not_exist', slug_name=self.slug_field,
value=smart_str(data))
except (TypeError, ValueError):
self.fail('invalid')
class CustomUserSerializer(BaseUserSerializer):
# user_status = StudentStatusSerializer(
# source='studentstatus', read_only=True)
course_shortname = serializers.SerializerMethodField()
yearlevel_shortname = serializers.SerializerMethodField()
semester_shortname = serializers.SerializerMethodField()
@ -27,14 +41,15 @@ class CustomUserSerializer(BaseUserSerializer):
many=False, slug_field='name', queryset=Year_Level.objects.all(), required=False, allow_null=True)
semester = serializers.SlugRelatedField(
many=False, slug_field='name', queryset=Semester.objects.all(), required=False, allow_null=True)
subjects = serializers.SlugRelatedField(
many=True, slug_field='name', queryset=Subject.objects.all(), required=False, allow_null=True)
# Use custom slug field for filtering
subjects = SubjectSlugRelatedField(
many=True, slug_field='name', queryset=Subject.objects.all(), required=False)
class Meta(BaseUserSerializer.Meta):
model = CustomUser
fields = ('username', 'email',
'student_id_number', 'year_level', 'yearlevel_shortname', 'semester', 'semester_shortname', 'course', 'course_shortname', 'subjects', 'avatar', 'first_name', 'last_name', 'is_banned')
read_only_fields = ('is_banned', 'user_status', 'yearlevel_shortname',
'student_id_number', 'year_level', 'yearlevel_shortname', 'semester', 'semester_shortname', 'course', 'course_shortname', 'subjects', 'avatar', 'first_name', 'last_name', 'irregular')
read_only_fields = ('user_status', 'yearlevel_shortname',
'semester_shortname', 'course_shortname')
def get_course_shortname(self, instance):
@ -51,9 +66,9 @@ class CustomUserSerializer(BaseUserSerializer):
print(validated_data)
# If course, year_level, or semester is changed
if any(field in validated_data for field in ['course', 'year_level', 'semester']):
if (instance.course != validated_data['course'] or
instance.year_level != validated_data['year_level'] or
instance.semester != validated_data['semester']):
if (instance.course not in validated_data['course'] or
instance.year_level not in validated_data['year_level'] or
instance.semester not in validated_data['semester']):
# Clear all subjects
instance.subjects.clear()
@ -61,17 +76,16 @@ class CustomUserSerializer(BaseUserSerializer):
instance = super().update(instance, validated_data)
# Then add new subjects matching the new criteria
self.add_subjects(instance)
# Else update as usual
else:
instance = super().update(instance, validated_data)
# Else update as usual
super().update(instance, validated_data)
return instance
def add_subjects(self, instance):
# Get the matching subjects based on the user's course, year level, and semester
matching_subjects = Subject.objects.filter(
courses=instance.course, year_levels=instance.year_level, semesters=instance.semester)
course=instance.course, year_level=instance.year_level, semester=instance.semester)
# Add the matching subjects to the user's subjects list
instance.subjects.add(*matching_subjects)