peoplegroup-connectors 0.1.66 → 0.1.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c00abbd23af58a2c893beaf5e8d286fb5b2470e2e85254b799fc48473a870485
-  data.tar.gz: 1c7d4fcd5fab3cf7f75f538fe3cd66bfd03beb80feff8b8de2ead575c113b98b
+  metadata.gz: a9274ee0cfd7218f984208e6746b404f523930606e0131b692fe3693b494fa52
+  data.tar.gz: 3c644450db792109565b5e73eb19984e478751c0a74049a6a312325c0601040e
 SHA512:
-  metadata.gz: bdcab02d7cf9b679eb72d4f2181f93a12d886cd7d2fdff3b7467197252a735acecc543a95f4daf08e498e612e92e9ad755a5dadc7f8811adb1b9425959d7df0b
-  data.tar.gz: c5ebda254577c8d529143624ced39408374964d8d49c2543f7ffdaeb3c15142902db72154d7762eed9063b90948255759e19bd10ea47aad82b886ab6de975ad7
+  metadata.gz: cd92ff904af3f63e73032cb723d5506f168bd5937e66bd7ebc0ebaa2da1cd9549a073278992aaeb4efbdf914c9b7a7826d55bdcc47752635c06a5a549680bdf1
+  data.tar.gz: ccce705cf39d04d1d210cd8942a018c7c398f021fdd348a570201b5b9690faab507538d2e2bcbc7142ac6df486a80b3525c1de0c8fcae968e8cf1b65ac750ce0

data/lib/peoplegroup/connectors/bamboo.rb

@@ -27,7 +27,9 @@ module PeopleGroup
       end
 
       def get_employee(id)
-        @client.employee.find(id, %w[firstName lastName jobTitle supervisor hireDate country location department division workEmail customCostCenter])
+        retry_on_error do
+          @client.employee.find(id, %w[firstName lastName jobTitle supervisor hireDate country location department division workEmail customCostCenter])
+        end
       end
 
       def get_employee!(id)
@@ -172,11 +174,11 @@ module PeopleGroup
       end
 
       def create_employee(employee_details_hash)
-        @client.employee.add(employee_details_hash)
+        retry_on_error { @client.employee.add(employee_details_hash) }
       end
 
       def update_employee(employee_id, employee_details_hash)
-        @client.employee.update(employee_id, employee_details_hash)
+        retry_on_error { @client.employee.update(employee_id, employee_details_hash) }
       end
 
       def departments
@@ -194,13 +196,14 @@ module PeopleGroup
       def fields
         return @fields if @fields
 
-        @fields = (Bamboozled::API::FieldCollection.all_names + @client.meta.fields.map { |f| f['alias'] }).compact.uniq
+        meta_field_aliases = retry_on_error { @client.meta.fields }.map { |f| f['alias'] }
+        @fields = (Bamboozled::API::FieldCollection.all_names + meta_field_aliases).compact.uniq
         @fields.delete('flsaCode') # temp fix for problems with BambooHR
         @fields
       end
 
       def employees
-        Utils.retry_on_error(errors: [Net::ReadTimeout, Bamboozled::GatewayError]) do
+        retry_on_error do
           if @use_report
             @employees ||= @client.report.find(@use_report, 'JSON', true).reject { |employee| employee['lastName'] == 'Test-Gitlab' }
           else
@@ -223,33 +226,33 @@ module PeopleGroup
       alias_method :active_and_current_team_members, :active_and_current_employees
 
       def add_stock_options(employee_id, data)
-        @client.employee.add_table_row(employee_id, 'customEquity', data)
+        retry_on_error { @client.employee.add_table_row(employee_id, 'customEquity', data) }
       end
 
       def stock_options_data(employee_id)
-        @client.employee.table_data(employee_id, 'customEquity')
+        retry_on_error { @client.employee.table_data(employee_id, 'customEquity') }
       end
 
       def add_job_details(employee_id, data)
-        @client.employee.add_table_row(employee_id, 'jobInfo', data)
+        retry_on_error { @client.employee.add_table_row(employee_id, 'jobInfo', data) }
       end
 
       def update_job_details(employee_id, data)
         current_data = job_details(employee_id) # it should only be one row as we just created this user
         row_id = current_data.first.dig('id')
-        @client.employee.update_table_row(employee_id, 'jobInfo', row_id, data)
+        retry_on_error { @client.employee.update_table_row(employee_id, 'jobInfo', row_id, data) }
       end
 
       def add_compensation_details(employee_id, data)
-        @client.employee.add_table_row(employee_id, 'compensation', data)
+        retry_on_error { @client.employee.add_table_row(employee_id, 'compensation', data) }
       end
 
       def employment_statuses(employee_id)
-        @client.employee.table_data(employee_id, 'employmentStatus')
+        retry_on_error { @client.employee.table_data(employee_id, 'employmentStatus') }
       end
 
       def time_off_types
-        @time_off_types ||= @client.meta.time_off_types
+        @time_off_types ||= retry_on_error { @client.meta.time_off_types }
       end
 
       def time_off_type(name)
@@ -257,11 +260,11 @@ module PeopleGroup
       end
 
       def time_off_estimate(employee_id, end_date = Date.today)
-        @client.employee.time_off_estimate(employee_id, end_date)
+        retry_on_error { @client.employee.time_off_estimate(employee_id, end_date) }
       end
 
       def time_off_adjustment(employee_id, options)
-        @client.employee.time_off_balance_adjustment(employee_id, options)
+        retry_on_error { @client.employee.time_off_balance_adjustment(employee_id, options) }
       end
 
       def accrued_days(employee_id)
@@ -272,18 +275,18 @@ module PeopleGroup
       end
 
       def time_off_policies
-        @time_off_policies ||= @client.meta.time_off_policies
+        @time_off_policies ||= retry_on_error { @client.meta.time_off_policies }
       end
 
       def employee_time_off_policies(employee_id)
-        @client.employee.time_off_policies(employee_id)
+        retry_on_error { @client.employee.time_off_policies(employee_id) }
       end
       alias_method :team_member_time_off_policies, :employee_time_off_policies
 
       def add_time_off_policy(employee_id, time_off_policy_id, accrual_start_date)
         policies = [{ timeOffPolicyId: time_off_policy_id, accrualStartDate: accrual_start_date }]
 
-        @client.employee.add_time_off_policies(employee_id, policies)
+        retry_on_error { @client.employee.add_time_off_policies(employee_id, policies) }
       end
 
       def remove_time_off_policy(employee_id, time_off_policy_id)
@@ -293,7 +296,7 @@ module PeopleGroup
       end
 
       def job_details(employee_id)
-        @client.employee.table_data(employee_id, 'jobInfo')
+        retry_on_error { @client.employee.table_data(employee_id, 'jobInfo') }
       end
 
       def resumes_folder_id(employee_id)
@@ -311,39 +314,39 @@ module PeopleGroup
           share: 'yes',
           file: file
         }
-        @client.employee.add_file(employee_id, options)
+        retry_on_error { @client.employee.add_file(employee_id, options) }
       end
 
       def add_employment_status(employee_id, data)
-        @client.employee.add_table_row(employee_id, 'employmentStatus', data)
+        retry_on_error { @client.employee.add_table_row(employee_id, 'employmentStatus', data) }
       end
 
       def add_currency_conversion(employee_id, data)
-        @client.employee.add_table_row(employee_id, 'customCurrencyConversion', data)
+        retry_on_error { @client.employee.add_table_row(employee_id, 'customCurrencyConversion', data) }
       end
 
       def add_on_target_earnings(employee_id, data)
-        @client.employee.add_table_row(employee_id, 'customOnTargetEarnings', data)
+        retry_on_error { @client.employee.add_table_row(employee_id, 'customOnTargetEarnings', data) }
       end
 
       def add_signing_bonus(employee_id, data)
-        @client.employee.add_table_row(employee_id, 'customBonus', data)
+        retry_on_error { @client.employee.add_table_row(employee_id, 'customBonus', data) }
       end
 
       def add_family_member(employee_id, data)
-        @client.employee.add_table_row(employee_id, 'customFamilyMember', data)
+        retry_on_error { @client.employee.add_table_row(employee_id, 'customFamilyMember', data) }
       end
 
       def add_additional_data(employee_id, data)
-        @client.employee.add_table_row(employee_id, 'customAdditionalInformation1', data)
+        retry_on_error { @client.employee.add_table_row(employee_id, 'customAdditionalInformation1', data) }
       end
 
       def additional_data(employee_id)
-        @client.employee.table_data(employee_id, 'employmentStatus')
+        retry_on_error { @client.employee.table_data(employee_id, 'employmentStatus') }
       end
 
       def currency_conversion(employee_id)
-        @client.employee.table_data(employee_id, 'customCurrencyConversion')
+        retry_on_error { @client.employee.table_data(employee_id, 'customCurrencyConversion') }
       end
 
       def add_bonus(team_member_id, comment)
@@ -354,7 +357,7 @@ module PeopleGroup
           customBonuscomments: comment
           # customNominatedBy: 'TODO'
         }
-        @client.employee.add_table_row(team_member_id, 'customBonus', data)
+        retry_on_error { @client.employee.add_table_row(team_member_id, 'customBonus', data) }
       end
 
       def add_rating_details(team_member_id, performance, potential)
@@ -363,17 +366,21 @@ module PeopleGroup
           customPerformanceFactor: performance,
           customPotentialFactor: potential
         }
-        @client.employee.add_table_row(team_member_id, 'customPerformanceandPotentialTable', data)
+        retry_on_error { @client.employee.add_table_row(team_member_id, 'customPerformanceandPotentialTable', data) }
       end
 
       private
 
       def meta_fields
-        @meta_fields ||= @client.meta.lists
+        @meta_fields ||= retry_on_error { @client.meta.lists }
       end
 
       def files(employee_id)
-        @files ||= @client.employee.files(employee_id)
+        @files ||= retry_on_error { @client.employee.files(employee_id) }
+      end
+
+      def retry_on_error(&block)
+        Utils.retry_on_error(errors: [Net::ReadTimeout, Bamboozled::GatewayError], delay: 3, &block)
       end
     end
   end

data/lib/peoplegroup/connectors/gitlab.rb

@@ -165,7 +165,7 @@ module PeopleGroup
       private
 
       def retry_on_error(&block)
-        Utils.retry_on_error(errors: [Gitlab::Error::InternalServerError], &block)
+        Utils.retry_on_error(errors: [Gitlab::Error::InternalServerError], delay: 3, &block)
       end
 
       def find_epic(group_id, title)

data/lib/peoplegroup/connectors/version.rb

@@ -2,6 +2,6 @@
 
 module PeopleGroup
   module Connectors
-    VERSION = '0.1.66'
+    VERSION = '0.1.67'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peoplegroup-connectors
 version: !ruby/object:Gem::Version
-  version: 0.1.66
+  version: 0.1.67
 platform: ruby
 authors:
 - lien van den steen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-20 00:00:00.000000000 Z
+date: 2021-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab