peoplegroup-connectors 0.1.32 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24fc0303d37aaf2d6aa63b3babcf36ff18b086e084de6ac323440428c53926d4
-  data.tar.gz: 7974b2b210a74ab0236eb23cac227eb788332ddf0412609437139d0dc4a04ac4
+  metadata.gz: 5ee402cbc096def361f487eda8ef9992ff459ab63a606f0ad94d4735d41bc365
+  data.tar.gz: a79c17d291849c27a2996da26c814dbf70e7ad1c27a2782ba502492407010c1a
 SHA512:
-  metadata.gz: a26c436c53c04da6889f179cad06c13f6a1b7d3f9fa6e12cfbfa2436d6df8e24311b3eebeabbaae5bb8cd2cc289b009635b64c0d581c212b5d3a518a4ce1ad5c
-  data.tar.gz: 80eb3e35a56dae8b36a4c50a05b6f052275f135435b2ca0821a9e275ddcce7941bfbb520a56652e9f035e5071f7e13e0a616d2e59e20d0930731b550110318ee
+  metadata.gz: 18b42324f2bb9db2c8e158df26d8ca5b35efa869fc3358afd4c94a44dd810487cb0138a80b7c977b274c43e4a3e86c9a15301528b2b465c8a1fd9e245fdde53a
+  data.tar.gz: 68c8545dbb12e870978a589872fdabcd2ff5fa9ea93e1dcd7c3fe90a3f758bd5cdf7b78edfee2ab9d57292a8a903eea6495974d5559e7c4b59e56cdc70d31778

data/lib/peoplegroup/connectors.rb

@@ -6,6 +6,7 @@ require_relative 'connectors/slack'
 require_relative 'connectors/pto_roots'
 require_relative 'connectors/bamboo'
 require_relative 'connectors/greenhouse'
+require_relative 'utils'
 
 module PeopleGroup
   module Connectors

data/lib/peoplegroup/connectors/bamboo.rb

@@ -5,9 +5,8 @@ require 'bamboozled'
 module PeopleGroup
   module Connectors
     class Bamboo
-      MAX_RETRIES = 3
-
-      def initialize
+      def initialize(use_report: false)
+        @use_report = use_report
         @client = Bamboozled.client(subdomain: 'gitlab', api_key: ENV['BAMBOO_API_KEY'])
       end
 
@@ -43,7 +42,7 @@ module PeopleGroup
         file_path = File.join(__dir__, '../../../data/email_mapper.yml')
         email_mapper = YAML.load_file(file_path)
         email_hit = email_mapper.find { |mapping| mapping['slack_email'] == email.delete_suffix('@gitlab.com') }
-        email = email_hit['bamboo_email'] if email_hit
+        email = "#{email_hit['bamboo_email']}@gitlab.com" if email_hit
 
         employees.find { |employee| employee['workEmail'] == email }
       end
@@ -52,6 +51,11 @@ module PeopleGroup
         active_team_members.find { |tm| tm['id'] == team_member['supervisorEId'] }
       end
 
+      def fetch_manager_for_id(team_member_id)
+        team_member = get_employee_details(team_member_id)
+        active_team_members.find { |tm| tm['id'] == team_member['supervisorEId'] }
+      end
+
       def fetch_second_level_manager(team_member)
         fetch_manager(fetch_manager(team_member))
       end
@@ -77,12 +81,12 @@ module PeopleGroup
       end
 
       def employees
-        retries = 0
-
-        begin
-          @employees ||= @client.report.custom(fields, 'JSON').reject { |employee| employee['lastName'] == 'Test-Gitlab' }
-        rescue Net::ReadTimeout, Bamboozled::GatewayError
-          retry if (retries += 1) < MAX_RETRIES
+        Utils.retry_on_error(errors: [Net::ReadTimeout, Bamboozled::GatewayError]) do
+          if @use_report
+            @employees ||= @client.report.find(@use_report, 'JSON', true).reject { |employee| employee['lastName'] == 'Test-Gitlab' }
+          else
+            @employees ||= @client.report.custom(fields, 'JSON').reject { |employee| employee['lastName'] == 'Test-Gitlab' }
+          end
         end
       end
 
@@ -171,6 +175,14 @@ module PeopleGroup
         @client.employee.add_table_row(employee_id, 'customAdditionalInformation1', data)
       end
 
+      def additional_data(employee_id)
+        @client.employee.table_data(employee_id, 'employmentStatus')
+      end
+
+      def currency_conversion(employee_id)
+        @client.employee.table_data(employee_id, 'customCurrencyConversion')
+      end
+
       def add_bonus(team_member_id, comment)
         data = {
           customBonusdate: Date.today.to_s,
@@ -182,6 +194,10 @@ module PeopleGroup
         @client.employee.add_table_row(team_member_id, 'customBonus', data)
       end
 
+      def has_direct_reports?(id)
+        active_team_members.any? { |team_member| team_member['supervisorEId'] == id.to_s }
+      end
+
       private
 
       def meta_fields

data/lib/peoplegroup/connectors/gitlab.rb

@@ -7,8 +7,6 @@ module PeopleGroup
     class GitLab
       attr_accessor :client
 
-      MAX_RETRIES = 3
-
       API_URL = ENV['GITLAB_API_V4_URL'] || 'https://gitlab.com/api/v4'
 
       def initialize(token: ENV['GITLAB_API_TOKEN'])
@@ -144,14 +142,8 @@ module PeopleGroup
 
       private
 
-      def retry_on_error
-        retries = 0
-
-        begin
-          yield
-        rescue Gitlab::Error::InternalServerError
-          retry if (retries += 1) < MAX_RETRIES
-        end
+      def retry_on_error(&block)
+        Utils.retry_on_error(errors: [Gitlab::Error::InternalServerError], &block)
       end
 
       def find_epic(group_id, title)

data/lib/peoplegroup/connectors/greenhouse.rb

@@ -19,20 +19,19 @@ module PeopleGroup
       def hired_candidates(updated_since)
         page = 1
         candidates = []
-        retries = 0
+        on_error = -> { p [updated_since, page] }
 
         loop do
-          begin
-            results = @client.candidates(nil, updated_after: updated_since, page: page)
-            break if results.empty?
-
-            results.each do |candidate|
-              candidates << candidate if hired_non_active?(candidate)
-            end
-          rescue GreenhouseIo::Error
-            p [updated_since, page]
-            retry if (retries += 1) < MAX_RETRIES
+          results = Utils.retry_on_error(errors: [GreenhouseIo::Error], on_error: on_error) do
+            @client.candidates(nil, updated_after: updated_since, page: page)
           end
+
+          break if results.empty?
+
+          results.each do |candidate|
+            candidates << candidate if hired_non_active?(candidate)
+          end
+
           page += 1
         end
 

data/lib/peoplegroup/connectors/slack.rb

@@ -22,7 +22,7 @@ module PeopleGroup
         file_path = File.join(__dir__, '../../../data/email_mapper.yml')
         email_mapper = YAML.load_file(file_path)
         email_hit = email_mapper.find { |mapping| mapping['bamboo_email'] == email.delete_suffix('@gitlab.com') }
-        email = email_hit['slack_email'] if email_hit
+        email = "#{email_hit['slack_email']}@gitlab.com" if email_hit
 
         @client.users_lookupByEmail(email: email)
       rescue ::Slack::Web::Api::Errors::SlackError

data/lib/peoplegroup/connectors/version.rb

@@ -2,6 +2,6 @@
 
 module PeopleGroup
   module Connectors
-    VERSION = '0.1.32'
+    VERSION = '0.1.37'
   end
 end

data/lib/peoplegroup/utils.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module PeopleGroup
+  class Utils
+    class << self
+      def retry_on_error(max_attempts: 3, delay: 0, errors: [StandardError], on_error: -> {})
+        attempts = 0
+
+        begin
+          yield
+        rescue *errors => e
+          on_error.call
+          sleep delay
+          retry if (attempts += 1) < max_attempts
+          raise e
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peoplegroup-connectors
 version: !ruby/object:Gem::Version
-  version: 0.1.32
+  version: 0.1.37
 platform: ruby
 authors:
 - lien van den steen
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2021-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -167,6 +167,7 @@ files:
 - lib/peoplegroup/connectors/pto_roots.rb
 - lib/peoplegroup/connectors/slack.rb
 - lib/peoplegroup/connectors/version.rb
+- lib/peoplegroup/utils.rb
 homepage: https://gitlab.com/gitlab-com/people-group/peopleops-eng/connectors-gem
 licenses:
 - MIT
@@ -174,7 +175,7 @@ metadata:
   homepage_uri: https://gitlab.com/gitlab-com/people-group/peopleops-eng/connectors-gem
   source_code_uri: https://gitlab.com/gitlab-com/people-group/peopleops-eng/connectors-gem
   changelog_uri: https://gitlab.com/gitlab-com/people-group/peopleops-eng/connectors-gem
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -190,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Library for our shared connectors.
 test_files: []