merge_hris_client 2.0.0 → 2.0.3

data/lib/merge_hris_client/models/account_details.rb

@@ -19,6 +19,8 @@ module MergeHRISClient
 
     attr_accessor :integration
 
+    attr_accessor :integration_slug
+
     attr_accessor :category
 
     attr_accessor :end_user_origin_id
@@ -29,16 +31,20 @@ module MergeHRISClient
 
     attr_accessor :status
 
+    attr_accessor :webhook_listener_url
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'id' => :'id',
         :'integration' => :'integration',
+        :'integration_slug' => :'integration_slug',
         :'category' => :'category',
         :'end_user_origin_id' => :'end_user_origin_id',
         :'end_user_organization_name' => :'end_user_organization_name',
         :'end_user_email_address' => :'end_user_email_address',
-        :'status' => :'status'
+        :'status' => :'status',
+        :'webhook_listener_url' => :'webhook_listener_url'
       }
     end
 
@@ -52,11 +58,13 @@ module MergeHRISClient
       {
         :'id' => :'String',
         :'integration' => :'String',
+        :'integration_slug' => :'String',
         :'category' => :'CategoryEnum',
         :'end_user_origin_id' => :'String',
         :'end_user_organization_name' => :'String',
         :'end_user_email_address' => :'String',
-        :'status' => :'String'
+        :'status' => :'String',
+        :'webhook_listener_url' => :'String'
       }
     end
 
@@ -90,6 +98,10 @@ module MergeHRISClient
         self.integration = attributes[:'integration']
       end
 
+      if attributes.key?(:'integration_slug')
+        self.integration_slug = attributes[:'integration_slug']
+      end
+
       if attributes.key?(:'category')
         self.category = attributes[:'category']
       end
@@ -109,6 +121,10 @@ module MergeHRISClient
       if attributes.key?(:'status')
         self.status = attributes[:'status']
       end
+
+      if attributes.key?(:'webhook_listener_url')
+        self.webhook_listener_url = attributes[:'webhook_listener_url']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -131,11 +147,13 @@ module MergeHRISClient
       self.class == o.class &&
           id == o.id &&
           integration == o.integration &&
+          integration_slug == o.integration_slug &&
           category == o.category &&
           end_user_origin_id == o.end_user_origin_id &&
           end_user_organization_name == o.end_user_organization_name &&
           end_user_email_address == o.end_user_email_address &&
-          status == o.status
+          status == o.status &&
+          webhook_listener_url == o.webhook_listener_url
     end
 
     # @see the `==` method
@@ -147,7 +165,7 @@ module MergeHRISClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, integration, category, end_user_origin_id, end_user_organization_name, end_user_email_address, status].hash
+      [id, integration, integration_slug, category, end_user_origin_id, end_user_organization_name, end_user_email_address, status, webhook_listener_url].hash
     end
 
     # Builds the object from hash

data/lib/merge_hris_client/models/account_details_and_actions.rb

@@ -30,6 +30,8 @@ module MergeHRISClient
 
     attr_accessor :end_user_email_address
 
+    attr_accessor :webhook_listener_url
+
     attr_accessor :integration
 
     # Attribute mapping from ruby-style variable name to JSON key.
@@ -42,6 +44,7 @@ module MergeHRISClient
         :'end_user_origin_id' => :'end_user_origin_id',
         :'end_user_organization_name' => :'end_user_organization_name',
         :'end_user_email_address' => :'end_user_email_address',
+        :'webhook_listener_url' => :'webhook_listener_url',
         :'integration' => :'integration'
       }
     end
@@ -61,6 +64,7 @@ module MergeHRISClient
         :'end_user_origin_id' => :'String',
         :'end_user_organization_name' => :'String',
         :'end_user_email_address' => :'String',
+        :'webhook_listener_url' => :'String',
         :'integration' => :'AccountDetailsAndActionsIntegration'
       }
     end
@@ -114,6 +118,10 @@ module MergeHRISClient
         self.end_user_email_address = attributes[:'end_user_email_address']
       end
 
+      if attributes.key?(:'webhook_listener_url')
+        self.webhook_listener_url = attributes[:'webhook_listener_url']
+      end
+
       if attributes.key?(:'integration')
         self.integration = attributes[:'integration']
       end
@@ -139,6 +147,10 @@ module MergeHRISClient
         invalid_properties.push('invalid value for "end_user_email_address", end_user_email_address cannot be nil.')
       end
 
+      if @webhook_listener_url.nil?
+        invalid_properties.push('invalid value for "webhook_listener_url", webhook_listener_url cannot be nil.')
+      end
+
       invalid_properties
     end
 
@@ -149,6 +161,7 @@ module MergeHRISClient
       return false if @status.nil?
       return false if @end_user_organization_name.nil?
       return false if @end_user_email_address.nil?
+      return false if @webhook_listener_url.nil?
       true
     end
 
@@ -164,6 +177,7 @@ module MergeHRISClient
           end_user_origin_id == o.end_user_origin_id &&
           end_user_organization_name == o.end_user_organization_name &&
           end_user_email_address == o.end_user_email_address &&
+          webhook_listener_url == o.webhook_listener_url &&
           integration == o.integration
     end
 
@@ -176,7 +190,7 @@ module MergeHRISClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, category, status, status_detail, end_user_origin_id, end_user_organization_name, end_user_email_address, integration].hash
+      [id, category, status, status_detail, end_user_origin_id, end_user_organization_name, end_user_email_address, webhook_listener_url, integration].hash
     end
 
     # Builds the object from hash

data/lib/merge_hris_client/models/account_details_and_actions_status_enum.rb

@@ -33,5 +33,4 @@ module MergeHRISClient
       value
     end
   end
-
 end

data/lib/merge_hris_client/models/account_type_enum.rb

@@ -32,5 +32,4 @@ module MergeHRISClient
       value
     end
   end
-
 end

data/lib/merge_hris_client/models/bank_info.rb

@@ -40,6 +40,9 @@ module MergeHRISClient
 
     attr_accessor :remote_data
 
+    # Indicates whether or not this object has been deleted on the third-party.
+    attr_accessor :remote_was_deleted
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -51,7 +54,8 @@ module MergeHRISClient
         :'bank_name' => :'bank_name',
         :'account_type' => :'account_type',
         :'remote_created_at' => :'remote_created_at',
-        :'remote_data' => :'remote_data'
+        :'remote_data' => :'remote_data',
+        :'remote_was_deleted' => :'remote_was_deleted'
       }
     end
 
@@ -71,7 +75,8 @@ module MergeHRISClient
         :'bank_name' => :'String',
         :'account_type' => :'AccountTypeEnum',
         :'remote_created_at' => :'Time',
-        :'remote_data' => :'Array<RemoteData>'
+        :'remote_data' => :'Array<RemoteData>',
+        :'remote_was_deleted' => :'Boolean'
       }
     end
 
@@ -85,7 +90,7 @@ module MergeHRISClient
         :'bank_name',
         :'account_type',
         :'remote_created_at',
-        :'remote_data'
+        :'remote_data',
       ])
     end
 
@@ -141,6 +146,10 @@ module MergeHRISClient
           self.remote_data = value
         end
       end
+
+      if attributes.key?(:'remote_was_deleted')
+        self.remote_was_deleted = attributes[:'remote_was_deleted']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -184,7 +193,8 @@ module MergeHRISClient
           bank_name == o.bank_name &&
           account_type == o.account_type &&
           remote_created_at == o.remote_created_at &&
-          remote_data == o.remote_data
+          remote_data == o.remote_data &&
+          remote_was_deleted == o.remote_was_deleted
     end
 
     # @see the `==` method
@@ -196,7 +206,7 @@ module MergeHRISClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, remote_id, employee, account_number, routing_number, bank_name, account_type, remote_created_at, remote_data].hash
+      [id, remote_id, employee, account_number, routing_number, bank_name, account_type, remote_created_at, remote_data, remote_was_deleted].hash
     end
 
     # Builds the object from hash

data/lib/merge_hris_client/models/benefit.rb

@@ -37,6 +37,9 @@ module MergeHRISClient
 
     attr_accessor :remote_data
 
+    # Indicates whether or not this object has been deleted on the third-party.
+    attr_accessor :remote_was_deleted
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -47,7 +50,8 @@ module MergeHRISClient
         :'benefit_plan_type' => :'benefit_plan_type',
         :'employee_contribution' => :'employee_contribution',
         :'company_contribution' => :'company_contribution',
-        :'remote_data' => :'remote_data'
+        :'remote_data' => :'remote_data',
+        :'remote_was_deleted' => :'remote_was_deleted'
       }
     end
 
@@ -66,7 +70,8 @@ module MergeHRISClient
         :'benefit_plan_type' => :'String',
         :'employee_contribution' => :'Float',
         :'company_contribution' => :'Float',
-        :'remote_data' => :'Array<RemoteData>'
+        :'remote_data' => :'Array<RemoteData>',
+        :'remote_was_deleted' => :'Boolean'
       }
     end
 
@@ -79,7 +84,7 @@ module MergeHRISClient
         :'benefit_plan_type',
         :'employee_contribution',
         :'company_contribution',
-        :'remote_data'
+        :'remote_data',
       ])
     end
 
@@ -131,6 +136,10 @@ module MergeHRISClient
           self.remote_data = value
         end
       end
+
+      if attributes.key?(:'remote_was_deleted')
+        self.remote_was_deleted = attributes[:'remote_was_deleted']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -158,7 +167,8 @@ module MergeHRISClient
           benefit_plan_type == o.benefit_plan_type &&
           employee_contribution == o.employee_contribution &&
           company_contribution == o.company_contribution &&
-          remote_data == o.remote_data
+          remote_data == o.remote_data &&
+          remote_was_deleted == o.remote_was_deleted
     end
 
     # @see the `==` method
@@ -170,7 +180,7 @@ module MergeHRISClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, remote_id, employee, provider_name, benefit_plan_type, employee_contribution, company_contribution, remote_data].hash
+      [id, remote_id, employee, provider_name, benefit_plan_type, employee_contribution, company_contribution, remote_data, remote_was_deleted].hash
     end
 
     # Builds the object from hash

data/lib/merge_hris_client/models/categories_enum.rb

@@ -18,6 +18,8 @@ module MergeHRISClient
     HRIS = "hris".freeze
     ATS = "ats".freeze
     ACCOUNTING = "accounting".freeze
+    TICKETING = "ticketing".freeze
+    CRM = "crm".freeze
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string
@@ -33,5 +35,4 @@ module MergeHRISClient
       value
     end
   end
-
 end

data/lib/merge_hris_client/models/category_enum.rb

@@ -18,6 +18,8 @@ module MergeHRISClient
     HRIS = "hris".freeze
     ATS = "ats".freeze
     ACCOUNTING = "accounting".freeze
+    TICKETING = "ticketing".freeze
+    CRM = "crm".freeze
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string
@@ -33,5 +35,4 @@ module MergeHRISClient
       value
     end
   end
-
 end

data/lib/merge_hris_client/models/company.rb

@@ -14,7 +14,7 @@ require 'date'
 require 'time'
 
 module MergeHRISClient
-  # # The Company Object ### Description The `Company` object is used to represent a Company.  ### Usage Example Fetch from the `LIST Companies` endpoint and filter by `ID` to show all companies.
+  # # The Company Object ### Description The `Company` object is used to represent a Company within the HRIS / Payroll system.  ### Usage Example Fetch from the `LIST Companies` endpoint and filter by `ID` to show all companies.
   class Company
     attr_accessor :id
 
@@ -32,6 +32,9 @@ module MergeHRISClient
 
     attr_accessor :remote_data
 
+    # Indicates whether or not this object has been deleted on the third-party.
+    attr_accessor :remote_was_deleted
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -40,7 +43,8 @@ module MergeHRISClient
         :'legal_name' => :'legal_name',
         :'display_name' => :'display_name',
         :'eins' => :'eins',
-        :'remote_data' => :'remote_data'
+        :'remote_data' => :'remote_data',
+        :'remote_was_deleted' => :'remote_was_deleted'
       }
     end
 
@@ -57,7 +61,8 @@ module MergeHRISClient
         :'legal_name' => :'String',
         :'display_name' => :'String',
         :'eins' => :'Array<String>',
-        :'remote_data' => :'Array<RemoteData>'
+        :'remote_data' => :'Array<RemoteData>',
+        :'remote_was_deleted' => :'Boolean'
       }
     end
 
@@ -68,7 +73,7 @@ module MergeHRISClient
         :'legal_name',
         :'display_name',
         :'eins',
-        :'remote_data'
+        :'remote_data',
       ])
     end
 
@@ -114,6 +119,10 @@ module MergeHRISClient
           self.remote_data = value
         end
       end
+
+      if attributes.key?(:'remote_was_deleted')
+        self.remote_was_deleted = attributes[:'remote_was_deleted']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -139,7 +148,8 @@ module MergeHRISClient
           legal_name == o.legal_name &&
           display_name == o.display_name &&
           eins == o.eins &&
-          remote_data == o.remote_data
+          remote_data == o.remote_data &&
+          remote_was_deleted == o.remote_was_deleted
     end
 
     # @see the `==` method
@@ -151,7 +161,7 @@ module MergeHRISClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, remote_id, legal_name, display_name, eins, remote_data].hash
+      [id, remote_id, legal_name, display_name, eins, remote_data, remote_was_deleted].hash
     end
 
     # Builds the object from hash

data/lib/merge_hris_client/models/country_enum.rb

@@ -279,5 +279,4 @@ module MergeHRISClient
       value
     end
   end
-
 end

data/lib/merge_hris_client/models/data_passthrough_request.rb

@@ -27,6 +27,7 @@ module MergeHRISClient
     # Pass an array of `MultipartFormField` objects in here instead of using the `data` param if `request_format` is set to `MULTIPART`.
     attr_accessor :multipart_form_data
 
+    # The headers to use for the request (Merge will handle the account's authorization headers). `Content-Type` header is required for passthrough. Choose content type corresponding to expected format of receiving server.
     attr_accessor :headers
 
     attr_accessor :request_format

data/lib/merge_hris_client/models/deduction.rb

@@ -31,6 +31,9 @@ module MergeHRISClient
 
     attr_accessor :remote_data
 
+    # Indicates whether or not this object has been deleted on the third-party.
+    attr_accessor :remote_was_deleted
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -39,7 +42,8 @@ module MergeHRISClient
         :'name' => :'name',
         :'employee_deduction' => :'employee_deduction',
         :'company_deduction' => :'company_deduction',
-        :'remote_data' => :'remote_data'
+        :'remote_data' => :'remote_data',
+        :'remote_was_deleted' => :'remote_was_deleted'
       }
     end
 
@@ -56,7 +60,8 @@ module MergeHRISClient
         :'name' => :'String',
         :'employee_deduction' => :'Float',
         :'company_deduction' => :'Float',
-        :'remote_data' => :'Array<RemoteData>'
+        :'remote_data' => :'Array<RemoteData>',
+        :'remote_was_deleted' => :'Boolean'
       }
     end
 
@@ -67,7 +72,7 @@ module MergeHRISClient
         :'name',
         :'employee_deduction',
         :'company_deduction',
-        :'remote_data'
+        :'remote_data',
       ])
     end
 
@@ -111,6 +116,10 @@ module MergeHRISClient
           self.remote_data = value
         end
       end
+
+      if attributes.key?(:'remote_was_deleted')
+        self.remote_was_deleted = attributes[:'remote_was_deleted']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -136,7 +145,8 @@ module MergeHRISClient
           name == o.name &&
           employee_deduction == o.employee_deduction &&
           company_deduction == o.company_deduction &&
-          remote_data == o.remote_data
+          remote_data == o.remote_data &&
+          remote_was_deleted == o.remote_was_deleted
     end
 
     # @see the `==` method
@@ -148,7 +158,7 @@ module MergeHRISClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, employee_payroll_run, name, employee_deduction, company_deduction, remote_data].hash
+      [id, employee_payroll_run, name, employee_deduction, company_deduction, remote_data, remote_was_deleted].hash
     end
 
     # Builds the object from hash

data/lib/merge_hris_client/models/earning.rb

@@ -28,6 +28,9 @@ module MergeHRISClient
 
     attr_accessor :remote_data
 
+    # Indicates whether or not this object has been deleted on the third-party.
+    attr_accessor :remote_was_deleted
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -35,7 +38,8 @@ module MergeHRISClient
         :'employee_payroll_run' => :'employee_payroll_run',
         :'amount' => :'amount',
         :'type' => :'type',
-        :'remote_data' => :'remote_data'
+        :'remote_data' => :'remote_data',
+        :'remote_was_deleted' => :'remote_was_deleted'
       }
     end
 
@@ -51,7 +55,8 @@ module MergeHRISClient
         :'employee_payroll_run' => :'String',
         :'amount' => :'Float',
         :'type' => :'EarningTypeEnum',
-        :'remote_data' => :'String'
+        :'remote_data' => :'Array<Hash<String, AnyType>>',
+        :'remote_was_deleted' => :'Boolean'
       }
     end
 
@@ -61,6 +66,7 @@ module MergeHRISClient
         :'employee_payroll_run',
         :'amount',
         :'type',
+        :'remote_data',
       ])
     end
 
@@ -96,7 +102,13 @@ module MergeHRISClient
       end
 
       if attributes.key?(:'remote_data')
-        self.remote_data = attributes[:'remote_data']
+        if (value = attributes[:'remote_data']).is_a?(Array)
+          self.remote_data = value
+        end
+      end
+
+      if attributes.key?(:'remote_was_deleted')
+        self.remote_was_deleted = attributes[:'remote_was_deleted']
       end
     end
 
@@ -122,7 +134,8 @@ module MergeHRISClient
           employee_payroll_run == o.employee_payroll_run &&
           amount == o.amount &&
           type == o.type &&
-          remote_data == o.remote_data
+          remote_data == o.remote_data &&
+          remote_was_deleted == o.remote_was_deleted
     end
 
     # @see the `==` method
@@ -134,7 +147,7 @@ module MergeHRISClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, employee_payroll_run, amount, type, remote_data].hash
+      [id, employee_payroll_run, amount, type, remote_data, remote_was_deleted].hash
     end
 
     # Builds the object from hash

data/lib/merge_hris_client/models/earning_type_enum.rb

@@ -34,5 +34,4 @@ module MergeHRISClient
       value
     end
   end
-
 end

data/lib/merge_hris_client/models/employee.rb

@@ -21,7 +21,7 @@ module MergeHRISClient
     # The third-party API ID of the matching object.
     attr_accessor :remote_id
 
-    # The employee's number that appears in the remote UI. Note: This is distinct from the remote_id field, which is a unique identifier for the employee set by the remote API, and is not exposed to the user.
+    # The employee's number that appears in the remote UI. Note: This is distinct from the remote_id field, which is a unique identifier for the employee set by the remote API, and is not exposed to the user. This value can also change in many API providers.
     attr_accessor :employee_number
 
     attr_accessor :company
@@ -94,6 +94,8 @@ module MergeHRISClient
     # Custom fields configured for a given model.
     attr_accessor :custom_fields
 
+    attr_accessor :remote_was_deleted
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -125,7 +127,8 @@ module MergeHRISClient
         :'termination_date' => :'termination_date',
         :'avatar' => :'avatar',
         :'remote_data' => :'remote_data',
-        :'custom_fields' => :'custom_fields'
+        :'custom_fields' => :'custom_fields',
+        :'remote_was_deleted' => :'remote_was_deleted'
       }
     end
 
@@ -165,7 +168,8 @@ module MergeHRISClient
         :'termination_date' => :'Time',
         :'avatar' => :'String',
         :'remote_data' => :'Array<RemoteData>',
-        :'custom_fields' => :'Hash<String, AnyType>'
+        :'custom_fields' => :'Hash<String, AnyType>',
+        :'remote_was_deleted' => :'Boolean'
       }
     end
 
@@ -197,7 +201,7 @@ module MergeHRISClient
         :'termination_date',
         :'avatar',
         :'remote_data',
-        :'custom_fields'
+        :'custom_fields',
       ])
     end
 
@@ -339,6 +343,10 @@ module MergeHRISClient
           self.custom_fields = value
         end
       end
+
+      if attributes.key?(:'remote_was_deleted')
+        self.remote_was_deleted = attributes[:'remote_was_deleted']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -447,7 +455,8 @@ module MergeHRISClient
           termination_date == o.termination_date &&
           avatar == o.avatar &&
           remote_data == o.remote_data &&
-          custom_fields == o.custom_fields
+          custom_fields == o.custom_fields &&
+          remote_was_deleted == o.remote_was_deleted
     end
 
     # @see the `==` method
@@ -459,7 +468,7 @@ module MergeHRISClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, remote_id, employee_number, company, first_name, last_name, display_full_name, groups, work_email, personal_email, mobile_phone_number, employments, home_location, work_location, manager, team, pay_group, ssn, gender, ethnicity, marital_status, date_of_birth, hire_date, start_date, employment_status, termination_date, avatar, remote_data, custom_fields].hash
+      [id, remote_id, employee_number, company, first_name, last_name, display_full_name, groups, work_email, personal_email, mobile_phone_number, employments, home_location, work_location, manager, team, pay_group, ssn, gender, ethnicity, marital_status, date_of_birth, hire_date, start_date, employment_status, termination_date, avatar, remote_data, custom_fields, remote_was_deleted].hash
     end
 
     # Builds the object from hash