Page MenuHomeSoftware Heritage
Files F9312363

D1914.diff
No OneTemporary
Actions

D1914.diff
View Options

diff --git a/swh/web/common/service.py b/swh/web/common/service.py
--- a/swh/web/common/service.py
+++ b/swh/web/common/service.py
@@ -276,12 +276,25 @@
matches = idx_storage.origin_intrinsic_metadata_search_fulltext(
conjunction=[fulltext], limit=limit)
results = []
+
for match in matches:
match['from_revision'] = hashutil.hash_to_hex(match['from_revision'])
- result = converters.from_origin(
- storage.origin_get({'url': match.pop('origin_url')}))
- result['metadata'] = match
- results.append(result)
+
+ if match['origin_url']:
+ origin = storage.origin_get({'url': match['origin_url']})
+ else:
+ # Fallback to origin-id for idx-storage with outdated db
+ origin = storage.origin_get({'id': match['id']})
+
+ del match['origin_url']
+ if 'id' in match:
+ del match['id']
+
+ result = converters.from_origin(origin)
+ if result:
+ result['metadata'] = match
+ results.append(result)
+
return results
diff --git a/swh/web/tests/api/views/test_origin.py b/swh/web/tests/api/views/test_origin.py
--- a/swh/web/tests/api/views/test_origin.py
+++ b/swh/web/tests/api/views/test_origin.py
@@ -477,6 +477,62 @@
mock_idx_storage.origin_intrinsic_metadata_search_fulltext \
.assert_called_with(conjunction=['Jane Doe'], limit=70)
+ @pytest.mark.origin_id
+ @given(origin())
+ def test_api_origin_metadata_search_missing_url(self, origin):
+ """indexer-storage with outdated db will return origin_url: None."""
+ with patch('swh.web.common.service.idx_storage') as mock_idx_storage:
+ mock_idx_storage.origin_intrinsic_metadata_search_fulltext \
+ .side_effect = lambda conjunction, limit: [{
+ 'id': origin['id'],
+ 'from_revision': (
+ b'p&\xb7\xc1\xa2\xafVR\x1e\x95\x1c\x01\xed '
+ b'\xf2U\xfa\x05B8'),
+ 'metadata': {'author': 'Jane Doe'},
+ 'origin_url': None,
+ 'tool': {
+ 'configuration': {
+ 'context': ['NpmMapping', 'CodemetaMapping'],
+ 'type': 'local'
+ },
+ 'id': 3,
+ 'name': 'swh-metadata-detector',
+ 'version': '0.0.1'
+ }
+ }]
+
+ url = reverse('api-1-origin-metadata-search',
+ query_params={'fulltext': 'Jane Doe'})
+ rv = self.client.get(url)
+
+ self.assertEqual(rv.status_code, 200, rv.content)
+ self.assertEqual(rv['Content-Type'], 'application/json')
+ expected_data = [{
+ 'type': origin['type'],
+ 'url': origin['url'],
+ 'metadata': {
+ 'metadata': {'author': 'Jane Doe'},
+ 'from_revision': (
+ '7026b7c1a2af56521e951c01ed20f255fa054238'),
+ 'tool': {
+ 'configuration': {
+ 'context': ['NpmMapping', 'CodemetaMapping'],
+ 'type': 'local'
+ },
+ 'id': 3,
+ 'name': 'swh-metadata-detector',
+ 'version': '0.0.1',
+ }
+ }
+ }]
+ actual_data = rv.data
+ for d in actual_data:
+ if 'id' in d:
+ del d['id']
+ self.assertEqual(rv.data, expected_data)
+ mock_idx_storage.origin_intrinsic_metadata_search_fulltext \
+ .assert_called_with(conjunction=['Jane Doe'], limit=70)
+
@given(origin())
def test_api_origin_metadata_search_limit(self, origin):

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 2, 10:51 AM (1 w, 6 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3221152

Event Timeline

About · Developer information · Legal