peoplegroup-connectors 0.1.86 → 0.1.89

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73f889f6a68e3ad859452624ccec8792ab93a1972b632c5e0f81f721737c656f
-  data.tar.gz: 45c9b05d96a379d0b830e0ff6bcfd8ee3e2668f4ad50b08bc815841b59e0e4b9
+  metadata.gz: 6c4414683f3b6d3b3e9566ba33df66018642cf551ec836e27c00b78b4dee16ee
+  data.tar.gz: 27be0aff4e7d971faaece5e7a984158bd91731037b1614596f98f42ab634b425
 SHA512:
-  metadata.gz: c9b4d31f5250b62a9e03491bdb0f944348c6bc1a85438722505b9f378956ae00065b297fc63cd713feaa98c9749ca47d696c54796bdb439e743f5058fb43e9e8
-  data.tar.gz: 8a7134d07c3a665c15f8647f4d69fa38d3c812d5baf4ddaee044f8e238e765aefad7a383a9a019bd23a1c2d2d7a7f895bb6d4e99686fc9d5d22c553216830da3
+  metadata.gz: 3bf61018687ad168f08695cf6e971b647735438488d5b8fbbc6a2e6fa69b9763bb1484dfe464b944d9db98b6adb19b0898a78e1cf9872877ae43fd706ba947eb
+  data.tar.gz: 48a97e0dfe60996cf5bcd1fd543c36c9a3429079541d10353031151143d3c0fea0d61584da9e6f2cc8b1213ab0700ed9332df6d4ebf71c95db10f3026edf7a59

data/lib/peoplegroup/connectors/bamboo.rb

@@ -26,19 +26,6 @@ module PeopleGroup
         employee_details
       end
 
-      def get_employee(id)
-        retry_on_error do
-          @client.employee.find(id, %w[firstName lastName jobTitle supervisor hireDate country location department division workEmail customCostCenter])
-        end
-      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?
 
@@ -101,24 +88,12 @@ module PeopleGroup
       end
 
       def fetch_manager(team_member)
-        active_team_members.find { |tm| tm['id'] == team_member['supervisorEId'] }
+        active_team_members.find { |tm| tm['employeeNumber'] == team_member['supervisorId'] }
       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?
+        raise EmployeeNotFoundError, "Manager not found for employee #{team_member['employeeNumber']}" if manager.nil?
 
         manager
       end
@@ -129,7 +104,7 @@ module PeopleGroup
 
       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?
+        raise EmployeeNotFoundError, "No second level manager found for employee #{team_member['employeeNumber']}" if manager.nil?
 
         manager
       end
@@ -349,7 +324,8 @@ module PeopleGroup
         retry_on_error { @client.employee.table_data(employee_id, 'customCurrencyConversion') }
       end
 
-      def add_bonus(team_member_id, comment)
+      def add_bonus(employee_number, comment)
+        team_member = search_employee_by_field(field: 'employeeNumber', value: employee_number)
         data = {
           customBonusdate: Date.today.to_s,
           customBonusamount: { value: 1_000, currency: 'USD' },
@@ -357,7 +333,7 @@ module PeopleGroup
           customBonuscomments: comment
           # customNominatedBy: 'TODO'
         }
-        retry_on_error { @client.employee.add_table_row(team_member_id, 'customBonus', data) }
+        retry_on_error { @client.employee.add_table_row(team_member['id'], 'customBonus', data) }
       end
 
       def add_rating_details(team_member_id, performance, potential)

data/lib/peoplegroup/connectors/gitlab.rb

@@ -55,6 +55,11 @@ module PeopleGroup
         retry_on_error { @client.remove_group_member(group_id, user_id) }
       end
 
+      def group_member_ids(group_id)
+        members = retry_on_error { @client.group_members(group_id) }
+        members.map { |member| member[:id] }
+      end
+
       def create_issue(project, title, options = {})
         retry_on_error { @client.create_issue(project, title, options) }
       end
@@ -91,11 +96,12 @@ module PeopleGroup
         epic = find_epic(group_id, title)
         reopen_epic(epic) if epic && epic.state == 'closed'
         options[:confidential] = true
-        epic || retry_on_error { @client.create_epic(group_id, title, options) }
+        epic || create_epic(group_id, title, options)
       end
 
-      def commit_new_files_to_new_merge_request(project_id, branch_name, new_files, commit_message, description = nil, target_branch: 'master')
-        retry_on_error { @client.create_branch(project_id, branch_name, target_branch) }
+      def commit_new_files_to_new_merge_request(project_id, branch_name, new_files, commit_message, description = nil, target_branch: 'master', assign_group: nil)
+        create_branch(project_id, branch_name, target_branch)
+
         actions = []
         new_files.each do |file|
           actions << {
@@ -105,45 +111,58 @@ module PeopleGroup
           }
         end
 
-        retry_on_error { @client.create_commit(project_id, branch_name, commit_message, actions) }
+        create_commit(project_id, branch_name, commit_message, actions)
+
+        options = {
+          source_branch: branch_name,
+          target_branch: target_branch,
+          remove_source_branch: true
+        }
 
-        options = { source_branch: branch_name, target_branch: target_branch, remove_source_branch: true }
         options[:description] = description if description
-        retry_on_error { @client.create_merge_request(project_id, commit_message, options) }
+        options[:assignee_ids] = group_member_ids(assign_group) if assign_group
+
+        create_merge_request(project_id, commit_message, options)
       end
 
-      def commit_change_to_new_merge_request_v2(project_id, branch_name, commit_message, description = nil, files_to_delete = [], files_to_update = [], target_branch: 'master')
+      def commit_change_to_new_merge_request_v2(project_id, branch_name, commit_message, description = nil, files_to_delete = [], files_to_update = [], target_branch: 'master', assign_group: nil)
         actions = []
 
         files_to_delete.each do |file|
-          action = {
+          actions << {
             action: 'delete',
             file_path: file
           }
-          actions << action
         end
 
         files_to_update.each do |file|
-          action = {
+          actions << {
             action: 'update',
             file_path: file[:file_path],
             content: File.read(file[:tmp_file_path])
           }
-          actions << action
         end
 
         return unless actions.any?
 
-        retry_on_error { @client.create_branch(project_id, branch_name, target_branch) }
-        retry_on_error { @client.create_commit(project_id, branch_name, commit_message, actions) }
+        create_branch(project_id, branch_name, target_branch)
+        create_commit(project_id, branch_name, commit_message, actions)
+
+        options = {
+          source_branch: branch_name,
+          target_branch: target_branch,
+          remove_source_branch: true
+        }
 
-        options = { source_branch: branch_name, target_branch: target_branch, remove_source_branch: true }
         options[:description] = description if description
-        retry_on_error { @client.create_merge_request(project_id, commit_message, options) }
+        options[:assignee_ids] = group_member_ids(assign_group) if assign_group
+
+        create_merge_request(project_id, commit_message, options)
       end
 
-      def commit_change_to_new_merge_request(project_id, branch_name, file_path, file_with_change, commit_message, description = nil, target_branch: 'master')
-        retry_on_error { @client.create_branch(project_id, branch_name, target_branch) }
+      def commit_change_to_new_merge_request(project_id, branch_name, file_path, file_with_change, commit_message, description = nil, target_branch: 'master', assign_group: nil)
+        create_branch(project_id, branch_name, target_branch)
+
         actions = [
           {
             action: 'update',
@@ -151,11 +170,23 @@ module PeopleGroup
             content: file_with_change
           }
         ]
-        retry_on_error { @client.create_commit(project_id, branch_name, commit_message, actions) }
 
-        options = { source_branch: branch_name, target_branch: target_branch, remove_source_branch: true }
+        create_commit(project_id, branch_name, commit_message, actions)
+
+        options = {
+          source_branch: branch_name,
+          target_branch: target_branch,
+          remove_source_branch: true
+        }
+
         options[:description] = description if description
-        retry_on_error { @client.create_merge_request(project_id, commit_message, options) }
+        options[:assignee_ids] = group_member_ids(assign_group) if assign_group
+
+        create_merge_request(project_id, commit_message, options)
+      end
+
+      def create_epic(group_id, title, options)
+        retry_on_error { @client.create_epic(group_id, title, options) }
       end
 
       def create_epic_note(group_id, epic_id, text)
@@ -188,7 +219,7 @@ module PeopleGroup
         epics.first
       end
 
-      def create_branch(project_id, branch_name, target_branch: 'master')
+      def create_branch(project_id, branch_name, target_branch = 'master')
         retry_on_error { @client.create_branch(project_id, branch_name, target_branch) }
       end
 
@@ -197,7 +228,7 @@ module PeopleGroup
       end
 
       def create_commit(project_id, branch, commit_message, actions)
-        retry_on_error { @client.create_commit(project_id, branch, commit_message, actions, {}) }
+        retry_on_error { @client.create_commit(project_id, branch, commit_message, actions) }
       end
 
       def reopen_epic(epic)

data/lib/peoplegroup/connectors/hris.rb

@@ -26,17 +26,6 @@ module PeopleGroup
         employee_details
       end
 
-      def get_employee(id)
-        format_worker(@workday.get_worker(id))
-      end
-
-      def get_employee!(id)
-        employee = get_employee(id)
-        raise EmployeeNotFoundError, "No employee found with id #{id}" if employee.nil?
-
-        employee
-      end
-
       private
 
       # Convert Workday worker to BambooHR employee

data/lib/peoplegroup/connectors/version.rb

@@ -2,6 +2,6 @@
 
 module PeopleGroup
   module Connectors
-    VERSION = '0.1.86'
+    VERSION = '0.1.89'
   end
 end

data/lib/peoplegroup/connectors.rb

@@ -1,15 +1,8 @@
 # frozen_string_literal: true
 
-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 'connectors/workday'
-require_relative 'connectors/hris'
-require_relative 'utils'
+require 'require_all'
+require_rel 'utils'
+require_rel 'connectors'
 
 module PeopleGroup
   module Connectors

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peoplegroup-connectors
 version: !ruby/object:Gem::Version
-  version: 0.1.86
+  version: 0.1.89
 platform: ruby
 authors:
 - lien van den steen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.1
+- !ruby/object:Gem::Dependency
+  name: require_all
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +142,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.91.1
+        version: '0.91'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.91.1
+        version: '0.91'
 - !ruby/object:Gem::Dependency
   name: gitlab-styles
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.6'
 - !ruby/object:Gem::Dependency
   name: rubocop-packaging
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +184,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.39'
+        version: '1.44'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.44'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.39'
+        version: '2.7'
 description: Avoid repeating methods in different projects for our connectos.
 email:
 - lvandensteen@gitlab.com
@@ -206,7 +234,7 @@ metadata:
   homepage_uri: https://gitlab.com/gitlab-com/people-group/peopleops-eng/connectors-gem
   source_code_uri: https://gitlab.com/gitlab-com/people-group/peopleops-eng/connectors-gem
   changelog_uri: https://gitlab.com/gitlab-com/people-group/peopleops-eng/connectors-gem
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -214,15 +242,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Library for our shared connectors.
 test_files: []