added categories to dashboard (#45)

Author: amulv

.gitignore

@@ -3,3 +3,4 @@ db.sqlite3
 backups
 .ds_store
 core/staticfiles
+venv

codechallenges/admin.py

@@ -1,7 +1,7 @@
 from django.contrib import admin
 
 # Register your models here.
-from .models import Question, Submission, CodeChallengeEvent
+from .models import Question, Submission, CodeChallengeEvent, Category
 
 
 @admin.register(Question)
@@ -24,3 +24,8 @@ class CustomerSubmission(admin.ModelAdmin):
 @admin.register(CodeChallengeEvent)
 class CustomerCodeChallengeEvent(admin.ModelAdmin):
     list_display = ("title", "description")
+
+
+@admin.register(Category)
+class CustomerCategory(admin.ModelAdmin):
+    list_display = ("title", "body")

codechallenges/migrations/0008_auto_20210522_1942.py

@@ -0,0 +1,22 @@
+# Generated by Django 3.1.4 on 2021-05-22 19:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("codechallenges", "0007_category"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="category",
+            name="questions",
+        ),
+        migrations.AddField(
+            model_name="question",
+            name="categories",
+            field=models.ManyToManyField(to="codechallenges.Category"),
+        ),
+    ]

codechallenges/models.py

@@ -9,6 +9,16 @@ def __str__(self):
         return self.title
 
 
+class Category(models.Model):
+    title = models.CharField(max_length=150)
+    body = models.TextField()
+
+    # questions = models.ManyToManyField(Question)  # Django auto-validates duplicates
+
+    def __str__(self):
+        return self.title
+
+
 class Question(models.Model):
     title = models.CharField(max_length=150)
     body = models.TextField()
@@ -37,6 +47,8 @@ class Question(models.Model):
         CodeChallengeEvent, on_delete=models.CASCADE, blank=True, null=True
     )
 
+    categories = models.ManyToManyField(Category)
+
     def __str__(self):
         return self.title
 
@@ -55,13 +67,3 @@ class Meta:
             "email",
             "question",
         )
-
-
-class Category(models.Model):
-    title = models.CharField(max_length=150)
-    body = models.TextField()
-
-    questions = models.ManyToManyField(Question)  # Django auto-validates duplicates
-
-    def __str__(self):
-        return self.title

codechallenges/serializers.py

@@ -1,8 +1,16 @@
 from rest_framework import serializers
-from codechallenges.models import Question, Submission
+from codechallenges.models import Question, Submission, Category
+
+
+class CategorySerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Category
+        fields = ["title"]
 
 
 class QuestionSerializer(serializers.ModelSerializer):
+    categories = CategorySerializer(many=True, required=False)
+
     class Meta:
         model = Question
         fields = (
@@ -13,13 +21,24 @@ class Meta:
             "release_date",
             "expiration_date",
             "difficulty",
+            "categories",
         )
 
 
 class QuestionHiddenSerializer(serializers.ModelSerializer):
+    categories = CategorySerializer(many=True, required=False)
+
     class Meta:
         model = Question
-        fields = ("title", "body", "format")
+        fields = (
+            "title",
+            "body",
+            "format",
+            "release_date",
+            "expiration_date",
+            "difficulty",
+            "categories",
+        )
 
 
 class SubmissionSerializer(serializers.ModelSerializer):

codechallenges/tests.py

@@ -37,10 +37,10 @@ def setUp(self) -> None:
         return super().setUp()
 
     def test_categories(self):
-        self.category1.questions.add(self.question1)  # Added
-        self.category1.questions.add(self.question2)  # Added
-        self.category1.questions.add(self.question1)  # Not Added
-        self.assertEquals(len(self.category1.questions.all()), 2)
+        self.question1.categories.add(self.category1)  # Added
+        self.question1.categories.add(self.category2)  # Added
+        self.question2.categories.add(self.category1)  # Not Added
+        self.assertEquals(len(self.question1.categories.all()), 2)
 
 
 class SubmissionTestCase(TestCase):