merge_hris_client 3.0.0 → 3.2.0

data/lib/merge_hris_client/api/employees_api.rb

@@ -100,10 +100,10 @@ module MergeHRISClient
     # @param model_id [String] 
     # @param ignore_common_model_request [IgnoreCommonModelRequest] 
     # @param [Hash] opts the optional parameters
-    # @return [IgnoreCommonModel]
+    # @return [nil]
     def employees_ignore_create(x_account_token, model_id, ignore_common_model_request, opts = {})
-      data, _status_code, _headers = employees_ignore_create_with_http_info(x_account_token, model_id, ignore_common_model_request, opts)
-      data
+      employees_ignore_create_with_http_info(x_account_token, model_id, ignore_common_model_request, opts)
+      nil
     end
 
     # Ignores a specific row based on the `model_id` in the url. These records will have their properties set to null, and will not be updated in future syncs. The \"reason\" and \"message\" fields in the request body will be stored for audit purposes.
@@ -111,7 +111,7 @@ module MergeHRISClient
     # @param model_id [String] 
     # @param ignore_common_model_request [IgnoreCommonModelRequest] 
     # @param [Hash] opts the optional parameters
-    # @return [Array<(IgnoreCommonModel, Integer, Hash)>] IgnoreCommonModel data, response status code and response headers
+    # @return [Array<(nil, Integer, Hash)>] nil, response status code and response headers
     def employees_ignore_create_with_http_info(x_account_token, model_id, ignore_common_model_request, opts = {})
       if @api_client.config.debugging
         @api_client.config.logger.debug 'Calling API: EmployeesApi.employees_ignore_create ...'
@@ -136,8 +136,6 @@ module MergeHRISClient
 
       # header parameters
       header_params = opts[:header_params] || {}
-      # HTTP header 'Accept' (if needed)
-      header_params['Accept'] = @api_client.select_header_accept(['application/json'])
       # HTTP header 'Content-Type'
       header_params['Content-Type'] = @api_client.select_header_content_type(['application/json', 'application/x-www-form-urlencoded', 'multipart/form-data'])
       header_params[:'X-Account-Token'] = x_account_token
@@ -149,7 +147,7 @@ module MergeHRISClient
       post_body = opts[:debug_body] || @api_client.object_to_http_body(ignore_common_model_request)
 
       # return_type
-      return_type = opts[:debug_return_type] || 'IgnoreCommonModel'
+      return_type = opts[:debug_return_type]
 
       # auth_names
       auth_names = opts[:debug_auth_names] || ['tokenAuth']
@@ -179,22 +177,28 @@ module MergeHRISClient
     # @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] :display_full_name If provided, will only return employees with this display name.
-    # @option opts [String] :employment_status If provided, will only return employees with this employment status.
+    # @option opts [String] :employment_status If provided, will only return employees with this employment status.  * &#x60;ACTIVE&#x60; - ACTIVE * &#x60;PENDING&#x60; - PENDING * &#x60;INACTIVE&#x60; - INACTIVE
     # @option opts [String] :expand Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     # @option opts [String] :first_name If provided, will only return employees with this first name.
+    # @option opts [String] :groups If provided, will only return employees matching the group ids; multiple groups can be separated by commas.
     # @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 [Boolean] :include_sensitive_fields Whether to include sensitive fields (such as social security numbers) in the response.
     # @option opts [String] :last_name If provided, will only return employees with this last name.
     # @option opts [String] :manager_id If provided, will only return employees for this manager.
-    # @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 [Time] :modified_after If provided, only objects synced by Merge after this date time will be returned.
+    # @option opts [Time] :modified_before If provided, only objects synced by Merge before this date time will be returned.
     # @option opts [Integer] :page_size Number of results to return per page.
     # @option opts [String] :pay_group_id If provided, will only return employees for this pay group
     # @option opts [String] :personal_email If provided, will only return Employees with this personal email
-    # @option opts [String] :remote_fields Which fields should be returned in non-normalized form.
+    # @option opts [String] :remote_fields Deprecated. Use show_enum_origins.
     # @option opts [String] :remote_id The API provider&#39;s ID for the given object.
+    # @option opts [String] :show_enum_origins Which fields should be returned in non-normalized form.
+    # @option opts [Time] :started_after If provided, will only return employees that started after this datetime.
+    # @option opts [Time] :started_before If provided, will only return employees that started before this datetime.
     # @option opts [String] :team_id If provided, will only return employees for this team.
+    # @option opts [Time] :terminated_after If provided, will only return employees that were terminated after this datetime.
+    # @option opts [Time] :terminated_before If provided, will only return employees that were terminated before this datetime.
     # @option opts [String] :work_email If provided, will only return Employees with this work email
     # @option opts [String] :work_location_id If provided, will only return employees for this location.
     # @return [PaginatedEmployeeList]
@@ -211,22 +215,28 @@ module MergeHRISClient
     # @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] :display_full_name If provided, will only return employees with this display name.
-    # @option opts [String] :employment_status If provided, will only return employees with this employment status.
+    # @option opts [String] :employment_status If provided, will only return employees with this employment status.  * &#x60;ACTIVE&#x60; - ACTIVE * &#x60;PENDING&#x60; - PENDING * &#x60;INACTIVE&#x60; - INACTIVE
     # @option opts [String] :expand Which relations should be returned in expanded form. Multiple relation names should be comma separated without spaces.
     # @option opts [String] :first_name If provided, will only return employees with this first name.
+    # @option opts [String] :groups If provided, will only return employees matching the group ids; multiple groups can be separated by commas.
     # @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 [Boolean] :include_sensitive_fields Whether to include sensitive fields (such as social security numbers) in the response.
     # @option opts [String] :last_name If provided, will only return employees with this last name.
     # @option opts [String] :manager_id If provided, will only return employees for this manager.
-    # @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 [Time] :modified_after If provided, only objects synced by Merge after this date time will be returned.
+    # @option opts [Time] :modified_before If provided, only objects synced by Merge before this date time will be returned.
     # @option opts [Integer] :page_size Number of results to return per page.
     # @option opts [String] :pay_group_id If provided, will only return employees for this pay group
     # @option opts [String] :personal_email If provided, will only return Employees with this personal email
-    # @option opts [String] :remote_fields Which fields should be returned in non-normalized form.
+    # @option opts [String] :remote_fields Deprecated. Use show_enum_origins.
     # @option opts [String] :remote_id The API provider&#39;s ID for the given object.
+    # @option opts [String] :show_enum_origins Which fields should be returned in non-normalized form.
+    # @option opts [Time] :started_after If provided, will only return employees that started after this datetime.
+    # @option opts [Time] :started_before If provided, will only return employees that started before this datetime.
     # @option opts [String] :team_id If provided, will only return employees for this team.
+    # @option opts [Time] :terminated_after If provided, will only return employees that were terminated after this datetime.
+    # @option opts [Time] :terminated_before If provided, will only return employees that were terminated before this datetime.
     # @option opts [String] :work_email If provided, will only return Employees with this work email
     # @option opts [String] :work_location_id If provided, will only return employees for this location.
     # @return [Array<(PaginatedEmployeeList, Integer, Hash)>] PaginatedEmployeeList data, response status code and response headers
@@ -250,6 +260,10 @@ module MergeHRISClient
       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 = ["employment_status", "employment_status,ethnicity", "employment_status,ethnicity,gender", "employment_status,ethnicity,gender,marital_status", "employment_status,ethnicity,marital_status", "employment_status,gender", "employment_status,gender,marital_status", "employment_status,marital_status", "ethnicity", "ethnicity,gender", "ethnicity,gender,marital_status", "ethnicity,marital_status", "gender", "gender,marital_status", "marital_status"]
+      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 = '/employees'
 
@@ -263,6 +277,7 @@ module MergeHRISClient
       query_params[:'employment_status'] = opts[:'employment_status'] if !opts[:'employment_status'].nil?
       query_params[:'expand'] = opts[:'expand'] if !opts[:'expand'].nil?
       query_params[:'first_name'] = opts[:'first_name'] if !opts[:'first_name'].nil?
+      query_params[:'groups'] = opts[:'groups'] if !opts[:'groups'].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[:'include_sensitive_fields'] = opts[:'include_sensitive_fields'] if !opts[:'include_sensitive_fields'].nil?
@@ -275,7 +290,12 @@ module MergeHRISClient
       query_params[:'personal_email'] = opts[:'personal_email'] if !opts[:'personal_email'].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?
+      query_params[:'started_after'] = opts[:'started_after'] if !opts[:'started_after'].nil?
+      query_params[:'started_before'] = opts[:'started_before'] if !opts[:'started_before'].nil?
       query_params[:'team_id'] = opts[:'team_id'] if !opts[:'team_id'].nil?
+      query_params[:'terminated_after'] = opts[:'terminated_after'] if !opts[:'terminated_after'].nil?
+      query_params[:'terminated_before'] = opts[:'terminated_before'] if !opts[:'terminated_before'].nil?
       query_params[:'work_email'] = opts[:'work_email'] if !opts[:'work_email'].nil?
       query_params[:'work_location_id'] = opts[:'work_location_id'] if !opts[:'work_location_id'].nil?
 
@@ -383,7 +403,8 @@ module MergeHRISClient
     # @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 [Boolean] :include_sensitive_fields Whether to include sensitive fields (such as social security numbers) in the response.
-    # @option opts [String] :remote_fields Which fields should be returned in non-normalized form.
+    # @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 [Employee]
     def employees_retrieve(x_account_token, id, opts = {})
       data, _status_code, _headers = employees_retrieve_with_http_info(x_account_token, id, opts)
@@ -397,7 +418,8 @@ module MergeHRISClient
     # @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 [Boolean] :include_sensitive_fields Whether to include sensitive fields (such as social security numbers) in the response.
-    # @option opts [String] :remote_fields Which fields should be returned in non-normalized form.
+    # @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<(Employee, Integer, Hash)>] Employee data, response status code and response headers
     def employees_retrieve_with_http_info(x_account_token, id, opts = {})
       if @api_client.config.debugging
@@ -419,6 +441,10 @@ module MergeHRISClient
       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 = ["employment_status", "employment_status,ethnicity", "employment_status,ethnicity,gender", "employment_status,ethnicity,gender,marital_status", "employment_status,ethnicity,marital_status", "employment_status,gender", "employment_status,gender,marital_status", "employment_status,marital_status", "ethnicity", "ethnicity,gender", "ethnicity,gender,marital_status", "ethnicity,marital_status", "gender", "gender,marital_status", "marital_status"]
+      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 = '/employees/{id}'.sub('{' + 'id' + '}', CGI.escape(id.to_s))
 
@@ -428,6 +454,7 @@ module MergeHRISClient
       query_params[:'include_remote_data'] = opts[:'include_remote_data'] if !opts[:'include_remote_data'].nil?
       query_params[:'include_sensitive_fields'] = opts[:'include_sensitive_fields'] if !opts[:'include_sensitive_fields'].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] || {}

data/lib/merge_hris_client/api/employments_api.rb

@@ -29,12 +29,13 @@ module MergeHRISClient
     # @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 [Time] :modified_after If provided, only objects synced by Merge after this date time will be returned.
+    # @option opts [Time] :modified_before If provided, only objects synced by Merge before this date time will be returned.
     # @option opts [String] :order_by Overrides the default ordering for this endpoint.
     # @option opts [Integer] :page_size Number of results to return per page.
-    # @option opts [String] :remote_fields Which fields should be returned in non-normalized form.
+    # @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 [PaginatedEmploymentList]
     def employments_list(x_account_token, opts = {})
       data, _status_code, _headers = employments_list_with_http_info(x_account_token, opts)
@@ -51,12 +52,13 @@ module MergeHRISClient
     # @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 [Time] :modified_after If provided, only objects synced by Merge after this date time will be returned.
+    # @option opts [Time] :modified_before If provided, only objects synced by Merge before this date time will be returned.
     # @option opts [String] :order_by Overrides the default ordering for this endpoint.
     # @option opts [Integer] :page_size Number of results to return per page.
-    # @option opts [String] :remote_fields Which fields should be returned in non-normalized form.
+    # @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<(PaginatedEmploymentList, Integer, Hash)>] PaginatedEmploymentList data, response status code and response headers
     def employments_list_with_http_info(x_account_token, opts = {})
       if @api_client.config.debugging
@@ -78,6 +80,10 @@ module MergeHRISClient
       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 = ["employment_type", "employment_type,flsa_status", "employment_type,flsa_status,pay_frequency", "employment_type,flsa_status,pay_frequency,pay_period", "employment_type,flsa_status,pay_period", "employment_type,pay_frequency", "employment_type,pay_frequency,pay_period", "employment_type,pay_period", "flsa_status", "flsa_status,pay_frequency", "flsa_status,pay_frequency,pay_period", "flsa_status,pay_period", "pay_frequency", "pay_frequency,pay_period", "pay_period"]
+      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 = '/employments'
 
@@ -96,6 +102,7 @@ module MergeHRISClient
       query_params[:'page_size'] = opts[:'page_size'] if !opts[:'page_size'].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] || {}
@@ -138,7 +145,8 @@ module MergeHRISClient
     # @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 Which fields should be returned in non-normalized form.
+    # @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 [Employment]
     def employments_retrieve(x_account_token, id, opts = {})
       data, _status_code, _headers = employments_retrieve_with_http_info(x_account_token, id, opts)
@@ -151,7 +159,8 @@ module MergeHRISClient
     # @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 Which fields should be returned in non-normalized form.
+    # @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<(Employment, Integer, Hash)>] Employment data, response status code and response headers
     def employments_retrieve_with_http_info(x_account_token, id, opts = {})
       if @api_client.config.debugging
@@ -173,6 +182,10 @@ module MergeHRISClient
       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 = ["employment_type", "employment_type,flsa_status", "employment_type,flsa_status,pay_frequency", "employment_type,flsa_status,pay_frequency,pay_period", "employment_type,flsa_status,pay_period", "employment_type,pay_frequency", "employment_type,pay_frequency,pay_period", "employment_type,pay_period", "flsa_status", "flsa_status,pay_frequency", "flsa_status,pay_frequency,pay_period", "flsa_status,pay_period", "pay_frequency", "pay_frequency,pay_period", "pay_period"]
+      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 = '/employments/{id}'.sub('{' + 'id' + '}', CGI.escape(id.to_s))
 
@@ -181,6 +194,7 @@ module MergeHRISClient
       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] || {}

data/lib/merge_hris_client/api/force_resync_api.rb

@@ -19,7 +19,7 @@ module MergeHRISClient
     def initialize(api_client = ApiClient.default)
       @api_client = api_client
     end
-    # Force re-sync of all models. This is only available for organizations on Merge's Grow and Expand plans.
+    # Force re-sync of all models. This is available for all organizations via the dashboard. Force re-sync is also available programmatically via API for monthly, quarterly, and highest sync frequency customers on the Core, Professional, or Enterprise plans. Doing so will consume a sync credit for the relevant linked account.
     # @param x_account_token [String] Token identifying the end user.
     # @param [Hash] opts the optional parameters
     # @return [Array<SyncStatus>]
@@ -28,7 +28,7 @@ module MergeHRISClient
       data
     end
 
-    # Force re-sync of all models. This is only available for organizations on Merge&#39;s Grow and Expand plans.
+    # Force re-sync of all models. This is available for all organizations via the dashboard. Force re-sync is also available programmatically via API for monthly, quarterly, and highest sync frequency customers on the Core, Professional, or Enterprise plans. Doing so will consume a sync credit for the relevant linked account.
     # @param x_account_token [String] Token identifying the end user.
     # @param [Hash] opts the optional parameters
     # @return [Array<(Array<SyncStatus>, Integer, Hash)>] Array<SyncStatus> data, response status code and response headers

data/lib/merge_hris_client/api/groups_api.rb

@@ -27,11 +27,13 @@ module MergeHRISClient
     # @option opts [String] :cursor The pagination cursor value.
     # @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 [Time] :modified_after If provided, only objects synced by Merge after this date time will be returned.
+    # @option opts [Time] :modified_before If provided, only objects synced by Merge before this date time will be returned.
     # @option opts [Integer] :page_size Number of results to return per page.
-    # @option opts [String] :remote_fields Which fields should be returned in non-normalized form.
+    # @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.
+    # @option opts [String] :types If provided, will only return groups of these types. Multiple values can be separated by commas.
     # @return [PaginatedGroupList]
     def groups_list(x_account_token, opts = {})
       data, _status_code, _headers = groups_list_with_http_info(x_account_token, opts)
@@ -46,11 +48,13 @@ module MergeHRISClient
     # @option opts [String] :cursor The pagination cursor value.
     # @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 [Time] :modified_after If provided, only objects synced by Merge after this date time will be returned.
+    # @option opts [Time] :modified_before If provided, only objects synced by Merge before this date time will be returned.
     # @option opts [Integer] :page_size Number of results to return per page.
-    # @option opts [String] :remote_fields Which fields should be returned in non-normalized form.
+    # @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.
+    # @option opts [String] :types If provided, will only return groups of these types. Multiple values can be separated by commas.
     # @return [Array<(PaginatedGroupList, Integer, Hash)>] PaginatedGroupList data, response status code and response headers
     def groups_list_with_http_info(x_account_token, opts = {})
       if @api_client.config.debugging
@@ -64,6 +68,10 @@ module MergeHRISClient
       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 = ["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 = '/groups'
 
@@ -79,6 +87,8 @@ module MergeHRISClient
       query_params[:'page_size'] = opts[:'page_size'] if !opts[:'page_size'].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?
+      query_params[:'types'] = opts[:'types'] if !opts[:'types'].nil?
 
       # header parameters
       header_params = opts[:header_params] || {}
@@ -120,7 +130,8 @@ module MergeHRISClient
     # @param id [String] 
     # @param [Hash] opts the optional parameters
     # @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 Which fields should be returned in non-normalized form.
+    # @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 [Group]
     def groups_retrieve(x_account_token, id, opts = {})
       data, _status_code, _headers = groups_retrieve_with_http_info(x_account_token, id, opts)
@@ -132,7 +143,8 @@ module MergeHRISClient
     # @param id [String] 
     # @param [Hash] opts the optional parameters
     # @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 Which fields should be returned in non-normalized form.
+    # @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<(Group, Integer, Hash)>] Group data, response status code and response headers
     def groups_retrieve_with_http_info(x_account_token, id, opts = {})
       if @api_client.config.debugging
@@ -150,6 +162,10 @@ module MergeHRISClient
       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 = ["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 = '/groups/{id}'.sub('{' + 'id' + '}', CGI.escape(id.to_s))
 
@@ -157,6 +173,7 @@ module MergeHRISClient
       query_params = opts[:query_params] || {}
       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] || {}

data/lib/merge_hris_client/api/issues_api.rb

@@ -29,11 +29,11 @@ module MergeHRISClient
     # @option opts [Time] :first_incident_time_before If provided, will only return issues whose first incident time was before this datetime.
     # @option opts [String] :include_muted If True, will include muted issues
     # @option opts [String] :integration_name 
-    # @option opts [Time] :last_incident_time_after If provided, will only return issues whose first incident time was after this datetime.
-    # @option opts [Time] :last_incident_time_before If provided, will only return issues whose first incident time was before this datetime.
+    # @option opts [Time] :last_incident_time_after If provided, will only return issues whose last incident time was after this datetime.
+    # @option opts [Time] :last_incident_time_before If provided, will only return issues whose last incident time was before this datetime.
     # @option opts [Integer] :page_size Number of results to return per page.
     # @option opts [String] :start_date If included, will only include issues whose most recent action occurred after this time
-    # @option opts [String] :status 
+    # @option opts [String] :status Status of the issue. Options: ('ONGOING', 'RESOLVED')  * `ONGOING` - ONGOING * `RESOLVED` - RESOLVED
     # @return [PaginatedIssueList]
     def issues_list(opts = {})
       data, _status_code, _headers = issues_list_with_http_info(opts)
@@ -50,11 +50,11 @@ module MergeHRISClient
     # @option opts [Time] :first_incident_time_before If provided, will only return issues whose first incident time was before this datetime.
     # @option opts [String] :include_muted If True, will include muted issues
     # @option opts [String] :integration_name 
-    # @option opts [Time] :last_incident_time_after If provided, will only return issues whose first incident time was after this datetime.
-    # @option opts [Time] :last_incident_time_before If provided, will only return issues whose first incident time was before this datetime.
+    # @option opts [Time] :last_incident_time_after If provided, will only return issues whose last incident time was after this datetime.
+    # @option opts [Time] :last_incident_time_before If provided, will only return issues whose last incident time was before this datetime.
     # @option opts [Integer] :page_size Number of results to return per page.
     # @option opts [String] :start_date If included, will only include issues whose most recent action occurred after this time
-    # @option opts [String] :status 
+    # @option opts [String] :status Status of the issue. Options: ('ONGOING', 'RESOLVED')  * `ONGOING` - ONGOING * `RESOLVED` - RESOLVED
     # @return [Array<(PaginatedIssueList, Integer, Hash)>] PaginatedIssueList data, response status code and response headers
     def issues_list_with_http_info(opts = {})
       if @api_client.config.debugging

data/lib/merge_hris_client/api/linked_accounts_api.rb

@@ -21,7 +21,7 @@ module MergeHRISClient
     end
     # List linked accounts for your organization.
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :category 
+    # @option opts [String] :category * `hris` - hris * `ats` - ats * `accounting` - accounting * `ticketing` - ticketing * `crm` - crm * `mktg` - mktg * `filestorage` - filestorage  * `hris` - hris * `ats` - ats * `accounting` - accounting * `ticketing` - ticketing * `crm` - crm * `mktg` - mktg * `filestorage` - filestorage
     # @option opts [String] :cursor The pagination cursor value.
     # @option opts [String] :end_user_email_address If provided, will only return linked accounts associated with the given email address.
     # @option opts [String] :end_user_organization_name If provided, will only return linked accounts associated with the given organization name.
@@ -42,7 +42,7 @@ module MergeHRISClient
 
     # List linked accounts for your organization.
     # @param [Hash] opts the optional parameters
-    # @option opts [String] :category 
+    # @option opts [String] :category * `hris` - hris * `ats` - ats * `accounting` - accounting * `ticketing` - ticketing * `crm` - crm * `mktg` - mktg * `filestorage` - filestorage  * `hris` - hris * `ats` - ats * `accounting` - accounting * `ticketing` - ticketing * `crm` - crm * `mktg` - mktg * `filestorage` - filestorage
     # @option opts [String] :cursor The pagination cursor value.
     # @option opts [String] :end_user_email_address If provided, will only return linked accounts associated with the given email address.
     # @option opts [String] :end_user_organization_name If provided, will only return linked accounts associated with the given organization name.
@@ -60,7 +60,7 @@ module MergeHRISClient
       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", "filestorage", "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_hris_client/api/locations_api.rb

@@ -27,11 +27,12 @@ module MergeHRISClient
     # @option opts [String] :cursor The pagination cursor value.
     # @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 [Time] :modified_after If provided, only objects synced by Merge after this date time will be returned.
+    # @option opts [Time] :modified_before If provided, only objects synced by Merge before this date time will be returned.
     # @option opts [Integer] :page_size Number of results to return per page.
-    # @option opts [String] :remote_fields Which fields should be returned in non-normalized form.
+    # @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 [PaginatedLocationList]
     def locations_list(x_account_token, opts = {})
       data, _status_code, _headers = locations_list_with_http_info(x_account_token, opts)
@@ -46,11 +47,12 @@ module MergeHRISClient
     # @option opts [String] :cursor The pagination cursor value.
     # @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 [Time] :modified_after If provided, only objects synced by Merge after this date time will be returned.
+    # @option opts [Time] :modified_before If provided, only objects synced by Merge before this date time will be returned.
     # @option opts [Integer] :page_size Number of results to return per page.
-    # @option opts [String] :remote_fields Which fields should be returned in non-normalized form.
+    # @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<(PaginatedLocationList, Integer, Hash)>] PaginatedLocationList data, response status code and response headers
     def locations_list_with_http_info(x_account_token, opts = {})
       if @api_client.config.debugging
@@ -64,6 +66,10 @@ module MergeHRISClient
       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 = ["location_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 = '/locations'
 
@@ -79,6 +85,7 @@ module MergeHRISClient
       query_params[:'page_size'] = opts[:'page_size'] if !opts[:'page_size'].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] || {}
@@ -120,7 +127,8 @@ module MergeHRISClient
     # @param id [String] 
     # @param [Hash] opts the optional parameters
     # @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 Which fields should be returned in non-normalized form.
+    # @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 [Location]
     def locations_retrieve(x_account_token, id, opts = {})
       data, _status_code, _headers = locations_retrieve_with_http_info(x_account_token, id, opts)
@@ -132,7 +140,8 @@ module MergeHRISClient
     # @param id [String] 
     # @param [Hash] opts the optional parameters
     # @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 Which fields should be returned in non-normalized form.
+    # @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<(Location, Integer, Hash)>] Location data, response status code and response headers
     def locations_retrieve_with_http_info(x_account_token, id, opts = {})
       if @api_client.config.debugging
@@ -150,6 +159,10 @@ module MergeHRISClient
       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 = ["location_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 = '/locations/{id}'.sub('{' + 'id' + '}', CGI.escape(id.to_s))
 
@@ -157,6 +170,7 @@ module MergeHRISClient
       query_params = opts[:query_params] || {}
       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] || {}

data/lib/merge_hris_client/api/pay_groups_api.rb

@@ -27,8 +27,8 @@ module MergeHRISClient
     # @option opts [String] :cursor The pagination cursor value.
     # @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 [Time] :modified_after If provided, only objects synced by Merge after this date time will be returned.
+    # @option opts [Time] :modified_before If provided, only objects synced by Merge before this date time will be returned.
     # @option opts [Integer] :page_size Number of results to return per page.
     # @option opts [String] :remote_id The API provider's ID for the given object.
     # @return [PaginatedPayGroupList]
@@ -45,8 +45,8 @@ module MergeHRISClient
     # @option opts [String] :cursor The pagination cursor value.
     # @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 [Time] :modified_after If provided, only objects synced by Merge after this date time will be returned.
+    # @option opts [Time] :modified_before If provided, only objects synced by Merge before this date time will be returned.
     # @option opts [Integer] :page_size Number of results to return per page.
     # @option opts [String] :remote_id The API provider's ID for the given object.
     # @return [Array<(PaginatedPayGroupList, Integer, Hash)>] PaginatedPayGroupList data, response status code and response headers