Skip to content

Commit 31492d4

Browse files
cjnbennettcjnbennett
committed
style(quiz): fixed linting issues on auto-generated Django migrations
1 parent 57fe0f0 commit 31492d4

10 files changed

Lines changed: 225 additions & 94 deletions

‎server/api/apps/shared_models/apps.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33

44
class SharedModelsConfig(AppConfig):
5-
default_auto_field = 'django.db.models.BigAutoField'
6-
name = 'api.apps.shared_models'
5+
default_auto_field = "django.db.models.BigAutoField"
6+
name = "api.apps.shared_models"

‎server/api/apps/shared_models/migrations/0001_initial.py‎

Lines changed: 61 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,81 @@
55

66

77
class Migration(migrations.Migration):
8-
98
initial = True
109

11-
dependencies = [
12-
]
10+
dependencies = []
1311

1412
operations = [
1513
migrations.CreateModel(
16-
name='Question',
14+
name="Question",
1715
fields=[
18-
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
19-
('text', models.TextField(blank=True, default='')),
20-
('question_type', models.CharField(choices=[('MC', 'Multiple Choice'), ('NA', 'Numerical Answer')], default='MC', max_length=2)),
21-
('date_created', models.DateTimeField(auto_now_add=True, null=True)),
16+
(
17+
"id",
18+
models.BigAutoField(
19+
auto_created=True,
20+
primary_key=True,
21+
serialize=False,
22+
verbose_name="ID",
23+
),
24+
),
25+
("text", models.TextField(blank=True, default="")),
26+
(
27+
"question_type",
28+
models.CharField(
29+
choices=[
30+
("MC", "Multiple Choice"),
31+
("NA", "Numerical Answer"),
32+
],
33+
default="MC",
34+
max_length=2,
35+
),
36+
),
37+
(
38+
"date_created",
39+
models.DateTimeField(auto_now_add=True, null=True),
40+
),
2241
],
2342
),
2443
migrations.CreateModel(
25-
name='Tag',
44+
name="Tag",
2645
fields=[
27-
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
28-
('name', models.CharField(max_length=100)),
29-
('question', models.ManyToManyField(to='shared_models.question')),
46+
(
47+
"id",
48+
models.BigAutoField(
49+
auto_created=True,
50+
primary_key=True,
51+
serialize=False,
52+
verbose_name="ID",
53+
),
54+
),
55+
("name", models.CharField(max_length=100)),
56+
(
57+
"question",
58+
models.ManyToManyField(to="shared_models.question"),
59+
),
3060
],
3161
),
3262
migrations.CreateModel(
33-
name='Answer',
63+
name="Answer",
3464
fields=[
35-
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
36-
('text', models.CharField(max_length=200)),
37-
('is_correct', models.BooleanField(default=False)),
38-
('question', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='shared_models.question')),
65+
(
66+
"id",
67+
models.BigAutoField(
68+
auto_created=True,
69+
primary_key=True,
70+
serialize=False,
71+
verbose_name="ID",
72+
),
73+
),
74+
("text", models.CharField(max_length=200)),
75+
("is_correct", models.BooleanField(default=False)),
76+
(
77+
"question",
78+
models.ForeignKey(
79+
on_delete=django.db.models.deletion.CASCADE,
80+
to="shared_models.question",
81+
),
82+
),
3983
],
4084
),
4185
]

‎server/api/apps/shared_models/migrations/0002_remove_tag_question_delete_answer_delete_question_and_more.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,22 @@
44

55

66
class Migration(migrations.Migration):
7-
87
dependencies = [
9-
('shared_models', '0001_initial'),
8+
("shared_models", "0001_initial"),
109
]
1110

1211
operations = [
1312
migrations.RemoveField(
14-
model_name='tag',
15-
name='question',
13+
model_name="tag",
14+
name="question",
1615
),
1716
migrations.DeleteModel(
18-
name='Answer',
17+
name="Answer",
1918
),
2019
migrations.DeleteModel(
21-
name='Question',
20+
name="Question",
2221
),
2322
migrations.DeleteModel(
24-
name='Tag',
23+
name="Tag",
2524
),
2625
]

‎server/api/apps/shared_models/migrations/0003_initial.py‎

Lines changed: 98 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,53 +6,126 @@
66

77

88
class Migration(migrations.Migration):
9-
109
initial = True
1110

1211
dependencies = [
13-
('shared_models', '0002_remove_tag_question_delete_answer_delete_question_and_more'),
12+
(
13+
"shared_models",
14+
"0002_remove_tag_question_delete_answer_delete_question_and_more",
15+
),
1416
]
1517

1618
operations = [
1719
migrations.CreateModel(
18-
name='Answer',
20+
name="Answer",
1921
fields=[
20-
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
21-
('text', models.CharField(max_length=200)),
22-
('is_correct', models.BooleanField(default=False)),
22+
(
23+
"id",
24+
models.BigAutoField(
25+
auto_created=True,
26+
primary_key=True,
27+
serialize=False,
28+
verbose_name="ID",
29+
),
30+
),
31+
("text", models.CharField(max_length=200)),
32+
("is_correct", models.BooleanField(default=False)),
2333
],
2434
),
2535
migrations.CreateModel(
26-
name='Question',
36+
name="Question",
2737
fields=[
28-
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
29-
('text', models.TextField(blank=True, default='')),
30-
('question_type', models.CharField(choices=[('MC', 'Multiple Choice'), ('NA', 'Numerical Answer'), ('SA', 'Short Answer')], default='MC', max_length=2)),
31-
('date_created', models.DateTimeField(auto_now_add=True, null=True)),
38+
(
39+
"id",
40+
models.BigAutoField(
41+
auto_created=True,
42+
primary_key=True,
43+
serialize=False,
44+
verbose_name="ID",
45+
),
46+
),
47+
("text", models.TextField(blank=True, default="")),
48+
(
49+
"question_type",
50+
models.CharField(
51+
choices=[
52+
("MC", "Multiple Choice"),
53+
("NA", "Numerical Answer"),
54+
("SA", "Short Answer"),
55+
],
56+
default="MC",
57+
max_length=2,
58+
),
59+
),
60+
(
61+
"date_created",
62+
models.DateTimeField(auto_now_add=True, null=True),
63+
),
3264
],
3365
),
3466
migrations.CreateModel(
35-
name='Tag',
67+
name="Tag",
3668
fields=[
37-
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
38-
('name', models.CharField(max_length=100)),
39-
('question', models.ManyToManyField(to='shared_models.question')),
69+
(
70+
"id",
71+
models.BigAutoField(
72+
auto_created=True,
73+
primary_key=True,
74+
serialize=False,
75+
verbose_name="ID",
76+
),
77+
),
78+
("name", models.CharField(max_length=100)),
79+
(
80+
"question",
81+
models.ManyToManyField(to="shared_models.question"),
82+
),
4083
],
4184
),
4285
migrations.CreateModel(
43-
name='QuestionResponse',
86+
name="QuestionResponse",
4487
fields=[
45-
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
46-
('is_correct', models.BooleanField(default=False)),
47-
('time_taken', models.DurationField(default=datetime.timedelta(0))),
48-
('date_created', models.DateTimeField(auto_now_add=True, null=True)),
49-
('question', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='shared_models.question')),
50-
('selected_answer', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='shared_models.answer')),
88+
(
89+
"id",
90+
models.BigAutoField(
91+
auto_created=True,
92+
primary_key=True,
93+
serialize=False,
94+
verbose_name="ID",
95+
),
96+
),
97+
("is_correct", models.BooleanField(default=False)),
98+
(
99+
"time_taken",
100+
models.DurationField(default=datetime.timedelta(0)),
101+
),
102+
(
103+
"date_created",
104+
models.DateTimeField(auto_now_add=True, null=True),
105+
),
106+
(
107+
"question",
108+
models.ForeignKey(
109+
on_delete=django.db.models.deletion.CASCADE,
110+
to="shared_models.question",
111+
),
112+
),
113+
(
114+
"selected_answer",
115+
models.ForeignKey(
116+
null=True,
117+
on_delete=django.db.models.deletion.CASCADE,
118+
to="shared_models.answer",
119+
),
120+
),
51121
],
52122
),
53123
migrations.AddField(
54-
model_name='answer',
55-
name='question',
56-
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='shared_models.question'),
124+
model_name="answer",
125+
name="question",
126+
field=models.ForeignKey(
127+
on_delete=django.db.models.deletion.CASCADE,
128+
to="shared_models.question",
129+
),
57130
),
58131
]

‎server/api/apps/shared_models/migrations/0004_question_creator_questionresponse_user.py‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,28 @@
66

77

88
class Migration(migrations.Migration):
9-
109
dependencies = [
1110
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
12-
('shared_models', '0003_initial'),
11+
("shared_models", "0003_initial"),
1312
]
1413

1514
operations = [
1615
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),
16+
model_name="question",
17+
name="creator",
18+
field=models.ForeignKey(
19+
null=True,
20+
on_delete=django.db.models.deletion.SET_NULL,
21+
to=settings.AUTH_USER_MODEL,
22+
),
2023
),
2124
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+
model_name="questionresponse",
26+
name="user",
27+
field=models.ForeignKey(
28+
null=True,
29+
on_delete=django.db.models.deletion.SET_NULL,
30+
to=settings.AUTH_USER_MODEL,
31+
),
2532
),
2633
]

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ class QuestionType(models.TextChoices):
1111
SHORT_ANSWER = "SA", _("Short Answer")
1212

1313
text = models.TextField(blank=True, default="")
14-
question_type = models.CharField(max_length=2,
15-
choices=QuestionType.choices,
16-
default=QuestionType.MULTICHOICE)
14+
question_type = models.CharField(
15+
max_length=2,
16+
choices=QuestionType.choices,
17+
default=QuestionType.MULTICHOICE,
18+
)
1719
creator = models.ForeignKey(User, on_delete=models.SET_NULL, null=True)
1820
date_created = models.DateTimeField(auto_now_add=True, null=True)
1921

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
class QuestionResponse(models.Model):
99
user = models.ForeignKey(User, on_delete=models.SET_NULL, null=True)
1010
question = models.ForeignKey(Question, on_delete=models.CASCADE)
11-
selected_answer = models.ForeignKey(Answer,
12-
on_delete=models.CASCADE,
13-
null=True)
11+
selected_answer = models.ForeignKey(
12+
Answer, on_delete=models.CASCADE, null=True
13+
)
1414
is_correct = models.BooleanField(default=False)
1515
time_taken = models.DurationField(default=timedelta())
1616
date_created = models.DateTimeField(auto_now_add=True, null=True)

‎server/api/apps/shared_models/serializers/statistics_serializers.py‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
class QuestionResponseSerializer(serializers.HyperlinkedModelSerializer):
66
class Meta:
77
model = QuestionResponse
8-
fields = ["id",
9-
"question",
10-
"selected_answer",
11-
"is_correct",
12-
"time_taken",
13-
"date_created"]
8+
fields = [
9+
"id",
10+
"question",
11+
"selected_answer",
12+
"is_correct",
13+
"time_taken",
14+
"date_created",
15+
]

0 commit comments

Comments
 (0)