Create ProblemInstance model

Author: matijapretnar

web/attempts/admin.py

@@ -9,6 +9,7 @@ class AttemptAdmin(SimpleHistoryAdmin):
         "user",
         "part",
         "problem",
+        "problem_instance",
         "solution",
         "valid",
         "feedback",
@@ -17,6 +18,7 @@ class AttemptAdmin(SimpleHistoryAdmin):
     list_display = (
         "user",
         "problem",
+        "problem_instance",
         "part",
         "valid",
     )
@@ -37,6 +39,7 @@ class AttemptAdmin(SimpleHistoryAdmin):
 
     readonly_fields = [
         "problem",
+        "problem_instance",
     ]
 
     def problem(self, obj):

web/attempts/migrations/0004_attempt_problem_instance_and_more.py

@@ -0,0 +1,36 @@
+# Generated by Django 4.1.2 on 2023-02-19 11:00
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("courses", "0004_probleminstance"),
+        ("attempts", "0003_alter_attempt_part"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="attempt",
+            name="problem_instance",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="attempts",
+                to="courses.probleminstance",
+            ),
+        ),
+        migrations.AddField(
+            model_name="historicalattempt",
+            name="problem_instance",
+            field=models.ForeignKey(
+                blank=True,
+                db_constraint=False,
+                null=True,
+                on_delete=django.db.models.deletion.DO_NOTHING,
+                related_name="+",
+                to="courses.probleminstance",
+            ),
+        ),
+    ]

web/attempts/models.py

@@ -11,6 +11,12 @@ class Attempt(models.Model):
     part = models.ForeignKey(
         "problems.Part", on_delete=models.CASCADE, related_name="attempts"
     )
+    problem_instance = models.ForeignKey(
+        "courses.ProblemInstance",
+        on_delete=models.SET_NULL,
+        related_name="attempts",
+        null=True,
+    )
     solution = models.TextField(blank=True)
     valid = models.BooleanField(default=False)
     feedback = models.TextField(default="[]", validators=[is_json_string_list])

web/courses/migrations/0004_probleminstance.py

@@ -0,0 +1,49 @@
+# Generated by Django 4.1.2 on 2023-02-19 11:00
+
+from django.db import migrations, models
+import django.db.models.deletion
+import utils.models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("problems", "0005_alter_historicalproblem_visible_and_more"),
+        ("courses", "0003_alter_coursegroup_options"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="ProblemInstance",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("visible", models.BooleanField(default=False, verbose_name="Visible")),
+                (
+                    "problem",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="instances",
+                        to="problems.problem",
+                    ),
+                ),
+                (
+                    "problem_set",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="courses.problemset",
+                    ),
+                ),
+            ],
+            options={
+                "order_with_respect_to": "problem_set",
+            },
+            bases=(utils.models.OrderWithRespectToMixin, models.Model),
+        ),
+    ]

web/courses/models.py

@@ -576,3 +576,17 @@ def copy_to(self, course):
         for problem in self.problems.all():
             problem.copy_to(new_problem_set)
         return new_problem_set
+
+
+class ProblemInstance(OrderWithRespectToMixin, models.Model):
+    problem = models.ForeignKey(
+        "problems.Problem", on_delete=models.CASCADE, related_name="instances"
+    )
+    problem_set = models.ForeignKey("courses.ProblemSet", on_delete=models.CASCADE)
+    visible = models.BooleanField(default=False, verbose_name=_("Visible"))
+
+    class Meta:
+        order_with_respect_to = "problem_set"
+
+    def __str__(self):
+        return self.problem.title