merge_ruby_client 0.1.2 → 0.1.4

data/lib/merge_ruby_client/filestorage/types/data_passthrough_request.rb

@@ -94,17 +94,17 @@ module Merge
       def self.from_json(json_object:)
         struct = JSON.parse(json_object, object_class: OpenStruct)
         parsed_json = JSON.parse(json_object)
-        method = struct["method"]
-        path = struct["path"]
-        base_url_override = struct["base_url_override"]
-        data = struct["data"]
-        multipart_form_data = parsed_json["multipart_form_data"]&.map do |v|
-          v = v.to_json
-          Merge::Filestorage::MultipartFormFieldRequest.from_json(json_object: v)
+        method = parsed_json["method"]
+        path = parsed_json["path"]
+        base_url_override = parsed_json["base_url_override"]
+        data = parsed_json["data"]
+        multipart_form_data = parsed_json["multipart_form_data"]&.map do |item|
+          item = item.to_json
+          Merge::Filestorage::MultipartFormFieldRequest.from_json(json_object: item)
         end
-        headers = struct["headers"]
-        request_format = struct["request_format"]
-        normalize_response = struct["normalize_response"]
+        headers = parsed_json["headers"]
+        request_format = parsed_json["request_format"]
+        normalize_response = parsed_json["normalize_response"]
         new(
           method: method,
           path: path,

data/lib/merge_ruby_client/filestorage/types/debug_mode_log.rb

@@ -41,8 +41,8 @@ module Merge
       def self.from_json(json_object:)
         struct = JSON.parse(json_object, object_class: OpenStruct)
         parsed_json = JSON.parse(json_object)
-        log_id = struct["log_id"]
-        dashboard_view = struct["dashboard_view"]
+        log_id = parsed_json["log_id"]
+        dashboard_view = parsed_json["dashboard_view"]
         if parsed_json["log_summary"].nil?
           log_summary = nil
         else

data/lib/merge_ruby_client/filestorage/types/debug_model_log_summary.rb

@@ -39,9 +39,10 @@ module Merge
       # @return [Merge::Filestorage::DebugModelLogSummary]
       def self.from_json(json_object:)
         struct = JSON.parse(json_object, object_class: OpenStruct)
-        url = struct["url"]
-        method = struct["method"]
-        status_code = struct["status_code"]
+        parsed_json = JSON.parse(json_object)
+        url = parsed_json["url"]
+        method = parsed_json["method"]
+        status_code = parsed_json["status_code"]
         new(
           url: url,
           method: method,

data/lib/merge_ruby_client/filestorage/types/drive.rb

@@ -91,18 +91,18 @@ module Merge
       def self.from_json(json_object:)
         struct = JSON.parse(json_object, object_class: OpenStruct)
         parsed_json = JSON.parse(json_object)
-        id = struct["id"]
-        remote_id = struct["remote_id"]
+        id = parsed_json["id"]
+        remote_id = parsed_json["remote_id"]
         created_at = (DateTime.parse(parsed_json["created_at"]) unless parsed_json["created_at"].nil?)
         modified_at = (DateTime.parse(parsed_json["modified_at"]) unless parsed_json["modified_at"].nil?)
-        name = struct["name"]
+        name = parsed_json["name"]
         remote_created_at = unless parsed_json["remote_created_at"].nil?
                               DateTime.parse(parsed_json["remote_created_at"])
                             end
-        drive_url = struct["drive_url"]
-        remote_was_deleted = struct["remote_was_deleted"]
-        field_mappings = struct["field_mappings"]
-        remote_data = struct["remote_data"]
+        drive_url = parsed_json["drive_url"]
+        remote_was_deleted = parsed_json["remote_was_deleted"]
+        field_mappings = parsed_json["field_mappings"]
+        remote_data = parsed_json["remote_data"]
         new(
           id: id,
           remote_id: remote_id,

data/lib/merge_ruby_client/filestorage/types/error_validation_problem.rb

@@ -58,9 +58,9 @@ module Merge
           source = parsed_json["source"].to_json
           source = Merge::Filestorage::ValidationProblemSource.from_json(json_object: source)
         end
-        title = struct["title"]
-        detail = struct["detail"]
-        problem_type = struct["problem_type"]
+        title = parsed_json["title"]
+        detail = parsed_json["detail"]
+        problem_type = parsed_json["problem_type"]
         new(
           source: source,
           title: title,

data/lib/merge_ruby_client/filestorage/types/event_type_enum.rb

@@ -46,6 +46,7 @@ module Merge
     #  - `ENABLED_MERGE_WEBHOOK` - ENABLED_MERGE_WEBHOOK
     #  - `DISABLED_MERGE_WEBHOOK` - DISABLED_MERGE_WEBHOOK
     #  - `MERGE_WEBHOOK_TARGET_CHANGED` - MERGE_WEBHOOK_TARGET_CHANGED
+    #  - `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED
     class EventTypeEnum
       CREATED_REMOTE_PRODUCTION_API_KEY = "CREATED_REMOTE_PRODUCTION_API_KEY"
       DELETED_REMOTE_PRODUCTION_API_KEY = "DELETED_REMOTE_PRODUCTION_API_KEY"
@@ -84,6 +85,7 @@ module Merge
       ENABLED_MERGE_WEBHOOK = "ENABLED_MERGE_WEBHOOK"
       DISABLED_MERGE_WEBHOOK = "DISABLED_MERGE_WEBHOOK"
       MERGE_WEBHOOK_TARGET_CHANGED = "MERGE_WEBHOOK_TARGET_CHANGED"
+      END_USER_CREDENTIALS_ACCESSED = "END_USER_CREDENTIALS_ACCESSED"
     end
   end
 end

data/lib/merge_ruby_client/filestorage/types/external_target_field_api.rb

@@ -41,9 +41,10 @@ module Merge
       # @return [Merge::Filestorage::ExternalTargetFieldApi]
       def self.from_json(json_object:)
         struct = JSON.parse(json_object, object_class: OpenStruct)
-        name = struct["name"]
-        description = struct["description"]
-        is_mapped = struct["is_mapped"]
+        parsed_json = JSON.parse(json_object)
+        name = parsed_json["name"]
+        description = parsed_json["description"]
+        is_mapped = parsed_json["is_mapped"]
         new(
           name: name,
           description: description,

data/lib/merge_ruby_client/filestorage/types/external_target_field_api_response.rb

@@ -57,25 +57,25 @@ module Merge
       def self.from_json(json_object:)
         struct = JSON.parse(json_object, object_class: OpenStruct)
         parsed_json = JSON.parse(json_object)
-        file = parsed_json["File"]&.map do |v|
-          v = v.to_json
-          Merge::Filestorage::ExternalTargetFieldApi.from_json(json_object: v)
+        file = parsed_json["File"]&.map do |item|
+          item = item.to_json
+          Merge::Filestorage::ExternalTargetFieldApi.from_json(json_object: item)
         end
-        folder = parsed_json["Folder"]&.map do |v|
-          v = v.to_json
-          Merge::Filestorage::ExternalTargetFieldApi.from_json(json_object: v)
+        folder = parsed_json["Folder"]&.map do |item|
+          item = item.to_json
+          Merge::Filestorage::ExternalTargetFieldApi.from_json(json_object: item)
         end
-        drive = parsed_json["Drive"]&.map do |v|
-          v = v.to_json
-          Merge::Filestorage::ExternalTargetFieldApi.from_json(json_object: v)
+        drive = parsed_json["Drive"]&.map do |item|
+          item = item.to_json
+          Merge::Filestorage::ExternalTargetFieldApi.from_json(json_object: item)
         end
-        group = parsed_json["Group"]&.map do |v|
-          v = v.to_json
-          Merge::Filestorage::ExternalTargetFieldApi.from_json(json_object: v)
+        group = parsed_json["Group"]&.map do |item|
+          item = item.to_json
+          Merge::Filestorage::ExternalTargetFieldApi.from_json(json_object: item)
         end
-        user = parsed_json["User"]&.map do |v|
-          v = v.to_json
-          Merge::Filestorage::ExternalTargetFieldApi.from_json(json_object: v)
+        user = parsed_json["User"]&.map do |item|
+          item = item.to_json
+          Merge::Filestorage::ExternalTargetFieldApi.from_json(json_object: item)
         end
         new(
           file: file,

data/lib/merge_ruby_client/filestorage/types/field_mapping_api_instance.rb

@@ -54,8 +54,8 @@ module Merge
       def self.from_json(json_object:)
         struct = JSON.parse(json_object, object_class: OpenStruct)
         parsed_json = JSON.parse(json_object)
-        id = struct["id"]
-        is_integration_wide = struct["is_integration_wide"]
+        id = parsed_json["id"]
+        is_integration_wide = parsed_json["is_integration_wide"]
         if parsed_json["target_field"].nil?
           target_field = nil
         else

data/lib/merge_ruby_client/filestorage/types/field_mapping_api_instance_remote_field.rb

@@ -45,8 +45,8 @@ module Merge
       def self.from_json(json_object:)
         struct = JSON.parse(json_object, object_class: OpenStruct)
         parsed_json = JSON.parse(json_object)
-        remote_key_name = struct["remote_key_name"]
-        schema = struct["schema"]
+        remote_key_name = parsed_json["remote_key_name"]
+        schema = parsed_json["schema"]
         if parsed_json["remote_endpoint_info"].nil?
           remote_endpoint_info = nil
         else

data/lib/merge_ruby_client/filestorage/types/field_mapping_api_instance_remote_field_remote_endpoint_info.rb

@@ -46,9 +46,10 @@ module Merge
       # @return [Merge::Filestorage::FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo]
       def self.from_json(json_object:)
         struct = JSON.parse(json_object, object_class: OpenStruct)
-        method = struct["method"]
-        url_path = struct["url_path"]
-        field_traversal_path = struct["field_traversal_path"]
+        parsed_json = JSON.parse(json_object)
+        method = parsed_json["method"]
+        url_path = parsed_json["url_path"]
+        field_traversal_path = parsed_json["field_traversal_path"]
         new(
           method: method,
           url_path: url_path,

data/lib/merge_ruby_client/filestorage/types/field_mapping_api_instance_response.rb

@@ -57,25 +57,25 @@ module Merge
       def self.from_json(json_object:)
         struct = JSON.parse(json_object, object_class: OpenStruct)
         parsed_json = JSON.parse(json_object)
-        file = parsed_json["File"]&.map do |v|
-          v = v.to_json
-          Merge::Filestorage::FieldMappingApiInstance.from_json(json_object: v)
+        file = parsed_json["File"]&.map do |item|
+          item = item.to_json
+          Merge::Filestorage::FieldMappingApiInstance.from_json(json_object: item)
         end
-        folder = parsed_json["Folder"]&.map do |v|
-          v = v.to_json
-          Merge::Filestorage::FieldMappingApiInstance.from_json(json_object: v)
+        folder = parsed_json["Folder"]&.map do |item|
+          item = item.to_json
+          Merge::Filestorage::FieldMappingApiInstance.from_json(json_object: item)
         end
-        drive = parsed_json["Drive"]&.map do |v|
-          v = v.to_json
-          Merge::Filestorage::FieldMappingApiInstance.from_json(json_object: v)
+        drive = parsed_json["Drive"]&.map do |item|
+          item = item.to_json
+          Merge::Filestorage::FieldMappingApiInstance.from_json(json_object: item)
         end
-        group = parsed_json["Group"]&.map do |v|
-          v = v.to_json
-          Merge::Filestorage::FieldMappingApiInstance.from_json(json_object: v)
+        group = parsed_json["Group"]&.map do |item|
+          item = item.to_json
+          Merge::Filestorage::FieldMappingApiInstance.from_json(json_object: item)
         end
-        user = parsed_json["User"]&.map do |v|
-          v = v.to_json
-          Merge::Filestorage::FieldMappingApiInstance.from_json(json_object: v)
+        user = parsed_json["User"]&.map do |item|
+          item = item.to_json
+          Merge::Filestorage::FieldMappingApiInstance.from_json(json_object: item)
         end
         new(
           file: file,

data/lib/merge_ruby_client/filestorage/types/field_mapping_api_instance_target_field.rb

@@ -39,9 +39,10 @@ module Merge
       # @return [Merge::Filestorage::FieldMappingApiInstanceTargetField]
       def self.from_json(json_object:)
         struct = JSON.parse(json_object, object_class: OpenStruct)
-        name = struct["name"]
-        description = struct["description"]
-        is_organization_wide = struct["is_organization_wide"]
+        parsed_json = JSON.parse(json_object)
+        name = parsed_json["name"]
+        description = parsed_json["description"]
+        is_organization_wide = parsed_json["is_organization_wide"]
         new(
           name: name,
           description: description,

data/lib/merge_ruby_client/filestorage/types/field_mapping_instance_response.rb

@@ -56,17 +56,17 @@ module Merge
           model = parsed_json["model"].to_json
           model = Merge::Filestorage::FieldMappingApiInstance.from_json(json_object: model)
         end
-        warnings = parsed_json["warnings"]&.map do |v|
-          v = v.to_json
-          Merge::Filestorage::WarningValidationProblem.from_json(json_object: v)
+        warnings = parsed_json["warnings"]&.map do |item|
+          item = item.to_json
+          Merge::Filestorage::WarningValidationProblem.from_json(json_object: item)
         end
-        errors = parsed_json["errors"]&.map do |v|
-          v = v.to_json
-          Merge::Filestorage::ErrorValidationProblem.from_json(json_object: v)
+        errors = parsed_json["errors"]&.map do |item|
+          item = item.to_json
+          Merge::Filestorage::ErrorValidationProblem.from_json(json_object: item)
         end
-        logs = parsed_json["logs"]&.map do |v|
-          v = v.to_json
-          Merge::Filestorage::DebugModeLog.from_json(json_object: v)
+        logs = parsed_json["logs"]&.map do |item|
+          item = item.to_json
+          Merge::Filestorage::DebugModeLog.from_json(json_object: item)
         end
         new(
           model: model,

data/lib/merge_ruby_client/filestorage/types/field_permission_deserializer.rb

@@ -37,8 +37,9 @@ module Merge
       # @return [Merge::Filestorage::FieldPermissionDeserializer]
       def self.from_json(json_object:)
         struct = JSON.parse(json_object, object_class: OpenStruct)
-        enabled = struct["enabled"]
-        disabled = struct["disabled"]
+        parsed_json = JSON.parse(json_object)
+        enabled = parsed_json["enabled"]
+        disabled = parsed_json["disabled"]
         new(
           enabled: enabled,
           disabled: disabled,

data/lib/merge_ruby_client/filestorage/types/field_permission_deserializer_request.rb

@@ -37,8 +37,9 @@ module Merge
       # @return [Merge::Filestorage::FieldPermissionDeserializerRequest]
       def self.from_json(json_object:)
         struct = JSON.parse(json_object, object_class: OpenStruct)
-        enabled = struct["enabled"]
-        disabled = struct["disabled"]
+        parsed_json = JSON.parse(json_object)
+        enabled = parsed_json["enabled"]
+        disabled = parsed_json["disabled"]
         new(
           enabled: enabled,
           disabled: disabled,

data/lib/merge_ruby_client/filestorage/types/file.rb

@@ -138,16 +138,16 @@ module Merge
       def self.from_json(json_object:)
         struct = JSON.parse(json_object, object_class: OpenStruct)
         parsed_json = JSON.parse(json_object)
-        id = struct["id"]
-        remote_id = struct["remote_id"]
+        id = parsed_json["id"]
+        remote_id = parsed_json["remote_id"]
         created_at = (DateTime.parse(parsed_json["created_at"]) unless parsed_json["created_at"].nil?)
         modified_at = (DateTime.parse(parsed_json["modified_at"]) unless parsed_json["modified_at"].nil?)
-        name = struct["name"]
-        file_url = struct["file_url"]
-        file_thumbnail_url = struct["file_thumbnail_url"]
-        size = struct["size"]
-        mime_type = struct["mime_type"]
-        description = struct["description"]
+        name = parsed_json["name"]
+        file_url = parsed_json["file_url"]
+        file_thumbnail_url = parsed_json["file_thumbnail_url"]
+        size = parsed_json["size"]
+        mime_type = parsed_json["mime_type"]
+        description = parsed_json["description"]
         if parsed_json["folder"].nil?
           folder = nil
         else
@@ -172,9 +172,9 @@ module Merge
         remote_updated_at = unless parsed_json["remote_updated_at"].nil?
                               DateTime.parse(parsed_json["remote_updated_at"])
                             end
-        remote_was_deleted = struct["remote_was_deleted"]
-        field_mappings = struct["field_mappings"]
-        remote_data = struct["remote_data"]
+        remote_was_deleted = parsed_json["remote_was_deleted"]
+        field_mappings = parsed_json["field_mappings"]
+        remote_data = parsed_json["remote_data"]
         new(
           id: id,
           remote_id: remote_id,

data/lib/merge_ruby_client/filestorage/types/file_drive.rb

@@ -15,7 +15,7 @@ module Merge
         struct = JSON.parse(json_object, object_class: OpenStruct)
         begin
           struct.is_a?(String) != false || raise("Passed value for field struct is not the expected type, validation failed.")
-          return json_object unless json_object.nil?
+          return struct unless struct.nil?
 
           return nil
         rescue StandardError
@@ -23,7 +23,7 @@ module Merge
         end
         begin
           Merge::Filestorage::Drive.validate_raw(obj: struct)
-          return Merge::Filestorage::Drive.from_json(json_object: json_object) unless json_object.nil?
+          return Merge::Filestorage::Drive.from_json(json_object: struct) unless struct.nil?
 
           return nil
         rescue StandardError

data/lib/merge_ruby_client/filestorage/types/file_folder.rb

@@ -15,7 +15,7 @@ module Merge
         struct = JSON.parse(json_object, object_class: OpenStruct)
         begin
           struct.is_a?(String) != false || raise("Passed value for field struct is not the expected type, validation failed.")
-          return json_object unless json_object.nil?
+          return struct unless struct.nil?
 
           return nil
         rescue StandardError
@@ -23,7 +23,7 @@ module Merge
         end
         begin
           Merge::Filestorage::Folder.validate_raw(obj: struct)
-          return Merge::Filestorage::Folder.from_json(json_object: json_object) unless json_object.nil?
+          return Merge::Filestorage::Folder.from_json(json_object: struct) unless struct.nil?
 
           return nil
         rescue StandardError

data/lib/merge_ruby_client/filestorage/types/file_permissions.rb

@@ -17,7 +17,7 @@ module Merge
         struct = JSON.parse(json_object, object_class: OpenStruct)
         begin
           struct.is_a?(String) != false || raise("Passed value for field struct is not the expected type, validation failed.")
-          return json_object unless json_object.nil?
+          return struct unless struct.nil?
 
           return nil
         rescue StandardError
@@ -25,7 +25,7 @@ module Merge
         end
         begin
           Merge::Filestorage::PermissionRequest.validate_raw(obj: struct)
-          return Merge::Filestorage::PermissionRequest.from_json(json_object: json_object) unless json_object.nil?
+          return Merge::Filestorage::PermissionRequest.from_json(json_object: struct) unless struct.nil?
 
           return nil
         rescue StandardError
@@ -33,11 +33,11 @@ module Merge
         end
         begin
           struct.is_a?(Array) != false || raise("Passed value for field struct is not the expected type, validation failed.")
-          return nil if json_object.nil?
+          return nil if struct.nil?
 
-          return json_object&.map do |v|
-                   v = v.to_json
-                   Merge::Filestorage::FilePermissionsItem.from_json(json_object: v)
+          return struct&.map do |item|
+                   item = item.to_json
+                   Merge::Filestorage::FilePermissionsItem.from_json(json_object: item)
                  end
         rescue StandardError
           # noop

data/lib/merge_ruby_client/filestorage/types/file_permissions_item.rb

@@ -14,7 +14,7 @@ module Merge
         struct = JSON.parse(json_object, object_class: OpenStruct)
         begin
           struct.is_a?(String) != false || raise("Passed value for field struct is not the expected type, validation failed.")
-          return json_object unless json_object.nil?
+          return struct unless struct.nil?
 
           return nil
         rescue StandardError
@@ -22,7 +22,7 @@ module Merge
         end
         begin
           Merge::Filestorage::PermissionRequest.validate_raw(obj: struct)
-          return Merge::Filestorage::PermissionRequest.from_json(json_object: json_object) unless json_object.nil?
+          return Merge::Filestorage::PermissionRequest.from_json(json_object: struct) unless struct.nil?
 
           return nil
         rescue StandardError

data/lib/merge_ruby_client/filestorage/types/file_request.rb

@@ -100,12 +100,12 @@ module Merge
       def self.from_json(json_object:)
         struct = JSON.parse(json_object, object_class: OpenStruct)
         parsed_json = JSON.parse(json_object)
-        name = struct["name"]
-        file_url = struct["file_url"]
-        file_thumbnail_url = struct["file_thumbnail_url"]
-        size = struct["size"]
-        mime_type = struct["mime_type"]
-        description = struct["description"]
+        name = parsed_json["name"]
+        file_url = parsed_json["file_url"]
+        file_thumbnail_url = parsed_json["file_thumbnail_url"]
+        size = parsed_json["size"]
+        mime_type = parsed_json["mime_type"]
+        description = parsed_json["description"]
         if parsed_json["folder"].nil?
           folder = nil
         else
@@ -124,8 +124,8 @@ module Merge
           drive = parsed_json["drive"].to_json
           drive = Merge::Filestorage::FileRequestDrive.from_json(json_object: drive)
         end
-        integration_params = struct["integration_params"]
-        linked_account_params = struct["linked_account_params"]
+        integration_params = parsed_json["integration_params"]
+        linked_account_params = parsed_json["linked_account_params"]
         new(
           name: name,
           file_url: file_url,

data/lib/merge_ruby_client/filestorage/types/file_request_drive.rb

@@ -15,7 +15,7 @@ module Merge
         struct = JSON.parse(json_object, object_class: OpenStruct)
         begin
           struct.is_a?(String) != false || raise("Passed value for field struct is not the expected type, validation failed.")
-          return json_object unless json_object.nil?
+          return struct unless struct.nil?
 
           return nil
         rescue StandardError
@@ -23,7 +23,7 @@ module Merge
         end
         begin
           Merge::Filestorage::Drive.validate_raw(obj: struct)
-          return Merge::Filestorage::Drive.from_json(json_object: json_object) unless json_object.nil?
+          return Merge::Filestorage::Drive.from_json(json_object: struct) unless struct.nil?
 
           return nil
         rescue StandardError

data/lib/merge_ruby_client/filestorage/types/file_request_folder.rb

@@ -15,7 +15,7 @@ module Merge
         struct = JSON.parse(json_object, object_class: OpenStruct)
         begin
           struct.is_a?(String) != false || raise("Passed value for field struct is not the expected type, validation failed.")
-          return json_object unless json_object.nil?
+          return struct unless struct.nil?
 
           return nil
         rescue StandardError
@@ -23,7 +23,7 @@ module Merge
         end
         begin
           Merge::Filestorage::Folder.validate_raw(obj: struct)
-          return Merge::Filestorage::Folder.from_json(json_object: json_object) unless json_object.nil?
+          return Merge::Filestorage::Folder.from_json(json_object: struct) unless struct.nil?
 
           return nil
         rescue StandardError

data/lib/merge_ruby_client/filestorage/types/file_request_permissions.rb

@@ -17,7 +17,7 @@ module Merge
         struct = JSON.parse(json_object, object_class: OpenStruct)
         begin
           struct.is_a?(String) != false || raise("Passed value for field struct is not the expected type, validation failed.")
-          return json_object unless json_object.nil?
+          return struct unless struct.nil?
 
           return nil
         rescue StandardError
@@ -25,7 +25,7 @@ module Merge
         end
         begin
           Merge::Filestorage::PermissionRequest.validate_raw(obj: struct)
-          return Merge::Filestorage::PermissionRequest.from_json(json_object: json_object) unless json_object.nil?
+          return Merge::Filestorage::PermissionRequest.from_json(json_object: struct) unless struct.nil?
 
           return nil
         rescue StandardError
@@ -33,11 +33,11 @@ module Merge
         end
         begin
           struct.is_a?(Array) != false || raise("Passed value for field struct is not the expected type, validation failed.")
-          return nil if json_object.nil?
+          return nil if struct.nil?
 
-          return json_object&.map do |v|
-                   v = v.to_json
-                   Merge::Filestorage::FileRequestPermissionsItem.from_json(json_object: v)
+          return struct&.map do |item|
+                   item = item.to_json
+                   Merge::Filestorage::FileRequestPermissionsItem.from_json(json_object: item)
                  end
         rescue StandardError
           # noop

data/lib/merge_ruby_client/filestorage/types/file_request_permissions_item.rb

@@ -14,7 +14,7 @@ module Merge
         struct = JSON.parse(json_object, object_class: OpenStruct)
         begin
           struct.is_a?(String) != false || raise("Passed value for field struct is not the expected type, validation failed.")
-          return json_object unless json_object.nil?
+          return struct unless struct.nil?
 
           return nil
         rescue StandardError
@@ -22,7 +22,7 @@ module Merge
         end
         begin
           Merge::Filestorage::PermissionRequest.validate_raw(obj: struct)
-          return Merge::Filestorage::PermissionRequest.from_json(json_object: json_object) unless json_object.nil?
+          return Merge::Filestorage::PermissionRequest.from_json(json_object: struct) unless struct.nil?
 
           return nil
         rescue StandardError

data/lib/merge_ruby_client/filestorage/types/file_storage_file_response.rb

@@ -56,17 +56,17 @@ module Merge
           model = parsed_json["model"].to_json
           model = Merge::Filestorage::File.from_json(json_object: model)
         end
-        warnings = parsed_json["warnings"]&.map do |v|
-          v = v.to_json
-          Merge::Filestorage::WarningValidationProblem.from_json(json_object: v)
+        warnings = parsed_json["warnings"]&.map do |item|
+          item = item.to_json
+          Merge::Filestorage::WarningValidationProblem.from_json(json_object: item)
         end
-        errors = parsed_json["errors"]&.map do |v|
-          v = v.to_json
-          Merge::Filestorage::ErrorValidationProblem.from_json(json_object: v)
+        errors = parsed_json["errors"]&.map do |item|
+          item = item.to_json
+          Merge::Filestorage::ErrorValidationProblem.from_json(json_object: item)
         end
-        logs = parsed_json["logs"]&.map do |v|
-          v = v.to_json
-          Merge::Filestorage::DebugModeLog.from_json(json_object: v)
+        logs = parsed_json["logs"]&.map do |item|
+          item = item.to_json
+          Merge::Filestorage::DebugModeLog.from_json(json_object: item)
         end
         new(
           model: model,

data/lib/merge_ruby_client/filestorage/types/file_storage_folder_response.rb

@@ -56,17 +56,17 @@ module Merge
           model = parsed_json["model"].to_json
           model = Merge::Filestorage::Folder.from_json(json_object: model)
         end
-        warnings = parsed_json["warnings"]&.map do |v|
-          v = v.to_json
-          Merge::Filestorage::WarningValidationProblem.from_json(json_object: v)
+        warnings = parsed_json["warnings"]&.map do |item|
+          item = item.to_json
+          Merge::Filestorage::WarningValidationProblem.from_json(json_object: item)
         end
-        errors = parsed_json["errors"]&.map do |v|
-          v = v.to_json
-          Merge::Filestorage::ErrorValidationProblem.from_json(json_object: v)
+        errors = parsed_json["errors"]&.map do |item|
+          item = item.to_json
+          Merge::Filestorage::ErrorValidationProblem.from_json(json_object: item)
         end
-        logs = parsed_json["logs"]&.map do |v|
-          v = v.to_json
-          Merge::Filestorage::DebugModeLog.from_json(json_object: v)
+        logs = parsed_json["logs"]&.map do |item|
+          item = item.to_json
+          Merge::Filestorage::DebugModeLog.from_json(json_object: item)
         end
         new(
           model: model,