peoplegroup-connectors 0.1.65 → 0.1.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 324983963ed713d77a2d17cfe9c1d8f0c6d1f3bc6d20e7893adccd2e604899ba
-  data.tar.gz: f4e29ae74cd6c9433273760535935367f0c39e261f5371fe1ddbb8948afc3b63
+  metadata.gz: 2c2124e4a7739e9027cb585f1af9f7a866d832bb7032c6763c9985607100cbcd
+  data.tar.gz: 70aaa2f83b314015474e2467a1844f1976152c1015639a3a2185eb06bfe5763f
 SHA512:
-  metadata.gz: 45d74ed9e67a22076d99fa72b738f3662405d478844df268e74408a0b16a65c64cce969d409505317ad8a078389065ca59271ae14b37fc220cd52d3f6228d9b7
-  data.tar.gz: 0e48a07eea15697f57dc8169f2d03463aacfb62a2898b6f21c9615f7cba03e8d974371fc6a8e705f0a4098af1a127e9b5f9ef63ec47567060a62c2ffad1a5b38
+  metadata.gz: 2ffff1332bbe0e13d6d7a308a55981ab02f2df55082f34e6ae81687442dd87ac15872becc2523cf95d160e59b140839d9c666e51de39abbb4e876b9119d98c81
+  data.tar.gz: 64444be92c7f2eea535aa72a6060ce68e1edb86ca09f4200661ba34372563d631e27a22ed1c2193782a370b00100b932b7e544f7d74f874f6fddc3e8db1e22d2

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

@@ -47,8 +47,7 @@ module PeopleGroup
         retry_on_error { @client.group_members(group_id, options).auto_paginate }
       end
 
-      def add_group_member(group_id, user_id, access_level_name)
-        access_level = access_levels[access_level_name]
+      def add_group_member(group_id, user_id, access_level)
         retry_on_error { @client.add_group_member(group_id, user_id, access_level) }
       end
 
@@ -64,6 +63,10 @@ module PeopleGroup
         retry_on_error { @client.create_issue_note(project, id, text) }
       end
 
+      def issue_notes(project, id, options = {})
+        retry_on_error { @client.issue_notes(project, id, options) }
+      end
+
       def edit_issue(project, id, options)
         retry_on_error { @client.edit_issue(project, id, options) }
       end
@@ -166,7 +169,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)
@@ -192,19 +195,6 @@ module PeopleGroup
       def reopen_epic(epic)
         retry_on_error { @client.edit_epic(epic.group_id, epic.iid, { state_event: 'reopen' }) }
       end
-
-      # Map access level names to values according to https://docs.gitlab.com/ee/api/members.html#valid-access-levels
-      def access_levels
-        @access_levels ||= {
-          no_access: 0,
-          minimal_access: 5,
-          guest: 10,
-          reporter: 20,
-          developer: 30,
-          maintainer: 40,
-          owner: 50
-        }
-      end
     end
   end
 end

data/lib/peoplegroup/connectors/slack.rb

@@ -65,6 +65,10 @@ module PeopleGroup
       def publish_view(user_id:, trigger:, view:)
         @client.views_publish(user_id: user_id, trigger_id: trigger, view: view)
       end
+
+      def get_message(channel:, timestamp:)
+        @client.conversations_history(channel: channel, latest: timestamp, limit: 1, inclusive: true)&.messages&.first
+      end
     end
   end
 end

data/lib/peoplegroup/connectors/version.rb

@@ -2,6 +2,6 @@
 
 module PeopleGroup
   module Connectors
-    VERSION = '0.1.65'
+    VERSION = '0.1.70'
   end
 end

metadata

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