merge_hris_client 2.0.4 → 3.2.2

data/lib/merge_hris_client/models/run_type_enum.rb

@@ -21,18 +21,28 @@ module MergeHRISClient
     TERMINATION = "TERMINATION".freeze
     SIGN_ON_BONUS = "SIGN_ON_BONUS".freeze
 
-    # Builds the enum from string
-    # @param [String] The enum value in the form of the string
-    # @return [String] The enum value
-    def self.build_from_hash(value)
-      new.build_from_hash(value)
-    end
+    MERGE_NONSTANDARD_VALUE = "MERGE_NONSTANDARD_VALUE".freeze
+
+    attr_accessor :value
+    attr_accessor :raw_value
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      value
+      @raw_value = value
+      if ["REGULAR", "OFF_CYCLE", "CORRECTION", "TERMINATION", "SIGN_ON_BONUS", ].include? value
+        @value = value
+      else
+        @value = MERGE_NONSTANDARD_VALUE
+      end
+
+      self
+    end
+
+    def self.build_from_hash(value)
+      RunTypeEnum.new.build_from_hash(value)
     end
   end
+
 end

data/lib/merge_hris_client/models/selective_sync_configurations_usage_enum.rb

@@ -0,0 +1,45 @@
+=begin
+#Merge HRIS API
+
+#The unified API for building rich integrations with multiple HR Information System platforms.
+
+The version of the OpenAPI document: 1.0
+Contact: hello@merge.dev
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 5.1.1
+
+=end
+
+require 'date'
+require 'time'
+
+module MergeHRISClient
+  class SelectiveSyncConfigurationsUsageEnum
+    NEXT_SYNC = "IN_NEXT_SYNC".freeze
+    LAST_SYNC = "IN_LAST_SYNC".freeze
+
+    MERGE_NONSTANDARD_VALUE = "MERGE_NONSTANDARD_VALUE".freeze
+
+    attr_accessor :value
+    attr_accessor :raw_value
+
+    # Builds the enum from string
+    # @param [String] The enum value in the form of the string
+    # @return [String] The enum value
+    def build_from_hash(value)
+      @raw_value = value
+      if ["IN_NEXT_SYNC", "IN_LAST_SYNC", ].include? value
+        @value = value
+      else
+        @value = MERGE_NONSTANDARD_VALUE
+      end
+
+      self
+    end
+
+    def self.build_from_hash(value)
+      SelectiveSyncConfigurationsUsageEnum.new.build_from_hash(value)
+    end
+  end
+
+end

data/lib/merge_hris_client/models/sync_status.rb

@@ -28,6 +28,8 @@ module MergeHRISClient
 
     attr_accessor :is_initial_sync
 
+    attr_accessor :selective_sync_configurations_usage
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -36,7 +38,8 @@ module MergeHRISClient
         :'last_sync_start' => :'last_sync_start',
         :'next_sync_start' => :'next_sync_start',
         :'status' => :'status',
-        :'is_initial_sync' => :'is_initial_sync'
+        :'is_initial_sync' => :'is_initial_sync',
+        :'selective_sync_configurations_usage' => :'selective_sync_configurations_usage'
       }
     end
 
@@ -53,7 +56,8 @@ module MergeHRISClient
         :'last_sync_start' => :'Time',
         :'next_sync_start' => :'Time',
         :'status' => :'SyncStatusStatusEnum',
-        :'is_initial_sync' => :'Boolean'
+        :'is_initial_sync' => :'Boolean',
+        :'selective_sync_configurations_usage' => :'SelectiveSyncConfigurationsUsageEnum'
       }
     end
 
@@ -101,6 +105,10 @@ module MergeHRISClient
       if attributes.key?(:'is_initial_sync')
         self.is_initial_sync = attributes[:'is_initial_sync']
       end
+
+      if attributes.key?(:'selective_sync_configurations_usage')
+        self.selective_sync_configurations_usage = attributes[:'selective_sync_configurations_usage']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -115,14 +123,6 @@ module MergeHRISClient
         invalid_properties.push('invalid value for "model_id", model_id cannot be nil.')
       end
 
-      if @last_sync_start.nil?
-        invalid_properties.push('invalid value for "last_sync_start", last_sync_start cannot be nil.')
-      end
-
-      if @next_sync_start.nil?
-        invalid_properties.push('invalid value for "next_sync_start", next_sync_start cannot be nil.')
-      end
-
       if @status.nil?
         invalid_properties.push('invalid value for "status", status cannot be nil.')
       end
@@ -139,8 +139,6 @@ module MergeHRISClient
     def valid?
       return false if @model_name.nil?
       return false if @model_id.nil?
-      return false if @last_sync_start.nil?
-      return false if @next_sync_start.nil?
       return false if @status.nil?
       return false if @is_initial_sync.nil?
       true
@@ -156,7 +154,8 @@ module MergeHRISClient
           last_sync_start == o.last_sync_start &&
           next_sync_start == o.next_sync_start &&
           status == o.status &&
-          is_initial_sync == o.is_initial_sync
+          is_initial_sync == o.is_initial_sync &&
+          selective_sync_configurations_usage == o.selective_sync_configurations_usage
     end
 
     # @see the `==` method
@@ -168,7 +167,7 @@ module MergeHRISClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [model_name, model_id, last_sync_start, next_sync_start, status, is_initial_sync].hash
+      [model_name, model_id, last_sync_start, next_sync_start, status, is_initial_sync, selective_sync_configurations_usage].hash
     end
 
     # Builds the object from hash

data/lib/merge_hris_client/models/sync_status_status_enum.rb

@@ -19,19 +19,31 @@ module MergeHRISClient
     DONE = "DONE".freeze
     FAILED = "FAILED".freeze
     DISABLED = "DISABLED".freeze
+    PAUSED = "PAUSED".freeze
+    PARTIALLY_SYNCED = "PARTIALLY_SYNCED".freeze
 
-    # Builds the enum from string
-    # @param [String] The enum value in the form of the string
-    # @return [String] The enum value
-    def self.build_from_hash(value)
-      new.build_from_hash(value)
-    end
+    MERGE_NONSTANDARD_VALUE = "MERGE_NONSTANDARD_VALUE".freeze
+
+    attr_accessor :value
+    attr_accessor :raw_value
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      value
+      @raw_value = value
+      if ["SYNCING", "DONE", "FAILED", "DISABLED", "PAUSED", "PARTIALLY_SYNCED", ].include? value
+        @value = value
+      else
+        @value = MERGE_NONSTANDARD_VALUE
+      end
+
+      self
+    end
+
+    def self.build_from_hash(value)
+      SyncStatusStatusEnum.new.build_from_hash(value)
     end
   end
+
 end

data/lib/merge_hris_client/models/tax.rb

@@ -14,10 +14,19 @@ require 'date'
 require 'time'
 
 module MergeHRISClient
-  # # The Tax Object ### Description The `Tax` object is used to represent a tax for a given employee's payroll run. One run could include several taxes.  ### Usage Example Fetch from the `LIST Taxes` endpoint and filter by `ID` to show all taxes.
+  # # The Tax Object ### Description The `Tax` object is used to represent an array of the tax deductions for a given employee's payroll run.  ### Usage Example Fetch from the `LIST Taxes` endpoint and filter by `ID` to show all taxes.
   class Tax
     attr_accessor :id
 
+    # The third-party API ID of the matching object.
+    attr_accessor :remote_id
+
+    # The datetime that this object was created by Merge.
+    attr_accessor :created_at
+
+    # The datetime that this object was modified by Merge.
+    attr_accessor :modified_at
+
     attr_accessor :employee_payroll_run
 
     # The tax's name.
@@ -29,21 +38,27 @@ module MergeHRISClient
     # Whether or not the employer is responsible for paying the tax.
     attr_accessor :employer_tax
 
-    attr_accessor :remote_data
-
-    # Indicates whether or not this object has been deleted by third party webhooks.
+    # Indicates whether or not this object has been deleted in the third party platform.
     attr_accessor :remote_was_deleted
 
+    attr_accessor :field_mappings
+
+    attr_accessor :remote_data
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'id' => :'id',
+        :'remote_id' => :'remote_id',
+        :'created_at' => :'created_at',
+        :'modified_at' => :'modified_at',
         :'employee_payroll_run' => :'employee_payroll_run',
         :'name' => :'name',
         :'amount' => :'amount',
         :'employer_tax' => :'employer_tax',
-        :'remote_data' => :'remote_data',
-        :'remote_was_deleted' => :'remote_was_deleted'
+        :'remote_was_deleted' => :'remote_was_deleted',
+        :'field_mappings' => :'field_mappings',
+        :'remote_data' => :'remote_data'
       }
     end
 
@@ -56,23 +71,29 @@ module MergeHRISClient
     def self.openapi_types
       {
         :'id' => :'String',
+        :'remote_id' => :'String',
+        :'created_at' => :'Time',
+        :'modified_at' => :'Time',
         :'employee_payroll_run' => :'String',
         :'name' => :'String',
         :'amount' => :'Float',
         :'employer_tax' => :'Boolean',
-        :'remote_data' => :'Array<Hash<String, AnyType>>',
-        :'remote_was_deleted' => :'Boolean'
+        :'remote_was_deleted' => :'Boolean',
+        :'field_mappings' => :'Object',
+        :'remote_data' => :'Array<RemoteData>'
       }
     end
 
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
+        :'remote_id',
         :'employee_payroll_run',
         :'name',
         :'amount',
         :'employer_tax',
-        :'remote_data',
+        :'field_mappings',
+        :'remote_data'
       ])
     end
 
@@ -95,6 +116,18 @@ module MergeHRISClient
         self.id = attributes[:'id']
       end
 
+      if attributes.key?(:'remote_id')
+        self.remote_id = attributes[:'remote_id']
+      end
+
+      if attributes.key?(:'created_at')
+        self.created_at = attributes[:'created_at']
+      end
+
+      if attributes.key?(:'modified_at')
+        self.modified_at = attributes[:'modified_at']
+      end
+
       if attributes.key?(:'employee_payroll_run')
         self.employee_payroll_run = attributes[:'employee_payroll_run']
       end
@@ -111,15 +144,19 @@ module MergeHRISClient
         self.employer_tax = attributes[:'employer_tax']
       end
 
+      if attributes.key?(:'remote_was_deleted')
+        self.remote_was_deleted = attributes[:'remote_was_deleted']
+      end
+
+      if attributes.key?(:'field_mappings')
+        self.field_mappings = attributes[:'field_mappings']
+      end
+
       if attributes.key?(:'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
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -141,12 +178,16 @@ module MergeHRISClient
       return true if self.equal?(o)
       self.class == o.class &&
           id == o.id &&
+          remote_id == o.remote_id &&
+          created_at == o.created_at &&
+          modified_at == o.modified_at &&
           employee_payroll_run == o.employee_payroll_run &&
           name == o.name &&
           amount == o.amount &&
           employer_tax == o.employer_tax &&
-          remote_data == o.remote_data &&
-          remote_was_deleted == o.remote_was_deleted
+          remote_was_deleted == o.remote_was_deleted &&
+          field_mappings == o.field_mappings &&
+          remote_data == o.remote_data
     end
 
     # @see the `==` method
@@ -158,7 +199,7 @@ module MergeHRISClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, employee_payroll_run, name, amount, employer_tax, remote_data, remote_was_deleted].hash
+      [id, remote_id, created_at, modified_at, employee_payroll_run, name, amount, employer_tax, remote_was_deleted, field_mappings, remote_data].hash
     end
 
     # Builds the object from hash

data/lib/merge_hris_client/models/team.rb

@@ -14,32 +14,44 @@ require 'date'
 require 'time'
 
 module MergeHRISClient
-  # # The Team Object ### Description The `Team` object is used to represent a Team within a company. `Employee` objects are often grouped this way. Note that in the Merge HRIS API, company subdivisions are all represented with `Teams`, rather than `Teams` and `Departments`.  ### Usage Example If you're building a way to filter by `Team`, you'd hit the `GET Teams` endpoint to fetch the `Teams`, and then use the `ID` of the team your user selects to filter the `GET Employees` endpoint.
+  # # The Team Object ### Description The `Team` object is used to represent a subdivision of the company, usually a department. Each employee will be grouped into one specific Team.  ### Usage Example If you're building a way to filter by `Team`, you'd hit the `GET Teams` endpoint to fetch the `Teams`, and then use the `ID` of the team your user selects to filter the `GET Employees` endpoint.
   class Team
     attr_accessor :id
 
     # The third-party API ID of the matching object.
     attr_accessor :remote_id
 
+    # The datetime that this object was created by Merge.
+    attr_accessor :created_at
+
+    # The datetime that this object was modified by Merge.
+    attr_accessor :modified_at
+
     # The team's name.
     attr_accessor :name
 
+    # The team's parent team.
     attr_accessor :parent_team
 
-    attr_accessor :remote_data
-
-    # Indicates whether or not this object has been deleted by third party webhooks.
+    # Indicates whether or not this object has been deleted in the third party platform.
     attr_accessor :remote_was_deleted
 
+    attr_accessor :field_mappings
+
+    attr_accessor :remote_data
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'id' => :'id',
         :'remote_id' => :'remote_id',
+        :'created_at' => :'created_at',
+        :'modified_at' => :'modified_at',
         :'name' => :'name',
         :'parent_team' => :'parent_team',
-        :'remote_data' => :'remote_data',
-        :'remote_was_deleted' => :'remote_was_deleted'
+        :'remote_was_deleted' => :'remote_was_deleted',
+        :'field_mappings' => :'field_mappings',
+        :'remote_data' => :'remote_data'
       }
     end
 
@@ -53,10 +65,13 @@ module MergeHRISClient
       {
         :'id' => :'String',
         :'remote_id' => :'String',
+        :'created_at' => :'Time',
+        :'modified_at' => :'Time',
         :'name' => :'String',
         :'parent_team' => :'String',
-        :'remote_data' => :'Array<RemoteData>',
-        :'remote_was_deleted' => :'Boolean'
+        :'remote_was_deleted' => :'Boolean',
+        :'field_mappings' => :'Object',
+        :'remote_data' => :'Array<RemoteData>'
       }
     end
 
@@ -66,7 +81,8 @@ module MergeHRISClient
         :'remote_id',
         :'name',
         :'parent_team',
-        :'remote_data',
+        :'field_mappings',
+        :'remote_data'
       ])
     end
 
@@ -93,6 +109,14 @@ module MergeHRISClient
         self.remote_id = attributes[:'remote_id']
       end
 
+      if attributes.key?(:'created_at')
+        self.created_at = attributes[:'created_at']
+      end
+
+      if attributes.key?(:'modified_at')
+        self.modified_at = attributes[:'modified_at']
+      end
+
       if attributes.key?(:'name')
         self.name = attributes[:'name']
       end
@@ -101,15 +125,19 @@ module MergeHRISClient
         self.parent_team = attributes[:'parent_team']
       end
 
+      if attributes.key?(:'remote_was_deleted')
+        self.remote_was_deleted = attributes[:'remote_was_deleted']
+      end
+
+      if attributes.key?(:'field_mappings')
+        self.field_mappings = attributes[:'field_mappings']
+      end
+
       if attributes.key?(:'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
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -132,10 +160,13 @@ module MergeHRISClient
       self.class == o.class &&
           id == o.id &&
           remote_id == o.remote_id &&
+          created_at == o.created_at &&
+          modified_at == o.modified_at &&
           name == o.name &&
           parent_team == o.parent_team &&
-          remote_data == o.remote_data &&
-          remote_was_deleted == o.remote_was_deleted
+          remote_was_deleted == o.remote_was_deleted &&
+          field_mappings == o.field_mappings &&
+          remote_data == o.remote_data
     end
 
     # @see the `==` method
@@ -147,7 +178,7 @@ module MergeHRISClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, remote_id, name, parent_team, remote_data, remote_was_deleted].hash
+      [id, remote_id, created_at, modified_at, name, parent_team, remote_was_deleted, field_mappings, remote_data].hash
     end
 
     # Builds the object from hash

data/lib/merge_hris_client/models/time_off.rb

@@ -14,30 +14,38 @@ require 'date'
 require 'time'
 
 module MergeHRISClient
-  # # The TimeOff Object ### Description The `TimeOff` object is used to represent a Time Off Request filed by an employee.  ### Usage Example Fetch from the `LIST TimeOffs` endpoint and filter by `ID` to show all time off requests.
+  # # The TimeOff Object ### Description The `TimeOff` object is used to represent all employees' Time Off entries.  ### Usage Example Fetch from the `LIST TimeOffs` endpoint and filter by `ID` to show all time off requests.
   class TimeOff
     attr_accessor :id
 
     # The third-party API ID of the matching object.
     attr_accessor :remote_id
 
+    # The datetime that this object was created by Merge.
+    attr_accessor :created_at
+
+    # The datetime that this object was modified by Merge.
+    attr_accessor :modified_at
+
+    # The employee requesting time off.
     attr_accessor :employee
 
+    # The Merge ID of the employee with the ability to approve the time off request.
     attr_accessor :approver
 
-    # The status of this time off request.
+    # The status of this time off request.  * `REQUESTED` - REQUESTED * `APPROVED` - APPROVED * `DECLINED` - DECLINED * `CANCELLED` - CANCELLED * `DELETED` - DELETED
     attr_accessor :status
 
     # The employee note for this time off request.
     attr_accessor :employee_note
 
-    # The unit of time requested.
+    # The measurement that the third-party integration uses to count time requested.  * `HOURS` - HOURS * `DAYS` - DAYS
     attr_accessor :units
 
-    # The number of time off units requested.
+    # The time off quantity measured by the prescribed “units”.
     attr_accessor :amount
 
-    # The type of time off request.
+    # The type of time off request.  * `VACATION` - VACATION * `SICK` - SICK * `PERSONAL` - PERSONAL * `JURY_DUTY` - JURY_DUTY * `VOLUNTEER` - VOLUNTEER * `BEREAVEMENT` - BEREAVEMENT
     attr_accessor :request_type
 
     # The day and time of the start of the time requested off.
@@ -46,15 +54,19 @@ module MergeHRISClient
     # The day and time of the end of the time requested off.
     attr_accessor :end_time
 
-    attr_accessor :remote_data
-
     attr_accessor :remote_was_deleted
 
+    attr_accessor :field_mappings
+
+    attr_accessor :remote_data
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'id' => :'id',
         :'remote_id' => :'remote_id',
+        :'created_at' => :'created_at',
+        :'modified_at' => :'modified_at',
         :'employee' => :'employee',
         :'approver' => :'approver',
         :'status' => :'status',
@@ -64,8 +76,9 @@ module MergeHRISClient
         :'request_type' => :'request_type',
         :'start_time' => :'start_time',
         :'end_time' => :'end_time',
-        :'remote_data' => :'remote_data',
-        :'remote_was_deleted' => :'remote_was_deleted'
+        :'remote_was_deleted' => :'remote_was_deleted',
+        :'field_mappings' => :'field_mappings',
+        :'remote_data' => :'remote_data'
       }
     end
 
@@ -79,6 +92,8 @@ module MergeHRISClient
       {
         :'id' => :'String',
         :'remote_id' => :'String',
+        :'created_at' => :'Time',
+        :'modified_at' => :'Time',
         :'employee' => :'String',
         :'approver' => :'String',
         :'status' => :'TimeOffStatusEnum',
@@ -88,8 +103,9 @@ module MergeHRISClient
         :'request_type' => :'RequestTypeEnum',
         :'start_time' => :'Time',
         :'end_time' => :'Time',
-        :'remote_data' => :'Array<RemoteData>',
-        :'remote_was_deleted' => :'Boolean'
+        :'remote_was_deleted' => :'Boolean',
+        :'field_mappings' => :'Object',
+        :'remote_data' => :'Array<RemoteData>'
       }
     end
 
@@ -106,7 +122,8 @@ module MergeHRISClient
         :'request_type',
         :'start_time',
         :'end_time',
-        :'remote_data',
+        :'field_mappings',
+        :'remote_data'
       ])
     end
 
@@ -133,6 +150,14 @@ module MergeHRISClient
         self.remote_id = attributes[:'remote_id']
       end
 
+      if attributes.key?(:'created_at')
+        self.created_at = attributes[:'created_at']
+      end
+
+      if attributes.key?(:'modified_at')
+        self.modified_at = attributes[:'modified_at']
+      end
+
       if attributes.key?(:'employee')
         self.employee = attributes[:'employee']
       end
@@ -169,15 +194,19 @@ module MergeHRISClient
         self.end_time = attributes[:'end_time']
       end
 
+      if attributes.key?(:'remote_was_deleted')
+        self.remote_was_deleted = attributes[:'remote_was_deleted']
+      end
+
+      if attributes.key?(:'field_mappings')
+        self.field_mappings = attributes[:'field_mappings']
+      end
+
       if attributes.key?(:'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
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -200,6 +229,8 @@ module MergeHRISClient
       self.class == o.class &&
           id == o.id &&
           remote_id == o.remote_id &&
+          created_at == o.created_at &&
+          modified_at == o.modified_at &&
           employee == o.employee &&
           approver == o.approver &&
           status == o.status &&
@@ -209,8 +240,9 @@ module MergeHRISClient
           request_type == o.request_type &&
           start_time == o.start_time &&
           end_time == o.end_time &&
-          remote_data == o.remote_data &&
-          remote_was_deleted == o.remote_was_deleted
+          remote_was_deleted == o.remote_was_deleted &&
+          field_mappings == o.field_mappings &&
+          remote_data == o.remote_data
     end
 
     # @see the `==` method
@@ -222,7 +254,7 @@ module MergeHRISClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, remote_id, employee, approver, status, employee_note, units, amount, request_type, start_time, end_time, remote_data, remote_was_deleted].hash
+      [id, remote_id, created_at, modified_at, employee, approver, status, employee_note, units, amount, request_type, start_time, end_time, remote_was_deleted, field_mappings, remote_data].hash
     end
 
     # Builds the object from hash