source/collection feeds

core/collections/feeds.py

@@ -5,3 +5,6 @@
 class CollectionFeed(ConceptContainerFeed):
     model = Collection
     entity_name = 'Collection'
+
+    def items(self, obj):
+        return self.filter_queryset(obj.concepts)

core/collections/urls.py

@@ -16,14 +16,14 @@
         views.CollectionVersionListView.as_view(),
         name='collection-version-list'
     ),
+    re_path(r'^(?P<collection>{pattern})/concepts/atom/$'.format(pattern=NAMESPACE_PATTERN), CollectionFeed()),
     re_path(r"^(?P<collection>{pattern})/concepts/".format(pattern=NAMESPACE_PATTERN), include('core.concepts.urls')),
     re_path(r"^(?P<collection>{pattern})/mappings/".format(pattern=NAMESPACE_PATTERN), include('core.mappings.urls')),
     re_path(
         r'^(?P<collection>{pattern})/references/$'.format(pattern=NAMESPACE_PATTERN),
         views.CollectionReferencesView.as_view(),
         name='collection-references'
     ),
-    re_path(r'^(?P<collection>{pattern})/concepts/atom/$'.format(pattern=NAMESPACE_PATTERN), CollectionFeed()),
     re_path(
         r'^(?P<collection>{pattern})/(?P<version>{pattern})/$'.format(pattern=NAMESPACE_PATTERN),
         views.CollectionVersionRetrieveUpdateDestroyView.as_view(),

core/common/feeds.py

@@ -40,7 +40,7 @@ def get_object(self, request, *args, **kwargs):
         org_mnemonic = kwargs.get('org')
 
         if username:
-            self.user = UserProfile.objects.filter(mnemonic=username).first()
+            self.user = UserProfile.objects.filter(username=username).first()
         if org_mnemonic:
             self.org = Organization.objects.filter(mnemonic=org_mnemonic).first()
 
@@ -51,11 +51,9 @@ def get_object(self, request, *args, **kwargs):
         self.updated_since = request.GET.get('updated_since', None)
         self.limit = request.GET.get('limit', None)
 
-        parent = self.user or self.org
-        return get_object_or_404(self.model, mnemonic=mnemonic, parent=parent, version=HEAD)
+        return get_object_or_404(self.model, mnemonic=mnemonic, user=self.user, organization=self.org, version=HEAD)
 
-    @staticmethod
-    def title(obj):
+    def title(self, obj):  # pylint: disable=no-self-use
         return "Updates to %s" % obj.mnemonic
 
     def link(self, obj):
@@ -71,4 +69,4 @@ def item_description(self, item):
         return item.display_name
 
     def item_link(self, item):
-        return reverse_resource(item, '{}-concept-detail'.format(self.entity_name.lower()))
+        return reverse_resource(item, 'concept-detail')

core/concepts/serializers.py

@@ -97,6 +97,7 @@ class ConceptListSerializer(ModelSerializer):
     url = CharField(source='version_url', read_only=True)
     version_created_on = DateTimeField(source='created_at', read_only=True)
     version_created_by = DateTimeField(source='created_by.username', read_only=True)
+    mappings = SerializerMethodField()
 
     def __init__(self, *args, **kwargs):
         self.query_params = kwargs.get('context').get('request').query_params.dict()

core/sources/feeds.py

@@ -14,7 +14,7 @@ def items(self, obj):
 
     def item_description(self, item):
         item = item.get_latest_version()
-        return item.update_comment
+        return item.comment
 
     def item_link(self, item):
         return item.url