diff --git a/keeps/helpers/reviewer_roulette.rb b/keeps/helpers/reviewer_roulette.rb index 959c8d7ba2cfd315d26b81eb01a27259b13fc7b5..6a8e2e2fcc9a3b7028153f4984c7d6f307adfbb5 100644 --- a/keeps/helpers/reviewer_roulette.rb +++ b/keeps/helpers/reviewer_roulette.rb @@ -22,7 +22,7 @@ def available_reviewers_for_role(role) end def reviewer_has_matching_role?(person, role) - person.dig(:user, :type).any? { |role_pair| role_pair[:r] == role } + person.dig(:user, :type).any? { |role_pair| role_pair[:p] == GITLAB_PROJECT && role_pair[:r] == role } end def average_type?(person) diff --git a/spec/fixtures/keeps/helpers/stats.json b/spec/fixtures/keeps/helpers/stats.json index 79d88a4ddf574413141d529680baf377f8aacbd0..6f119f03750d4a97f9bfa889ca3cfa23b378dfd8 100644 --- a/spec/fixtures/keeps/helpers/stats.json +++ b/spec/fixtures/keeps/helpers/stats.json @@ -3,6 +3,57 @@ "nextBuild": "2024-06-27T05:34:12.000Z", "commit": "00000000", "people": [ + { + "key": "arianna", + "user": { + "username": "@arianna", + "name": "Camila Champlin", + "avatarUrl": "https://localhost/uploads/-/system/user/avatar/4/avatar.png?width=32", + "webUrl": "https://localhost/arianna", + "type": [ + { + "p": "customers-app", + "r": "maintainer::backend" + }, + { + "p": "gitlab", + "r": "reviewer::backend" + } + ], + "tzOffset": 330, + "merge_request_coach": false + }, + "status": { + "emoji": "2ï¸âƒ£", + "messageHtml": "", + "available": true, + "has_capacity": true, + "hungry": false, + "reduced_capacity": false, + "out_of_office": false, + "assigned_max_capacity": 2, + "gitlab_mrs_involved_for_review_count": 0 + }, + "stats": { + "assignEvents": [ + { + "date": "2024-05-28", + "value": 4 + }, + { + "date": "2024-05-29", + "value": 1 + } + ], + "count7": 10, + "count30": 38, + "avg7": 1.4, + "avg30": 1.3 + }, + "mrs": [ + + ] + }, { "key": "tiera", "user": {