release: v4.36.3

inveniosoftware · Oct 15, 2023 · 7663107 · 7663107
1 parent 6557ca3
commit 7663107
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -11,6 +11,10 @@
 Changes
 =======
 
+Version 4.36.3 (2023-10-15)
+
+- fix search of drafts
+
 Version 4.36.2 (2023-10-14)
 
 - datastore: prevent autoflush on search

diff --git a/invenio_rdm_records/__init__.py b/invenio_rdm_records/__init__.py
@@ -10,6 +10,6 @@
 
 from .ext import InvenioRDMRecords
 
-__version__ = "4.36.2"
+__version__ = "4.36.3"
 
 __all__ = ("__version__", "InvenioRDMRecords")
diff --git a/invenio_rdm_records/services/services.py b/invenio_rdm_records/services/services.py
@@ -402,14 +402,26 @@ def search_drafts(
         #
         # To filter out deleted records we apply the following logic:
         #   deletion_status=="P" or "deletion_status" not in data
-
-        search_filter = dsl.query.Q("bool", should=[
-            dsl.query.Q("bool", must=[dsl.query.Q("term", deletion_status=RecordDeletionStatusEnum.PUBLISHED.value)]),
-            # Drafts does not have deletion_status so this clause is needed to
-            # prevent the above clause from filtering out the drafts
-            # TODO: ensure draft also has the needed data.
-            dsl.query.Q("bool", must_not=[dsl.query.Q("exists", field="deletion_status")]),
-        ])
+        search_filter = dsl.query.Q(
+            "bool",
+            should=[
+                dsl.query.Q(
+                    "bool",
+                    must=[
+                        dsl.query.Q(
+                            "term",
+                            deletion_status=RecordDeletionStatusEnum.PUBLISHED.value,
+                        )
+                    ],
+                ),
+                # Drafts does not have deletion_status so this clause is needed to
+                # prevent the above clause from filtering out the drafts
+                # TODO: ensure draft also has the needed data.
+                dsl.query.Q(
+                    "bool", must_not=[dsl.query.Q("exists", field="deletion_status")]
+                ),
+            ],
+        )
         if extra_filter:
             search_filter &= extra_filter
         return super().search_drafts(