🐛 Fix number of projects recuperation (#47)

Author: jeanphi-baconnais

CHANGELOG.md

@@ -38,8 +38,3 @@
 ## 🐛 Bug Fixes
 - [`ccd40d1`](https://github.com/zenika-open-source/opensource-statistics/commit/ccd40d1)  Fix/semantic release release note (#32) (Issues: [`#32`](https://github.com/zenika-open-source/opensource-statistics/issues/32))
 
-default
-
-default
-
-default

src/main/java/zenika/oss/stats/config/GitHubClient.java

@@ -33,7 +33,8 @@ default String prepareToken() {
     @ClientHeaderParam(name = "Authorization", value = "{zenika.oss.stats.config.GitHubClient.prepareToken}")
     @Path("/orgs/{organizationName}/members")
     List<GitHubMember> getOrganizationMembers(@PathParam("organizationName") String organizationName,
-            @QueryParam("per_page") int page);
+            @QueryParam("per_page") int perPage,
+            @QueryParam("page") int page);
 
     @GET
     @ClientHeaderParam(name = "Authorization", value = "{zenika.oss.stats.config.GitHubClient.prepareToken}")
@@ -43,11 +44,14 @@ List<GitHubMember> getOrganizationMembers(@PathParam("organizationName") String
     @GET
     @ClientHeaderParam(name = "Authorization", value = "{zenika.oss.stats.config.GitHubClient.prepareToken}")
     @Path("/users/{login}/repos")
-    List<GitHubProject> getReposForAnUser(@PathParam("login") String login);
+    List<GitHubProject> getReposForAnUser(@PathParam("login") String login,
+            @QueryParam("per_page") int perPage,
+            @QueryParam("page") int page);
 
     @GET
     @ClientHeaderParam(name = "Authorization", value = "{zenika.oss.stats.config.GitHubClient.prepareToken}")
     @Path("/orgs/{organizationName}/repos")
     List<GitHubProject> getOrganizationProjects(@PathParam("organizationName") String organizationName,
-            @QueryParam("per_page") int perPage);
+            @QueryParam("per_page") int perPage,
+            @QueryParam("page") int page);
 }

src/main/java/zenika/oss/stats/services/GitHubServices.java

@@ -89,7 +89,7 @@ public GitHubOrganization getOrganizationInformation(String organizationName) {
      */
     public List<GitHubMember> getOrganizationMembers(String organizationName) {
 
-        return gitHubClient.getOrganizationMembers(organizationName, NB_MEMBERS_PAR_PAGE);
+        return fetchAll((perPage, page) -> gitHubClient.getOrganizationMembers(organizationName, perPage, page));
     }
 
     /**
@@ -111,7 +111,7 @@ public GitHubMember getUserInformation(final String id) {
      */
     public List<GitHubProject> getPersonalProjectForAnUser(final String login) {
 
-        var repos = gitHubClient.getReposForAnUser(login);
+        var repos = fetchAll((perPage, page) -> gitHubClient.getReposForAnUser(login, perPage, page));
         return repos.stream()
                 .filter(repo -> !repo.isFork() && !repo.isArchived())
                 .collect(Collectors.toList());
@@ -125,7 +125,7 @@ public List<GitHubProject> getPersonalProjectForAnUser(final String login) {
      */
     public List<GitHubProject> getForkedProjectForAnUser(final String login) {
 
-        var repos = gitHubClient.getReposForAnUser(login);
+        var repos = fetchAll((perPage, page) -> gitHubClient.getReposForAnUser(login, perPage, page));
         return repos.stream()
                 .filter(GitHubProject::isFork)
                 .collect(Collectors.toList());
@@ -241,7 +241,7 @@ public List<CustomStatsUser> getContributionsForTheCurrentYearAndAllTheOrganizat
     }
 
     public List<GitHubMember> getZenikaOpenSourceMembers() {
-        return gitHubClient.getOrganizationMembers(organizationName, NB_MEMBERS_PAR_PAGE);
+        return fetchAll((perPage, page) -> gitHubClient.getOrganizationMembers(organizationName, perPage, page));
     }
 
     /**
@@ -252,9 +252,28 @@ public List<GitHubMember> getZenikaOpenSourceMembers() {
      * @return a List of GitHubProject
      */
     public List<GitHubProject> getOrganizationProjects(String organizationName) {
-        var repos = gitHubClient.getOrganizationProjects(organizationName, 100);
+        var repos = fetchAll((perPage, page) -> gitHubClient.getOrganizationProjects(organizationName, perPage, page));
         return repos.stream()
                 .filter(repo -> !repo.isFork() && !repo.isArchived())
                 .collect(Collectors.toList());
     }
+
+    @FunctionalInterface
+    private interface PaginatedFetcher<T> {
+        List<T> fetch(int perPage, int page);
+    }
+
+    private <T> List<T> fetchAll(PaginatedFetcher<T> fetcher) {
+        List<T> allItems = new ArrayList<>();
+        int page = 1;
+        List<T> currentItems;
+        do {
+            currentItems = fetcher.fetch(NB_MEMBERS_PAR_PAGE, page++);
+            if (currentItems == null || currentItems.isEmpty()) {
+                break;
+            }
+            allItems.addAll(currentItems);
+        } while (currentItems.size() == NB_MEMBERS_PAR_PAGE);
+        return allItems;
+    }
 }

src/test/java/zenika/oss/stats/ressources/MembersRessourcesTest.java

@@ -1,16 +1,25 @@
 package zenika.oss.stats.ressources;
 
+import io.quarkus.test.InjectMock;
 import io.quarkus.test.junit.QuarkusTest;
 
 import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+import zenika.oss.stats.services.FirestoreServices;
+
+import java.util.Collections;
 
 import static io.restassured.RestAssured.given;
 
 @QuarkusTest
 class MembersRessourcesTest {
 
+    @InjectMock
+    FirestoreServices firestoreServices;
+
     @Test
-    void test_getAllMembers() {
+    void test_getAllMembers() throws Exception {
+        Mockito.when(firestoreServices.getAllMembers()).thenReturn(Collections.emptyList());
 
         given().when()
                 .get("/v1/members/all")
@@ -27,13 +36,4 @@ void test_getMember() {
                 .statusCode(200);
     }
 
-    @Test
-    void test_getInactivesMembers() {
-
-        given().when()
-                .get("/v1/members/inactives")
-                .then()
-                .statusCode(200);
-    }
-
 }

src/test/java/zenika/oss/stats/services/GitHubServicesTest.java

@@ -6,6 +6,7 @@
 import zenika.oss.stats.beans.github.GitHubProject;
 import zenika.oss.stats.config.GitHubClient;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -99,20 +100,68 @@ void test_getPersonalProjectForAnUser() {
                 new GitHubProject()
         );
 
-        when(gitHubClient.getReposForAnUser(login)).thenReturn(expectedProjects);
+        when(gitHubClient.getReposForAnUser(login, 100, 1)).thenReturn(expectedProjects);
 
         List<GitHubProject> result = gitHubServices.getPersonalProjectForAnUser(login);
 
         assertNotNull(result);
         assertEquals(2, result.size());
         assertEquals(expectedProjects, result);
 
-        verify(gitHubClient, times(1)).getReposForAnUser(login);
+        verify(gitHubClient, times(1)).getReposForAnUser(login, 100, 1);
     }
 
-    //@Test
-    void test_getContributionsData(){
+    @Test
+    void test_getForkedProjectForAnUser() {
+        String login = "testUser";
+        GitHubProject fork = new GitHubProject();
+        fork.setFork(true);
+        List<GitHubProject> expectedProjects = Arrays.asList(fork);
+
+        when(gitHubClient.getReposForAnUser(login, 100, 1)).thenReturn(expectedProjects);
+
+        List<GitHubProject> result = gitHubServices.getForkedProjectForAnUser(login);
+
+        assertNotNull(result);
+        assertEquals(1, result.size());
+        verify(gitHubClient, times(1)).getReposForAnUser(login, 100, 1);
+    }
+
+    @Test
+    void test_getOrganizationMembers_MultiPage() {
+        String org = "testOrg";
+        List<GitHubMember> page1 = new ArrayList<>();
+        for (int i = 0; i < 100; i++) {
+            page1.add(new GitHubMember());
+        }
+        List<GitHubMember> page2 = Arrays.asList(new GitHubMember());
+
+        when(gitHubClient.getOrganizationMembers(org, 100, 1)).thenReturn(page1);
+        when(gitHubClient.getOrganizationMembers(org, 100, 2)).thenReturn(page2);
 
+        List<GitHubMember> result = gitHubServices.getOrganizationMembers(org);
+
+        assertNotNull(result);
+        assertEquals(101, result.size());
+        verify(gitHubClient, times(1)).getOrganizationMembers(org, 100, 1);
+        verify(gitHubClient, times(1)).getOrganizationMembers(org, 100, 2);
+    }
+
+    @Test
+    void test_getOrganizationProjects() {
+        String org = "testOrg";
+        GitHubProject project = new GitHubProject();
+        project.setFork(false);
+        project.setArchived(false);
+        List<GitHubProject> expectedProjects = Arrays.asList(project);
+
+        when(gitHubClient.getOrganizationProjects(org, 100, 1)).thenReturn(expectedProjects);
+
+        List<GitHubProject> result = gitHubServices.getOrganizationProjects(org);
+
+        assertNotNull(result);
+        assertEquals(1, result.size());
+        verify(gitHubClient, times(1)).getOrganizationProjects(org, 100, 1);
     }