weko#44635, #44914, #44981 Fix elasticsearch query issue

modules/invenio-resourcesyncserver/invenio_resourcesyncserver/query.py

@@ -27,6 +27,7 @@
 from invenio_search import RecordsSearch
 from weko_index_tree.api import Indexes
 from weko_schema_ui.models import PublishStatus
+from weko_search_ui.utils import execute_search_with_pagination
 
 from .config import WEKO_ROOT_INDEX
 
@@ -36,14 +37,13 @@ def get_items_by_index_tree(index_tree_id):
     records_search = RecordsSearch()
     records_search = records_search.with_preference_param().params(
         version=False)
+    records_search = records_search.sort({"control_number": {"order": "asc"}})
     records_search._index[0] = current_app.config['SEARCH_UI_SEARCH_INDEX']
     search_instance = item_path_search_factory(
         search=records_search,
         index_id=index_tree_id
     )
-    search_result = search_instance.execute().to_dict()
-
-    return search_result.get('hits').get('hits')
+    return execute_search_with_pagination(search_instance, -1)
 
 
 def get_item_changes_by_index(index_tree_id, date_from, date_until):
@@ -58,9 +58,7 @@ def get_item_changes_by_index(index_tree_id, date_from, date_until):
         date_from=date_from,
         date_until=date_until
     )
-    search_result = search_instance.execute().to_dict()
-
-    return search_result.get('hits').get('hits')
+    return execute_search_with_pagination(search_instance, -1)
 
 
 def item_path_search_factory(search, index_id="0"):
@@ -224,11 +222,13 @@ def _get_index_search_query(_date_from: str, _date_until: str) -> dict:
                     ]
                 }
             },
-            "sort": {
-                "_updated": {
-                    "order": "asc"
+            "sort": [
+                {
+                    "_updated": {
+                        "order": "asc"
+                    }
                 }
-            },
+            ],
             "post_filter": {
                 "bool": {
                     "must": [

modules/invenio-resourcesyncserver/tests/conftest.py

@@ -688,6 +688,30 @@ def es(app):
     list(current_search.delete(ignore=[404]))
 
 
+@pytest.fixture()
+def esindex(app):
+    current_search_client.indices.delete(index="test-*")
+    with open("tests/data/item-v1.0.0.json", "r") as f:
+        mapping = json.load(f)
+    try:
+        current_search_client.indices.create(
+            app.config["INDEXER_DEFAULT_INDEX"], body=mapping
+        )
+        current_search_client.indices.put_alias(
+            index=app.config["INDEXER_DEFAULT_INDEX"], name="test-weko"
+        )
+    except:
+        current_search_client.indices.create("test-weko-items", body=mapping)
+        current_search_client.indices.put_alias(
+            index="test-weko-items", name="test-weko"
+        )
+
+    try:
+        yield current_search_client
+    finally:
+        current_search_client.indices.delete(index="test-*")
+
+
 @pytest.yield_fixture()
 def i18n_app(app):
     with app.test_request_context(
@@ -725,10 +749,18 @@ def indices(app, db):
         )
         testIndexMore = Index(index_name="testIndexMore",parent=33,public_state=True,id='more')
         testIndexPrivate = Index(index_name="testIndexPrivate",public_state=False,id=55)
+        testIndexSix = Index(
+            index_name="testIndexSix",
+            browsing_role="1,2,3,4,-98,-99",
+            public_state=True,
+            id=66,
+            position=4
+        )
 
         db.session.add(testIndexThree)
         db.session.add(testIndexThreeChild)
-
+        db.session.add(testIndexSix)
+
     return {
         'index_dict': dict(testIndexThree),
         'index_non_dict': testIndexThree,