Generate data from dotcom and add support for transferred to user pay…

…loads
eleanorgoh · Apr 25, 2024 · 075d627 · 075d627
1 parent e685367
commit 075d627
Show file tree

Hide file tree

Showing 6 changed files with 452 additions and 297 deletions.
diff --git a/src/main/java/org/kohsuke/github/GHRepositoryChanges.java b/src/main/java/org/kohsuke/github/GHRepositoryChanges.java
@@ -40,16 +40,27 @@ public FromOwner getFrom() {
      */
     public static class FromOwner {
         private GHUser user;
+        private GHOrganization organization;
 
         /**
-         * Get user from which this repository was transferrred.
+         * Get user from which this repository was transferred.
          *
          * @return user
          */
         @SuppressFBWarnings(value = { "EI_EXPOSE_REP" }, justification = "Expected")
         public GHUser getUser() {
             return user;
         }
+
+        /**
+         * Get organization from which this repository was transferred.
+         *
+         * @return GHOrganization
+         */
+        @SuppressFBWarnings(value = { "EI_EXPOSE_REP" }, justification = "Expected")
+        public GHOrganization getOrganization() {
+            return organization;
+        }
     }
 
     /**

diff --git a/src/test/java/org/kohsuke/github/GHEventPayloadTest.java b/src/test/java/org/kohsuke/github/GHEventPayloadTest.java
@@ -783,29 +783,46 @@ public void repository_renamed() throws Exception {
         final GHEventPayload.RepositoryChanges event = GitHub.offline()
                 .parseEventPayload(payload.asReader(), GHEventPayload.RepositoryChanges.class);
         assertThat(event.getAction(), is("renamed"));
-        assertThat(event.getChanges().getRepository().getName().getFrom(), is("egoh-test-repo"));
-        assertThat(event.getRepository().getName(), is("egoh-test-repo-0"));
-        assertThat(event.getRepository().getOwner().getLogin(), is("corp"));
-        assertThat(event.getOrganization().getLogin(), is("corp"));
-        assertThat(event.getSender().getLogin(), is("egoh"));
+        assertThat(event.getChanges().getRepository().getName().getFrom(), is("react-workshop"));
+        assertThat(event.getRepository().getName(), is("react-workshop-renamed"));
+        assertThat(event.getRepository().getOwner().getLogin(), is("EJG-Organization"));
+        assertThat(event.getOrganization().getLogin(), is("EJG-Organization"));
+        assertThat(event.getSender().getLogin(), is("eleanorgoh"));
     }
 
     /**
-     * Repository ownership transferred.
+     * Repository ownership transferred to an organization.
      *
      * @throws Exception
      *             the exception
      */
     @Test
-    public void repository_transferred() throws Exception {
+    public void repository_transferred_to_org() throws Exception {
         final GHEventPayload.RepositoryChanges event = GitHub.offline()
                 .parseEventPayload(payload.asReader(), GHEventPayload.RepositoryChanges.class);
         assertThat(event.getAction(), is("transferred"));
-        assertThat(event.getChanges().getOwner().getFrom().getUser().getLogin(), is("egoh"));
-        assertThat(event.getChanges().getOwner().getFrom().getUser().getId(), is(30L));
+        assertThat(event.getChanges().getOwner().getFrom().getUser().getLogin(), is("eleanorgoh"));
+        assertThat(event.getChanges().getOwner().getFrom().getUser().getId(), is(66235606L));
         assertThat(event.getChanges().getOwner().getFrom().getUser().getType(), is("User"));
     }
 
+    /**
+     * Repository ownership transferred to a user.
+     *
+     * @throws Exception
+     *             the exception
+     */
+    @Test
+    public void repository_transferred_to_user() throws Exception {
+        final GHEventPayload.RepositoryChanges event = GitHub.offline()
+                .parseEventPayload(payload.asReader(), GHEventPayload.RepositoryChanges.class);
+        assertThat(event.getAction(), is("transferred"));
+        assertThat(event.getChanges().getOwner().getFrom().getOrganization().getLogin(), is("EJG-Organization"));
+        assertThat(event.getChanges().getOwner().getFrom().getOrganization().getId(), is(168135412L));
+        assertThat(event.getRepository().getOwner().getLogin(), is("eleanorgoh"));
+        assertThat(event.getRepository().getOwner().getType(), is("User"));
+    }
+
     /**
      * Status.
      *