oarepo-runtime 2.0.0.dev31__tar.gz → 2.0.0.dev32__tar.gz

{oarepo_runtime-2.0.0.dev31 → oarepo_runtime-2.0.0.dev32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oarepo-runtime
-Version: 2.0.0.dev31
+Version: 2.0.0.dev32
 Summary: A set of runtime extensions of Invenio repository
 Project-URL: Homepage, https://github.com/oarepo/oarepo-runtime
 License-Expression: MIT

{oarepo_runtime-2.0.0.dev31 → oarepo_runtime-2.0.0.dev32}/oarepo_runtime/__init__.py

@@ -19,6 +19,6 @@ from .api import Model
 from .ext import OARepoRuntime
 from .proxies import current_runtime
 
-__version__ = "2.0.0dev31"
+__version__ = "2.0.0dev32"
 
 __all__ = ("Model", "OARepoRuntime", "__version__", "current_runtime")

{oarepo_runtime-2.0.0.dev31 → oarepo_runtime-2.0.0.dev32}/oarepo_runtime/services/records/links.py

@@ -11,6 +11,8 @@
 
 from __future__ import annotations
 
+from typing import Any, override
+
 from invenio_records_resources.services.base.links import EndpointLink
 
 
@@ -28,16 +30,28 @@ def rdm_pagination_record_endpoint_links(endpoint: str, params: list[str] | None
     service but not in invenio_drafts_resources service, where the parameter is
     called "id" instead of "pid_value". That is why this function is called rdm_...
     """
-    params = [*(params or []), "pid_value"]
+    params = [*(params or []), "id"]
+
+    class RecordEndpointLinkWithId(EndpointLink):
+        @override
+        @staticmethod
+        def vars(obj: Any, vars: dict[str, Any]) -> None:
+            pid_value = vars.pop("pid_value", None)
+            if pid_value is not None:
+                vars["id"] = pid_value
+
     return {
-        "prev": EndpointLink(
+        "prev": RecordEndpointLinkWithId(
             endpoint,
             when=lambda pagination, _ctx: pagination.has_prev,
             vars=lambda pagination, _vars: _vars["args"].update({"page": pagination.prev_page.page}),
             params=params,
         ),
-        "self": EndpointLink(endpoint, params=params),
-        "next": EndpointLink(
+        "self": RecordEndpointLinkWithId(
+            endpoint,
+            params=params,
+        ),
+        "next": RecordEndpointLinkWithId(
             endpoint,
             when=lambda pagination, _ctx: pagination.has_next,
             vars=lambda pagination, _vars: _vars["args"].update({"page": pagination.next_page.page}),