Merge pull request #1260 from JLLeitschuh/fix/JLL/project_card_reposi…

…tory Support getting repository from project card
hub4j · Oct 21, 2021 · 42469ba · 42469ba
2 parents 0b8c6e3 + c25068e
commit 42469ba
Show file tree

Hide file tree

Showing 58 changed files with 2,565 additions and 289 deletions.
diff --git a/src/main/java/org/kohsuke/github/GHIssue.java b/src/main/java/org/kohsuke/github/GHIssue.java
@@ -79,13 +79,32 @@ GHIssue wrap(GHRepository owner) {
         return this;
     }
 
+    private String getRepositoryUrlPath() {
+        String url = getUrl().toString();
+        int index = url.indexOf("/issues");
+        if (index == -1) {
+            index = url.indexOf("/pulls");
+        }
+        return url.substring(0, index);
+    }
+
     /**
      * Repository to which the issue belongs.
      *
      * @return the repository
      */
     @SuppressFBWarnings(value = { "EI_EXPOSE_REP" }, justification = "Expected behavior")
     public GHRepository getRepository() {
+        try {
+            synchronized (this) {
+                if (owner == null) {
+                    String repositoryUrlPath = getRepositoryUrlPath();
+                    wrap(root().createRequest().withUrlPath(repositoryUrlPath).fetch(GHRepository.class));
+                }
+            }
+        } catch (IOException e) {
+            throw new GHException("Failed to fetch repository", e);
+        }
         return owner;
     }
 
@@ -595,7 +614,8 @@ protected String getIssuesApiRoute() {
             final URL url = Objects.requireNonNull(getUrl(), "Missing instance URL!");
             return StringUtils.prependIfMissing(url.toString().replace(root().getApiUrl(), ""), "/");
         }
-        return "/repos/" + owner.getOwnerName() + "/" + owner.getName() + "/issues/" + number;
+        GHRepository repo = getRepository();
+        return "/repos/" + repo.getOwnerName() + "/" + repo.getName() + "/issues/" + number;
     }
 
     /**
@@ -740,7 +760,7 @@ protected static List<String> getLogins(Collection<GHUser> users) {
      */
     public PagedIterable<GHIssueEvent> listEvents() throws IOException {
         return root().createRequest()
-                .withUrlPath(owner.getApiTailUrl(String.format("/issues/%s/events", number)))
+                .withUrlPath(getRepository().getApiTailUrl(String.format("/issues/%s/events", number)))
                 .toIterable(GHIssueEvent[].class, item -> item.wrapUp(this));
     }
 }
diff --git a/src/main/java/org/kohsuke/github/GHProjectCard.java b/src/main/java/org/kohsuke/github/GHProjectCard.java
@@ -115,7 +115,7 @@ public GHProjectColumn getColumn() throws IOException {
     }
 
     /**
-     * Gets content.
+     * Gets content if present. Might be a {@link GHPullRequest} or a {@link GHIssue}.
      *
      * @return the content
      * @throws IOException

diff --git a/src/main/java/org/kohsuke/github/GHProjectColumn.java b/src/main/java/org/kohsuke/github/GHProjectColumn.java
@@ -186,10 +186,11 @@ public GHProjectCard createCard(String note) throws IOException {
      *             the io exception
      */
     public GHProjectCard createCard(GHIssue issue) throws IOException {
+        String contentType = issue instanceof GHPullRequest ? "PullRequest" : "Issue";
         return root().createRequest()
                 .method("POST")
                 .withPreview(INERTIA)
-                .with("content_type", issue instanceof GHPullRequest ? "PullRequest" : "Issue")
+                .with("content_type", contentType)
                 .with("content_id", issue.getId())
                 .withUrlPath(String.format("/projects/columns/%d/cards", getId()))
                 .fetch(GHProjectCard.class)

diff --git a/src/test/java/org/kohsuke/github/GHProjectCardTest.java b/src/test/java/org/kohsuke/github/GHProjectCardTest.java
@@ -55,6 +55,34 @@ public void testCreateCardFromIssue() throws IOException {
             GHIssue issue = repo.createIssue("new-issue").body("With body").create();
             GHProjectCard card = column.createCard(issue);
             assertThat(card.getContentUrl(), equalTo(issue.getUrl()));
+            assertThat(card.getContent().getUrl(), equalTo(issue.getUrl()));
+            assertThat(card.getContent().getRepository().getUrl(), equalTo(repo.getUrl()));
+        } finally {
+            repo.delete();
+        }
+    }
+
+    @Test
+    public void testCreateCardFromPR() throws IOException {
+        GHRepository repo = org.createRepository("repo-for-project-card").autoInit(true).create();
+
+        try {
+            String mainHead = repo.getRef("heads/main").getObject().getSha();
+            String branchName1 = "refs/heads/branch1";
+            repo.createRef(branchName1, mainHead);
+            repo.createContent()
+                    .content(branchName1)
+                    .message(branchName1)
+                    .path(branchName1)
+                    .branch(branchName1)
+                    .commit();
+            GHPullRequest pr = repo.createPullRequest("new-PR", branchName1, "refs/heads/main", "Body Text");
+            GHProjectCard card = column.createCard(pr);
+            // For some reason, PRs are still treated as issues in project card urls
+            assertThat(card.getContentUrl().toString(), equalTo(pr.getUrl().toString().replace("/pulls/", "/issues/")));
+            assertThat(card.getContent().getUrl().toString(),
+                    equalTo(pr.getUrl().toString().replace("/pulls/", "/issues/")));
+            assertThat(card.getContent().getRepository().getUrl(), equalTo(repo.getUrl()));
         } finally {
             repo.delete();
         }

diff --git a/...hub/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/orgs_hub4j-test-org-2.json b/...hub/GHProjectCardTest/wiremock/testCreateCardFromIssue/__files/orgs_hub4j-test-org-2.json
@@ -9,33 +9,46 @@
   "issues_url": "https://api.github.com/orgs/hub4j-test-org/issues",
   "members_url": "https://api.github.com/orgs/hub4j-test-org/members{/member}",
   "public_members_url": "https://api.github.com/orgs/hub4j-test-org/public_members{/member}",
-  "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
-  "description": null,
+  "avatar_url": "https://avatars.githubusercontent.com/u/7544739?v=4",
+  "description": "Hub4j Test Org Description (this could be null or blank too)",
+  "name": "Hub4j Test Org Name (this could be null or blank too)",
+  "company": null,
+  "blog": "https://hub4j.url.io/could/be/null",
+  "location": "Hub4j Test Org Location (this could be null or blank too)",
+  "email": "[email protected]",
+  "twitter_username": null,
   "is_verified": false,
   "has_organization_projects": true,
   "has_repository_projects": true,
-  "public_repos": 9,
+  "public_repos": 20,
   "public_gists": 0,
   "followers": 0,
   "following": 0,
   "html_url": "https://github.com/hub4j-test-org",
   "created_at": "2014-05-10T19:39:11Z",
-  "updated_at": "2015-04-20T00:42:30Z",
+  "updated_at": "2020-06-04T05:56:10Z",
   "type": "Organization",
-  "total_private_repos": 0,
-  "owned_private_repos": 0,
+  "total_private_repos": 2,
+  "owned_private_repos": 2,
   "private_gists": 0,
-  "disk_usage": 132,
+  "disk_usage": 11979,
   "collaborators": 0,
   "billing_email": "[email protected]",
   "default_repository_permission": "none",
   "members_can_create_repositories": false,
   "two_factor_requirement_enabled": false,
+  "members_allowed_repository_creation_type": "none",
+  "members_can_create_public_repositories": false,
+  "members_can_create_private_repositories": false,
+  "members_can_create_internal_repositories": false,
+  "members_can_create_pages": true,
+  "members_can_create_public_pages": true,
+  "members_can_create_private_pages": true,
   "plan": {
     "name": "free",
     "space": 976562499,
-    "private_repos": 0,
-    "filled_seats": 4,
-    "seats": 0
+    "private_repos": 10000,
+    "filled_seats": 29,
+    "seats": 3
   }
 }
diff --git a/...jectCardTest/wiremock/testCreateCardFromIssue/__files/orgs_hub4j-test-org_projects-3.json b/...jectCardTest/wiremock/testCreateCardFromIssue/__files/orgs_hub4j-test-org_projects-3.json
@@ -1,13 +1,13 @@
 {
   "owner_url": "https://api.github.com/orgs/hub4j-test-org",
-  "url": "https://api.github.com/projects/3312449",
-  "html_url": "https://github.com/orgs/hub4j-test-org/projects/31",
-  "columns_url": "https://api.github.com/projects/3312449/columns",
-  "id": 3312449,
-  "node_id": "MDc6UHJvamVjdDMzMTI0NDk=",
+  "url": "https://api.github.com/projects/13495086",
+  "html_url": "https://github.com/orgs/hub4j-test-org/projects/32",
+  "columns_url": "https://api.github.com/projects/13495086/columns",
+  "id": 13495086,
+  "node_id": "PRO_kwDOAHMfo84Azesu",
   "name": "test-project",
   "body": "This is a test project",
-  "number": 31,
+  "number": 32,
   "state": "open",
   "creator": {
     "login": "bitwiseman",
@@ -29,8 +29,8 @@
     "type": "User",
     "site_admin": false
   },
-  "created_at": "2019-10-04T17:25:11Z",
-  "updated_at": "2019-10-04T17:25:11Z",
+  "created_at": "2021-10-11T15:43:37Z",
+  "updated_at": "2021-10-11T15:43:37Z",
   "organization_permission": "write",
   "private": true
-}
+}
diff --git a/...ProjectCardTest/wiremock/testCreateCardFromIssue/__files/orgs_hub4j-test-org_repos-6.json b/...ProjectCardTest/wiremock/testCreateCardFromIssue/__files/orgs_hub4j-test-org_repos-6.json
@@ -1,14 +1,14 @@
 {
-  "id": 212868194,
-  "node_id": "MDEwOlJlcG9zaXRvcnkyMTI4NjgxOTQ=",
+  "id": 415990154,
+  "node_id": "R_kgDOGMuBig",
   "name": "repo-for-project-card",
   "full_name": "hub4j-test-org/repo-for-project-card",
   "private": false,
   "owner": {
     "login": "hub4j-test-org",
     "id": 7544739,
     "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
-    "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7544739?v=4",
     "gravatar_id": "",
     "url": "https://api.github.com/users/hub4j-test-org",
     "html_url": "https://github.com/hub4j-test-org",
@@ -64,9 +64,9 @@
   "labels_url": "https://api.github.com/repos/hub4j-test-org/repo-for-project-card/labels{/name}",
   "releases_url": "https://api.github.com/repos/hub4j-test-org/repo-for-project-card/releases{/id}",
   "deployments_url": "https://api.github.com/repos/hub4j-test-org/repo-for-project-card/deployments",
-  "created_at": "2019-10-04T17:25:12Z",
-  "updated_at": "2019-10-04T17:25:12Z",
-  "pushed_at": "2019-10-04T17:25:13Z",
+  "created_at": "2021-10-11T15:43:39Z",
+  "updated_at": "2021-10-11T15:43:39Z",
+  "pushed_at": "2021-10-11T15:43:39Z",
   "git_url": "git://github.com/hub4j-test-org/repo-for-project-card.git",
   "ssh_url": "[email protected]:hub4j-test-org/repo-for-project-card.git",
   "clone_url": "https://github.com/hub4j-test-org/repo-for-project-card.git",
@@ -87,23 +87,31 @@
   "disabled": false,
   "open_issues_count": 0,
   "license": null,
+  "allow_forking": true,
+  "is_template": false,
+  "topics": [],
+  "visibility": "public",
   "forks": 0,
   "open_issues": 0,
   "watchers": 0,
   "default_branch": "main",
   "permissions": {
     "admin": true,
+    "maintain": true,
     "push": true,
+    "triage": true,
     "pull": true
   },
   "allow_squash_merge": true,
   "allow_merge_commit": true,
   "allow_rebase_merge": true,
+  "allow_auto_merge": false,
+  "delete_branch_on_merge": false,
   "organization": {
     "login": "hub4j-test-org",
     "id": 7544739,
     "node_id": "MDEyOk9yZ2FuaXphdGlvbjc1NDQ3Mzk=",
-    "avatar_url": "https://avatars3.githubusercontent.com/u/7544739?v=4",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7544739?v=4",
     "gravatar_id": "",
     "url": "https://api.github.com/users/hub4j-test-org",
     "html_url": "https://github.com/hub4j-test-org",
@@ -120,5 +128,5 @@
     "site_admin": false
   },
   "network_count": 0,
-  "subscribers_count": 2
+  "subscribers_count": 0
 }
diff --git a/...ProjectCardTest/wiremock/testCreateCardFromIssue/__files/projects_13495086_columns-4.json b/...ProjectCardTest/wiremock/testCreateCardFromIssue/__files/projects_13495086_columns-4.json
@@ -0,0 +1,10 @@
+{
+  "url": "https://api.github.com/projects/columns/16361848",
+  "project_url": "https://api.github.com/projects/13495086",
+  "cards_url": "https://api.github.com/projects/columns/16361848/cards",
+  "id": 16361848,
+  "node_id": "PC_lAPOAHMfo84AzesuzgD5qXg",
+  "name": "column-one",
+  "created_at": "2021-10-11T15:43:38Z",
+  "updated_at": "2021-10-11T15:43:38Z"
+}
diff --git a/...HProjectCardTest/wiremock/testCreateCardFromIssue/__files/projects_3312449_columns-4.json b/...HProjectCardTest/wiremock/testCreateCardFromIssue/__files/projects_3312449_columns-4.json
diff --git a/...les/projects_columns_6706803_cards-5.json → ...es/projects_columns_16361848_cards-5.json b/...les/projects_columns_6706803_cards-5.json → ...es/projects_columns_16361848_cards-5.json
@@ -1,8 +1,8 @@
 {
-  "url": "https://api.github.com/projects/columns/cards/27353274",
-  "project_url": "https://api.github.com/projects/3312449",
-  "id": 27353274,
-  "node_id": "MDExOlByb2plY3RDYXJkMjczNTMyNzQ=",
+  "url": "https://api.github.com/projects/columns/cards/70575561",
+  "project_url": "https://api.github.com/projects/13495086",
+  "id": 70575561,
+  "node_id": "PRC_lADOAHMfo84AzesuzgQ05ck",
   "note": "This is a card",
   "archived": false,
   "creator": {
@@ -25,7 +25,7 @@
     "type": "User",
     "site_admin": false
   },
-  "created_at": "2019-10-04T17:25:11Z",
-  "updated_at": "2019-10-04T17:25:11Z",
-  "column_url": "https://api.github.com/projects/columns/6706803"
-}
+  "created_at": "2021-10-11T15:43:38Z",
+  "updated_at": "2021-10-11T15:43:38Z",
+  "column_url": "https://api.github.com/projects/columns/16361848"
+}
diff --git a/...les/projects_columns_6706803_cards-8.json → ...es/projects_columns_16361848_cards-8.json b/...les/projects_columns_6706803_cards-8.json → ...es/projects_columns_16361848_cards-8.json
@@ -1,8 +1,8 @@
 {
-  "url": "https://api.github.com/projects/columns/cards/27353276",
-  "project_url": "https://api.github.com/projects/3312449",
-  "id": 27353276,
-  "node_id": "MDExOlByb2plY3RDYXJkMjczNTMyNzY=",
+  "url": "https://api.github.com/projects/columns/cards/70575566",
+  "project_url": "https://api.github.com/projects/13495086",
+  "id": 70575566,
+  "node_id": "PRC_lADOAHMfo84AzesuzgQ05c4",
   "note": null,
   "archived": false,
   "creator": {
@@ -25,8 +25,8 @@
     "type": "User",
     "site_admin": false
   },
-  "created_at": "2019-10-04T17:25:14Z",
-  "updated_at": "2019-10-04T17:25:14Z",
-  "column_url": "https://api.github.com/projects/columns/6706803",
+  "created_at": "2021-10-11T15:43:41Z",
+  "updated_at": "2021-10-11T15:43:41Z",
+  "column_url": "https://api.github.com/projects/columns/16361848",
   "content_url": "https://api.github.com/repos/hub4j-test-org/repo-for-project-card/issues/1"
-}
+}