Merge pull request #54 from oarepo/krist/be-658-omb-drafts-generate-a…

…-draftsearchoptions-as-well draft search options separated
oarepo · Feb 11, 2025 · 3b57dcf · 3b57dcf
2 parents f143f99 + 416f163
commit 3b57dcf
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/oarepo_model_builder_drafts/datatypes/components/draft_model/search_options.py b/oarepo_model_builder_drafts/datatypes/components/draft_model/search_options.py
@@ -18,17 +18,18 @@ def before_model_prepare(self, datatype, *, context, **kwargs):
 
         record_draft_search_prefix = datatype.definition["module"]["prefix"]
 
-        if datatype.root.profile == "draft":
-            # published and draft records share the same facets, that's why we use the same prefix
-            record_draft_search_prefix = context["published_record"].definition[
-                "module"
-            ]["prefix"]
-
         record_search_options = set_default(datatype, "search-options", {})
         module = record_search_options.setdefault(
             "module", f"{module}.services.{profile_module}.search"
         )
         record_search_options.setdefault(
             "class", f"{module}.{record_draft_search_prefix}SearchOptions"
         )
+        if datatype.root.profile == "draft":
+            record_search_options.setdefault(
+                "base-classes",
+                [
+                    "invenio_drafts_resources.services.records.config.SearchDraftsOptions{InvenioSearchDraftsOptions}"
+                ],
+            )
         super().before_model_prepare(datatype, context=context, **kwargs)
diff --git a/oarepo_model_builder_drafts/datatypes/components/draft_tests.py b/oarepo_model_builder_drafts/datatypes/components/draft_tests.py
@@ -47,6 +47,5 @@ def process_tests(self, datatype, section, **extra_kwargs):
                 "edit_html": "https://{site_hostname}{base_urls['base_html_url']}{pid_value}/edit",
             },
             "page_size": "10",
-            "sort_search": "newest",
             "sort_versions": "version",
         }
diff --git a/oarepo_model_builder_drafts/invenio/templates/invenio_drafts_record_service_config.py.jinja2 b/oarepo_model_builder_drafts/invenio/templates/invenio_drafts_record_service_config.py.jinja2
@@ -3,4 +3,4 @@
 
 class {{ published_record.service_config|class_header }}:
     draft_cls = {{ draft_record.record.class|base_name }}
-    search_drafts = {{ published_record.search_options.class|base_name }}
+    search_drafts = {{ draft_record.search_options.class|base_name }}
diff --git a/oarepo_model_builder_drafts/tests/templates/invenio_test_resources.py.jinja2 b/oarepo_model_builder_drafts/tests/templates/invenio_test_resources.py.jinja2
@@ -258,7 +258,6 @@ def test_pagination_links(
 ):
 
     page_size = {{ test_constants.page_size }}
-    sort_search = "{{ test_constants.sort_search }}"
     sort_versions = "{{ test_constants.sort_versions }}"
 
     current_id = sample_published_record['id']
@@ -309,8 +308,8 @@ def test_pagination_links(
     base_url_search = (f"https://{site_hostname}/api{base_urls['base_url']}")
     base_url_user_search = (f"https://{site_hostname}/api/user{base_urls['base_url']}")
 
-    link_test(base_url_search, page_size, sort_search)
-    link_test(base_url_user_search, page_size, sort_search)
+    link_test(base_url_search, page_size, "newest")
+    link_test(base_url_user_search, page_size, "updated-desc")
 
 
 def test_when_draft_links(

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-model-builder-drafts
-version = 4.0.42
+version = 4.0.43
 description =
 authors = Ronald Krist <[email protected]>
 readme = README.md
@@ -38,6 +38,8 @@ oarepo_model_builder.builders.draft:
 
     0110-invenio_record  = oarepo_model_builder.invenio.invenio_record:InvenioRecordBuilder
     0120-invenio_record_metadata  = oarepo_model_builder.invenio.invenio_record_metadata:InvenioRecordMetadataBuilder
+    0300-invenio_record_search_facets  = oarepo_model_builder.invenio.invenio_record_facets:InvenioRecordSearchFacetsBuilder
+    0305-invenio_record_search_options  = oarepo_model_builder.invenio.invenio_record_search_options:InvenioRecordSearchOptionsBuilder
     0340-invenio_record_dumper  = oarepo_model_builder.invenio.invenio_record_dumper:InvenioRecordDumperBuilder
     0350-edtf_interval-dumper  = oarepo_model_builder.invenio.edtf_interval_dumper:EDTFIntervalDumperBuilder
     2800-invenio_drafts_record_metadata_extra_fields = oarepo_model_builder_drafts.invenio.invenio_drafts_record_metadata_extra_fields:InvenioDraftsRecordMetadataExtraFieldsBuilder
@@ -67,6 +69,8 @@ oarepo_model_builder.builders.record:
     2800-invenio_drafts_record_metadata_extra_fields = oarepo_model_builder_drafts.invenio.invenio_drafts_record_metadata_extra_fields:InvenioDraftsRecordMetadataExtraFieldsBuilder
     2900-invenio_drafts_record_extra_fields = oarepo_model_builder_drafts.invenio.invenio_drafts_record_extra_fields:InvenioDraftsRecordExtraFieldsBuilder
 
+    5400-invenio_drafts_record_search_options = oarepo_model_builder_drafts.invenio.invenio_drafts_record_search_options:InvenioRecordSearchOptionsBuilder
+
 
 oarepo_model_builder.templates =
     99-drafts_templates = oarepo_model_builder_drafts.invenio