emass_client 1.0.3 → 1.0.5

data/lib/emass_client/models/workflow_instances_get.rb

@@ -1,107 +1,113 @@
 =begin
 #Enterprise Mission Assurance Support Service (eMASS)
 
-#The Enterprise Mission Assurance Support Service (eMASS) Representational State Transfer (REST) Application Programming Interface (API) enables users to perform assessments and complete actions associated with system records.   The `emasser` is a command-line interface (CLI) tool that implements all of the  eMASS endpoints defined in the eMASS REST API v3.2, dated October 21, 2021.</br><br>  <strong>Register CLI</strong></br> New users will need to register an API key with the eMASS development team prior to accessing the site for the first time. The eMASS REST API requires a client certificate (SSL/TLS, DoD PKI only) where {url}/api/register (POST) is used to register the client certificate.</br></br>  Every call to the eMASS REST API will require the use of the agreed upon public key certificate and API key. The API key must be provided in the request header for all endpoint calls (api-key). If the service receives an untrusted certificate or API key, a 401 error response code will be returned along with an error message.</br></br>  <strong>Available Request Headers:</strong></br> <table>   <tr>     <th align=left>key</th>     <th align=left>Example Value</th>     <th align=left>Description</th>   </tr>   <tr>     <td>`api-key`</td>     <td>api-key-provided-by-emass</td>     <td>This API key must be provided in the request header for all endpoint calls</td>   </tr>   <tr>     <td>`user-uid`</td>     <td>USER.UID.KEY</td>     <td>This User unique identifier key must be provided in the request header for all PUT, POST, and DELETE endpoint calls</td>   </tr>   <tr>     <td></td><td></td>     <td>       Note: For DoD users this is the DoD ID Number (EIDIPI) on their DoD CAC     </td>   </tr> </table>  </br><strong>Approve API Client for Actionable Requests</strong></br> Users are required to log-in to eMASS and grant permissions for a client to update data within eMASS on their behalf. This is only required for actionable requests (PUT, POST, DELETE). The Registration Endpoint and all GET requests can be accessed without completing this process with the correct permissions. Please note that leaving a field parameter blank (for PUT/POST requests) has the potential to clear information in the active eMASS records.  To establish an account with eMASS and/or acquire an api-key/user-uid, contact one of the listed POC: 
+#The Enterprise Mission Assurance Support Service (eMASS) Representational State Transfer (REST) Application Programming Interface (API) enables users to perform assessments and complete actions associated with system records.   <strong>Register External Application (that use the eMASS API)</strong></br> New users will need to [register](https://nisp.emass.apps.mil/Content/Help/jobaids/eMASS_OT_NewUser_Job_Aid.pdf) an API key with the eMASS development team prior to accessing the site for the first time. The eMASS REST API  requires a client certificate (SSL/TLS, DoD PKI only). Use the `Registration` endpoint to register the client certificate.</br></br>  Every call to the eMASS REST API will require the use of the agreed upon public key certificate and API key.  The API key must be provided in the request header for all endpoint calls (api-key). If the service receives an untrusted certificate or API key, a 401 error response code will be returned along with an error message.</br></br>  <strong>Available Request Headers</strong></br> <table>   <tr>     <th align=left>key</th>     <th align=left>Example Value</th>     <th align=left>Description</th>   </tr>   <tr>     <td>`api-key`</td>     <td>api-key-provided-by-emass</td>     <td>This API key must be provided in the request header for all endpoint calls</td>   </tr>   <tr>     <td>`user-uid`</td>     <td>USER.UID.KEY</td>     <td>This User unique identifier key must be provided in the request header for all PUT, POST, and DELETE endpoint calls</td>   </tr>   <tr>     <td></td><td></td>     <td>       Note: For DoD users this is the DoD ID Number (EIDIPI) on their DoD CAC     </td>   </tr> </table>  </br><strong>Approve API Client for Actionable Requests</strong></br> Users are required to log-in to eMASS and grant permissions for a client to update data within eMASS on their behalf. This is only required for actionable requests (PUT, POST, DELETE). The Registration Endpoint and all GET requests can be accessed without completing this process with the correct permissions. Please note that leaving a field parameter blank (for PUT/POST requests) has the potential to clear information in the active eMASS records.  To establish an account with eMASS and/or acquire an api-key/user-uid, contact one of the listed POC: 
 
-OpenAPI spec version: v3.2
+The version of the OpenAPI document: v3.3
 Contact: disa.meade.id.mbx.emass-tier-iii-support@mail.mil
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 3.0.26
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 6.0.0-SNAPSHOT
+
 =end
 
 require 'date'
+require 'time'
 
 module EmassClient
   class WorkflowInstancesGet
-    # [Read-Only] Date the workflow instance or the workflow transition was created.
-    attr_accessor :created_date
+    # [Read-Only] Unique workflow definition identifier.
+    attr_accessor :workflow_uid
 
-    # [Read-Only] Name of the current stage.
-    attr_accessor :current_stage
+    # [Read-only] Unique system record identifier.
+    attr_accessor :system_id
 
-    # [Read-Only] User that last acted on the workflow.
-    attr_accessor :last_edited_by
+    # [Read-Only] The system name.
+    attr_accessor :system_name
 
-    # [Read-Only] Date the workflow was last acted on.
-    attr_accessor :last_edited_date
+    # [Read-Only] Unique workflow instance identifier.
+    attr_accessor :workflow_instance_id
 
     # [Read-Only] The package name.
     attr_accessor :package_name
 
-    # [Read-Only] The system name.
-    attr_accessor :system_name
+    # [Read-Only] Date the workflow instance or the workflow transition was created.
+    attr_accessor :created_date
 
-    # [Read-Only] Version of the workflow definition.
-    attr_accessor :version
+    # [Read-Only] Date the workflow was last acted on.
+    attr_accessor :last_edited_date
+
+    # [Read-Only] User that last acted on the workflow.
+    attr_accessor :last_edited_by
 
     # [Read-Only] The workflow type.
     attr_accessor :workflow
 
-    # [Read-Only] Unique workflow instance identifier.
-    attr_accessor :workflow_instance_id
-
-    attr_accessor :transitions
+    # [Read-Only] Version of the workflow definition.
+    attr_accessor :version
 
-    class EnumAttributeValidator
-      attr_reader :datatype
-      attr_reader :allowable_values
-
-      def initialize(datatype, allowable_values)
-        @allowable_values = allowable_values.map do |value|
-          case datatype.to_s
-          when /Integer/i
-            value.to_i
-          when /Float/i
-            value.to_f
-          else
-            value
-          end
-        end
-      end
+    # [Read-Only] Name of the current stage.
+    attr_accessor :current_stage
 
-      def valid?(value)
-        !value || allowable_values.include?(value)
-      end
-    end
+    attr_accessor :transitions
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'workflow_uid' => :'workflowUid',
+        :'system_id' => :'systemId',
+        :'system_name' => :'systemName',
+        :'workflow_instance_id' => :'workflowInstanceId',
+        :'package_name' => :'packageName',
         :'created_date' => :'createdDate',
-        :'current_stage' => :'currentStage',
-        :'last_edited_by' => :'lastEditedBy',
         :'last_edited_date' => :'lastEditedDate',
-        :'package_name' => :'packageName',
-        :'system_name' => :'systemName',
-        :'version' => :'version',
+        :'last_edited_by' => :'lastEditedBy',
         :'workflow' => :'workflow',
-        :'workflow_instance_id' => :'workflowInstanceId',
+        :'version' => :'version',
+        :'current_stage' => :'currentStage',
         :'transitions' => :'transitions'
       }
     end
 
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'created_date' => :'Object',
-        :'current_stage' => :'Object',
-        :'last_edited_by' => :'Object',
-        :'last_edited_date' => :'Object',
-        :'package_name' => :'Object',
-        :'system_name' => :'Object',
-        :'version' => :'Object',
-        :'workflow' => :'Object',
-        :'workflow_instance_id' => :'Object',
-        :'transitions' => :'Object'
+        :'workflow_uid' => :'String',
+        :'system_id' => :'Integer',
+        :'system_name' => :'String',
+        :'workflow_instance_id' => :'Integer',
+        :'package_name' => :'String',
+        :'created_date' => :'Integer',
+        :'last_edited_date' => :'Integer',
+        :'last_edited_by' => :'String',
+        :'workflow' => :'String',
+        :'version' => :'String',
+        :'current_stage' => :'String',
+        :'transitions' => :'Array<InstancesTransitions>'
       }
     end
 
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
+        :'workflow_uid',
+        :'system_id',
+        :'system_name',
+        :'workflow_instance_id',
+        :'package_name',
+        :'created_date',
+        :'last_edited_date',
+        :'last_edited_by',
+        :'workflow',
+        :'version',
+        :'current_stage',
       ])
     end
-  
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -117,40 +123,48 @@ module EmassClient
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'created_date')
-        self.created_date = attributes[:'created_date']
+      if attributes.key?(:'workflow_uid')
+        self.workflow_uid = attributes[:'workflow_uid']
       end
 
-      if attributes.key?(:'current_stage')
-        self.current_stage = attributes[:'current_stage']
+      if attributes.key?(:'system_id')
+        self.system_id = attributes[:'system_id']
       end
 
-      if attributes.key?(:'last_edited_by')
-        self.last_edited_by = attributes[:'last_edited_by']
+      if attributes.key?(:'system_name')
+        self.system_name = attributes[:'system_name']
       end
 
-      if attributes.key?(:'last_edited_date')
-        self.last_edited_date = attributes[:'last_edited_date']
+      if attributes.key?(:'workflow_instance_id')
+        self.workflow_instance_id = attributes[:'workflow_instance_id']
       end
 
       if attributes.key?(:'package_name')
         self.package_name = attributes[:'package_name']
       end
 
-      if attributes.key?(:'system_name')
-        self.system_name = attributes[:'system_name']
+      if attributes.key?(:'created_date')
+        self.created_date = attributes[:'created_date']
       end
 
-      if attributes.key?(:'version')
-        self.version = attributes[:'version']
+      if attributes.key?(:'last_edited_date')
+        self.last_edited_date = attributes[:'last_edited_date']
+      end
+
+      if attributes.key?(:'last_edited_by')
+        self.last_edited_by = attributes[:'last_edited_by']
       end
 
       if attributes.key?(:'workflow')
         self.workflow = attributes[:'workflow']
       end
 
-      if attributes.key?(:'workflow_instance_id')
-        self.workflow_instance_id = attributes[:'workflow_instance_id']
+      if attributes.key?(:'version')
+        self.version = attributes[:'version']
+      end
+
+      if attributes.key?(:'current_stage')
+        self.current_stage = attributes[:'current_stage']
       end
 
       if attributes.key?(:'transitions')
@@ -170,71 +184,25 @@ module EmassClient
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      current_stage_validator = EnumAttributeValidator.new('Object', ['Echelon I', 'Echelon II', 'Echelon III', 'Categorize System', 'Submit Categorization', 'Approval', 'Cancel', 'Complete'])
-      return false unless current_stage_validator.valid?(@current_stage)
-      package_name_validator = EnumAttributeValidator.new('Object', ['Test POA&M Approval', 'Test RMF Step 1 package', 'Test RMF Step 2 package', 'Test RMF Step 3 package'])
-      return false unless package_name_validator.valid?(@package_name)
-      system_name_validator = EnumAttributeValidator.new('Object', ['Test system 1', 'Test system 2', 'Test system 3', 'Test system 4'])
-      return false unless system_name_validator.valid?(@system_name)
-      workflow_validator = EnumAttributeValidator.new('Object', ['POA&M Approval', 'RMF Step 1: Security Category', 'RMF Step 2: Security Category', 'RMF Step 3: Security Category'])
-      return false unless workflow_validator.valid?(@workflow)
       true
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] current_stage Object to be assigned
-    def current_stage=(current_stage)
-      validator = EnumAttributeValidator.new('Object', ['Echelon I', 'Echelon II', 'Echelon III', 'Categorize System', 'Submit Categorization', 'Approval', 'Cancel', 'Complete'])
-      unless validator.valid?(current_stage)
-        fail ArgumentError, "invalid value for \"current_stage\", must be one of #{validator.allowable_values}."
-      end
-      @current_stage = current_stage
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] package_name Object to be assigned
-    def package_name=(package_name)
-      validator = EnumAttributeValidator.new('Object', ['Test POA&M Approval', 'Test RMF Step 1 package', 'Test RMF Step 2 package', 'Test RMF Step 3 package'])
-      unless validator.valid?(package_name)
-        fail ArgumentError, "invalid value for \"package_name\", must be one of #{validator.allowable_values}."
-      end
-      @package_name = package_name
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] system_name Object to be assigned
-    def system_name=(system_name)
-      validator = EnumAttributeValidator.new('Object', ['Test system 1', 'Test system 2', 'Test system 3', 'Test system 4'])
-      unless validator.valid?(system_name)
-        fail ArgumentError, "invalid value for \"system_name\", must be one of #{validator.allowable_values}."
-      end
-      @system_name = system_name
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] workflow Object to be assigned
-    def workflow=(workflow)
-      validator = EnumAttributeValidator.new('Object', ['POA&M Approval', 'RMF Step 1: Security Category', 'RMF Step 2: Security Category', 'RMF Step 3: Security Category'])
-      unless validator.valid?(workflow)
-        fail ArgumentError, "invalid value for \"workflow\", must be one of #{validator.allowable_values}."
-      end
-      @workflow = workflow
-    end
-
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          workflow_uid == o.workflow_uid &&
+          system_id == o.system_id &&
+          system_name == o.system_name &&
+          workflow_instance_id == o.workflow_instance_id &&
+          package_name == o.package_name &&
           created_date == o.created_date &&
-          current_stage == o.current_stage &&
-          last_edited_by == o.last_edited_by &&
           last_edited_date == o.last_edited_date &&
-          package_name == o.package_name &&
-          system_name == o.system_name &&
-          version == o.version &&
+          last_edited_by == o.last_edited_by &&
           workflow == o.workflow &&
-          workflow_instance_id == o.workflow_instance_id &&
+          version == o.version &&
+          current_stage == o.current_stage &&
           transitions == o.transitions
     end
 
@@ -247,7 +215,7 @@ module EmassClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [created_date, current_stage, last_edited_by, last_edited_date, package_name, system_name, version, workflow, workflow_instance_id, transitions].hash
+      [workflow_uid, system_id, system_name, workflow_instance_id, package_name, created_date, last_edited_date, last_edited_by, workflow, version, current_stage, transitions].hash
     end
 
     # Builds the object from hash
@@ -262,8 +230,11 @@ module EmassClient
     # @return [Object] Returns the model itself
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
+      attributes = attributes.transform_keys(&:to_sym)
       self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -271,8 +242,6 @@ module EmassClient
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        elsif attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
         end
       end
 
@@ -285,8 +254,8 @@ module EmassClient
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -316,7 +285,9 @@ module EmassClient
           end
         end
       else # model
-        EmassClient.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = EmassClient.const_get(type)
+        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -364,5 +335,8 @@ module EmassClient
       else
         value
       end
-    end  end
+    end
+
+  end
+
 end

data/lib/emass_client/models/workflow_instances_response_get.rb

@@ -1,15 +1,17 @@
 =begin
 #Enterprise Mission Assurance Support Service (eMASS)
 
-#The Enterprise Mission Assurance Support Service (eMASS) Representational State Transfer (REST) Application Programming Interface (API) enables users to perform assessments and complete actions associated with system records.   The `emasser` is a command-line interface (CLI) tool that implements all of the  eMASS endpoints defined in the eMASS REST API v3.2, dated October 21, 2021.</br><br>  <strong>Register CLI</strong></br> New users will need to register an API key with the eMASS development team prior to accessing the site for the first time. The eMASS REST API requires a client certificate (SSL/TLS, DoD PKI only) where {url}/api/register (POST) is used to register the client certificate.</br></br>  Every call to the eMASS REST API will require the use of the agreed upon public key certificate and API key. The API key must be provided in the request header for all endpoint calls (api-key). If the service receives an untrusted certificate or API key, a 401 error response code will be returned along with an error message.</br></br>  <strong>Available Request Headers:</strong></br> <table>   <tr>     <th align=left>key</th>     <th align=left>Example Value</th>     <th align=left>Description</th>   </tr>   <tr>     <td>`api-key`</td>     <td>api-key-provided-by-emass</td>     <td>This API key must be provided in the request header for all endpoint calls</td>   </tr>   <tr>     <td>`user-uid`</td>     <td>USER.UID.KEY</td>     <td>This User unique identifier key must be provided in the request header for all PUT, POST, and DELETE endpoint calls</td>   </tr>   <tr>     <td></td><td></td>     <td>       Note: For DoD users this is the DoD ID Number (EIDIPI) on their DoD CAC     </td>   </tr> </table>  </br><strong>Approve API Client for Actionable Requests</strong></br> Users are required to log-in to eMASS and grant permissions for a client to update data within eMASS on their behalf. This is only required for actionable requests (PUT, POST, DELETE). The Registration Endpoint and all GET requests can be accessed without completing this process with the correct permissions. Please note that leaving a field parameter blank (for PUT/POST requests) has the potential to clear information in the active eMASS records.  To establish an account with eMASS and/or acquire an api-key/user-uid, contact one of the listed POC: 
+#The Enterprise Mission Assurance Support Service (eMASS) Representational State Transfer (REST) Application Programming Interface (API) enables users to perform assessments and complete actions associated with system records.   <strong>Register External Application (that use the eMASS API)</strong></br> New users will need to [register](https://nisp.emass.apps.mil/Content/Help/jobaids/eMASS_OT_NewUser_Job_Aid.pdf) an API key with the eMASS development team prior to accessing the site for the first time. The eMASS REST API  requires a client certificate (SSL/TLS, DoD PKI only). Use the `Registration` endpoint to register the client certificate.</br></br>  Every call to the eMASS REST API will require the use of the agreed upon public key certificate and API key.  The API key must be provided in the request header for all endpoint calls (api-key). If the service receives an untrusted certificate or API key, a 401 error response code will be returned along with an error message.</br></br>  <strong>Available Request Headers</strong></br> <table>   <tr>     <th align=left>key</th>     <th align=left>Example Value</th>     <th align=left>Description</th>   </tr>   <tr>     <td>`api-key`</td>     <td>api-key-provided-by-emass</td>     <td>This API key must be provided in the request header for all endpoint calls</td>   </tr>   <tr>     <td>`user-uid`</td>     <td>USER.UID.KEY</td>     <td>This User unique identifier key must be provided in the request header for all PUT, POST, and DELETE endpoint calls</td>   </tr>   <tr>     <td></td><td></td>     <td>       Note: For DoD users this is the DoD ID Number (EIDIPI) on their DoD CAC     </td>   </tr> </table>  </br><strong>Approve API Client for Actionable Requests</strong></br> Users are required to log-in to eMASS and grant permissions for a client to update data within eMASS on their behalf. This is only required for actionable requests (PUT, POST, DELETE). The Registration Endpoint and all GET requests can be accessed without completing this process with the correct permissions. Please note that leaving a field parameter blank (for PUT/POST requests) has the potential to clear information in the active eMASS records.  To establish an account with eMASS and/or acquire an api-key/user-uid, contact one of the listed POC: 
 
-OpenAPI spec version: v3.2
+The version of the OpenAPI document: v3.3
 Contact: disa.meade.id.mbx.emass-tier-iii-support@mail.mil
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 3.0.26
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 6.0.0-SNAPSHOT
+
 =end
 
 require 'date'
+require 'time'
 
 module EmassClient
   class WorkflowInstancesResponseGet
@@ -17,19 +19,28 @@ module EmassClient
 
     attr_accessor :data
 
+    attr_accessor :pagination
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'meta' => :'meta',
-        :'data' => :'data'
+        :'data' => :'data',
+        :'pagination' => :'pagination'
       }
     end
 
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'meta' => :'Object',
-        :'data' => :'Object'
+        :'meta' => :'Response200',
+        :'data' => :'Array<WorkflowInstancesGet>',
+        :'pagination' => :'WorkflowInstancesResponseGetPagination'
       }
     end
 
@@ -38,7 +49,7 @@ module EmassClient
       Set.new([
       ])
     end
-  
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -63,6 +74,10 @@ module EmassClient
           self.data = value
         end
       end
+
+      if attributes.key?(:'pagination')
+        self.pagination = attributes[:'pagination']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -84,7 +99,8 @@ module EmassClient
       return true if self.equal?(o)
       self.class == o.class &&
           meta == o.meta &&
-          data == o.data
+          data == o.data &&
+          pagination == o.pagination
     end
 
     # @see the `==` method
@@ -96,7 +112,7 @@ module EmassClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [meta, data].hash
+      [meta, data, pagination].hash
     end
 
     # Builds the object from hash
@@ -111,8 +127,11 @@ module EmassClient
     # @return [Object] Returns the model itself
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
+      attributes = attributes.transform_keys(&:to_sym)
       self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -120,8 +139,6 @@ module EmassClient
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        elsif attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
         end
       end
 
@@ -134,8 +151,8 @@ module EmassClient
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -165,7 +182,9 @@ module EmassClient
           end
         end
       else # model
-        EmassClient.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = EmassClient.const_get(type)
+        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -213,5 +232,8 @@ module EmassClient
       else
         value
       end
-    end  end
+    end
+
+  end
+
 end