From cd6d72be594581addb432dcaecade2ed2a599ca3 Mon Sep 17 00:00:00 2001 From: Mohammed Taha Khan Date: Fri, 6 Nov 2026 14:26:41 +0100 Subject: [PATCH] fix(harvester): skip via ctx cds id --- .../cds_rdm/inspire_harvester/load/matcher.py | 10 +++++ site/tests/inspire_harvester/test_matcher.py | 41 +++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/site/cds_rdm/inspire_harvester/load/matcher.py b/site/cds_rdm/inspire_harvester/load/matcher.py index 8dc81801..e1e51330 100644 --- a/site/cds_rdm/inspire_harvester/load/matcher.py +++ b/site/cds_rdm/inspire_harvester/load/matcher.py @@ -241,6 +241,16 @@ def match_migrated(self, entry, logger): for cds_id in retrieve_identifiers(identifiers, "cds") if legacy_cds_pattern.match(str(cds_id)) ] + # Also use the CDS id taken from INSPIRE external_system_identifiers + # during transform (_inspire_ctx). Needed when metadata.identifiers + # never got the cds scheme (those records were wrongly created). + ctx_cds_id = (entry.get("_inspire_ctx") or {}).get("cds_id") + if ( + ctx_cds_id + and legacy_cds_pattern.match(str(ctx_cds_id)) + and str(ctx_cds_id) not in {str(i) for i in legacy_ids} + ): + legacy_ids.append(str(ctx_cds_id)) matched_ids = [] unresolved = [] for cds_id in legacy_ids: diff --git a/site/tests/inspire_harvester/test_matcher.py b/site/tests/inspire_harvester/test_matcher.py index 86346e1b..d53241c4 100644 --- a/site/tests/inspire_harvester/test_matcher.py +++ b/site/tests/inspire_harvester/test_matcher.py @@ -151,6 +151,47 @@ def test_matcher_skips_fallback_search_when_legacy_pidstore_lookup_misses( mock_get_legacy.assert_called_once_with("2633876") +@patch("cds_rdm.inspire_harvester.load.matcher.RecordMatcher._get_legacy_cds") +@patch("cds_rdm.inspire_harvester.load.matcher.current_rdm_records_service.search") +@patch("cds_rdm.inspire_harvester.load.matcher.get_pid_by_legacy_recid") +def test_matcher_skips_using_inspire_ctx_cds_id_when_identifiers_missing( + mock_get_pid, mock_search, mock_get_legacy, running_app +): + """Legacy CDS id in _inspire_ctx alone is enough to skip (not create).""" + matcher = RecordMatcher() + logger = Mock() + stream_entry = StreamEntry( + { + "id": "2170337", + "metadata": { + "title": "Test", + "resource_type": {"id": "publication-conferencepaper"}, + "identifiers": [], + "related_identifiers": [ + { + "scheme": "inspire", + "identifier": "2170337", + "relation_type": {"id": "isvariantformof"}, + } + ], + }, + "files": {"enabled": False}, + "parent": {"access": {"owned_by": {"user": 2}}}, + "access": {"record": "public", "files": "public"}, + "_inspire_ctx": {"cds_id": "2973593", "versions": []}, + } + ) + mock_get_pid.side_effect = NoResultFound() + mock_get_legacy.return_value = Mock(status_code=200, headers={}) + + result = matcher.match(stream_entry, inspire_id="2170337", logger=logger) + + assert result.unmigrated is True + assert result.matched_ids == ["2973593"] + mock_search.assert_not_called() + mock_get_legacy.assert_called_once_with("2973593") + + @patch("cds_rdm.inspire_harvester.load.matcher.current_rdm_records_service.read_latest") @patch("cds_rdm.inspire_harvester.load.matcher.get_pid_by_legacy_recid") def test_matcher_finds_record_by_legacy_recid(