peoplegroup-connectors 0.1.34 → 0.1.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b10c3d12519bd5dd49e0a002677ed9c5972c9b5d13a378421043c1140977411
-  data.tar.gz: 14b399de4dba169b28feaf7f2a64f7a71eea215c690549c903337876d29c7c4f
+  metadata.gz: 78e46db0bb05337e7bf2601f9f4aa8da6a7da6aa103f36accf7f75b8d89fd15a
+  data.tar.gz: 0541db53cbaee3f61fa1a10bb0ef505c89e1649392651b11d591281aa27669e8
 SHA512:
-  metadata.gz: a7896627f7124a8fd6dcee9722e061e4dfc555445f2f6764b847ea81b155aa837c4024f4720c25f6d293fd253526dc9244574b4226b371fce001034fbc2b2e5d
-  data.tar.gz: 6b07b93367fdf2a1841e171ba09d4f993bcb665e0b6362426d13fcb6fbcf1025061feb6a258adcf927103c96d95f1c2c1f8489856f206438d6bb38076d77d0ae
+  metadata.gz: 71e38044fea71f113ccbd2f03a0f7590c9510d6e2074f5f67a55b6410649e761965216a5e7b57e636d64f44e6c4aaf96eaff598c545ad3c8c830e196f0d2e19b
+  data.tar.gz: 5cd5cd8d46ec9d36287da5d2a5efd8625623df45fcbc3020ec7cb060db0a7cc0b99bc7769464a67095b344137744b5d8884099ee6b6482bf80da12d41e847184

data/lib/peoplegroup/connectors.rb

@@ -2,10 +2,12 @@
 
 require_relative 'connectors/version'
 require_relative 'connectors/gitlab'
+require_relative 'connectors/google_sheets'
 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,8 +5,6 @@ require 'bamboozled'
 module PeopleGroup
   module Connectors
     class Bamboo
-      MAX_RETRIES = 3
-
       def initialize(use_report: false)
         @use_report = use_report
         @client = Bamboozled.client(subdomain: 'gitlab', api_key: ENV['BAMBOO_API_KEY'])
@@ -29,7 +27,8 @@ module PeopleGroup
             "#{emp['firstName']&.downcase} #{emp['lastName']&.downcase}",
             "#{emp['preferredName']&.downcase} #{emp['lastName']&.downcase}",
             "#{emp['firstName']&.downcase} #{emp['customPreferredLastName']&.downcase}",
-            "#{emp['preferredName']&.downcase} #{emp['customPreferredLastName']&.downcase}"
+            "#{emp['preferredName']&.downcase} #{emp['customPreferredLastName']&.downcase}",
+            emp['fullName5']&.downcase # this is firstName middleName lastName
           ].include?(name.downcase)
         end
       end
@@ -53,6 +52,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
@@ -78,16 +82,12 @@ module PeopleGroup
       end
 
       def employees
-        retries = 0
-
-        begin
+        Utils.retry_on_error(errors: [Net::ReadTimeout, Bamboozled::GatewayError]) do
           if @use_report
-            @employees ||= @client.report.find(@use_report, 'JSON', true)
+            @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
       end
 
@@ -195,6 +195,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/google_sheets.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'google_drive'
+
+module PeopleGroup
+  module Connectors
+    class GoogleSheets
+      def spreadsheet(title)
+        retry_on_error { session.spreadsheet_by_title(title) }
+      end
+
+      def worksheet(spreadsheet_title, worksheet_title)
+        worksheets = retry_on_error { spreadsheet(spreadsheet_title).worksheets }
+        worksheets.find { |worksheet| worksheet.title == worksheet_title }
+      end
+
+      private
+
+      def service_account_key
+        StringIO.new(Base64.strict_decode64(ENV['GOOGLE_DRIVE_SERVICE_ACCOUNT_KEY']))
+      end
+
+      def session
+        @session ||= retry_on_error { GoogleDrive::Session.from_service_account_key(service_account_key) }
+      end
+
+      def retry_on_error(&block)
+        Utils.retry_on_error(errors: [Google::Apis::ServerError], delay: 1, &block)
+      end
+    end
+  end
+end

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/version.rb

@@ -2,6 +2,6 @@
 
 module PeopleGroup
   module Connectors
-    VERSION = '0.1.34'
+    VERSION = '0.1.39'
   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.34
+  version: 0.1.39
 platform: ruby
 authors:
 - lien van den steen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: google_drive
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client
   requirement: !ruby/object:Gem::Requirement
@@ -163,10 +177,12 @@ files:
 - lib/peoplegroup/connectors.rb
 - lib/peoplegroup/connectors/bamboo.rb
 - lib/peoplegroup/connectors/gitlab.rb
+- lib/peoplegroup/connectors/google_sheets.rb
 - lib/peoplegroup/connectors/greenhouse.rb
 - 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