ElasticEmail 4.0.22 → 4.0.24

data/lib/ElasticEmail/models/email_data.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 4.0.0
 Contact: support@elasticemail.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 6.3.0
+Generator version: 7.7.0
 
 =end
 
@@ -84,6 +84,7 @@ module ElasticEmail
     # 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
@@ -91,6 +92,7 @@ module ElasticEmail
     # 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
 
@@ -120,37 +122,30 @@ module ElasticEmail
     # @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)
@@ -185,7 +180,7 @@ module ElasticEmail
       else # model
         # models (e.g. Pet) or oneOf
         klass = ElasticEmail.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/ElasticEmail/models/{contact_history.rb → email_job_failed_status.rb}

@@ -1,12 +1,12 @@
 =begin
 #Elastic Email REST API
 
-#This API is based on the REST API architecture, allowing the user to easily manage their data with this resource-based approach.    Every API call is established on which specific request type (GET, POST, PUT, DELETE) will be used.    The API has a limit of 20 concurrent connections and a hard timeout of 600 seconds per request.    To start using this API, you will need your Access Token (available <a target=\"_blank\" href=\"https://elasticemail.com/account#/settings/new/manage-api\">here</a>). Remember to keep it safe. Required access levels are listed in the given request’s description.    Downloadable library clients can be found in our Github repository <a target=\"_blank\" href=\"https://github.com/ElasticEmail?tab=repositories&q=%22rest+api%22+in%3Areadme\">here</a>
+#This API is based on the REST API architecture, allowing the user to easily manage their data with this resource-based approach.    Every API call is established on which specific request type (GET, POST, PUT, DELETE) will be used.    The API has a limit of 20 concurrent connections and a hard timeout of 600 seconds per request.    To start using this API, you will need your Access Token (available <a target=\"_blank\" href=\"https://app.elasticemail.com/marketing/settings/new/manage-api\">here</a>). Remember to keep it safe. Required access levels are listed in the given request’s description.    Downloadable library clients can be found in our Github repository <a target=\"_blank\" href=\"https://github.com/ElasticEmail?tab=repositories&q=%22rest+api%22+in%3Areadme\">here</a>
 
 The version of the OpenAPI document: 4.0.0
 Contact: support@elasticemail.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 6.0.0
+Generator version: 7.7.0
 
 =end
 
@@ -14,37 +14,23 @@ require 'date'
 require 'time'
 
 module ElasticEmail
-  class ContactHistory
-    attr_accessor :event_type
+  class EmailJobFailedStatus
+    attr_accessor :address
 
-    # Formatted date of event.
-    attr_accessor :event_date
+    attr_accessor :error
 
-    # Name of channel this event occured on
-    attr_accessor :channel_name
+    # RFC Error code
+    attr_accessor :error_code
 
-    # Name of template this event occured on
-    attr_accessor :template_name
-
-    # IP Address of the event.
-    attr_accessor :ip_address
-
-    # Country of the event.
-    attr_accessor :country
-
-    # Additional information about the event
-    attr_accessor :data
+    attr_accessor :category
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'event_type' => :'EventType',
-        :'event_date' => :'EventDate',
-        :'channel_name' => :'ChannelName',
-        :'template_name' => :'TemplateName',
-        :'ip_address' => :'IPAddress',
-        :'country' => :'Country',
-        :'data' => :'Data'
+        :'address' => :'Address',
+        :'error' => :'Error',
+        :'error_code' => :'ErrorCode',
+        :'category' => :'Category'
       }
     end
 
@@ -56,13 +42,10 @@ module ElasticEmail
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'event_type' => :'ContactHistEventType',
-        :'event_date' => :'Time',
-        :'channel_name' => :'String',
-        :'template_name' => :'String',
-        :'ip_address' => :'String',
-        :'country' => :'String',
-        :'data' => :'String'
+        :'address' => :'String',
+        :'error' => :'String',
+        :'error_code' => :'Integer',
+        :'category' => :'String'
       }
     end
 
@@ -76,51 +59,38 @@ module ElasticEmail
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `ElasticEmail::ContactHistory` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `ElasticEmail::EmailJobFailedStatus` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h|
         if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `ElasticEmail::ContactHistory`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `ElasticEmail::EmailJobFailedStatus`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'event_type')
-        self.event_type = attributes[:'event_type']
-      else
-        self.event_type = 'Opened'
-      end
-
-      if attributes.key?(:'event_date')
-        self.event_date = attributes[:'event_date']
-      end
-
-      if attributes.key?(:'channel_name')
-        self.channel_name = attributes[:'channel_name']
+      if attributes.key?(:'address')
+        self.address = attributes[:'address']
       end
 
-      if attributes.key?(:'template_name')
-        self.template_name = attributes[:'template_name']
+      if attributes.key?(:'error')
+        self.error = attributes[:'error']
       end
 
-      if attributes.key?(:'ip_address')
-        self.ip_address = attributes[:'ip_address']
+      if attributes.key?(:'error_code')
+        self.error_code = attributes[:'error_code']
       end
 
-      if attributes.key?(:'country')
-        self.country = attributes[:'country']
-      end
-
-      if attributes.key?(:'data')
-        self.data = attributes[:'data']
+      if attributes.key?(:'category')
+        self.category = attributes[:'category']
       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
       invalid_properties
     end
@@ -128,6 +98,7 @@ module ElasticEmail
     # 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
 
@@ -136,13 +107,10 @@ module ElasticEmail
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          event_type == o.event_type &&
-          event_date == o.event_date &&
-          channel_name == o.channel_name &&
-          template_name == o.template_name &&
-          ip_address == o.ip_address &&
-          country == o.country &&
-          data == o.data
+          address == o.address &&
+          error == o.error &&
+          error_code == o.error_code &&
+          category == o.category
     end
 
     # @see the `==` method
@@ -154,44 +122,37 @@ module ElasticEmail
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [event_type, event_date, channel_name, template_name, ip_address, country, data].hash
+      [address, error, error_code, category].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)
@@ -226,7 +187,7 @@ module ElasticEmail
       else # model
         # models (e.g. Pet) or oneOf
         klass = ElasticEmail.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