mailslurp_client 15.17.32 → 15.17.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b66d7eb48418522d9af019e393c27859d19f8d90b3343f7cdf4b09254a6b13c
-  data.tar.gz: 5ab18eaa5cb6081ccb78c5539722b24a9d2fb9f15358e05abe051820588553c2
+  metadata.gz: f592144a7e81437b7c73cc45fd304a9574111badc1a8c6f3add0c429f1ce8a74
+  data.tar.gz: 716b45de6ac031530edbe658305a6d51524ef4b8d18c56b4594f711afb63839e
 SHA512:
-  metadata.gz: 8ddc3a17d6e58175993b96d423c1a54f0406ee4dd5be2244a1e91fb1bc74d2d5d056eb6784ed475efbdda6536eb722e2eccbd96969f757801333e414bde8f528
-  data.tar.gz: 150be50ae7a56d94f1d83e82129485b979a4b8399c55aa5a8e19259d16c94df12075dec29078e8769f89e7709e4aec1ee715d53c7068914c0f95e36b7fc0d3a4
+  metadata.gz: cb1cb933502fc7cb5702466c7e294311e882103cf401a9486c180d4c57b7de5a3141ebed0856d30c1552f2679e6e13e1c22671a7ed134f9be2016ce44358c50b
+  data.tar.gz: 122b03c2dbe78ff81e2bafd201b877c52950e75682ea40cf47698ef9c7817c3f5091927caf07cdaa77a25789dae77fac8c080accdcc8537cd9fd9f78d4c4f7ba

data/lib/mailslurp_client/api/attachment_controller_api.rb

@@ -384,6 +384,7 @@ module MailSlurpClient
     # @option opts [String] :file_name_filter Optional file name and content type search filter
     # @option opts [DateTime] :since Filter by created at after the given timestamp
     # @option opts [DateTime] :before Filter by created at before the given timestamp
+    # @option opts [String] :inbox_id Optional inboxId to filter attachments by
     # @return [PageAttachmentEntity]
     def get_attachments(opts = {})
       data, _status_code, _headers = get_attachments_with_http_info(opts)
@@ -399,6 +400,7 @@ module MailSlurpClient
     # @option opts [String] :file_name_filter Optional file name and content type search filter
     # @option opts [DateTime] :since Filter by created at after the given timestamp
     # @option opts [DateTime] :before Filter by created at before the given timestamp
+    # @option opts [String] :inbox_id Optional inboxId to filter attachments by
     # @return [Array<(PageAttachmentEntity, Integer, Hash)>] PageAttachmentEntity data, response status code and response headers
     def get_attachments_with_http_info(opts = {})
       if @api_client.config.debugging
@@ -419,6 +421,7 @@ module MailSlurpClient
       query_params[:'fileNameFilter'] = opts[:'file_name_filter'] if !opts[:'file_name_filter'].nil?
       query_params[:'since'] = opts[:'since'] if !opts[:'since'].nil?
       query_params[:'before'] = opts[:'before'] if !opts[:'before'].nil?
+      query_params[:'inboxId'] = opts[:'inbox_id'] if !opts[:'inbox_id'].nil?
 
       # header parameters
       header_params = opts[:header_params] || {}

data/lib/mailslurp_client/api/sms_controller_api.rb

@@ -198,6 +198,62 @@ module MailSlurpClient
       return data, status_code, headers
     end
 
+    # Get SMS count
+    # Get number of SMS
+    # @param [Hash] opts the optional parameters
+    # @return [CountDto]
+    def get_sms_count(opts = {})
+      data, _status_code, _headers = get_sms_count_with_http_info(opts)
+      data
+    end
+
+    # Get SMS count
+    # Get number of SMS
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(CountDto, Integer, Hash)>] CountDto data, response status code and response headers
+    def get_sms_count_with_http_info(opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: SmsControllerApi.get_sms_count ...'
+      end
+      # resource path
+      local_var_path = '/sms/count'
+
+      # 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] || 'CountDto' 
+
+      # 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: SmsControllerApi#get_sms_count\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Get SMS content including body. Expects SMS to exist by ID. For SMS that may not have arrived yet use the WaitForController.
     # Returns a SMS summary object with content.
     # @param sms_id [String] 

data/lib/mailslurp_client/api/webhook_controller_api.rb

@@ -507,6 +507,15 @@ module MailSlurpClient
     # @option opts [DateTime] :since Filter by created at after the given timestamp
     # @option opts [DateTime] :before Filter by created at before the given timestamp
     # @option opts [Boolean] :unseen_only Filter for unseen exceptions only
+    # @option opts [String] :result_type Filter by result type
+    # @option opts [String] :event_name Filter by event name
+    # @option opts [Integer] :min_status_code Minimum response status
+    # @option opts [Integer] :max_status_code Maximum response status
+    # @option opts [String] :inbox_id Inbox ID
+    # @option opts [String] :sms_id Sms ID
+    # @option opts [String] :attachment_id Attachment ID
+    # @option opts [String] :email_id Email ID
+    # @option opts [String] :phone_id Phone ID
     # @return [PageWebhookResult]
     def get_all_webhook_results(opts = {})
       data, _status_code, _headers = get_all_webhook_results_with_http_info(opts)
@@ -522,6 +531,15 @@ module MailSlurpClient
     # @option opts [DateTime] :since Filter by created at after the given timestamp
     # @option opts [DateTime] :before Filter by created at before the given timestamp
     # @option opts [Boolean] :unseen_only Filter for unseen exceptions only
+    # @option opts [String] :result_type Filter by result type
+    # @option opts [String] :event_name Filter by event name
+    # @option opts [Integer] :min_status_code Minimum response status
+    # @option opts [Integer] :max_status_code Maximum response status
+    # @option opts [String] :inbox_id Inbox ID
+    # @option opts [String] :sms_id Sms ID
+    # @option opts [String] :attachment_id Attachment ID
+    # @option opts [String] :email_id Email ID
+    # @option opts [String] :phone_id Phone ID
     # @return [Array<(PageWebhookResult, Integer, Hash)>] PageWebhookResult data, response status code and response headers
     def get_all_webhook_results_with_http_info(opts = {})
       if @api_client.config.debugging
@@ -531,6 +549,14 @@ module MailSlurpClient
       if @api_client.config.client_side_validation && opts[:'sort'] && !allowable_values.include?(opts[:'sort'])
         fail ArgumentError, "invalid value for \"sort\", must be one of #{allowable_values}"
       end
+      allowable_values = ["BAD_RESPONSE", "EXCEPTION", "SUCCESS", "REDRIVEN"]
+      if @api_client.config.client_side_validation && opts[:'result_type'] && !allowable_values.include?(opts[:'result_type'])
+        fail ArgumentError, "invalid value for \"result_type\", must be one of #{allowable_values}"
+      end
+      allowable_values = ["EMAIL_RECEIVED", "NEW_EMAIL", "NEW_CONTACT", "NEW_ATTACHMENT", "EMAIL_OPENED", "EMAIL_READ", "DELIVERY_STATUS", "BOUNCE", "BOUNCE_RECIPIENT", "NEW_SMS"]
+      if @api_client.config.client_side_validation && opts[:'event_name'] && !allowable_values.include?(opts[:'event_name'])
+        fail ArgumentError, "invalid value for \"event_name\", must be one of #{allowable_values}"
+      end
       # resource path
       local_var_path = '/webhooks/results'
 
@@ -543,6 +569,15 @@ module MailSlurpClient
       query_params[:'since'] = opts[:'since'] if !opts[:'since'].nil?
       query_params[:'before'] = opts[:'before'] if !opts[:'before'].nil?
       query_params[:'unseenOnly'] = opts[:'unseen_only'] if !opts[:'unseen_only'].nil?
+      query_params[:'resultType'] = opts[:'result_type'] if !opts[:'result_type'].nil?
+      query_params[:'eventName'] = opts[:'event_name'] if !opts[:'event_name'].nil?
+      query_params[:'minStatusCode'] = opts[:'min_status_code'] if !opts[:'min_status_code'].nil?
+      query_params[:'maxStatusCode'] = opts[:'max_status_code'] if !opts[:'max_status_code'].nil?
+      query_params[:'inboxId'] = opts[:'inbox_id'] if !opts[:'inbox_id'].nil?
+      query_params[:'smsId'] = opts[:'sms_id'] if !opts[:'sms_id'].nil?
+      query_params[:'attachmentId'] = opts[:'attachment_id'] if !opts[:'attachment_id'].nil?
+      query_params[:'emailId'] = opts[:'email_id'] if !opts[:'email_id'].nil?
+      query_params[:'phoneId'] = opts[:'phone_id'] if !opts[:'phone_id'].nil?
 
       # header parameters
       header_params = opts[:header_params] || {}
@@ -1701,6 +1736,15 @@ module MailSlurpClient
     # @option opts [DateTime] :since Filter by created at after the given timestamp
     # @option opts [DateTime] :before Filter by created at before the given timestamp
     # @option opts [Boolean] :unseen_only Filter for unseen exceptions only
+    # @option opts [String] :result_type Filter by result type
+    # @option opts [String] :event_name Filter by event name
+    # @option opts [Integer] :min_status_code Minimum response status
+    # @option opts [Integer] :max_status_code Maximum response status
+    # @option opts [String] :inbox_id Inbox ID
+    # @option opts [String] :sms_id Sms ID
+    # @option opts [String] :attachment_id Attachment ID
+    # @option opts [String] :email_id Email ID
+    # @option opts [String] :phone_id Phone ID
     # @return [PageWebhookResult]
     def get_webhook_results(webhook_id, opts = {})
       data, _status_code, _headers = get_webhook_results_with_http_info(webhook_id, opts)
@@ -1717,6 +1761,15 @@ module MailSlurpClient
     # @option opts [DateTime] :since Filter by created at after the given timestamp
     # @option opts [DateTime] :before Filter by created at before the given timestamp
     # @option opts [Boolean] :unseen_only Filter for unseen exceptions only
+    # @option opts [String] :result_type Filter by result type
+    # @option opts [String] :event_name Filter by event name
+    # @option opts [Integer] :min_status_code Minimum response status
+    # @option opts [Integer] :max_status_code Maximum response status
+    # @option opts [String] :inbox_id Inbox ID
+    # @option opts [String] :sms_id Sms ID
+    # @option opts [String] :attachment_id Attachment ID
+    # @option opts [String] :email_id Email ID
+    # @option opts [String] :phone_id Phone ID
     # @return [Array<(PageWebhookResult, Integer, Hash)>] PageWebhookResult data, response status code and response headers
     def get_webhook_results_with_http_info(webhook_id, opts = {})
       if @api_client.config.debugging
@@ -1730,6 +1783,14 @@ module MailSlurpClient
       if @api_client.config.client_side_validation && opts[:'sort'] && !allowable_values.include?(opts[:'sort'])
         fail ArgumentError, "invalid value for \"sort\", must be one of #{allowable_values}"
       end
+      allowable_values = ["BAD_RESPONSE", "EXCEPTION", "SUCCESS", "REDRIVEN"]
+      if @api_client.config.client_side_validation && opts[:'result_type'] && !allowable_values.include?(opts[:'result_type'])
+        fail ArgumentError, "invalid value for \"result_type\", must be one of #{allowable_values}"
+      end
+      allowable_values = ["EMAIL_RECEIVED", "NEW_EMAIL", "NEW_CONTACT", "NEW_ATTACHMENT", "EMAIL_OPENED", "EMAIL_READ", "DELIVERY_STATUS", "BOUNCE", "BOUNCE_RECIPIENT", "NEW_SMS"]
+      if @api_client.config.client_side_validation && opts[:'event_name'] && !allowable_values.include?(opts[:'event_name'])
+        fail ArgumentError, "invalid value for \"event_name\", must be one of #{allowable_values}"
+      end
       # resource path
       local_var_path = '/webhooks/{webhookId}/results'.sub('{' + 'webhookId' + '}', CGI.escape(webhook_id.to_s))
 
@@ -1742,6 +1803,15 @@ module MailSlurpClient
       query_params[:'since'] = opts[:'since'] if !opts[:'since'].nil?
       query_params[:'before'] = opts[:'before'] if !opts[:'before'].nil?
       query_params[:'unseenOnly'] = opts[:'unseen_only'] if !opts[:'unseen_only'].nil?
+      query_params[:'resultType'] = opts[:'result_type'] if !opts[:'result_type'].nil?
+      query_params[:'eventName'] = opts[:'event_name'] if !opts[:'event_name'].nil?
+      query_params[:'minStatusCode'] = opts[:'min_status_code'] if !opts[:'min_status_code'].nil?
+      query_params[:'maxStatusCode'] = opts[:'max_status_code'] if !opts[:'max_status_code'].nil?
+      query_params[:'inboxId'] = opts[:'inbox_id'] if !opts[:'inbox_id'].nil?
+      query_params[:'smsId'] = opts[:'sms_id'] if !opts[:'sms_id'].nil?
+      query_params[:'attachmentId'] = opts[:'attachment_id'] if !opts[:'attachment_id'].nil?
+      query_params[:'emailId'] = opts[:'email_id'] if !opts[:'email_id'].nil?
+      query_params[:'phoneId'] = opts[:'phone_id'] if !opts[:'phone_id'].nil?
 
       # header parameters
       header_params = opts[:header_params] || {}
@@ -1776,6 +1846,66 @@ module MailSlurpClient
       return data, status_code, headers
     end
 
+    # Get a webhook results count for a webhook
+    # @param webhook_id [String] ID of webhook to get results for
+    # @param [Hash] opts the optional parameters
+    # @return [CountDto]
+    def get_webhook_results_count(webhook_id, opts = {})
+      data, _status_code, _headers = get_webhook_results_count_with_http_info(webhook_id, opts)
+      data
+    end
+
+    # Get a webhook results count for a webhook
+    # @param webhook_id [String] ID of webhook to get results for
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(CountDto, Integer, Hash)>] CountDto data, response status code and response headers
+    def get_webhook_results_count_with_http_info(webhook_id, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: WebhookControllerApi.get_webhook_results_count ...'
+      end
+      # verify the required parameter 'webhook_id' is set
+      if @api_client.config.client_side_validation && webhook_id.nil?
+        fail ArgumentError, "Missing the required parameter 'webhook_id' when calling WebhookControllerApi.get_webhook_results_count"
+      end
+      # resource path
+      local_var_path = '/webhooks/{webhookId}/results/count'.sub('{' + 'webhookId' + '}', CGI.escape(webhook_id.to_s))
+
+      # 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] || 'CountDto' 
+
+      # 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_webhook_results_count\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Get count of unseen webhook results with error status
     # @param [Hash] opts the optional parameters
     # @return [UnseenErrorCountDto]
@@ -1890,6 +2020,62 @@ module MailSlurpClient
       return data, status_code, headers
     end
 
+    # Redrive all webhook results that have failed status
+    # Allows you to resend webhook payloads for any recorded webhook result that failed to deliver the payload.
+    # @param [Hash] opts the optional parameters
+    # @return [WebhookRedriveAllResult]
+    def redrive_all_webhook_results(opts = {})
+      data, _status_code, _headers = redrive_all_webhook_results_with_http_info(opts)
+      data
+    end
+
+    # Redrive all webhook results that have failed status
+    # Allows you to resend webhook payloads for any recorded webhook result that failed to deliver the payload.
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(WebhookRedriveAllResult, Integer, Hash)>] WebhookRedriveAllResult data, response status code and response headers
+    def redrive_all_webhook_results_with_http_info(opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: WebhookControllerApi.redrive_all_webhook_results ...'
+      end
+      # resource path
+      local_var_path = '/webhooks/results/redrive'
+
+      # 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] || 'WebhookRedriveAllResult' 
+
+      # 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(:POST, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: WebhookControllerApi#redrive_all_webhook_results\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Get a webhook result and try to resend the original webhook payload
     # Allows you to resend a webhook payload that was already sent. Webhooks that fail are retried automatically for 24 hours and then put in a dead letter queue. You can retry results manually using this method.
     # @param webhook_result_id [String] Webhook Result ID

data/lib/mailslurp_client/models/alias_projection.rb

@@ -17,10 +17,10 @@ module MailSlurpClient
   class AliasProjection
     attr_accessor :inbox_id
 
-    attr_accessor :email_address
-
     attr_accessor :user_id
 
+    attr_accessor :email_address
+
     attr_accessor :use_threads
 
     attr_accessor :created_at
@@ -35,8 +35,8 @@ module MailSlurpClient
     def self.attribute_map
       {
         :'inbox_id' => :'inboxId',
-        :'email_address' => :'emailAddress',
         :'user_id' => :'userId',
+        :'email_address' => :'emailAddress',
         :'use_threads' => :'useThreads',
         :'created_at' => :'createdAt',
         :'updated_at' => :'updatedAt',
@@ -49,8 +49,8 @@ module MailSlurpClient
     def self.openapi_types
       {
         :'inbox_id' => :'String',
-        :'email_address' => :'String',
         :'user_id' => :'String',
+        :'email_address' => :'String',
         :'use_threads' => :'Boolean',
         :'created_at' => :'DateTime',
         :'updated_at' => :'DateTime',
@@ -84,14 +84,14 @@ module MailSlurpClient
         self.inbox_id = attributes[:'inbox_id']
       end
 
-      if attributes.key?(:'email_address')
-        self.email_address = attributes[:'email_address']
-      end
-
       if attributes.key?(:'user_id')
         self.user_id = attributes[:'user_id']
       end
 
+      if attributes.key?(:'email_address')
+        self.email_address = attributes[:'email_address']
+      end
+
       if attributes.key?(:'use_threads')
         self.use_threads = attributes[:'use_threads']
       end
@@ -121,14 +121,14 @@ module MailSlurpClient
         invalid_properties.push('invalid value for "inbox_id", inbox_id cannot be nil.')
       end
 
-      if @email_address.nil?
-        invalid_properties.push('invalid value for "email_address", email_address cannot be nil.')
-      end
-
       if @user_id.nil?
         invalid_properties.push('invalid value for "user_id", user_id cannot be nil.')
       end
 
+      if @email_address.nil?
+        invalid_properties.push('invalid value for "email_address", email_address cannot be nil.')
+      end
+
       if @created_at.nil?
         invalid_properties.push('invalid value for "created_at", created_at cannot be nil.')
       end
@@ -148,8 +148,8 @@ module MailSlurpClient
     # @return true if the model is valid
     def valid?
       return false if @inbox_id.nil?
-      return false if @email_address.nil?
       return false if @user_id.nil?
+      return false if @email_address.nil?
       return false if @created_at.nil?
       return false if @updated_at.nil?
       return false if @id.nil?
@@ -162,8 +162,8 @@ module MailSlurpClient
       return true if self.equal?(o)
       self.class == o.class &&
           inbox_id == o.inbox_id &&
-          email_address == o.email_address &&
           user_id == o.user_id &&
+          email_address == o.email_address &&
           use_threads == o.use_threads &&
           created_at == o.created_at &&
           updated_at == o.updated_at &&
@@ -180,7 +180,7 @@ module MailSlurpClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [inbox_id, email_address, user_id, use_threads, created_at, updated_at, name, id].hash
+      [inbox_id, user_id, email_address, use_threads, created_at, updated_at, name, id].hash
     end
 
     # Builds the object from hash

data/lib/mailslurp_client/models/attachment_entity.rb

@@ -30,6 +30,8 @@ module MailSlurpClient
 
     attr_accessor :name
 
+    attr_accessor :inbox_id
+
     attr_accessor :created_at
 
     attr_accessor :updated_at
@@ -45,6 +47,7 @@ module MailSlurpClient
         :'content_length' => :'contentLength',
         :'content_id' => :'contentId',
         :'name' => :'name',
+        :'inbox_id' => :'inboxId',
         :'created_at' => :'createdAt',
         :'updated_at' => :'updatedAt'
       }
@@ -61,6 +64,7 @@ module MailSlurpClient
         :'content_length' => :'Integer',
         :'content_id' => :'String',
         :'name' => :'String',
+        :'inbox_id' => :'String',
         :'created_at' => :'DateTime',
         :'updated_at' => :'DateTime'
       }
@@ -119,6 +123,10 @@ module MailSlurpClient
         self.name = attributes[:'name']
       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
@@ -174,6 +182,7 @@ module MailSlurpClient
           content_length == o.content_length &&
           content_id == o.content_id &&
           name == o.name &&
+          inbox_id == o.inbox_id &&
           created_at == o.created_at &&
           updated_at == o.updated_at
     end
@@ -187,7 +196,7 @@ module MailSlurpClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, attachment_id, bucket, user_id, content_type, content_length, content_id, name, created_at, updated_at].hash
+      [id, attachment_id, bucket, user_id, content_type, content_length, content_id, name, inbox_id, created_at, updated_at].hash
     end
 
     # Builds the object from hash

data/lib/mailslurp_client/models/bounce_projection.rb

@@ -15,6 +15,8 @@ require 'date'
 module MailSlurpClient
   # Bounced email event
   class BounceProjection
+    attr_accessor :subject
+
     attr_accessor :sender
 
     attr_accessor :bounce_type
@@ -23,18 +25,16 @@ module MailSlurpClient
 
     attr_accessor :created_at
 
-    attr_accessor :subject
-
     attr_accessor :id
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'subject' => :'subject',
         :'sender' => :'sender',
         :'bounce_type' => :'bounceType',
         :'bounce_mta' => :'bounceMta',
         :'created_at' => :'createdAt',
-        :'subject' => :'subject',
         :'id' => :'id'
       }
     end
@@ -42,11 +42,11 @@ module MailSlurpClient
     # Attribute type mapping.
     def self.openapi_types
       {
+        :'subject' => :'String',
         :'sender' => :'String',
         :'bounce_type' => :'String',
         :'bounce_mta' => :'String',
         :'created_at' => :'DateTime',
-        :'subject' => :'String',
         :'id' => :'String'
       }
     end
@@ -54,9 +54,9 @@ module MailSlurpClient
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
+        :'subject',
         :'bounce_type',
         :'bounce_mta',
-        :'subject',
       ])
     end
 
@@ -75,6 +75,10 @@ module MailSlurpClient
         h[k.to_sym] = v
       }
 
+      if attributes.key?(:'subject')
+        self.subject = attributes[:'subject']
+      end
+
       if attributes.key?(:'sender')
         self.sender = attributes[:'sender']
       end
@@ -91,10 +95,6 @@ module MailSlurpClient
         self.created_at = attributes[:'created_at']
       end
 
-      if attributes.key?(:'subject')
-        self.subject = attributes[:'subject']
-      end
-
       if attributes.key?(:'id')
         self.id = attributes[:'id']
       end
@@ -128,11 +128,11 @@ module MailSlurpClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          subject == o.subject &&
           sender == o.sender &&
           bounce_type == o.bounce_type &&
           bounce_mta == o.bounce_mta &&
           created_at == o.created_at &&
-          subject == o.subject &&
           id == o.id
     end
 
@@ -145,7 +145,7 @@ module MailSlurpClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [sender, bounce_type, bounce_mta, created_at, subject, id].hash
+      [subject, sender, bounce_type, bounce_mta, created_at, id].hash
     end
 
     # Builds the object from hash

data/lib/mailslurp_client/models/email.rb

@@ -96,10 +96,10 @@ module MailSlurpClient
     # A list of detected multipart mime message body part content types such as text/plain and text/html. Can be used with email bodyPart endpoints to fetch individual body parts.
     attr_accessor :body_part_content_types
 
-    attr_accessor :html
-
     attr_accessor :xamp_html
 
+    attr_accessor :html
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -131,8 +131,8 @@ module MailSlurpClient
         :'team_access' => :'teamAccess',
         :'is_x_amp_html' => :'isXAmpHtml',
         :'body_part_content_types' => :'bodyPartContentTypes',
-        :'html' => :'html',
-        :'xamp_html' => :'xampHtml'
+        :'xamp_html' => :'xampHtml',
+        :'html' => :'html'
       }
     end
 
@@ -167,8 +167,8 @@ module MailSlurpClient
         :'team_access' => :'Boolean',
         :'is_x_amp_html' => :'Boolean',
         :'body_part_content_types' => :'Array<String>',
-        :'html' => :'Boolean',
-        :'xamp_html' => :'Boolean'
+        :'xamp_html' => :'Boolean',
+        :'html' => :'Boolean'
       }
     end
 
@@ -339,13 +339,13 @@ module MailSlurpClient
         end
       end
 
-      if attributes.key?(:'html')
-        self.html = attributes[:'html']
-      end
-
       if attributes.key?(:'xamp_html')
         self.xamp_html = attributes[:'xamp_html']
       end
+
+      if attributes.key?(:'html')
+        self.html = attributes[:'html']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -434,8 +434,8 @@ module MailSlurpClient
           team_access == o.team_access &&
           is_x_amp_html == o.is_x_amp_html &&
           body_part_content_types == o.body_part_content_types &&
-          html == o.html &&
-          xamp_html == o.xamp_html
+          xamp_html == o.xamp_html &&
+          html == o.html
     end
 
     # @see the `==` method
@@ -447,7 +447,7 @@ module MailSlurpClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, user_id, inbox_id, domain_id, to, from, sender, recipients, reply_to, cc, bcc, headers, headers_map, attachments, subject, body, body_excerpt, text_excerpt, body_md5_hash, is_html, charset, analysis, created_at, updated_at, read, team_access, is_x_amp_html, body_part_content_types, html, xamp_html].hash
+      [id, user_id, inbox_id, domain_id, to, from, sender, recipients, reply_to, cc, bcc, headers, headers_map, attachments, subject, body, body_excerpt, text_excerpt, body_md5_hash, is_html, charset, analysis, created_at, updated_at, read, team_access, is_x_amp_html, body_part_content_types, xamp_html, html].hash
     end
 
     # Builds the object from hash