Merge pull request #37 from MITLibraries/grant-info

Add grant number information field
MITLibraries · Oct 16, 2020 · 0c8ccca · 0c8ccca
2 parents e530580 + 2c710fe
commit 0c8ccca
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/hoard/models.py b/hoard/models.py
@@ -40,6 +40,7 @@ class Distributor:
 class GrantNumber:
     grantNumberValue: Optional[str] = None
     grantNumberAgency: Optional[str] = None
+    grantNumberInformation: Optional[str] = None
 
 
 @attr.s(auto_attribs=True)
@@ -164,7 +165,7 @@ def asdict(self) -> dict:
             compound(
                 self.grantNumbers,
                 "grantNumber",
-                ["grantNumberValue", "grantNumberAgency"],
+                ["grantNumberValue", "grantNumberAgency", "grantNumberInformation"],
             )
         )
         fields.append(compound(self.keywords, "keyword", ["keywordValue"]))

diff --git a/hoard/sources/whoas.py b/hoard/sources/whoas.py
@@ -114,7 +114,7 @@ def create_from_whoas_dim_xml(data: str, client: OAIClient) -> Dataset:
             and field.attrib["qualifier"] == "sponsorship"
         ):
             kwargs.setdefault("grantNumbers", []).append(
-                GrantNumber(grantNumberValue=field.text, grantNumberAgency=field.text)
+                GrantNumber(grantNumberInformation=field.text)
             )
         if field.attrib["element"] == "description" and "qualifier" not in field.attrib:
             if field.text is not None and notesText == "":

diff --git a/tests/data/all_fields.json b/tests/data/all_fields.json
@@ -164,6 +164,12 @@
                   "multiple": false,
                   "typeClass": "primitive",
                   "value": "GrantInformationGrantNumber1"
+                },
+                "grantNumberInformation": {
+                  "typeName": "grantNumberInformation",
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "value": "GrantInformationInformation1"
                 }
               }
             ]

diff --git a/tests/test_models.py b/tests/test_models.py
@@ -64,6 +64,7 @@ def test_full_dataset(dataverse_full_json_record):
     grantNumbers = GrantNumber(
         grantNumberValue="GrantInformationGrantNumber1",
         grantNumberAgency="GrantInformationGrantAgency1",
+        grantNumberInformation="GrantInformationInformation1",
     )
     otherIds = OtherId(
         otherIdValue="OtherIDIdentifier1", otherIdAgency="OtherIDAgency1",

diff --git a/tests/test_whoas.py b/tests/test_whoas.py
@@ -59,10 +59,7 @@ def test_create_whoas_dim_xml(whoas_oai_server, dspace_oai_xml_series_name_recor
         ]
         distributors = [Distributor(distributorName="Esteemed Publishing Conglomerate")]
         grantNumbers = [
-            GrantNumber(
-                grantNumberValue="Funding for this educational package.",
-                grantNumberAgency="Funding for this educational package.",
-            )
+            GrantNumber(grantNumberInformation="Funding for this educational package.")
         ]
         keywords = [
             Keyword(keywordValue="Migration"),