peoplegroup-connectors 0.1.42 → 0.1.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69635f6af5c75821defe1c7268775bb1ef296b86f6997ab84023211455697113
-  data.tar.gz: 493843154a961f0be043a1824368452fda93fa2348b750be30559def0387437a
+  metadata.gz: ab4d070d633d4a4ba0e14f99661249d4ba905c53805bbf0de2d79f73509256b1
+  data.tar.gz: 1d961037f0ef2181d76850de6507803a2274dd631877028a1422621bab4c08b5
 SHA512:
-  metadata.gz: a404cb091f97fe756341e3ba044f8508b0cc571170e6404b5222df121a1baa8743904db256d5d8ed36a6c5781dd07e890c37b76bcc7823eea157617c780bdfda
-  data.tar.gz: 49149ea99d968ec58b782b5076b730d4bc3157b680ac33e097c8091eb3cd296629be50713e8c8ccf48cd4e7d5ec4ea1661da7018cf243ecd5c9fd059361b2b27
+  metadata.gz: 6c3862beed5ca490783a2404ac40af0df8411ae249c05e73a919aaa30eb809dc1253135e657af23a5e45dc79464d279f97decd5eff58ec59215f23924a0781fb
+  data.tar.gz: bfe7f83f6ee1371742139d3dcd36ecc792ad63d4ac3aac876f3cbda8f133465df375b0c3462e4b3e084d9ee81046e210623d02373dcffd06115419390fefb30c

data/lib/peoplegroup/connectors/bamboo.rb

@@ -5,6 +5,8 @@ require 'bamboozled'
 module PeopleGroup
   module Connectors
     class Bamboo
+      EmployeeNotFoundError = Class.new(StandardError)
+
       def initialize(use_report: false)
         @use_report = use_report
         @client = Bamboozled.client(subdomain: 'gitlab', api_key: ENV['BAMBOO_API_KEY'])
@@ -14,10 +16,24 @@ module PeopleGroup
         employees.find { |emp| emp['id'] == id.to_s }
       end
 
+      def get_employee_details!(id)
+        employee_details = get_employee_details(id)
+        raise EmployeeNotFoundError, "No employee found with id #{id}" if employee_details.nil?
+
+        employee_details
+      end
+
       def get_employee(id)
         @client.employee.find(id, %w[firstName lastName jobTitle supervisor hireDate country location department division workEmail customCostCenter])
       end
 
+      def get_employee!(id)
+        employee = get_employee(id)
+        raise EmployeeNotFoundError, "No employee found with id #{id}" if employee.nil?
+
+        employee
+      end
+
       def search_employee(name)
         return if name.empty?
 
@@ -34,11 +50,27 @@ module PeopleGroup
       end
       alias_method :search_team_member, :search_employee
 
+      def search_employee!(name)
+        employee = search_employee(name)
+        raise EmployeeNotFoundError, "No employee found with name #{name}" if employee.nil?
+
+        employee
+      end
+      alias_method :search_team_member!, :search_employee!
+
       def search_employee_by_field(field:, value:)
         employees.find { |employee| employee[field] == value.to_s }
       end
       alias_method :search_team_member_by_field, :search_employee_by_field
 
+      def search_employee_by_field!(field:, value:)
+        employee = search_employee_by_field(field: field, value: value)
+        raise EmployeeNotFoundError, "No employee found with #{field}: #{value}" if employee.nil?
+
+        employee
+      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)
@@ -48,19 +80,47 @@ module PeopleGroup
         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
+
       def fetch_manager(team_member)
         active_team_members.find { |tm| tm['id'] == team_member['supervisorEId'] }
       end
 
+      def fetch_manager!(team_member)
+        manager = fetch_manager(team_member)
+        raise EmployeeNotFoundError, "Manager not found for employee #{team_member['id']}" if manager.nil?
+
+        manager
+      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_manager_for_id!(team_member_id)
+        manager = fetch_manager_for_id(team_member_id)
+        raise EmployeeNotFoundError, "No manager found with id #{team_member_id}" if manager.nil?
+
+        manager
+      end
+
       def fetch_second_level_manager(team_member)
         fetch_manager(fetch_manager(team_member))
       end
 
+      def fetch_second_level_manager!(team_member)
+        manager = fetch_second_level_manager(team_member)
+        raise EmployeeNotFoundError, "No second level manager found for employee #{team_member['id']}" if manager.nil?
+
+        manager
+      end
+
       def create_employee(employee_details_hash)
         @client.employee.add(employee_details_hash)
       end
@@ -78,7 +138,11 @@ 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('flsaCode') # temp fix for problems with BambooHR
+        @fields
       end
 
       def employees
@@ -130,6 +194,14 @@ module PeopleGroup
         @client.employee.table_data(employee_id, 'employmentStatus')
       end
 
+      def time_off_types
+        @time_off_types ||= @client.meta.time_off_types
+      end
+
+      def time_off_type(name)
+        time_off_types['timeOffTypes'].find { |type| type['name'] == name }
+      end
+
       def job_details(employee_id)
         @client.employee.table_data(employee_id, 'jobInfo')
       end

data/lib/peoplegroup/connectors/google_sheets.rb

@@ -25,7 +25,7 @@ module PeopleGroup
       end
 
       def retry_on_error(&block)
-        Utils.retry_on_error(errors: [Google::Apis::ServerError], delay: 1, &block)
+        Utils.retry_on_error(errors: [Google::Apis::ServerError], delay: 3, max_attempts: 4, &block)
       end
     end
   end

data/lib/peoplegroup/connectors/version.rb

@@ -2,6 +2,6 @@
 
 module PeopleGroup
   module Connectors
-    VERSION = '0.1.42'
+    VERSION = '0.1.47'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peoplegroup-connectors
 version: !ruby/object:Gem::Version
-  version: 0.1.42
+  version: 0.1.47
 platform: ruby
 authors:
 - lien van den steen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -28,16 +28,16 @@ dependencies:
   name: google_drive
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client
   requirement: !ruby/object:Gem::Requirement