From 99a863fe305d3c294b022a9195e2da1154bf3743 Mon Sep 17 00:00:00 2001
From: Roberto Oliveira <rguimara@redhat.com>
Date: Wed, 6 Mar 2024 14:16:36 +0100
Subject: [PATCH] Fix head field used by octokit.rest.pulls.list() method
 (#464)

In octokit/rest 18 doc (https://octokit.github.io/rest.js/v18) there is explanation about octokit.rest.pulls.list and
for the `head` field it mentions:

"Filter pulls by head user or head organization and branch name in the format of user:ref-name or organization:ref-name.
For example: github:new-script-format or octocat:test-branch."

We are currently using user/fork-name:ref-name and from the documentation it seems it should be user:ref-name
---
 package-lock.json                             |  4 ++--
 package.json                                  |  2 +-
 src/service/checkout/checkout-service.ts      |  2 +-
 .../service/checkout/checkout-service.test.ts | 24 +++++++++----------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2a9c8bb2..3ea97486 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@kie/build-chain-action",
-  "version": "3.5.5",
+  "version": "3.5.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@kie/build-chain-action",
-      "version": "3.5.5",
+      "version": "3.5.6",
       "license": "ISC",
       "dependencies": {
         "@actions/artifact": "^1.1.0",
diff --git a/package.json b/package.json
index c26e1bf3..1cac1234 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@kie/build-chain-action",
-  "version": "3.5.5",
+  "version": "3.5.6",
   "description": "Library to execute commands based on github projects dependencies.",
   "main": "dist/index.js",
   "author": "",
diff --git a/src/service/checkout/checkout-service.ts b/src/service/checkout/checkout-service.ts
index 21e1477c..5da6c20c 100644
--- a/src/service/checkout/checkout-service.ts
+++ b/src/service/checkout/checkout-service.ts
@@ -166,7 +166,7 @@ export class CheckoutService implements Serializable<SerializedCheckoutService,
         const hasPullRequestFromFork = await gitAPIService.hasPullRequest(
           currentTarget.group,
           currentTarget.name,
-          `${originalSource.group}/${forkName}:${originalSource.branch}`,
+          `${originalSource.group}:${originalSource.branch}`,
           currentTarget.mappedBranch
         );
         return { forkName, hasPullRequest: hasPullRequestFromFork };
diff --git a/test/unitary/service/checkout/checkout-service.test.ts b/test/unitary/service/checkout/checkout-service.test.ts
index f603dcd8..30f92537 100644
--- a/test/unitary/service/checkout/checkout-service.test.ts
+++ b/test/unitary/service/checkout/checkout-service.test.ts
@@ -95,8 +95,8 @@ describe.each([
       repo: "project2"
     }).reply({status: 200, data: {}});
 
-    moctokit.rest.pulls.list({owner: "owner1", repo: "project1", state: "open", head: "owner2/project1-forked:sbranch2", base: "tbranch1"}).reply({status: 200, data: [{title: "pr"}]});
-    moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner2/project2:sbranch2", base: "tbranch2"}).reply({status: 200, data: []});
+    moctokit.rest.pulls.list({owner: "owner1", repo: "project1", state: "open", head: "owner2:sbranch2", base: "tbranch1"}).reply({status: 200, data: [{title: "pr"}]});
+    moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner2:sbranch2", base: "tbranch2"}).reply({status: 200, data: []});
     moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner2:sbranch2", base: "tbranch2"}).reply({status: 200, data: [{title: "pr"}]});
 
     const checkedOutNodeInfo = await checkoutService.checkoutDefinitionTree();
@@ -170,7 +170,7 @@ describe.each([
     }).reply({status: 200, data: {}});
 
     moctokit.rest.pulls.list({owner: "owner1", repo: "project1", state: "open", head: "owner1:sbranch2", base: "tbranch1"}).reply({status: 200, data: [{title: "pr"}]});
-    moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner2/project2:sbranch2", base: "tbranch2"}).reply({status: 200, data: []});
+    moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner2:sbranch2", base: "tbranch2"}).reply({status: 200, data: []});
     moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner2:sbranch2", base: "tbranch2"}).reply({status: 200, data: [{title: "pr"}]});
 
     const checkedOutNodeInfo = await checkoutService.checkoutDefinitionTree();
@@ -243,7 +243,7 @@ describe.each([
     }).reply({status: 200, data: {}});
 
     moctokit.rest.pulls.list({owner: "owner1", repo: "project1", state: "open", head: "owner1:sbranch2", base: "tbranch1"}).reply({status: 200, data: []});
-    moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner2/project2:sbranch2", base: "tbranch2"}).reply({status: 200, data: []});
+    moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner2:sbranch2", base: "tbranch2"}).reply({status: 200, data: []});
     moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner2:sbranch2", base: "tbranch2"}).reply({status: 200, data: [{title: "pr"}]});
 
     const checkedOutNodeInfo = await checkoutService.checkoutDefinitionTree();
@@ -344,8 +344,8 @@ describe.each([
       repo: "project2"
     }).reply({status: 200, data: [{name: "project2-forked", owner: {login: "owner4"}}]});
 
-    moctokit.rest.pulls.list({owner: "owner1", repo: "project1", state: "open", head: "owner4/project1-forked:sbranch2-forked", base: "tbranch1"}).reply({status: 200, data: [{title: "pr"}]});
-    moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner4/project2-forked:sbranch2-forked", base: "tbranch2"}).reply({status: 200, data: [{title: "pr"}]});
+    moctokit.rest.pulls.list({owner: "owner1", repo: "project1", state: "open", head: "owner4:sbranch2-forked", base: "tbranch1"}).reply({status: 200, data: [{title: "pr"}]});
+    moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner4:sbranch2-forked", base: "tbranch2"}).reply({status: 200, data: [{title: "pr"}]});
 
     
     const checkedOutNodeInfo = await checkoutService.checkoutDefinitionTree();
@@ -418,7 +418,7 @@ describe.each([
     }).reply({status: 200, data: [{name: "project2-forked", owner: {login: "owner4"}}]});
 
     moctokit.rest.pulls.list({owner: "owner1", repo: "project1", state: "open", head: "owner1:sbranch2-forked", base: "tbranch1"}).reply({status: 200, data: [{title: "pr"}]});
-    moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner4/project2-forked:sbranch2-forked", base: "tbranch2"}).reply({status: 200, data: [{title: "pr"}]});
+    moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner4:sbranch2-forked", base: "tbranch2"}).reply({status: 200, data: [{title: "pr"}]});
 
     const checkedOutNodeInfo = await checkoutService.checkoutDefinitionTree();
 
@@ -490,7 +490,7 @@ describe.each([
     }).reply({status: 200, data: [{name: "project2-forked", owner: {login: "owner4"}}]});
 
     moctokit.rest.pulls.list({owner: "owner1", repo: "project1", state: "open", head: "owner1:sbranch2-forked", base: "tbranch1"}).reply({status: 200, data: []});
-    moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner4/project2-forked:sbranch2-forked", base: "tbranch2"}).reply({status: 200, data: [{title: "pr"}]});
+    moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner4:sbranch2-forked", base: "tbranch2"}).reply({status: 200, data: [{title: "pr"}]});
 
     
     const checkedOutNodeInfo = await checkoutService.checkoutDefinitionTree();
@@ -592,8 +592,8 @@ describe.each([
       repo: "project2"
     }).reply({status: 200, data: {}});
 
-    moctokit.rest.pulls.list({owner: "owner1", repo: "project1", state: "open", head: "owner2/project1-forked:tbranch2", base: "tbranch1"}).reply({status: 200, data: [{title: "pr"}]});
-    moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner2/project2:tbranch2", base: "tbranch2"}).reply({status: 200, data: []});
+    moctokit.rest.pulls.list({owner: "owner1", repo: "project1", state: "open", head: "owner2:tbranch2", base: "tbranch1"}).reply({status: 200, data: [{title: "pr"}]});
+    moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner2:tbranch2", base: "tbranch2"}).reply({status: 200, data: []});
     moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner2:tbranch2", base: "tbranch2"}).reply({status: 200, data: []});
  
     const checkedOutNodeInfo = await checkoutService.checkoutDefinitionTree();
@@ -664,7 +664,7 @@ describe.each([
     }).reply({status: 200, data: {}});
 
     moctokit.rest.pulls.list({owner: "owner1", repo: "project1", state: "open", head: "owner1:tbranch2", base: "tbranch1"}).reply({status: 200, data: [{title: "pr"}]});
-    moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner2/project2:tbranch2", base: "tbranch2"}).reply({status: 200, data: []});
+    moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner2:tbranch2", base: "tbranch2"}).reply({status: 200, data: []});
     moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner2:tbranch2", base: "tbranch2"}).reply({status: 200, data: []});
  
     const checkedOutNodeInfo = await checkoutService.checkoutDefinitionTree();
@@ -735,7 +735,7 @@ describe.each([
     }).reply({status: 200, data: {}});
 
     moctokit.rest.pulls.list({owner: "owner1", repo: "project1", state: "open", head: "owner1:tbranch2", base: "tbranch1"}).reply({status: 200, data: []});
-    moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner2/project2:tbranch2", base: "tbranch2"}).reply({status: 200, data: []});
+    moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner2:tbranch2", base: "tbranch2"}).reply({status: 200, data: []});
     moctokit.rest.pulls.list({owner: "owner2", repo: "project2", state: "open", head: "owner2:tbranch2", base: "tbranch2"}).reply({status: 200, data: []});