peoplegroup-connectors 0.1.11 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2193145f0bfa0c5e69c282db2c6d3c6d61c98c5ddf97f6a5adf50e9d3041c932
-  data.tar.gz: 06c04625b87ce7653df20a404a7bd8dd0c696516f6aa24523542985ad06373b5
+  metadata.gz: c6b338dc99a406f2007bc308ec4229a0c8381ef512a63a065cbc3fb299a97669
+  data.tar.gz: 8468e08cc2778c73e9e25bbd789c121f7182146b7009299e5b4babc57b11f548
 SHA512:
-  metadata.gz: 237ba92529a93da4c53b20ec134545f7873b8d677c7a33d36ab009b9e21b49316de6e51a27cac18f408619db59d4b006037cbeced4ec8aad229c1b4ba5f695f4
-  data.tar.gz: fc4b1ef1b8dd1271ea1c61fd164f673a444fe8dc27966925d9f320cc09e06b521316bdaba26d8d5dc557b02555ea46f1535fef985350f82ff474ec1b85cdc76b
+  metadata.gz: 2b387d93f8ef6c8795c6fe377a4bbed6ac2ed736ea33baef3b55b733e6269a04f229ed09631e7ff09f1fc7145899b95f0e3ae8044df1ed16fe35b2c8f7d7f03d
+  data.tar.gz: 57c5a6aa49a3aae672ad1eb41edd0941de328da77c309ac5ebe4e4859a434dbafa3e10a3e6f90b9eb8ce43ed7311e1accab3cc99fb21ff36d7fe66a1675c8776

data/lib/peoplegroup/connectors/bamboo.rb

@@ -37,6 +37,7 @@ module PeopleGroup
       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 fetch_manager(team_member)
         active_team_members.find { |tm| tm['id'] == team_member['supervisorEId'] }
@@ -71,7 +72,7 @@ module PeopleGroup
 
         begin
           @employees ||= @client.report.custom(fields, 'JSON').reject { |employee| employee['lastName'] == 'Test-Gitlab' }
-        rescue Net::ReadTimeout
+        rescue Net::ReadTimeout, Bamboozled::GatewayError
           retry if (retries += 1) < MAX_RETRIES
         end
       end
@@ -81,6 +82,18 @@ module PeopleGroup
       end
       alias_method :active_team_members, :active_employees
 
+      def active_and_current_employees
+        today = Date.current
+        employees.select do |employee|
+          employee['status'] == 'Active' && Date.parse(employee['hireDate']) <= today
+        end
+      end
+      alias_method :active_and_current_team_members, :active_and_current_employees
+
+      def direct_reports(id)
+        active_team_members.select { |team_member| team_member['supervisorEId'] == id.to_s }
+      end
+
       def add_stock_options(employee_id, data)
         @client.employee.add_table_row(employee_id, 'customEquity', data)
       end

data/lib/peoplegroup/connectors/gitlab.rb

@@ -51,7 +51,7 @@ module PeopleGroup
         new_files.each do |file|
           actions << {
             action: 'create',
-            file_path: file.sub('tmp', '/data/team_members'),
+            file_path: file.sub('tmp', '/data/team_members/person'),
             content: File.read(file)
           }
         end
@@ -78,7 +78,7 @@ module PeopleGroup
           action = {
             action: 'update',
             file_path: file[:file_path],
-            content: file[:file_with_change]
+            content: File.read(file[:tmp_file_path])
           }
           actions << action
         end

data/lib/peoplegroup/connectors/slack.rb

@@ -18,6 +18,12 @@ module PeopleGroup
         nil
       end
 
+      def find_user_by_id(id)
+        @client.users_info(user: id)
+      rescue ::Slack::Web::Api::Errors::SlackError
+        nil
+      end
+
       def list_public_channels
         channels = @client.channels_list(exclude_archived: true).channels
         channels.reject(&:is_private)&.map(:name)

data/lib/peoplegroup/connectors/version.rb

@@ -2,6 +2,6 @@
 
 module PeopleGroup
   module Connectors
-    VERSION = '0.1.11'
+    VERSION = '0.1.17'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peoplegroup-connectors
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.17
 platform: ruby
 authors:
 - lien van den steen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab