From 87b02af68e7117c64e22f9593bbde10b3ab48465 Mon Sep 17 00:00:00 2001
From: Bartha Maxime <231026@umons.ac.be>
Date: Tue, 16 Apr 2024 11:54:11 +0200
Subject: [PATCH] added stats SQL queries

---
 .../StatsRepository.java                      | 21 +++++++++++++++----
 .../StatisticsService.java                    |  9 ++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java
index ae025ce..95f4da6 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Repositories/ScientificPublications/StatsRepository.java
@@ -11,17 +11,30 @@ public interface StatsRepository extends CrudRepository<Research,Long> {
     @Query("select new map(to_char(r.releaseDate, 'month') as label, sum(r.views) as y) from Research r group by to_char(r.releaseDate, 'month')")
     Iterable<Map<String ,Integer>> viewsByMonths();
 
-/**
+    @Query("select new map(to_char(r.releaseDate,'year') as label, sum  (r.views) as y) from Research r group by to_char(r.releaseDate,'year')")
     Iterable<Map<String ,Integer>> viewsByYears();
+
+
+    @Query("select new map(r.domain as label, sum(r.views) as y) from Research r group by r.domain")
     Iterable<Map<String ,Integer>> viewsByTopics();
-    Iterable<Map<String ,Integer>> coAuthorByMonths();
-    Iterable<Map<String ,Integer>> coAuthorsByTopics();
+
+
+    @Query("select new map(r.domain as label, r.language as y) from Research r group by r.domain")
     Iterable<Map<String ,Integer>> languageByTopics();
+
+    @Query("select new map(to_char(r.releaseDate,'year') as label,  r.language as y) from Research r group by to_char(r.releaseDate,'year')")
     Iterable<Map<String ,Integer>> languageByYears();
+
+    @Query("select new map(to_char(r.releaseDate, 'month') as label, r.language as y) from Research r group by to_char(r.releaseDate, 'month')")
     Iterable<Map<String ,Integer>> languageByMonths();
+
+    @Query("select new map(to_char(r.releaseDate,'year') as label, count(r) as y) from Research r group by to_char(r.releaseDate,'year')")
     Iterable<Map<String ,Integer>> researchesByYears();
+
+    @Query("select new map(r.domain as label, count(r) as y) from Research r group by r.domain")
     Iterable<Map<String ,Integer>> researchesByTopics();
+
+    @Query("select new map(to_char(r.releaseDate, 'month') as label, count(r) as y) from Research r group by to_char(r.releaseDate, 'month')")
     Iterable<Map<String ,Integer>> researchesByMonth();
-**/
 
 }
diff --git a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/StatisticsService.java b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/StatisticsService.java
index d547943..886285b 100644
--- a/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/StatisticsService.java
+++ b/backend/src/main/java/ovh/herisson/Clyde/Services/ScientificPublications/StatisticsService.java
@@ -29,8 +29,17 @@ public class StatisticsService {
 
         ArrayList<Iterable<Map<String,Integer>>> toReturn = new ArrayList<>();
 
+        toReturn.add(statsRepo.viewsByYears());
         toReturn.add(statsRepo.viewsByMonths());
+        toReturn.add(statsRepo.viewsByTopics());
 
+        toReturn.add(statsRepo.researchesByYears());
+        toReturn.add(statsRepo.researchesByMonth());
+        toReturn.add(statsRepo.researchesByTopics());
+
+        toReturn.add(statsRepo.languageByYears());
+        toReturn.add(statsRepo.languageByMonths());
+        toReturn.add(statsRepo.languageByTopics());
 
         return toReturn;
     }