Merge pull request #1110 from ryoya-hayase/feature/W2025-28

Address review comments

Author: ryoya-hayase

test/tavern/create_item_type_template.py

@@ -35,14 +35,14 @@ def create_itemtype_template():
         # Create template for entering data
         template = create_template(result['schema'])
         template['$schema'] = '/items/jsonschema/' + str(schema[0])
-        template['shared_user_id'] = -1
+        template['shared_user_ids'] = []
         with open('request_params/item_type_template/template/' + file_name + '.json', 'w', encoding='utf-8') as f:
             f.write(json.dumps(template, indent=4, ensure_ascii=False))
 
         # Create template for generating random data
         random_template, _ = create_random_template(result['schema'])
         random_template['$schema'] = '/items/jsonschema/' + str(schema[0])
-        random_template['shared_user_id'] = -1
+        random_template['shared_user_ids'] = []
         with open('request_params/item_type_template/template/' + file_name + '_random.json', 'w', encoding='utf-8') as f:
             f.write(json.dumps(random_template, indent=4, ensure_ascii=False))
 

test/tavern/helper/common/request_helper.py

@@ -134,7 +134,7 @@ def request_create_deposits_redirect_param(data, title_key, file_metadata=None):
             $schema (str): schema
             lang (str): lang
             pubdate (str): publish date
-            shared_user_id (int): shared user id
+            shared_user_ids (list): shared user ids
             title (str): title
             [key] (list or dict): item data with value
             deleted_items (list): item keys with no value

test/tavern/helper/config.py

@@ -1,38 +1,38 @@
 DATABASE = {
-  'host': 'localhost',
-  'port': 25401,
-  'dbname': 'invenio',
-  'user': 'invenio',
-  'password': 'dbpass123'
+    'host': 'localhost',
+    'port': 25401,
+    'dbname': 'invenio',
+    'user': 'invenio',
+    'password': 'dbpass123'
 }
 
 REDIS = {
-  'host': 'localhost',
-  'port': 26301,
-  'db': 0
+    'host': 'localhost',
+    'port': 26301,
+    'db': 0
 }
 
 USERS = {
-  'sysadmin': {
-    'email': 'wekosoftware@nii.ac.jp',
-    'password': 'uspass123'
-  },
-  'repoadmin': {
-    'email': 'repoadmin@example.org',
-    'password': 'uspass123'
-  },
-  'comadmin': {
-    'email': 'comadmin@example.org',
-    'password': 'uspass123'
-  },
-  'contributor': {
-    'email': 'contributor@example.org',
-    'password': 'uspass123'
-  },
-  'user': {
-    'email': 'user@example.org',
-    'password': 'uspass123'
-  }
+    'sysadmin': {
+        'email': 'wekosoftware@nii.ac.jp',
+        'password': 'uspass123'
+    },
+    'repoadmin': {
+        'email': 'repoadmin@example.org',
+        'password': 'uspass123'
+    },
+    'comadmin': {
+        'email': 'comadmin@example.org',
+        'password': 'uspass123'
+    },
+    'contributor': {
+        'email': 'contributor@example.org',
+        'password': 'uspass123'
+    },
+    'user': {
+        'email': 'user@example.org',
+        'password': 'uspass123'
+    }
 }
 
 REPLACEMENT_DECISION_STRING = {

test/tavern/helper/index/verify_helper.py

@@ -92,7 +92,8 @@ def verify_index_tree(
         expected_tree_file,
         role_id,
         edited_id_list=None,
-        deleted_id_list=None
+        deleted_id_list=None,
+        no_action=False
     ):
     """Verify the index tree structure in the response.
 
@@ -102,6 +103,7 @@ def verify_index_tree(
         role_id(str): Role ID to filter the tree information.
         edited_id_list(list, optional): List of IDs of the edited index nodes. Defaults to None.
         deleted_id_list(list, optional): List of IDs of the deleted index nodes. Defaults to None.
+        no_action(bool, optional): Flag to indicate no action. Defaults to False.
 
     Raises:
         ValueError: If an edited index ID is not found in the database.
@@ -176,7 +178,7 @@ def delete_node(tree, my_id):
 
     with open(expected_tree_file, 'r') as f:
         expected_tree = json.load(f)
-    if role_id not in [1, 2, 3, 4]:
+    if role_id not in [1, 2] and not no_action:
         browsing_tree = get_browsing_treeinfo(expected_tree, role_id)
     else:
         browsing_tree = expected_tree

test/tavern/prepare_data/execute_order.txt

@@ -13,3 +13,5 @@ communities_community.sql
 oaiserver_schema.sql
 pdfcoverpage_set.sql
 oaiserver_identify.sql
+files_bucket.sql
+oaiserver_set.sql

test/tavern/request_params/item_type_30002_invalid_choice.json

@@ -11,5 +11,5 @@
         "resourcetype": "no resource type"
     },
     "$schema": "/items/jsonschema/30002",
-    "shared_user_id": -1
+    "shared_user_ids": []
 }

test/tavern/request_params/item_type_30002_no_required.json

@@ -7,5 +7,5 @@
         }
     ],
     "$schema": "/items/jsonschema/30002",
-    "shared_user_id": -1
+    "shared_user_ids": []
 }

test/tavern/request_params/item_type_template/template/item_type_10001.json

@@ -322,5 +322,5 @@
         }
     ],
     "$schema": "/items/jsonschema/10001",
-    "shared_user_id": -1
+    "shared_user_ids": []
 }

test/tavern/request_params/item_type_template/template/item_type_10001_random.json

@@ -1666,5 +1666,5 @@
         "max": 5
     },
     "$schema": "/items/jsonschema/10001",
-    "shared_user_id": -1
+    "shared_user_ids": []
 }

test/tavern/request_params/item_type_template/template/item_type_30001.json

@@ -343,5 +343,5 @@
         "bibliographicNumberOfPages": ""
     },
     "$schema": "/items/jsonschema/30001",
-    "shared_user_id": -1
+    "shared_user_ids": []
 }