fix gwmd datasettype

HDRUK · Sep 20, 2024 · 0e8fe3b · 0e8fe3b
1 parent fb822b4
commit 0e8fe3b
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 33 deletions.
diff --git a/hdr_schemata/models/GWDM/2.0/schema.json b/hdr_schemata/models/GWDM/2.0/schema.json
@@ -570,19 +570,6 @@
                   "title": "DatasetLinkage",
                   "type": "object"
             },
-            "DatasetType": {
-                  "anyOf": [
-                        {
-                              "maxLength": 100,
-                              "minLength": 2,
-                              "type": "string"
-                        },
-                        {
-                              "type": "null"
-                        }
-                  ],
-                  "title": "DatasetType"
-            },
             "DeliveryLeadTimeV2": {
                   "enum": [
                         "Less than 1 week",
@@ -1585,7 +1572,7 @@
                         "datasetType": {
                               "anyOf": [
                                     {
-                                          "$ref": "#/$defs/DatasetType"
+                                          "$ref": "#/$defs/CommaSeparatedValues"
                                     },
                                     {
                                           "type": "null"
@@ -1640,7 +1627,7 @@
                         "datasetSubType": {
                               "anyOf": [
                                     {
-                                          "$ref": "#/$defs/DatasetType"
+                                          "$ref": "#/$defs/CommaSeparatedValues"
                                     },
                                     {
                                           "type": "null"

diff --git a/hdr_schemata/models/GWDM/v2_0/Summary.py b/hdr_schemata/models/GWDM/v2_0/Summary.py
@@ -31,7 +31,7 @@ class Summary(BaseModel):
 
     contactPoint: Optional[EmailStr] = Field(None, **an.contactPoint.__dict__)
 
-    datasetType: Optional[DatasetType] = Field(None, **an.datasetType.__dict__)
+    datasetType: Optional[CommaSeparatedValues] = Field(None, **an.datasetType.__dict__)
 
     description: Optional[LongDescription] = Field(None, **an.description.__dict__)
 
@@ -43,8 +43,8 @@ class Summary(BaseModel):
 
     populationSize: Optional[int] = Field(None, **an.populationSize.__dict__)
 
-    datasetSubType: Optional[DatasetType] = Field(None, **an.datasetSubType.__dict__)
+    datasetSubType: Optional[CommaSeparatedValues] = Field(
+        None, **an.datasetSubType.__dict__
+    )
 
     inPipeline: Optional[Pipeline] = Field("Not available", **an.inPipeline.__dict__)
-
-
diff --git a/hdr_schemata/models/HDRUK/v3_0_0/Access.py b/hdr_schemata/models/HDRUK/v3_0_0/Access.py
@@ -12,36 +12,49 @@ class Config:
         extra = "forbid"
 
     accessRights: LongDescription = Field(
-        ..., **an.accessRights.__dict__, json_schema_extra={"guidance": an.accessRights.guidance}
+        ...,
+        **an.accessRights.__dict__,
+        json_schema_extra={"guidance": an.accessRights.guidance}
     )
 
     accessServiceCategory: Optional[AccessService] = Field(
-        None, 
-        **an.accessServiceCategory.__dict__, 
+        None,
+        **an.accessServiceCategory.__dict__,
         json_schema_extra={"guidance": an.accessServiceCategory.guidance}
     )
 
     accessService: Optional[LongDescription] = Field(
-        None, **an.accessService.__dict__, json_schema_extra={"guidance": an.accessService.guidance}
+        None,
+        **an.accessService.__dict__,
+        json_schema_extra={"guidance": an.accessService.guidance}
     )
-    
+
     accessRequestCost: Optional[LongDescription] = Field(
-        None, **an.accessRequestCost.__dict__, json_schema_extra={"guidance": an.accessRequestCost.guidance}
+        None,
+        **an.accessRequestCost.__dict__,
+        json_schema_extra={"guidance": an.accessRequestCost.guidance}
     )
-    
+
     deliveryLeadTime: Optional[DeliveryLeadTimeV2] = Field(
-        None, **an.deliveryLeadTime.__dict__, json_schema_extra={"guidance": an.deliveryLeadTime.guidance}
+        None,
+        **an.deliveryLeadTime.__dict__,
+        json_schema_extra={"guidance": an.deliveryLeadTime.guidance}
     )
 
     jurisdiction: Optional[List[Isocountrycode]] = Field(
-        None, **an.jurisdiction.__dict__, json_schema_extra={"guidance": an.jurisdiction.guidance}
+        None,
+        **an.jurisdiction.__dict__,
+        json_schema_extra={"guidance": an.jurisdiction.guidance}
     )
-    
+
     dataController: Optional[LongDescription] = Field(
-        None, **an.dataController.__dict__, json_schema_extra={"guidance": an.dataController.guidance}
+        None,
+        **an.dataController.__dict__,
+        json_schema_extra={"guidance": an.dataController.guidance}
     )
-    
+
     dataProcessor: Optional[LongDescription] = Field(
-        None, **an.dataProcessor.__dict__, json_schema_extra={"guidance": an.dataProcessor.guidance}
+        None,
+        **an.dataProcessor.__dict__,
+        json_schema_extra={"guidance": an.dataProcessor.guidance}
     )
-