stackone_migration 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d01ae0e3ccadc71617ac37d478e5f89262e592c743f68b5647154da2278baf23
-  data.tar.gz: 19668886873b5d119f03626366f638f38e6c5611869cdf71ff571d563e009975
+  metadata.gz: 7ed058e52bc6531d4776c4309fa4a63c1f17c050cf7a3a79cbdd5cdb126314a2
+  data.tar.gz: dc2432ab2547c52815d94de47f2e837937e47035b0ec582f723a547c00050596
 SHA512:
-  metadata.gz: '09e0cd27d2761358d6e282ca3ddb1a813c0c477a7aec8b90e812ff798eac8a3048aa1fb42c3f8fec69a80f33749e367bfa6488c269024960fedeac3c15fcbabc'
-  data.tar.gz: 6424f9d55b1f7f7ff4f1189c9471ee47811c943b54cef7e40087ec1dbbf9b54dc9f06b32ddd33e3687d2fddfd0881d0616bb2db24cedca90f8d7dd5955cacc67
+  metadata.gz: bd971a17ee5e0ae0788e75ed6203ec7cf0907988c3e8c6ffab34bd29c1dde4487184a7161a68b3a1c7e1bbea3cf1a8f55a62a9b80a1b0d7816897752881bbce6
+  data.tar.gz: 799d35be2943ac5678d2bdf1c4e2ce09269c09fe736bc89480fa62d981318eec8a2ac7bf02f464145961188b868dda0a969ddf3b3aa8cc8634ecbdce2c297aa6

data/Gemfile

@@ -11,4 +11,4 @@ group :development, :test do
 end
 
 gem 'merge_hris_client', '~> 3.0'
-gem 'stackone_hris_client', '~> 1.3.0'
+gem 'stackone_hris_client', '~> 1.3.2'

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    stackone_migration (1.2.0)
+    stackone_migration (1.2.2)
       merge_hris_client (~> 3.0)
-      stackone_hris_client (~> 1.3.0)
+      stackone_hris_client (~> 1.3.2)
 
 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.3.0)
+    stackone_hris_client (1.3.2)
       typhoeus (~> 1.0, >= 1.0.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
@@ -73,7 +73,7 @@ DEPENDENCIES
   rake (~> 13.0.1)
   rspec (~> 3.6, >= 3.6.0)
   rubocop (~> 1.48.0)
-  stackone_hris_client (~> 1.3.0)
+  stackone_hris_client (~> 1.3.2)
   stackone_migration!
 
 BUNDLED WITH

data/lib/stackone_migration/mappers/employees_mapper.rb

@@ -110,43 +110,41 @@ module StackOneMigration
         :hire_date => employee.hire_date,
         :employment_status => MergeHRISClient::EmploymentStatusEnum.build_from_hash(employment_status_enum_hash[employee.employment_status&.to_sym]),
         :termination_date => employee.termination_date,
-        :company => json_str_to_hash(employee.company),
-        :home_location => json_str_to_hash(employee.home_location),
-        :work_location => json_str_to_hash(employee.work_location),
+        :home_location => map_to_location_model(employee.home_location),
+        :work_location => map_to_location_model(employee.work_location),
         :employments => map_employments(employee.employments),
       )
     end
 
-    def self.json_str_to_hash(hash_string)
-      begin
-        return nil if hash_string.nil?
-
-        new_str = hash_string
-          .gsub(/:(\w+)/, '"\1"')
-          .gsub('=>', ':')
-          .gsub('nil', 'null')
-
-        hash = JSON.parse(new_str)
-
-        hash.transform_keys(&:to_sym)
-      rescue JSON::ParserError => e
-        puts "Error parsing JSON string: #{e.message}"
-
-        hash_string
-      end
+    def self.map_to_location_model(location)
+      return nil if location.nil?
+
+      MergeHRISClient::Location.new(
+        :id => location.id,
+        :remote_id => location.id,
+        :name => location.name,
+        :phone_number => location.phone_number,
+        :street_1 => location.street_1,
+        :street_2 => location.street_2,
+        :city => location.city,
+        :state => location.state,
+        :zip_code => location.zip_code,
+        :country => MergeHRISClient::CountryEnum.build_from_hash(location.country),
+        :location_type => MergeHRISClient::LocationTypeEnum.build_from_hash(location_type_enum_hash[location.location_type&.to_sym]),
+      )
     end
 
     def self.map_to_employment_model(employment)
       return nil if employment.nil?
 
       MergeHRISClient::Employment.new(
-        :job_title => employment[:job_title],
-        :pay_rate => employment[:pay_rate],
-        :pay_period => MergeHRISClient::PayPeriodEnum.build_from_hash(pay_period_enum_hash[employment[:pay_period]&.to_sym]),
-        :pay_frequency => MergeHRISClient::PayFrequencyEnum.build_from_hash(pay_frequency_enum_hash[employment[:pay_frequency]&.to_sym]),
-        :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(employment_type_enum_hash[employment[:employment_type]&.to_sym]),
+        :job_title => employment.job_title,
+        :pay_rate => employment.pay_rate,
+        :pay_period => MergeHRISClient::PayPeriodEnum.build_from_hash(pay_period_enum_hash[employment.pay_period&.to_sym]),
+        :pay_frequency => MergeHRISClient::PayFrequencyEnum.build_from_hash(pay_frequency_enum_hash[employment.pay_frequency&.to_sym]),
+        :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(employment_type_enum_hash[employment.employment_type&.to_sym]),
       )
     end
 

data/lib/stackone_migration/version.rb

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

data/spec/mappers/employees_mapper_spec.rb

@@ -24,29 +24,27 @@ describe StackOneMigration::EmployeesMapper do
       :work_phone_number => '(456) 787-3508',
       :job_title => 'Manager',
       :department => 'Human Resources',
-      :home_location => "{
-        :phone_number => \"(456) 787-3508\",
-        :street_1 => \"123 Main' St\",
-        :street_2 => \"Apt 1\",
-        :city => \"San Francisco\",
-        :state => \"CA\",
-        :zip_code => \"94105\",
-        :country => \"US\"
-      }",
+      :home_location => 
+         StackOneHRIS::Location.new(
+           :phone_number => "(456) 787-3508",
+           :street_1 => "123 Main' St",
+           :street_2 => "Apt 1",
+           :city => "San Francisco",
+           :state => "CA",
+           :zip_code => "94105",
+           :country => "US"
+        ),
       :work_location => nil,
-      :company => "{
-        \"display_name\": \"StackOne\"
-      }",
       :employments => [
-        { 
-          job_title: 'Manager',
-          pay_rate: 100000,
-          pay_period: 'yearly',
-          pay_frequency: 'weekly',
-          pay_currency: 'USD',
-          effective_date: '2018-01-01',
-          employee_type: 'full_time',
-        }
+        StackOneHRIS::Employment.new( 
+          :job_title => 'Manager',
+          :pay_rate => 100000,
+          :pay_period => 'year',
+          :pay_frequency => 'weekly',
+          :pay_currency => 'USD',
+          :effective_date => '2018-01-01',
+          :employment_type => 'full_time',
+        )
       ]
     )
   }
@@ -94,19 +92,8 @@ describe StackOneMigration::EmployeesMapper do
         :date_of_birth => '1990-01-01',
         :start_date => '2018-01-01',
         :manager => '417b5e62-e011-5e69-a906-0aefade9ded1',
-        :home_location => {
-          phone_number: '(456) 787-3508',
-          street_1: '123 Main\' St',
-          street_2: 'Apt 1',
-          city: 'San Francisco',
-          state: 'CA',
-          zip_code: '94105',
-          country: 'US',
-        },
         :work_location => nil,
-        :company => {
-          display_name: 'StackOne',
-        },
+        :company => nil,
       )
       expect(target_model.gender).to have_attributes(:value => 'FEMALE')
       expect(target_model.ethnicity).to have_attributes(:value => 'WHITE')
@@ -123,33 +110,80 @@ describe StackOneMigration::EmployeesMapper do
     end
   end
 
+  context '.map_to_location_model' do
+    it 'maps a location to correct class' do
+      sample_location = StackOneHRIS::Location.new(
+        :phone_number => "(456) 787-3508",
+        :street_1 => "123 Main' St",
+        :street_2 => "Apt 1",
+        :city => "San Francisco",
+        :state => "CA",
+        :zip_code => "94105",
+        :country => "US"
+      )
+
+      target_model = described_class.map_to_location_model(sample_location)
+
+      expect(target_model).to be_a(MergeHRISClient::Location)
+    end
+
+    it 'maps a location with the right attributes' do
+      sample_location = StackOneHRIS::Location.new(
+        :id => '123',
+        :name => 'David Leonard',
+        :phone_number => "(456) 787-3508",
+        :street_1 => "123 Main' St",
+        :street_2 => "Apt 1",
+        :city => "San Francisco",
+        :state => "CA",
+        :zip_code => "94105",
+        :country => "US",
+        :location_type => 'home'
+      )
+
+      target_model = described_class.map_to_location_model(sample_location)
+
+      expect(target_model.id).to eq('123')
+      expect(target_model.remote_id).to eq('123')
+      expect(target_model.name).to eq('David Leonard')
+      expect(target_model.phone_number).to eq('(456) 787-3508')
+      expect(target_model.street_1).to eq("123 Main' St")
+      expect(target_model.street_2).to eq("Apt 1")
+      expect(target_model.city).to eq("San Francisco")
+      expect(target_model.state).to eq("CA")
+      expect(target_model.zip_code).to eq("94105")
+      expect(target_model.country).to have_attributes(:raw_value => 'US')
+      expect(target_model.location_type).to have_attributes(:value => 'HOME')
+    end
+  end
+
   context '.map_to_employment_model' do
-    it 'maps a employeement hash to correct class' do
-      sample_employment = { 
-            job_title: 'Manager',
-            pay_rate: 100000,
-            pay_period: 'yearly',
-            pay_frequency: 'weekly',
-            pay_currency: 'USD',
-            effective_date: '2018-01-01',
-            employment_type: 'full_time',
-          }
+    it 'maps a employeement to correct class' do
+      sample_employment = StackOneHRIS::Employment.new( 
+        :job_title => 'Manager',
+        :pay_rate => 100000,
+        :pay_period => 'year',
+        :pay_frequency => 'weekly',
+        :pay_currency => 'USD',
+        :effective_date => '2018-01-01',
+        :employment_type => 'full_time',
+      )
 
       target_model = described_class.map_to_employment_model(sample_employment)
 
       expect(target_model).to be_a(MergeHRISClient::Employment)
     end
 
-    it 'maps a employeement hash with the right attributes' do
-      sample_employment = { 
-            job_title: 'Manager',
-            pay_rate: 100000,
-            pay_period: 'year',
-            pay_frequency: 'weekly',
-            pay_currency: 'usd',
-            effective_date: '2018-01-01',
-            employment_type: 'full_time',
-          }
+    it 'maps a employeement with the right attributes' do
+      sample_employment = StackOneHRIS::Employment.new( 
+        :job_title => 'Manager',
+        :pay_rate => 100000,
+        :pay_period => 'year',
+        :pay_frequency => 'weekly',
+        :pay_currency => 'USD',
+        :effective_date => '2018-01-01',
+        :employment_type => 'full_time',
+      )
 
       target_model = described_class.map_to_employment_model(sample_employment)
 

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.0'
-  s.add_runtime_dependency 'stackone_hris_client', '~> 1.3.0'
+  s.add_runtime_dependency 'stackone_hris_client', '~> 1.3.2'
 
   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.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - StackOne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-20 00:00:00.000000000 Z
+date: 2023-05-03 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.3.0
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement