urls: integrate invenio_url_for

Author: fenekku

invenio_rdm_records/oaiserver/services/config.py

@@ -10,11 +10,10 @@
 from invenio_i18n import lazy_gettext as _
 from invenio_oaiserver.models import OAISet
 from invenio_records_resources.services import ServiceConfig
-from invenio_records_resources.services.base import Link
-from invenio_records_resources.services.records.links import pagination_links
+from invenio_records_resources.services.base import EndpointLink
+from invenio_records_resources.services.records.links import pagination_endpoint_links
 from sqlalchemy import asc, desc
 
-from ..services.links import OAIPMHSetLink
 from ..services.permissions import OAIPMHServerPermissionPolicy
 from ..services.results import (
     OAIMetadataFormatItem,
@@ -90,21 +89,74 @@ class OAIPMHServerServiceConfig(ServiceConfig):
     metadata_format_schema = OAIPMHMetadataFormat
 
     links_item = {
-        "self": OAIPMHSetLink("{+api}/oaipmh/sets/{id}"),
-        "oai-listrecords": OAIPMHSetLink(
-            "{+ui}/oai2d?verb=ListRecords&metadataPrefix=oai_dc&set={spec}"
+        "self": EndpointLink(
+            "oaipmh-server.read",
+            vars=lambda obj, vars_: vars_.update({"id": obj.id}),
+            params=["id"],
         ),
-        "oai-listidentifiers": OAIPMHSetLink(
-            "{+ui}/oai2d?verb=ListIdentifiers&metadataPrefix=oai_dc&set={spec}"
+        "oai-listrecords": EndpointLink(
+            "invenio_oaiserver.response",
+            vars=lambda obj, vars_: vars_.update(
+                {
+                    # querystring parameters
+                    "args": {
+                        "verb": "ListRecords",
+                        "metadataPrefix": "oai_dc",
+                        "set": obj.spec,
+                    }
+                }
+            ),
+        ),
+        "oai-listidentifiers": EndpointLink(
+            "invenio_oaiserver.response",
+            vars=lambda obj, vars_: vars_.update(
+                {
+                    "args": {
+                        "verb": "ListIdentifiers",
+                        "metadataPrefix": "oai_dc",
+                        "set": obj.spec,
+                    }
+                }
+            ),
         ),
     }
 
     links_search = {
-        **pagination_links("{+api}/oaipmh/sets{?args*}"),
-        "oai-listsets": Link("{+ui}/oai2d?verb=ListSets"),
-        "oai-listrecords": Link("{+ui}/oai2d?verb=ListRecords&metadataPrefix=oai_dc"),
-        "oai-listidentifiers": Link(
-            "{+ui}/oai2d?verb=ListIdentifiers&metadataPrefix=oai_dc"
+        **pagination_endpoint_links("oaipmh-server.search"),
+        "oai-listsets": EndpointLink(
+            "invenio_oaiserver.response",
+            vars=lambda obj, vars_: vars_.update({"args": {"verb": "ListSets"}}),
+        ),
+        "oai-listrecords": EndpointLink(
+            "invenio_oaiserver.response",
+            vars=lambda obj, vars_: vars_.update(
+                {
+                    "args": {
+                        "verb": "ListRecords",
+                        "metadataPrefix": "oai_dc",
+                    }
+                }
+            ),
+        ),
+        "oai-listidentifiers": EndpointLink(
+            "invenio_oaiserver.response",
+            vars=lambda obj, vars_: vars_.update(
+                {
+                    "args": {
+                        "verb": "ListIdentifiers",
+                        "metadataPrefix": "oai_dc",
+                    }
+                }
+            ),
+        ),
+        "oai-identify": EndpointLink(
+            "invenio_oaiserver.response",
+            vars=lambda obj, vars_: vars_.update(
+                {
+                    "args": {
+                        "verb": "Identify",
+                    }
+                }
+            ),
         ),
-        "oai-identify": Link("{+ui}/oai2d?verb=Identify"),
     }

invenio_rdm_records/oaiserver/services/links.py

@@ -568,7 +568,7 @@ class RDMCommunityRecordsResourceConfig(RecordResourceConfig, ConfiguratorMixin)
 class RDMRecordCommunitiesResourceConfig(CommunityResourceConfig, ConfiguratorMixin):
     """Record communities resource config."""
 
-    blueprint_name = "records-community"
+    blueprint_name = "record_communities"
     url_prefix = "/records"
     routes = {
         "list": "/<pid_value>/communities",
@@ -586,7 +586,7 @@ class RDMRecordCommunitiesResourceConfig(CommunityResourceConfig, ConfiguratorMi
 class RDMRecordRequestsResourceConfig(ResourceConfig, ConfiguratorMixin):
     """Record communities resource config."""
 
-    blueprint_name = "records-requests"
+    blueprint_name = "record_requests"
     url_prefix = "/records"
     routes = {"list": "/<record_pid>/requests"}
 

invenio_rdm_records/resources/config.py

@@ -94,7 +94,7 @@ def search(
                 self.config.links_search_community_records,
                 context={
                     "args": params,
-                    "id": community_id,
+                    "pid_value": community_id,
                 },
             ),
             links_item_tpl=self.links_item_tpl,