stackone_migration 1.4.8 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54502eb2343658c7853369b1629be75f8020d32f9287192037d60f657577f2ef
-  data.tar.gz: c3594fe6cfe8ef43a49f195e748cacf02f3313271fa1606bad87a96e18a79c16
+  metadata.gz: 25fcd83c1607852cb181d677bbc39de719fb1d912c3d591bca4a6023b099a1d5
+  data.tar.gz: 894108fb3b35ead045d3e3bbcc0da8463192f00b044269ee39fb43f6ba87ccd7
 SHA512:
-  metadata.gz: b7ac0788a52ae2968b3380f661a20962ae2338ac8bc3bb47d3922d917f4b2963a57ed664aec7039a4b292c0f500e72b354a70a7620a510a8405f81c6fb3d7b87
-  data.tar.gz: 072eef5853bd9ad549a4884b81e5ff6c69fafcdc831afc234fd94cc202299a77935ce806e032dd4811207731fc830782710ebb84055cd2e838e827a39c1ce779
+  metadata.gz: 3a93be21a57db38d3a0aa53823e2c5c122adca1b7e6f684a32431a646118679f7664e188aa503201bc52f4966f72769236360cb2c87ff02690ce5209acba228d
+  data.tar.gz: 4ab15a0d9d01dee4d97da2de4469b5f63cc4d5475834ba2a7289bda70257c6f75fa1c85e78a259a61dad1494e2e8629394fafec77f439ed8792b6618738cf07c

data/Gemfile

@@ -10,5 +10,5 @@ group :development, :test do
   gem 'rubocop', '~> 1.48.0'
 end
 
-gem 'merge_hris_client', '~> 3.0'
-gem 'stackone_hris_client', '~> 1.6.0'
+gem 'merge_hris_client', '3.2.0'
+gem 'stackone_hris_client', '~> 1.7.0'

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    stackone_migration (1.4.8)
-      merge_hris_client (~> 3.0)
-      stackone_hris_client (~> 1.6.0)
+    stackone_migration (1.6.0)
+      merge_hris_client (= 3.2.0)
+      stackone_hris_client (~> 1.7.0)
 
 GEM
   remote: https://rubygems.org/
@@ -16,7 +16,7 @@ GEM
       ffi (>= 1.15.0)
     ffi (1.15.5)
     json (2.6.3)
-    merge_hris_client (3.0.0)
+    merge_hris_client (3.2.0)
       typhoeus (~> 1.0, >= 1.0.1)
     method_source (1.0.0)
     parallel (1.22.1)
@@ -58,7 +58,7 @@ GEM
     rubocop-ast (1.27.0)
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
-    stackone_hris_client (1.6.0)
+    stackone_hris_client (1.7.0)
       typhoeus (~> 1.0, >= 1.0.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
@@ -68,13 +68,13 @@ PLATFORMS
   arm64-darwin-22
 
 DEPENDENCIES
-  merge_hris_client (~> 3.0)
+  merge_hris_client (= 3.2.0)
   pry-byebug
   rake (~> 13.0.1)
   rspec (~> 3.6, >= 3.6.0)
   rubocop (~> 1.48.0)
-  stackone_hris_client (~> 1.6.0)
+  stackone_hris_client (~> 1.7.0)
   stackone_migration!
 
 BUNDLED WITH
-   2.4.7
+   2.4.13

data/lib/stackone_migration/api/link_token_api.rb

@@ -6,10 +6,10 @@ module MergeHRISClient
 
     def link_token_create(end_user_details_request, opts = {})
       return original_link_token_create(end_user_details_request, opts) if opts.key?(:use_merge) && opts[:use_merge]
-      
       connect_session_create_request = StackOneHRIS::ConnectSessionCreate.new(
         :origin_owner_id => end_user_details_request.end_user_origin_id,
-        :origin_owner_name => end_user_details_request.end_user_email_address,
+        :origin_owner_name => end_user_details_request.end_user_organization_name || end_user_details_request.end_user_email_address,
+        :origin_username => end_user_details_request.end_user_email_address,
         :provider => StackOneMigration::ProviderMapper.map_to_stackone_provider_name(end_user_details_request.integration),
         :categories => end_user_details_request.categories,
       )

data/lib/stackone_migration/mappers/employees_mapper.rb

@@ -91,7 +91,7 @@ module StackOneMigration
     def self.map_to_employee_model(employee)
       return nil if employee.nil?
 
-      MergeHRISClient::Employee.new(
+      new_employee = MergeHRISClient::Employee.new(
         :id => employee.id,
         :remote_id => employee.id,
         :first_name => employee.first_name,
@@ -108,12 +108,16 @@ module StackOneMigration
         :ethnicity => build_merge_enum(MergeHRISClient::EthnicityEnum, ethnicity_enum_hash, employee.ethnicity),
         :marital_status => build_merge_enum(MergeHRISClient::MaritalStatusEnum, marital_status_enum_hash, employee.marital_status),
         :hire_date => employee.hire_date,
-        :employment_status => MergeHRISClient::EmploymentStatusEnum.build_from_hash(map_enum(employment_status_enum_hash, employee.employment_status)),
+        :employment_status => build_merge_enum(MergeHRISClient::EmploymentStatusEnum, employment_status_enum_hash, employee.employment_status),
         :termination_date => employee.termination_date,
         :home_location => map_to_location_model(employee.home_location),
         :work_location => map_to_location_model(employee.work_location),
         :employments => map_employments(employee.employments),
       )
+
+      new_employee.employment_contract_type = employee.employment_contract_type unless employee.employment_contract_type.nil?
+
+      new_employee
     end
 
     def self.map_to_location_model(location)
@@ -137,21 +141,25 @@ module StackOneMigration
     def self.map_to_employment_model(employment)
       return nil if employment.nil?
 
-      MergeHRISClient::Employment.new(
+      new_employment = MergeHRISClient::Employment.new(
         :job_title => employment.job_title,
         :pay_rate => employment.pay_rate,
         :pay_period => build_merge_enum(MergeHRISClient::PayPeriodEnum, pay_period_enum_hash, employment.pay_period),
         :pay_frequency => build_merge_enum(MergeHRISClient::PayFrequencyEnum, pay_frequency_enum_hash, employment.pay_frequency),
         :pay_currency => MergeHRISClient::PayCurrencyEnum.build_from_hash(employment.pay_currency&.to_s&.upcase),
         :effective_date => employment.effective_date,
-        :employment_type => MergeHRISClient::EmploymentTypeEnum.build_from_hash(map_enum(employment_type_enum_hash, employment.employment_type)),
+        :employment_type => build_merge_enum(MergeHRISClient::EmploymentTypeEnum, employment_type_enum_hash, employment.employment_type),
       )
+
+      new_employment.employment_contract_type = employment.employment_contract_type unless employment.employment_contract_type.nil?
+
+      new_employment
     end
 
     def self.map_employments(employments)
-      if employments.nil? 
+      if employments.nil?
         mapped_results = []
-      else 
+      else
         mapped_results = employments.map do |employment|
           map_to_employment_model(employment)
         end
@@ -167,13 +175,13 @@ module StackOneMigration
         :_next => nil,
         :results => mapped_results,
         :previous => nil
-      )  
+      )
     end
 
     def self.map_to_paginated_employee_list_model(paginated_employees)
-      if paginated_employees&.data.nil? 
+      if paginated_employees&.data.nil?
         mapped_results = []
-      else 
+      else
         mapped_results = paginated_employees.data.map do |employee|
           map_to_employee_model(employee)
         end

data/lib/stackone_migration/models/employee.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module MergeHRISClient
+  class Employee
+    attr_accessor :employment_contract_type
+  end
+end

data/lib/stackone_migration/models/employment.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module MergeHRISClient
+  class Employment
+    attr_accessor :employment_contract_type
+  end
+end

data/lib/stackone_migration/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module StackOneMigration
-  VERSION = '1.4.8'
+  VERSION = '1.6.0'
 end

data/lib/stackone_migration.rb

@@ -6,6 +6,10 @@ require 'merge_hris_client'
 # Common files
 require 'stackone_migration/version'
 
+# Models
+require 'stackone_migration/models/employee'
+require 'stackone_migration/models/employment'
+
 # APIs
 require 'stackone_migration/api/employees_api'
 require 'stackone_migration/api/account_token_api'

data/spec/api/link_token_api_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe MergeHRISClient::LinkTokenApi do
   subject { MergeHRISClient::LinkTokenApi.new }
-  
+
   context '.link_token_create' do
     context 'when the the key to use merge is not present in the options' do
       it 'returns a merge link token object' do
@@ -49,19 +49,21 @@ describe MergeHRISClient::LinkTokenApi do
         end_user_details_request = MergeHRISClient::EndUserDetailsRequest.new(
           :end_user_email_address => 'tos@potig.er',
           :end_user_origin_id => 'user_origin_id',
+          :end_user_organization_name => 'sample org',
           :categories => ['hris'],
           :integration => 'sage-hr',
         )
 
         expected_request = StackOneHRIS::ConnectSessionCreate.new(
           :origin_owner_id => 'user_origin_id',
-          :origin_owner_name => 'tos@potig.er',
+          :origin_username => 'tos@potig.er',
+          :origin_owner_name => 'sample org',
           :provider => 'sage',
           :categories => ['hris'],
         )
 
         expect(connect_sessions_api_double).to receive(:connect_sessions_create).with(expected_request)
-        
+
         result = subject.link_token_create(end_user_details_request)
       end
     end

data/spec/mappers/employees_mapper_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe StackOneMigration::EmployeesMapper do
-  let(:sample_employee) { 
+  let(:sample_employee) {
     StackOneHRIS::Employee.new(
       :id => '123',
       :first_name => 'Jean',
@@ -21,10 +21,11 @@ describe StackOneMigration::EmployeesMapper do
       :ethnicity => StackOneHRIS::EthnicityEnum.new(value: 'white', source_value: 'White'),
       :marital_status => StackOneHRIS::MaritalStatusEnum.new(value: 'married', source_value: 'Married'),
       :employment_status => StackOneHRIS::EmploymentStatusEnum.new(value: 'terminated', source_value: 'Terminated'),
+      :employment_contract_type => StackOneHRIS::EmploymentTypeEnum.new(value: 'full_time', source_value: 'Full time'),
       :work_phone_number => '(456) 787-3508',
       :job_title => 'Manager',
       :department => 'Human Resources',
-      :home_location => 
+      :home_location =>
          StackOneHRIS::Location.new(
            :phone_number => "(456) 787-3508",
            :street_1 => "123 Main' St",
@@ -37,19 +38,20 @@ describe StackOneMigration::EmployeesMapper do
         ),
       :work_location => nil,
       :employments => [
-        StackOneHRIS::Employment.new( 
+        StackOneHRIS::Employment.new(
           :job_title => 'Manager',
           :pay_rate => 100000,
           :pay_period => StackOneHRIS::PayPeriodEnum.new(value: 'year', source_value: 'Year'),
           :pay_frequency => StackOneHRIS::PayFrequencyEnum.new(value: 'weekly', source_value: 'Weekly'),
           :pay_currency => 'USD',
           :effective_date => '2018-01-01',
-          :employment_type => StackOneHRIS::EmploymentTypeEnum.new(value: 'full_time', source_value: 'Full time'),
+          :employment_type => StackOneHRIS::EmploymentTypeEnum.new(value: 'contractor', source_value: 'Contractor'),
+          :employment_contract_type => StackOneHRIS::EmploymentTypeEnum.new(value: 'full_time', source_value: 'Full time'),
         )
       ]
     )
   }
-  let(:other_sample_employee) { 
+  let(:other_sample_employee) {
     StackOneHRIS::Employee.new(
       :id => '456',
       :first_name => 'Allie',
@@ -65,9 +67,9 @@ describe StackOneMigration::EmployeesMapper do
       :work_phone_number => '(456) 787-3508',
       :job_title => 'Manager',
       :department => 'Human Resources',
-    )   
+    )
   }
-  let(:another_sample_employee) { 
+  let(:another_sample_employee) {
     StackOneHRIS::Employee.new(
       :id => '456',
       :first_name => 'Allie',
@@ -84,9 +86,9 @@ describe StackOneMigration::EmployeesMapper do
       :personal_phone_number => '(715) 658-9486',
       :job_title => 'Manager',
       :department => 'Human Resources',
-    )   
+    )
   }
-  let(:employee_with_no_phone_number_and_avatar) { 
+  let(:employee_with_no_phone_number_and_avatar) {
     StackOneHRIS::Employee.new(
       :id => '456',
       :first_name => 'Allie',
@@ -101,7 +103,7 @@ describe StackOneMigration::EmployeesMapper do
       :manager_id => '417b5e62-e011-5e69-a906-0aefade9ded1',
       :job_title => 'Manager',
       :department => 'Human Resources',
-    )   
+    )
   }
 
   context '.map_to_employee_model' do
@@ -133,7 +135,8 @@ describe StackOneMigration::EmployeesMapper do
       expect(target_model.gender).to have_attributes(:value => 'FEMALE', :raw_value => 'Female')
       expect(target_model.ethnicity).to have_attributes(:value => 'WHITE', :raw_value => 'White')
       expect(target_model.marital_status).to have_attributes(:value => 'MARRIED_FILING_JOINTLY', :raw_value => 'Married')
-      expect(target_model.employment_status).to have_attributes(:value => 'INACTIVE', :raw_value => 'INACTIVE')
+      expect(target_model.employment_status).to have_attributes(:value => 'INACTIVE', :raw_value => 'Terminated')
+      expect(target_model.employment_contract_type).to have_attributes(:value => 'full_time', :source_value => 'Full time')
     end
 
     context 'when the employee record has the avatar base64 field instead of url' do
@@ -299,14 +302,15 @@ describe StackOneMigration::EmployeesMapper do
 
   context '.map_to_employment_model' do
     it 'maps a employeement to correct class' do
-      sample_employment = StackOneHRIS::Employment.new( 
+      sample_employment = StackOneHRIS::Employment.new(
         :job_title => 'Manager',
         :pay_rate => 100000,
         :pay_period => StackOneHRIS::PayPeriodEnum.new(value: 'year', source_value: 'Year'),
         :pay_frequency => StackOneHRIS::PayFrequencyEnum.new(value: 'weekly', source_value: 'Weekly'),
         :pay_currency => 'USD',
         :effective_date => '2018-01-01',
-        :employment_type => StackOneHRIS::EmploymentTypeEnum.new(value: 'full_time', source_value: 'Full time'),
+        :employment_type => StackOneHRIS::EmploymentTypeEnum.new(value: 'contractor', source_value: 'Contractor'),
+        :employment_contract_type => StackOneHRIS::EmploymentTypeEnum.new(value: 'full_time', source_value: 'Full Time'),
       )
 
       target_model = described_class.map_to_employment_model(sample_employment)
@@ -315,14 +319,15 @@ describe StackOneMigration::EmployeesMapper do
     end
 
     it 'maps a employeement with the right attributes' do
-      sample_employment = StackOneHRIS::Employment.new( 
+      sample_employment = StackOneHRIS::Employment.new(
         :job_title => 'Manager',
         :pay_rate => 100000,
         :pay_period => StackOneHRIS::PayPeriodEnum.new(value: 'year', source_value: 'Year'),
         :pay_frequency => StackOneHRIS::PayFrequencyEnum.new(value: 'weekly', source_value: 'Weekly'),
         :pay_currency => 'USD',
         :effective_date => '2018-01-01',
-        :employment_type => StackOneHRIS::EmploymentTypeEnum.new(value: 'full_time', source_value: 'Full time'),
+        :employment_type => StackOneHRIS::EmploymentTypeEnum.new(value: 'contractor', source_value: 'Contractor'),
+        :employment_contract_type => StackOneHRIS::EmploymentTypeEnum.new(value: 'full_time', source_value: 'Full time'),
       )
 
       target_model = described_class.map_to_employment_model(sample_employment)
@@ -333,7 +338,8 @@ describe StackOneMigration::EmployeesMapper do
       expect(target_model.pay_frequency).to have_attributes(:value => 'WEEKLY', :raw_value => 'Weekly')
       expect(target_model.pay_currency).to have_attributes(:value => 'USD', :raw_value => 'USD')
       expect(target_model.effective_date).to eq('2018-01-01')
-      expect(target_model.employment_type).to have_attributes(:value => 'FULL_TIME', :raw_value => 'FULL_TIME')
+      expect(target_model.employment_type).to have_attributes(:value => 'CONTRACTOR', :raw_value => 'Contractor')
+      expect(target_model.employment_contract_type).to have_attributes(:value => 'full_time', :source_value => 'Full time')
     end
   end
 
@@ -378,7 +384,7 @@ describe StackOneMigration::EmployeesMapper do
 
       expect(target_model).to be_a(MergeHRISClient::PaginatedEmployeeList)
     end
-  
+
 
     it 'maps the employee list attributes with the right structure to the target class' do
       stackone_paginated_employees = StackOneHRIS::EmployeesPaginated.new(

data/stackone_migration.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
   s.required_ruby_version = '>= 2.7'
 
-  s.add_runtime_dependency 'merge_hris_client', '~> 3.0'
-  s.add_runtime_dependency 'stackone_hris_client', '~> 1.6.0'
+  s.add_runtime_dependency 'merge_hris_client', '3.2.0'
+  s.add_runtime_dependency 'stackone_hris_client', '~> 1.7.0'
 
   s.add_development_dependency 'rspec', '~> 3.6', '>= 3.6.0'
 

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: stackone_migration
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.6.0
 platform: ruby
 authors:
 - StackOne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-04 00:00:00.000000000 Z
+date: 2023-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: merge_hris_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: stackone_hris_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +78,8 @@ files:
 - lib/stackone_migration/helpers/account_helper.rb
 - lib/stackone_migration/mappers/employees_mapper.rb
 - lib/stackone_migration/mappers/provider_mapper.rb
+- lib/stackone_migration/models/employee.rb
+- lib/stackone_migration/models/employment.rb
 - lib/stackone_migration/version.rb
 - spec/api/account_token_api_spec.rb
 - spec/api/delete_account_api_spec.rb