Skip to content

Commit

Permalink
Merge pull request #23 from SELab-2/model-implementation
Browse files Browse the repository at this point in the history
fix user migrations
  • Loading branch information
axellorreyne authored Mar 2, 2024
2 parents c7cb454 + 6a97894 commit 03f4dde
Show file tree
Hide file tree
Showing 8 changed files with 65 additions and 143 deletions.
2 changes: 1 addition & 1 deletion backend/pigeonhole/apps/courses/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 5.0.2 on 2024-02-28 17:36
# Generated by Django 5.0.2 on 2024-03-02 13:17

from django.db import migrations, models

Expand Down
4 changes: 2 additions & 2 deletions backend/pigeonhole/apps/groups/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Generated by Django 4.2.7 on 2024-02-28 19:58
# Generated by Django 5.0.2 on 2024-03-02 13:17

from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models


class Migration(migrations.Migration):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 5.0.2 on 2024-02-28 17:46
# Generated by Django 5.0.2 on 2024-03-02 13:17

import django.db.models.deletion
from django.db import migrations, models
Expand Down
17 changes: 8 additions & 9 deletions backend/pigeonhole/apps/submissions/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 5.0.2 on 2024-02-28 17:47
# Generated by Django 5.0.2 on 2024-03-02 13:21

import django.db.models.deletion
from django.db import migrations, models
Expand All @@ -9,22 +9,21 @@ class Migration(migrations.Migration):

dependencies = [
('projects', '0001_initial'),
('users', '0003_student_project'),
('users', '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>/')),
('file', models.FileField(upload_to='uploads/<django.db.models.fields.related.ForeignKey>/'
'<django.db.models.fields.related.ForeignKey>/')),
('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')),
('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')),
],
),
]
61 changes: 53 additions & 8 deletions backend/pigeonhole/apps/users/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,40 +1,85 @@
# Generated by Django 5.0.2 on 2024-02-28 17:07
# Generated by Django 5.0.2 on 2024-03-02 13:17

import django.contrib.auth.models
import django.contrib.auth.validators
import django.db.models.deletion
import django.utils.timezone
from django.conf import settings
from django.db import migrations, models


class Migration(migrations.Migration):
initial = True

dependencies = [
('auth', '0012_alter_user_first_name_max_length'),
('courses', '0001_initial'),
('projects', '0001_initial'),
]

operations = [
migrations.CreateModel(
name='Person',
name='User',
fields=[
('person_id', models.BigAutoField(primary_key=True, serialize=False)),
('e_mail', models.CharField(max_length=256)),
('first_name', models.CharField(max_length=64)),
('last_name', models.CharField(max_length=64)),
('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.',
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.',
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.',
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')),
('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')),
('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')),
],
options={
'verbose_name': 'user',
'verbose_name_plural': 'users',
'db_table': 'auth_user',
'abstract': False,
},
managers=[
('objects', django.contrib.auth.models.UserManager()),
],
),
migrations.CreateModel(
name='Student',
fields=[
('id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False,
to='users.person')),
to=settings.AUTH_USER_MODEL)),
('number', models.IntegerField()),
('course', models.ManyToManyField(to='courses.course')),
('project', models.ManyToManyField(to='projects.project')),
],
),
migrations.CreateModel(
name='Teacher',
fields=[
('id', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False,
to='users.person')),
to=settings.AUTH_USER_MODEL)),
('is_admin', models.BooleanField(default=False)),
('is_assistent', models.BooleanField(default=False)),
('course', models.ManyToManyField(to='courses.course')),
],
),
]

This file was deleted.

19 changes: 0 additions & 19 deletions backend/pigeonhole/apps/users/migrations/0003_student_project.py

This file was deleted.

This file was deleted.

0 comments on commit 03f4dde

Please sign in to comment.