[ENG-9046][followup] fix rss/atom validation errors

tests/trove/render/test_cardsearch_atom_renderer.py

@@ -1,3 +1,6 @@
+from unittest import mock
+import datetime
+
 from trove.render.cardsearch_atom import CardsearchAtomRenderer
 from trove.render.rendering import EntireRendering
 from . import _base
@@ -15,8 +18,9 @@ class TestCardsearchAtomRenderer(_base.TrovesearchRendererTests):
                 b'<feed xmlns="http://www.w3.org/2005/Atom">'
                 b'<title>shtrove search results</title>'
                 b'<subtitle>feed of metadata records matching given filters</subtitle>'
-                b'<link>http://blarg.example/vocab/aSearch</link>'
+                b'<link href="http://blarg.example/vocab/aSearch" />'
                 b'<id>http://blarg.example/vocab/aSearch</id>'
+                b'<updated>2345-06-07T08:09:10Z</updated>'
                 b'</feed>'
             ),
         ),
@@ -27,8 +31,9 @@ class TestCardsearchAtomRenderer(_base.TrovesearchRendererTests):
                 b'<feed xmlns="http://www.w3.org/2005/Atom">'
                 b'<title>shtrove search results</title>'
                 b'<subtitle>feed of metadata records matching given filters</subtitle>'
-                b'<link>http://blarg.example/vocab/aSearchFew</link>'
+                b'<link href="http://blarg.example/vocab/aSearchFew" />'
                 b'<id>http://blarg.example/vocab/aSearchFew</id>'
+                b'<updated>2345-06-07T08:09:10Z</updated>'
                 b'<entry>'
                 b'<link href="http://blarg.example/vocab/anItem" />'
                 b'<id>http://blarg.example/vocab/aCard</id>'
@@ -42,7 +47,14 @@ class TestCardsearchAtomRenderer(_base.TrovesearchRendererTests):
                 b'<id>http://blarg.example/vocab/aCarddd</id>'
                 b'<title>an itemmm, yes</title>'
                 b'<published>2001-02-03T00:00:00Z</published>'
+                b'<author><name>a person indeed</name><uri>http://blarg.example/vocab/aPerson</uri></author>'
                 b'</entry></feed>'
             ),
         ),
     }
+
+    def setUp(self):
+        self.enterContext(mock.patch(
+            'django.utils.timezone.now',
+            return_value=datetime.datetime(2345, 6, 7, 8, 9, 10, tzinfo=datetime.UTC),
+        ))

tests/trove/render/test_cardsearch_rss_renderer.py

@@ -12,10 +12,11 @@ class TestCardsearchRssRenderer(_base.TrovesearchRendererTests):
             mediatype='application/rss+xml',
             entire_content=(
                 b"<?xml version='1.0' encoding='utf-8'?>\n"
-                b'<rss version="2.0">'
+                b'<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom">'
                 b'<channel>'
                 b'<title>shtrove search results</title>'
                 b'<link>http://blarg.example/vocab/aSearch</link>'
+                b'<atom:link rel="self" href="http://blarg.example/vocab/aSearch" />'
                 b'<description>feed of metadata records matching given filters</description>'
                 b'<webMaster>share-support@cos.io</webMaster>'
                 b'</channel></rss>'
@@ -25,9 +26,11 @@ class TestCardsearchRssRenderer(_base.TrovesearchRendererTests):
             mediatype='application/rss+xml',
             entire_content=(
                 b"<?xml version='1.0' encoding='utf-8'?>\n"
-                b'<rss version="2.0"><channel>'
+                b'<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:atom="http://www.w3.org/2005/Atom">'
+                b'<channel>'
                 b'<title>shtrove search results</title>'
                 b'<link>http://blarg.example/vocab/aSearchFew</link>'
+                b'<atom:link rel="self" href="http://blarg.example/vocab/aSearchFew" />'
                 b'<description>feed of metadata records matching given filters</description>'
                 b'<webMaster>share-support@cos.io</webMaster>'
                 b'<item>'
@@ -43,7 +46,7 @@ class TestCardsearchRssRenderer(_base.TrovesearchRendererTests):
                 b'<guid isPermaLink="true">http://blarg.example/vocab/anItemmm</guid>'
                 b'<title>an itemmm, yes</title>'
                 b'<pubDate>Sat, 03 Feb 2001 00:00:00 -0000</pubDate>'
-                b'<author>http://blarg.example/vocab/aPerson (a person indeed)</author>'
+                b'<dc:creator>http://blarg.example/vocab/aPerson (a person indeed)</dc:creator>'
                 b'</item></channel></rss>'
             ),
         ),

trove/render/cardsearch_atom.py

@@ -2,6 +2,7 @@
 import itertools
 import typing
 
+from django.utils import timezone
 from django.utils.translation import gettext as _
 from primitive_metadata import primitive_rdf as rdf
 
@@ -38,31 +39,37 @@ def _dates(*path: str) -> Iterator[str]:
         _xb = XmlBuilder('feed', {'xmlns': 'http://www.w3.org/2005/Atom'})
         _xb.leaf('title', text=_('shtrove search results'))
         _xb.leaf('subtitle', text=_('feed of metadata records matching given filters'))
-        _xb.leaf('link', text=self.response_focus.single_iri())
+        _xb.leaf('link', {'href': self.response_focus.single_iri()})
         _xb.leaf('id', text=self.response_focus.single_iri())
+        _xb.leaf('updated', text=datetime_isoformat_z(timezone.now()))
         for _card_iri, _osfmap_json in itertools.chain.from_iterable(card_pages):
             with _xb.nest('entry'):
                 _iri = _osfmap_json.get('@id', _card_iri)
                 _xb.leaf('link', {'href': _iri})
                 _xb.leaf('id', text=self._atom_id(_card_iri))
                 for _title in _strs('title'):
                     _xb.leaf('title', text=_title)
+                for _filename in _strs('fileName'):
+                    _xb.leaf('title', text=_filename)
                 for _desc in _strs('description'):
                     _xb.leaf('summary', text=_desc)
                 for _keyword in _strs('keyword'):
-                    _xb.leaf('category', text=_keyword)
+                    _xb.leaf('category', {'term': _keyword})
                 for _created in _dates('dateCreated'):
                     _xb.leaf('published', text=_created)
-                for _creator_obj in json_vals(_osfmap_json, 'creator'):
+                for _modified in _dates('dateModified'):
+                    _xb.leaf('updated', text=_modified)
+                _creator_objs = list(json_vals(_osfmap_json, ['creator']))
+                if not _creator_objs:
+                    _creator_objs = list(json_vals(_osfmap_json, ['isContainedBy', 'creator']))
+                for _creator_obj in _creator_objs:
                     assert isinstance(_creator_obj, dict)
                     with _xb.nest('author'):
                         for _name in json_strs(_creator_obj, ['name']):
                             _xb.leaf('name', text=_name)
                         _creator_iri = _creator_obj.get('@id')
                         if _creator_iri:
                             _xb.leaf('uri', text=_creator_iri)
-                        for _sameas_iri in json_strs(_creator_obj, ['sameAs']):
-                            _xb.leaf('uri', text=_sameas_iri)
         return EntireRendering(
             mediatype=self.MEDIATYPE,
             entire_content=bytes(_xb),

trove/render/cardsearch_rss.py

@@ -35,11 +35,19 @@ def _dates(*path: str) -> Iterator[str]:
             for _dt in json_datetimes(_osfmap_json, path):
                 yield rfc2822_datetime(_dt)
 
-        _xb = XmlBuilder('rss', {'version': '2.0'})
+        _xb = XmlBuilder('rss', {
+            'version': '2.0',
+            'xmlns:dc': 'http://purl.org/dc/elements/1.1/',
+            'xmlns:atom': 'http://www.w3.org/2005/Atom',
+        })
         with _xb.nest('channel'):
             # see https://www.rssboard.org/rss-specification#requiredChannelElements
             _xb.leaf('title', text=_('shtrove search results'))
             _xb.leaf('link', text=self.response_focus.single_iri())
+            _xb.leaf('atom:link', {
+                'rel': 'self',
+                'href': self.response_focus.single_iri(),
+            })
             _xb.leaf('description', text=_('feed of metadata records matching given filters'))
             _xb.leaf('webMaster', text=settings.SHARE_SUPPORT_EMAIL)
             for _card_iri, _osfmap_json in itertools.chain.from_iterable(card_pages):
@@ -48,8 +56,8 @@ def _dates(*path: str) -> Iterator[str]:
                     _iri = _osfmap_json.get('@id', _card_iri)
                     _xb.leaf('link', text=_iri)
                     _xb.leaf('guid', {'isPermaLink': 'true'}, text=_iri)
-                    for _title in _strs('title'):
-                        _xb.leaf('title', text=_title)
+                    _titles = itertools.chain(_strs('title'), _strs('fileName'))
+                    _xb.leaf('title', text=next(_titles, ''))
                     for _desc in _strs('description'):
                         _xb.leaf('description', text=_desc)
                     for _keyword in _strs('keyword'):
@@ -60,7 +68,7 @@ def _dates(*path: str) -> Iterator[str]:
                         assert isinstance(_creator_obj, dict)
                         _creator_name = next(json_strs(_creator_obj, ['name']))
                         _creator_id = _creator_obj.get('@id', _creator_name)
-                        _xb.leaf('author', text=f'{_creator_id} ({_creator_name})')
+                        _xb.leaf('dc:creator', text=f'{_creator_id} ({_creator_name})')
         return EntireRendering(
             mediatype=self.MEDIATYPE,
             entire_content=bytes(_xb),

trove/render/trovesearch_json.py

@@ -1,11 +1,13 @@
 from __future__ import annotations
+import itertools
 import json
 import re
 import typing
 
 from primitive_metadata import primitive_rdf as rdf
 
 from trove.vocab.jsonapi import (
+    JSONAPI_LINK,
     JSONAPI_LINK_OBJECT,
     JSONAPI_MEMBERNAME,
 )
@@ -91,8 +93,9 @@ def _render_meta(self) -> dict[str, int | str]:
 
     def _render_links(self) -> JsonObject:
         _links = {}
-        for _pagelink in self._page_links:
-            _twopledict = rdf.twopledict_from_twopleset(_pagelink)
+        _response_links = self.response_gathering.ask(JSONAPI_LINK, focus=self.response_focus)
+        for _link_obj in itertools.chain(self._page_links, _response_links):
+            _twopledict = rdf.twopledict_from_twopleset(_link_obj)
             if JSONAPI_LINK_OBJECT in _twopledict.get(RDF.type, ()):
                 (_membername,) = _twopledict[JSONAPI_MEMBERNAME]
                 (_link_url,) = _twopledict[RDF.value]