mailslurp_client 15.0.6 → 15.1.1

data/lib/mailslurp_client/models/page_thread_projection.rb

@@ -19,12 +19,14 @@ module MailSlurpClient
 
     attr_accessor :pageable
 
-    attr_accessor :last
+    attr_accessor :total
 
-    attr_accessor :total_pages
+    attr_accessor :last
 
     attr_accessor :total_elements
 
+    attr_accessor :total_pages
+
     attr_accessor :size
 
     attr_accessor :number
@@ -42,9 +44,10 @@ module MailSlurpClient
       {
         :'content' => :'content',
         :'pageable' => :'pageable',
+        :'total' => :'total',
         :'last' => :'last',
-        :'total_pages' => :'totalPages',
         :'total_elements' => :'totalElements',
+        :'total_pages' => :'totalPages',
         :'size' => :'size',
         :'number' => :'number',
         :'sort' => :'sort',
@@ -58,10 +61,11 @@ module MailSlurpClient
     def self.openapi_types
       {
         :'content' => :'Array<ThreadProjection>',
-        :'pageable' => :'Pageable',
+        :'pageable' => :'PageableObject',
+        :'total' => :'Integer',
         :'last' => :'Boolean',
-        :'total_pages' => :'Integer',
         :'total_elements' => :'Integer',
+        :'total_pages' => :'Integer',
         :'size' => :'Integer',
         :'number' => :'Integer',
         :'sort' => :'Sort',
@@ -102,18 +106,22 @@ module MailSlurpClient
         self.pageable = attributes[:'pageable']
       end
 
-      if attributes.key?(:'last')
-        self.last = attributes[:'last']
+      if attributes.key?(:'total')
+        self.total = attributes[:'total']
       end
 
-      if attributes.key?(:'total_pages')
-        self.total_pages = attributes[:'total_pages']
+      if attributes.key?(:'last')
+        self.last = attributes[:'last']
       end
 
       if attributes.key?(:'total_elements')
         self.total_elements = attributes[:'total_elements']
       end
 
+      if attributes.key?(:'total_pages')
+        self.total_pages = attributes[:'total_pages']
+      end
+
       if attributes.key?(:'size')
         self.size = attributes[:'size']
       end
@@ -159,9 +167,10 @@ module MailSlurpClient
       self.class == o.class &&
           content == o.content &&
           pageable == o.pageable &&
+          total == o.total &&
           last == o.last &&
-          total_pages == o.total_pages &&
           total_elements == o.total_elements &&
+          total_pages == o.total_pages &&
           size == o.size &&
           number == o.number &&
           sort == o.sort &&
@@ -179,7 +188,7 @@ module MailSlurpClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [content, pageable, last, total_pages, total_elements, size, number, sort, first, number_of_elements, empty].hash
+      [content, pageable, total, last, total_elements, total_pages, size, number, sort, first, number_of_elements, empty].hash
     end
 
     # Builds the object from hash

data/lib/mailslurp_client/models/page_tracking_pixel_projection.rb

@@ -19,12 +19,14 @@ module MailSlurpClient
 
     attr_accessor :pageable
 
-    attr_accessor :last
+    attr_accessor :total
 
-    attr_accessor :total_pages
+    attr_accessor :last
 
     attr_accessor :total_elements
 
+    attr_accessor :total_pages
+
     attr_accessor :size
 
     attr_accessor :number
@@ -42,9 +44,10 @@ module MailSlurpClient
       {
         :'content' => :'content',
         :'pageable' => :'pageable',
+        :'total' => :'total',
         :'last' => :'last',
-        :'total_pages' => :'totalPages',
         :'total_elements' => :'totalElements',
+        :'total_pages' => :'totalPages',
         :'size' => :'size',
         :'number' => :'number',
         :'sort' => :'sort',
@@ -58,10 +61,11 @@ module MailSlurpClient
     def self.openapi_types
       {
         :'content' => :'Array<TrackingPixelProjection>',
-        :'pageable' => :'Pageable',
+        :'pageable' => :'PageableObject',
+        :'total' => :'Integer',
         :'last' => :'Boolean',
-        :'total_pages' => :'Integer',
         :'total_elements' => :'Integer',
+        :'total_pages' => :'Integer',
         :'size' => :'Integer',
         :'number' => :'Integer',
         :'sort' => :'Sort',
@@ -102,18 +106,22 @@ module MailSlurpClient
         self.pageable = attributes[:'pageable']
       end
 
-      if attributes.key?(:'last')
-        self.last = attributes[:'last']
+      if attributes.key?(:'total')
+        self.total = attributes[:'total']
       end
 
-      if attributes.key?(:'total_pages')
-        self.total_pages = attributes[:'total_pages']
+      if attributes.key?(:'last')
+        self.last = attributes[:'last']
       end
 
       if attributes.key?(:'total_elements')
         self.total_elements = attributes[:'total_elements']
       end
 
+      if attributes.key?(:'total_pages')
+        self.total_pages = attributes[:'total_pages']
+      end
+
       if attributes.key?(:'size')
         self.size = attributes[:'size']
       end
@@ -159,9 +167,10 @@ module MailSlurpClient
       self.class == o.class &&
           content == o.content &&
           pageable == o.pageable &&
+          total == o.total &&
           last == o.last &&
-          total_pages == o.total_pages &&
           total_elements == o.total_elements &&
+          total_pages == o.total_pages &&
           size == o.size &&
           number == o.number &&
           sort == o.sort &&
@@ -179,7 +188,7 @@ module MailSlurpClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [content, pageable, last, total_pages, total_elements, size, number, sort, first, number_of_elements, empty].hash
+      [content, pageable, total, last, total_elements, total_pages, size, number, sort, first, number_of_elements, empty].hash
     end
 
     # Builds the object from hash

data/lib/mailslurp_client/models/page_unknown_missed_email_projection.rb

@@ -19,12 +19,14 @@ module MailSlurpClient
 
     attr_accessor :pageable
 
-    attr_accessor :last
+    attr_accessor :total
 
-    attr_accessor :total_pages
+    attr_accessor :last
 
     attr_accessor :total_elements
 
+    attr_accessor :total_pages
+
     attr_accessor :size
 
     attr_accessor :number
@@ -42,9 +44,10 @@ module MailSlurpClient
       {
         :'content' => :'content',
         :'pageable' => :'pageable',
+        :'total' => :'total',
         :'last' => :'last',
-        :'total_pages' => :'totalPages',
         :'total_elements' => :'totalElements',
+        :'total_pages' => :'totalPages',
         :'size' => :'size',
         :'number' => :'number',
         :'sort' => :'sort',
@@ -58,10 +61,11 @@ module MailSlurpClient
     def self.openapi_types
       {
         :'content' => :'Array<UnknownMissedEmailProjection>',
-        :'pageable' => :'Pageable',
+        :'pageable' => :'PageableObject',
+        :'total' => :'Integer',
         :'last' => :'Boolean',
-        :'total_pages' => :'Integer',
         :'total_elements' => :'Integer',
+        :'total_pages' => :'Integer',
         :'size' => :'Integer',
         :'number' => :'Integer',
         :'sort' => :'Sort',
@@ -102,18 +106,22 @@ module MailSlurpClient
         self.pageable = attributes[:'pageable']
       end
 
-      if attributes.key?(:'last')
-        self.last = attributes[:'last']
+      if attributes.key?(:'total')
+        self.total = attributes[:'total']
       end
 
-      if attributes.key?(:'total_pages')
-        self.total_pages = attributes[:'total_pages']
+      if attributes.key?(:'last')
+        self.last = attributes[:'last']
       end
 
       if attributes.key?(:'total_elements')
         self.total_elements = attributes[:'total_elements']
       end
 
+      if attributes.key?(:'total_pages')
+        self.total_pages = attributes[:'total_pages']
+      end
+
       if attributes.key?(:'size')
         self.size = attributes[:'size']
       end
@@ -159,9 +167,10 @@ module MailSlurpClient
       self.class == o.class &&
           content == o.content &&
           pageable == o.pageable &&
+          total == o.total &&
           last == o.last &&
-          total_pages == o.total_pages &&
           total_elements == o.total_elements &&
+          total_pages == o.total_pages &&
           size == o.size &&
           number == o.number &&
           sort == o.sort &&
@@ -179,7 +188,7 @@ module MailSlurpClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [content, pageable, last, total_pages, total_elements, size, number, sort, first, number_of_elements, empty].hash
+      [content, pageable, total, last, total_elements, total_pages, size, number, sort, first, number_of_elements, empty].hash
     end
 
     # Builds the object from hash

data/lib/mailslurp_client/models/page_webhook_projection.rb

@@ -19,12 +19,14 @@ module MailSlurpClient
 
     attr_accessor :pageable
 
-    attr_accessor :last
+    attr_accessor :total
 
-    attr_accessor :total_pages
+    attr_accessor :last
 
     attr_accessor :total_elements
 
+    attr_accessor :total_pages
+
     attr_accessor :size
 
     attr_accessor :number
@@ -42,9 +44,10 @@ module MailSlurpClient
       {
         :'content' => :'content',
         :'pageable' => :'pageable',
+        :'total' => :'total',
         :'last' => :'last',
-        :'total_pages' => :'totalPages',
         :'total_elements' => :'totalElements',
+        :'total_pages' => :'totalPages',
         :'size' => :'size',
         :'number' => :'number',
         :'sort' => :'sort',
@@ -58,10 +61,11 @@ module MailSlurpClient
     def self.openapi_types
       {
         :'content' => :'Array<WebhookProjection>',
-        :'pageable' => :'Pageable',
+        :'pageable' => :'PageableObject',
+        :'total' => :'Integer',
         :'last' => :'Boolean',
-        :'total_pages' => :'Integer',
         :'total_elements' => :'Integer',
+        :'total_pages' => :'Integer',
         :'size' => :'Integer',
         :'number' => :'Integer',
         :'sort' => :'Sort',
@@ -102,18 +106,22 @@ module MailSlurpClient
         self.pageable = attributes[:'pageable']
       end
 
-      if attributes.key?(:'last')
-        self.last = attributes[:'last']
+      if attributes.key?(:'total')
+        self.total = attributes[:'total']
       end
 
-      if attributes.key?(:'total_pages')
-        self.total_pages = attributes[:'total_pages']
+      if attributes.key?(:'last')
+        self.last = attributes[:'last']
       end
 
       if attributes.key?(:'total_elements')
         self.total_elements = attributes[:'total_elements']
       end
 
+      if attributes.key?(:'total_pages')
+        self.total_pages = attributes[:'total_pages']
+      end
+
       if attributes.key?(:'size')
         self.size = attributes[:'size']
       end
@@ -159,9 +167,10 @@ module MailSlurpClient
       self.class == o.class &&
           content == o.content &&
           pageable == o.pageable &&
+          total == o.total &&
           last == o.last &&
-          total_pages == o.total_pages &&
           total_elements == o.total_elements &&
+          total_pages == o.total_pages &&
           size == o.size &&
           number == o.number &&
           sort == o.sort &&
@@ -179,7 +188,7 @@ module MailSlurpClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [content, pageable, last, total_pages, total_elements, size, number, sort, first, number_of_elements, empty].hash
+      [content, pageable, total, last, total_elements, total_pages, size, number, sort, first, number_of_elements, empty].hash
     end
 
     # Builds the object from hash

data/lib/mailslurp_client/models/page_webhook_result.rb

@@ -19,12 +19,14 @@ module MailSlurpClient
 
     attr_accessor :pageable
 
-    attr_accessor :last
+    attr_accessor :total
 
-    attr_accessor :total_pages
+    attr_accessor :last
 
     attr_accessor :total_elements
 
+    attr_accessor :total_pages
+
     attr_accessor :size
 
     attr_accessor :number
@@ -42,9 +44,10 @@ module MailSlurpClient
       {
         :'content' => :'content',
         :'pageable' => :'pageable',
+        :'total' => :'total',
         :'last' => :'last',
-        :'total_pages' => :'totalPages',
         :'total_elements' => :'totalElements',
+        :'total_pages' => :'totalPages',
         :'size' => :'size',
         :'number' => :'number',
         :'sort' => :'sort',
@@ -58,10 +61,11 @@ module MailSlurpClient
     def self.openapi_types
       {
         :'content' => :'Array<WebhookResultDto>',
-        :'pageable' => :'Pageable',
+        :'pageable' => :'PageableObject',
+        :'total' => :'Integer',
         :'last' => :'Boolean',
-        :'total_pages' => :'Integer',
         :'total_elements' => :'Integer',
+        :'total_pages' => :'Integer',
         :'size' => :'Integer',
         :'number' => :'Integer',
         :'sort' => :'Sort',
@@ -102,18 +106,22 @@ module MailSlurpClient
         self.pageable = attributes[:'pageable']
       end
 
-      if attributes.key?(:'last')
-        self.last = attributes[:'last']
+      if attributes.key?(:'total')
+        self.total = attributes[:'total']
       end
 
-      if attributes.key?(:'total_pages')
-        self.total_pages = attributes[:'total_pages']
+      if attributes.key?(:'last')
+        self.last = attributes[:'last']
       end
 
       if attributes.key?(:'total_elements')
         self.total_elements = attributes[:'total_elements']
       end
 
+      if attributes.key?(:'total_pages')
+        self.total_pages = attributes[:'total_pages']
+      end
+
       if attributes.key?(:'size')
         self.size = attributes[:'size']
       end
@@ -159,9 +167,10 @@ module MailSlurpClient
       self.class == o.class &&
           content == o.content &&
           pageable == o.pageable &&
+          total == o.total &&
           last == o.last &&
-          total_pages == o.total_pages &&
           total_elements == o.total_elements &&
+          total_pages == o.total_pages &&
           size == o.size &&
           number == o.number &&
           sort == o.sort &&
@@ -179,7 +188,7 @@ module MailSlurpClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [content, pageable, last, total_pages, total_elements, size, number, sort, first, number_of_elements, empty].hash
+      [content, pageable, total, last, total_elements, total_pages, size, number, sort, first, number_of_elements, empty].hash
     end
 
     # Builds the object from hash

data/lib/mailslurp_client/models/{pageable.rb → pageable_object.rb}

@@ -13,28 +13,28 @@ OpenAPI Generator version: 4.3.1
 require 'date'
 
 module MailSlurpClient
-  class Pageable
+  class PageableObject
     attr_accessor :offset
 
     attr_accessor :sort
 
-    attr_accessor :paged
-
-    attr_accessor :unpaged
-
     attr_accessor :page_number
 
     attr_accessor :page_size
 
+    attr_accessor :paged
+
+    attr_accessor :unpaged
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'offset' => :'offset',
         :'sort' => :'sort',
-        :'paged' => :'paged',
-        :'unpaged' => :'unpaged',
         :'page_number' => :'pageNumber',
-        :'page_size' => :'pageSize'
+        :'page_size' => :'pageSize',
+        :'paged' => :'paged',
+        :'unpaged' => :'unpaged'
       }
     end
 
@@ -43,10 +43,10 @@ module MailSlurpClient
       {
         :'offset' => :'Integer',
         :'sort' => :'Sort',
-        :'paged' => :'Boolean',
-        :'unpaged' => :'Boolean',
         :'page_number' => :'Integer',
-        :'page_size' => :'Integer'
+        :'page_size' => :'Integer',
+        :'paged' => :'Boolean',
+        :'unpaged' => :'Boolean'
       }
     end
 
@@ -60,13 +60,13 @@ module MailSlurpClient
     # @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 `MailSlurpClient::Pageable` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `MailSlurpClient::PageableObject` 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 `MailSlurpClient::Pageable`. 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 `MailSlurpClient::PageableObject`. 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
       }
@@ -79,14 +79,6 @@ module MailSlurpClient
         self.sort = attributes[:'sort']
       end
 
-      if attributes.key?(:'paged')
-        self.paged = attributes[:'paged']
-      end
-
-      if attributes.key?(:'unpaged')
-        self.unpaged = attributes[:'unpaged']
-      end
-
       if attributes.key?(:'page_number')
         self.page_number = attributes[:'page_number']
       end
@@ -94,6 +86,14 @@ module MailSlurpClient
       if attributes.key?(:'page_size')
         self.page_size = attributes[:'page_size']
       end
+
+      if attributes.key?(:'paged')
+        self.paged = attributes[:'paged']
+      end
+
+      if attributes.key?(:'unpaged')
+        self.unpaged = attributes[:'unpaged']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -116,10 +116,10 @@ module MailSlurpClient
       self.class == o.class &&
           offset == o.offset &&
           sort == o.sort &&
-          paged == o.paged &&
-          unpaged == o.unpaged &&
           page_number == o.page_number &&
-          page_size == o.page_size
+          page_size == o.page_size &&
+          paged == o.paged &&
+          unpaged == o.unpaged
     end
 
     # @see the `==` method
@@ -131,7 +131,7 @@ module MailSlurpClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [offset, sort, paged, unpaged, page_number, page_size].hash
+      [offset, sort, page_number, page_size, paged, unpaged].hash
     end
 
     # Builds the object from hash

data/lib/mailslurp_client/models/raw_email_json.rb

@@ -61,12 +61,17 @@ module MailSlurpClient
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
+      if @content.nil?
+        invalid_properties.push('invalid value for "content", content cannot be nil.')
+      end
+
       invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      return false if @content.nil?
       true
     end
 

data/lib/mailslurp_client/models/recipient.rb

@@ -76,12 +76,22 @@ module MailSlurpClient
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
+      if @raw_value.nil?
+        invalid_properties.push('invalid value for "raw_value", raw_value cannot be nil.')
+      end
+
+      if @email_address.nil?
+        invalid_properties.push('invalid value for "email_address", email_address cannot be nil.')
+      end
+
       invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      return false if @raw_value.nil?
+      return false if @email_address.nil?
       true
     end