✨ Integrate Javelit to build dashboard + configure semantic release (#28)

✨ 🚀 Init Javelit interface

Author: jeanphi-baconnais

.env-example

@@ -1,2 +1,2 @@
 # This is an example of env file.
-github.token=<set your token here>
+github.token=<set your token here>

.github/workflows/release.yml

@@ -0,0 +1,40 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: maven
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 'lts/*'
+
+      - name: Install dependencies
+        run: npm install -g semantic-release semantic-release-gitmoji @semantic-release/exec @semantic-release/git
+
+      - name: Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: npx semantic-release

.releaserc.json

@@ -0,0 +1,33 @@
+{
+  "branches": ["main"],
+  "plugins": [
+    [
+      "semantic-release-gitmoji",
+      {
+        "releaseRules": {
+          "major": [":boom:"],
+          "minor": [":sparkles:"],
+          "patch": [":bug:", ":ambulance:", ":lock:"]
+        },
+        "releaseNotes": {
+          "template": "default"
+        }
+      }
+    ],
+    "@semantic-release/github",
+    [
+      "@semantic-release/exec",
+      {
+        "prepareCmd": "mvn versions:set -DnewVersion=${nextRelease.version} && mvn versions:commit",
+        "publishCmd": "mvn deploy -DskipTests"
+      }
+    ],
+    [
+      "@semantic-release/git",
+      {
+        "assets": ["pom.xml"],
+        "message": ":bookmark: ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
+      }
+    ]
+  ]
+}

README.md

@@ -1,15 +1,19 @@
 # Opensource-statistiques 📊
 
+![GitHub Release](https://img.shields.io/github/v/release/zenika-open-source/opensource-statistics)
+![Quarkus](https://img.shields.io/badge/Quarkus-3.12.1-4695EB?logo=quarkus)
+![Java](https://img.shields.io/badge/Java-17-ED8B00?logo=openjdk&logoColor=white)
+
 🚧 This project is in progress ... 
 
-One objective of this project is to highlight Zenika members for your open source contributions. 
+One objective of this project is to highlight Zenika members for their open source contributions. 
 
-To do this, the zenika-open-source GitHub Organization is scanned and data are be saved in a private Database on GCP.
-Datas could be used to find and list projects maintained or forked by Zenika Members, all projects which Zenika members contributed, etc.
+To do this, the zenika-open-source GitHub Organization is scanned and data is saved in a private Database on GCP.
+Data could be used to find and list projects maintained or forked by Zenika Members, all projects to which Zenika members contributed, etc.
 
 ## 🗄️ Tech 
 
-Using :
+Using:
 - [Quarkus](https://quarkus.io/)
 - [Firestore](https://docs.quarkiverse.io/quarkus-google-cloud-services/) to save data
 - [GitHub actions](https://github.com/features/actions) as CICD - 🚧 not implemented
@@ -23,7 +27,7 @@ Some resources are available but only the first is in progress :
 - `/contributions/` to get information about contributions from GCP database 🚧 not implemented
 - `/workflow/` to get data and save them on GCP database
 
-> 🎯 The last one resource will be removed after implementing all features and will be replaced by schedules. 
+> 🎯 The last resource will be removed after implementing all features and will be replaced by schedules. 
 
 ## 📝 Setup 
 
@@ -33,9 +37,8 @@ Some resources are available but only the first is in progress :
 - Run the application with `quarkus dev` if you have the [Quarkus CLI](https://quarkus.io/guides/cli-tooling) installed on your environment, or `mvn quarkus:dev`command.
 - You can use Quarkus dev service for Firestore enabling this variable `quarkus.google.cloud.firestore.devservice.enabled` in application.properties file.
 
-
 ## ✨Contribute 
 
-Anyone can contribute to this project. For the moment, please add your question or purpose something in [a new issue](https://github.com/zenika-open-source/opensource-statistics/issues).
+Anyone can contribute to this project. For the moment, please add your question or propose something in [a new issue](https://github.com/zenika-open-source/opensource-statistics/issues).
 
 ![with love by zenika](https://img.shields.io/badge/With%20%E2%9D%A4%EF%B8%8F%20by-Zenika-b51432.svg?link=https://oss.zenika.com)

pom.xml

@@ -99,6 +99,15 @@
       <artifactId>quarkus-junit5-mockito</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.javelit</groupId>
+      <artifactId>javelit</artifactId>
+      <version>0.86.0</version>
+    </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-cache</artifactId>
+    </dependency>
 
   </dependencies>
   <build>

src/main/java/zenika/oss/stats/beans/ZenikaMember.java

@@ -11,6 +11,8 @@ public class ZenikaMember {
 
     private String firstname;
 
+    private String city;
+
     private GitHubMember gitHubAccount;
 
     private GitLabMember gitlabAccount;
@@ -39,6 +41,14 @@ public void setFirstname(String firstname) {
         this.firstname = firstname;
     }
 
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
     public GitHubMember getGitHubAccount() {
         return gitHubAccount;
     }

src/main/java/zenika/oss/stats/beans/github/Parent.java

@@ -0,0 +1,33 @@
+package zenika.oss.stats.beans.github;
+
+public class Parent {
+
+    public String title;
+    public String url;
+    public String html_url;
+    public String full_name;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getHtml_url() {
+        return html_url;
+    }
+
+    public void setHtml_url(String html_url) {
+        this.html_url = html_url;
+    }
+}

src/main/java/zenika/oss/stats/beans/gitlab/GitLabMember.java

@@ -1,4 +1,13 @@
 package zenika.oss.stats.beans.gitlab;
 
 public class GitLabMember {
+    private String username;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
 }

src/main/java/zenika/oss/stats/mapper/ZenikaMemberMapper.java

@@ -3,6 +3,7 @@
 import com.google.cloud.firestore.QueryDocumentSnapshot;
 import zenika.oss.stats.beans.ZenikaMember;
 import zenika.oss.stats.beans.github.GitHubMember;
+import zenika.oss.stats.beans.gitlab.GitLabMember;
 
 import java.util.UUID;
 
@@ -19,14 +20,18 @@ public static ZenikaMember mapFirestoreZenikaMemberToZenikaMember(QueryDocumentS
 
         zenikaMember.setFirstname(documentMember.getString("firstname"));
         zenikaMember.setName(documentMember.getString("name"));
+        zenikaMember.setCity(documentMember.getString("city"));
         zenikaMember.setId(documentMember.getId());
         zenikaMember.setGitHubAccount(documentMember.get("gitHubAccount", GitHubMember.class));
+        zenikaMember.setGitlabAccount(documentMember.get("gitlabAccount", GitLabMember.class));
 
         return zenikaMember;
+
     }
 
     /**
      * Create a ZenikaMember from a GitHub Member.
+     * 
      * @param gitHubMember : the github Member to map
      * @return an instance of ZenikaMember
      */

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

@@ -40,7 +40,8 @@ public Response saveMembers() throws DatabaseException {
         firestoreServices.deleteAllMembers();
 
         List<GitHubMember> gitHubMembers = gitHubServices.getZenikaOpenSourceMembers();
-        gitHubMembers.forEach(gitHubMember -> firestoreServices.createMember(ZenikaMemberMapper.mapGitHubMemberToZenikaMember(gitHubMember)));
+        gitHubMembers.forEach(gitHubMember -> firestoreServices
+                .createMember(ZenikaMemberMapper.mapGitHubMemberToZenikaMember(gitHubMember)));
 
         return Response.ok().build();
     }
@@ -62,7 +63,8 @@ public Response savePersonalProjects() throws DatabaseException {
         List<ZenikaMember> members = firestoreServices.getAllMembers();
 
         members.forEach(member -> {
-            List<GitHubProject> gitHubProjects = gitHubServices.getPersonalProjectForAnUser(member.getGitHubAccount().getLogin());
+            List<GitHubProject> gitHubProjects = gitHubServices
+                    .getPersonalProjectForAnUser(member.getGitHubAccount().getLogin());
 
             gitHubProjects.forEach(project -> {
                 firestoreServices.createProject(project);
@@ -75,7 +77,6 @@ public Response savePersonalProjects() throws DatabaseException {
     @Path("stats/save/{year}")
     @Produces(MediaType.TEXT_PLAIN)
     public Response saveStatsForYear(@PathParam("year") int year) throws DatabaseException {
-        List<CustomStatsContributionsUserByMonth> stats = new ArrayList<>();
 
         firestoreServices.deleteStatsForAllGitHubAccountForAYear(year);
 
@@ -84,8 +85,10 @@ public Response saveStatsForYear(@PathParam("year") int year) throws DatabaseExc
         for (ZenikaMember zenikaMember : zMembers) {
             if (zenikaMember.getGitHubAccount() != null) {
                 System.out.print("\uD83D\uDD0E Check information for " + zenikaMember.getGitHubAccount().getLogin());
-                stats.addAll(gitHubServices.getContributionsForTheCurrentYear(zenikaMember.getGitHubAccount().getLogin(), year));
-                List<StatsContribution> statsMap = StatsMapper.mapGithubStatisticsToStatsContribution(zenikaMember.getGitHubAccount().getLogin(), year, stats);
+                List<CustomStatsContributionsUserByMonth> stats = gitHubServices
+                        .getContributionsForTheCurrentYear(zenikaMember.getGitHubAccount().getLogin(), year);
+                List<StatsContribution> statsMap = StatsMapper.mapGithubStatisticsToStatsContribution(
+                        zenikaMember.getGitHubAccount().getLogin(), year, stats);
                 System.out.println("... ✅");
 
                 if (!statsMap.isEmpty()) {
@@ -102,13 +105,16 @@ public Response saveStatsForYear(@PathParam("year") int year) throws DatabaseExc
     @POST
     @Path("stats/save/{githubMember}/{year}")
     @Produces(MediaType.TEXT_PLAIN)
-    public Response saveStatsForAGitHubAccountForAYear(@PathParam("githubMember") String githubMember, @PathParam("year") int year) throws DatabaseException {
+    public Response saveStatsForAGitHubAccountForAYear(@PathParam("githubMember") String githubMember,
+            @PathParam("year") int year) throws DatabaseException {
 
         firestoreServices.deleteStatsForAGitHubAccountForAYear(githubMember, year);
 
-        List<CustomStatsContributionsUserByMonth> stats = gitHubServices.getContributionsForTheCurrentYear(githubMember, year);
+        List<CustomStatsContributionsUserByMonth> stats = gitHubServices.getContributionsForTheCurrentYear(githubMember,
+                year);
 
-        List<StatsContribution> statsMap = StatsMapper.mapGithubStatisticsToStatsContribution(githubMember, year, stats);
+        List<StatsContribution> statsMap = StatsMapper.mapGithubStatisticsToStatsContribution(githubMember, year,
+                stats);
 
         if (!statsMap.isEmpty()) {
             for (StatsContribution stat : statsMap) {