Merge remote-tracking branch 'origin/main' into release-2-9-0

cdisc-org · Jan 11, 2024 · 4a8d188 · 4a8d188
2 parents b7851dc + 78f1c2d
commit 4a8d188
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 36 deletions.
diff --git a/docs/USDM_API.json b/docs/USDM_API.json
@@ -1906,14 +1906,14 @@
           },
           "instanceType": {
             "const": "GeographicScope",
-            "title": "Instancetype"
+            "title": "Instancetype",
+            "default": "GeographicScope"
           }
         },
         "type": "object",
         "required": [
           "id",
-          "type",
-          "instanceType"
+          "type"
         ],
         "title": "GeographicScope"
       },
@@ -1939,14 +1939,14 @@
           },
           "instanceType": {
             "const": "GeographicScope",
-            "title": "Instancetype"
+            "title": "Instancetype",
+            "default": "GeographicScope"
           }
         },
         "type": "object",
         "required": [
           "id",
-          "type",
-          "instanceType"
+          "type"
         ],
         "title": "GeographicScope"
       },
@@ -4857,7 +4857,11 @@
             "default": []
           },
           "administrations": {
-            "$ref": "#/components/schemas/AgentAdministration-Input"
+            "items": {
+              "$ref": "#/components/schemas/AgentAdministration-Input"
+            },
+            "type": "array",
+            "title": "Administrations"
           },
           "productDesignation": {
             "$ref": "#/components/schemas/Code"
@@ -4936,7 +4940,11 @@
             "default": []
           },
           "administrations": {
-            "$ref": "#/components/schemas/AgentAdministration-Output"
+            "items": {
+              "$ref": "#/components/schemas/AgentAdministration-Output"
+            },
+            "type": "array",
+            "title": "Administrations"
           },
           "productDesignation": {
             "$ref": "#/components/schemas/Code"
@@ -5446,8 +5454,7 @@
             "title": "Instancetype"
           },
           "quantity": {
-            "type": "string",
-            "title": "Quantity"
+            "$ref": "#/components/schemas/Quantity"
           }
         },
         "type": "object",
@@ -5484,8 +5491,7 @@
             "title": "Instancetype"
           },
           "quantity": {
-            "type": "string",
-            "title": "Quantity"
+            "$ref": "#/components/schemas/Quantity"
           }
         },
         "type": "object",

diff --git a/docs/USDM_API.yaml b/docs/USDM_API.yaml
@@ -1230,11 +1230,11 @@ components:
         instanceType:
           const: GeographicScope
           title: Instancetype
+          default: GeographicScope
       type: object
       required:
       - id
       - type
-      - instanceType
       title: GeographicScope
     GeographicScope-Output:
       properties:
@@ -1251,11 +1251,11 @@ components:
         instanceType:
           const: GeographicScope
           title: Instancetype
+          default: GeographicScope
       type: object
       required:
       - id
       - type
-      - instanceType
       title: GeographicScope
     GovernanceDate-Input:
       properties:
@@ -3122,7 +3122,10 @@ components:
           title: Codes
           default: []
         administrations:
-          $ref: '#/components/schemas/AgentAdministration-Input'
+          items:
+            $ref: '#/components/schemas/AgentAdministration-Input'
+          type: array
+          title: Administrations
         productDesignation:
           $ref: '#/components/schemas/Code'
         pharmacologicClass:
@@ -3175,7 +3178,10 @@ components:
           title: Codes
           default: []
         administrations:
-          $ref: '#/components/schemas/AgentAdministration-Output'
+          items:
+            $ref: '#/components/schemas/AgentAdministration-Output'
+          type: array
+          title: Administrations
         productDesignation:
           $ref: '#/components/schemas/Code'
         pharmacologicClass:
@@ -3522,8 +3528,7 @@ components:
           const: SubjectEnrollment
           title: Instancetype
         quantity:
-          type: string
-          title: Quantity
+          $ref: '#/components/schemas/Quantity'
       type: object
       required:
       - id
@@ -3547,8 +3552,7 @@ components:
           const: SubjectEnrollment
           title: Instancetype
         quantity:
-          type: string
-          title: Quantity
+          $ref: '#/components/schemas/Quantity'
       type: object
       required:
       - id

diff --git a/model/administration_duration.py b/model/administration_duration.py
@@ -3,8 +3,8 @@
 from typing import Literal
 
 class AdministrationDuration(ApiBaseModelWithId):
-	quantity:	Quantity
-	description: str
-	durationWillVary: bool
-	reasonDurationWillVary:	str
-	instanceType: Literal['AdministrationDuration']
+  quantity:	Quantity
+  description: str
+  durationWillVary: bool
+  reasonDurationWillVary:	str
+  instanceType: Literal['AdministrationDuration']
diff --git a/model/agent_administration.py b/model/agent_administration.py
@@ -5,8 +5,8 @@
 from typing import Literal
 
 class AgentAdministration(ApiBaseModelWithIdNameLabelAndDesc):
-	duration:	AdministrationDuration
-	dose:	Quantity
-	route:	Code
-	frequency:	Code
-	instanceType: Literal['AgentAdministration']
+  duration:	AdministrationDuration
+  dose:	Quantity
+  route:	Code
+  frequency:	Code
+  instanceType: Literal['AgentAdministration']
diff --git a/model/code.py b/model/code.py
@@ -1,5 +1,5 @@
-from .api_base_model import ApiBaseModelWithId
 from typing import Literal
+from .api_base_model import ApiBaseModelWithId
 
 class Code(ApiBaseModelWithId):
   code: str

diff --git a/model/geographic_scope.py b/model/geographic_scope.py
@@ -2,12 +2,13 @@
 from .api_base_model import ApiBaseModelWithId
 from .code import Code
 from .alias_code import AliasCode
+from .quantity import Quantity
 
 class GeographicScope(ApiBaseModelWithId):
   type: Code
   code: Union[AliasCode, None] = None
   instanceType: Literal['GeographicScope']
 
 class SubjectEnrollment(GeographicScope):
-  quantity: str
+  quantity: Quantity
   instanceType: Literal['SubjectEnrollment']
diff --git a/model/intercurrent_event.py b/model/intercurrent_event.py
@@ -1,5 +1,5 @@
-from .api_base_model import ApiBaseModelWithIdNameLabelAndDesc
 from typing import Literal
+from .api_base_model import ApiBaseModelWithIdNameLabelAndDesc
 
 class IntercurrentEvent(ApiBaseModelWithIdNameLabelAndDesc):
   strategy: str

diff --git a/model/response_code.py b/model/response_code.py
@@ -1,6 +1,6 @@
+from typing import Literal
 from .api_base_model import ApiBaseModelWithId
 from .code import Code
-from typing import Literal
 
 class ResponseCode(ApiBaseModelWithId):
   isEnabled: bool

diff --git a/model/study_identifier.py b/model/study_identifier.py
@@ -1,6 +1,6 @@
+from typing import Literal
 from .api_base_model import ApiBaseModelWithId
 from .organization import Organization
-from typing import Literal
 
 class StudyIdentifier(ApiBaseModelWithId):
   studyIdentifier: str

diff --git a/model/study_intervention.py b/model/study_intervention.py
@@ -9,7 +9,7 @@ class StudyIntervention(ApiBaseModelWithIdNameLabelAndDesc):
   type:	Code
   minimumResponseDuration: Quantity
   codes: List[Code] = []
-  administrations: AgentAdministration
+  administrations: List[AgentAdministration]
   productDesignation:	Code
   pharmacologicClass:	Code
   instanceType: Literal['StudyIntervention']