Merge pull request #5 from data4knowledge/api-sprint-5

Api sprint 5

Author: jared-schreibman-cdisc

factory/factory.py

@@ -15,7 +15,7 @@
 from model.transition_rule import *
 from model.encounter import *
 
-VERSION = "1.4 Provisional (0.28)"
+VERSION = "1.5 Provisional (0.29)"
 SYSTEM_NAME = "Simple API for DDF"
 
 tags_metadata = [

main.py

@@ -14,4 +14,4 @@ class Activity(ApiBaseModel):
   definedProcedures: List[Procedure] = []
   studyDataCollection: List[StudyData] = []
   activityIsOptional: bool
-  activityIsOptionalReason: str
+  activityIsOptionalReason: Union[str, None] = None

model/activity.py

@@ -0,0 +1,11 @@
+from .api_base_model import ApiBaseModel
+
+class Address(ApiBaseModel):
+
+  text: str
+  line: str
+  city: str
+  district: str
+  state: str
+  postalCode: str
+  country: str

model/address.py

@@ -1,14 +1,15 @@
 from typing import Union
-from uuid import UUID
 from .api_base_model import ApiBaseModel
 from .code import Code
+from .address import Address
 
 class Organisation(ApiBaseModel):
   organizationId: str
   organisationIdentifierScheme: str
   organisationIdentifier: str
   organisationName: str
   organisationType: Code
+  organizationLegalAddress: Union[Address, None] = None
 
   @classmethod
   def global_reuse(cls):

model/organisation.py

@@ -17,6 +17,8 @@ class Study(ApiBaseModel):
   studyIdentifiers: List[StudyIdentifier] = []
   studyProtocolVersions: List[StudyProtocolVersion] = []
   studyDesigns: List[StudyDesign] = []
+  studyRationale: str
+  studyAcronym: str
 
   @classmethod
   def scope_reuse(cls):

model/study.py

@@ -32,6 +32,7 @@ class StudyDesign(ApiBaseModel):
   studyEstimands: List[Estimand] = []
   encounters: List[Encounter] = []
   activities: List[Activity] = []
+  studyDesignRationale: str
 
   @classmethod
   def search(cls, store, uuid):

model/study_design.py

@@ -1,5 +1,11 @@
 from .api_base_model import ApiBaseModel
+from typing import List
+from .code import Code
 
 class StudyDesignPopulation(ApiBaseModel):
   studyDesignPopulationId: str
   populationDescription: str
+  plannedNumberOfParticipants: int
+  plannedMaximumAgeOfParticipants: str  
+  plannedMinimumAgeOfParticipants: str
+  plannedSexOfParticipants: List[Code] = []

model/study_design_population.py

@@ -1,4 +1,5 @@
 fastapi
 deta
 pyyaml
-pandas
+pandas
+Faker