Skip to content

Commit 0c0ad23

Browse files
committed
feat(quiz): added in user fields to Question and QuestionResponse models
1 parent 3b3347c commit 0c0ad23

3 files changed

Lines changed: 30 additions & 1 deletion

File tree

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Generated by Django 4.0.6 on 2022-07-16 07:39
2+
3+
from django.conf import settings
4+
from django.db import migrations, models
5+
import django.db.models.deletion
6+
7+
8+
class Migration(migrations.Migration):
9+
10+
dependencies = [
11+
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
12+
('shared_models', '0003_initial'),
13+
]
14+
15+
operations = [
16+
migrations.AddField(
17+
model_name='question',
18+
name='creator',
19+
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL),
20+
),
21+
migrations.AddField(
22+
model_name='questionresponse',
23+
name='user',
24+
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL),
25+
),
26+
]

server/api/apps/shared_models/models/quiz_models.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from django.db import models
22
from django.utils.translation import gettext_lazy as _
33
from . import defines
4+
from django.contrib.auth.models import User
45

56

67
class Question(models.Model):
@@ -14,6 +15,7 @@ class QuestionType(models.TextChoices):
1415
question_type = models.CharField(max_length=2,
1516
choices=QuestionType.choices,
1617
default=QuestionType.MULTICHOICE)
18+
creator = models.ForeignKey(User, on_delete=models.SET_NULL, null=True)
1719
date_created = models.DateTimeField(auto_now_add=True, null=True)
1820

1921
def __str__(self):

server/api/apps/shared_models/models/statistics_models.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
from django.db import models
22
from . import defines
33
from .quiz_models import *
4+
from django.contrib.auth.models import User
45

56
from datetime import timedelta
67

78

89
class QuestionResponse(models.Model):
9-
# TODO later: add in a field for the user who submitted the response
10+
user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True)
1011
question = models.ForeignKey(Question, on_delete=models.CASCADE)
1112
selected_answer = models.ForeignKey(Answer,
1213
on_delete=models.CASCADE,

0 commit comments

Comments
 (0)