peoplegroup-connectors 0.1.31 → 0.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f8e9b381041269a553b63f9c64fc86de1dedf730ba10191d055b2d30eaeb205
-  data.tar.gz: cd5512eef60b5d2bc05450790ed6181b013ac7f7bacc3c888a4c1c91fb4c5a65
+  metadata.gz: 8611752b4ca5e726cc88207388a89cb90a7ad49cfa57681409b857ee13d59c8e
+  data.tar.gz: adb086e3c860033292caff493bf483967223b11b534828b11db5a9f3ffca7ac0
 SHA512:
-  metadata.gz: 85014b51651109152eff8a1232b13bc653f5d0855bc1408044ffd5f304bbe20768cd861c4683097bd7d9f8d4123a09f52ca5dd84dbf9948dd26f4eaf6522ee0f
-  data.tar.gz: 8324034a0ce7ddd6038a56a0a5b9680a0a64f2cbdf8cece9b72f5bbc8a063743c85940577728bb7b7aca244dd00ff598762d806ba82b65f801da8e140b65ace6
+  metadata.gz: c4e1c9ab9341dc9731695024237f6f2d9f7febc87821926c5205dd345725affcfcc66732787fdf12bf3bcfaddbc01c27ff3409b38a900738980d187771219a66
+  data.tar.gz: b05f29c43918c58229fa3486b2935f0945355b31a925fc55fa1e0f38f10df45321548611ed34f50f715560da04ebd2b2f6ea85ce3a450d275885e66a996dbe3a

data/data/email_mapper.yml

@@ -0,0 +1,4 @@
+- slack_email: cristiano
+  bamboo_email: ccasella
+- slack_email: kencjohnston
+  bamboo_email: kjohnston

data/lib/peoplegroup/connectors/bamboo.rb

@@ -7,7 +7,8 @@ module PeopleGroup
     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
 
@@ -39,10 +40,24 @@ module PeopleGroup
       end
       alias_method :search_team_member_by_field, :search_employee_by_field
 
+      def slack_email_lookup_with_fallback(email)
+        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']}@gitlab.com" if email_hit
+
+        employees.find { |employee| employee['workEmail'] == email }
+      end
+
       def fetch_manager(team_member)
         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
@@ -71,7 +86,11 @@ module PeopleGroup
         retries = 0
 
         begin
-          @employees ||= @client.report.custom(fields, 'JSON').reject { |employee| employee['lastName'] == 'Test-Gitlab' }
+          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
         rescue Net::ReadTimeout, Bamboozled::GatewayError
           retry if (retries += 1) < MAX_RETRIES
         end
@@ -162,6 +181,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,
@@ -173,6 +200,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/slack.rb

@@ -18,6 +18,17 @@ module PeopleGroup
         nil
       end
 
+      def bamboo_email_lookup_with_fallback(email)
+        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']}@gitlab.com" if email_hit
+
+        @client.users_lookupByEmail(email: email)
+      rescue ::Slack::Web::Api::Errors::SlackError
+        nil
+      end
+
       def find_user_by_id(id)
         @client.users_info(user: id)
       rescue ::Slack::Web::Api::Errors::SlackError

data/lib/peoplegroup/connectors/version.rb

@@ -2,6 +2,6 @@
 
 module PeopleGroup
   module Connectors
-    VERSION = '0.1.31'
+    VERSION = '0.1.36'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peoplegroup-connectors
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.1.36
 platform: ruby
 authors:
 - lien van den steen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -159,6 +159,7 @@ extra_rdoc_files: []
 files:
 - LICENSE.txt
 - README.md
+- data/email_mapper.yml
 - lib/peoplegroup/connectors.rb
 - lib/peoplegroup/connectors/bamboo.rb
 - lib/peoplegroup/connectors/gitlab.rb