merge_ruby_client 0.1.3 → 0.1.4

data/lib/merge_ruby_client/hris/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/hris/types/remote_field_api.rb

@@ -37,12 +37,12 @@ module Merge
       # @param coverage [Merge::Hris::RemoteFieldApiCoverage]
       # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
       # @return [Merge::Hris::RemoteFieldApi]
-      def initialize(schema:, remote_key_name:, remote_endpoint_info:, example_values:, advanced_metadata: OMIT,
+      def initialize(schema:, remote_key_name:, remote_endpoint_info:, example_values: OMIT, advanced_metadata: OMIT,
                      coverage: OMIT, additional_properties: nil)
         @schema = schema
         @remote_key_name = remote_key_name
         @remote_endpoint_info = remote_endpoint_info
-        @example_values = example_values
+        @example_values = example_values if example_values != OMIT
         @advanced_metadata = advanced_metadata if advanced_metadata != OMIT
         @coverage = coverage if coverage != OMIT
         @additional_properties = additional_properties
@@ -114,7 +114,7 @@ module Merge
         obj.schema.is_a?(Hash) != false || raise("Passed value for field obj.schema is not the expected type, validation failed.")
         obj.remote_key_name.is_a?(String) != false || raise("Passed value for field obj.remote_key_name is not the expected type, validation failed.")
         Merge::Hris::RemoteEndpointInfo.validate_raw(obj: obj.remote_endpoint_info)
-        obj.example_values.is_a?(Array) != false || raise("Passed value for field obj.example_values is not the expected type, validation failed.")
+        obj.example_values&.is_a?(Array) != false || raise("Passed value for field obj.example_values is not the expected type, validation failed.")
         obj.advanced_metadata.nil? || Merge::Hris::AdvancedMetadata.validate_raw(obj: obj.advanced_metadata)
         obj.coverage.nil? || Merge::Hris::RemoteFieldApiCoverage.validate_raw(obj: obj.coverage)
       end

data/lib/merge_ruby_client/ticketing/attachments/client.rb

@@ -163,7 +163,7 @@ module Merge
         Merge::Ticketing::Attachment.from_json(json_object: response.body)
       end
 
-      # Returns an `Attachment` object with the given `id`.
+      # Returns the `File` content with the given `id` as a stream of bytes.
       #
       # @param id [String]
       # @param mime_type [String] If provided, specifies the export format of the file to be downloaded. For
@@ -393,7 +393,7 @@ module Merge
         end
       end
 
-      # Returns an `Attachment` object with the given `id`.
+      # Returns the `File` content with the given `id` as a stream of bytes.
       #
       # @param id [String]
       # @param mime_type [String] If provided, specifies the export format of the file to be downloaded. For

data/lib/merge_ruby_client/ticketing/audit_trail/client.rb

@@ -40,7 +40,8 @@ module Merge
       #  `DELETED_INTEGRATION_WIDE_FIELD_MAPPING`,
       #  `DELETED_LINKED_ACCOUNT_FIELD_MAPPING`, `FORCED_LINKED_ACCOUNT_RESYNC`,
       #  `MUTED_ISSUE`, `GENERATED_MAGIC_LINK`, `ENABLED_MERGE_WEBHOOK`,
-      #  `DISABLED_MERGE_WEBHOOK`, `MERGE_WEBHOOK_TARGET_CHANGED`
+      #  `DISABLED_MERGE_WEBHOOK`, `MERGE_WEBHOOK_TARGET_CHANGED`,
+      #  `END_USER_CREDENTIALS_ACCESSED`
       # @param page_size [Integer] Number of results to return per page.
       # @param start_date [String] If included, will only include audit trail events that occurred after this time
       # @param user_email [String] If provided, this will return events associated with the specified user email.
@@ -118,7 +119,8 @@ module Merge
       #  `DELETED_INTEGRATION_WIDE_FIELD_MAPPING`,
       #  `DELETED_LINKED_ACCOUNT_FIELD_MAPPING`, `FORCED_LINKED_ACCOUNT_RESYNC`,
       #  `MUTED_ISSUE`, `GENERATED_MAGIC_LINK`, `ENABLED_MERGE_WEBHOOK`,
-      #  `DISABLED_MERGE_WEBHOOK`, `MERGE_WEBHOOK_TARGET_CHANGED`
+      #  `DISABLED_MERGE_WEBHOOK`, `MERGE_WEBHOOK_TARGET_CHANGED`,
+      #  `END_USER_CREDENTIALS_ACCESSED`
       # @param page_size [Integer] Number of results to return per page.
       # @param start_date [String] If included, will only include audit trail events that occurred after this time
       # @param user_email [String] If provided, this will return events associated with the specified user email.

data/lib/merge_ruby_client/ticketing/issues/client.rb

@@ -19,7 +19,7 @@ module Merge
         @request_client = request_client
       end
 
-      # Gets issues.
+      # Gets all issues for Organization.
       #
       # @param account_token [String]
       # @param cursor [String] The pagination cursor value.
@@ -36,6 +36,8 @@ module Merge
       #  datetime.
       # @param last_incident_time_before [DateTime] If provided, will only return issues whose last incident time was before this
       #  datetime.
+      # @param linked_account_id [String] If provided, will only include issues pertaining to the linked account passed
+      #  in.
       # @param page_size [Integer] Number of results to return per page.
       # @param start_date [String] If included, will only include issues whose most recent action occurred after
       #  this time
@@ -52,7 +54,7 @@ module Merge
       #  )
       #  api.ticketing.issues.list
       def list(account_token: nil, cursor: nil, end_date: nil, end_user_organization_name: nil,
-               first_incident_time_after: nil, first_incident_time_before: nil, include_muted: nil, integration_name: nil, last_incident_time_after: nil, last_incident_time_before: nil, page_size: nil, start_date: nil, status: nil, request_options: nil)
+               first_incident_time_after: nil, first_incident_time_before: nil, include_muted: nil, integration_name: nil, last_incident_time_after: nil, last_incident_time_before: nil, linked_account_id: nil, page_size: nil, start_date: nil, status: nil, request_options: nil)
         response = @request_client.conn.get do |req|
           req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
           req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
@@ -74,6 +76,7 @@ module Merge
             "integration_name": integration_name,
             "last_incident_time_after": last_incident_time_after,
             "last_incident_time_before": last_incident_time_before,
+            "linked_account_id": linked_account_id,
             "page_size": page_size,
             "start_date": start_date,
             "status": status
@@ -130,7 +133,7 @@ module Merge
         @request_client = request_client
       end
 
-      # Gets issues.
+      # Gets all issues for Organization.
       #
       # @param account_token [String]
       # @param cursor [String] The pagination cursor value.
@@ -147,6 +150,8 @@ module Merge
       #  datetime.
       # @param last_incident_time_before [DateTime] If provided, will only return issues whose last incident time was before this
       #  datetime.
+      # @param linked_account_id [String] If provided, will only include issues pertaining to the linked account passed
+      #  in.
       # @param page_size [Integer] Number of results to return per page.
       # @param start_date [String] If included, will only include issues whose most recent action occurred after
       #  this time
@@ -163,7 +168,7 @@ module Merge
       #  )
       #  api.ticketing.issues.list
       def list(account_token: nil, cursor: nil, end_date: nil, end_user_organization_name: nil,
-               first_incident_time_after: nil, first_incident_time_before: nil, include_muted: nil, integration_name: nil, last_incident_time_after: nil, last_incident_time_before: nil, page_size: nil, start_date: nil, status: nil, request_options: nil)
+               first_incident_time_after: nil, first_incident_time_before: nil, include_muted: nil, integration_name: nil, last_incident_time_after: nil, last_incident_time_before: nil, linked_account_id: nil, page_size: nil, start_date: nil, status: nil, request_options: nil)
         Async do
           response = @request_client.conn.get do |req|
             req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
@@ -186,6 +191,7 @@ module Merge
               "integration_name": integration_name,
               "last_incident_time_after": last_incident_time_after,
               "last_incident_time_before": last_incident_time_before,
+              "linked_account_id": linked_account_id,
               "page_size": page_size,
               "start_date": start_date,
               "status": status

data/lib/merge_ruby_client/ticketing/link_token/client.rb

@@ -35,6 +35,9 @@ module Merge
       # @param should_create_magic_link_url [Boolean] Whether to generate a Magic Link URL. Defaults to false. For more information on
       #  Magic Link, see
       #  https://merge.dev/blog/integrations-fast-say-hello-to-magic-link.
+      # @param hide_admin_magic_link [Boolean] Whether to generate a Magic Link URL on the Admin Needed screen during the
+      #  linking flow. Defaults to false. For more information on Magic Link, see
+      #  https://merge.dev/blog/integrations-fast-say-hello-to-magic-link.
       # @param common_models [Array<Hash>] An array of objects to specify the models and fields that will be disabled for a
       #  given Linked Account. Each object uses model_id, enabled_actions, and
       #  disabled_fields to specify the model, method, and fields that are scoped for a
@@ -62,7 +65,7 @@ module Merge
       #    categories: [HRIS, ATS]
       #  )
       def create(end_user_email_address:, end_user_organization_name:, end_user_origin_id:, categories:,
-                 integration: nil, link_expiry_mins: nil, should_create_magic_link_url: nil, common_models: nil, category_common_model_scopes: nil, language: nil, integration_specific_config: nil, request_options: nil)
+                 integration: nil, link_expiry_mins: nil, should_create_magic_link_url: nil, hide_admin_magic_link: nil, common_models: nil, category_common_model_scopes: nil, language: nil, integration_specific_config: nil, request_options: nil)
         response = @request_client.conn.post do |req|
           req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
           req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
@@ -84,6 +87,7 @@ module Merge
             integration: integration,
             link_expiry_mins: link_expiry_mins,
             should_create_magic_link_url: should_create_magic_link_url,
+            hide_admin_magic_link: hide_admin_magic_link,
             common_models: common_models,
             category_common_model_scopes: category_common_model_scopes,
             language: language,
@@ -122,6 +126,9 @@ module Merge
       # @param should_create_magic_link_url [Boolean] Whether to generate a Magic Link URL. Defaults to false. For more information on
       #  Magic Link, see
       #  https://merge.dev/blog/integrations-fast-say-hello-to-magic-link.
+      # @param hide_admin_magic_link [Boolean] Whether to generate a Magic Link URL on the Admin Needed screen during the
+      #  linking flow. Defaults to false. For more information on Magic Link, see
+      #  https://merge.dev/blog/integrations-fast-say-hello-to-magic-link.
       # @param common_models [Array<Hash>] An array of objects to specify the models and fields that will be disabled for a
       #  given Linked Account. Each object uses model_id, enabled_actions, and
       #  disabled_fields to specify the model, method, and fields that are scoped for a
@@ -149,7 +156,7 @@ module Merge
       #    categories: [HRIS, ATS]
       #  )
       def create(end_user_email_address:, end_user_organization_name:, end_user_origin_id:, categories:,
-                 integration: nil, link_expiry_mins: nil, should_create_magic_link_url: nil, common_models: nil, category_common_model_scopes: nil, language: nil, integration_specific_config: nil, request_options: nil)
+                 integration: nil, link_expiry_mins: nil, should_create_magic_link_url: nil, hide_admin_magic_link: nil, common_models: nil, category_common_model_scopes: nil, language: nil, integration_specific_config: nil, request_options: nil)
         Async do
           response = @request_client.conn.post do |req|
             req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
@@ -172,6 +179,7 @@ module Merge
               integration: integration,
               link_expiry_mins: link_expiry_mins,
               should_create_magic_link_url: should_create_magic_link_url,
+              hide_admin_magic_link: hide_admin_magic_link,
               common_models: common_models,
               category_common_model_scopes: category_common_model_scopes,
               language: language,

data/lib/merge_ruby_client/ticketing/linked_accounts/client.rb

@@ -19,8 +19,7 @@ module Merge
 
       # List linked accounts for your organization.
       #
-      # @param category [Merge::Ticketing::LinkedAccounts::LinkedAccountsListRequestCategory] Options: ('hris', 'ats', 'accounting', 'ticketing', 'crm', 'mktg',
-      #  'filestorage')
+      # @param category [Merge::Ticketing::LinkedAccounts::LinkedAccountsListRequestCategory] Options: `accounting`, `ats`, `crm`, `filestorage`, `hris`, `mktg`, `ticketing`
       #  - `hris` - hris
       #  - `ats` - ats
       #  - `accounting` - accounting
@@ -106,8 +105,7 @@ module Merge
 
       # List linked accounts for your organization.
       #
-      # @param category [Merge::Ticketing::LinkedAccounts::LinkedAccountsListRequestCategory] Options: ('hris', 'ats', 'accounting', 'ticketing', 'crm', 'mktg',
-      #  'filestorage')
+      # @param category [Merge::Ticketing::LinkedAccounts::LinkedAccountsListRequestCategory] Options: `accounting`, `ats`, `crm`, `filestorage`, `hris`, `mktg`, `ticketing`
       #  - `hris` - hris
       #  - `ats` - ats
       #  - `accounting` - accounting

data/lib/merge_ruby_client/ticketing/tickets/client.rb

@@ -86,6 +86,8 @@ module Merge
       # @param tags [String] If provided, will only return tickets matching the tags; multiple tags can be
       #  separated by commas.
       # @param ticket_type [String] If provided, will only return tickets of this type.
+      # @param ticket_url [String] If provided, will only return tickets where the URL matches or contains the
+      #  substring
       # @param request_options [Merge::RequestOptions]
       # @return [Merge::Ticketing::PaginatedTicketList]
       # @example
@@ -96,7 +98,7 @@ module Merge
       #  )
       #  api.ticketing.tickets.list
       def list(account_id: nil, assignee_ids: nil, collection_ids: nil, completed_after: nil, completed_before: nil,
-               contact_id: nil, created_after: nil, created_before: nil, cursor: nil, due_after: nil, due_before: nil, expand: nil, include_deleted_data: nil, include_remote_data: nil, include_remote_fields: nil, modified_after: nil, modified_before: nil, page_size: nil, parent_ticket_id: nil, priority: nil, remote_created_after: nil, remote_created_before: nil, remote_fields: nil, remote_id: nil, remote_updated_after: nil, remote_updated_before: nil, show_enum_origins: nil, status: nil, tags: nil, ticket_type: nil, request_options: nil)
+               contact_id: nil, created_after: nil, created_before: nil, cursor: nil, due_after: nil, due_before: nil, expand: nil, include_deleted_data: nil, include_remote_data: nil, include_remote_fields: nil, modified_after: nil, modified_before: nil, page_size: nil, parent_ticket_id: nil, priority: nil, remote_created_after: nil, remote_created_before: nil, remote_fields: nil, remote_id: nil, remote_updated_after: nil, remote_updated_before: nil, show_enum_origins: nil, status: nil, tags: nil, ticket_type: nil, ticket_url: nil, request_options: nil)
         response = @request_client.conn.get do |req|
           req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
           req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
@@ -137,7 +139,8 @@ module Merge
             "show_enum_origins": show_enum_origins,
             "status": status,
             "tags": tags,
-            "ticket_type": ticket_type
+            "ticket_type": ticket_type,
+            "ticket_url": ticket_url
           }.compact
           unless request_options.nil? || request_options&.additional_body_parameters.nil?
             req.body = { **(request_options&.additional_body_parameters || {}) }.compact
@@ -421,6 +424,8 @@ module Merge
       # @param include_deleted_data [Boolean] Whether to include data that was marked as deleted by third party webhooks.
       # @param include_remote_data [Boolean] Whether to include the original data Merge fetched from the third-party to
       #  produce these models.
+      # @param is_common_model_field [Boolean] If provided, will only return remote field classes with this
+      #  is_common_model_field value
       # @param page_size [Integer] Number of results to return per page.
       # @param request_options [Merge::RequestOptions]
       # @return [Merge::Ticketing::PaginatedRemoteFieldClassList]
@@ -431,8 +436,8 @@ module Merge
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
       #  api.ticketing.tickets.remote_field_classes_list
-      def remote_field_classes_list(cursor: nil, include_deleted_data: nil, include_remote_data: nil, page_size: nil,
-                                    request_options: nil)
+      def remote_field_classes_list(cursor: nil, include_deleted_data: nil, include_remote_data: nil,
+                                    is_common_model_field: nil, page_size: nil, request_options: nil)
         response = @request_client.conn.get do |req|
           req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
           req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
@@ -447,6 +452,7 @@ module Merge
             "cursor": cursor,
             "include_deleted_data": include_deleted_data,
             "include_remote_data": include_remote_data,
+            "is_common_model_field": is_common_model_field,
             "page_size": page_size
           }.compact
           unless request_options.nil? || request_options&.additional_body_parameters.nil?
@@ -521,6 +527,8 @@ module Merge
       # @param tags [String] If provided, will only return tickets matching the tags; multiple tags can be
       #  separated by commas.
       # @param ticket_type [String] If provided, will only return tickets of this type.
+      # @param ticket_url [String] If provided, will only return tickets where the URL matches or contains the
+      #  substring
       # @param request_options [Merge::RequestOptions]
       # @return [Merge::Ticketing::PaginatedTicketList]
       # @example
@@ -531,7 +539,7 @@ module Merge
       #  )
       #  api.ticketing.tickets.list
       def list(account_id: nil, assignee_ids: nil, collection_ids: nil, completed_after: nil, completed_before: nil,
-               contact_id: nil, created_after: nil, created_before: nil, cursor: nil, due_after: nil, due_before: nil, expand: nil, include_deleted_data: nil, include_remote_data: nil, include_remote_fields: nil, modified_after: nil, modified_before: nil, page_size: nil, parent_ticket_id: nil, priority: nil, remote_created_after: nil, remote_created_before: nil, remote_fields: nil, remote_id: nil, remote_updated_after: nil, remote_updated_before: nil, show_enum_origins: nil, status: nil, tags: nil, ticket_type: nil, request_options: nil)
+               contact_id: nil, created_after: nil, created_before: nil, cursor: nil, due_after: nil, due_before: nil, expand: nil, include_deleted_data: nil, include_remote_data: nil, include_remote_fields: nil, modified_after: nil, modified_before: nil, page_size: nil, parent_ticket_id: nil, priority: nil, remote_created_after: nil, remote_created_before: nil, remote_fields: nil, remote_id: nil, remote_updated_after: nil, remote_updated_before: nil, show_enum_origins: nil, status: nil, tags: nil, ticket_type: nil, ticket_url: nil, request_options: nil)
         Async do
           response = @request_client.conn.get do |req|
             req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
@@ -573,7 +581,8 @@ module Merge
               "show_enum_origins": show_enum_origins,
               "status": status,
               "tags": tags,
-              "ticket_type": ticket_type
+              "ticket_type": ticket_type,
+              "ticket_url": ticket_url
             }.compact
             unless request_options.nil? || request_options&.additional_body_parameters.nil?
               req.body = { **(request_options&.additional_body_parameters || {}) }.compact
@@ -870,6 +879,8 @@ module Merge
       # @param include_deleted_data [Boolean] Whether to include data that was marked as deleted by third party webhooks.
       # @param include_remote_data [Boolean] Whether to include the original data Merge fetched from the third-party to
       #  produce these models.
+      # @param is_common_model_field [Boolean] If provided, will only return remote field classes with this
+      #  is_common_model_field value
       # @param page_size [Integer] Number of results to return per page.
       # @param request_options [Merge::RequestOptions]
       # @return [Merge::Ticketing::PaginatedRemoteFieldClassList]
@@ -880,8 +891,8 @@ module Merge
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
       #  api.ticketing.tickets.remote_field_classes_list
-      def remote_field_classes_list(cursor: nil, include_deleted_data: nil, include_remote_data: nil, page_size: nil,
-                                    request_options: nil)
+      def remote_field_classes_list(cursor: nil, include_deleted_data: nil, include_remote_data: nil,
+                                    is_common_model_field: nil, page_size: nil, request_options: nil)
         Async do
           response = @request_client.conn.get do |req|
             req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
@@ -897,6 +908,7 @@ module Merge
               "cursor": cursor,
               "include_deleted_data": include_deleted_data,
               "include_remote_data": include_remote_data,
+              "is_common_model_field": is_common_model_field,
               "page_size": page_size
             }.compact
             unless request_options.nil? || request_options&.additional_body_parameters.nil?

data/lib/merge_ruby_client/ticketing/types/account_integration.rb

@@ -9,6 +9,11 @@ module Merge
     class AccountIntegration
       # @return [String] Company name.
       attr_reader :name
+      # @return [String] Optional. This shortened name appears in places with limited space, usually in
+      #  conjunction with the platform's logo (e.g., Merge Link menu).<br><br>Example:
+      #  <i>Workforce Now (in lieu of ADP Workforce Now), SuccessFactors (in lieu of SAP
+      #  SuccessFactors)</i>
+      attr_reader :abbreviated_name
       # @return [Array<Merge::Ticketing::CategoriesEnum>] Category or categories this integration belongs to. Multiple categories should
       #  be comma separated, i.e. [ats, hris].
       attr_reader :categories
@@ -41,6 +46,10 @@ module Merge
       OMIT = Object.new
 
       # @param name [String] Company name.
+      # @param abbreviated_name [String] Optional. This shortened name appears in places with limited space, usually in
+      #  conjunction with the platform's logo (e.g., Merge Link menu).<br><br>Example:
+      #  <i>Workforce Now (in lieu of ADP Workforce Now), SuccessFactors (in lieu of SAP
+      #  SuccessFactors)</i>
       # @param categories [Array<Merge::Ticketing::CategoriesEnum>] Category or categories this integration belongs to. Multiple categories should
       #  be comma separated, i.e. [ats, hris].
       # @param image [String] Company logo in rectangular shape. <b>Upload an image with a clear
@@ -58,9 +67,10 @@ module Merge
       # @param category_beta_status [Hash{String => Object}] Category or categories this integration is in beta status for.
       # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
       # @return [Merge::Ticketing::AccountIntegration]
-      def initialize(name:, categories: OMIT, image: OMIT, square_image: OMIT, color: OMIT, slug: OMIT,
-                     api_endpoints_to_documentation_urls: OMIT, webhook_setup_guide_url: OMIT, category_beta_status: OMIT, additional_properties: nil)
+      def initialize(name:, abbreviated_name: OMIT, categories: OMIT, image: OMIT, square_image: OMIT, color: OMIT,
+                     slug: OMIT, api_endpoints_to_documentation_urls: OMIT, webhook_setup_guide_url: OMIT, category_beta_status: OMIT, additional_properties: nil)
         @name = name
+        @abbreviated_name = abbreviated_name if abbreviated_name != OMIT
         @categories = categories if categories != OMIT
         @image = image if image != OMIT
         @square_image = square_image if square_image != OMIT
@@ -74,6 +84,7 @@ module Merge
         @additional_properties = additional_properties
         @_field_set = {
           "name": name,
+          "abbreviated_name": abbreviated_name,
           "categories": categories,
           "image": image,
           "square_image": square_image,
@@ -95,6 +106,7 @@ module Merge
         struct = JSON.parse(json_object, object_class: OpenStruct)
         parsed_json = JSON.parse(json_object)
         name = parsed_json["name"]
+        abbreviated_name = parsed_json["abbreviated_name"]
         categories = parsed_json["categories"]
         image = parsed_json["image"]
         square_image = parsed_json["square_image"]
@@ -105,6 +117,7 @@ module Merge
         category_beta_status = parsed_json["category_beta_status"]
         new(
           name: name,
+          abbreviated_name: abbreviated_name,
           categories: categories,
           image: image,
           square_image: square_image,
@@ -132,6 +145,7 @@ module Merge
       # @return [Void]
       def self.validate_raw(obj:)
         obj.name.is_a?(String) != false || raise("Passed value for field obj.name is not the expected type, validation failed.")
+        obj.abbreviated_name&.is_a?(String) != false || raise("Passed value for field obj.abbreviated_name is not the expected type, validation failed.")
         obj.categories&.is_a?(Array) != false || raise("Passed value for field obj.categories is not the expected type, validation failed.")
         obj.image&.is_a?(String) != false || raise("Passed value for field obj.image is not the expected type, validation failed.")
         obj.square_image&.is_a?(String) != false || raise("Passed value for field obj.square_image is not the expected type, validation failed.")

data/lib/merge_ruby_client/ticketing/types/audit_log_event.rb

@@ -71,6 +71,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
       attr_reader :event_type
       # @return [String]
       attr_reader :event_description
@@ -141,6 +142,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
       # @param event_description [String]
       # @param created_at [DateTime]
       # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition

data/lib/merge_ruby_client/ticketing/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/ticketing/types/remote_field_api.rb

@@ -37,12 +37,12 @@ module Merge
       # @param coverage [Merge::Ticketing::RemoteFieldApiCoverage]
       # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
       # @return [Merge::Ticketing::RemoteFieldApi]
-      def initialize(schema:, remote_key_name:, remote_endpoint_info:, example_values:, advanced_metadata: OMIT,
+      def initialize(schema:, remote_key_name:, remote_endpoint_info:, example_values: OMIT, advanced_metadata: OMIT,
                      coverage: OMIT, additional_properties: nil)
         @schema = schema
         @remote_key_name = remote_key_name
         @remote_endpoint_info = remote_endpoint_info
-        @example_values = example_values
+        @example_values = example_values if example_values != OMIT
         @advanced_metadata = advanced_metadata if advanced_metadata != OMIT
         @coverage = coverage if coverage != OMIT
         @additional_properties = additional_properties
@@ -114,7 +114,7 @@ module Merge
         obj.schema.is_a?(Hash) != false || raise("Passed value for field obj.schema is not the expected type, validation failed.")
         obj.remote_key_name.is_a?(String) != false || raise("Passed value for field obj.remote_key_name is not the expected type, validation failed.")
         Merge::Ticketing::RemoteEndpointInfo.validate_raw(obj: obj.remote_endpoint_info)
-        obj.example_values.is_a?(Array) != false || raise("Passed value for field obj.example_values is not the expected type, validation failed.")
+        obj.example_values&.is_a?(Array) != false || raise("Passed value for field obj.example_values is not the expected type, validation failed.")
         obj.advanced_metadata.nil? || Merge::Ticketing::AdvancedMetadata.validate_raw(obj: obj.advanced_metadata)
         obj.coverage.nil? || Merge::Ticketing::RemoteFieldApiCoverage.validate_raw(obj: obj.coverage)
       end

data/lib/merge_ruby_client/ticketing/types/tag.rb

@@ -19,6 +19,8 @@ module Merge
       attr_reader :created_at
       # @return [DateTime] The datetime that this object was modified by Merge.
       attr_reader :modified_at
+      # @return [String]
+      attr_reader :id
       # @return [String] The tag's name.
       attr_reader :name
       # @return [Boolean] Indicates whether or not this object has been deleted in the third party
@@ -39,6 +41,7 @@ module Merge
       # @param remote_id [String] The third-party API ID of the matching object.
       # @param created_at [DateTime] The datetime that this object was created by Merge.
       # @param modified_at [DateTime] The datetime that this object was modified by Merge.
+      # @param id [String]
       # @param name [String] The tag's name.
       # @param remote_was_deleted [Boolean] Indicates whether or not this object has been deleted in the third party
       #  platform.
@@ -46,11 +49,12 @@ module Merge
       # @param remote_data [Array<Merge::Ticketing::RemoteData>]
       # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
       # @return [Merge::Ticketing::Tag]
-      def initialize(remote_id: OMIT, created_at: OMIT, modified_at: OMIT, name: OMIT, remote_was_deleted: OMIT,
-                     field_mappings: OMIT, remote_data: OMIT, additional_properties: nil)
+      def initialize(remote_id: OMIT, created_at: OMIT, modified_at: OMIT, id: OMIT, name: OMIT,
+                     remote_was_deleted: OMIT, field_mappings: OMIT, remote_data: OMIT, additional_properties: nil)
         @remote_id = remote_id if remote_id != OMIT
         @created_at = created_at if created_at != OMIT
         @modified_at = modified_at if modified_at != OMIT
+        @id = id if id != OMIT
         @name = name if name != OMIT
         @remote_was_deleted = remote_was_deleted if remote_was_deleted != OMIT
         @field_mappings = field_mappings if field_mappings != OMIT
@@ -60,6 +64,7 @@ module Merge
           "remote_id": remote_id,
           "created_at": created_at,
           "modified_at": modified_at,
+          "id": id,
           "name": name,
           "remote_was_deleted": remote_was_deleted,
           "field_mappings": field_mappings,
@@ -79,6 +84,7 @@ module Merge
         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?)
+        id = parsed_json["id"]
         name = parsed_json["name"]
         remote_was_deleted = parsed_json["remote_was_deleted"]
         field_mappings = parsed_json["field_mappings"]
@@ -90,6 +96,7 @@ module Merge
           remote_id: remote_id,
           created_at: created_at,
           modified_at: modified_at,
+          id: id,
           name: name,
           remote_was_deleted: remote_was_deleted,
           field_mappings: field_mappings,
@@ -115,6 +122,7 @@ module Merge
         obj.remote_id&.is_a?(String) != false || raise("Passed value for field obj.remote_id is not the expected type, validation failed.")
         obj.created_at&.is_a?(DateTime) != false || raise("Passed value for field obj.created_at is not the expected type, validation failed.")
         obj.modified_at&.is_a?(DateTime) != false || raise("Passed value for field obj.modified_at is not the expected type, validation failed.")
+        obj.id&.is_a?(String) != false || raise("Passed value for field obj.id is not the expected type, validation failed.")
         obj.name&.is_a?(String) != false || raise("Passed value for field obj.name is not the expected type, validation failed.")
         obj.remote_was_deleted&.is_a?(Boolean) != false || raise("Passed value for field obj.remote_was_deleted is not the expected type, validation failed.")
         obj.field_mappings&.is_a?(Hash) != false || raise("Passed value for field obj.field_mappings is not the expected type, validation failed.")

data/lib/merge_ruby_client.rb

@@ -3,21 +3,21 @@
 require_relative "environment"
 require_relative "types_export"
 require_relative "requests"
-require_relative "merge_ruby_client/filestorage/client"
 require_relative "merge_ruby_client/ats/client"
 require_relative "merge_ruby_client/crm/client"
+require_relative "merge_ruby_client/filestorage/client"
 require_relative "merge_ruby_client/hris/client"
 require_relative "merge_ruby_client/ticketing/client"
 require_relative "merge_ruby_client/accounting/client"
 
 module Merge
   class Client
-    # @return [Merge::Filestorage::Client]
-    attr_reader :filestorage
     # @return [Merge::Ats::Client]
     attr_reader :ats
     # @return [Merge::Crm::Client]
     attr_reader :crm
+    # @return [Merge::Filestorage::Client]
+    attr_reader :filestorage
     # @return [Merge::Hris::Client]
     attr_reader :hris
     # @return [Merge::Ticketing::Client]
@@ -42,9 +42,9 @@ module Merge
         api_key: api_key,
         account_token: account_token
       )
-      @filestorage = Merge::Filestorage::Client.new(request_client: @request_client)
       @ats = Merge::Ats::Client.new(request_client: @request_client)
       @crm = Merge::Crm::Client.new(request_client: @request_client)
+      @filestorage = Merge::Filestorage::Client.new(request_client: @request_client)
       @hris = Merge::Hris::Client.new(request_client: @request_client)
       @ticketing = Merge::Ticketing::Client.new(request_client: @request_client)
       @accounting = Merge::Accounting::Client.new(request_client: @request_client)
@@ -52,12 +52,12 @@ module Merge
   end
 
   class AsyncClient
-    # @return [Merge::Filestorage::AsyncClient]
-    attr_reader :filestorage
     # @return [Merge::Ats::AsyncClient]
     attr_reader :ats
     # @return [Merge::Crm::AsyncClient]
     attr_reader :crm
+    # @return [Merge::Filestorage::AsyncClient]
+    attr_reader :filestorage
     # @return [Merge::Hris::AsyncClient]
     attr_reader :hris
     # @return [Merge::Ticketing::AsyncClient]
@@ -82,9 +82,9 @@ module Merge
         api_key: api_key,
         account_token: account_token
       )
-      @filestorage = Merge::Filestorage::AsyncClient.new(request_client: @async_request_client)
       @ats = Merge::Ats::AsyncClient.new(request_client: @async_request_client)
       @crm = Merge::Crm::AsyncClient.new(request_client: @async_request_client)
+      @filestorage = Merge::Filestorage::AsyncClient.new(request_client: @async_request_client)
       @hris = Merge::Hris::AsyncClient.new(request_client: @async_request_client)
       @ticketing = Merge::Ticketing::AsyncClient.new(request_client: @async_request_client)
       @accounting = Merge::Accounting::AsyncClient.new(request_client: @async_request_client)

data/lib/requests.rb

@@ -48,7 +48,7 @@ module Merge
 
     # @return [Hash{String => String}]
     def get_headers
-      headers = { "X-Fern-Language": "Ruby", "X-Fern-SDK-Name": "merge_ruby_client", "X-Fern-SDK-Version": "0.1.3" }
+      headers = { "X-Fern-Language": "Ruby", "X-Fern-SDK-Name": "merge_ruby_client", "X-Fern-SDK-Version": "0.1.4" }
       headers["Authorization"] = ((@api_key.is_a? Method) ? @api_key.call : @api_key) unless @api_key.nil?
       headers
     end
@@ -96,7 +96,7 @@ module Merge
 
     # @return [Hash{String => String}]
     def get_headers
-      headers = { "X-Fern-Language": "Ruby", "X-Fern-SDK-Name": "merge_ruby_client", "X-Fern-SDK-Version": "0.1.3" }
+      headers = { "X-Fern-Language": "Ruby", "X-Fern-SDK-Name": "merge_ruby_client", "X-Fern-SDK-Version": "0.1.4" }
       headers["Authorization"] = ((@api_key.is_a? Method) ? @api_key.call : @api_key) unless @api_key.nil?
       headers
     end