openactive 0.3.0 → 0.4.0

data/lib/openactive/models/schema/drug.rb

@@ -1,59 +1,86 @@
 module OpenActive
   module Models
     module Schema
-      class Drug < ::OpenActive::Models::Schema::Substance
+      class Drug < ::OpenActive::Models::Schema::Product
         # @!attribute type
         # @return [String]
         def type
           "schema:Drug"
         end
 
-        # @return [OpenActive::Models::Schema::DrugPregnancyCategory,URI]
-        define_property :pregnancy_category, as: "pregnancyCategory", types: [
-          "OpenActive::Models::Schema::DrugPregnancyCategory",
+        # @return [String]
+        define_property :clinical_pharmacology, as: "clinicalPharmacology", types: [
+          "string",
+        ]
+
+        # @return [OpenActive::Models::Schema::DoseSchedule,URI]
+        define_property :dose_schedule, as: "doseSchedule", types: [
+          "OpenActive::Models::Schema::DoseSchedule",
           "URI",
         ]
 
         # @return [String]
-        define_property :overdosage, as: "overdosage", types: [
+        define_property :active_ingredient, as: "activeIngredient", types: [
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::DrugLegalStatus,String,OpenActive::Enums::Schema::MedicalEnumeration,URI,nil]
-        define_property :legal_status, as: "legalStatus", types: [
-          "OpenActive::Models::Schema::DrugLegalStatus",
-          "string",
-          "OpenActive::Enums::Schema::MedicalEnumeration",
+        # @return [OpenActive::Models::Schema::Drug,URI]
+        define_property :interacting_drug, as: "interactingDrug", types: [
+          "OpenActive::Models::Schema::Drug",
           "URI",
-          "null",
         ]
 
         # @return [String]
-        define_property :mechanism_of_action, as: "mechanismOfAction", types: [
+        define_property :overdosage, as: "overdosage", types: [
           "string",
         ]
 
+        # @return [OpenActive::Models::Schema::DrugStrength,URI]
+        define_property :available_strength, as: "availableStrength", types: [
+          "OpenActive::Models::Schema::DrugStrength",
+          "URI",
+        ]
+
+        # @return [OpenActive::Models::Schema::DrugPrescriptionStatus,String,URI]
+        define_property :prescription_status, as: "prescriptionStatus", types: [
+          "OpenActive::Models::Schema::DrugPrescriptionStatus",
+          "string",
+          "URI",
+        ]
+
         # @return [String]
-        define_property :clinical_pharmacology, as: "clinicalPharmacology", types: [
+        define_property :administration_route, as: "administrationRoute", types: [
           "string",
         ]
 
         # @return [String]
-        define_property :rxcui, as: "rxcui", types: [
+        define_property :alcohol_warning, as: "alcoholWarning", types: [
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::Drug,URI]
-        define_property :interacting_drug, as: "interactingDrug", types: [
-          "OpenActive::Models::Schema::Drug",
+        # @return [OpenActive::Models::Schema::DrugClass,URI]
+        define_property :drug_class, as: "drugClass", types: [
+          "OpenActive::Models::Schema::DrugClass",
+          "URI",
+        ]
+
+        # @return [OpenActive::Models::Schema::DrugPregnancyCategory,URI]
+        define_property :pregnancy_category, as: "pregnancyCategory", types: [
+          "OpenActive::Models::Schema::DrugPregnancyCategory",
           "URI",
         ]
 
         # @return [String]
-        define_property :dosage_form, as: "dosageForm", types: [
+        define_property :mechanism_of_action, as: "mechanismOfAction", types: [
           "string",
         ]
 
+        # @return [Boolean,nil]
+        define_property :is_proprietary, as: "isProprietary", types: [
+          "bool",
+          "null",
+        ]
+
         # @return [URI]
         define_property :label_details, as: "labelDetails", types: [
           "URI",
@@ -65,43 +92,40 @@ module OpenActive
           "URI",
         ]
 
+        # @return [URI,String]
+        define_property :warning, as: "warning", types: [
+          "URI",
+          "string",
+        ]
+
         # @return [String]
-        define_property :active_ingredient, as: "activeIngredient", types: [
+        define_property :drug_unit, as: "drugUnit", types: [
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::Drug,URI]
-        define_property :related_drug, as: "relatedDrug", types: [
-          "OpenActive::Models::Schema::Drug",
+        # @return [URI]
+        define_property :prescribing_info, as: "prescribingInfo", types: [
           "URI",
         ]
 
         # @return [String]
-        define_property :administration_route, as: "administrationRoute", types: [
+        define_property :dosage_form, as: "dosageForm", types: [
           "string",
         ]
 
         # @return [String]
-        define_property :drug_unit, as: "drugUnit", types: [
+        define_property :pregnancy_warning, as: "pregnancyWarning", types: [
           "string",
         ]
 
         # @return [String]
-        define_property :food_warning, as: "foodWarning", types: [
-          "string",
-        ]
-
-        # @return [URI,String]
-        define_property :warning, as: "warning", types: [
-          "URI",
+        define_property :non_proprietary_name, as: "nonProprietaryName", types: [
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::DrugPrescriptionStatus,String,URI]
-        define_property :prescription_status, as: "prescriptionStatus", types: [
-          "OpenActive::Models::Schema::DrugPrescriptionStatus",
+        # @return [String]
+        define_property :clincal_pharmacology, as: "clincalPharmacology", types: [
           "string",
-          "URI",
         ]
 
         # @return [String]
@@ -109,45 +133,37 @@ module OpenActive
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::DrugClass,URI]
-        define_property :drug_class, as: "drugClass", types: [
-          "OpenActive::Models::Schema::DrugClass",
-          "URI",
-        ]
-
-        # @return [URI]
-        define_property :prescribing_info, as: "prescribingInfo", types: [
-          "URI",
-        ]
-
-        # @return [OpenActive::Models::Schema::HealthInsurancePlan,URI]
-        define_property :included_in_health_insurance_plan, as: "includedInHealthInsurancePlan", types: [
-          "OpenActive::Models::Schema::HealthInsurancePlan",
+        # @return [OpenActive::Models::Schema::Drug,URI]
+        define_property :related_drug, as: "relatedDrug", types: [
+          "OpenActive::Models::Schema::Drug",
           "URI",
         ]
 
         # @return [String]
-        define_property :non_proprietary_name, as: "nonProprietaryName", types: [
+        define_property :food_warning, as: "foodWarning", types: [
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::Organization,URI]
-        define_property :manufacturer, as: "manufacturer", types: [
-          "OpenActive::Models::Schema::Organization",
+        # @return [OpenActive::Models::Schema::DrugLegalStatus,OpenActive::Enums::Schema::MedicalEnumeration,String,URI,nil]
+        define_property :legal_status, as: "legalStatus", types: [
+          "OpenActive::Models::Schema::DrugLegalStatus",
+          "OpenActive::Enums::Schema::MedicalEnumeration",
+          "string",
           "URI",
-        ]
-
-        # @return [Boolean,nil]
-        define_property :is_proprietary, as: "isProprietary", types: [
-          "bool",
           "null",
         ]
 
         # @return [String]
-        define_property :clincal_pharmacology, as: "clincalPharmacology", types: [
+        define_property :rxcui, as: "rxcui", types: [
           "string",
         ]
 
+        # @return [OpenActive::Models::Schema::HealthInsurancePlan,URI]
+        define_property :included_in_health_insurance_plan, as: "includedInHealthInsurancePlan", types: [
+          "OpenActive::Models::Schema::HealthInsurancePlan",
+          "URI",
+        ]
+
         # @return [Boolean,nil]
         define_property :is_available_generically, as: "isAvailableGenerically", types: [
           "bool",
@@ -158,28 +174,6 @@ module OpenActive
         define_property :breastfeeding_warning, as: "breastfeedingWarning", types: [
           "string",
         ]
-
-        # @return [String]
-        define_property :pregnancy_warning, as: "pregnancyWarning", types: [
-          "string",
-        ]
-
-        # @return [String]
-        define_property :alcohol_warning, as: "alcoholWarning", types: [
-          "string",
-        ]
-
-        # @return [OpenActive::Models::Schema::DoseSchedule,URI]
-        define_property :dose_schedule, as: "doseSchedule", types: [
-          "OpenActive::Models::Schema::DoseSchedule",
-          "URI",
-        ]
-
-        # @return [OpenActive::Models::Schema::DrugStrength,URI]
-        define_property :available_strength, as: "availableStrength", types: [
-          "OpenActive::Models::Schema::DrugStrength",
-          "URI",
-        ]
       end
     end
   end

data/lib/openactive/models/schema/drug_cost.rb

@@ -8,10 +8,9 @@ module OpenActive
           "schema:DrugCost"
         end
 
-        # @return [OpenActive::Models::Schema::AdministrativeArea,URI]
-        define_property :applicable_location, as: "applicableLocation", types: [
-          "OpenActive::Models::Schema::AdministrativeArea",
-          "URI",
+        # @return [String]
+        define_property :cost_currency, as: "costCurrency", types: [
+          "string",
         ]
 
         # @return [BigDecimal,String,OpenActive::Enums::Schema::QualitativeValue,nil]
@@ -22,10 +21,9 @@ module OpenActive
           "null",
         ]
 
-        # @return [OpenActive::Models::Schema::DrugCostCategory,URI]
-        define_property :cost_category, as: "costCategory", types: [
-          "OpenActive::Models::Schema::DrugCostCategory",
-          "URI",
+        # @return [String]
+        define_property :cost_origin, as: "costOrigin", types: [
+          "string",
         ]
 
         # @return [String]
@@ -33,14 +31,16 @@ module OpenActive
           "string",
         ]
 
-        # @return [String]
-        define_property :cost_currency, as: "costCurrency", types: [
-          "string",
+        # @return [OpenActive::Models::Schema::AdministrativeArea,URI]
+        define_property :applicable_location, as: "applicableLocation", types: [
+          "OpenActive::Models::Schema::AdministrativeArea",
+          "URI",
         ]
 
-        # @return [String]
-        define_property :cost_origin, as: "costOrigin", types: [
-          "string",
+        # @return [OpenActive::Models::Schema::DrugCostCategory,URI]
+        define_property :cost_category, as: "costCategory", types: [
+          "OpenActive::Models::Schema::DrugCostCategory",
+          "URI",
         ]
       end
     end

data/lib/openactive/models/schema/drug_strength.rb

@@ -8,23 +8,11 @@ module OpenActive
           "schema:DrugStrength"
         end
 
-        # @return [OpenActive::Models::Schema::AdministrativeArea,URI]
-        define_property :available_in, as: "availableIn", types: [
-          "OpenActive::Models::Schema::AdministrativeArea",
-          "URI",
-        ]
-
         # @return [String]
         define_property :strength_unit, as: "strengthUnit", types: [
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::MaximumDoseSchedule,URI]
-        define_property :maximum_intake, as: "maximumIntake", types: [
-          "OpenActive::Models::Schema::MaximumDoseSchedule",
-          "URI",
-        ]
-
         # @return [String]
         define_property :active_ingredient, as: "activeIngredient", types: [
           "string",
@@ -35,6 +23,18 @@ module OpenActive
           "Number",
           "null",
         ]
+
+        # @return [OpenActive::Models::Schema::MaximumDoseSchedule,URI]
+        define_property :maximum_intake, as: "maximumIntake", types: [
+          "OpenActive::Models::Schema::MaximumDoseSchedule",
+          "URI",
+        ]
+
+        # @return [OpenActive::Models::Schema::AdministrativeArea,URI]
+        define_property :available_in, as: "availableIn", types: [
+          "OpenActive::Models::Schema::AdministrativeArea",
+          "URI",
+        ]
       end
     end
   end

data/lib/openactive/models/schema/education_event.rb

@@ -8,13 +8,6 @@ module OpenActive
           "schema:EducationEvent"
         end
 
-        # @return [OpenActive::Models::Schema::DefinedTerm,String,URI]
-        define_property :teaches, as: "teaches", types: [
-          "OpenActive::Models::Schema::DefinedTerm",
-          "string",
-          "URI",
-        ]
-
         # @return [URI,OpenActive::Models::Schema::DefinedTerm,String]
         define_property :educational_level, as: "educationalLevel", types: [
           "URI",
@@ -28,6 +21,13 @@ module OpenActive
           "OpenActive::Models::Schema::DefinedTerm",
           "URI",
         ]
+
+        # @return [OpenActive::Models::Schema::DefinedTerm,String,URI]
+        define_property :teaches, as: "teaches", types: [
+          "OpenActive::Models::Schema::DefinedTerm",
+          "string",
+          "URI",
+        ]
       end
     end
   end

data/lib/openactive/models/schema/educational_occupational_credential.rb

@@ -8,13 +8,6 @@ module OpenActive
           "schema:EducationalOccupationalCredential"
         end
 
-        # @return [ActiveSupport::Duration,URI,nil]
-        define_property :valid_for, as: "validFor", types: [
-          "DateInterval",
-          "URI",
-          "null",
-        ]
-
         # @return [URI,OpenActive::Models::Schema::DefinedTerm,String]
         define_property :educational_level, as: "educationalLevel", types: [
           "URI",
@@ -22,6 +15,18 @@ module OpenActive
           "string",
         ]
 
+        # @return [OpenActive::Models::Schema::Organization,URI]
+        define_property :recognized_by, as: "recognizedBy", types: [
+          "OpenActive::Models::Schema::Organization",
+          "URI",
+        ]
+
+        # @return [OpenActive::Models::Schema::AdministrativeArea,URI]
+        define_property :valid_in, as: "validIn", types: [
+          "OpenActive::Models::Schema::AdministrativeArea",
+          "URI",
+        ]
+
         # @return [URI,OpenActive::Models::Schema::DefinedTerm,String]
         define_property :credential_category, as: "credentialCategory", types: [
           "URI",
@@ -29,23 +34,18 @@ module OpenActive
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::Organization,URI]
-        define_property :recognized_by, as: "recognizedBy", types: [
-          "OpenActive::Models::Schema::Organization",
+        # @return [ActiveSupport::Duration,URI,nil]
+        define_property :valid_for, as: "validFor", types: [
+          "DateInterval",
           "URI",
+          "null",
         ]
 
-        # @return [String,OpenActive::Models::Schema::DefinedTerm,URI]
+        # @return [URI,OpenActive::Models::Schema::DefinedTerm,String]
         define_property :competency_required, as: "competencyRequired", types: [
-          "string",
-          "OpenActive::Models::Schema::DefinedTerm",
-          "URI",
-        ]
-
-        # @return [OpenActive::Models::Schema::AdministrativeArea,URI]
-        define_property :valid_in, as: "validIn", types: [
-          "OpenActive::Models::Schema::AdministrativeArea",
           "URI",
+          "OpenActive::Models::Schema::DefinedTerm",
+          "string",
         ]
       end
     end