awards: fixed program in openaire transformer

inveniosoftware · Oct 3, 2024 · e317fbc · e317fbc
1 parent 780fa96
commit e317fbc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/invenio_vocabularies/contrib/awards/datastreams.py b/invenio_vocabularies/contrib/awards/datastreams.py
@@ -73,10 +73,7 @@ def apply(self, stream_entry, **kwargs):
 
         funding = next(iter(record.get("funding", [])), None)
         if funding:
-            funding_stream_id = funding.get("funding_stream", {}).get("id", "")
-            # Example funding stream ID: `EC::HE::HORIZON-AG-UN`. We need the `EC`
-            # string, i.e. the second "part" of the identifier.
-            program = next(iter(funding_stream_id.split("::")[1:2]), "")
+            program = funding.get("fundingStream", {}).get("id", "")
             if program:
                 award["program"] = program
 

diff --git a/invenio_vocabularies/contrib/awards/mappings/os-v1/awards/award-v1.0.0.json b/invenio_vocabularies/contrib/awards/mappings/os-v1/awards/award-v1.0.0.json
@@ -11,7 +11,7 @@
         }
       }
     ],
-    "dynamic": "true",
+    "dynamic": "strict",
     "properties": {
       "$schema": {
         "type": "keyword",

diff --git a/invenio_vocabularies/contrib/awards/mappings/os-v2/awards/award-v1.0.0.json b/invenio_vocabularies/contrib/awards/mappings/os-v2/awards/award-v1.0.0.json
@@ -11,7 +11,7 @@
         }
       }
     ],
-    "dynamic": "true",
+    "dynamic": "strict",
     "properties": {
       "$schema": {
         "type": "keyword",

diff --git a/invenio_vocabularies/contrib/awards/mappings/v7/awards/award-v1.0.0.json b/invenio_vocabularies/contrib/awards/mappings/v7/awards/award-v1.0.0.json
@@ -11,7 +11,7 @@
         }
       }
     ],
-    "dynamic": "true",
+    "dynamic": "strict",
     "properties": {
       "$schema": {
         "type": "keyword",