未病DB WEKOエクスポート:拡張メタデータを必須扱いにしないための修正

addons/weko/deposit.py

@@ -177,7 +177,7 @@ def _deposit_metadata(
         if update_task_state:
             update_task_state(state='packaging', meta={
                 'progress': 50,
-                'paths': path,
+                'paths': ad_metadata_paths,
             })
 
         c = weko_addon.create_client()

addons/weko/mappings/ms2-mibyodb-metadata-mappings-ro-crate.json

@@ -411,6 +411,7 @@
             "dateCreated": "{{ date_registered_in_metadata_value }}",
             "hasPart[]": [
                 {
+                    "@createIf": "{{ choose_additional_metadata_value }}",
                     ".@type": "File",
                     ".@id": "files/{{choose_additional_metadata_value}}",
                     "name": "{{choose_additional_metadata_value}}",

addons/weko/schema/ro_crate.py

@@ -522,7 +522,9 @@ def write_ro_crate_json(user, f, target_index, download_file_names, schema_id, f
                 value = source_data.get('value', '')
                 if 'choose-additional-metadata' in value:
                     url = value['choose-additional-metadata']
-                    value_data = json.loads(url['value'])
+                    value_data = json.loads(url.get('value') or '[]')
+                    if not value_data:
+                        continue
                     file_path = value_data[0]['path']
                     file_name = file_path.split('/')[-1]
                     for item in value_data:

osf/migrations/0261_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', '0260_merge_20251126_1230'),
+    ]
+
+    operations = [
+        migrations.RunPython(ensure_registration_mappings, ensure_registration_mappings),
+    ]