merge_hris_client 2.0.3 → 2.0.5

data/lib/merge_hris_client/api/employees_api.rb

@@ -182,7 +182,7 @@ module MergeHRISClient
     # @option opts [String] :employment_status If provided, will only return employees with this employment status.
     # @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 [Boolean] :include_deleted_data Whether to include data that was deleted in the third-party service.
+    # @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.
@@ -192,6 +192,7 @@ module MergeHRISClient
     # @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_id The API provider's ID for the given object.
     # @option opts [String] :team_id If provided, will only return employees for this team.
     # @option opts [String] :work_email If provided, will only return Employees with this work email
@@ -213,7 +214,7 @@ module MergeHRISClient
     # @option opts [String] :employment_status If provided, will only return employees with this employment status.
     # @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 [Boolean] :include_deleted_data Whether to include data that was deleted in the third-party service.
+    # @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.
@@ -223,6 +224,7 @@ module MergeHRISClient
     # @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_id The API provider's ID for the given object.
     # @option opts [String] :team_id If provided, will only return employees for this team.
     # @option opts [String] :work_email If provided, will only return Employees with this work email
@@ -244,6 +246,10 @@ module MergeHRISClient
       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 = ["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[:'remote_fields'] && !allowable_values.include?(opts[:'remote_fields'])
+        fail ArgumentError, "invalid value for \"remote_fields\", must be one of #{allowable_values}"
+      end
       # resource path
       local_var_path = '/employees'
 
@@ -267,6 +273,7 @@ module MergeHRISClient
       query_params[:'page_size'] = opts[:'page_size'] if !opts[:'page_size'].nil?
       query_params[:'pay_group_id'] = opts[:'pay_group_id'] if !opts[:'pay_group_id'].nil?
       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[:'team_id'] = opts[:'team_id'] if !opts[:'team_id'].nil?
       query_params[:'work_email'] = opts[:'work_email'] if !opts[:'work_email'].nil?
@@ -376,6 +383,7 @@ 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.
     # @return [Employee]
     def employees_retrieve(x_account_token, id, opts = {})
       data, _status_code, _headers = employees_retrieve_with_http_info(x_account_token, id, opts)
@@ -389,6 +397,7 @@ 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.
     # @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
@@ -406,6 +415,10 @@ module MergeHRISClient
       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 = ["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[:'remote_fields'] && !allowable_values.include?(opts[:'remote_fields'])
+        fail ArgumentError, "invalid value for \"remote_fields\", must be one of #{allowable_values}"
+      end
       # resource path
       local_var_path = '/employees/{id}'.sub('{' + 'id' + '}', CGI.escape(id.to_s))
 
@@ -414,6 +427,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[:'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?
 
       # header parameters
       header_params = opts[:header_params] || {}

data/lib/merge_hris_client/api/employments_api.rb

@@ -27,12 +27,13 @@ module MergeHRISClient
     # @option opts [String] :cursor The pagination cursor value.
     # @option opts [String] :employee_id If provided, will only return employments for this employee.
     # @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 deleted in the third-party service.
+    # @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 [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_id The API provider's ID for the given object.
     # @return [PaginatedEmploymentList]
     def employments_list(x_account_token, opts = {})
@@ -48,12 +49,13 @@ module MergeHRISClient
     # @option opts [String] :cursor The pagination cursor value.
     # @option opts [String] :employee_id If provided, will only return employments for this employee.
     # @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 deleted in the third-party service.
+    # @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 [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_id The API provider's ID for the given object.
     # @return [Array<(PaginatedEmploymentList, Integer, Hash)>] PaginatedEmploymentList data, response status code and response headers
     def employments_list_with_http_info(x_account_token, opts = {})
@@ -72,6 +74,10 @@ module MergeHRISClient
       if @api_client.config.client_side_validation && opts[:'order_by'] && !allowable_values.include?(opts[:'order_by'])
         fail ArgumentError, "invalid value for \"order_by\", 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[:'remote_fields'] && !allowable_values.include?(opts[:'remote_fields'])
+        fail ArgumentError, "invalid value for \"remote_fields\", must be one of #{allowable_values}"
+      end
       # resource path
       local_var_path = '/employments'
 
@@ -88,6 +94,7 @@ module MergeHRISClient
       query_params[:'modified_before'] = opts[:'modified_before'] if !opts[:'modified_before'].nil?
       query_params[:'order_by'] = opts[:'order_by'] if !opts[:'order_by'].nil?
       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?
 
       # header parameters
@@ -131,6 +138,7 @@ 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.
     # @return [Employment]
     def employments_retrieve(x_account_token, id, opts = {})
       data, _status_code, _headers = employments_retrieve_with_http_info(x_account_token, id, opts)
@@ -143,6 +151,7 @@ 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.
     # @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
@@ -160,6 +169,10 @@ module MergeHRISClient
       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 = ["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[:'remote_fields'] && !allowable_values.include?(opts[:'remote_fields'])
+        fail ArgumentError, "invalid value for \"remote_fields\", must be one of #{allowable_values}"
+      end
       # resource path
       local_var_path = '/employments/{id}'.sub('{' + 'id' + '}', CGI.escape(id.to_s))
 
@@ -167,6 +180,7 @@ module MergeHRISClient
       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?
 
       # header parameters
       header_params = opts[:header_params] || {}

data/lib/merge_hris_client/api/groups_api.rb

@@ -25,11 +25,12 @@ module MergeHRISClient
     # @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 [Boolean] :include_deleted_data Whether to include data that was deleted in the third-party service.
+    # @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] :remote_fields Which fields should be returned in non-normalized form.
     # @option opts [String] :remote_id The API provider's ID for the given object.
     # @return [PaginatedGroupList]
     def groups_list(x_account_token, opts = {})
@@ -43,11 +44,12 @@ module MergeHRISClient
     # @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 [Boolean] :include_deleted_data Whether to include data that was deleted in the third-party service.
+    # @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] :remote_fields Which fields should be returned in non-normalized form.
     # @option opts [String] :remote_id The API provider's ID for the given object.
     # @return [Array<(PaginatedGroupList, Integer, Hash)>] PaginatedGroupList data, response status code and response headers
     def groups_list_with_http_info(x_account_token, opts = {})
@@ -58,6 +60,10 @@ module MergeHRISClient
       if @api_client.config.client_side_validation && x_account_token.nil?
         fail ArgumentError, "Missing the required parameter 'x_account_token' when calling GroupsApi.groups_list"
       end
+      allowable_values = ["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
       # resource path
       local_var_path = '/groups'
 
@@ -71,6 +77,7 @@ module MergeHRISClient
       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[:'remote_fields'] = opts[:'remote_fields'] if !opts[:'remote_fields'].nil?
       query_params[:'remote_id'] = opts[:'remote_id'] if !opts[:'remote_id'].nil?
 
       # header parameters
@@ -113,6 +120,7 @@ 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.
     # @return [Group]
     def groups_retrieve(x_account_token, id, opts = {})
       data, _status_code, _headers = groups_retrieve_with_http_info(x_account_token, id, opts)
@@ -124,6 +132,7 @@ 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.
     # @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
@@ -137,12 +146,17 @@ module MergeHRISClient
       if @api_client.config.client_side_validation && id.nil?
         fail ArgumentError, "Missing the required parameter 'id' when calling GroupsApi.groups_retrieve"
       end
+      allowable_values = ["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
       # resource path
       local_var_path = '/groups/{id}'.sub('{' + 'id' + '}', CGI.escape(id.to_s))
 
       # query parameters
       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?
 
       # header parameters
       header_params = opts[:header_params] || {}

data/lib/merge_hris_client/api/linked_accounts_api.rb

@@ -29,6 +29,7 @@ module MergeHRISClient
     # @option opts [String] :end_user_origin_ids Comma-separated list of EndUser origin IDs, making it possible to specify multiple EndUsers at once.
     # @option opts [String] :id 
     # @option opts [String] :ids Comma-separated list of LinkedAccount IDs, making it possible to specify multiple LinkedAccounts at once.
+    # @option opts [Boolean] :include_duplicates If `true`, will include complete production duplicates of the account specified by the `id` query parameter in the response. `id` must be for a complete production linked account.
     # @option opts [String] :integration_name If provided, will only return linked accounts associated with the given integration name.
     # @option opts [String] :is_test_account If included, will only include test linked accounts. If not included, will only include non-test linked accounts.
     # @option opts [Integer] :page_size Number of results to return per page.
@@ -49,6 +50,7 @@ module MergeHRISClient
     # @option opts [String] :end_user_origin_ids Comma-separated list of EndUser origin IDs, making it possible to specify multiple EndUsers at once.
     # @option opts [String] :id 
     # @option opts [String] :ids Comma-separated list of LinkedAccount IDs, making it possible to specify multiple LinkedAccounts at once.
+    # @option opts [Boolean] :include_duplicates If `true`, will include complete production duplicates of the account specified by the `id` query parameter in the response. `id` must be for a complete production linked account.
     # @option opts [String] :integration_name If provided, will only return linked accounts associated with the given integration name.
     # @option opts [String] :is_test_account If included, will only include test linked accounts. If not included, will only include non-test linked accounts.
     # @option opts [Integer] :page_size Number of results to return per page.
@@ -75,6 +77,7 @@ module MergeHRISClient
       query_params[:'end_user_origin_ids'] = opts[:'end_user_origin_ids'] if !opts[:'end_user_origin_ids'].nil?
       query_params[:'id'] = opts[:'id'] if !opts[:'id'].nil?
       query_params[:'ids'] = opts[:'ids'] if !opts[:'ids'].nil?
+      query_params[:'include_duplicates'] = opts[:'include_duplicates'] if !opts[:'include_duplicates'].nil?
       query_params[:'integration_name'] = opts[:'integration_name'] if !opts[:'integration_name'].nil?
       query_params[:'is_test_account'] = opts[:'is_test_account'] if !opts[:'is_test_account'].nil?
       query_params[:'page_size'] = opts[:'page_size'] if !opts[:'page_size'].nil?

data/lib/merge_hris_client/api/locations_api.rb

@@ -25,11 +25,12 @@ module MergeHRISClient
     # @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 [Boolean] :include_deleted_data Whether to include data that was deleted in the third-party service.
+    # @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] :remote_fields Which fields should be returned in non-normalized form.
     # @option opts [String] :remote_id The API provider's ID for the given object.
     # @return [PaginatedLocationList]
     def locations_list(x_account_token, opts = {})
@@ -43,11 +44,12 @@ module MergeHRISClient
     # @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 [Boolean] :include_deleted_data Whether to include data that was deleted in the third-party service.
+    # @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] :remote_fields Which fields should be returned in non-normalized form.
     # @option opts [String] :remote_id The API provider's ID for the given object.
     # @return [Array<(PaginatedLocationList, Integer, Hash)>] PaginatedLocationList data, response status code and response headers
     def locations_list_with_http_info(x_account_token, opts = {})
@@ -58,6 +60,10 @@ module MergeHRISClient
       if @api_client.config.client_side_validation && x_account_token.nil?
         fail ArgumentError, "Missing the required parameter 'x_account_token' when calling LocationsApi.locations_list"
       end
+      allowable_values = ["location_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
       # resource path
       local_var_path = '/locations'
 
@@ -71,6 +77,7 @@ module MergeHRISClient
       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[:'remote_fields'] = opts[:'remote_fields'] if !opts[:'remote_fields'].nil?
       query_params[:'remote_id'] = opts[:'remote_id'] if !opts[:'remote_id'].nil?
 
       # header parameters
@@ -113,6 +120,7 @@ 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.
     # @return [Location]
     def locations_retrieve(x_account_token, id, opts = {})
       data, _status_code, _headers = locations_retrieve_with_http_info(x_account_token, id, opts)
@@ -124,6 +132,7 @@ 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.
     # @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
@@ -137,12 +146,17 @@ module MergeHRISClient
       if @api_client.config.client_side_validation && id.nil?
         fail ArgumentError, "Missing the required parameter 'id' when calling LocationsApi.locations_retrieve"
       end
+      allowable_values = ["location_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
       # resource path
       local_var_path = '/locations/{id}'.sub('{' + 'id' + '}', CGI.escape(id.to_s))
 
       # query parameters
       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?
 
       # header parameters
       header_params = opts[:header_params] || {}

data/lib/merge_hris_client/api/pay_groups_api.rb

@@ -25,7 +25,7 @@ module MergeHRISClient
     # @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 [Boolean] :include_deleted_data Whether to include data that was deleted in the third-party service.
+    # @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.
@@ -43,7 +43,7 @@ module MergeHRISClient
     # @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 [Boolean] :include_deleted_data Whether to include data that was deleted in the third-party service.
+    # @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.

data/lib/merge_hris_client/api/payroll_runs_api.rb

@@ -27,11 +27,12 @@ module MergeHRISClient
     # @option opts [String] :cursor The pagination cursor value.
     # @option opts [Time] :ended_after If provided, will only return payroll runs ended after this datetime.
     # @option opts [Time] :ended_before If provided, will only return payroll runs ended before this datetime.
-    # @option opts [Boolean] :include_deleted_data Whether to include data that was deleted in the third-party service.
+    # @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] :remote_fields Which fields should be returned in non-normalized form.
     # @option opts [String] :remote_id The API provider's ID for the given object.
     # @option opts [String] :run_type If provided, will only return PayrollRun's with this status. Options: ('REGULAR', 'OFF_CYCLE', 'CORRECTION', 'TERMINATION', 'SIGN_ON_BONUS')
     # @option opts [Time] :started_after If provided, will only return payroll runs started after this datetime.
@@ -50,11 +51,12 @@ module MergeHRISClient
     # @option opts [String] :cursor The pagination cursor value.
     # @option opts [Time] :ended_after If provided, will only return payroll runs ended after this datetime.
     # @option opts [Time] :ended_before If provided, will only return payroll runs ended before this datetime.
-    # @option opts [Boolean] :include_deleted_data Whether to include data that was deleted in the third-party service.
+    # @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] :remote_fields Which fields should be returned in non-normalized form.
     # @option opts [String] :remote_id The API provider's ID for the given object.
     # @option opts [String] :run_type If provided, will only return PayrollRun's with this status. Options: ('REGULAR', 'OFF_CYCLE', 'CORRECTION', 'TERMINATION', 'SIGN_ON_BONUS')
     # @option opts [Time] :started_after If provided, will only return payroll runs started after this datetime.
@@ -68,6 +70,10 @@ module MergeHRISClient
       if @api_client.config.client_side_validation && x_account_token.nil?
         fail ArgumentError, "Missing the required parameter 'x_account_token' when calling PayrollRunsApi.payroll_runs_list"
       end
+      allowable_values = ["run_state", "run_state,run_type", "run_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 = ["CORRECTION", "OFF_CYCLE", "REGULAR", "SIGN_ON_BONUS", "TERMINATION"]
       if @api_client.config.client_side_validation && opts[:'run_type'] && !allowable_values.include?(opts[:'run_type'])
         fail ArgumentError, "invalid value for \"run_type\", must be one of #{allowable_values}"
@@ -87,6 +93,7 @@ module MergeHRISClient
       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[:'remote_fields'] = opts[:'remote_fields'] if !opts[:'remote_fields'].nil?
       query_params[:'remote_id'] = opts[:'remote_id'] if !opts[:'remote_id'].nil?
       query_params[:'run_type'] = opts[:'run_type'] if !opts[:'run_type'].nil?
       query_params[:'started_after'] = opts[:'started_after'] if !opts[:'started_after'].nil?
@@ -132,6 +139,7 @@ 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.
     # @return [PayrollRun]
     def payroll_runs_retrieve(x_account_token, id, opts = {})
       data, _status_code, _headers = payroll_runs_retrieve_with_http_info(x_account_token, id, opts)
@@ -143,6 +151,7 @@ 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.
     # @return [Array<(PayrollRun, Integer, Hash)>] PayrollRun data, response status code and response headers
     def payroll_runs_retrieve_with_http_info(x_account_token, id, opts = {})
       if @api_client.config.debugging
@@ -156,12 +165,17 @@ module MergeHRISClient
       if @api_client.config.client_side_validation && id.nil?
         fail ArgumentError, "Missing the required parameter 'id' when calling PayrollRunsApi.payroll_runs_retrieve"
       end
+      allowable_values = ["run_state", "run_state,run_type", "run_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
       # resource path
       local_var_path = '/payroll-runs/{id}'.sub('{' + 'id' + '}', CGI.escape(id.to_s))
 
       # query parameters
       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?
 
       # header parameters
       header_params = opts[:header_params] || {}

data/lib/merge_hris_client/api/sync_status_api.rb

@@ -19,7 +19,7 @@ module MergeHRISClient
     def initialize(api_client = ApiClient.default)
       @api_client = api_client
     end
-    # Get syncing status. Possible values: `DISABLED`, `DONE`, `FAILED`, `SYNCING`
+    # Get syncing status. Possible values: `DISABLED`, `DONE`, `FAILED`, `PAUSED`, `SYNCING`
     # @param x_account_token [String] Token identifying the end user.
     # @param [Hash] opts the optional parameters
     # @option opts [String] :cursor The pagination cursor value.
@@ -30,7 +30,7 @@ module MergeHRISClient
       data
     end
 
-    # Get syncing status. Possible values: `DISABLED`, `DONE`, `FAILED`, `SYNCING`
+    # Get syncing status. Possible values: `DISABLED`, `DONE`, `FAILED`, `PAUSED`, `SYNCING`
     # @param x_account_token [String] Token identifying the end user.
     # @param [Hash] opts the optional parameters
     # @option opts [String] :cursor The pagination cursor value.

data/lib/merge_hris_client/api/teams_api.rb

@@ -26,7 +26,7 @@ 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] :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 deleted in the third-party service.
+    # @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.
@@ -46,7 +46,7 @@ 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] :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 deleted in the third-party service.
+    # @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.

data/lib/merge_hris_client/api/time_off_api.rb

@@ -104,11 +104,12 @@ module MergeHRISClient
     # @option opts [String] :cursor The pagination cursor value.
     # @option opts [String] :employee_id If provided, will only return time off for this employee.
     # @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 deleted in the third-party service.
+    # @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] :remote_fields Which fields should be returned in non-normalized form.
     # @option opts [String] :remote_id The API provider's ID for the given object.
     # @option opts [String] :request_type If provided, will only return TimeOff with this request type. Options: ('VACATION', 'SICK', 'PERSONAL', 'JURY_DUTY', 'VOLUNTEER', 'BEREAVEMENT')
     # @option opts [String] :status If provided, will only return TimeOff with this status. Options: ('REQUESTED', 'APPROVED', 'DECLINED', 'CANCELLED', 'DELETED')
@@ -127,11 +128,12 @@ module MergeHRISClient
     # @option opts [String] :cursor The pagination cursor value.
     # @option opts [String] :employee_id If provided, will only return time off for this employee.
     # @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 deleted in the third-party service.
+    # @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] :remote_fields Which fields should be returned in non-normalized form.
     # @option opts [String] :remote_id The API provider's ID for the given object.
     # @option opts [String] :request_type If provided, will only return TimeOff with this request type. Options: ('VACATION', 'SICK', 'PERSONAL', 'JURY_DUTY', 'VOLUNTEER', 'BEREAVEMENT')
     # @option opts [String] :status If provided, will only return TimeOff with this status. Options: ('REQUESTED', 'APPROVED', 'DECLINED', 'CANCELLED', 'DELETED')
@@ -148,6 +150,10 @@ module MergeHRISClient
       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 = ["request_type", "request_type,status", "request_type,status,units", "request_type,units", "status", "status,units", "units"]
+      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 = ["BEREAVEMENT", "JURY_DUTY", "PERSONAL", "SICK", "VACATION", "VOLUNTEER"]
       if @api_client.config.client_side_validation && opts[:'request_type'] && !allowable_values.include?(opts[:'request_type'])
         fail ArgumentError, "invalid value for \"request_type\", must be one of #{allowable_values}"
@@ -172,6 +178,7 @@ module MergeHRISClient
       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[:'remote_fields'] = opts[:'remote_fields'] if !opts[:'remote_fields'].nil?
       query_params[:'remote_id'] = opts[:'remote_id'] if !opts[:'remote_id'].nil?
       query_params[:'request_type'] = opts[:'request_type'] if !opts[:'request_type'].nil?
       query_params[:'status'] = opts[:'status'] if !opts[:'status'].nil?
@@ -279,6 +286,7 @@ 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.
     # @return [TimeOff]
     def time_off_retrieve(x_account_token, id, opts = {})
       data, _status_code, _headers = time_off_retrieve_with_http_info(x_account_token, id, opts)
@@ -291,6 +299,7 @@ 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.
     # @return [Array<(TimeOff, Integer, Hash)>] TimeOff data, response status code and response headers
     def time_off_retrieve_with_http_info(x_account_token, id, opts = {})
       if @api_client.config.debugging
@@ -308,6 +317,10 @@ module MergeHRISClient
       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 = ["request_type", "request_type,status", "request_type,status,units", "request_type,units", "status", "status,units", "units"]
+      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
       # resource path
       local_var_path = '/time-off/{id}'.sub('{' + 'id' + '}', CGI.escape(id.to_s))
 
@@ -315,6 +328,7 @@ module MergeHRISClient
       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?
 
       # header parameters
       header_params = opts[:header_params] || {}