Feature/w2025 35

modules/weko-items-autofill/tests/data/itemtypes/mapping.json

@@ -133,5 +133,32 @@
     "test_item15":{
         "jpcoar_mapping":{"volume": { "@value": "test15_subitem1" } }
     },
+    "test_item16":{
+        "jpcoar_mapping":{
+            "relation":{
+                "@attributes": {"relationType": "subitem_relation_type"},
+                "relatedIdentifier": {
+                    "@value": "test16_subitem1.test16_subitem2",
+                    "@attributes": {
+                      "identifierType": "test16_subitem1.test16_subitem3"
+                    }
+                }
+            }
+        }
+    },
+    "test_item17":{
+        "jpcoar_mapping":{
+            "relation":{
+                "@attributes": {"": ""},
+                "relatedIdentifier": {
+                    "@value": "test16_subitem1.test16_subitem2",
+                    "@attributes": {
+                      "identifierType": "test16_subitem1.test16_subitem3"
+                    }
+                }
+            }
+        }
+    },
+
     "test_itemxx":""
 }

modules/weko-items-autofill/tests/test_utils.py

@@ -1040,7 +1040,7 @@ def test_get_crossref_relation_data(mocker):
     isbn = []
     doi = "test_doi"
     result = get_crossref_relation_data(isbn, doi)
-    assert result == [{"@value": "test_doi", "@type": "DOI"}]
+    assert result == [{"@value": "test_doi", "@type": "DOI","@relation_type": "isVersionOf"}]
 
     isbn = ["test_isbn1", "test_isbn2"]
     doi = ""
@@ -1394,6 +1394,20 @@ def assert_test(item_name, parent_key, value_key, attributes_keys):
             test = {"@value":value_key}
             test.update(attributes_keys)
             assert result == test
+
+    def assert_test2(item_name, parent_key, value_key, attributes_keys):
+        mock_effect = [{"key": value_key}]
+        mock_effect += [{"key": attributes_key} for attributes_key in attributes_keys.values()]
+        with patch(
+            "weko_items_autofill.utils.get_autofill_key_path",
+            side_effect=mock_effect,
+        ):
+            result = get_key_value(
+                schema_form, data[item_name]["jpcoar_mapping"]["relation"][parent_key], parent_key,data[item_name]["jpcoar_mapping"]["relation"]
+            )
+            test = {"@value":value_key}
+            test.update(attributes_keys)
+            assert result == test
 
 
     # exist @attributes.xml:lang
@@ -1436,6 +1450,20 @@ def assert_test(item_name, parent_key, value_key, attributes_keys):
         attributes_keys={"@type":"test12_subitem2"}
     )
 
+    assert_test2(
+        item_name="test_item16",
+        parent_key="relatedIdentifier",
+        value_key="test16_subitem1.test16_subitem2",
+        attributes_keys={"@type":"test16_subitem1.test16_subitem2","@relation_type":"subitem_relation_type","@type":"test16_subitem1.test16_subitem3"}
+    )
+
+    assert_test2(
+        item_name="test_item17",
+        parent_key="relatedIdentifier",
+        value_key="test17_subitem1.test17_subitem2",
+        attributes_keys={"@type":"test17_subitem1.test16_subitem2","@type":"test17_subitem1.test16_subitem3"}
+    )
+
 
 # def get_autofill_key_path(schema_form, parent_key, child_key):
 # .tox/c1/bin/pytest --cov=weko_items_autofill tests/test_utils.py::test_get_autofill_key_path -vv -s --cov-branch --cov-report=term --basetemp=/code/modules/weko-items-autofill/.tox/c1/tmp

modules/weko-items-autofill/weko_items_autofill/utils.py

@@ -840,6 +840,7 @@ def get_crossref_relation_data(isbn, doi):
         new_data = dict()
         new_data['@value'] = doi
         new_data['@type'] = "DOI"
+        new_data['@relation_type'] = 'isVersionOf'
         result.append(new_data)
     if isbn and len(result) == 0:
         for element in isbn:
@@ -993,7 +994,7 @@ def get_autofill_key_tree(schema_form, item, result=None):
                 related_identifier = val.get("relatedIdentifier")
                 if related_identifier:
                     key_data = get_key_value(schema_form,
-                                             related_identifier, parent_key)
+                                             related_identifier, parent_key, val)
             else:
                 key_data = get_key_value(schema_form, val, parent_key)
             if key_data:
@@ -1054,7 +1055,7 @@ def get_parent_key(_item):
     return autofill_key_tree
 
 
-def get_key_value(schema_form, val, parent_key):
+def get_key_value(schema_form, val, parent_key,val2={}):
     """Get key value.
 
     :param schema_form: Schema form
@@ -1109,7 +1110,14 @@ def get_key_value(schema_form, val, parent_key):
                 parent_key,
                 value_key.get("dateType")
             ).get('key')
-
+    if val2.get("@attributes") is not None:
+        value_key = val2.get('@attributes')
+        if value_key.get("relationType") is not None:
+            key_data['@relation_type'] = get_autofill_key_path(
+                schema_form,
+                parent_key,
+                value_key.get("relationType")
+            ).get('key')
     return key_data