Added a comment factory and added them to entry serializer

Author: jerel

example/factories/__init__.py

@@ -3,7 +3,7 @@
 
 import factory
 from faker import Factory as FakerFactory
-from example.models import Blog, Author, Entry
+from example.models import Blog, Author, Entry, Comment
 
 faker = FakerFactory.create()
 faker.seed(983843)
@@ -40,3 +40,13 @@ def authors(self, create, extracted, **kwargs):
                     self.authors.add(author)
             else:
                 self.authors.add(extracted)
+
+
+class CommentFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = Comment
+
+    entry = factory.SubFactory(EntryFactory)
+    body = factory.LazyAttribute(lambda x: faker.text())
+    author = factory.SubFactory(AuthorFactory)
+

example/serializers.py

@@ -1,4 +1,4 @@
-from rest_framework import serializers
+from rest_framework_json_api import serializers, relations
 from example.models import Blog, Entry, Author, Comment
 
 
@@ -10,10 +10,14 @@ class Meta:
 
 
 class EntrySerializer(serializers.ModelSerializer):
+
+    comments = relations.ResourceRelatedField(
+            source='comment_set', many=True, read_only=True)
+
     class Meta:
         model = Entry
         fields = ('blog', 'headline', 'body_text', 'pub_date', 'mod_date',
-                'authors',)
+                'authors', 'comments',)
 
 
 class AuthorSerializer(serializers.ModelSerializer):

example/tests/conftest.py

@@ -1,24 +1,30 @@
 import pytest
 from pytest_factoryboy import register
 
-from example.factories import BlogFactory, AuthorFactory, EntryFactory
+from example.factories import BlogFactory, AuthorFactory, EntryFactory, CommentFactory
 
 register(BlogFactory)
 register(AuthorFactory)
 register(EntryFactory)
+register(CommentFactory)
 
 
 @pytest.fixture
-def single_entry(blog, author, entry_factory):
+def single_entry(blog, author, entry_factory, comment_factory):
 
-    return entry_factory(blog=blog, authors=(author,))
+    entry = entry_factory(blog=blog, authors=(author,))
+    comment_factory(entry=entry)
+    return entry
 
 
 @pytest.fixture
-def multiple_entries(blog_factory, author_factory, entry_factory):
+def multiple_entries(blog_factory, author_factory, entry_factory, comment_factory):
 
-    return [
+    entries = [
         entry_factory(blog=blog_factory(), authors=(author_factory(),)),
         entry_factory(blog=blog_factory(), authors=(author_factory(),)),
     ]
+    comment_factory(entry=entries[0])
+    comment_factory(entry=entries[1])
+    return entries
 

example/tests/integration/test_non_paginated_responses.py

@@ -34,6 +34,10 @@ def test_multiple_entries_no_pagination(multiple_entries, rf):
                     "authors": {
                         "meta": {"count": 1},
                         "data": [{"type": "authors", "id": "1"}]
+                    },
+                    "comments": {
+                        "meta": {"count": 1},
+                        "data": [{"type": "comments", "id": "1"}]
                     }
                 }
             },
@@ -55,6 +59,10 @@ def test_multiple_entries_no_pagination(multiple_entries, rf):
                     "authors": {
                         "meta": {"count": 1},
                         "data": [{"type": "authors", "id": "2"}]
+                    },
+                    "comments": {
+                        "meta": {"count": 1},
+                        "data": [{"type": "comments", "id": "2"}]
                     }
                 }
             },

example/tests/integration/test_pagination.py

@@ -28,6 +28,10 @@ def test_pagination_with_single_entry(single_entry, client):
                     "authors": {
                         "meta": {"count": 1},
                         "data": [{"type": "authors", "id": "1"}]
+                    },
+                    "comments": {
+                        "meta": {"count": 1},
+                        "data": [{"type": "comments", "id": "1"}]
                     }
                 }
             }],