Merge pull request #27 from gdcc/fix-datetime-year

Fix date fields not accepting years
gdcc · Oct 16, 2024 · d1543ab · d1543ab
2 parents 0688ff1 + 3770c99
commit d1543ab
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 75 deletions.
diff --git a/easyDataverse/classgen.py b/easyDataverse/classgen.py
@@ -1,4 +1,3 @@
-from datetime import date
 import forge
 import types
 import re
@@ -17,7 +16,7 @@
     "integer": int,
     "int": int,
     "textbox": str,
-    "date": date,
+    "date": str,
     "email": EmailStr,
 }
 

diff --git a/tests/fixtures/minimal_upload.json b/tests/fixtures/minimal_upload.json
@@ -1,75 +1,79 @@
 {
-    "datasetVersion": {
-        "metadataBlocks": {
-            "citation": {
-                "fields": [
-                    {
-                        "multiple": true,
-                        "typeClass": "compound",
-                        "typeName": "author",
-                        "value": [
-                            {
-                                "authorName": {
-                                    "multiple": false,
-                                    "typeClass": "primitive",
-                                    "typeName": "authorName",
-                                    "value": "John Doe"
-                                }
-                            }
-                        ]
-                    },
-                    {
-                        "multiple": true,
-                        "typeClass": "compound",
-                        "typeName": "datasetContact",
-                        "value": [
-                            {
-                                "datasetContactName": {
-                                    "multiple": false,
-                                    "typeClass": "primitive",
-                                    "typeName": "datasetContactName",
-                                    "value": "John Doe"
-                                },
-                                "datasetContactEmail": {
-                                    "multiple": false,
-                                    "typeClass": "primitive",
-                                    "typeName": "datasetContactEmail",
-                                    "value": "[email protected]"
-                                }
-                            }
-                        ]
-                    },
-                    {
-                        "multiple": true,
-                        "typeClass": "compound",
-                        "typeName": "dsDescription",
-                        "value": [
-                            {
-                                "dsDescriptionValue": {
-                                    "multiple": false,
-                                    "typeClass": "primitive",
-                                    "typeName": "dsDescriptionValue",
-                                    "value": "This is a description of the dataset"
-                                }
-                            }
-                        ]
-                    },
-                    {
-                        "multiple": true,
-                        "typeClass": "controlledVocabulary",
-                        "typeName": "subject",
-                        "value": [
-                            "Other"
-                        ]
-                    },
-                    {
-                        "multiple": false,
-                        "typeClass": "primitive",
-                        "typeName": "title",
-                        "value": "My dataset"
-                    }
-                ]
-            }
-        }
+  "datasetVersion": {
+    "metadataBlocks": {
+      "citation": {
+        "fields": [
+          {
+            "multiple": true,
+            "typeClass": "compound",
+            "typeName": "author",
+            "value": [
+              {
+                "authorName": {
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "typeName": "authorName",
+                  "value": "John Doe"
+                }
+              }
+            ]
+          },
+          {
+            "multiple": true,
+            "typeClass": "compound",
+            "typeName": "datasetContact",
+            "value": [
+              {
+                "datasetContactName": {
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "typeName": "datasetContactName",
+                  "value": "John Doe"
+                },
+                "datasetContactEmail": {
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "typeName": "datasetContactEmail",
+                  "value": "[email protected]"
+                }
+              }
+            ]
+          },
+          {
+            "multiple": true,
+            "typeClass": "compound",
+            "typeName": "dsDescription",
+            "value": [
+              {
+                "dsDescriptionValue": {
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "typeName": "dsDescriptionValue",
+                  "value": "This is a description of the dataset"
+                },
+                "dsDescriptionDate": {
+                  "multiple": false,
+                  "typeClass": "primitive",
+                  "typeName": "dsDescriptionDate",
+                  "value": "2024"
+                }
+              }
+            ]
+          },
+          {
+            "multiple": true,
+            "typeClass": "controlledVocabulary",
+            "typeName": "subject",
+            "value": ["Other"]
+          },
+          {
+            "multiple": false,
+            "typeClass": "primitive",
+            "typeName": "title",
+            "value": "My dataset"
+          }
+        ]
+      }
     }
+  }
 }
diff --git a/tests/integration/test_dataset_creation.py b/tests/integration/test_dataset_creation.py
@@ -25,7 +25,8 @@ def test_creation(
         dataset.citation.subject = ["Other"]
         dataset.citation.add_author(name="John Doe")
         dataset.citation.add_ds_description(
-            value="This is a description of the dataset"
+            value="This is a description of the dataset",
+            date="2024",
         )
         dataset.citation.add_dataset_contact(
             name="John Doe",