awards: add "program" field

front-matter · Sep 14, 2023 · a6c5b76 · a6c5b76
1 parent 62c9e87
commit a6c5b76
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 0 deletions.
diff --git a/invenio_vocabularies/contrib/awards/datastreams.py b/invenio_vocabularies/contrib/awards/datastreams.py
@@ -52,6 +52,15 @@ def apply(self, stream_entry, **kwargs):
 
         award["id"] = f"{funder_id}::{code}"
 
+        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]), "")
+            if program:
+                award["program"] = program
+
         identifiers = []
         if funder_id == awards_ec_ror_id:
             identifiers.append(

diff --git a/invenio_vocabularies/contrib/awards/jsonschemas/awards/award-v1.0.0.json b/invenio_vocabularies/contrib/awards/jsonschemas/awards/award-v1.0.0.json
@@ -36,6 +36,9 @@
     },
     "acronym": {
       "type": "string"
+    },
+    "program": {
+      "type": "string"
     }
   }
 }
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
@@ -55,6 +55,9 @@
       "acronym": {
         "type": "keyword"
       },
+      "program": {
+        "type": "keyword"
+      },
       "funder": {
         "type": "object",
         "properties": {

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
@@ -55,6 +55,9 @@
       "acronym": {
         "type": "keyword"
       },
+      "program": {
+        "type": "keyword"
+      },
       "funder": {
         "type": "object",
         "properties": {

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
@@ -55,6 +55,9 @@
       "acronym": {
         "type": "keyword"
       },
+      "program": {
+        "type": "keyword"
+      },
       "funder": {
         "type": "object",
         "properties": {

diff --git a/invenio_vocabularies/contrib/awards/schema.py b/invenio_vocabularies/contrib/awards/schema.py
@@ -49,6 +49,8 @@ class AwardSchema(BaseVocabularySchema):
 
     acronym = SanitizedUnicode()
 
+    program = SanitizedUnicode()
+
     id = SanitizedUnicode(
         validate=validate.Length(min=1, error=_("PID cannot be blank."))
     )

diff --git a/tests/contrib/awards/test_awards_datastreams.py b/tests/contrib/awards/test_awards_datastreams.py
@@ -93,6 +93,7 @@ def expected_from_award_json():
         "title": {"en": "Test title"},
         "funder": {"id": "021nxhr62"},
         "acronym": "TA",
+        "program": "GEO/OAD",
     }
 
 
@@ -107,6 +108,7 @@ def expected_from_award_json_ec():
         "title": {"en": "Test title"},
         "funder": {"id": "00k4n6c32"},
         "acronym": "TS",
+        "program": "test",
     }