peoplegroup-connectors 0.1.35 → 0.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a25f593d76b85e7532fb74e0632837615afd293b5c71a8b15c8aba8c4d5aa62d
-  data.tar.gz: b3c761fab0a3a61a323b0d955fe9bdf07d74ac8588efa1ff52633f2f204c2689
+  metadata.gz: ecf7d0f6b87ac0685639d2e21cffdb23638a57ee038dca05df2e470cc7247a88
+  data.tar.gz: ca6fee41f611867d0ad89743b88e5cec2cc88f7ed1b84f8b9f95e9e3efcef358
 SHA512:
-  metadata.gz: 6aa52434151d5f2b944eeb138e5c2c8686d8b11e22b7bf28b532df5b0ea1b85493e52e589b4036795ea5f93805d9fcba0d6000f739e669d024217e2d68c5c80e
-  data.tar.gz: 29dc6122c7f7c8c5bc48a9cc1f3aa79565b46b98f0d2139b3709e69ab037ab54a5dba648b626bf08d484eb3ccbaff476942d6b63d7d702f6e46cf179699436ff
+  metadata.gz: 1f654feae15f573b77c9a7148029c8102731f761128d810193adb8019b3ee25d295c9a157fc0c249355009c55677a4d6c91cebf327db15c60f49dd9c4a5ea008
+  data.tar.gz: b7b4ca73c61a45540c341b73a616c79526d94a573e82328867e389aa6fd6dc86f65539be7d9deff7f14baca5903604d84f9496cdbcdc9a8a17855e8d7438c24d

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
@@ -79,20 +78,20 @@ module PeopleGroup
       end
 
       def fields
-        @fields ||= (Bamboozled::API::FieldCollection.all_names + @client.meta.fields.map { |f| f['alias'] }).compact.uniq
+        return @fields if @fields
+
+        @fields = (Bamboozled::API::FieldCollection.all_names + @client.meta.fields.map { |f| f['alias'] }).compact.uniq
+        @fields.delete('fslaCode') # temp fix for problems with BambooHR
+        @fields
       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
 
@@ -200,6 +199,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.35'
+    VERSION = '0.1.40'
   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.35
+  version: 0.1.40
 platform: ruby
 authors:
 - lien van den steen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-15 00:00:00.000000000 Z
+date: 2021-04-30 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