lib/openactive/models/schema/dietary_supplement.rb in openactive-0.3.0 vs lib/openactive/models/schema/dietary_supplement.rb in openactive-0.4.0

@@ -1,75 +1,69 @@
 module OpenActive
   module Models
     module Schema
-      class DietarySupplement < ::OpenActive::Models::Schema::Substance
+      class DietarySupplement < ::OpenActive::Models::Schema::Product
         # @!attribute type
         # @return [String]
         def type
           "schema:DietarySupplement"
         end
 
         # @return [String]
-        define_property :target_population, as: "targetPopulation", types: [
+        define_property :active_ingredient, as: "activeIngredient", types: [
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::RecommendedDoseSchedule,URI]
-        define_property :recommended_intake, as: "recommendedIntake", types: [
-          "OpenActive::Models::Schema::RecommendedDoseSchedule",
-          "URI",
-        ]
-
-        # @return [OpenActive::Models::Schema::DrugLegalStatus,String,OpenActive::Enums::Schema::MedicalEnumeration,URI,nil]
-        define_property :legal_status, as: "legalStatus", types: [
-          "OpenActive::Models::Schema::DrugLegalStatus",
+        # @return [String]
+        define_property :target_population, as: "targetPopulation", types: [
           "string",
-          "OpenActive::Enums::Schema::MedicalEnumeration",
-          "URI",
-          "null",
         ]
 
         # @return [String]
         define_property :mechanism_of_action, as: "mechanismOfAction", types: [
           "string",
         ]
 
+        # @return [Boolean,nil]
+        define_property :is_proprietary, as: "isProprietary", types: [
+          "bool",
+          "null",
+        ]
+
         # @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",
+        # @return [OpenActive::Models::Schema::RecommendedDoseSchedule,URI]
+        define_property :recommended_intake, as: "recommendedIntake", types: [
+          "OpenActive::Models::Schema::RecommendedDoseSchedule",
+          "URI",
         ]
 
         # @return [String]
-        define_property :proprietary_name, as: "proprietaryName", types: [
+        define_property :safety_consideration, as: "safetyConsideration", types: [
           "string",
         ]
 
         # @return [String]
         define_property :non_proprietary_name, as: "nonProprietaryName", types: [
           "string",
         ]
 
-        # @return [OpenActive::Models::Schema::Organization,URI]
-        define_property :manufacturer, as: "manufacturer", types: [
-          "OpenActive::Models::Schema::Organization",
-          "URI",
+        # @return [String]
+        define_property :proprietary_name, as: "proprietaryName", types: [
+          "string",
         ]
 
-        # @return [Boolean,nil]
-        define_property :is_proprietary, as: "isProprietary", types: [
-          "bool",
-          "null",
-        ]
-
-        # @return [String]
-        define_property :safety_consideration, as: "safetyConsideration", types: [
+        # @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",
+          "null",
         ]
       end
     end
   end
 end