togai_client 1.0.1 → 1.0.2

data/lib/togai_client/models/event_schema.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 1.0
 Contact: engg@togai.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 6.1.0
+Generator version: 7.10.0
 
 =end
 
@@ -32,6 +32,17 @@ module TogaiClient
 
     attr_accessor :dimensions
 
+    attr_accessor :filter_fields
+
+    attr_accessor :feature_details
+
+    attr_accessor :enrichments
+
+    # Template used to generate event id based on event payload
+    attr_accessor :event_id_template
+
+    attr_accessor :event_level_revenue
+
     attr_accessor :created_at
 
     attr_accessor :updated_at
@@ -67,6 +78,11 @@ module TogaiClient
         :'status' => :'status',
         :'attributes' => :'attributes',
         :'dimensions' => :'dimensions',
+        :'filter_fields' => :'filterFields',
+        :'feature_details' => :'featureDetails',
+        :'enrichments' => :'enrichments',
+        :'event_id_template' => :'eventIdTemplate',
+        :'event_level_revenue' => :'eventLevelRevenue',
         :'created_at' => :'createdAt',
         :'updated_at' => :'updatedAt'
       }
@@ -86,6 +102,11 @@ module TogaiClient
         :'status' => :'String',
         :'attributes' => :'Array<EventAttributeSchema>',
         :'dimensions' => :'Array<DimensionsSchema>',
+        :'filter_fields' => :'Array<String>',
+        :'feature_details' => :'FeatureDetails',
+        :'enrichments' => :'Enrichments',
+        :'event_id_template' => :'String',
+        :'event_level_revenue' => :'Boolean',
         :'created_at' => :'Time',
         :'updated_at' => :'Time'
       }
@@ -114,6 +135,8 @@ module TogaiClient
 
       if attributes.key?(:'name')
         self.name = attributes[:'name']
+      else
+        self.name = nil
       end
 
       if attributes.key?(:'description')
@@ -122,6 +145,8 @@ module TogaiClient
 
       if attributes.key?(:'version')
         self.version = attributes[:'version']
+      else
+        self.version = nil
       end
 
       if attributes.key?(:'status')
@@ -140,6 +165,28 @@ module TogaiClient
         end
       end
 
+      if attributes.key?(:'filter_fields')
+        if (value = attributes[:'filter_fields']).is_a?(Array)
+          self.filter_fields = value
+        end
+      end
+
+      if attributes.key?(:'feature_details')
+        self.feature_details = attributes[:'feature_details']
+      end
+
+      if attributes.key?(:'enrichments')
+        self.enrichments = attributes[:'enrichments']
+      end
+
+      if attributes.key?(:'event_id_template')
+        self.event_id_template = attributes[:'event_id_template']
+      end
+
+      if attributes.key?(:'event_level_revenue')
+        self.event_level_revenue = attributes[:'event_level_revenue']
+      end
+
       if attributes.key?(:'created_at')
         self.created_at = attributes[:'created_at']
       end
@@ -152,6 +199,7 @@ module TogaiClient
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
       if @name.nil?
         invalid_properties.push('invalid value for "name", name cannot be nil.')
@@ -178,11 +226,7 @@ module TogaiClient
         invalid_properties.push('invalid value for "version", must be greater than or equal to 1.')
       end
 
-      if @attributes.nil?
-        invalid_properties.push('invalid value for "attributes", attributes cannot be nil.')
-      end
-
-      if @attributes.length > 50
+      if !@attributes.nil? && @attributes.length > 50
         invalid_properties.push('invalid value for "attributes", number of items must be less than or equal to 50.')
       end
 
@@ -196,6 +240,7 @@ module TogaiClient
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @name.nil?
       return false if @name.to_s.length > 50
       return false if @name !~ Regexp.new(/^[\sa-zA-Z0-9_-]*$/)
@@ -204,8 +249,7 @@ module TogaiClient
       return false if @version < 1
       status_validator = EnumAttributeValidator.new('String', ["DRAFT", "ACTIVE", "INACTIVE", "ARCHIVED"])
       return false unless status_validator.valid?(@status)
-      return false if @attributes.nil?
-      return false if @attributes.length > 50
+      return false if !@attributes.nil? && @attributes.length > 50
       return false if !@dimensions.nil? && @dimensions.length > 50
       true
     end
@@ -232,7 +276,11 @@ module TogaiClient
     # Custom attribute writer method with validation
     # @param [Object] description Value to be assigned
     def description=(description)
-      if !description.nil? && description.to_s.length > 255
+      if description.nil?
+        fail ArgumentError, 'description cannot be nil'
+      end
+
+      if description.to_s.length > 255
         fail ArgumentError, 'invalid value for "description", the character length must be smaller than or equal to 255.'
       end
 
@@ -280,13 +328,27 @@ module TogaiClient
     # Custom attribute writer method with validation
     # @param [Object] dimensions Value to be assigned
     def dimensions=(dimensions)
-      if !dimensions.nil? && dimensions.length > 50
+      if dimensions.nil?
+        fail ArgumentError, 'dimensions cannot be nil'
+      end
+
+      if dimensions.length > 50
         fail ArgumentError, 'invalid value for "dimensions", number of items must be less than or equal to 50.'
       end
 
       @dimensions = dimensions
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] filter_fields Value to be assigned
+    def filter_fields=(filter_fields)
+      if filter_fields.nil?
+        fail ArgumentError, 'filter_fields cannot be nil'
+      end
+
+      @filter_fields = filter_fields
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -298,6 +360,11 @@ module TogaiClient
           status == o.status &&
           attributes == o.attributes &&
           dimensions == o.dimensions &&
+          filter_fields == o.filter_fields &&
+          feature_details == o.feature_details &&
+          enrichments == o.enrichments &&
+          event_id_template == o.event_id_template &&
+          event_level_revenue == o.event_level_revenue &&
           created_at == o.created_at &&
           updated_at == o.updated_at
     end
@@ -311,44 +378,37 @@ module TogaiClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [name, description, version, status, attributes, dimensions, created_at, updated_at].hash
+      [name, description, version, status, attributes, dimensions, filter_fields, feature_details, enrichments, event_id_template, event_level_revenue, created_at, updated_at].hash
     end
 
     # Builds the object from hash
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
     def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       attributes = attributes.transform_keys(&:to_sym)
-      self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
+      transformed_hash = {}
+      openapi_types.each_pair do |key, type|
+        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = nil
         elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
         end
       end
-
-      self
+      new(transformed_hash)
     end
 
     # Deserializes the data based on type
     # @param string type Data type
     # @param string value Value to be deserialized
     # @return [Object] Deserialized data
-    def _deserialize(type, value)
+    def self._deserialize(type, value)
       case type.to_sym
       when :Time
         Time.parse(value)
@@ -383,7 +443,7 @@ module TogaiClient
       else # model
         # models (e.g. Pet) or oneOf
         klass = TogaiClient.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 

data/lib/togai_client/models/event_schema_list_data.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 1.0
 Contact: engg@togai.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 6.1.0
+Generator version: 7.10.0
 
 =end
 
@@ -31,6 +31,17 @@ module TogaiClient
 
     attr_accessor :dimensions
 
+    attr_accessor :filter_fields
+
+    attr_accessor :feature_details
+
+    attr_accessor :enrichments
+
+    # Template used to generate event id based on event payload
+    attr_accessor :event_id_template
+
+    attr_accessor :event_level_revenue
+
     attr_accessor :created_at
 
     attr_accessor :updated_at
@@ -68,6 +79,11 @@ module TogaiClient
         :'status' => :'status',
         :'attributes' => :'attributes',
         :'dimensions' => :'dimensions',
+        :'filter_fields' => :'filterFields',
+        :'feature_details' => :'featureDetails',
+        :'enrichments' => :'enrichments',
+        :'event_id_template' => :'eventIdTemplate',
+        :'event_level_revenue' => :'eventLevelRevenue',
         :'created_at' => :'createdAt',
         :'updated_at' => :'updatedAt',
         :'usage_meters_count' => :'usageMetersCount'
@@ -88,6 +104,11 @@ module TogaiClient
         :'status' => :'String',
         :'attributes' => :'Array<EventAttributeSchema>',
         :'dimensions' => :'Array<DimensionsSchema>',
+        :'filter_fields' => :'Array<String>',
+        :'feature_details' => :'FeatureDetails',
+        :'enrichments' => :'Enrichments',
+        :'event_id_template' => :'String',
+        :'event_level_revenue' => :'Boolean',
         :'created_at' => :'Time',
         :'updated_at' => :'Time',
         :'usage_meters_count' => :'Integer'
@@ -103,8 +124,7 @@ module TogaiClient
     # List of class defined in allOf (OpenAPI v3)
     def self.openapi_all_of
       [
-      :'EventSchema',
-      :'EventSchemaListDataAllOf'
+      :'EventSchema'
       ]
     end
 
@@ -125,6 +145,8 @@ module TogaiClient
 
       if attributes.key?(:'name')
         self.name = attributes[:'name']
+      else
+        self.name = nil
       end
 
       if attributes.key?(:'description')
@@ -133,6 +155,8 @@ module TogaiClient
 
       if attributes.key?(:'version')
         self.version = attributes[:'version']
+      else
+        self.version = nil
       end
 
       if attributes.key?(:'status')
@@ -151,6 +175,28 @@ module TogaiClient
         end
       end
 
+      if attributes.key?(:'filter_fields')
+        if (value = attributes[:'filter_fields']).is_a?(Array)
+          self.filter_fields = value
+        end
+      end
+
+      if attributes.key?(:'feature_details')
+        self.feature_details = attributes[:'feature_details']
+      end
+
+      if attributes.key?(:'enrichments')
+        self.enrichments = attributes[:'enrichments']
+      end
+
+      if attributes.key?(:'event_id_template')
+        self.event_id_template = attributes[:'event_id_template']
+      end
+
+      if attributes.key?(:'event_level_revenue')
+        self.event_level_revenue = attributes[:'event_level_revenue']
+      end
+
       if attributes.key?(:'created_at')
         self.created_at = attributes[:'created_at']
       end
@@ -167,6 +213,7 @@ module TogaiClient
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
       if @name.nil?
         invalid_properties.push('invalid value for "name", name cannot be nil.')
@@ -193,11 +240,7 @@ module TogaiClient
         invalid_properties.push('invalid value for "version", must be greater than or equal to 1.')
       end
 
-      if @attributes.nil?
-        invalid_properties.push('invalid value for "attributes", attributes cannot be nil.')
-      end
-
-      if @attributes.length > 50
+      if !@attributes.nil? && @attributes.length > 50
         invalid_properties.push('invalid value for "attributes", number of items must be less than or equal to 50.')
       end
 
@@ -211,6 +254,7 @@ module TogaiClient
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @name.nil?
       return false if @name.to_s.length > 50
       return false if @name !~ Regexp.new(/^[\sa-zA-Z0-9_-]*$/)
@@ -219,8 +263,7 @@ module TogaiClient
       return false if @version < 1
       status_validator = EnumAttributeValidator.new('String', ["DRAFT", "ACTIVE", "INACTIVE", "ARCHIVED"])
       return false unless status_validator.valid?(@status)
-      return false if @attributes.nil?
-      return false if @attributes.length > 50
+      return false if !@attributes.nil? && @attributes.length > 50
       return false if !@dimensions.nil? && @dimensions.length > 50
       true
     end
@@ -247,7 +290,11 @@ module TogaiClient
     # Custom attribute writer method with validation
     # @param [Object] description Value to be assigned
     def description=(description)
-      if !description.nil? && description.to_s.length > 255
+      if description.nil?
+        fail ArgumentError, 'description cannot be nil'
+      end
+
+      if description.to_s.length > 255
         fail ArgumentError, 'invalid value for "description", the character length must be smaller than or equal to 255.'
       end
 
@@ -295,13 +342,27 @@ module TogaiClient
     # Custom attribute writer method with validation
     # @param [Object] dimensions Value to be assigned
     def dimensions=(dimensions)
-      if !dimensions.nil? && dimensions.length > 50
+      if dimensions.nil?
+        fail ArgumentError, 'dimensions cannot be nil'
+      end
+
+      if dimensions.length > 50
         fail ArgumentError, 'invalid value for "dimensions", number of items must be less than or equal to 50.'
       end
 
       @dimensions = dimensions
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] filter_fields Value to be assigned
+    def filter_fields=(filter_fields)
+      if filter_fields.nil?
+        fail ArgumentError, 'filter_fields cannot be nil'
+      end
+
+      @filter_fields = filter_fields
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -313,6 +374,11 @@ module TogaiClient
           status == o.status &&
           attributes == o.attributes &&
           dimensions == o.dimensions &&
+          filter_fields == o.filter_fields &&
+          feature_details == o.feature_details &&
+          enrichments == o.enrichments &&
+          event_id_template == o.event_id_template &&
+          event_level_revenue == o.event_level_revenue &&
           created_at == o.created_at &&
           updated_at == o.updated_at &&
           usage_meters_count == o.usage_meters_count
@@ -327,44 +393,37 @@ module TogaiClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [name, description, version, status, attributes, dimensions, created_at, updated_at, usage_meters_count].hash
+      [name, description, version, status, attributes, dimensions, filter_fields, feature_details, enrichments, event_id_template, event_level_revenue, created_at, updated_at, usage_meters_count].hash
     end
 
     # Builds the object from hash
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
     def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       attributes = attributes.transform_keys(&:to_sym)
-      self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
+      transformed_hash = {}
+      openapi_types.each_pair do |key, type|
+        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = nil
         elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
         end
       end
-
-      self
+      new(transformed_hash)
     end
 
     # Deserializes the data based on type
     # @param string type Data type
     # @param string value Value to be deserialized
     # @return [Object] Deserialized data
-    def _deserialize(type, value)
+    def self._deserialize(type, value)
       case type.to_sym
       when :Time
         Time.parse(value)
@@ -399,7 +458,7 @@ module TogaiClient
       else # model
         # models (e.g. Pet) or oneOf
         klass = TogaiClient.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 

data/lib/togai_client/models/event_schema_list_paginated_response.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 1.0
 Contact: engg@togai.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 6.1.0
+Generator version: 7.10.0
 
 =end
 
@@ -83,6 +83,7 @@ module TogaiClient
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
       invalid_properties
     end
@@ -90,6 +91,7 @@ module TogaiClient
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      warn '[DEPRECATED] the `valid?` method is obsolete'
       true
     end
 
@@ -119,37 +121,30 @@ module TogaiClient
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
     def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       attributes = attributes.transform_keys(&:to_sym)
-      self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
+      transformed_hash = {}
+      openapi_types.each_pair do |key, type|
+        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = nil
         elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
         end
       end
-
-      self
+      new(transformed_hash)
     end
 
     # Deserializes the data based on type
     # @param string type Data type
     # @param string value Value to be deserialized
     # @return [Object] Deserialized data
-    def _deserialize(type, value)
+    def self._deserialize(type, value)
       case type.to_sym
       when :Time
         Time.parse(value)
@@ -184,7 +179,7 @@ module TogaiClient
       else # model
         # models (e.g. Pet) or oneOf
         klass = TogaiClient.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 

data/lib/togai_client/models/event_schema_versions_response.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 1.0
 Contact: engg@togai.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 6.1.0
+Generator version: 7.10.0
 
 =end
 
@@ -62,12 +62,15 @@ module TogaiClient
         if (value = attributes[:'data']).is_a?(Array)
           self.data = value
         end
+      else
+        self.data = nil
       end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
       if @data.nil?
         invalid_properties.push('invalid value for "data", data cannot be nil.')
@@ -79,6 +82,7 @@ module TogaiClient
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @data.nil?
       true
     end
@@ -107,37 +111,30 @@ module TogaiClient
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
     def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       attributes = attributes.transform_keys(&:to_sym)
-      self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
+      transformed_hash = {}
+      openapi_types.each_pair do |key, type|
+        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = nil
         elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
         end
       end
-
-      self
+      new(transformed_hash)
     end
 
     # Deserializes the data based on type
     # @param string type Data type
     # @param string value Value to be deserialized
     # @return [Object] Deserialized data
-    def _deserialize(type, value)
+    def self._deserialize(type, value)
       case type.to_sym
       when :Time
         Time.parse(value)
@@ -172,7 +169,7 @@ module TogaiClient
       else # model
         # models (e.g. Pet) or oneOf
         klass = TogaiClient.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end