peoplegroup-connectors 0.1.93 → 0.1.96

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bde60b43474978b4dd611f50d5778fc0467526a025139a2c63123afd247bdca0
-  data.tar.gz: e4a0ba0b45b6d21031d8585037f1c081654abcf3079478e9c9625ae0e93ba1af
+  metadata.gz: 8bf603701e7dc27da76fcc61f2a8a4047133e7933ea58ec0f2549efb1d709afe
+  data.tar.gz: 8e600b62d801d284c831fb69fd55430d9322594b355ce5a65fe1cca335c387ff
 SHA512:
-  metadata.gz: d4a5bd986cfd5cc1414adf0a57e1d458c01c5fe659a3c05981b2301bb8e57b6cdf7a7819d7e01aca873f0ecc91646d6dc8ecf0031327a80ddb58599572eed895
-  data.tar.gz: 2b3921dcec32efafe5815f841aaa195b01c65cf46f3764033cf66e8bd51471c89cb036e83e6192368919304e8e28614bdabe1cb94b0539a93194a4afb33d9581
+  metadata.gz: abd0763536f8eeeb9769e8ee5c2996e27ea459194613ab3e8bb6db249feb9620fc0a283f01e791adb9ecb04638775dd75ff33a37fbc7a957dfd38dff5d449a76
+  data.tar.gz: 07d010c5b8c01fbcfa8e2bc84e741280034974ce4e7499027f488c2af4ea0b190bfbffe55a61073a6db3a673d24a5a23c41a4209ed4cac708821c732fe74e174

data/lib/peoplegroup/connectors/bamboo.rb

@@ -67,6 +67,7 @@ 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 search_team_member_by_email!(email)
         team_member = search_team_member_by_email(email)
@@ -74,22 +75,7 @@ module PeopleGroup
 
         team_member
       end
-
-      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 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
-      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)
@@ -41,33 +32,62 @@ module PeopleGroup
         nil
       end
 
+      # https://www.rubydoc.info/gems/slack-ruby-client/0.17.0/Slack%2FWeb%2FApi%2FEndpoints%2FConversations:conversations_list
+      # Defaults to only show public channels.
       def list_public_channels
-        channels = @client.channels_list(exclude_archived: true).channels
-        channels.reject(&:is_private)&.map(:name)
+        response = @client.conversations_list(exclude_archived: true)
+        response['channels'].map { |channel| channel['name'] }
       end
 
+      # https://www.rubydoc.info/gems/slack-ruby-client/0.17.0/Slack%2FWeb%2FApi%2FEndpoints%2FChat:chat_getPermalink
       def link_for_message(channel:, timestamp:)
         @client.chat_getPermalink(channel: channel, message_ts: timestamp)
       end
 
+      # https://www.rubydoc.info/gems/slack-ruby-client/0.17.0/Slack%2FWeb%2FApi%2FEndpoints%2FChat:chat_postMessage
       def send_message(channel:, text: '', as_user: true, attachments: [], thread_ts: nil, reply_broadcast: false, formatted_message: [])
-        @client.chat_postMessage(channel: channel, text: text, as_user: true, attachments: attachments, unfurl_links: false, thread_ts: thread_ts, reply_broadcast: reply_broadcast, blocks: formatted_message)
+        options = {
+          channel: channel,
+          text: text,
+          as_user: true,
+          attachments: attachments,
+          unfurl_links: false,
+          thread_ts: thread_ts,
+          reply_broadcast: reply_broadcast,
+          blocks: formatted_message
+        }
+
+        @client.chat_postMessage(options)
       end
 
+      # https://www.rubydoc.info/gems/slack-ruby-client/0.17.0/Slack%2FWeb%2FApi%2FEndpoints%2FChat:chat_update
       def update_message(channel:, timestamp:, text: '', attachments: [], formatted_message: [])
-        @client.chat_update(channel: channel, text: text, ts: timestamp, as_user: true, attachments: attachments, blocks: formatted_message)
+        options = {
+          channel: channel,
+          text: text,
+          ts: timestamp,
+          as_user: true,
+          attachments: attachments,
+          blocks: formatted_message
+        }
+
+        @client.chat_update(options)
       end
 
+      # https://www.rubydoc.info/gems/slack-ruby-client/0.17.0/Slack%2FWeb%2FApi%2FEndpoints%2FViews:views_open
       def send_modal_message(trigger:, view:)
         @client.views_open(trigger_id: trigger, view: view)
       end
 
+      # https://www.rubydoc.info/gems/slack-ruby-client/0.17.0/Slack%2FWeb%2FApi%2FEndpoints%2FViews:views_publish
       def publish_view(user_id:, trigger:, view:)
         @client.views_publish(user_id: user_id, trigger_id: trigger, view: view)
       end
 
+      # https://www.rubydoc.info/gems/slack-ruby-client/0.17.0/Slack%2FWeb%2FApi%2FEndpoints%2FConversations:conversations_history
       def get_message(channel:, timestamp:)
-        @client.conversations_history(channel: channel, latest: timestamp, limit: 1, inclusive: true)&.messages&.first
+        options = { channel: channel, latest: timestamp, limit: 1, inclusive: true }
+        @client.conversations_history(options)&.messages&.first
       end
     end
   end

data/lib/peoplegroup/connectors/version.rb

@@ -2,6 +2,6 @@
 
 module PeopleGroup
   module Connectors
-    VERSION = '0.1.93'
+    VERSION = '0.1.96'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peoplegroup-connectors
 version: !ruby/object:Gem::Version
-  version: 0.1.93
+  version: 0.1.96
 platform: ruby
 authors:
 - lien van den steen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-28 00:00:00.000000000 Z
+date: 2022-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: splinter-pto
   requirement: !ruby/object:Gem::Requirement
@@ -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