fix: don’t assign if MR already has assignees or reviewers (#6386)

* fix(gitlab): don’t assign if MR already has assignees Closes #6375 * add more platforms * fix github * simplify gitlab Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
renovatebot · Jul 16, 2020 · 0571eb3 · 0571eb3
1 parent 2ae2d23
commit 0571eb3
Show file tree

Hide file tree

Showing 16 changed files with 175 additions and 16 deletions.
diff --git a/lib/platform/azure/__snapshots__/index.spec.ts.snap b/lib/platform/azure/__snapshots__/index.spec.ts.snap
@@ -133,6 +133,7 @@ exports[`platform/azure getBranchPr(branchName) should return the pr 1`] = `null
 
 exports[`platform/azure getPr(prNo) should return a pr in the right format 1`] = `
 Object {
+  "hasReviewers": false,
   "isModified": false,
   "labels": Array [
     "renovate",
@@ -143,6 +144,7 @@ Object {
 
 exports[`platform/azure getPr(prNo) should return a pr thats been modified 1`] = `
 Object {
+  "hasReviewers": false,
   "isModified": true,
   "labels": Array [],
   "number": 1234,

diff --git a/lib/platform/azure/index.ts b/lib/platform/azure/index.ts
@@ -1,3 +1,4 @@
+import is from '@sindresorhus/is';
 import {
   GitPullRequest,
   GitPullRequestCommentThread,
@@ -262,7 +263,7 @@ export async function getPr(pullRequestId: number): Promise<Pr | null> {
   azurePr.isModified =
     commits.length > 0 &&
     commits[0].author.name !== commits[commits.length - 1].author.name;
-
+  azurePr.hasReviewers = is.nonEmptyArray(azurePr.reviewers);
   return azurePr;
 }
 

diff --git a/lib/platform/bitbucket-server/__snapshots__/index.spec.ts.snap b/lib/platform/bitbucket-server/__snapshots__/index.spec.ts.snap
@@ -1506,6 +1506,7 @@ Object {
   "canMerge": false,
   "createdAt": 1547853840016,
   "displayNumber": "Pull Request #5",
+  "hasReviewers": true,
   "isConflicted": false,
   "isModified": false,
   "isStale": false,
@@ -1957,6 +1958,7 @@ Object {
   "canMerge": false,
   "createdAt": 1547853840016,
   "displayNumber": "Pull Request #5",
+  "hasReviewers": true,
   "isConflicted": false,
   "isModified": true,
   "isStale": false,
@@ -1979,6 +1981,7 @@ Object {
   "canMerge": false,
   "createdAt": 1547853840016,
   "displayNumber": "Pull Request #5",
+  "hasReviewers": true,
   "isConflicted": false,
   "isModified": false,
   "isStale": false,
@@ -2001,6 +2004,7 @@ Object {
   "canMerge": false,
   "createdAt": 1547853840016,
   "displayNumber": "Pull Request #5",
+  "hasReviewers": true,
   "isConflicted": false,
   "isModified": true,
   "isStale": false,
@@ -2160,6 +2164,7 @@ Object {
   "canMerge": false,
   "createdAt": 1547853840016,
   "displayNumber": "Pull Request #5",
+  "hasReviewers": true,
   "isConflicted": false,
   "isModified": false,
   "isStale": false,
@@ -2245,6 +2250,7 @@ Object {
   "branchName": undefined,
   "createdAt": undefined,
   "displayNumber": "Pull Request #undefined",
+  "hasReviewers": false,
   "isModified": false,
   "isStale": false,
   "number": undefined,
@@ -5372,6 +5378,7 @@ Object {
   "canMerge": false,
   "createdAt": 1547853840016,
   "displayNumber": "Pull Request #5",
+  "hasReviewers": true,
   "isConflicted": false,
   "isModified": false,
   "isStale": false,
@@ -5823,6 +5830,7 @@ Object {
   "canMerge": false,
   "createdAt": 1547853840016,
   "displayNumber": "Pull Request #5",
+  "hasReviewers": true,
   "isConflicted": false,
   "isModified": true,
   "isStale": false,
@@ -5845,6 +5853,7 @@ Object {
   "canMerge": false,
   "createdAt": 1547853840016,
   "displayNumber": "Pull Request #5",
+  "hasReviewers": true,
   "isConflicted": false,
   "isModified": false,
   "isStale": false,
@@ -5867,6 +5876,7 @@ Object {
   "canMerge": false,
   "createdAt": 1547853840016,
   "displayNumber": "Pull Request #5",
+  "hasReviewers": true,
   "isConflicted": false,
   "isModified": true,
   "isStale": false,
@@ -6026,6 +6036,7 @@ Object {
   "canMerge": false,
   "createdAt": 1547853840016,
   "displayNumber": "Pull Request #5",
+  "hasReviewers": true,
   "isConflicted": false,
   "isModified": false,
   "isStale": false,
@@ -6111,6 +6122,7 @@ Object {
   "branchName": undefined,
   "createdAt": undefined,
   "displayNumber": "Pull Request #undefined",
+  "hasReviewers": false,
   "isModified": false,
   "isStale": false,
   "number": undefined,

diff --git a/lib/platform/bitbucket-server/index.ts b/lib/platform/bitbucket-server/index.ts
@@ -1,4 +1,5 @@
 import url, { URLSearchParams } from 'url';
+import is from '@sindresorhus/is';
 import delay from 'delay';
 import { RenovateConfig } from '../../config/common';
 import {
@@ -267,7 +268,7 @@ export async function getPr(
     reviewers: res.body.reviewers.map((r) => r.user.name),
     isModified: false,
   };
-
+  pr.hasReviewers = is.nonEmptyArray(pr.reviewers);
   pr.version = updatePrVersion(pr.number, pr.version);
 
   if (pr.state === PR_STATE_OPEN) {

diff --git a/lib/platform/bitbucket/__snapshots__/index.spec.ts.snap b/lib/platform/bitbucket/__snapshots__/index.spec.ts.snap
@@ -518,6 +518,7 @@ Object {
   "canMerge": true,
   "createdAt": "2018-07-02T07:02:25.275030+00:00",
   "displayNumber": "Pull Request #5",
+  "hasReviewers": false,
   "isConflicted": false,
   "isModified": false,
   "isStale": false,
@@ -919,6 +920,7 @@ Object {
   "canMerge": true,
   "createdAt": "2018-07-02T07:02:25.275030+00:00",
   "displayNumber": "Pull Request #3",
+  "hasReviewers": false,
   "isConflicted": false,
   "isModified": true,
   "isStale": false,
@@ -936,6 +938,7 @@ Object {
   "canMerge": true,
   "createdAt": "2018-07-02T07:02:25.275030+00:00",
   "displayNumber": "Pull Request #5",
+  "hasReviewers": false,
   "isConflicted": false,
   "isModified": false,
   "isStale": false,
@@ -953,6 +956,7 @@ Object {
   "canMerge": true,
   "createdAt": "2018-07-02T07:02:25.275030+00:00",
   "displayNumber": "Pull Request #5",
+  "hasReviewers": false,
   "isConflicted": false,
   "isModified": true,
   "isStale": false,
@@ -1082,6 +1086,7 @@ Object {
   "canMerge": true,
   "createdAt": "2018-07-02T07:02:25.275030+00:00",
   "displayNumber": "Pull Request #5",
+  "hasReviewers": false,
   "isConflicted": false,
   "isModified": false,
   "isStale": false,

diff --git a/lib/platform/bitbucket/index.ts b/lib/platform/bitbucket/index.ts
@@ -1,4 +1,5 @@
 import URL from 'url';
+import is from '@sindresorhus/is';
 import addrs from 'email-addresses';
 import parseDiff from 'parse-diff';
 import { RenovateConfig } from '../../config/common';
@@ -327,6 +328,8 @@ export async function getPr(prNo: number): Promise<Pr | null> {
     res.isStale = await git.isBranchStale(pr.source.branch.name);
   }
 
+  res.hasReviewers = is.nonEmptyArray(pr.reviewers);
+
   return res;
 }
 

diff --git a/lib/platform/common.ts b/lib/platform/common.ts
@@ -43,6 +43,8 @@ export interface Pr {
   canMergeReason?: string;
   createdAt?: string;
   displayNumber?: string;
+  hasAssignees?: boolean;
+  hasReviewers?: boolean;
   isConflicted?: boolean;
   isModified?: boolean;
   isStale?: boolean;

diff --git a/lib/platform/gitea/__snapshots__/index.spec.ts.snap b/lib/platform/gitea/__snapshots__/index.spec.ts.snap
@@ -7,6 +7,7 @@ Object {
   "canMerge": true,
   "createdAt": "2014-04-01T05:14:20Z",
   "displayNumber": "Pull Request #42",
+  "hasAssignees": false,
   "isConflicted": false,
   "isModified": undefined,
   "isStale": undefined,
@@ -26,6 +27,7 @@ Object {
   "canMerge": true,
   "createdAt": "2014-04-01T05:14:20Z",
   "displayNumber": "Pull Request #42",
+  "hasAssignees": false,
   "isConflicted": false,
   "isModified": undefined,
   "isStale": undefined,
@@ -45,6 +47,7 @@ Object {
   "canMerge": true,
   "createdAt": "2015-03-22T20:36:16Z",
   "displayNumber": "Pull Request #1",
+  "hasAssignees": false,
   "isConflicted": false,
   "isModified": true,
   "isStale": false,
@@ -64,6 +67,7 @@ Object {
   "canMerge": true,
   "createdAt": "2015-03-22T20:36:16Z",
   "displayNumber": "Pull Request #1",
+  "hasAssignees": false,
   "isConflicted": false,
   "isModified": false,
   "isStale": false,
@@ -84,6 +88,7 @@ Array [
     "canMerge": true,
     "createdAt": "2015-03-22T20:36:16Z",
     "displayNumber": "Pull Request #1",
+    "hasAssignees": false,
     "isConflicted": false,
     "isModified": undefined,
     "isStale": undefined,
@@ -100,6 +105,7 @@ Array [
     "canMerge": true,
     "createdAt": "2011-08-18T22:30:38Z",
     "displayNumber": "Pull Request #2",
+    "hasAssignees": false,
     "isConflicted": false,
     "isModified": undefined,
     "isStale": undefined,

diff --git a/lib/platform/gitea/gitea-helper.ts b/lib/platform/gitea/gitea-helper.ts
@@ -33,6 +33,10 @@ export interface PR {
     sha: string;
     repo?: Repo;
   };
+  assignee?: {
+    login?: string;
+  };
+  assignees?: any[];
 }
 
 export interface Issue {

diff --git a/lib/platform/gitea/index.ts b/lib/platform/gitea/index.ts
@@ -1,4 +1,5 @@
 import URL from 'url';
+import is from '@sindresorhus/is';
 import { configFileNames } from '../../config/app-strings';
 import { RenovateConfig } from '../../config/common';
 import {
@@ -104,6 +105,7 @@ function toRenovatePR(data: helper.PR): Pr | null {
     isConflicted: !data.mergeable,
     isStale: undefined,
     isModified: undefined,
+    hasAssignees: !!(data.assignee?.login || is.nonEmptyArray(data.assignees)),
   };
 }