Various small fixes to make tests pass

A hodgepodge of internal API cleanup, testing vagaries, and typos.
Barely worth mentioning, really.

Author: ptgolden

editorsnotes/api/serializers/base.py

@@ -2,7 +2,7 @@
 from rest_framework.relations import (HyperlinkedRelatedField, RelatedField,
                                       get_attribute)
 from rest_framework.reverse import reverse
-from rest_framework.serializers import ReadOnlyField, ModelSerializer
+from rest_framework.serializers import ReadOnlyField, ModelSerializer, SerializerMethodField
 
 from editorsnotes.main.models import Topic, TopicAssignment, Project
 
@@ -79,9 +79,12 @@ def to_representation(self, value):
 
 class MinimalTopicSerializer(ModelSerializer):
     url = URLField(lookup_arg_attrs=('project.slug', 'topic_node_id'))
+    topic_node_id = SerializerMethodField()
     class Meta:
         model = Topic
         fields = ('id', 'topic_node_id', 'preferred_name', 'url',)
+    def get_topic_node_id(self, obj):
+        return obj.topic_node_id
 
 class TopicAssignmentField(RelatedField):
     default_error_messages = {

editorsnotes/api/tests.py

@@ -43,7 +43,9 @@ def delete_es_indexes():
 def create_test_topic(**kwargs):
     data = TEST_TOPIC.copy()
     data.update(kwargs)
-    node, topic = main_models.Topic.objects.create_along_with_node(**kwargs)
+    data.pop('alternate_names', None)
+    data.pop('related_topics', None)
+    node, topic = main_models.Topic.objects.create_along_with_node(**data)
     return topic
 
 
@@ -63,19 +65,21 @@ def create_test_topic(**kwargs):
 def create_test_document(**kwargs):
     data = TEST_DOCUMENT.copy()
     data['zotero_data'] = json.dumps(data['zotero_data'])
+    data.pop('related_topics', None)
     data.update(kwargs)
-    return main_models.Document.objects.create(**kwargs)
+    return main_models.Document.objects.create(**data)
 
 TEST_NOTE = {
     'title': u'Is testing good?',
-    'related_topics': [u'Testing', u'Django'],
+    'related_topics': [],
     'content': u'<p>We need to figure out if it\'s worth it to write tests.</p>',
     'status': 'open'
 }
 def create_test_note(**kwargs):
     data = TEST_NOTE.copy()
+    data.pop('related_topics', None)
     data.update(kwargs)
-    return main_models.Note.objects.create(**kwargs)
+    return main_models.Note.objects.create(**data)
 
 
 BAD_PERMISSION_MESSAGE = u'You do not have permission to perform this action.'

editorsnotes/main/models/topics.py

@@ -84,7 +84,7 @@ def related_objects(self, model=None):
 #################################
 
 class TopicManager(models.Manager):
-    def create_along_with_node(self, preferred_name, project, user, topic_type=None,
+    def create_along_with_node(self, preferred_name, project, user, type=None,
                                **kwargs):
         """
         Create a new topic node and a container with the given name.
@@ -94,7 +94,7 @@ def create_along_with_node(self, preferred_name, project, user, topic_type=None,
         topic_node = TopicNode.objects.create(_preferred_name=preferred_name,
                                               creator=user,
                                               last_updater=user,
-                                              type=topic_type)
+                                              type=type)
         return topic_node, self.create(topic_node_id=topic_node.id,
                                        project_id=project.id,
                                        preferred_name=preferred_name,