stackone_migration 1.6.1 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dc167022ee197e8544e7ed8d29ff67ac243c8125c55de8a447f45a8bafabc58
-  data.tar.gz: 70623c0e8c55683ed893e5122b2305fa65b56401e75264993779c109c51b42bd
+  metadata.gz: 94018a5c8bea5ac5c7db380a17afebbc5f36df51451e57d824ff9bc2af442428
+  data.tar.gz: c45de2c354412532fc373bfb2580b8036c6b6c0bbcd548f27c7aaacc0593d0c3
 SHA512:
-  metadata.gz: 0de75d646ce9ff4f4838bf87eb0eed2fc668827376efac8fae801e1707fa1a0a50fe929d0500a73811f722317c1c4dbbd03460f713d00c3f236cfc15e11abfed
-  data.tar.gz: a64114273afce17ade79067c0714f5154e0f244dacaab3467816d6cbd53b0990c766697dcaffcd195ae7cd139860e0874ae6a7be4886a5b48c978b7dfae23010
+  metadata.gz: a55b0e72717e64ed97253ae72fbbfd0a95a23ab5ef557aebbcb2da66557ee5acb8adac6adef0bf490712c2d196d2edc9a1966a6e98a94a6ef964bedb378173d0
+  data.tar.gz: 7cb666974fb605e967dc30695db41faa99381555915846e1a391dc09c08da4e6e9524640e6fd37dd1f30368100157609c11e040c7b959e186e7329180afdadfb

data/Gemfile

@@ -11,4 +11,4 @@ group :development, :test do
 end
 
 gem 'merge_hris_client', '3.2.0'
-gem 'stackone_hris_client', '~> 1.7.0'
+gem 'stackone_hris_client', '~> 1.7.1'

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    stackone_migration (1.6.1)
+    stackone_migration (1.6.3)
       merge_hris_client (= 3.2.0)
-      stackone_hris_client (~> 1.7.0)
+      stackone_hris_client (~> 1.7.1)
 
 GEM
   remote: https://rubygems.org/
@@ -58,7 +58,7 @@ GEM
     rubocop-ast (1.27.0)
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
-    stackone_hris_client (1.7.0)
+    stackone_hris_client (1.7.1)
       typhoeus (~> 1.0, >= 1.0.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
@@ -66,6 +66,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-22
+  arm64-darwin-23
 
 DEPENDENCIES
   merge_hris_client (= 3.2.0)
@@ -73,7 +74,7 @@ DEPENDENCIES
   rake (~> 13.0.1)
   rspec (~> 3.6, >= 3.6.0)
   rubocop (~> 1.48.0)
-  stackone_hris_client (~> 1.7.0)
+  stackone_hris_client (~> 1.7.1)
   stackone_migration!
 
 BUNDLED WITH

data/lib/stackone_migration/api/account_token_api.rb

@@ -8,8 +8,9 @@ module MergeHRISClient
       return original_account_token_retrieve(public_token, opts) unless StackOneMigration::AccountHelper.stackone_account?(public_token)
 
       account_data = StackOneHRIS::AccountsApi.new.accounts_get(public_token)
-        
-      integration_data = MergeHRISClient::AccountIntegration.new(slug: account_data.provider)
+
+      merge_provider_name = StackOneMigration::ProviderMapper.map_to_merge_provider_name(account_data.provider)
+      integration_data = MergeHRISClient::AccountIntegration.new(slug: merge_provider_name)
       MergeHRISClient::AccountToken.new(account_token: public_token, integration: integration_data)
 
     rescue StackOneHRIS::ApiError

data/lib/stackone_migration/api/employees_api.rb

@@ -16,11 +16,15 @@ module MergeHRISClient
       if opts.key?(:remote_id)
         stripped_opts = opts.reject { |k, _| k == :remote_id }
         response = StackOneHRIS::EmployeesApi.new.hris_employees_get(opts[:remote_id], x_account_id,
-                                                                                      stripped_opts)
+                                                                                      stripped_opts.merge({ :include => 'avatar_url' }))
 
         StackOneMigration::EmployeesMapper.map_single_employee_to_list_model(response&.data)
       else
-        response = StackOneHRIS::EmployeesApi.new.hris_employees_list(x_account_id, opts)
+        if opts[:page].nil? || opts[:page].strip.empty?
+          opts[:page] = '1'
+        end
+
+        response = StackOneHRIS::EmployeesApi.new.hris_employees_list(x_account_id, opts.merge({ :include => 'avatar_url' }))
 
         StackOneMigration::EmployeesMapper.map_to_paginated_employee_list_model(response)
       end

data/lib/stackone_migration/mappers/provider_mapper.rb

@@ -21,5 +21,14 @@ module StackOneMigration
 
       provider_name
     end
+
+    def self.map_to_merge_provider_name(provider_name)
+      return nil if provider_name.nil?
+
+      mapped_provider_name = provider_name_hash.key(provider_name)&.to_s
+      return mapped_provider_name unless mapped_provider_name.nil?
+
+      provider_name
+    end
   end
 end

data/lib/stackone_migration/version.rb

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

data/spec/api/account_token_api_spec.rb

@@ -18,13 +18,13 @@ describe MergeHRISClient::AccountTokenApi do
       end
 
       it 'returns an account token object with the right attributes' do
-        account_data = StackOneHRIS::Account.new(:id => '12345', :provider => 'stackone_hris_provider')
+        account_data = StackOneHRIS::Account.new(:id => '12345', :provider => 'adpworkforcenow')
         stackone_account_api_double = double('StackOneHRIS::AccountsApi', :accounts_get => account_data)
         allow(StackOneHRIS::AccountsApi).to receive(:new).and_return(stackone_account_api_double)
 
         result = subject.account_token_retrieve('12345')
 
-        expect(result).to have_attributes(:account_token => '12345', :integration => MergeHRISClient::AccountIntegration.new(:slug => 'stackone_hris_provider'))
+        expect(result).to have_attributes(:account_token => '12345', :integration => MergeHRISClient::AccountIntegration.new(:slug => 'adp-workforce-now'))
       end
     end
   end

data/spec/api/employees_api_spec.rb

@@ -11,9 +11,9 @@ describe MergeHRISClient::EmployeesApi do
         paginated_employees_double = double('StackOneHRIS::PaginatedEmployeeList', :data => nil, :next_page => nil)
         stackone_employees_api_double = double('StackOneHRIS::EmployeesApi', :hris_employees_list => paginated_employees_double)
         allow(StackOneHRIS::EmployeesApi).to receive(:new).and_return(stackone_employees_api_double)
-        options = { :expand => 'employments,home_location' }
+        options = { :expand => 'employments,home_location', :include => 'avatar_url' }
 
-        expect(stackone_employees_api_double).to receive(:hris_employees_list).with('123', options)
+        expect(stackone_employees_api_double).to receive(:hris_employees_list).with('123', options.merge({ :page => '1' }))
 
         subject.employees_list('123', options)
       end
@@ -25,7 +25,7 @@ describe MergeHRISClient::EmployeesApi do
           allow(StackOneHRIS::EmployeesApi).to receive(:new).and_return(stackone_employees_api_double)
           options = { :expand => 'employments,home_location', :remote_id => '456' }
 
-          expect(stackone_employees_api_double).to receive(:hris_employees_get).with('456', '123', { :expand => 'employments,home_location' })
+          expect(stackone_employees_api_double).to receive(:hris_employees_get).with('456', '123', { :expand => 'employments,home_location', include: 'avatar_url' })
 
           subject.employees_list('123', options)
         end
@@ -38,7 +38,20 @@ describe MergeHRISClient::EmployeesApi do
           allow(StackOneHRIS::EmployeesApi).to receive(:new).and_return(stackone_employees_api_double)
           options = { :cursor => 'page_cursor' }
 
-          expect(stackone_employees_api_double).to receive(:hris_employees_list).with('123', { :page => 'page_cursor' })
+          expect(stackone_employees_api_double).to receive(:hris_employees_list).with('123', { :page => 'page_cursor', :include => 'avatar_url' })
+
+          subject.employees_list('123', options)
+        end
+      end
+
+      context 'and the page param is in the options' do
+        it 'calls the method from the StackOne client to list employees without overriding the page parameter' do
+          paginated_employees_double = double('StackOneHRIS::PaginatedEmployeeList', :data => nil, :next_page => nil)
+          stackone_employees_api_double = double('StackOneHRIS::EmployeesApi', :hris_employees_list => paginated_employees_double)
+          allow(StackOneHRIS::EmployeesApi).to receive(:new).and_return(stackone_employees_api_double)
+          options = { :expand => 'employments,home_location', :include => 'avatar_url', :page => '2' }
+
+          expect(stackone_employees_api_double).to receive(:hris_employees_list).with('123', options.merge({ :page => '2' }))
 
           subject.employees_list('123', options)
         end

data/spec/mappers/provider_mapper_spec.rb

@@ -32,4 +32,34 @@ describe StackOneMigration::ProviderMapper do
       end
     end
   end
+
+  context '.map_to_merge_provider_name' do
+    it 'returns the mapped provider name' do
+        actual_provider = described_class.map_to_merge_provider_name('hibob')
+
+        expect(actual_provider).to eq('hibob')
+      end
+
+    it 'returns the mapped provider name' do
+        actual_provider = described_class.map_to_merge_provider_name('ukgpro')
+
+        expect(actual_provider).to eq('ukg-pro')
+      end
+
+    context 'when the provider name is nil' do
+      it 'returns nil' do
+        actual_provider = described_class.map_to_merge_provider_name(nil)
+
+        expect(actual_provider).to be_nil
+      end
+    end
+
+    context 'when the provider name could not be mapped' do
+      it 'returns the original provider name' do
+        actual_provider = described_class.map_to_merge_provider_name('ashby-ats')
+
+        expect(actual_provider).to eq('ashby-ats')
+      end
+    end
+  end
 end

data/stackone_migration.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.7'
 
   s.add_runtime_dependency 'merge_hris_client', '3.2.0'
-  s.add_runtime_dependency 'stackone_hris_client', '~> 1.7.0'
+  s.add_runtime_dependency 'stackone_hris_client', '~> 1.7.1'
 
   s.add_development_dependency 'rspec', '~> 3.6', '>= 3.6.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackone_migration
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.3
 platform: ruby
 authors:
 - StackOne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-03 00:00:00.000000000 Z
+date: 2023-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: merge_hris_client
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: StackOne migration client gem