peoplegroup-connectors 0.1.92 → 0.1.95

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7789daf921b2d71118e041de7294ef10b4ca6258704ff643f7043cb7424b79d8
-  data.tar.gz: 38c896e3f2ea63b97b12f6d0e79654ca0d08703ec9d26cf2588520b1f3892e07
+  metadata.gz: a0be7c675b0111f44ac068ea7760213db4a1185f274ee5ce7013cb7d2523c9da
+  data.tar.gz: 9f476d18190ea653d7ea95fc94ca2ab09a694825e08d6d0bd754d9fdcd065e9d
 SHA512:
-  metadata.gz: bad2a3a1604e0f69ccf38e78b9e8f6564f1b52630bdb694d617958c0a5e275e96c388c6554c12060543019e0c3edba4c27ea5ade63aa55f0698d5372f326c813
-  data.tar.gz: eb1a527c6b32770812360d45fb3b6f121999f32ea57339cd4b70cd77ebd7aae08fe2a2f0ff192d6871fdb93f6e66a49210852e06419145e7e0949dc3c43daf27
+  metadata.gz: 919075595ea9748646157b40c678d460f33ce644281766815366f8f4917299afcb783cfd037ab9a8901bf3e61cf4c3ad555d6d53c7542cb1b6ad8de2aad92c98
+  data.tar.gz: 46eb40d8499e675bced2e0b84a71a93c849174fc81d9a328cb36a6df668af561a3794864f9d3410bc85e8bad102f873a0f2523ebfcff4ab49eab0acc13982ea0

data/lib/peoplegroup/connectors/bamboo.rb

@@ -67,22 +67,15 @@ module PeopleGroup
       def search_team_member_by_email(email)
         team_members.find { |team_member| team_member['workEmail']&.downcase == email&.downcase }
       end
+      alias_method :slack_email_lookup_with_fallback, :search_team_member_by_email
 
-      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
+      def search_team_member_by_email!(email)
+        team_member = search_team_member_by_email(email)
+        raise EmployeeNotFoundError, "No team member found with email #{email}." unless team_member
 
-        employees.find { |employee| employee['workEmail'] == email }
-      end
-
-      def slack_email_lookup_with_fallback!(email)
-        employee = slack_email_lookup_with_fallback(email)
-        raise EmployeeNotFoundError, "No employee found with Slack email #{email}" if employee.nil?
-
-        employee
+        team_member
       end
+      alias_method :slack_email_lookup_with_fallback!, :search_team_member_by_email!
 
       def team_members_by_department(department)
         active_and_current_team_members.select { |team_member| team_member['department'] == department }

data/lib/peoplegroup/connectors/slack.rb

@@ -12,22 +12,13 @@ module PeopleGroup
         @client = ::Slack::Web::Client.new
       end
 
-      def find_user(email)
-        @client.users_lookupByEmail(email: email)
-      rescue ::Slack::Web::Api::Errors::SlackError
-        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
-
+      def bamboo_email_lookup(email)
         @client.users_lookupByEmail(email: email)
       rescue ::Slack::Web::Api::Errors::SlackError
         nil
       end
+      alias_method :bamboo_email_lookup_with_fallback, :bamboo_email_lookup
+      alias_method :find_user, :bamboo_email_lookup
 
       def find_user_by_id(id)
         @client.users_info(user: id)

data/lib/peoplegroup/connectors/version.rb

@@ -2,6 +2,6 @@
 
 module PeopleGroup
   module Connectors
-    VERSION = '0.1.92'
+    VERSION = '0.1.95'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peoplegroup-connectors
 version: !ruby/object:Gem::Version
-  version: 0.1.92
+  version: 0.1.95
 platform: ruby
 authors:
 - lien van den steen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-28 00:00:00.000000000 Z
+date: 2022-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -229,7 +229,6 @@ 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

data/data/email_mapper.yml

@@ -1,6 +0,0 @@
-- slack_email: cristiano
-  bamboo_email: ccasella
-- slack_email: mjacob
-  bamboo_email: mgomez
-- slack_email: nprecilla
-  bamboo_email: ngarcia