danger-gitlab_reviewbot 1.1.5 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a87855f2af8575497c523339ced8070408e9e2191bbf1eec2b4cf1ef0e431376
-  data.tar.gz: 5d30b4bde8ad0ce2ccf8e95c5efb75899f1e3acf40cc8e806211da79e518acdd
+  metadata.gz: 41365a9bbcf6f88fbdb8bc3893a304d706443e9a2fdb2c651a9a9b658eaba5b6
+  data.tar.gz: '057559035a78f06554d7986ef7b57c968148f5e943f74dca9420ba81e5b880ea'
 SHA512:
-  metadata.gz: 90895467fe4e12bf949f2bdc38bc72e2885aa0c77ec73cd3b7d47c4cfb0fe07f1f14641e159b47dc64fdbbd17b59d29bb49805794521305d077ae726c1063953
-  data.tar.gz: 39ab6152e3916f0ab1e473c06ca5514608906174bf416a28d3ebe4be8ac249414020effbc57a61375335d5eee864bd122eb0b425fe01ef18bc07e2566a80bd7f
+  metadata.gz: f4273adbaedd45032d35ab4ebe989a92da1765f0e3438da87b3d06638a07507e47e3da220c55735cc7b0b156a75c0f86c44dbb498f56cec26f2e758fc8c0ea05
+  data.tar.gz: 14435237e8c507b4dfa01529d48d4ca84c1a318b566a33f49e520fdfbbd97ad1230edf1424ce9c7acb6c78324c8f80d52584a5340f440e23429d130b28c6d7e9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danger-gitlab_reviewbot (1.1.5)
+    danger-gitlab_reviewbot (1.1.7)
       danger-gitlab
       danger-plugin-api (~> 1.0)
 

data/lib/gitlab_reviewbot/gem_version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitlabReviewbot
-  VERSION = "1.1.5"
+  VERSION = "1.1.10"
 end

data/lib/gitlab_reviewbot/gitlab.rb

@@ -19,12 +19,33 @@ module Gitlab
     end
   end
 
-  class Client < API
+  class ClientHelper
+    def initialize(client)
+      @client = client
+    end
+
+    def users_with_pending_mr_review(project_id)
+      outstanding_mrs = fetch_mrs_requiring_review(project_id)
+      all_assignees = outstanding_mrs.reduce([]) { |acc, mr| acc + mr.assignees - assignees_with_review(project_id, mr.iid, mr.assignees)}
+      assignees_id_map = all_assignees.each_with_object({}) do |a, acc|
+        aid = a["id"]
+        ausername = a["username"]
+        assignee = acc[aid] || User.new(aid, ausername)
+        assignee.review_count += 1
+        acc[aid] = assignee
+      end
+      assignees_id_map.values
+    end
+
+    def fetch_mrs_requiring_review(project_id)
+      @client.merge_requests(project_id, state: "opened", per_page: "100")
+    end
+
     def fetch_users_for_group(group_name)
-      group_id = search_group(group_name)
+      group_id = search_group_with_path(group_name)
       return nil if group_id.nil?
 
-      res = group_members(group_id)
+      res = @client.group_members(group_id, :per_page => 100)
 
       developer_access_level = 30
       res.select { |u| u.state == "active" && u.access_level >= developer_access_level }.map { |u| User.new(u.id, u.username) }
@@ -32,44 +53,28 @@ module Gitlab
 
     def assign_mr_to_users(project_id, mr_iid, users)
       user_ids = users.map(&:id)
-      update_merge_request(project_id, mr_iid, "assignee_ids" => user_ids)
+      @client.update_merge_request(project_id, mr_iid, "assignee_ids" => user_ids)
+
     end
 
     def fetch_author_for_mr(project_id, mr_iid)
-      res = merge_request(project_id, mr_iid)
+      res = @client.merge_request(project_id, mr_iid)
       User.new(res.author.id, res.author.name)
     end
 
-    def fetch_mrs_requiring_review(project_id)
-      merge_requests(project_id, state: "opened", per_page: "100").reject { |mr| mr.merge_status == "can_be_merged" }
-    end
-
     def find_user_with_username(username)
-      users({ username: username }).map { |u| User.new(u.id, u.username) }
-    end
-
-    def users_with_pending_mr_review(project_id)
-      outstanding_mrs = fetch_mrs_requiring_review(project_id)
-      all_assignees = outstanding_mrs.reduce([]) { |acc, mr| acc + mr.assignees }
-      assignees_id_map = all_assignees.each_with_object({}) do |a, acc|
-        aid = a["id"]
-        ausername = a["username"]
-        assignee = acc[aid] || User.new(aid, ausername)
-        assignee.review_count += 1
-        acc[aid] = assignee
-      end
-      assignees_id_map.values
+      @client.users({ username: username }).map { |u| User.new(u.id, u.username) }
     end
 
     def fetch_mr_reviewers(project_id, mr_iid)
-      merge_request(project_id, mr_iid).assignees.map { |u| User.new(u["id"], u["username"]) }
+      @client.merge_request(project_id, mr_iid).assignees.map { |u| User.new(u["id"], u["username"]) }
     end
 
     private
 
-    def search_group(group_name)
+    def search_group_with_path(group_name)
       short_name = group_name.split("/").last
-      res = group_search(short_name)
+      res = @client.group_search(short_name)
       res = res.find { |i| i.full_path == group_name }
 
       if res.nil?
@@ -78,5 +83,28 @@ module Gitlab
         res.id
       end
     end
+
+    def assignees_with_review(project_id, mr_iid, gusers)
+      approvals =  @client.merge_request_approval_state(project_id, mr_iid)
+      approved_by = approvals.rules.reduce([]) { |acc, r| acc + r['approved_by'] }
+      gusers.filter { |u| approved_by.index { |au| au['id'] == u['id'] } != nil }
+    end
+
+  end
+
+  class Client < API
+
+    def client_helper
+      @client_helper ||= ClientHelper.new(self)
+    end
+
+    def method_missing(method, *args)
+      if client_helper.respond_to?(method)
+        client_helper.send(method, *args)
+      else
+        super
+      end
+    end
+
   end
 end

data/lib/gitlab_reviewbot/strategies/strategy.rb

@@ -27,7 +27,7 @@ module Danger
         all_assignees.map(&:username)
       end
 
-      def assignees(_amount)
+      def assignees(amount)
         raise "To be implemented in the subclasses"
       end
 

data/spec/gitlab_ext_spec.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require File.expand_path("spec_helper", __dir__)
+
+
+module Danger
+  describe Gitlab::Client do
+    before do
+      #
+      # @sam = Gitlab::User.new(1, "Sam")
+      # @tom = Gitlab::User.new(2, "Tom")
+      # @nic = Gitlab::User.new(3, "Nic")
+      # @luke = Gitlab::User.new(4, "Luke")
+      @mock_client = double(Gitlab::Client)
+      @client_helper = Gitlab::ClientHelper.new(@mock_client)
+      @sam = Gitlab::User.new(1, "Sam")
+      @tom = Gitlab::User.new(2, "Tom")
+      @nic = Gitlab::User.new(3, "Nic")
+      @assignees = [{'id' => 1, 'username' => "Sam"},
+                    {'id' => 2, 'username' => "Tom"},
+                    {'id' => 3, 'username' => "Nic"}]
+    end
+
+    it "Correctly calculates users with pending reviews" do
+      already_reviewed = [@assignees[0]]
+
+      allow(@mock_client).to receive(:merge_requests).with(10, {:per_page=>"100", :state=>"opened"}).and_return([Gitlab::ObjectifiedHash.new({'id' => 110, 'assignees' => @assignees})])
+      allow(@mock_client).to receive(:merge_request_approval_state).with(10, 110).and_return(Gitlab::ObjectifiedHash.new({'rules' => [{'approved_by' => already_reviewed}]}))
+
+      expect(@client_helper.users_with_pending_mr_review(10)).to be == [@tom, @nic]
+    end
+
+    it "Correctly calculates users with pending reviews (multi rule)" do
+      allow(@mock_client).to receive(:merge_requests).with(10, {:per_page=>"100", :state=>"opened"}).and_return([Gitlab::ObjectifiedHash.new({'id' => 110, 'assignees' => @assignees})])
+      allow(@mock_client).to receive(:merge_request_approval_state).with(10, 110).and_return(Gitlab::ObjectifiedHash.new({'rules' => [{'approved_by' => [{'id' => 1, 'username' => "Sam"}]}, {'approved_by' => [{'id' => 2, 'username' => "Tom"}]}]}))
+
+      expect(@client_helper.users_with_pending_mr_review(10)).to be == [@nic]
+    end
+
+    it "Fetches only active developer users for group" do
+      active_users = [Gitlab::ObjectifiedHash.new({'id' => 1, 'username' => 'Sam', 'state' => 'active', 'access_level' => 30}),
+                      Gitlab::ObjectifiedHash.new({'id' => 2, 'username' => 'Tom', 'state' => 'active', 'access_level' => 50})]
+      inactive_users = [Gitlab::ObjectifiedHash.new({'id' => 3, 'username' => 'OldSam', 'state' => 'inactive', 'access_level' => 30})]
+      non_developer_users = [Gitlab::ObjectifiedHash.new({'id' => 4, 'username' => 'Reporter', 'state' => 'active', 'access_level' => 20})]
+      allow(@mock_client).to receive(:group_search).with("mygroup").and_return([Gitlab::ObjectifiedHash.new({'id' => 10, 'full_path' => "mygroup"})])
+      allow(@mock_client).to receive(:group_members).with(10).and_return(active_users + inactive_users + non_developer_users)
+      expect(@client_helper.fetch_users_for_group("mygroup")).to be == [@sam, @tom]
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -10,6 +10,7 @@ require "pry"
 
 require "rspec"
 require "danger"
+require File.expand_path("../lib/gitlab_reviewbot/gitlab", __dir__)
 
 if `git remote -v` == ""
   puts "You cannot run tests without setting a local git remote on this repo"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-gitlab_reviewbot
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.10
 platform: ruby
 authors:
 - Fabio Gallonetto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-15 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api
@@ -218,6 +218,7 @@ files:
 - lib/gitlab_reviewbot/strategies/least_busy.rb
 - lib/gitlab_reviewbot/strategies/random.rb
 - lib/gitlab_reviewbot/strategies/strategy.rb
+- spec/gitlab_ext_spec.rb
 - spec/gitlab_reviewbot_spec.rb
 - spec/least_busy_strategy_spec.rb
 - spec/random_strategy_spec.rb
@@ -246,6 +247,7 @@ signing_key:
 specification_version: 4
 summary: A review raffle bot for Gitlab.
 test_files:
+- spec/gitlab_ext_spec.rb
 - spec/gitlab_reviewbot_spec.rb
 - spec/least_busy_strategy_spec.rb
 - spec/random_strategy_spec.rb