fix(reconfigure/pr): find reconfigure pr separately

lib/modules/platform/bitbucket-server/__snapshots__/index.spec.ts.snap

@@ -10,6 +10,21 @@ exports[`modules/platform/bitbucket-server/index endpoint with no path addReview
 
 exports[`modules/platform/bitbucket-server/index endpoint with no path deleteLAbel() does not throw 1`] = `undefined`;
 
+exports[`modules/platform/bitbucket-server/index endpoint with no path findPr() finds pr from other authors 1`] = `
+{
+  "bodyStruct": {
+    "hash": "7980dafc4eb6f0c79278fd929d3e8e5954b32b68ae118a22565c7c369fc2f591",
+  },
+  "createdAt": 1547853840016,
+  "number": 5,
+  "sourceBranch": "userName1/pullRequest5",
+  "state": "open",
+  "targetBranch": "master",
+  "title": "title",
+  "version": 1,
+}
+`;
+
 exports[`modules/platform/bitbucket-server/index endpoint with no path findPr() has pr 1`] = `
 {
   "bodyStruct": {
@@ -214,6 +229,21 @@ exports[`modules/platform/bitbucket-server/index endpoint with path addReviewers
 
 exports[`modules/platform/bitbucket-server/index endpoint with path deleteLAbel() does not throw 1`] = `undefined`;
 
+exports[`modules/platform/bitbucket-server/index endpoint with path findPr() finds pr from other authors 1`] = `
+{
+  "bodyStruct": {
+    "hash": "7980dafc4eb6f0c79278fd929d3e8e5954b32b68ae118a22565c7c369fc2f591",
+  },
+  "createdAt": 1547853840016,
+  "number": 5,
+  "sourceBranch": "userName1/pullRequest5",
+  "state": "open",
+  "targetBranch": "master",
+  "title": "title",
+  "version": 1,
+}
+`;
+
 exports[`modules/platform/bitbucket-server/index endpoint with path findPr() has pr 1`] = `
 {
   "bodyStruct": {

lib/modules/platform/bitbucket-server/index.spec.ts

@@ -1306,6 +1306,44 @@ describe('modules/platform/bitbucket-server/index', () => {
             }),
           ).toBeNull();
         });
+
+        it('finds pr from other authors', async () => {
+          const scope = await initRepo();
+          scope
+            .get(
+              `${urlPath}/rest/api/1.0/projects/SOME/repos/repo/pull-requests?state=OPEN&direction=outgoing&at=refs/heads/branch&limit=1`,
+            )
+            .reply(200, {
+              isLastPage: true,
+              values: [prMock(url, 'SOME', 'repo')],
+            });
+          expect(
+            await bitbucket.findPr({
+              branchName: 'branch',
+              state: 'open',
+              includeOtherAuthors: true,
+            }),
+          ).toMatchSnapshot();
+        });
+
+        it('returns null if no pr found - (includeOtherAuthors)', async () => {
+          const scope = await initRepo();
+          scope
+            .get(
+              `${urlPath}/rest/api/1.0/projects/SOME/repos/repo/pull-requests?state=OPEN&direction=outgoing&at=refs/heads/branch&limit=1`,
+            )
+            .reply(200, {
+              isLastPage: true,
+              values: [],
+            });
+
+          const pr = await bitbucket.findPr({
+            branchName: 'branch',
+            state: 'open',
+            includeOtherAuthors: true,
+          });
+          expect(pr).toBeNull();
+        });
       });
 
       describe('createPr()', () => {

lib/modules/platform/bitbucket-server/index.ts

@@ -324,8 +324,40 @@ export async function findPr({
   prTitle,
   state = 'all',
   refreshCache,
+  includeOtherAuthors,
 }: FindPRConfig): Promise<Pr | null> {
   logger.debug(`findPr(${branchName}, "${prTitle!}", "${state}")`);
+
+  if (includeOtherAuthors) {
+    // only fetch open prs from other authors
+    const searchParams: Record<string, string> = {
+      state: 'OPEN',
+    };
+    searchParams['direction'] = 'outgoing';
+    searchParams['at'] = `refs/heads/${branchName}`;
+
+    const query = getQueryString(searchParams);
+    const prs = await utils.accumulateValues(
+      `./rest/api/1.0/projects/${config.projectKey}/repos/${config.repositorySlug}/pull-requests?${query}`,
+      'get',
+      {},
+      1, // only fetch the latest pr
+    );
+
+    if (!prs.length) {
+      logger.debug(`No reconfigure Pr found for branch ${branchName}`);
+      return null;
+    }
+
+    // return the latest pr
+    const pr = utils.prInfo(prs[0]);
+    if (pr) {
+      logger.debug(`Found PR #${pr.number}`);
+    }
+
+    return pr;
+  }
+
   const prList = await getPrList(refreshCache);
   const pr = prList.find(isRelevantPr(branchName, prTitle, state));
   if (pr) {

lib/modules/platform/bitbucket/__snapshots__/index.spec.ts.snap

@@ -27,6 +27,20 @@ exports[`modules/platform/bitbucket/index findPr() finds pr 1`] = `
 }
 `;
 
+exports[`modules/platform/bitbucket/index findPr() finds pr from other authors 1`] = `
+{
+  "bodyStruct": {
+    "hash": "761b7ad8ad439b2855fcbb611331c646ef0870b0631247bba3f3025cb6df5a53",
+  },
+  "createdAt": "2018-07-02T07:02:25.275030+00:00",
+  "number": 5,
+  "sourceBranch": "branch",
+  "state": "open",
+  "targetBranch": "master",
+  "title": "title",
+}
+`;
+
 exports[`modules/platform/bitbucket/index getBranchPr() bitbucket finds PR for branch 1`] = `
 {
   "bodyStruct": {

lib/modules/platform/bitbucket/index.spec.ts

@@ -953,6 +953,40 @@ describe('modules/platform/bitbucket/index', () => {
       });
       expect(pr?.number).toBe(5);
     });
+
+    it('finds pr from other authors', async () => {
+      const scope = await initRepoMock();
+      scope
+        .get(
+          '/2.0/repositories/some/repo/pullrequests?q=source.branch.name="branch"&state=open',
+        )
+        .reply(200, { values: [pr] });
+      expect(
+        await bitbucket.findPr({
+          branchName: 'branch',
+          state: 'open',
+          includeOtherAuthors: true,
+        }),
+      ).toMatchSnapshot();
+    });
+
+    it('returns null if no open pr exists - (includeOtherAuthors)', async () => {
+      const scope = await initRepoMock();
+      scope
+        .get(
+          '/2.0/repositories/some/repo/pullrequests?q=source.branch.name="branch"&state=open',
+        )
+        .reply(200, {
+          values: [],
+        });
+
+      const pr = await bitbucket.findPr({
+        branchName: 'branch',
+        state: 'open',
+        includeOtherAuthors: true,
+      });
+      expect(pr).toBeNull();
+    });
   });
 
   describe('createPr()', () => {

lib/modules/platform/bitbucket/index.ts

@@ -296,8 +296,31 @@ export async function findPr({
   branchName,
   prTitle,
   state = 'all',
+  includeOtherAuthors,
 }: FindPRConfig): Promise<Pr | null> {
   logger.debug(`findPr(${branchName}, ${prTitle}, ${state})`);
+
+  if (includeOtherAuthors) {
+    // only fetch open prs from other authors
+    const prs = (
+      await bitbucketHttp.getJson<PagedResult<PrResponse>>(
+        `/2.0/repositories/${config.repository}/pullrequests?q=source.branch.name="${branchName}"&state=open`,
+      )
+    ).body.values;
+
+    if (prs.length === 0) {
+      logger.debug(`No reconfigure Pr found for branch ${branchName}`);
+      return null;
+    }
+
+    // return the latest pr
+    const pr = utils.prInfo(prs[0]);
+    if (pr) {
+      logger.debug(`Found PR #${pr.number}`);
+    }
+    return pr;
+  }
+
   const prList = await getPrList();
   const pr = prList.find(
     (p) =>

lib/modules/platform/gitea/index.ts

@@ -90,7 +90,7 @@ function toRenovateIssue(data: Issue): Issue {
 }
 
 // TODO #22198
-function toRenovatePR(data: PR): Pr | null {
+function toRenovatePR(data: PR, includeOtherAuthors = false): Pr | null {
   if (!data) {
     return null;
   }
@@ -108,7 +108,12 @@ function toRenovatePR(data: PR): Pr | null {
   }
 
   const createdBy = data.user?.username;
-  if (createdBy && botUserName && createdBy !== botUserName) {
+  if (
+    !includeOtherAuthors &&
+    createdBy &&
+    botUserName &&
+    createdBy !== botUserName
+  ) {
     return null;
   }
 
@@ -447,12 +452,14 @@ const platform: Platform = {
     return 'yellow';
   },
 
-  getPrList(): Promise<Pr[]> {
+  getPrList(includeOtherAuthors = false): Promise<Pr[]> {
     if (config.prList === null) {
       config.prList = helper
         .searchPRs(config.repository, { state: 'all' }, { memCache: false })
         .then((prs) => {
-          const prList = prs.map(toRenovatePR).filter(is.truthy);
+          const prList = prs
+            .map((pr) => toRenovatePR(pr, includeOtherAuthors))
+            .filter(is.truthy);
           logger.debug(`Retrieved ${prList.length} Pull Requests`);
           return prList;
         });
@@ -491,9 +498,10 @@ const platform: Platform = {
     branchName,
     prTitle: title,
     state = 'all',
+    includeOtherAuthors,
   }: FindPRConfig): Promise<Pr | null> {
     logger.debug(`findPr(${branchName}, ${title!}, ${state})`);
-    const prList = await platform.getPrList();
+    const prList = await platform.getPrList(includeOtherAuthors);
     const pr = prList.find(
       (p) =>
         p.sourceRepo === config.repository &&

lib/modules/platform/github/__snapshots__/index.spec.ts.snap

@@ -1,5 +1,20 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`modules/platform/github/index findPr(branchName, prTitle, state) finds pr from other authors 1`] = `
+{
+  "bodyStruct": {
+    "hash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+  },
+  "node_id": undefined,
+  "number": 1,
+  "sourceBranch": "branch-a",
+  "sourceRepo": "some/repo",
+  "state": "open",
+  "title": "branch a pr",
+  "updated_at": undefined,
+}
+`;
+
 exports[`modules/platform/github/index getRepoForceRebase should throw 401 1`] = `"Response code 401 (Unauthorized)"`;
 
 exports[`modules/platform/github/index getRepos should return an array of repos 1`] = `

lib/modules/platform/github/index.spec.ts

@@ -2428,6 +2428,44 @@ describe('modules/platform/github/index', () => {
       res = await github.findPr({ branchName: 'branch-b' });
       expect(res).toBeNull();
     });
+
+    it('finds pr from other authors', async () => {
+      const scope = httpMock.scope(githubApiHost);
+      initRepoMock(scope, 'some/repo');
+      scope
+        .get('/repos/some/repo/pulls?head=some/repo:branch&state=open')
+        .reply(200, [
+          {
+            number: 1,
+            head: { ref: 'branch-a', repo: { full_name: 'some/repo' } },
+            title: 'branch a pr',
+            state: 'open',
+          },
+        ]);
+      await github.initRepo({ repository: 'some/repo' });
+      expect(
+        await github.findPr({
+          branchName: 'branch',
+          state: 'open',
+          includeOtherAuthors: true,
+        }),
+      ).toMatchSnapshot();
+    });
+
+    it('returns null if no pr found - (includeOtherAuthors)', async () => {
+      const scope = httpMock.scope(githubApiHost);
+      initRepoMock(scope, 'some/repo');
+      scope
+        .get('/repos/some/repo/pulls?head=some/repo:branch&state=open')
+        .reply(200, []);
+      await github.initRepo({ repository: 'some/repo' });
+      const pr = await github.findPr({
+        branchName: 'branch',
+        state: 'open',
+        includeOtherAuthors: true,
+      });
+      expect(pr).toBeNull();
+    });
   });
 
   describe('createPr()', () => {

lib/modules/platform/github/index.ts

@@ -798,8 +798,31 @@ export async function findPr({
   branchName,
   prTitle,
   state = 'all',
+  includeOtherAuthors,
 }: FindPRConfig): Promise<GhPr | null> {
   logger.debug(`findPr(${branchName}, ${prTitle}, ${state})`);
+
+  if (includeOtherAuthors) {
+    const repo = config.parentRepo ?? config.repository;
+    // only fetch open prs from other authors
+    const response = await githubApi.getJson<GhRestPr[]>(
+      `repos/${repo}/pulls?head=${repo}:${branchName}&state=open`,
+    );
+
+    const { body: prList } = response;
+    if (!prList.length) {
+      logger.debug(`No reconfigure Pr found for branch ${branchName}`);
+      return null;
+    }
+
+    // return the latest pull request
+    const pr = coerceRestPr(prList[0]);
+    if (pr) {
+      logger.debug(`Found PR #${pr.number}`);
+    }
+    return pr;
+  }
+
   const prList = await getPrList();
   const pr = prList.find((p) => {
     if (p.sourceBranch !== branchName) {

lib/modules/platform/gitlab/__snapshots__/index.spec.ts.snap

@@ -62,6 +62,15 @@ exports[`modules/platform/gitlab/index createPr(branchName, title, body) uses de
 }
 `;
 
+exports[`modules/platform/gitlab/index findPr(branchName, prTitle, state) finds reconfigure pr 1`] = `
+{
+  "number": 1,
+  "sourceBranch": "branch",
+  "state": "open",
+  "title": "branch a pr",
+}
+`;
+
 exports[`modules/platform/gitlab/index getBranchPr(branchName) should return the PR object 1`] = `
 {
   "bodyStruct": {