feat(backend): detalle ORCID en export y sync sin borrar datos

Enriquece obras al exportar SWORD/ZIP, pide detalle en obras nuevas (con tope), preserva campos de detalle en re-sync y desenvuelve la respuesta work de ORCID.
2026-05-20 12:56:02 +02:00
parent 330f0dd62b
commit 9b596af494
5 changed files with 254 additions and 22 deletions
@@ -10,6 +10,8 @@ from app.core.rate_limit import limiter
 from app.db.models import Publication, PublicationDownload, Researcher
 from app.db.session import get_db
 from app.security.export_auth import require_export_access
+from app.services.orcid_client import get_display_name
+from app.services.publication_enrichment import enrich_publications_from_orcid
 from app.services.sword_generator import SWORDGenerator
 from app.services.zip_generator import ZIPGenerator
 from app.utils.orcid_validator import ORCID_PATTERN, is_valid_orcid
@@ -51,6 +53,22 @@ def _record_downloads(db: Session, current: Researcher, pubs: Iterable[Publicati
        db.commit()


+def _prepare_researcher_and_publications_for_export(
+    db: Session,
+    researcher: Researcher,
+    pubs: List[Publication],
+) -> None:
+    """Nombre del investigador y detalle ORCID de obras antes de generar SWORD/ZIP."""
+    if not researcher.name:
+        display_name = get_display_name(researcher.orcid_id)
+        if display_name:
+            researcher.name = display_name
+            db.commit()
+            db.refresh(researcher)
+
+    enrich_publications_from_orcid(db, researcher, pubs)
+
+
 def _validate_pub_ids(pub_ids: List[UUID]) -> List[UUID]:
    if len(pub_ids) > settings.MAX_PUB_IDS_BATCH:
        raise HTTPException(status_code=413, detail="Too many publication IDs")
@@ -98,6 +116,10 @@ async def export_multiple_sword(
        raise HTTPException(status_code=404, detail="No publications found")

    researcher = db.query(Researcher).filter_by(id=pubs[0].researcher_id).first()
+    if not researcher:
+        raise HTTPException(status_code=404, detail="Researcher not found")
+
+    _prepare_researcher_and_publications_for_export(db, researcher, pubs)

    xml_bytes = SWORDGenerator.generate_feed_xml(researcher, pubs)
    if current:
@@ -129,6 +151,8 @@ async def export_researcher_sword(
    if not pubs:
        raise HTTPException(status_code=404, detail="No publications found for this researcher")

+    _prepare_researcher_and_publications_for_export(db, researcher, pubs)
+
    xml_bytes = SWORDGenerator.generate_feed_xml(researcher, pubs)
    if current:
        _record_downloads(db, current, pubs)
@@ -156,6 +180,10 @@ async def export_multiple_zip(
        raise HTTPException(status_code=404, detail="No publications found")

    researcher = db.query(Researcher).filter_by(id=pubs[0].researcher_id).first()
+    if not researcher:
+        raise HTTPException(status_code=404, detail="Researcher not found")
+
+    _prepare_researcher_and_publications_for_export(db, researcher, pubs)

    zip_bytes = ZIPGenerator.generate_zip(researcher, pubs)
    if current:
@@ -187,6 +215,8 @@ async def export_researcher_zip(
    if not pubs:
        raise HTTPException(status_code=404, detail="No publications found for this researcher")

+    _prepare_researcher_and_publications_for_export(db, researcher, pubs)
+
    zip_bytes = ZIPGenerator.generate_zip(researcher, pubs)
    if current:
        _record_downloads(db, current, pubs)
@@ -20,13 +20,19 @@ from app.schema.researcher import (
 from app.security.jwt import get_optional_current_researcher
 from app.services.normalizer import PublicationNormalizer
 from app.services.orcid_client import get_display_name, get_orcid_client
+from app.services.publication_enrichment import DETAIL_ONLY_FIELDS, apply_publication_data
 from app.utils.orcid_validator import ORCID_PATTERN, is_valid_orcid


 router = APIRouter(prefix="/researchers", tags=["researchers"])


-def publication_changed(existing: Publication, data: dict) -> bool:
+def publication_changed(
+    existing: Publication,
+    data: dict,
+    *,
+    include_detail_fields: bool = True,
+) -> bool:
    fields = [
        "title", "subtitle", "type", "journal",
        "pub_year", "pub_month", "pub_day",
@@ -35,6 +41,8 @@ def publication_changed(existing: Publication, data: dict) -> bool:
        "language_code", "country",
        "external_ids", "contributors",
    ]
+    if not include_detail_fields:
+        fields = [f for f in fields if f not in DETAIL_ONLY_FIELDS]
    return any(getattr(existing, f) != data[f] for f in fields)


@@ -71,6 +79,8 @@ def _upsert_researcher_publications(
    detail_cap = max(0, min(settings.ORCID_WORK_DETAIL_ENRICH_MAX, 200))
    detail_budget = detail_cap if enrich_work_details else 0
    detail_attempts = 0
+    new_detail_cap = max(0, min(settings.ORCID_NEW_SYNC_DETAIL_MAX, 200))
+    new_detail_attempts = 0

    for g in groups:
        summaries = g.get("work-summary") or []
@@ -82,28 +92,36 @@ def _upsert_researcher_publications(
        if put_code is None:
            continue

+        existing = existing_by_put_code.get(put_code)
        detail = None
-        if detail_budget > 0 and detail_attempts < detail_budget:
+        fetch_detail = (
+            existing is None
+            and new_detail_cap > 0
+            and new_detail_attempts < new_detail_cap
+        )
+        if (
+            not fetch_detail
+            and enrich_work_details
+            and detail_budget > 0
+            and detail_attempts < detail_budget
+        ):
+            fetch_detail = True
+
+        if fetch_detail:
            try:
                detail = orcid_client.fetch_work_detail(orcid_id, put_code)
            except Exception:
                detail = None
-            detail_attempts += 1
+            if existing is None:
+                new_detail_attempts += 1
+            else:
+                detail_attempts += 1

        data = PublicationNormalizer.normalize(summary, detail)
-
-        existing = existing_by_put_code.get(data["put_code"])
+        preserve_detail = detail is None

        if existing:
-            for field in [
-                "title", "subtitle", "type", "journal",
-                "pub_year", "pub_month", "pub_day",
-                "doi", "url", "short_description",
-                "citation_type", "citation_value",
-                "language_code", "country",
-                "external_ids", "contributors",
-            ]:
-                setattr(existing, field, data[field])
+            apply_publication_data(existing, data, preserve_detail_if_missing=preserve_detail)
            existing.last_modified = datetime.utcnow()
            existing.status = None
            publications.append(existing)
@@ -313,6 +331,8 @@ def sync_researcher(
    detail_cap = max(0, min(settings.ORCID_WORK_DETAIL_ENRICH_MAX, 200))
    detail_budget = detail_cap if enrich_work_details else 0
    detail_attempts = 0
+    new_detail_cap = max(0, min(settings.ORCID_NEW_SYNC_DETAIL_MAX, 200))
+    new_detail_attempts = 0

    for g in groups:
        summaries = g.get("work-summary") or []
@@ -324,26 +344,50 @@ def sync_researcher(
        if put_code is None:
            continue

+        existing = existing_by_put_code.get(put_code)
        detail = None
-        if detail_budget > 0 and detail_attempts < detail_budget:
+        fetch_detail = (
+            existing is None
+            and new_detail_cap > 0
+            and new_detail_attempts < new_detail_cap
+        )
+        if (
+            not fetch_detail
+            and enrich_work_details
+            and detail_budget > 0
+            and detail_attempts < detail_budget
+        ):
+            fetch_detail = True
+
+        if fetch_detail:
            try:
                detail = orcid_client.fetch_work_detail(orcid_id, put_code)
            except Exception:
                detail = None
-            detail_attempts += 1
+            if existing is None:
+                new_detail_attempts += 1
+            else:
+                detail_attempts += 1

        data = PublicationNormalizer.normalize(summary, detail)
-
-        existing = existing_by_put_code.get(data["put_code"])
+        preserve_detail = detail is None

        if existing:
-            if publication_changed(existing, data):
-                for field in data:
-                    setattr(existing, field, data[field])
+            if publication_changed(
+                existing,
+                data,
+                include_detail_fields=not preserve_detail,
+            ):
+                apply_publication_data(
+                    existing, data, preserve_detail_if_missing=preserve_detail
+                )
                existing.last_modified = datetime.utcnow()
                existing.status = "updated"
                updated_count += 1
            else:
+                apply_publication_data(
+                    existing, data, preserve_detail_if_missing=preserve_detail
+                )
                existing.status = "unchanged"
                unchanged_count += 1