Add WEKO patch to delay file content task to avoid ES version conflict

Author: yacchin1205

.github/patches/weko-delay-file-content-task.patch

@@ -0,0 +1,14 @@
+diff --git a/modules/weko-deposit/weko_deposit/api.py b/modules/weko-deposit/weko_deposit/api.py
+index XXXXXXX..XXXXXXX 100644
+--- a/modules/weko-deposit/weko_deposit/api.py
++++ b/modules/weko-deposit/weko_deposit/api.py
+@@ -1025,7 +1025,8 @@ class WekoDeposit(Deposit):
+                                                  self.revision_id)
+                     # Upload pdf file content to Elasticsearch
+                     from .tasks import extract_pdf_and_update_file_contents
+-                    extract_pdf_and_update_file_contents.apply_async((reading_targets, str(self.pid.object_uuid)))
++                    # Add countdown to avoid version conflict with web process
++                    extract_pdf_and_update_file_contents.apply_async((reading_targets, str(self.pid.object_uuid)), countdown=10)
+                 except TransportError as err:
+                     if self.jrc.get('content'):
+                         for content in self.jrc['content']:

.github/scripts/setup_weko.sh

@@ -47,6 +47,8 @@ case "$COMMAND" in
     patch -d "${WEKO_ROOT}" -p1 < "${SCRIPT_DIR}/../patches/weko-oauth2-insecure-transport.patch"
     # Apply patch to fix chardet TypeError on ZIP filename handling
     patch -d "${WEKO_ROOT}" -p1 < "${SCRIPT_DIR}/../patches/weko-chardet-fix.patch"
+    # Apply patch to delay file content extraction task to avoid ES version conflict
+    patch -d "${WEKO_ROOT}" -p1 < "${SCRIPT_DIR}/../patches/weko-delay-file-content-task.patch"
     # Generate self-signed certificate for WEKO nginx with SAN for IP address
     mkdir -p "${WEKO_ROOT}/nginx/keys"
     openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
@@ -89,6 +91,44 @@ db.session.commit()
 print('Updated mapping 30002')
 "
 
+    # Grant contributor access to Sample Index
+    echo "=== Granting Contributor Access to Sample Index ==="
+    docker compose -f "${compose_file}" exec -T web invenio shell -c '
+from weko_index_tree.models import Index
+from invenio_db import db
+index = Index.query.filter_by(index_name_english="Sample Index").first()
+if index:
+    print(f"Before: contribute_role={index.contribute_role}, browsing_role={index.browsing_role}")
+    index.contribute_role = "1,2,3,4,-98,-99"
+    index.browsing_role = "1,2,3,4,-98,-99"
+    index.public_state = True
+    db.session.commit()
+    print(f"After: contribute_role={index.contribute_role}, browsing_role={index.browsing_role}")
+else:
+    print("Sample Index not found")
+    exit(1)
+'
+
+    # Grant index-tree-access permission to Contributor role
+    echo "=== Granting index-tree-access to Contributor ==="
+    docker compose -f "${compose_file}" exec -T web invenio shell -c '
+from invenio_access.models import ActionRoles, Role
+from invenio_db import db
+role = Role.query.filter_by(name="Contributor").first()
+if role:
+    existing = ActionRoles.query.filter_by(action="index-tree-access", role_id=role.id).first()
+    if existing:
+        print(f"index-tree-access already granted to Contributor (role_id={role.id})")
+    else:
+        ar = ActionRoles(action="index-tree-access", role_id=role.id)
+        db.session.add(ar)
+        db.session.commit()
+        print(f"Granted index-tree-access to Contributor (role_id={role.id})")
+else:
+    print("Contributor role not found")
+    exit(1)
+'
+
     # Validate SWORD mapping 30002
     echo "=== SWORD Mapping Validation (30002) ==="
     validation_result=$(docker compose -f "${compose_file}" exec -T web invenio shell -c '

テスト手順-WEKOアドオン-アドオン追加.ipynb

@@ -4891,6 +4891,34 @@
     "await run_pw(_step)\n"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "id": "wp8nockzkos",
+   "source": "## ドロップダウンから「Log out」をクリックする\n\nログアウトされ、WEKO3のトップ画面が表示されること",
+   "metadata": {}
+  },
+  {
+   "cell_type": "code",
+   "id": "nqhy9erzu6q",
+   "source": "async def _step(page):\n    await page.locator('//div[contains(@class, \"navbar-form\")]//button[contains(@class, \"dropdown-toggle\")]').click()\n    await expect(page.locator('//a[@href = \"/logout/\"]')).to_be_visible(timeout=transition_timeout)\n    await page.locator('//a[@href = \"/logout/\"]').click()\n    await expect(page.locator('//a[contains(@class, \"login-button\")]')).to_be_visible(timeout=transition_timeout)\n\nawait run_pw(_step)",
+   "metadata": {},
+   "execution_count": null,
+   "outputs": []
+  },
+  {
+   "cell_type": "markdown",
+   "id": "087b4z3vc41",
+   "source": "## 「ログイン」をクリックし、WEKOユーザーアカウントでログインする\n\nWEKO3のアイテム画面が表示されること",
+   "metadata": {}
+  },
+  {
+   "cell_type": "code",
+   "id": "4iuntqhmvp8",
+   "source": "async def _step(page):\n    await page.locator('//a[contains(@class, \"login-button\")]').click()\n    await expect(page.locator('//input[@name = \"email\"]')).to_be_visible(timeout=transition_timeout)\n    await page.locator('//input[@name = \"email\"]').fill(weko_user_email)\n    await page.locator('//input[@name = \"password\"]').fill(weko_user_password)\n    await page.locator('//button[@type = \"submit\"]').click()\n    await expect(page.locator('//a[@href = \"/account/settings/profile/\" and .//i[@class=\"fa fa-user\"]]')).to_be_visible(timeout=transition_timeout)\n\nawait run_pw(_step)",
+   "metadata": {},
+   "execution_count": null,
+   "outputs": []
+  },
   {
    "cell_type": "markdown",
    "id": "39b71328-855f-430f-a4d8-da0756137933",