SematextCloud 0.3.1 → 0.4.0

data/lib/SematextCloud/models/service_integration.rb

@@ -6,8 +6,7 @@
 OpenAPI spec version: v3
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.12
-
+Swagger Codegen version: 3.0.30
 =end
 
 require 'date'
@@ -57,76 +56,89 @@ module SematextCloud
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'app_type_id' => :'Integer',
-        :'app_type_name' => :'String',
-        :'display_name' => :'String',
-        :'enabled' => :'BOOLEAN',
-        :'external_product_id' => :'Integer',
-        :'external_product_name' => :'String',
-        :'id' => :'Integer',
-        :'integration_type' => :'String',
-        :'ordinal' => :'Integer',
-        :'parent_integration_id' => :'Integer',
-        :'sematext_service' => :'String',
-        :'visible' => :'BOOLEAN'
+        :'app_type_id' => :'Object',
+        :'app_type_name' => :'Object',
+        :'display_name' => :'Object',
+        :'enabled' => :'Object',
+        :'external_product_id' => :'Object',
+        :'external_product_name' => :'Object',
+        :'id' => :'Object',
+        :'integration_type' => :'Object',
+        :'ordinal' => :'Object',
+        :'parent_integration_id' => :'Object',
+        :'sematext_service' => :'Object',
+        :'visible' => :'Object'
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+  
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `SematextCloud::ServiceIntegration` initialize method"
+      end
 
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+      # 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 `SematextCloud::ServiceIntegration`. 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.has_key?(:'appTypeId')
-        self.app_type_id = attributes[:'appTypeId']
+      if attributes.key?(:'app_type_id')
+        self.app_type_id = attributes[:'app_type_id']
       end
 
-      if attributes.has_key?(:'appTypeName')
-        self.app_type_name = attributes[:'appTypeName']
+      if attributes.key?(:'app_type_name')
+        self.app_type_name = attributes[:'app_type_name']
       end
 
-      if attributes.has_key?(:'displayName')
-        self.display_name = attributes[:'displayName']
+      if attributes.key?(:'display_name')
+        self.display_name = attributes[:'display_name']
       end
 
-      if attributes.has_key?(:'enabled')
+      if attributes.key?(:'enabled')
         self.enabled = attributes[:'enabled']
       end
 
-      if attributes.has_key?(:'externalProductId')
-        self.external_product_id = attributes[:'externalProductId']
+      if attributes.key?(:'external_product_id')
+        self.external_product_id = attributes[:'external_product_id']
       end
 
-      if attributes.has_key?(:'externalProductName')
-        self.external_product_name = attributes[:'externalProductName']
+      if attributes.key?(:'external_product_name')
+        self.external_product_name = attributes[:'external_product_name']
       end
 
-      if attributes.has_key?(:'id')
+      if attributes.key?(:'id')
         self.id = attributes[:'id']
       end
 
-      if attributes.has_key?(:'integrationType')
-        self.integration_type = attributes[:'integrationType']
+      if attributes.key?(:'integration_type')
+        self.integration_type = attributes[:'integration_type']
       end
 
-      if attributes.has_key?(:'ordinal')
+      if attributes.key?(:'ordinal')
         self.ordinal = attributes[:'ordinal']
       end
 
-      if attributes.has_key?(:'parentIntegrationId')
-        self.parent_integration_id = attributes[:'parentIntegrationId']
+      if attributes.key?(:'parent_integration_id')
+        self.parent_integration_id = attributes[:'parent_integration_id']
       end
 
-      if attributes.has_key?(:'sematextService')
-        self.sematext_service = attributes[:'sematextService']
+      if attributes.key?(:'sematext_service')
+        self.sematext_service = attributes[:'sematext_service']
       end
 
-      if attributes.has_key?(:'visible')
+      if attributes.key?(:'visible')
         self.visible = attributes[:'visible']
       end
     end
@@ -170,26 +182,35 @@ module SematextCloud
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [app_type_id, app_type_name, display_name, enabled, external_product_id, external_product_name, id, integration_type, ordinal, parent_integration_id, sematext_service, visible].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)
-      self.class.swagger_types.each_pair do |key, type|
+      self.class.openapi_types.each_pair do |key, type|
         if type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the the attribute
+          # 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) })
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        elsif attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        end
       end
 
       self
@@ -211,7 +232,7 @@ module SematextCloud
         value.to_i
       when :Float
         value.to_f
-      when :BOOLEAN
+      when :Boolean
         if value.to_s =~ /\A(true|t|yes|y|1)\z/i
           true
         else
@@ -232,8 +253,7 @@ module SematextCloud
           end
         end
       else # model
-        temp_model = SematextCloud.const_get(type).new
-        temp_model.build_from_hash(value)
+        SematextCloud.const_get(type).build_from_hash(value)
       end
     end
 
@@ -255,7 +275,11 @@ module SematextCloud
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
         hash[param] = _to_hash(value)
       end
       hash
@@ -277,6 +301,5 @@ module SematextCloud
       else
         value
       end
-    end
-  end
+    end  end
 end

data/lib/{stcloud → SematextCloud}/models/subscription.rb

@@ -6,13 +6,15 @@
 OpenAPI spec version: v3
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 3.0.25
+Swagger Codegen version: 3.0.30
 =end
 
 require 'date'
 
-module stcloud
+module SematextCloud
   class Subscription
+    attr_accessor :additional_params
+
     attr_accessor :addresses
 
     attr_accessor :created_by
@@ -68,6 +70,7 @@ module stcloud
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'additional_params' => :'additionalParams',
         :'addresses' => :'addresses',
         :'created_by' => :'createdBy',
         :'dashboard_id' => :'dashboardId',
@@ -89,6 +92,7 @@ module stcloud
     # Attribute type mapping.
     def self.openapi_types
       {
+        :'additional_params' => :'Object',
         :'addresses' => :'Object',
         :'created_by' => :'Object',
         :'dashboard_id' => :'Object',
@@ -117,17 +121,21 @@ module stcloud
     # @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 `stcloud::Subscription` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `SematextCloud::Subscription` 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 `stcloud::Subscription`. 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 `SematextCloud::Subscription`. 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?(:'additional_params')
+        self.additional_params = attributes[:'additional_params']
+      end
+
       if attributes.key?(:'addresses')
         self.addresses = attributes[:'addresses']
       end
@@ -231,6 +239,7 @@ module stcloud
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          additional_params == o.additional_params &&
           addresses == o.addresses &&
           created_by == o.created_by &&
           dashboard_id == o.dashboard_id &&
@@ -257,7 +266,7 @@ module stcloud
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [addresses, created_by, dashboard_id, dashboard_name, enabled, filters, frequency, id, next_send_date, subject, system_id, system_name, text, time_range, user_permissions].hash
+      [additional_params, addresses, created_by, dashboard_id, dashboard_name, enabled, filters, frequency, id, next_send_date, subject, system_id, system_name, text, time_range, user_permissions].hash
     end
 
     # Builds the object from hash
@@ -326,7 +335,7 @@ module stcloud
           end
         end
       else # model
-        stcloud.const_get(type).build_from_hash(value)
+        SematextCloud.const_get(type).build_from_hash(value)
       end
     end
 

data/lib/SematextCloud/models/subscription_dashboard_dto.rb

@@ -6,13 +6,12 @@
 OpenAPI spec version: v3
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.12
-
+Swagger Codegen version: 3.0.30
 =end
 
 require 'date'
 
-module stcloud
+module SematextCloud
   class SubscriptionDashboardDto
     attr_accessor :addresses
 
@@ -76,72 +75,85 @@ module stcloud
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'addresses' => :'String',
-        :'dashboard_id' => :'Integer',
-        :'enable' => :'BOOLEAN',
-        :'filters' => :'String',
-        :'frequency' => :'String',
-        :'id' => :'Integer',
-        :'report_name' => :'String',
-        :'send_time' => :'DateTime',
-        :'subject' => :'String',
-        :'text' => :'String',
-        :'time_range' => :'String'
+        :'addresses' => :'Object',
+        :'dashboard_id' => :'Object',
+        :'enable' => :'Object',
+        :'filters' => :'Object',
+        :'frequency' => :'Object',
+        :'id' => :'Object',
+        :'report_name' => :'Object',
+        :'send_time' => :'Object',
+        :'subject' => :'Object',
+        :'text' => :'Object',
+        :'time_range' => :'Object'
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+  
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `SematextCloud::SubscriptionDashboardDto` initialize method"
+      end
 
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+      # 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 `SematextCloud::SubscriptionDashboardDto`. 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.has_key?(:'addresses')
+      if attributes.key?(:'addresses')
         self.addresses = attributes[:'addresses']
       end
 
-      if attributes.has_key?(:'dashboardId')
-        self.dashboard_id = attributes[:'dashboardId']
+      if attributes.key?(:'dashboard_id')
+        self.dashboard_id = attributes[:'dashboard_id']
       end
 
-      if attributes.has_key?(:'enable')
+      if attributes.key?(:'enable')
         self.enable = attributes[:'enable']
       end
 
-      if attributes.has_key?(:'filters')
+      if attributes.key?(:'filters')
         self.filters = attributes[:'filters']
       end
 
-      if attributes.has_key?(:'frequency')
+      if attributes.key?(:'frequency')
         self.frequency = attributes[:'frequency']
       end
 
-      if attributes.has_key?(:'id')
+      if attributes.key?(:'id')
         self.id = attributes[:'id']
       end
 
-      if attributes.has_key?(:'reportName')
-        self.report_name = attributes[:'reportName']
+      if attributes.key?(:'report_name')
+        self.report_name = attributes[:'report_name']
       end
 
-      if attributes.has_key?(:'sendTime')
-        self.send_time = attributes[:'sendTime']
+      if attributes.key?(:'send_time')
+        self.send_time = attributes[:'send_time']
       end
 
-      if attributes.has_key?(:'subject')
+      if attributes.key?(:'subject')
         self.subject = attributes[:'subject']
       end
 
-      if attributes.has_key?(:'text')
+      if attributes.key?(:'text')
         self.text = attributes[:'text']
       end
 
-      if attributes.has_key?(:'timeRange')
-        self.time_range = attributes[:'timeRange']
+      if attributes.key?(:'time_range')
+        self.time_range = attributes[:'time_range']
       end
     end
 
@@ -155,9 +167,9 @@ module stcloud
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      frequency_validator = EnumAttributeValidator.new('String', ['EVERY_FIVE_MINUTES', 'DAILY', 'WEEKLY', 'MONTHLY', 'QUARTERLY'])
+      frequency_validator = EnumAttributeValidator.new('Object', ['EVERY_FIVE_MINUTES', 'DAILY', 'WEEKLY', 'MONTHLY', 'QUARTERLY'])
       return false unless frequency_validator.valid?(@frequency)
-      time_range_validator = EnumAttributeValidator.new('String', ['ONE_DAY', 'ONE_WEEK', 'ONE_MONTH', 'TWO_MONTH', 'SIX_MONTH', 'ONE_YEAR'])
+      time_range_validator = EnumAttributeValidator.new('Object', ['ONE_DAY', 'ONE_WEEK', 'ONE_MONTH', 'TWO_MONTH', 'SIX_MONTH', 'ONE_YEAR'])
       return false unless time_range_validator.valid?(@time_range)
       true
     end
@@ -165,9 +177,9 @@ module stcloud
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] frequency Object to be assigned
     def frequency=(frequency)
-      validator = EnumAttributeValidator.new('String', ['EVERY_FIVE_MINUTES', 'DAILY', 'WEEKLY', 'MONTHLY', 'QUARTERLY'])
+      validator = EnumAttributeValidator.new('Object', ['EVERY_FIVE_MINUTES', 'DAILY', 'WEEKLY', 'MONTHLY', 'QUARTERLY'])
       unless validator.valid?(frequency)
-        fail ArgumentError, 'invalid value for "frequency", must be one of #{validator.allowable_values}.'
+        fail ArgumentError, "invalid value for \"frequency\", must be one of #{validator.allowable_values}."
       end
       @frequency = frequency
     end
@@ -175,9 +187,9 @@ module stcloud
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] time_range Object to be assigned
     def time_range=(time_range)
-      validator = EnumAttributeValidator.new('String', ['ONE_DAY', 'ONE_WEEK', 'ONE_MONTH', 'TWO_MONTH', 'SIX_MONTH', 'ONE_YEAR'])
+      validator = EnumAttributeValidator.new('Object', ['ONE_DAY', 'ONE_WEEK', 'ONE_MONTH', 'TWO_MONTH', 'SIX_MONTH', 'ONE_YEAR'])
       unless validator.valid?(time_range)
-        fail ArgumentError, 'invalid value for "time_range", must be one of #{validator.allowable_values}.'
+        fail ArgumentError, "invalid value for \"time_range\", must be one of #{validator.allowable_values}."
       end
       @time_range = time_range
     end
@@ -207,26 +219,35 @@ module stcloud
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [addresses, dashboard_id, enable, filters, frequency, id, report_name, send_time, subject, text, time_range].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)
-      self.class.swagger_types.each_pair do |key, type|
+      self.class.openapi_types.each_pair do |key, type|
         if type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the the attribute
+          # 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) })
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        elsif attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        end
       end
 
       self
@@ -248,7 +269,7 @@ module stcloud
         value.to_i
       when :Float
         value.to_f
-      when :BOOLEAN
+      when :Boolean
         if value.to_s =~ /\A(true|t|yes|y|1)\z/i
           true
         else
@@ -269,8 +290,7 @@ module stcloud
           end
         end
       else # model
-        temp_model = stcloud.const_get(type).new
-        temp_model.build_from_hash(value)
+        SematextCloud.const_get(type).build_from_hash(value)
       end
     end
 
@@ -292,7 +312,11 @@ module stcloud
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
         hash[param] = _to_hash(value)
       end
       hash
@@ -314,6 +338,5 @@ module stcloud
       else
         value
       end
-    end
-  end
+    end  end
 end