stackone_migration 1.6.1 → 1.6.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5dc167022ee197e8544e7ed8d29ff67ac243c8125c55de8a447f45a8bafabc58
4
- data.tar.gz: 70623c0e8c55683ed893e5122b2305fa65b56401e75264993779c109c51b42bd
3
+ metadata.gz: d469fc2eff7c4b06d225e138492292a27da80bc2f0ab93c42511cfa9fc924c29
4
+ data.tar.gz: 7e3be5dc88259fc2a4697e42864de61f183b3f3b52c79c6d838b833806a6538e
5
5
  SHA512:
6
- metadata.gz: 0de75d646ce9ff4f4838bf87eb0eed2fc668827376efac8fae801e1707fa1a0a50fe929d0500a73811f722317c1c4dbbd03460f713d00c3f236cfc15e11abfed
7
- data.tar.gz: a64114273afce17ade79067c0714f5154e0f244dacaab3467816d6cbd53b0990c766697dcaffcd195ae7cd139860e0874ae6a7be4886a5b48c978b7dfae23010
6
+ metadata.gz: de7e8d0d7e97eb08b10190488fee1373e068779e9ba6127da89e98c23c5f0b29acbb306e07e8fb02b06c2555afd38dd4cc86d885b380dc798f93ad95dc15b876
7
+ data.tar.gz: 6277fb542b87337161bcb14460fbbf99ef225a774d93347fa88eff946e77d0c687f92056cc053cb0e01407c264afca2569d7c124028e194d82c96c1baf9153be
data/Gemfile CHANGED
@@ -11,4 +11,4 @@ group :development, :test do
11
11
  end
12
12
 
13
13
  gem 'merge_hris_client', '3.2.0'
14
- gem 'stackone_hris_client', '~> 1.7.0'
14
+ gem 'stackone_hris_client', '~> 1.7.1'
data/Gemfile.lock CHANGED
@@ -1,9 +1,9 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- stackone_migration (1.6.1)
4
+ stackone_migration (1.6.2)
5
5
  merge_hris_client (= 3.2.0)
6
- stackone_hris_client (~> 1.7.0)
6
+ stackone_hris_client (~> 1.7.1)
7
7
 
8
8
  GEM
9
9
  remote: https://rubygems.org/
@@ -58,7 +58,7 @@ GEM
58
58
  rubocop-ast (1.27.0)
59
59
  parser (>= 3.2.1.0)
60
60
  ruby-progressbar (1.13.0)
61
- stackone_hris_client (1.7.0)
61
+ stackone_hris_client (1.7.1)
62
62
  typhoeus (~> 1.0, >= 1.0.1)
63
63
  typhoeus (1.4.0)
64
64
  ethon (>= 0.9.0)
@@ -66,6 +66,7 @@ GEM
66
66
 
67
67
  PLATFORMS
68
68
  arm64-darwin-22
69
+ arm64-darwin-23
69
70
 
70
71
  DEPENDENCIES
71
72
  merge_hris_client (= 3.2.0)
@@ -73,7 +74,7 @@ DEPENDENCIES
73
74
  rake (~> 13.0.1)
74
75
  rspec (~> 3.6, >= 3.6.0)
75
76
  rubocop (~> 1.48.0)
76
- stackone_hris_client (~> 1.7.0)
77
+ stackone_hris_client (~> 1.7.1)
77
78
  stackone_migration!
78
79
 
79
80
  BUNDLED WITH
@@ -16,11 +16,15 @@ module MergeHRISClient
16
16
  if opts.key?(:remote_id)
17
17
  stripped_opts = opts.reject { |k, _| k == :remote_id }
18
18
  response = StackOneHRIS::EmployeesApi.new.hris_employees_get(opts[:remote_id], x_account_id,
19
- stripped_opts)
19
+ stripped_opts.merge({ :include => 'avatar_url' }))
20
20
 
21
21
  StackOneMigration::EmployeesMapper.map_single_employee_to_list_model(response&.data)
22
22
  else
23
- response = StackOneHRIS::EmployeesApi.new.hris_employees_list(x_account_id, opts)
23
+ if opts[:page].nil? || opts[:page].strip.empty?
24
+ opts[:page] = '1'
25
+ end
26
+
27
+ response = StackOneHRIS::EmployeesApi.new.hris_employees_list(x_account_id, opts.merge({ :include => 'avatar_url' }))
24
28
 
25
29
  StackOneMigration::EmployeesMapper.map_to_paginated_employee_list_model(response)
26
30
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module StackOneMigration
4
- VERSION = '1.6.1'
4
+ VERSION = '1.6.2'
5
5
  end
@@ -11,9 +11,9 @@ describe MergeHRISClient::EmployeesApi do
11
11
  paginated_employees_double = double('StackOneHRIS::PaginatedEmployeeList', :data => nil, :next_page => nil)
12
12
  stackone_employees_api_double = double('StackOneHRIS::EmployeesApi', :hris_employees_list => paginated_employees_double)
13
13
  allow(StackOneHRIS::EmployeesApi).to receive(:new).and_return(stackone_employees_api_double)
14
- options = { :expand => 'employments,home_location' }
14
+ options = { :expand => 'employments,home_location', :include => 'avatar_url' }
15
15
 
16
- expect(stackone_employees_api_double).to receive(:hris_employees_list).with('123', options)
16
+ expect(stackone_employees_api_double).to receive(:hris_employees_list).with('123', options.merge({ :page => '1' }))
17
17
 
18
18
  subject.employees_list('123', options)
19
19
  end
@@ -25,7 +25,7 @@ describe MergeHRISClient::EmployeesApi do
25
25
  allow(StackOneHRIS::EmployeesApi).to receive(:new).and_return(stackone_employees_api_double)
26
26
  options = { :expand => 'employments,home_location', :remote_id => '456' }
27
27
 
28
- expect(stackone_employees_api_double).to receive(:hris_employees_get).with('456', '123', { :expand => 'employments,home_location' })
28
+ expect(stackone_employees_api_double).to receive(:hris_employees_get).with('456', '123', { :expand => 'employments,home_location', include: 'avatar_url' })
29
29
 
30
30
  subject.employees_list('123', options)
31
31
  end
@@ -38,7 +38,20 @@ describe MergeHRISClient::EmployeesApi do
38
38
  allow(StackOneHRIS::EmployeesApi).to receive(:new).and_return(stackone_employees_api_double)
39
39
  options = { :cursor => 'page_cursor' }
40
40
 
41
- expect(stackone_employees_api_double).to receive(:hris_employees_list).with('123', { :page => 'page_cursor' })
41
+ expect(stackone_employees_api_double).to receive(:hris_employees_list).with('123', { :page => 'page_cursor', :include => 'avatar_url' })
42
+
43
+ subject.employees_list('123', options)
44
+ end
45
+ end
46
+
47
+ context 'and the page param is in the options' do
48
+ it 'calls the method from the StackOne client to list employees without overriding the page parameter' do
49
+ paginated_employees_double = double('StackOneHRIS::PaginatedEmployeeList', :data => nil, :next_page => nil)
50
+ stackone_employees_api_double = double('StackOneHRIS::EmployeesApi', :hris_employees_list => paginated_employees_double)
51
+ allow(StackOneHRIS::EmployeesApi).to receive(:new).and_return(stackone_employees_api_double)
52
+ options = { :expand => 'employments,home_location', :include => 'avatar_url', :page => '2' }
53
+
54
+ expect(stackone_employees_api_double).to receive(:hris_employees_list).with('123', options.merge({ :page => '2' }))
42
55
 
43
56
  subject.employees_list('123', options)
44
57
  end
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
16
16
  s.required_ruby_version = '>= 2.7'
17
17
 
18
18
  s.add_runtime_dependency 'merge_hris_client', '3.2.0'
19
- s.add_runtime_dependency 'stackone_hris_client', '~> 1.7.0'
19
+ s.add_runtime_dependency 'stackone_hris_client', '~> 1.7.1'
20
20
 
21
21
  s.add_development_dependency 'rspec', '~> 3.6', '>= 3.6.0'
22
22
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: stackone_migration
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.1
4
+ version: 1.6.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - StackOne
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-10-03 00:00:00.000000000 Z
11
+ date: 2023-11-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: merge_hris_client
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.7.0
33
+ version: 1.7.1
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 1.7.0
40
+ version: 1.7.1
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rspec
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  requirements: []
112
- rubygems_version: 3.1.6
112
+ rubygems_version: 3.4.10
113
113
  signing_key:
114
114
  specification_version: 4
115
115
  summary: StackOne migration client gem