Merge pull request #25 from SELab-2/models-implementation

Groups implemented

Author: axellorreyne

backend/pigeonhole/apps/courses/migrations/0001_initial.py

@@ -1,10 +1,9 @@
-# Generated by Django 5.0.2 on 2024-03-02 13:17
+# Generated by Django 5.0.2 on 2024-03-02 21:03
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

backend/pigeonhole/apps/courses/models.py

@@ -3,12 +3,13 @@
 
 
 # Create your models here.
-
 class Course(models.Model):
     course_id = models.BigAutoField(primary_key=True)
     name = models.CharField(max_length=256)
     description = models.TextField()
 
+    objects = models.Manager()
+
 
 class CourseSerializer(serializers.ModelSerializer):
     class Meta:

backend/pigeonhole/apps/groups/migrations/0001_initial.py

@@ -1,11 +1,10 @@
-# Generated by Django 5.0.2 on 2024-03-02 13:17
+# Generated by Django 5.0.2 on 2024-03-02 21:03
 
 import django.db.models.deletion
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [
@@ -18,6 +17,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('group_id', models.BigAutoField(primary_key=True, serialize=False)),
                 ('group_nr', models.IntegerField()),
+                ('feedback', models.TextField(null=True)),
                 ('final_score', models.IntegerField()),
                 ('project_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='projects.project')),
             ],

backend/pigeonhole/apps/groups/migrations/0002_initial.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.0.2 on 2024-03-02 21:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    initial = True
+
+    dependencies = [
+        ('groups', '0001_initial'),
+        ('users', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='group',
+            name='student',
+            field=models.ManyToManyField(to='users.student'),
+        ),
+    ]

backend/pigeonhole/apps/groups/models.py

@@ -2,16 +2,21 @@
 from rest_framework import serializers
 
 from backend.pigeonhole.apps.projects.models import Project
+from backend.pigeonhole.apps.users.models import Student
 
 
 class Group(models.Model):
     group_id = models.BigAutoField(primary_key=True)
     group_nr = models.IntegerField()
-    final_score = models.IntegerField()
     project_id = models.ForeignKey(Project, on_delete=models.CASCADE)
+    student = models.ManyToManyField(Student)
+    feedback = models.TextField(null=True)
+    final_score = models.IntegerField()
+
+    objects = models.Manager()
 
 
 class GroupSerializer(serializers.ModelSerializer):
     class Meta:
         model = Group
-        fields = ["group_id", "group_nr", "final_score", "project_id"]
+        fields = ["group_id", "group_nr", "final_score", "project_id", "student"]

backend/pigeonhole/apps/projects/migrations/0001_initial.py

@@ -1,11 +1,10 @@
-# Generated by Django 5.0.2 on 2024-03-02 13:17
+# Generated by Django 5.0.2 on 2024-03-02 21:03
 
 import django.db.models.deletion
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [
@@ -19,9 +18,36 @@ class Migration(migrations.Migration):
                 ('project_id', models.BigAutoField(primary_key=True, serialize=False)),
                 ('name', models.CharField(max_length=256)),
                 ('description', models.TextField()),
-                ('deadline', models.DateTimeField()),
                 ('visible', models.BooleanField(default=False)),
                 ('course_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.course')),
             ],
         ),
+        migrations.CreateModel(
+            name='ForbiddenExtension',
+            fields=[
+                ('extension_id', models.BigAutoField(primary_key=True, serialize=False)),
+                ('extension', models.IntegerField()),
+                ('project_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='projects.project')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Conditions',
+            fields=[
+                ('condition_id', models.BigAutoField(primary_key=True, serialize=False)),
+                ('condition', models.CharField(max_length=256)),
+                ('deadline', models.DateTimeField()),
+                ('test_file_location', models.CharField(max_length=512, null=True)),
+                ('test_file_type', models.CharField(max_length=256, null=True)),
+                ('submission_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,
+                                                    to='projects.project')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='AllowedExtension',
+            fields=[
+                ('extension_id', models.BigAutoField(primary_key=True, serialize=False)),
+                ('extension', models.IntegerField()),
+                ('project_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='projects.project')),
+            ],
+        ),
     ]

backend/pigeonhole/apps/projects/models.py

@@ -10,11 +10,45 @@ class Project(models.Model):
     course_id = models.ForeignKey(Course, on_delete=models.CASCADE)
     name = models.CharField(max_length=256)
     description = models.TextField()
-    deadline = models.DateTimeField()
     visible = models.BooleanField(default=False)
 
 
 class ProjectSerializer(serializers.ModelSerializer):
     class Meta:
         model = Project
         fields = ['project_id', 'course_id', 'name', 'description', 'deadline', 'visible']
+
+
+class Conditions(models.Model):
+    condition_id = models.BigAutoField(primary_key=True)
+    submission_id = models.ForeignKey(Project, on_delete=models.CASCADE)
+    condition = models.CharField(max_length=256)
+    deadline = models.DateTimeField()
+    test_file_location = models.CharField(max_length=512, null=True)
+    test_file_type = models.CharField(max_length=256, null=True)
+
+    objects = models.Manager()
+
+    @property
+    def get_forbidden_extensions(self):
+        return ForbiddenExtension.objects.filter(project_id=self.submission_id)
+
+    @property
+    def get_allowed_extensions(self):
+        return AllowedExtension.objects.filter(project_id=self.submission_id)
+
+
+class AllowedExtension(models.Model):
+    extension_id = models.BigAutoField(primary_key=True)
+    project_id = models.ForeignKey(Project, on_delete=models.CASCADE)
+    extension = models.IntegerField()
+
+    objects = models.Manager()
+
+
+class ForbiddenExtension(models.Model):
+    extension_id = models.BigAutoField(primary_key=True)
+    project_id = models.ForeignKey(Project, on_delete=models.CASCADE)
+    extension = models.IntegerField()
+
+    objects = models.Manager()

backend/pigeonhole/apps/submissions/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.0.2 on 2024-03-02 13:21
+# Generated by Django 5.0.2 on 2024-03-02 21:03
 
 import django.db.models.deletion
 from django.db import migrations, models
@@ -8,22 +8,23 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('projects', '0001_initial'),
-        ('users', '0001_initial'),
+        ('groups', '0001_initial'),
     ]
 
     operations = [
         migrations.CreateModel(
             name='Submissions',
             fields=[
                 ('submission_id', models.BigAutoField(primary_key=True, serialize=False)),
-                ('file', models.FileField(upload_to='uploads/<django.db.models.fields.related.ForeignKey>/'
-                                                    '<django.db.models.fields.related.ForeignKey>/')),
+                ('submission_nr', models.IntegerField()),
+                ('file', models.FileField(
+                    upload_to='uploads/<django.db.models.fields.related.ForeignKey>/<django.db.models.fields'
+                              '.IntegerField>/')),
                 ('timestamp', models.DateTimeField(auto_now_add=True)),
-                ('project_id', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE,
-                                                 to='projects.project')),
-                ('student_id', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE,
-                                                 to='users.student')),
+                ('output_test', models.FileField(
+                    upload_to='uploads/<django.db.models.fields.related.ForeignKey>/<django.db.models.fields'
+                              '.IntegerField>/output_test/')),
+                ('group_id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='groups.group')),
             ],
         ),
     ]

backend/pigeonhole/apps/submissions/migrations/0002_alter_submissions_file_alter_submissions_output_test.py

@@ -0,0 +1,26 @@
+# Generated by Django 5.0.2 on 2024-03-02 21:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('submissions', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='submissions',
+            name='file',
+            field=models.FileField(null=True,
+                                   upload_to='uploads/<django.db.models.fields.related.ForeignKey>/<django.db.models'
+                                             '.fields.IntegerField>/'),
+        ),
+        migrations.AlterField(
+            model_name='submissions',
+            name='output_test',
+            field=models.FileField(null=True,
+                                   upload_to='uploads/<django.db.models.fields.related.ForeignKey>/<django.db.models'
+                                             '.fields.IntegerField>/output_test/'),
+        ),
+    ]

backend/pigeonhole/apps/submissions/models.py

@@ -1,20 +1,24 @@
 from django.db import models
 from rest_framework import serializers
 
-from backend.pigeonhole.apps.projects.models import Project
-from backend.pigeonhole.apps.users.models import Student
+from backend.pigeonhole.apps.groups.models import Group
 
 
 # Create your models here.
 class Submissions(models.Model):
     submission_id = models.BigAutoField(primary_key=True)
-    student_id = models.ForeignKey(Student, on_delete=models.CASCADE, null=True)
-    project_id = models.ForeignKey(Project, on_delete=models.CASCADE, null=True)
-    file = models.FileField(upload_to='uploads/' + str(student_id) + '/' + str(project_id) + '/')
+    group_id = models.ForeignKey(Group, on_delete=models.CASCADE, blank=False)
+    submission_nr = models.IntegerField()
+    file = models.FileField(upload_to='uploads/' + str(group_id) + '/' + str(submission_nr) + '/',
+                            null=True, blank=False)
     timestamp = models.DateTimeField(auto_now_add=True)
+    output_test = models.FileField(upload_to='uploads/' + str(group_id) + '/' + str(submission_nr) + '/output_test/',
+                                   null=True, blank=False)
+
+    objects = models.Manager()
 
 
 class SubmissionsSerializer(serializers.ModelSerializer):
     class Meta:
         model = Submissions
-        fields = ['submission_id', 'student_id', 'project_id', 'file', 'timestamp', 'submission_nr']
+        fields = ['submission_id', 'group_id', 'file', 'timestamp', 'submission_nr']

backend/pigeonhole/apps/users/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.0.2 on 2024-03-02 13:17
+# Generated by Django 5.0.2 on 2024-03-02 21:03
 
 import django.contrib.auth.models
 import django.contrib.auth.validators
@@ -14,7 +14,6 @@ class Migration(migrations.Migration):
     dependencies = [
         ('auth', '0012_alter_user_first_name_max_length'),
         ('courses', '0001_initial'),
-        ('projects', '0001_initial'),
     ]
 
     operations = [
@@ -24,30 +23,32 @@ class Migration(migrations.Migration):
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('password', models.CharField(max_length=128, verbose_name='password')),
                 ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
-                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all '
-                                                                              'permissions without explicitly '
-                                                                              'assigning them.',
+                ('is_superuser', models.BooleanField(default=False,
+                                                     help_text='Designates that this user has all permissions '
+                                                               'without explicitly assigning them.',
                                                      verbose_name='superuser status')),
                 ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'},
-                                              help_text='Required. 150 characters or fewer. '
-                                                        'Letters, digits and @/./+/-/_ only.',
+                                              help_text='Required. 150 characters or fewer. Letters, digits '
+                                                        'and @/./+/-/_ only.',
                                               max_length=150, unique=True,
                                               validators=[django.contrib.auth.validators.UnicodeUsernameValidator()],
                                               verbose_name='username')),
                 ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')),
                 ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
                 ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
-                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can '
-                                                                          'log into this admin site.',
+                ('is_staff', models.BooleanField(default=False,
+                                                 help_text='Designates whether the user can log into this admin site.',
                                                  verbose_name='staff status')),
-                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be '
-                                                                          'treated as active. Unselect this instead of '
-                                                                          'deleting accounts.', verbose_name='active')),
+                ('is_active', models.BooleanField(default=True,
+                                                  help_text='Designates whether this user should be treated as active. '
+                                                            'Unselect this instead of deleting accounts.',
+                                                  verbose_name='active')),
                 ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
-                ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will '
-                                                                        'get all permissions granted to each of their '
-                                                                        'groups.', related_name='user_set',
-                                                  related_query_name='user', to='auth.group', verbose_name='groups')),
+                ('groups', models.ManyToManyField(blank=True,
+                                                  help_text='The groups this user belongs to. A user will get all '
+                                                            'permissions granted to each of their groups.',
+                                                  related_name='user_set', related_query_name='user', to='auth.group',
+                                                  verbose_name='groups')),
                 ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.',
                                                             related_name='user_set', related_query_name='user',
                                                             to='auth.permission', verbose_name='user permissions')),
@@ -69,7 +70,6 @@ class Migration(migrations.Migration):
                                          to=settings.AUTH_USER_MODEL)),
                 ('number', models.IntegerField()),
                 ('course', models.ManyToManyField(to='courses.course')),
-                ('project', models.ManyToManyField(to='projects.project')),
             ],
         ),
         migrations.CreateModel(

backend/pigeonhole/apps/users/models.py

@@ -3,7 +3,6 @@
 from rest_framework import serializers
 
 from backend.pigeonhole.apps.courses.models import Course
-from backend.pigeonhole.apps.projects.models import Project
 
 
 class User(AbstractUser):
@@ -24,14 +23,15 @@ class Meta:
 class Student(models.Model):
     id = models.ForeignKey(User, on_delete=models.CASCADE, primary_key=True)
     number = models.IntegerField()
-    project = models.ManyToManyField(Project)
     course = models.ManyToManyField(Course)
 
+    objects = models.Manager()
+
 
 class StudentSerializer(serializers.ModelSerializer):
     class Meta:
         model = Student
-        fields = ['number', 'project', 'course', 'id']
+        fields = ['number', 'course', 'id']
 
 
 class Teacher(models.Model):
@@ -40,6 +40,8 @@ class Teacher(models.Model):
     is_admin = models.BooleanField(default=False)
     is_assistent = models.BooleanField(default=False)
 
+    objects = models.Manager()
+
 
 class TeacherSerializer(serializers.ModelSerializer):
     class Meta: