merge_hris_client 1.0.4 → 2.0.0

data/lib/merge_hris_client/models/paginated_sync_status_list.rb

@@ -157,7 +157,7 @@ module MergeHRISClient
       when :Date
         Date.parse(value)
       when :String
-        value.to_s
+        value
       when :Integer
         value.to_i
       when :Float

data/lib/merge_hris_client/models/paginated_team_list.rb

@@ -157,7 +157,7 @@ module MergeHRISClient
       when :Date
         Date.parse(value)
       when :String
-        value.to_s
+        value
       when :Integer
         value.to_i
       when :Float

data/lib/merge_hris_client/models/paginated_time_off_balance_list.rb

@@ -157,7 +157,7 @@ module MergeHRISClient
       when :Date
         Date.parse(value)
       when :String
-        value.to_s
+        value
       when :Integer
         value.to_i
       when :Float

data/lib/merge_hris_client/models/paginated_time_off_list.rb

@@ -157,7 +157,7 @@ module MergeHRISClient
       when :Date
         Date.parse(value)
       when :String
-        value.to_s
+        value
       when :Integer
         value.to_i
       when :Float

data/lib/merge_hris_client/models/pay_currency_enum.rb

@@ -333,8 +333,8 @@ module MergeHRISClient
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      constantValues = PayCurrencyEnum.constants.select { |c| PayCurrencyEnum::const_get(c) == value }
       value
     end
   end
+
 end

data/lib/merge_hris_client/models/pay_frequency_enum.rb

@@ -23,7 +23,6 @@ module MergeHRISClient
     ANNUALLY = "ANNUALLY".freeze
     THIRTEEN_MONTHLY = "THIRTEEN-MONTHLY".freeze
     PRO_RATA = "PRO_RATA".freeze
-    NULL = "NULL".freeze
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string
@@ -36,8 +35,8 @@ module MergeHRISClient
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      constantValues = PayFrequencyEnum.constants.select { |c| PayFrequencyEnum::const_get(c) == value }
       value
     end
   end
+
 end

data/lib/merge_hris_client/models/pay_period_enum.rb

@@ -35,8 +35,8 @@ module MergeHRISClient
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      constantValues = PayPeriodEnum.constants.select { |c| PayPeriodEnum::const_get(c) == value }
       value
     end
   end
+
 end

data/lib/merge_hris_client/models/policy_type_enum.rb

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

data/lib/merge_hris_client/models/reason_enum.rb

@@ -0,0 +1,37 @@
+=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 ReasonEnum
+    GENERAL_CUSTOMER_REQUEST = "GENERAL_CUSTOMER_REQUEST".freeze
+    GDPR = "GDPR".freeze
+    OTHER = "OTHER".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
+
+    # 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
+    end
+  end
+
+end

data/lib/merge_hris_client/models/remote_data.rb

@@ -151,7 +151,7 @@ module MergeHRISClient
       when :Date
         Date.parse(value)
       when :String
-        value.to_s
+        value
       when :Integer
         value.to_i
       when :Float

data/lib/merge_hris_client/models/remote_data_request.rb

@@ -170,7 +170,7 @@ module MergeHRISClient
       when :Date
         Date.parse(value)
       when :String
-        value.to_s
+        value
       when :Integer
         value.to_i
       when :Float

data/lib/merge_hris_client/models/remote_key.rb

@@ -155,7 +155,7 @@ module MergeHRISClient
       when :Date
         Date.parse(value)
       when :String
-        value.to_s
+        value
       when :Integer
         value.to_i
       when :Float

data/lib/merge_hris_client/models/remote_key_for_regeneration_request.rb

@@ -160,7 +160,7 @@ module MergeHRISClient
       when :Date
         Date.parse(value)
       when :String
-        value.to_s
+        value
       when :Integer
         value.to_i
       when :Float

data/lib/merge_hris_client/models/remote_response.rb

@@ -196,7 +196,7 @@ module MergeHRISClient
       when :Date
         Date.parse(value)
       when :String
-        value.to_s
+        value
       when :Integer
         value.to_i
       when :Float

data/lib/merge_hris_client/models/request_format_enum.rb

@@ -17,6 +17,7 @@ module MergeHRISClient
   class RequestFormatEnum
     JSON = "JSON".freeze
     XML = "XML".freeze
+    MULTIPART = "MULTIPART".freeze
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string
@@ -32,4 +33,5 @@ module MergeHRISClient
       value
     end
   end
+
 end

data/lib/merge_hris_client/models/request_type_enum.rb

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

data/lib/merge_hris_client/models/run_state_enum.rb

@@ -32,8 +32,8 @@ module MergeHRISClient
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      constantValues = RunStateEnum.constants.select { |c| RunStateEnum::const_get(c) == value }
       value
     end
   end
+
 end

data/lib/merge_hris_client/models/run_type_enum.rb

@@ -15,21 +15,11 @@ require 'time'
 
 module MergeHRISClient
   class RunTypeEnum
-    INIT = "INIT".freeze
     REGULAR = "REGULAR".freeze
     OFF_CYCLE = "OFF_CYCLE".freeze
     CORRECTION = "CORRECTION".freeze
     TERMINATION = "TERMINATION".freeze
-    RECONCILIATION = "RECONCILIATION".freeze
-    NEW_HIRE = "NEW_HIRE".freeze
-    POP = "POP".freeze
-    TRANSITION = "TRANSITION".freeze
-    CORRECTION_DISPLAY = "CORRECTION_DISPLAY".freeze
-    EXCESS_HOURS = "EXCESS_HOURS".freeze
     SIGN_ON_BONUS = "SIGN_ON_BONUS".freeze
-    S_CORP = "S_CORP".freeze
-    FRINGE_BENEFITS = "FRINGE_BENEFITS".freeze
-    CONTRACTOR_LATE_PAYMENTS = "CONTRACTOR_LATE_PAYMENTS".freeze
 
     # Builds the enum from string
     # @param [String] The enum value in the form of the string
@@ -42,8 +32,8 @@ module MergeHRISClient
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      constantValues = RunTypeEnum.constants.select { |c| RunTypeEnum::const_get(c) == value }
       value
     end
   end
+
 end

data/lib/merge_hris_client/models/sync_status.rb

@@ -211,7 +211,7 @@ module MergeHRISClient
       when :Date
         Date.parse(value)
       when :String
-        value.to_s
+        value
       when :Integer
         value.to_i
       when :Float

data/lib/merge_hris_client/models/sync_status_status_enum.rb

@@ -31,9 +31,8 @@ module MergeHRISClient
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      constantValues = SyncStatusStatusEnum.constants.select { |c| SyncStatusStatusEnum::const_get(c) == value }
-      raise "Invalid ENUM value #{value} for class #SyncStatusStatusEnum" if constantValues.empty?
       value
     end
   end
+
 end

data/lib/merge_hris_client/models/tax.rb

@@ -18,7 +18,6 @@ module MergeHRISClient
   class Tax
     attr_accessor :id
 
-    # The tax's employee payroll run.
     attr_accessor :employee_payroll_run
 
     # The tax's name.
@@ -57,7 +56,7 @@ module MergeHRISClient
         :'name' => :'String',
         :'amount' => :'Float',
         :'employer_tax' => :'Boolean',
-        :'remote_data' => :'Array<RemoteData>'
+        :'remote_data' => :'String'
       }
     end
 
@@ -68,7 +67,6 @@ module MergeHRISClient
         :'name',
         :'amount',
         :'employer_tax',
-        :'remote_data'
       ])
     end
 
@@ -108,9 +106,7 @@ module MergeHRISClient
       end
 
       if attributes.key?(:'remote_data')
-        if (value = attributes[:'remote_data']).is_a?(Array)
-          self.remote_data = value
-        end
+        self.remote_data = attributes[:'remote_data']
       end
     end
 
@@ -192,7 +188,7 @@ module MergeHRISClient
       when :Date
         Date.parse(value)
       when :String
-        value.to_s
+        value
       when :Integer
         value.to_i
       when :Float

data/lib/merge_hris_client/models/team.rb

@@ -24,7 +24,6 @@ module MergeHRISClient
     # The team's name.
     attr_accessor :name
 
-    # The team's parent team.
     attr_accessor :parent_team
 
     attr_accessor :remote_data

data/lib/merge_hris_client/models/time_off.rb

@@ -21,10 +21,8 @@ module MergeHRISClient
     # The third-party API ID of the matching object.
     attr_accessor :remote_id
 
-    # The employee requesting time off.
     attr_accessor :employee
 
-    # The employee approving the time off request.
     attr_accessor :approver
 
     # The status of this time off request.

data/lib/merge_hris_client/models/time_off_balance.rb

@@ -21,7 +21,6 @@ module MergeHRISClient
     # The third-party API ID of the matching object.
     attr_accessor :remote_id
 
-    # The employee the balance belongs to.
     attr_accessor :employee
 
     # The current PTO balance in terms of hours.

data/lib/merge_hris_client/models/time_off_endpoint_request.rb

@@ -140,7 +140,7 @@ module MergeHRISClient
       when :Date
         Date.parse(value)
       when :String
-        value.to_s
+        value
       when :Integer
         value.to_i
       when :Float

data/lib/merge_hris_client/models/time_off_request.rb

@@ -19,10 +19,8 @@ module MergeHRISClient
     # The third-party API ID of the matching object.
     attr_accessor :remote_id
 
-    # The employee requesting time off.
     attr_accessor :employee
 
-    # The employee approving the time off request.
     attr_accessor :approver
 
     # The status of this time off request.
@@ -237,7 +235,7 @@ module MergeHRISClient
       when :Date
         Date.parse(value)
       when :String
-        value.to_s
+        value
       when :Integer
         value.to_i
       when :Float

data/lib/merge_hris_client/models/time_off_response.rb

@@ -21,12 +21,15 @@ module MergeHRISClient
 
     attr_accessor :errors
 
+    attr_accessor :logs
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'model' => :'model',
         :'warnings' => :'warnings',
-        :'errors' => :'errors'
+        :'errors' => :'errors',
+        :'logs' => :'logs'
       }
     end
 
@@ -40,7 +43,8 @@ module MergeHRISClient
       {
         :'model' => :'TimeOff',
         :'warnings' => :'Array<WarningValidationProblem>',
-        :'errors' => :'Array<ErrorValidationProblem>'
+        :'errors' => :'Array<ErrorValidationProblem>',
+        :'logs' => :'Array<DebugModeLog>'
       }
     end
 
@@ -80,6 +84,12 @@ module MergeHRISClient
           self.errors = value
         end
       end
+
+      if attributes.key?(:'logs')
+        if (value = attributes[:'logs']).is_a?(Array)
+          self.logs = value
+        end
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -117,7 +127,8 @@ module MergeHRISClient
       self.class == o.class &&
           model == o.model &&
           warnings == o.warnings &&
-          errors == o.errors
+          errors == o.errors &&
+          logs == o.logs
     end
 
     # @see the `==` method
@@ -129,7 +140,7 @@ module MergeHRISClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [model, warnings, errors].hash
+      [model, warnings, errors, logs].hash
     end
 
     # Builds the object from hash
@@ -172,7 +183,7 @@ module MergeHRISClient
       when :Date
         Date.parse(value)
       when :String
-        value.to_s
+        value
       when :Integer
         value.to_i
       when :Float

data/lib/merge_hris_client/models/time_off_status_enum.rb

@@ -32,8 +32,8 @@ module MergeHRISClient
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      constantValues = TimeOffStatusEnum.constants.select { |c| TimeOffStatusEnum::const_get(c) == value }
       value
     end
   end
+
 end

data/lib/merge_hris_client/models/units_enum.rb

@@ -29,8 +29,8 @@ module MergeHRISClient
     # @param [String] The enum value in the form of the string
     # @return [String] The enum value
     def build_from_hash(value)
-      constantValues = UnitsEnum.constants.select { |c| UnitsEnum::const_get(c) == value }
       value
     end
   end
+
 end

data/lib/merge_hris_client/models/validation_problem_source.rb

@@ -140,7 +140,7 @@ module MergeHRISClient
       when :Date
         Date.parse(value)
       when :String
-        value.to_s
+        value
       when :Integer
         value.to_i
       when :Float

data/lib/merge_hris_client/models/warning_validation_problem.rb

@@ -177,7 +177,7 @@ module MergeHRISClient
       when :Date
         Date.parse(value)
       when :String
-        value.to_s
+        value
       when :Integer
         value.to_i
       when :Float

data/lib/merge_hris_client/version.rb

@@ -11,5 +11,5 @@ OpenAPI Generator version: 5.1.1
 =end
 
 module MergeHRISClient
-  VERSION = '1.0.4'
+  VERSION = '2.0.0'
 end

data/lib/merge_hris_client.rb

@@ -27,32 +27,44 @@ require 'merge_hris_client/models/account_type_enum'
 require 'merge_hris_client/models/available_actions'
 require 'merge_hris_client/models/bank_info'
 require 'merge_hris_client/models/benefit'
-require 'merge_hris_client/models/benefit_plan_type_enum'
 require 'merge_hris_client/models/categories_enum'
 require 'merge_hris_client/models/category_enum'
 require 'merge_hris_client/models/company'
 require 'merge_hris_client/models/country_enum'
 require 'merge_hris_client/models/data_passthrough_request'
+require 'merge_hris_client/models/debug_mode_log'
+require 'merge_hris_client/models/debug_model_log_summary'
 require 'merge_hris_client/models/deduction'
 require 'merge_hris_client/models/earning'
+require 'merge_hris_client/models/earning_type_enum'
 require 'merge_hris_client/models/employee'
+require 'merge_hris_client/models/employee_endpoint_request'
 require 'merge_hris_client/models/employee_payroll_run'
+require 'merge_hris_client/models/employee_request'
+require 'merge_hris_client/models/employee_response'
 require 'merge_hris_client/models/employment'
 require 'merge_hris_client/models/employment_status_enum'
 require 'merge_hris_client/models/employment_type_enum'
+require 'merge_hris_client/models/encoding_enum'
 require 'merge_hris_client/models/end_user_details_request'
 require 'merge_hris_client/models/error_validation_problem'
 require 'merge_hris_client/models/ethnicity_enum'
 require 'merge_hris_client/models/flsa_status_enum'
 require 'merge_hris_client/models/gender_enum'
 require 'merge_hris_client/models/generate_remote_key_request'
+require 'merge_hris_client/models/group'
+require 'merge_hris_client/models/group_type_enum'
+require 'merge_hris_client/models/ignore_common_model'
+require 'merge_hris_client/models/ignore_common_model_request'
 require 'merge_hris_client/models/issue'
 require 'merge_hris_client/models/issue_status_enum'
 require 'merge_hris_client/models/link_token'
 require 'merge_hris_client/models/location'
+require 'merge_hris_client/models/location_type_enum'
 require 'merge_hris_client/models/marital_status_enum'
 require 'merge_hris_client/models/method_enum'
 require 'merge_hris_client/models/model_operation'
+require 'merge_hris_client/models/multipart_form_field_request'
 require 'merge_hris_client/models/paginated_account_details_and_actions_list'
 require 'merge_hris_client/models/paginated_bank_info_list'
 require 'merge_hris_client/models/paginated_benefit_list'
@@ -61,6 +73,7 @@ require 'merge_hris_client/models/paginated_deduction_list'
 require 'merge_hris_client/models/paginated_employee_list'
 require 'merge_hris_client/models/paginated_employee_payroll_run_list'
 require 'merge_hris_client/models/paginated_employment_list'
+require 'merge_hris_client/models/paginated_group_list'
 require 'merge_hris_client/models/paginated_issue_list'
 require 'merge_hris_client/models/paginated_location_list'
 require 'merge_hris_client/models/paginated_pay_group_list'
@@ -75,6 +88,7 @@ require 'merge_hris_client/models/pay_group'
 require 'merge_hris_client/models/pay_period_enum'
 require 'merge_hris_client/models/payroll_run'
 require 'merge_hris_client/models/policy_type_enum'
+require 'merge_hris_client/models/reason_enum'
 require 'merge_hris_client/models/remote_data'
 require 'merge_hris_client/models/remote_data_request'
 require 'merge_hris_client/models/remote_key'
@@ -94,7 +108,6 @@ require 'merge_hris_client/models/time_off_endpoint_request'
 require 'merge_hris_client/models/time_off_request'
 require 'merge_hris_client/models/time_off_response'
 require 'merge_hris_client/models/time_off_status_enum'
-require 'merge_hris_client/models/type_enum'
 require 'merge_hris_client/models/units_enum'
 require 'merge_hris_client/models/validation_problem_source'
 require 'merge_hris_client/models/warning_validation_problem'
@@ -113,6 +126,7 @@ require 'merge_hris_client/api/employees_api'
 require 'merge_hris_client/api/employments_api'
 require 'merge_hris_client/api/force_resync_api'
 require 'merge_hris_client/api/generate_key_api'
+require 'merge_hris_client/api/groups_api'
 require 'merge_hris_client/api/issues_api'
 require 'merge_hris_client/api/link_token_api'
 require 'merge_hris_client/api/linked_accounts_api'

data/pull_request_template.md

@@ -1,6 +1,7 @@
 ## Description of the change
 
 > Description here
+
 ## Type of change
 - [ ] Bug fix (non-breaking change that fixes an issue)
 - [ ] New feature (non-breaking change that adds functionality)
@@ -8,7 +9,8 @@
 
 ## Related issues
 
-> All PRs at Merge must be backed by an Asana ticket. Create one here, and then replace this line with the link. https://app.asana.com/0/1198991781422585/list
+> All PRs at Merge must be backed by an Asana ticket. 
+
 ## Checklists
 
 ### Development

data/spec/api/bank_info_api_spec.rb

@@ -36,12 +36,11 @@ describe 'BankInfoApi' do
   # Returns a list of `BankInfo` objects.
   # @param x_account_token Token identifying the end user.
   # @param [Hash] opts the optional parameters
-  # @option opts [String] :account_type The bank account type
-  # @option opts [String] :bank_name 
+  # @option opts [String] :account_type If provided, will only return BankInfo's with this account type. Options: ('SAVINGS', 'CHECKING')
+  # @option opts [String] :bank_name If provided, will only return BankInfo's with this bank name.
   # @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 [String] :employee If provided, will only return bank accounts for this employee.
   # @option opts [String] :employee_id If provided, will only return bank accounts 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.
@@ -50,7 +49,6 @@ describe 'BankInfoApi' do
   # @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 [Time] :remote_created_at 
   # @option opts [String] :remote_id The API provider's ID for the given object.
   # @return [PaginatedBankInfoList]
   describe 'bank_info_list test' do

data/spec/api/employees_api_spec.rb

@@ -32,6 +32,32 @@ describe 'EmployeesApi' do
     end
   end
 
+  # unit tests for employees_create
+  # Creates an `Employee` object with the given values.
+  # @param x_account_token Token identifying the end user.
+  # @param employee_endpoint_request 
+  # @param [Hash] opts the optional parameters
+  # @option opts [Boolean] :is_debug_mode Whether to include debug fields (such as log file links) in the response.
+  # @option opts [Boolean] :run_async Whether or not third-party updates should be run asynchronously.
+  # @return [EmployeeResponse]
+  describe 'employees_create test' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
+  # unit tests for employees_ignore_create
+  # Ignores a specific row based on the `model_id` in the url. These records will have their properties set to null, and will not be updated in future syncs. The \"reason\" and \"message\" fields in the request body will be stored for audit purposes.
+  # @param model_id 
+  # @param ignore_common_model_request 
+  # @param [Hash] opts the optional parameters
+  # @return [IgnoreCommonModel]
+  describe 'employees_ignore_create test' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
   # unit tests for employees_list
   # Returns a list of `Employee` objects.
   # @param x_account_token Token identifying the end user.