mailslurp_client 15.13.9 → 15.13.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e18ac1619c4a9b445983aa337c366510480c03b8ef8e335dbdba863caa46cf1
-  data.tar.gz: 61b14a3b5bafc1036a183eab1aab49745191593d2bf35f0d560febc1e8bd62e3
+  metadata.gz: 2cf77772ab41a7e92d42d9167aac1c52b28468e8fcae2824953026e0b24aad13
+  data.tar.gz: bac2419363ae1530c45069d5d53880355ddc075c216b1e827af7976c04b73622
 SHA512:
-  metadata.gz: c4ce5e749827b5c337a37ee197538c5d64146a2ef908e3d98e8e9b02331ad3417ae2d7bf9e8984172f84fd9c61f795c1c8caf164644e7c0ea0d89e3329bd549c
-  data.tar.gz: ff3f51b0894ddb5dd7b079627cdc197239d28cd55d092be8d0cf24fae5e7bb6fa2b33c484540ce6b4af5a1612948b33c7177cd133d56424a977c29f7f9a8137f
+  metadata.gz: 31c53e9043de0f675c94b837dada379ac223f236d8ccf06caefff087533930684477ead3b5342ed32b1943ecb9db56f6dacd851806d1de175a34a09521fc72f0
+  data.tar.gz: 21c88d97cc0c755d338f5c08ca356009598e57ba37afeaa6cfec72bc7a6baf2a58daac71742446d9e549fcfe2a2b3154fab8a742ce0e8705d169a6584bdee9fb

data/lib/mailslurp_client/api/api_user_controller_api.rb

@@ -19,87 +19,52 @@ module MailSlurpClient
     def initialize(api_client = ApiClient.default)
       @api_client = api_client
     end
+    # Utility function to extract properties from JSON objects in language where this is cumbersome.
+    # @param property [String] JSON property name or dot separated path selector such as `a.b.c`
+    # @param body [Object] 
     # @param [Hash] opts the optional parameters
     # @return [String]
-    def get_smtp_password(opts = {})
-      data, _status_code, _headers = get_smtp_password_with_http_info(opts)
+    def get_json_property_as_string(property, body, opts = {})
+      data, _status_code, _headers = get_json_property_as_string_with_http_info(property, body, opts)
       data
     end
 
+    # Utility function to extract properties from JSON objects in language where this is cumbersome.
+    # @param property [String] JSON property name or dot separated path selector such as `a.b.c`
+    # @param body [Object] 
     # @param [Hash] opts the optional parameters
     # @return [Array<(String, Integer, Hash)>] String data, response status code and response headers
-    def get_smtp_password_with_http_info(opts = {})
+    def get_json_property_as_string_with_http_info(property, body, opts = {})
       if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: ApiUserControllerApi.get_smtp_password ...'
+        @api_client.config.logger.debug 'Calling API: ApiUserControllerApi.get_json_property_as_string ...'
       end
-      # resource path
-      local_var_path = '/user/smtp/password'
-
-      # query parameters
-      query_params = opts[:query_params] || {}
-
-      # header parameters
-      header_params = opts[:header_params] || {}
-      # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['*/*'])
-
-      # form parameters
-      form_params = opts[:form_params] || {}
-
-      # http body (model)
-      post_body = opts[:body] 
-
-      # return_type
-      return_type = opts[:return_type] || 'String' 
-
-      # auth_names
-      auth_names = opts[:auth_names] || ['API_KEY']
-
-      new_options = opts.merge(
-        :header_params => header_params,
-        :query_params => query_params,
-        :form_params => form_params,
-        :body => post_body,
-        :auth_names => auth_names,
-        :return_type => return_type
-      )
-
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
-      if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: ApiUserControllerApi#get_smtp_password\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      # verify the required parameter 'property' is set
+      if @api_client.config.client_side_validation && property.nil?
+        fail ArgumentError, "Missing the required parameter 'property' when calling ApiUserControllerApi.get_json_property_as_string"
       end
-      return data, status_code, headers
-    end
-
-    # @param [Hash] opts the optional parameters
-    # @return [String]
-    def get_smtp_username(opts = {})
-      data, _status_code, _headers = get_smtp_username_with_http_info(opts)
-      data
-    end
-
-    # @param [Hash] opts the optional parameters
-    # @return [Array<(String, Integer, Hash)>] String data, response status code and response headers
-    def get_smtp_username_with_http_info(opts = {})
-      if @api_client.config.debugging
-        @api_client.config.logger.debug 'Calling API: ApiUserControllerApi.get_smtp_username ...'
+      # verify the required parameter 'body' is set
+      if @api_client.config.client_side_validation && body.nil?
+        fail ArgumentError, "Missing the required parameter 'body' when calling ApiUserControllerApi.get_json_property_as_string"
       end
       # resource path
-      local_var_path = '/user/smtp/username'
+      local_var_path = '/user/json/pluck'
 
       # query parameters
       query_params = opts[:query_params] || {}
+      query_params[:'property'] = property
 
       # header parameters
       header_params = opts[:header_params] || {}
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['*/*'])
+      # HTTP header 'Content-Type'
+      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:body] || @api_client.object_to_http_body(body) 
 
       # return_type
       return_type = opts[:return_type] || 'String' 
@@ -116,9 +81,9 @@ module MailSlurpClient
         :return_type => return_type
       )
 
-      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
       if @api_client.config.debugging
-        @api_client.config.logger.debug "API called: ApiUserControllerApi#get_smtp_username\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+        @api_client.config.logger.debug "API called: ApiUserControllerApi#get_json_property_as_string\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
       end
       return data, status_code, headers
     end

data/lib/mailslurp_client/api/email_controller_api.rb

@@ -1925,42 +1925,39 @@ module MailSlurpClient
 
     # Send email
     # Alias for `InboxController.sendEmail` method - see original method for full details. Sends an email from a given inbox that you have created. If no inbox is supplied a random inbox will be created for you and used to send the email.
-    # @param inbox_id [String] ID of the inbox you want to send the email from
     # @param send_email_options [SendEmailOptions] 
     # @param [Hash] opts the optional parameters
+    # @option opts [String] :inbox_id ID of the inbox you want to send the email from
     # @option opts [Boolean] :use_domain_pool Use domain pool. Optionally create inbox to send from using the mailslurp domain pool.
     # @option opts [Boolean] :virtual_send Optionally create inbox to send from that is a virtual inbox and won't send to external addresses
     # @return [nil]
-    def send_email_source_optional(inbox_id, send_email_options, opts = {})
-      send_email_source_optional_with_http_info(inbox_id, send_email_options, opts)
+    def send_email_source_optional(send_email_options, opts = {})
+      send_email_source_optional_with_http_info(send_email_options, opts)
       nil
     end
 
     # Send email
     # Alias for `InboxController.sendEmail` method - see original method for full details. Sends an email from a given inbox that you have created. If no inbox is supplied a random inbox will be created for you and used to send the email.
-    # @param inbox_id [String] ID of the inbox you want to send the email from
     # @param send_email_options [SendEmailOptions] 
     # @param [Hash] opts the optional parameters
+    # @option opts [String] :inbox_id ID of the inbox you want to send the email from
     # @option opts [Boolean] :use_domain_pool Use domain pool. Optionally create inbox to send from using the mailslurp domain pool.
     # @option opts [Boolean] :virtual_send Optionally create inbox to send from that is a virtual inbox and won't send to external addresses
     # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
-    def send_email_source_optional_with_http_info(inbox_id, send_email_options, opts = {})
+    def send_email_source_optional_with_http_info(send_email_options, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: EmailControllerApi.send_email_source_optional ...'
       end
-      # verify the required parameter 'inbox_id' is set
-      if @api_client.config.client_side_validation && inbox_id.nil?
-        fail ArgumentError, "Missing the required parameter 'inbox_id' when calling EmailControllerApi.send_email_source_optional"
-      end
       # verify the required parameter 'send_email_options' is set
       if @api_client.config.client_side_validation && send_email_options.nil?
         fail ArgumentError, "Missing the required parameter 'send_email_options' when calling EmailControllerApi.send_email_source_optional"
       end
       # resource path
-      local_var_path = '/emails'.sub('{' + 'inboxId' + '}', CGI.escape(inbox_id.to_s))
+      local_var_path = '/emails'
 
       # query parameters
       query_params = opts[:query_params] || {}
+      query_params[:'inboxId'] = opts[:'inbox_id'] if !opts[:'inbox_id'].nil?
       query_params[:'useDomainPool'] = opts[:'use_domain_pool'] if !opts[:'use_domain_pool'].nil?
       query_params[:'virtualSend'] = opts[:'virtual_send'] if !opts[:'virtual_send'].nil?
 

data/lib/mailslurp_client/api/inbox_controller_api.rb

@@ -1510,7 +1510,7 @@ module MailSlurpClient
     end
 
     # List Inboxes and email addresses
-    # List the inboxes you have created. Note use of the more advanced `getAllEmails` is recommended and allows paginated access using a limit and sort parameter.
+    # List the inboxes you have created. Note use of the more advanced `getAllInboxes` is recommended and allows paginated access using a limit and sort parameter.
     # @param [Hash] opts the optional parameters
     # @option opts [Integer] :size Optional result size limit. Note an automatic limit of 100 results is applied. See the paginated `getAllEmails` for larger queries. (default to 100)
     # @option opts [String] :sort Optional createdAt sort direction ASC or DESC (default to 'ASC')
@@ -1523,7 +1523,7 @@ module MailSlurpClient
     end
 
     # List Inboxes and email addresses
-    # List the inboxes you have created. Note use of the more advanced `getAllEmails` is recommended and allows paginated access using a limit and sort parameter.
+    # List the inboxes you have created. Note use of the more advanced `getAllInboxes` is recommended and allows paginated access using a limit and sort parameter.
     # @param [Hash] opts the optional parameters
     # @option opts [Integer] :size Optional result size limit. Note an automatic limit of 100 results is applied. See the paginated `getAllEmails` for larger queries.
     # @option opts [String] :sort Optional createdAt sort direction ASC or DESC

data/lib/mailslurp_client/api/webhook_controller_api.rb

@@ -1035,6 +1035,60 @@ module MailSlurpClient
       return data, status_code, headers
     end
 
+    # Get webhook test payload for delivery status event
+    # @param [Hash] opts the optional parameters
+    # @return [WebhookDeliveryStatusPayload]
+    def get_test_webhook_payload_delivery_status(opts = {})
+      data, _status_code, _headers = get_test_webhook_payload_delivery_status_with_http_info(opts)
+      data
+    end
+
+    # Get webhook test payload for delivery status event
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(WebhookDeliveryStatusPayload, Integer, Hash)>] WebhookDeliveryStatusPayload data, response status code and response headers
+    def get_test_webhook_payload_delivery_status_with_http_info(opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: WebhookControllerApi.get_test_webhook_payload_delivery_status ...'
+      end
+      # resource path
+      local_var_path = '/webhooks/test/delivery-status-payload'
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['*/*'])
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] || 'WebhookDeliveryStatusPayload' 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['API_KEY']
+
+      new_options = opts.merge(
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: WebhookControllerApi#get_test_webhook_payload_delivery_status\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Get webhook test payload for email opened event
     # @param [Hash] opts the optional parameters
     # @return [WebhookEmailOpenedPayload]
@@ -1365,6 +1419,60 @@ module MailSlurpClient
       return data, status_code, headers
     end
 
+    # Get webhook test payload for new sms event
+    # @param [Hash] opts the optional parameters
+    # @return [WebhookNewSmsPayload]
+    def get_test_webhook_payload_new_sms(opts = {})
+      data, _status_code, _headers = get_test_webhook_payload_new_sms_with_http_info(opts)
+      data
+    end
+
+    # Get webhook test payload for new sms event
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(WebhookNewSmsPayload, Integer, Hash)>] WebhookNewSmsPayload data, response status code and response headers
+    def get_test_webhook_payload_new_sms_with_http_info(opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: WebhookControllerApi.get_test_webhook_payload_new_sms ...'
+      end
+      # resource path
+      local_var_path = '/webhooks/test/new-sms-payload'
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['*/*'])
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:body] 
+
+      # return_type
+      return_type = opts[:return_type] || 'WebhookNewSmsPayload' 
+
+      # auth_names
+      auth_names = opts[:auth_names] || ['API_KEY']
+
+      new_options = opts.merge(
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: WebhookControllerApi#get_test_webhook_payload_new_sms\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Get a webhook
     # @param webhook_id [String] 
     # @param [Hash] opts the optional parameters

data/lib/mailslurp_client/models/alias_projection.rb

@@ -19,29 +19,29 @@ module MailSlurpClient
 
     attr_accessor :id
 
+    attr_accessor :inbox_id
+
     attr_accessor :user_id
 
     attr_accessor :email_address
 
-    attr_accessor :inbox_id
-
     attr_accessor :created_at
 
-    attr_accessor :updated_at
-
     attr_accessor :use_threads
 
+    attr_accessor :updated_at
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'name' => :'name',
         :'id' => :'id',
+        :'inbox_id' => :'inboxId',
         :'user_id' => :'userId',
         :'email_address' => :'emailAddress',
-        :'inbox_id' => :'inboxId',
         :'created_at' => :'createdAt',
-        :'updated_at' => :'updatedAt',
-        :'use_threads' => :'useThreads'
+        :'use_threads' => :'useThreads',
+        :'updated_at' => :'updatedAt'
       }
     end
 
@@ -50,12 +50,12 @@ module MailSlurpClient
       {
         :'name' => :'String',
         :'id' => :'String',
+        :'inbox_id' => :'String',
         :'user_id' => :'String',
         :'email_address' => :'String',
-        :'inbox_id' => :'String',
         :'created_at' => :'DateTime',
-        :'updated_at' => :'DateTime',
-        :'use_threads' => :'Boolean'
+        :'use_threads' => :'Boolean',
+        :'updated_at' => :'DateTime'
       }
     end
 
@@ -88,6 +88,10 @@ module MailSlurpClient
         self.id = attributes[:'id']
       end
 
+      if attributes.key?(:'inbox_id')
+        self.inbox_id = attributes[:'inbox_id']
+      end
+
       if attributes.key?(:'user_id')
         self.user_id = attributes[:'user_id']
       end
@@ -96,21 +100,17 @@ module MailSlurpClient
         self.email_address = attributes[:'email_address']
       end
 
-      if attributes.key?(:'inbox_id')
-        self.inbox_id = attributes[:'inbox_id']
-      end
-
       if attributes.key?(:'created_at')
         self.created_at = attributes[:'created_at']
       end
 
-      if attributes.key?(:'updated_at')
-        self.updated_at = attributes[:'updated_at']
-      end
-
       if attributes.key?(:'use_threads')
         self.use_threads = attributes[:'use_threads']
       end
+
+      if attributes.key?(:'updated_at')
+        self.updated_at = attributes[:'updated_at']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -121,6 +121,10 @@ module MailSlurpClient
         invalid_properties.push('invalid value for "id", id cannot be nil.')
       end
 
+      if @inbox_id.nil?
+        invalid_properties.push('invalid value for "inbox_id", inbox_id cannot be nil.')
+      end
+
       if @user_id.nil?
         invalid_properties.push('invalid value for "user_id", user_id cannot be nil.')
       end
@@ -129,10 +133,6 @@ module MailSlurpClient
         invalid_properties.push('invalid value for "email_address", email_address cannot be nil.')
       end
 
-      if @inbox_id.nil?
-        invalid_properties.push('invalid value for "inbox_id", inbox_id cannot be nil.')
-      end
-
       if @created_at.nil?
         invalid_properties.push('invalid value for "created_at", created_at cannot be nil.')
       end
@@ -148,9 +148,9 @@ module MailSlurpClient
     # @return true if the model is valid
     def valid?
       return false if @id.nil?
+      return false if @inbox_id.nil?
       return false if @user_id.nil?
       return false if @email_address.nil?
-      return false if @inbox_id.nil?
       return false if @created_at.nil?
       return false if @updated_at.nil?
       true
@@ -163,12 +163,12 @@ module MailSlurpClient
       self.class == o.class &&
           name == o.name &&
           id == o.id &&
+          inbox_id == o.inbox_id &&
           user_id == o.user_id &&
           email_address == o.email_address &&
-          inbox_id == o.inbox_id &&
           created_at == o.created_at &&
-          updated_at == o.updated_at &&
-          use_threads == o.use_threads
+          use_threads == o.use_threads &&
+          updated_at == o.updated_at
     end
 
     # @see the `==` method
@@ -180,7 +180,7 @@ module MailSlurpClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [name, id, user_id, email_address, inbox_id, created_at, updated_at, use_threads].hash
+      [name, id, inbox_id, user_id, email_address, created_at, use_threads, updated_at].hash
     end
 
     # Builds the object from hash

data/lib/mailslurp_client/models/attachment_projection.rb

@@ -20,6 +20,9 @@ module MailSlurpClient
     # Content length of attachment in bytes
     attr_accessor :content_length
 
+    # Content type of attachment.
+    attr_accessor :content_type
+
     attr_accessor :user_id
 
     # Attachment ID
@@ -29,19 +32,16 @@ module MailSlurpClient
 
     attr_accessor :updated_at
 
-    # Content type of attachment.
-    attr_accessor :content_type
-
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'name' => :'name',
         :'content_length' => :'contentLength',
+        :'content_type' => :'contentType',
         :'user_id' => :'userId',
         :'attachment_id' => :'attachmentId',
         :'created_at' => :'createdAt',
-        :'updated_at' => :'updatedAt',
-        :'content_type' => :'contentType'
+        :'updated_at' => :'updatedAt'
       }
     end
 
@@ -50,11 +50,11 @@ module MailSlurpClient
       {
         :'name' => :'String',
         :'content_length' => :'Integer',
+        :'content_type' => :'String',
         :'user_id' => :'String',
         :'attachment_id' => :'String',
         :'created_at' => :'DateTime',
-        :'updated_at' => :'DateTime',
-        :'content_type' => :'String'
+        :'updated_at' => :'DateTime'
       }
     end
 
@@ -87,6 +87,10 @@ module MailSlurpClient
         self.content_length = attributes[:'content_length']
       end
 
+      if attributes.key?(:'content_type')
+        self.content_type = attributes[:'content_type']
+      end
+
       if attributes.key?(:'user_id')
         self.user_id = attributes[:'user_id']
       end
@@ -102,10 +106,6 @@ module MailSlurpClient
       if attributes.key?(:'updated_at')
         self.updated_at = attributes[:'updated_at']
       end
-
-      if attributes.key?(:'content_type')
-        self.content_type = attributes[:'content_type']
-      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -148,11 +148,11 @@ module MailSlurpClient
       self.class == o.class &&
           name == o.name &&
           content_length == o.content_length &&
+          content_type == o.content_type &&
           user_id == o.user_id &&
           attachment_id == o.attachment_id &&
           created_at == o.created_at &&
-          updated_at == o.updated_at &&
-          content_type == o.content_type
+          updated_at == o.updated_at
     end
 
     # @see the `==` method
@@ -164,7 +164,7 @@ module MailSlurpClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [name, content_length, user_id, attachment_id, created_at, updated_at, content_type].hash
+      [name, content_length, content_type, user_id, attachment_id, created_at, updated_at].hash
     end
 
     # Builds the object from hash

data/lib/mailslurp_client/models/bounce_projection.rb

@@ -23,10 +23,10 @@ module MailSlurpClient
 
     attr_accessor :created_at
 
-    attr_accessor :bounce_mta
-
     attr_accessor :bounce_type
 
+    attr_accessor :bounce_mta
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -34,8 +34,8 @@ module MailSlurpClient
         :'sender' => :'sender',
         :'subject' => :'subject',
         :'created_at' => :'createdAt',
-        :'bounce_mta' => :'bounceMta',
-        :'bounce_type' => :'bounceType'
+        :'bounce_type' => :'bounceType',
+        :'bounce_mta' => :'bounceMta'
       }
     end
 
@@ -46,8 +46,8 @@ module MailSlurpClient
         :'sender' => :'String',
         :'subject' => :'String',
         :'created_at' => :'DateTime',
-        :'bounce_mta' => :'String',
-        :'bounce_type' => :'String'
+        :'bounce_type' => :'String',
+        :'bounce_mta' => :'String'
       }
     end
 
@@ -88,13 +88,13 @@ module MailSlurpClient
         self.created_at = attributes[:'created_at']
       end
 
-      if attributes.key?(:'bounce_mta')
-        self.bounce_mta = attributes[:'bounce_mta']
-      end
-
       if attributes.key?(:'bounce_type')
         self.bounce_type = attributes[:'bounce_type']
       end
+
+      if attributes.key?(:'bounce_mta')
+        self.bounce_mta = attributes[:'bounce_mta']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -129,8 +129,8 @@ module MailSlurpClient
           sender == o.sender &&
           subject == o.subject &&
           created_at == o.created_at &&
-          bounce_mta == o.bounce_mta &&
-          bounce_type == o.bounce_type
+          bounce_type == o.bounce_type &&
+          bounce_mta == o.bounce_mta
     end
 
     # @see the `==` method
@@ -142,7 +142,7 @@ module MailSlurpClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, sender, subject, created_at, bounce_mta, bounce_type].hash
+      [id, sender, subject, created_at, bounce_type, bounce_mta].hash
     end
 
     # Builds the object from hash