Merge pull request #560 from yacchin1205/fix/gw-issue-2024-12-rcos-release

[GRDM-47278, 47805] GW連携に関する修正のRCOS環境への反映

Author: yacchin1205

Dockerfile

@@ -99,7 +99,7 @@ RUN set -ex \
         /code/addons/*/requirements.txt \
         /code/admin/rdm*/requirements.txt \
     ; do \
-        pip3 install --no-cache-dir -r "$reqs_file" \
+        pip3 install --no-cache-dir -r "$reqs_file" || exit 1 \
     ; done \
     && (pip3 uninstall uritemplate.py --yes || true) \
     && pip3 install --no-cache-dir uritemplate.py==0.3.0 \

addons/weko/deposit.py

@@ -120,7 +120,7 @@ def deposit_metadata(
         zip_path = os.path.join(tmp_dir, 'payload.zip')
         with ZipFile(zip_path, 'w') as zf:
             for download_file_name, _ in download_file_names:
-                with zf.open(os.path.join('data/', download_file_name), 'w') as df:
+                with zf.open(f'data/files/{download_file_name}', 'w') as df:
                     with open(download_file_path, 'rb') as sf:
                         shutil.copyfileobj(sf, df)
             with zf.open('data/index.csv', 'w') as f:

addons/weko/mappings/e-rad-metadata-mappings.json

@@ -21,7 +21,7 @@
     "@projects": {
         "@type": "object",
         "metadata.item_30002_funding_reference21[]": {
-            "subitem_funder_identifier": {
+            "subitem_funder_identifiers": {
                 "@createIf": "{{ funder_value }}",
                 "subitem_funder_identifier_type": "e-Rad_funder"
             },
@@ -50,7 +50,7 @@
                 "subitem_funding_stream": "{{program_name_en_value}}",
                 "subitem_funding_stream_language": "en"
             },
-            "subitem_award_number": {
+            "subitem_award_numbers": {
                 "@createIf": "{{ japan_grant_number_value }}",
                 "subitem_award_number_type": "JGN",
                 "subitem_award_number": "{{japan_grant_number_value}}"

addons/weko/schema.py

@@ -25,7 +25,13 @@
 
 def _generate_file_columns(index, download_file_name, download_file_type):
     columns = []
-    columns.append((f'.file_path[{index}]', f'.ファイルパス[{index}]', '', 'Allow Multiple', download_file_name))
+    columns.append((
+        f'.file_path[{index}]',
+        f'.ファイルパス[{index}]',
+        '',
+        'Allow Multiple',
+        f'files/{download_file_name}'
+    ))
     return columns
 
 def _get_metadata_value(file_metadata_data, item, lang, index):

addons/weko/tests/test_schema.py

@@ -96,7 +96,7 @@ def test_write_csv_minimal(self):
         )
         assert_equal(
             props.pop(),
-            ['.file_path[0]', '.ファイルパス[0]', '', 'Allow Multiple', 'test.jpg'],
+            ['.file_path[0]', '.ファイルパス[0]', '', 'Allow Multiple', 'files/test.jpg'],
         )
         feedback_mail = props.pop()
         assert_equal(
@@ -281,7 +281,7 @@ def test_write_csv_full(self):
         )
         assert_equal(
             props.pop(),
-            ['.file_path[0]', '.ファイルパス[0]', '', 'Allow Multiple', 'test.jpg'],
+            ['.file_path[0]', '.ファイルパス[0]', '', 'Allow Multiple', 'files/test.jpg'],
         )
         feedback_mail = props.pop()
         assert_equal(

osf/migrations/0243_ensure_schema_mappings.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.28 on 2024-11-07 22:16
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+def ensure_registration_mappings(*args):
+    from api.base import settings
+    from addons.weko.apps import NAME
+    from addons.weko.utils import ensure_registration_metadata_mapping
+    from addons.weko.mappings import REGISTRATION_METADATA_MAPPINGS
+    if NAME not in settings.INSTALLED_APPS:
+        return
+    for schema_name, mappings in REGISTRATION_METADATA_MAPPINGS:
+        ensure_registration_metadata_mapping(schema_name, mappings)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('osf', '0242_ensure_schema_mappings'),
+    ]
+
+    operations = [
+        migrations.RunPython(ensure_registration_mappings, ensure_registration_mappings),
+    ]