merge_ruby_client 1.0.0 → 1.1.0

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

@@ -2,10 +2,10 @@
 
 module Merge
   module Ticketing
-    # - `OPEN` - OPEN
-    #  - `CLOSED` - CLOSED
-    #  - `IN_PROGRESS` - IN_PROGRESS
-    #  - `ON_HOLD` - ON_HOLD
+    # * `OPEN` - OPEN
+    #  * `CLOSED` - CLOSED
+    #  * `IN_PROGRESS` - IN_PROGRESS
+    #  * `ON_HOLD` - ON_HOLD
     class TicketStatusEnum
       OPEN = "OPEN"
       CLOSED = "CLOSED"

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

@@ -42,6 +42,7 @@ module Merge
       #  returned.
       # @param page_size [Integer] Number of results to return per page.
       # @param remote_id [String] The API provider's ID for the given object.
+      # @param team [String] If provided, will only return users matching in this team.
       # @param request_options [Merge::RequestOptions]
       # @return [Merge::Ticketing::PaginatedUserList]
       # @example
@@ -52,7 +53,7 @@ module Merge
       #  )
       #  api.ticketing.users.list
       def list(created_after: nil, created_before: nil, cursor: nil, email_address: nil, expand: nil,
-               include_deleted_data: nil, include_remote_data: nil, include_shell_data: nil, modified_after: nil, modified_before: nil, page_size: nil, remote_id: nil, request_options: nil)
+               include_deleted_data: nil, include_remote_data: nil, include_shell_data: nil, modified_after: nil, modified_before: nil, page_size: nil, remote_id: nil, team: 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?
@@ -75,7 +76,8 @@ module Merge
             "modified_after": modified_after,
             "modified_before": modified_before,
             "page_size": page_size,
-            "remote_id": remote_id
+            "remote_id": remote_id,
+            "team": team
           }.compact
           unless request_options.nil? || request_options&.additional_body_parameters.nil?
             req.body = { **(request_options&.additional_body_parameters || {}) }.compact
@@ -92,6 +94,8 @@ module Merge
       #  should be comma separated without spaces.
       # @param include_remote_data [Boolean] Whether to include the original data Merge fetched from the third-party to
       #  produce these models.
+      # @param include_shell_data [Boolean] Whether to include shell records. Shell records are empty records (they may
+      #  contain some metadata but all other fields are null).
       # @param request_options [Merge::RequestOptions]
       # @return [Merge::Ticketing::User]
       # @example
@@ -101,7 +105,7 @@ module Merge
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
       #  api.ticketing.users.retrieve(id: "id")
-      def retrieve(id:, expand: nil, include_remote_data: nil, request_options: nil)
+      def retrieve(id:, expand: nil, include_remote_data: nil, include_shell_data: 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?
@@ -114,7 +118,8 @@ module Merge
           req.params = {
             **(request_options&.additional_query_parameters || {}),
             "expand": expand,
-            "include_remote_data": include_remote_data
+            "include_remote_data": include_remote_data,
+            "include_shell_data": include_shell_data
           }.compact
           unless request_options.nil? || request_options&.additional_body_parameters.nil?
             req.body = { **(request_options&.additional_body_parameters || {}) }.compact
@@ -157,6 +162,7 @@ module Merge
       #  returned.
       # @param page_size [Integer] Number of results to return per page.
       # @param remote_id [String] The API provider's ID for the given object.
+      # @param team [String] If provided, will only return users matching in this team.
       # @param request_options [Merge::RequestOptions]
       # @return [Merge::Ticketing::PaginatedUserList]
       # @example
@@ -167,7 +173,7 @@ module Merge
       #  )
       #  api.ticketing.users.list
       def list(created_after: nil, created_before: nil, cursor: nil, email_address: nil, expand: nil,
-               include_deleted_data: nil, include_remote_data: nil, include_shell_data: nil, modified_after: nil, modified_before: nil, page_size: nil, remote_id: nil, request_options: nil)
+               include_deleted_data: nil, include_remote_data: nil, include_shell_data: nil, modified_after: nil, modified_before: nil, page_size: nil, remote_id: nil, team: 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?
@@ -191,7 +197,8 @@ module Merge
               "modified_after": modified_after,
               "modified_before": modified_before,
               "page_size": page_size,
-              "remote_id": remote_id
+              "remote_id": remote_id,
+              "team": team
             }.compact
             unless request_options.nil? || request_options&.additional_body_parameters.nil?
               req.body = { **(request_options&.additional_body_parameters || {}) }.compact
@@ -209,6 +216,8 @@ module Merge
       #  should be comma separated without spaces.
       # @param include_remote_data [Boolean] Whether to include the original data Merge fetched from the third-party to
       #  produce these models.
+      # @param include_shell_data [Boolean] Whether to include shell records. Shell records are empty records (they may
+      #  contain some metadata but all other fields are null).
       # @param request_options [Merge::RequestOptions]
       # @return [Merge::Ticketing::User]
       # @example
@@ -218,7 +227,7 @@ module Merge
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
       #  api.ticketing.users.retrieve(id: "id")
-      def retrieve(id:, expand: nil, include_remote_data: nil, request_options: nil)
+      def retrieve(id:, expand: nil, include_remote_data: nil, include_shell_data: 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?
@@ -232,7 +241,8 @@ module Merge
             req.params = {
               **(request_options&.additional_query_parameters || {}),
               "expand": expand,
-              "include_remote_data": include_remote_data
+              "include_remote_data": include_remote_data,
+              "include_shell_data": include_shell_data
             }.compact
             unless request_options.nil? || request_options&.additional_body_parameters.nil?
               req.body = { **(request_options&.additional_body_parameters || {}) }.compact

data/lib/merge_ruby_client.rb

@@ -3,23 +3,23 @@
 require_relative "environment"
 require_relative "types_export"
 require_relative "requests"
-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/ats/client"
 require_relative "merge_ruby_client/hris/client"
+require_relative "merge_ruby_client/filestorage/client"
 require_relative "merge_ruby_client/ticketing/client"
 require_relative "merge_ruby_client/accounting/client"
 
 module Merge
   class Client
-    # @return [Merge::Ats::Client]
-    attr_reader :ats
     # @return [Merge::Crm::Client]
     attr_reader :crm
-    # @return [Merge::Filestorage::Client]
-    attr_reader :filestorage
+    # @return [Merge::Ats::Client]
+    attr_reader :ats
     # @return [Merge::Hris::Client]
     attr_reader :hris
+    # @return [Merge::Filestorage::Client]
+    attr_reader :filestorage
     # @return [Merge::Ticketing::Client]
     attr_reader :ticketing
     # @return [Merge::Accounting::Client]
@@ -42,24 +42,24 @@ module Merge
         api_key: api_key,
         account_token: account_token
       )
-      @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)
+      @ats = Merge::Ats::Client.new(request_client: @request_client)
       @hris = Merge::Hris::Client.new(request_client: @request_client)
+      @filestorage = Merge::Filestorage::Client.new(request_client: @request_client)
       @ticketing = Merge::Ticketing::Client.new(request_client: @request_client)
       @accounting = Merge::Accounting::Client.new(request_client: @request_client)
     end
   end
 
   class AsyncClient
-    # @return [Merge::Ats::AsyncClient]
-    attr_reader :ats
     # @return [Merge::Crm::AsyncClient]
     attr_reader :crm
-    # @return [Merge::Filestorage::AsyncClient]
-    attr_reader :filestorage
+    # @return [Merge::Ats::AsyncClient]
+    attr_reader :ats
     # @return [Merge::Hris::AsyncClient]
     attr_reader :hris
+    # @return [Merge::Filestorage::AsyncClient]
+    attr_reader :filestorage
     # @return [Merge::Ticketing::AsyncClient]
     attr_reader :ticketing
     # @return [Merge::Accounting::AsyncClient]
@@ -82,10 +82,10 @@ module Merge
         api_key: api_key,
         account_token: account_token
       )
-      @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)
+      @ats = Merge::Ats::AsyncClient.new(request_client: @async_request_client)
       @hris = Merge::Hris::AsyncClient.new(request_client: @async_request_client)
+      @filestorage = Merge::Filestorage::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)
     end

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": "1.0.0" }
+      headers = { "X-Fern-Language": "Ruby", "X-Fern-SDK-Name": "merge_ruby_client", "X-Fern-SDK-Version": "1.1.0" }
       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": "1.0.0" }
+      headers = { "X-Fern-Language": "Ruby", "X-Fern-SDK-Name": "merge_ruby_client", "X-Fern-SDK-Version": "1.1.0" }
       headers["Authorization"] = ((@api_key.is_a? Method) ? @api_key.call : @api_key) unless @api_key.nil?
       headers
     end