merge_ticketing_client 1.0.1 → 1.0.2

data/docs/Ticket.md

@@ -8,14 +8,16 @@
 | **remote_id** | **String** | The third-party API ID of the matching object. | [optional] |
 | **name** | **String** | The ticket's name. | [optional] |
 | **assignees** | **Array<String>** |  | [optional] |
+| **creator** | **String** | The user who created this ticket. | [optional] |
 | **due_date** | **Time** | The ticket's due date. | [optional] |
 | **status** | [**TicketStatusEnum**](TicketStatusEnum.md) | The current status of the ticket. | [optional] |
-| **description** | **String** | The ticket's description. | [optional] |
-| **project** | **String** |  | [optional] |
+| **description** | **String** | The ticket’s description. HTML version of description is mapped if supported by the third-party platform. | [optional] |
+| **project** | **String** | The project the ticket belongs to. | [optional] |
+| **collections** | **Array<String>** |  | [optional] |
 | **ticket_type** | **String** | The ticket's type. | [optional] |
-| **account** | **String** |  | [optional] |
-| **contact** | **String** |  | [optional] |
-| **parent_ticket** | **String** |  | [optional] |
+| **account** | **String** | The account associated with the ticket. | [optional] |
+| **contact** | **String** | The contact associated with the ticket. | [optional] |
+| **parent_ticket** | **String** | The ticket's parent ticket. | [optional] |
 | **attachments** | **Array<String>** |  | [optional] |
 | **tags** | **Array<String>** |  | [optional] |
 | **remote_created_at** | **Time** | When the third party's ticket was created. | [optional] |
@@ -24,7 +26,8 @@
 | **remote_data** | [**Array<RemoteData>**](RemoteData.md) |  | [optional][readonly] |
 | **remote_was_deleted** | **Boolean** |  | [optional][readonly] |
 | **ticket_url** | **String** | The 3rd party url of the Ticket. | [optional] |
-| **priority** | [**PriorityEnum**](PriorityEnum.md) | The priority or urgency of the Ticket. Possible values include: URGENT, HIGH, NORMAL, LOW - in cases where there is no clear mapping - the original value passed through. | [optional] |
+| **priority** | [**PriorityEnum**](PriorityEnum.md) | The priority or urgency of the Ticket. | [optional] |
+| **field_mappings** | [**Hash<String, AnyType>**](AnyType.md) |  | [optional][readonly] |
 
 ## Example
 
@@ -36,10 +39,12 @@ instance = MergeTicketingClient::Ticket.new(
   remote_id: 19202938,
   name: Please add more integrations,
   assignees: ["17a54124-287f-494d-965e-3c5b330c9a68"],
+  creator: null,
   due_date: 2022-10-11T00:00Z,
   status: OPEN,
   description: Can you please add more integrations? It'll make syncing data much easier!,
   project: fb8c55b6-1cb8-4b4c-9fb6-17924231619d,
+  collections: ["fb8c55b6-1cb8-4b4c-9fb6-17924231619d"],
   ticket_type: incident,
   account: 0958cbc6-6040-430a-848e-aafacbadf4ae,
   contact: 65c345ba-6870-4974-87ba-dd31509c367a,
@@ -52,7 +57,8 @@ instance = MergeTicketingClient::Ticket.new(
   remote_data: null,
   remote_was_deleted: null,
   ticket_url: https://thirdpartysoftware.com/project/3/issue/1,
-  priority: HIGH
+  priority: HIGH,
+  field_mappings: {"organization_defined_targets":{"custom_key":"custom_value"},"linked_account_defined_targets":{"custom_key":"custom_value"}}
 )
 ```
 

data/docs/TicketRequest.md

@@ -7,21 +7,25 @@
 | **remote_id** | **String** | The third-party API ID of the matching object. | [optional] |
 | **name** | **String** | The ticket's name. | [optional] |
 | **assignees** | **Array<String>** |  | [optional] |
+| **creator** | **String** | The user who created this ticket. | [optional] |
 | **due_date** | **Time** | The ticket's due date. | [optional] |
 | **status** | [**TicketStatusEnum**](TicketStatusEnum.md) | The current status of the ticket. | [optional] |
-| **description** | **String** | The ticket's description. | [optional] |
-| **project** | **String** |  | [optional] |
+| **description** | **String** | The ticket’s description. HTML version of description is mapped if supported by the third-party platform. | [optional] |
+| **project** | **String** | The project the ticket belongs to. | [optional] |
+| **collections** | **Array<String>** |  | [optional] |
 | **ticket_type** | **String** | The ticket's type. | [optional] |
-| **account** | **String** |  | [optional] |
-| **contact** | **String** |  | [optional] |
-| **parent_ticket** | **String** |  | [optional] |
+| **account** | **String** | The account associated with the ticket. | [optional] |
+| **contact** | **String** | The contact associated with the ticket. | [optional] |
+| **parent_ticket** | **String** | The ticket's parent ticket. | [optional] |
 | **attachments** | **Array<String>** |  | [optional] |
 | **tags** | **Array<String>** |  | [optional] |
 | **remote_created_at** | **Time** | When the third party's ticket was created. | [optional] |
 | **remote_updated_at** | **Time** | When the third party's ticket was updated. | [optional] |
 | **completed_at** | **Time** | When the ticket was completed. | [optional] |
 | **ticket_url** | **String** | The 3rd party url of the Ticket. | [optional] |
-| **priority** | [**PriorityEnum**](PriorityEnum.md) | The priority or urgency of the Ticket. Possible values include: URGENT, HIGH, NORMAL, LOW - in cases where there is no clear mapping - the original value passed through. | [optional] |
+| **priority** | [**PriorityEnum**](PriorityEnum.md) | The priority or urgency of the Ticket. | [optional] |
+| **integration_params** | [**Hash<String, AnyType>**](AnyType.md) |  | [optional] |
+| **linked_account_params** | [**Hash<String, AnyType>**](AnyType.md) |  | [optional] |
 
 ## Example
 
@@ -32,10 +36,12 @@ instance = MergeTicketingClient::TicketRequest.new(
   remote_id: 19202938,
   name: Please add more integrations,
   assignees: ["17a54124-287f-494d-965e-3c5b330c9a68"],
+  creator: null,
   due_date: 2022-10-11T00:00Z,
   status: OPEN,
   description: Can you please add more integrations? It'll make syncing data much easier!,
   project: fb8c55b6-1cb8-4b4c-9fb6-17924231619d,
+  collections: ["fb8c55b6-1cb8-4b4c-9fb6-17924231619d"],
   ticket_type: incident,
   account: 0958cbc6-6040-430a-848e-aafacbadf4ae,
   contact: 65c345ba-6870-4974-87ba-dd31509c367a,
@@ -46,7 +52,9 @@ instance = MergeTicketingClient::TicketRequest.new(
   remote_updated_at: 2021-12-09T00:00Z,
   completed_at: 2021-12-09T00:00Z,
   ticket_url: https://thirdpartysoftware.com/project/3/issue/1,
-  priority: HIGH
+  priority: HIGH,
+  integration_params: {"unique_integration_field":"unique_integration_field_value"},
+  linked_account_params: {"unique_linked_account_field":"unique_linked_account_field_value"}
 )
 ```
 

data/docs/TicketsApi.md

@@ -4,7 +4,7 @@ All URIs are relative to *https://api.merge.dev/api/ticketing/v1*
 
 | Method | HTTP request | Description |
 | ------ | ------------ | ----------- |
-| [**tickets_collaborators_list**](TicketsApi.md#tickets_collaborators_list) | **GET** /tickets/{id}/collaborators |  |
+| [**tickets_collaborators_list**](TicketsApi.md#tickets_collaborators_list) | **GET** /tickets/{parent_id}/collaborators |  |
 | [**tickets_create**](TicketsApi.md#tickets_create) | **POST** /tickets |  |
 | [**tickets_list**](TicketsApi.md#tickets_list) | **GET** /tickets |  |
 | [**tickets_meta_patch_retrieve**](TicketsApi.md#tickets_meta_patch_retrieve) | **GET** /tickets/meta/patch/{id} |  |
@@ -15,11 +15,11 @@ All URIs are relative to *https://api.merge.dev/api/ticketing/v1*
 
 ## tickets_collaborators_list
 
-> <PaginatedUserList> tickets_collaborators_list(x_account_token, id, opts)
+> <PaginatedUserList> tickets_collaborators_list(x_account_token, parent_id, opts)
 
 
 
-Returns a `User` object with the given `id`.
+Returns a list of `User` objects.
 
 ### Examples
 
@@ -36,17 +36,18 @@ end
 
 api_instance = MergeTicketingClient::TicketsApi.new
 x_account_token = 'x_account_token_example' # String | Token identifying the end user.
-id = TODO # String | 
+parent_id = TODO # String | 
 opts = {
   cursor: 'cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw', # String | The pagination cursor value.
   expand: 'teams', # String | Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
+  include_deleted_data: true, # Boolean | Whether to include data that was marked as deleted by third party webhooks.
   include_remote_data: true, # Boolean | Whether to include the original data Merge fetched from the third-party to produce these models.
   page_size: 56 # Integer | Number of results to return per page.
 }
 
 begin
   
-  result = api_instance.tickets_collaborators_list(x_account_token, id, opts)
+  result = api_instance.tickets_collaborators_list(x_account_token, parent_id, opts)
   p result
 rescue MergeTicketingClient::ApiError => e
   puts "Error when calling TicketsApi->tickets_collaborators_list: #{e}"
@@ -57,12 +58,12 @@ end
 
 This returns an Array which contains the response data, status code and headers.
 
-> <Array(<PaginatedUserList>, Integer, Hash)> tickets_collaborators_list_with_http_info(x_account_token, id, opts)
+> <Array(<PaginatedUserList>, Integer, Hash)> tickets_collaborators_list_with_http_info(x_account_token, parent_id, opts)
 
 ```ruby
 begin
   
-  data, status_code, headers = api_instance.tickets_collaborators_list_with_http_info(x_account_token, id, opts)
+  data, status_code, headers = api_instance.tickets_collaborators_list_with_http_info(x_account_token, parent_id, opts)
   p status_code # => 2xx
   p headers # => { ... }
   p data # => <PaginatedUserList>
@@ -76,9 +77,10 @@ end
 | Name | Type | Description | Notes |
 | ---- | ---- | ----------- | ----- |
 | **x_account_token** | **String** | Token identifying the end user. |  |
-| **id** | [**String**](.md) |  |  |
+| **parent_id** | [**String**](.md) |  |  |
 | **cursor** | **String** | The pagination cursor value. | [optional] |
 | **expand** | **String** | Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces. | [optional] |
+| **include_deleted_data** | **Boolean** | Whether to include data that was marked as deleted by third party webhooks. | [optional] |
 | **include_remote_data** | **Boolean** | Whether to include the original data Merge fetched from the third-party to produce these models. | [optional] |
 | **page_size** | **Integer** | Number of results to return per page. | [optional] |
 
@@ -200,18 +202,35 @@ api_instance = MergeTicketingClient::TicketsApi.new
 x_account_token = 'x_account_token_example' # String | Token identifying the end user.
 opts = {
   account_id: 'account_id_example', # String | If provided, will only return tickets for this account.
+  assignee_ids: 'assignee_ids_example', # String | If provided, will only return tickets assigned to the assignee_ids; multiple assignee_ids can be separated by commas.
+  collection_ids: 'collection_ids_example', # String | If provided, will only return tickets assigned to the collection_ids; multiple collection_ids can be separated by commas.
+  completed_after: Time.parse('2013-10-20T19:20:30+01:00'), # Time | If provided, will only return tickets completed after this datetime.
+  completed_before: Time.parse('2013-10-20T19:20:30+01:00'), # Time | If provided, will only return tickets completed before this datetime.
+  contact_id: 'contact_id_example', # String | If provided, will only return tickets for this contact.
   created_after: Time.parse('2013-10-20T19:20:30+01:00'), # Time | If provided, will only return objects created after this datetime.
   created_before: Time.parse('2013-10-20T19:20:30+01:00'), # Time | If provided, will only return objects created before this datetime.
   cursor: 'cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw', # String | The pagination cursor value.
+  due_after: Time.parse('2013-10-20T19:20:30+01:00'), # Time | If provided, will only return tickets due after this datetime.
+  due_before: Time.parse('2013-10-20T19:20:30+01:00'), # Time | If provided, will only return tickets due before this datetime.
   expand: 'account', # String | Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
   include_deleted_data: true, # Boolean | Whether to include data that was marked as deleted by third party webhooks.
   include_remote_data: true, # Boolean | Whether to include the original data Merge fetched from the third-party to produce these models.
   modified_after: Time.parse('2013-10-20T19:20:30+01:00'), # Time | If provided, will only return objects modified after this datetime.
   modified_before: Time.parse('2013-10-20T19:20:30+01:00'), # Time | If provided, will only return objects modified before this datetime.
   page_size: 56, # Integer | Number of results to return per page.
+  parent_ticket_id: 'parent_ticket_id_example', # String | If provided, will only return sub tickets of the parent_ticket_id.
+  priority: 'HIGH', # String | If provided, will only return tickets of this priority.
   project_id: 'project_id_example', # String | If provided, will only return tickets for this project.
-  remote_fields: 'status', # String | Which fields should be returned in non-normalized form.
-  remote_id: 'remote_id_example' # String | The API provider's ID for the given object.
+  remote_created_after: Time.parse('2013-10-20T19:20:30+01:00'), # Time | If provided, will only return tickets created in the third party platform after this datetime.
+  remote_created_before: Time.parse('2013-10-20T19:20:30+01:00'), # Time | If provided, will only return tickets created in the third party platform before this datetime.
+  remote_fields: 'priority', # String | Deprecated. Use show_enum_origins.
+  remote_id: 'remote_id_example', # String | The API provider's ID for the given object.
+  remote_updated_after: Time.parse('2013-10-20T19:20:30+01:00'), # Time | If provided, will only return tickets updated in the third party platform after this datetime.
+  remote_updated_before: Time.parse('2013-10-20T19:20:30+01:00'), # Time | If provided, will only return tickets updated in the third party platform before this datetime.
+  show_enum_origins: 'priority', # String | Which fields should be returned in non-normalized form.
+  status: 'CLOSED', # String | If provided, will only return tickets of this status.
+  tags: 'tags_example', # String | If provided, will only return tickets matching the tags; multiple tags can be separated by commas.
+  ticket_type: 'ticket_type_example' # String | If provided, will only return tickets of this type.
 }
 
 begin
@@ -247,18 +266,35 @@ end
 | ---- | ---- | ----------- | ----- |
 | **x_account_token** | **String** | Token identifying the end user. |  |
 | **account_id** | **String** | If provided, will only return tickets for this account. | [optional] |
+| **assignee_ids** | **String** | If provided, will only return tickets assigned to the assignee_ids; multiple assignee_ids can be separated by commas. | [optional] |
+| **collection_ids** | **String** | If provided, will only return tickets assigned to the collection_ids; multiple collection_ids can be separated by commas. | [optional] |
+| **completed_after** | **Time** | If provided, will only return tickets completed after this datetime. | [optional] |
+| **completed_before** | **Time** | If provided, will only return tickets completed before this datetime. | [optional] |
+| **contact_id** | **String** | If provided, will only return tickets for this contact. | [optional] |
 | **created_after** | **Time** | If provided, will only return objects created after this datetime. | [optional] |
 | **created_before** | **Time** | If provided, will only return objects created before this datetime. | [optional] |
 | **cursor** | **String** | The pagination cursor value. | [optional] |
+| **due_after** | **Time** | If provided, will only return tickets due after this datetime. | [optional] |
+| **due_before** | **Time** | If provided, will only return tickets due before this datetime. | [optional] |
 | **expand** | **String** | Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces. | [optional] |
 | **include_deleted_data** | **Boolean** | Whether to include data that was marked as deleted by third party webhooks. | [optional] |
 | **include_remote_data** | **Boolean** | Whether to include the original data Merge fetched from the third-party to produce these models. | [optional] |
 | **modified_after** | **Time** | If provided, will only return objects modified after this datetime. | [optional] |
 | **modified_before** | **Time** | If provided, will only return objects modified before this datetime. | [optional] |
 | **page_size** | **Integer** | Number of results to return per page. | [optional] |
+| **parent_ticket_id** | **String** | If provided, will only return sub tickets of the parent_ticket_id. | [optional] |
+| **priority** | **String** | If provided, will only return tickets of this priority. | [optional] |
 | **project_id** | **String** | If provided, will only return tickets for this project. | [optional] |
-| **remote_fields** | **String** | Which fields should be returned in non-normalized form. | [optional] |
+| **remote_created_after** | **Time** | If provided, will only return tickets created in the third party platform after this datetime. | [optional] |
+| **remote_created_before** | **Time** | If provided, will only return tickets created in the third party platform before this datetime. | [optional] |
+| **remote_fields** | **String** | Deprecated. Use show_enum_origins. | [optional] |
 | **remote_id** | **String** | The API provider&#39;s ID for the given object. | [optional] |
+| **remote_updated_after** | **Time** | If provided, will only return tickets updated in the third party platform after this datetime. | [optional] |
+| **remote_updated_before** | **Time** | If provided, will only return tickets updated in the third party platform before this datetime. | [optional] |
+| **show_enum_origins** | **String** | Which fields should be returned in non-normalized form. | [optional] |
+| **status** | **String** | If provided, will only return tickets of this status. | [optional] |
+| **tags** | **String** | If provided, will only return tickets matching the tags; multiple tags can be separated by commas. | [optional] |
+| **ticket_type** | **String** | If provided, will only return tickets of this type. | [optional] |
 
 ### Return type
 
@@ -424,6 +460,8 @@ end
 
 
 
+Updates a `Ticket` object with the given `id`.
+
 ### Examples
 
 ```ruby
@@ -524,7 +562,8 @@ id = TODO # String |
 opts = {
   expand: 'account', # String | Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
   include_remote_data: true, # Boolean | Whether to include the original data Merge fetched from the third-party to produce these models.
-  remote_fields: 'status' # String | Which fields should be returned in non-normalized form.
+  remote_fields: 'priority', # String | Deprecated. Use show_enum_origins.
+  show_enum_origins: 'priority' # String | Which fields should be returned in non-normalized form.
 }
 
 begin
@@ -562,7 +601,8 @@ end
 | **id** | [**String**](.md) |  |  |
 | **expand** | **String** | Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces. | [optional] |
 | **include_remote_data** | **Boolean** | Whether to include the original data Merge fetched from the third-party to produce these models. | [optional] |
-| **remote_fields** | **String** | Which fields should be returned in non-normalized form. | [optional] |
+| **remote_fields** | **String** | Deprecated. Use show_enum_origins. | [optional] |
+| **show_enum_origins** | **String** | Which fields should be returned in non-normalized form. | [optional] |
 
 ### Return type
 

data/docs/User.md

@@ -13,6 +13,7 @@
 | **avatar** | **String** | The user's avatar picture. | [optional] |
 | **remote_data** | [**Array<RemoteData>**](RemoteData.md) |  | [optional][readonly] |
 | **remote_was_deleted** | **Boolean** | Indicates whether or not this object has been deleted by third party webhooks. | [optional][readonly] |
+| **field_mappings** | [**Hash<String, AnyType>**](AnyType.md) |  | [optional][readonly] |
 
 ## Example
 
@@ -28,7 +29,8 @@ instance = MergeTicketingClient::User.new(
   teams: ["28b54125-287f-494d-965e-3c5b330c9a68","17a54124-287f-494d-965e-3c5b330c9a68"],
   avatar: https://merge.dev/user_profile_pic.png,
   remote_data: null,
-  remote_was_deleted: null
+  remote_was_deleted: null,
+  field_mappings: {"organization_defined_targets":{"custom_key":"custom_value"},"linked_account_defined_targets":{"custom_key":"custom_value"}}
 )
 ```
 

data/docs/UsersApi.md

@@ -35,6 +35,7 @@ opts = {
   created_after: Time.parse('2013-10-20T19:20:30+01:00'), # Time | If provided, will only return objects created after this datetime.
   created_before: Time.parse('2013-10-20T19:20:30+01:00'), # Time | If provided, will only return objects created before this datetime.
   cursor: 'cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw', # String | The pagination cursor value.
+  email_address: 'email_address_example', # String | If provided, will only return users with emails equal to this value (case insensitive).
   expand: 'teams', # String | Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
   include_deleted_data: true, # Boolean | Whether to include data that was marked as deleted by third party webhooks.
   include_remote_data: true, # Boolean | Whether to include the original data Merge fetched from the third-party to produce these models.
@@ -79,6 +80,7 @@ end
 | **created_after** | **Time** | If provided, will only return objects created after this datetime. | [optional] |
 | **created_before** | **Time** | If provided, will only return objects created before this datetime. | [optional] |
 | **cursor** | **String** | The pagination cursor value. | [optional] |
+| **email_address** | **String** | If provided, will only return users with emails equal to this value (case insensitive). | [optional] |
 | **expand** | **String** | Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces. | [optional] |
 | **include_deleted_data** | **Boolean** | Whether to include data that was marked as deleted by third party webhooks. | [optional] |
 | **include_remote_data** | **Boolean** | Whether to include the original data Merge fetched from the third-party to produce these models. | [optional] |

data/lib/merge_ticketing_client/api/collections_api.rb

@@ -0,0 +1,234 @@
+=begin
+#Merge Ticketing API
+
+#The unified API for building rich integrations with multiple Ticketing platforms.
+
+The version of the OpenAPI document: 1.0
+Contact: hello@merge.dev
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 5.1.1
+
+=end
+
+require 'cgi'
+
+module MergeTicketingClient
+  class CollectionsApi
+    attr_accessor :api_client
+
+    def initialize(api_client = ApiClient.default)
+      @api_client = api_client
+    end
+    # Returns a list of `Collection` objects.
+    # @param x_account_token [String] Token identifying the end user.
+    # @param [Hash] opts the optional parameters
+    # @option opts [String] :collection_type If provided, will only return collections of the given type.
+    # @option opts [Time] :created_after If provided, will only return objects created after this datetime.
+    # @option opts [Time] :created_before If provided, will only return objects created before this datetime.
+    # @option opts [String] :cursor The pagination cursor value.
+    # @option opts [String] :expand Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
+    # @option opts [Boolean] :include_deleted_data Whether to include data that was marked as deleted by third party webhooks.
+    # @option opts [Boolean] :include_remote_data Whether to include the original data Merge fetched from the third-party to produce these models.
+    # @option opts [Time] :modified_after If provided, will only return objects modified after this datetime.
+    # @option opts [Time] :modified_before If provided, will only return objects modified before this datetime.
+    # @option opts [Integer] :page_size Number of results to return per page.
+    # @option opts [String] :parent_collection_id If provided, will only return collections whose parent collection matches the given id.
+    # @option opts [String] :remote_fields Deprecated. Use show_enum_origins.
+    # @option opts [String] :remote_id The API provider's ID for the given object.
+    # @option opts [String] :show_enum_origins Which fields should be returned in non-normalized form.
+    # @return [PaginatedCollectionList]
+    def collections_list(x_account_token, opts = {})
+      data, _status_code, _headers = collections_list_with_http_info(x_account_token, opts)
+      data
+    end
+
+    # Returns a list of `Collection` objects.
+    # @param x_account_token [String] Token identifying the end user.
+    # @param [Hash] opts the optional parameters
+    # @option opts [String] :collection_type If provided, will only return collections of the given type.
+    # @option opts [Time] :created_after If provided, will only return objects created after this datetime.
+    # @option opts [Time] :created_before If provided, will only return objects created before this datetime.
+    # @option opts [String] :cursor The pagination cursor value.
+    # @option opts [String] :expand Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
+    # @option opts [Boolean] :include_deleted_data Whether to include data that was marked as deleted by third party webhooks.
+    # @option opts [Boolean] :include_remote_data Whether to include the original data Merge fetched from the third-party to produce these models.
+    # @option opts [Time] :modified_after If provided, will only return objects modified after this datetime.
+    # @option opts [Time] :modified_before If provided, will only return objects modified before this datetime.
+    # @option opts [Integer] :page_size Number of results to return per page.
+    # @option opts [String] :parent_collection_id If provided, will only return collections whose parent collection matches the given id.
+    # @option opts [String] :remote_fields Deprecated. Use show_enum_origins.
+    # @option opts [String] :remote_id The API provider's ID for the given object.
+    # @option opts [String] :show_enum_origins Which fields should be returned in non-normalized form.
+    # @return [Array<(PaginatedCollectionList, Integer, Hash)>] PaginatedCollectionList data, response status code and response headers
+    def collections_list_with_http_info(x_account_token, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: CollectionsApi.collections_list ...'
+      end
+      # verify the required parameter 'x_account_token' is set
+      if @api_client.config.client_side_validation && x_account_token.nil?
+        fail ArgumentError, "Missing the required parameter 'x_account_token' when calling CollectionsApi.collections_list"
+      end
+      allowable_values = ["LIST", "PROJECT"]
+      if @api_client.config.client_side_validation && opts[:'collection_type'] && !allowable_values.include?(opts[:'collection_type'])
+        fail ArgumentError, "invalid value for \"collection_type\", must be one of #{allowable_values}"
+      end
+      allowable_values = ["parent_collection"]
+      if @api_client.config.client_side_validation && opts[:'expand'] && !allowable_values.include?(opts[:'expand'])
+        fail ArgumentError, "invalid value for \"expand\", must be one of #{allowable_values}"
+      end
+      allowable_values = ["collection_type"]
+      if @api_client.config.client_side_validation && opts[:'remote_fields'] && !allowable_values.include?(opts[:'remote_fields'])
+        fail ArgumentError, "invalid value for \"remote_fields\", must be one of #{allowable_values}"
+      end
+      allowable_values = ["collection_type"]
+      if @api_client.config.client_side_validation && opts[:'show_enum_origins'] && !allowable_values.include?(opts[:'show_enum_origins'])
+        fail ArgumentError, "invalid value for \"show_enum_origins\", must be one of #{allowable_values}"
+      end
+      # resource path
+      local_var_path = '/collections'
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+      query_params[:'collection_type'] = opts[:'collection_type'] if !opts[:'collection_type'].nil?
+      query_params[:'created_after'] = opts[:'created_after'] if !opts[:'created_after'].nil?
+      query_params[:'created_before'] = opts[:'created_before'] if !opts[:'created_before'].nil?
+      query_params[:'cursor'] = opts[:'cursor'] if !opts[:'cursor'].nil?
+      query_params[:'expand'] = opts[:'expand'] if !opts[:'expand'].nil?
+      query_params[:'include_deleted_data'] = opts[:'include_deleted_data'] if !opts[:'include_deleted_data'].nil?
+      query_params[:'include_remote_data'] = opts[:'include_remote_data'] if !opts[:'include_remote_data'].nil?
+      query_params[:'modified_after'] = opts[:'modified_after'] if !opts[:'modified_after'].nil?
+      query_params[:'modified_before'] = opts[:'modified_before'] if !opts[:'modified_before'].nil?
+      query_params[:'page_size'] = opts[:'page_size'] if !opts[:'page_size'].nil?
+      query_params[:'parent_collection_id'] = opts[:'parent_collection_id'] if !opts[:'parent_collection_id'].nil?
+      query_params[:'remote_fields'] = opts[:'remote_fields'] if !opts[:'remote_fields'].nil?
+      query_params[:'remote_id'] = opts[:'remote_id'] if !opts[:'remote_id'].nil?
+      query_params[:'show_enum_origins'] = opts[:'show_enum_origins'] if !opts[:'show_enum_origins'].nil?
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params[:'X-Account-Token'] = x_account_token
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'PaginatedCollectionList'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['tokenAuth']
+
+      new_options = opts.merge(
+        :operation => :"CollectionsApi.collections_list",
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: CollectionsApi#collections_list\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
+    # Returns a `Collection` object with the given `id`.
+    # @param x_account_token [String] Token identifying the end user.
+    # @param id [String] 
+    # @param [Hash] opts the optional parameters
+    # @option opts [String] :expand Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
+    # @option opts [Boolean] :include_remote_data Whether to include the original data Merge fetched from the third-party to produce these models.
+    # @option opts [String] :remote_fields Deprecated. Use show_enum_origins.
+    # @option opts [String] :show_enum_origins Which fields should be returned in non-normalized form.
+    # @return [Collection]
+    def collections_retrieve(x_account_token, id, opts = {})
+      data, _status_code, _headers = collections_retrieve_with_http_info(x_account_token, id, opts)
+      data
+    end
+
+    # Returns a &#x60;Collection&#x60; object with the given &#x60;id&#x60;.
+    # @param x_account_token [String] Token identifying the end user.
+    # @param id [String] 
+    # @param [Hash] opts the optional parameters
+    # @option opts [String] :expand Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
+    # @option opts [Boolean] :include_remote_data Whether to include the original data Merge fetched from the third-party to produce these models.
+    # @option opts [String] :remote_fields Deprecated. Use show_enum_origins.
+    # @option opts [String] :show_enum_origins Which fields should be returned in non-normalized form.
+    # @return [Array<(Collection, Integer, Hash)>] Collection data, response status code and response headers
+    def collections_retrieve_with_http_info(x_account_token, id, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: CollectionsApi.collections_retrieve ...'
+      end
+      # verify the required parameter 'x_account_token' is set
+      if @api_client.config.client_side_validation && x_account_token.nil?
+        fail ArgumentError, "Missing the required parameter 'x_account_token' when calling CollectionsApi.collections_retrieve"
+      end
+      # verify the required parameter 'id' is set
+      if @api_client.config.client_side_validation && id.nil?
+        fail ArgumentError, "Missing the required parameter 'id' when calling CollectionsApi.collections_retrieve"
+      end
+      allowable_values = ["parent_collection"]
+      if @api_client.config.client_side_validation && opts[:'expand'] && !allowable_values.include?(opts[:'expand'])
+        fail ArgumentError, "invalid value for \"expand\", must be one of #{allowable_values}"
+      end
+      allowable_values = ["collection_type"]
+      if @api_client.config.client_side_validation && opts[:'remote_fields'] && !allowable_values.include?(opts[:'remote_fields'])
+        fail ArgumentError, "invalid value for \"remote_fields\", must be one of #{allowable_values}"
+      end
+      allowable_values = ["collection_type"]
+      if @api_client.config.client_side_validation && opts[:'show_enum_origins'] && !allowable_values.include?(opts[:'show_enum_origins'])
+        fail ArgumentError, "invalid value for \"show_enum_origins\", must be one of #{allowable_values}"
+      end
+      # resource path
+      local_var_path = '/collections/{id}'.sub('{' + 'id' + '}', CGI.escape(id.to_s))
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+      query_params[:'expand'] = opts[:'expand'] if !opts[:'expand'].nil?
+      query_params[:'include_remote_data'] = opts[:'include_remote_data'] if !opts[:'include_remote_data'].nil?
+      query_params[:'remote_fields'] = opts[:'remote_fields'] if !opts[:'remote_fields'].nil?
+      query_params[:'show_enum_origins'] = opts[:'show_enum_origins'] if !opts[:'show_enum_origins'].nil?
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
+      header_params[:'X-Account-Token'] = x_account_token
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'Collection'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['tokenAuth']
+
+      new_options = opts.merge(
+        :operation => :"CollectionsApi.collections_retrieve",
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: CollectionsApi#collections_retrieve\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+  end
+end

data/lib/merge_ticketing_client/api/linked_accounts_api.rb

@@ -60,7 +60,7 @@ module MergeTicketingClient
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: LinkedAccountsApi.linked_accounts_list ...'
       end
-      allowable_values = ["accounting", "ats", "crm", "hris", "ticketing"]
+      allowable_values = ["accounting", "ats", "crm", "hris", "mktg", "ticketing"]
       if @api_client.config.client_side_validation && opts[:'category'] && !allowable_values.include?(opts[:'category'])
         fail ArgumentError, "invalid value for \"category\", must be one of #{allowable_values}"
       end

data/lib/merge_ticketing_client/api/projects_api.rb

@@ -179,30 +179,32 @@ module MergeTicketingClient
       return data, status_code, headers
     end
 
-    # Returns a `User` object with the given `id`.
+    # Returns a list of `User` objects.
     # @param x_account_token [String] Token identifying the end user.
-    # @param id [String] 
+    # @param parent_id [String] 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :cursor The pagination cursor value.
     # @option opts [String] :expand Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
+    # @option opts [Boolean] :include_deleted_data Whether to include data that was marked as deleted by third party webhooks.
     # @option opts [Boolean] :include_remote_data Whether to include the original data Merge fetched from the third-party to produce these models.
     # @option opts [Integer] :page_size Number of results to return per page.
     # @return [PaginatedUserList]
-    def projects_users_list(x_account_token, id, opts = {})
-      data, _status_code, _headers = projects_users_list_with_http_info(x_account_token, id, opts)
+    def projects_users_list(x_account_token, parent_id, opts = {})
+      data, _status_code, _headers = projects_users_list_with_http_info(x_account_token, parent_id, opts)
       data
     end
 
-    # Returns a `User` object with the given `id`.
+    # Returns a list of `User` objects.
     # @param x_account_token [String] Token identifying the end user.
-    # @param id [String] 
+    # @param parent_id [String] 
     # @param [Hash] opts the optional parameters
     # @option opts [String] :cursor The pagination cursor value.
     # @option opts [String] :expand Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
+    # @option opts [Boolean] :include_deleted_data Whether to include data that was marked as deleted by third party webhooks.
     # @option opts [Boolean] :include_remote_data Whether to include the original data Merge fetched from the third-party to produce these models.
     # @option opts [Integer] :page_size Number of results to return per page.
     # @return [Array<(PaginatedUserList, Integer, Hash)>] PaginatedUserList data, response status code and response headers
-    def projects_users_list_with_http_info(x_account_token, id, opts = {})
+    def projects_users_list_with_http_info(x_account_token, parent_id, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: ProjectsApi.projects_users_list ...'
       end
@@ -210,21 +212,22 @@ module MergeTicketingClient
       if @api_client.config.client_side_validation && x_account_token.nil?
         fail ArgumentError, "Missing the required parameter 'x_account_token' when calling ProjectsApi.projects_users_list"
       end
-      # verify the required parameter 'id' is set
-      if @api_client.config.client_side_validation && id.nil?
-        fail ArgumentError, "Missing the required parameter 'id' when calling ProjectsApi.projects_users_list"
+      # verify the required parameter 'parent_id' is set
+      if @api_client.config.client_side_validation && parent_id.nil?
+        fail ArgumentError, "Missing the required parameter 'parent_id' when calling ProjectsApi.projects_users_list"
       end
       allowable_values = ["teams"]
       if @api_client.config.client_side_validation && opts[:'expand'] && !allowable_values.include?(opts[:'expand'])
         fail ArgumentError, "invalid value for \"expand\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/projects/{id}/users'.sub('{' + 'id' + '}', CGI.escape(id.to_s))
+      local_var_path = '/projects/{parent_id}/users'.sub('{' + 'parent_id' + '}', CGI.escape(parent_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
       query_params[:'cursor'] = opts[:'cursor'] if !opts[:'cursor'].nil?
       query_params[:'expand'] = opts[:'expand'] if !opts[:'expand'].nil?
+      query_params[:'include_deleted_data'] = opts[:'include_deleted_data'] if !opts[:'include_deleted_data'].nil?
       query_params[:'include_remote_data'] = opts[:'include_remote_data'] if !opts[:'include_remote_data'].nil?
       query_params[:'page_size'] = opts[:'page_size'] if !opts[:'page_size'].nil?