✨ Fix users recuperation to not remove all users before gett… (#34)

* ✨ Fix users recuperation to not remove all users before getting in GitHub

* 🎨 Add links on GitHub and GitLab profile

Author: jeanphi-baconnais

src/main/java/zenika/oss/stats/ressources/workflow/WorkflowRessources.java

@@ -20,6 +20,8 @@
 import zenika.oss.stats.services.GitHubServices;
 
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 @ApplicationScoped
 @Path("/v1/workflow/")
@@ -36,12 +38,39 @@ public class WorkflowRessources {
     @Produces(MediaType.TEXT_PLAIN)
     public Response saveMembers() throws DatabaseException {
 
-        firestoreServices.deleteAllMembers();
-
+        // Load current state
+        List<ZenikaMember> existingMembers = firestoreServices.getAllMembers();
         List<GitHubMember> gitHubMembers = gitHubServices.getZenikaOpenSourceMembers();
-        // Use a for-loop to properly handle the checked DatabaseException
+
+        // Build a set of current GitHub logins in the organization
+        Set<String> currentGitHubLogins = gitHubMembers.stream()
+                .map(GitHubMember::getLogin)
+                .collect(Collectors.toSet());
+
+        // Upsert: add new GitHub members and update existing ones
         for (GitHubMember gitHubMember : gitHubMembers) {
-            firestoreServices.createMember(ZenikaMemberMapper.mapGitHubMemberToZenikaMember(gitHubMember));
+            ZenikaMember existing = existingMembers.stream()
+                    .filter(m -> m.getGitHubAccount() != null
+                            && gitHubMember.getLogin().equals(m.getGitHubAccount().getLogin()))
+                    .findFirst()
+                    .orElse(null);
+
+            if (existing == null) {
+                // New member from GitHub organization
+                firestoreServices.createMember(ZenikaMemberMapper.mapGitHubMemberToZenikaMember(gitHubMember));
+            } else {
+                // Keep the same ZenikaMember (id, city, GitLab, etc.) but refresh GitHub data
+                existing.setGitHubAccount(gitHubMember);
+                firestoreServices.createMember(existing);
+            }
+        }
+
+        // Cleanup: remove members whose GitHub account is no longer in the organization
+        for (ZenikaMember member : existingMembers) {
+            if (member.getGitHubAccount() != null
+                    && !currentGitHubLogins.contains(member.getGitHubAccount().getLogin())) {
+                firestoreServices.deleteMember(member.getId());
+            }
         }
 
         return Response.ok().build();

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

@@ -163,6 +163,24 @@ public void deleteAllMembers() throws DatabaseException {
         deleteAllDocuments(FirestoreCollections.MEMBERS);
     }
 
+    /**
+     * Delete a single member by id.
+     *
+     * @param memberId the id of the member document to delete.
+     * @throws DatabaseException exception
+     */
+    @CacheInvalidateAll(cacheName = "members-cache")
+    public void deleteMember(String memberId) throws DatabaseException {
+        try {
+            firestore.collection(FirestoreCollections.MEMBERS.value)
+                    .document(memberId)
+                    .delete()
+                    .get();
+        } catch (InterruptedException | ExecutionException e) {
+            throw new DatabaseException(e);
+        }
+    }
+
     /**
      * Create a document in the Firestore database.
      *

src/main/java/zenika/oss/stats/ui/tabs/MembersTab.java

@@ -15,6 +15,8 @@
 
 import java.util.Comparator;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 @ApplicationScoped
 public class MembersTab {
@@ -65,13 +67,48 @@ public void render(JtContainer membersTab) {
 
             if (Jt.button("🔄 Sync Members from GitHub").use(columns.col(1))) {
                 try {
-                    firestoreServices.deleteAllMembers();
+                    // Load current state from Firestore and GitHub
+                    List<ZenikaMember> existingMembers = firestoreServices.getAllMembers();
                     List<GitHubMember> gitHubMembers = gitHubServices.getZenikaOpenSourceMembers();
-                    
+
+                    Set<String> currentGitHubLogins = gitHubMembers.stream()
+                            .map(GitHubMember::getLogin)
+                            .collect(Collectors.toSet());
+
+                    int added = 0;
+                    int updated = 0;
+                    int removed = 0;
+
+                    // Upsert: add/update members based on GitHub organization
                     for (GitHubMember gitHubMember : gitHubMembers) {
-                        firestoreServices.createMember(ZenikaMemberMapper.mapGitHubMemberToZenikaMember(gitHubMember));
+                        ZenikaMember existing = existingMembers.stream()
+                                .filter(m -> m.getGitHubAccount() != null
+                                        && gitHubMember.getLogin().equals(m.getGitHubAccount().getLogin()))
+                                .findFirst()
+                                .orElse(null);
+
+                        if (existing == null) {
+                            firestoreServices.createMember(
+                                    ZenikaMemberMapper.mapGitHubMemberToZenikaMember(gitHubMember));
+                            added++;
+                        } else {
+                            existing.setGitHubAccount(gitHubMember);
+                            firestoreServices.createMember(existing);
+                            updated++;
+                        }
+                    }
+
+                    // Remove members that are no longer in the GitHub organization
+                    for (ZenikaMember member : existingMembers) {
+                        if (member.getGitHubAccount() != null
+                                && !currentGitHubLogins.contains(member.getGitHubAccount().getLogin())) {
+                            firestoreServices.deleteMember(member.getId());
+                            removed++;
+                        }
                     }
-                    Jt.success("Successfully synced " + gitHubMembers.size() + " members!").use(membersTab);
+
+                    Jt.success("✅ Synchronization completed: " + added + " added, " + updated + " updated, " + removed
+                            + " removed.").use(membersTab);
                 } catch (DatabaseException e) {
                     Jt.error("Error syncing members: " + e.getMessage()).use(membersTab);
                 }
@@ -102,8 +139,26 @@ public void render(JtContainer membersTab) {
                 var row = Jt.columns(6).key("member_row_" + m.getId()).use(membersTab);
                 Jt.text(m.getFirstname() != null ? m.getFirstname() : "").use(row.col(0));
                 Jt.text(m.getName() != null ? m.getName() : "").use(row.col(1));
-                Jt.text(m.getGitHubAccount() != null ? m.getGitHubAccount().getLogin() : "").use(row.col(2));
-                Jt.text(m.getGitlabAccount() != null ? m.getGitlabAccount().getUsername() : "").use(row.col(3));
+
+                if (m.getGitHubAccount() != null && m.getGitHubAccount().getLogin() != null) {
+                    String githubLogin = m.getGitHubAccount().getLogin();
+                    String githubLinkMarkdown = "<a href=\"https://github.com/" + githubLogin
+                            + "\" target=\"_blank\" rel=\"noopener noreferrer\">"
+                            + githubLogin + "</a>";
+                    Jt.markdown(githubLinkMarkdown).use(row.col(2));
+                } else {
+                    Jt.text("").use(row.col(2));
+                }
+
+                if (m.getGitlabAccount() != null && m.getGitlabAccount().getUsername() != null) {
+                    String gitlabUsername = m.getGitlabAccount().getUsername();
+                    String gitlabLinkMarkdown = "<a href=\"https://gitlab.com/" + gitlabUsername
+                            + "\" target=\"_blank\" rel=\"noopener noreferrer\">"
+                            + gitlabUsername + "</a>";
+                    Jt.markdown(gitlabLinkMarkdown).use(row.col(3));
+                } else {
+                    Jt.text("").use(row.col(3));
+                }
                 Jt.text(m.getCity() != null ? m.getCity() : "").use(row.col(4));
                 if (Jt.button("📝").key("btn_edit_" + m.getId()).use(row.col(5))) {
                     selectedMemberId = m.getId();
@@ -128,7 +183,7 @@ public void render(JtContainer membersTab) {
                         m.setCity(newCity);
                         firestoreServices.createMember(m);
                         selectedMemberId = null;
-                        Jt.success("Successfully updated ✅").use(membersTab);
+                        Jt.success("✅ Successfully updated").use(membersTab);
                         Jt.markdown("<style>#edit_row_" + m.getId() + " { display: none !important; }</style>").use(membersTab);
                     }
                     if (Jt.button("Cancel").key("btn_cancel_" + m.getId()).use(editRow.col(5))) {

src/main/java/zenika/oss/stats/ui/tabs/ProjectsTab.java

@@ -109,8 +109,6 @@ record ProjectDisplay(String id, String name, String fullName, String url, Long
                 Jt.text("no data available").use(projectsTab);
             }
 
-            Jt.text("Fetch and save personal projects (not forked) for all saved members.").use(projectsTab);
-
         } catch (Exception e) {
             Jt.warning("Could not load current projects: " + e.getMessage()).use(projectsTab);
             LOG.error("Could not load current projects", e);