fixed the models, views and serializers to read challenge info

Author: dvidsilva

challenges/migrations/0002_challenge_tags.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.1.2 on 2018-10-07 16:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('challenges', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='challenge',
+            name='tags',
+            field=models.ManyToManyField(related_name='challenges', to='challenges.Tag'),
+        ),
+    ]

challenges/models.py

@@ -35,6 +35,7 @@ class Challenge(models.Model):
     technical_notes = models.TextField()
     procedure = models.TextField()
     code_tips = models.TextField()
+    tags = models.ManyToManyField(Tag, related_name='challenges')
 
 class Attachment(models.Model):
     def __str__(self):
@@ -56,4 +57,4 @@ def __str__(self):
     name = models.CharField(max_length=250,)
     url = models.TextField()
     active = models.BooleanField(default=True)
-    challenge = models.ForeignKey(Challenge, on_delete=models.DO_NOTHING)
+    challenge = models.ForeignKey(Challenge, related_name='sources', on_delete=models.DO_NOTHING)

challenges/serializers.py

@@ -1,23 +1,49 @@
 from rest_framework_json_api import serializers
-from .models import Challenge
+from .models import Challenge, Tag, Source
 from accounts.models import User
 from accounts.serializers import UserSerializer
 from rest_framework_json_api.relations import ResourceRelatedField
 
+class TagsSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Tag
+        fields = ('name',)
+
+class SourcesSerializer(serializers.ModelSerializer):
+
+    queryset = Source.objects.filter(active=True,)
+
+    class Meta:
+        model = Source
+        fields = ('name', 'url')
+
 class ChallengeSerializer(serializers.ModelSerializer):
     class Meta:
         model = Challenge
-        fields = ('user', 'created_at', 'updated_at', 'title', 'short_title', 'owner', 'difficulty',
+        fields = ('user', 'tags', 'sources', 'created_at', 'updated_at', 'title', 'short_title', 'owner', 'difficulty',
             'challenge_type', 'priority', 'description', 'short_description',
             'extra_points', 'technical_notes', 'procedure', 'code_tips')
 
     included_serializers = {
         'user':  UserSerializer,
+        'tags': TagsSerializer,
+        'sources': SourcesSerializer,
     }
 
     user = ResourceRelatedField(
         queryset=User.objects
     )
 
+    tags = ResourceRelatedField(
+        queryset=Tag.objects,
+        many=True,
+    )
+
+    sources = ResourceRelatedField(
+        queryset=Source.objects,
+        many=True,
+    )
+
     class JSONAPIMeta:
-        included_resources = ['user',]
+        included_resources = ['user', 'tags', 'sources']
+