From 8b9822de19cfdec1f07606f86c4172a88bfdb0b5 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Wed, 14 Apr 2021 16:56:47 +0400
Subject: [PATCH] #22 - Change statistic pie

---
 .../extractor/controller/StatisticController.java     | 11 +++++++++++
 .../ulstu/extractor/repository/CommitRepository.java  |  3 +++
 src/main/resources/templates/statistic.html           | 10 +++++-----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/main/java/ru/ulstu/extractor/controller/StatisticController.java b/src/main/java/ru/ulstu/extractor/controller/StatisticController.java
index 7952aba..eaa2340 100644
--- a/src/main/java/ru/ulstu/extractor/controller/StatisticController.java
+++ b/src/main/java/ru/ulstu/extractor/controller/StatisticController.java
@@ -50,7 +50,18 @@ public class StatisticController {
         List<Object[]> entityCommits = commitRepository.getCommitEntityStatistic().stream()
                 .map(stat -> new Object[]{stat.getEntity(), stat.getCountCommit()})
                 .collect(Collectors.toList());
+        for (int i = 0; i < entityCommits.size(); i++) {
+            entityCommits.get(i)[0] = Boolean.TRUE.equals(entityCommits.get(i)[0])
+                    ? "Есть сущности"
+                    : (entityCommits.get(i)[0] == null
+                    ? "Нет данных"
+                    : "Нет сущностей");
+        }
         model.addAttribute("commitEntityData", entityCommits);
+        List<Object[]> timeEntityCommits = commitRepository.getCommitTimeEntityStatistic().stream()
+                .map(stat -> new Object[]{stat.getDate(), stat.getCountCommit()})
+                .collect(Collectors.toList());
+        model.addAttribute("commitTimeEntityData", timeEntityCommits);
         return STATISTIC;
     }
 }
diff --git a/src/main/java/ru/ulstu/extractor/repository/CommitRepository.java b/src/main/java/ru/ulstu/extractor/repository/CommitRepository.java
index 9b92756..f7fe48a 100644
--- a/src/main/java/ru/ulstu/extractor/repository/CommitRepository.java
+++ b/src/main/java/ru/ulstu/extractor/repository/CommitRepository.java
@@ -35,4 +35,7 @@ public interface CommitRepository extends JpaRepository<Commit, Integer> {
     @Query("SELECT new ru.ulstu.extractor.model.CommitEntityStatistic(f.containsEntity, COUNT(DISTINCT c.hash)) FROM FileChange f, Commit c WHERE f MEMBER OF c.fileChanges GROUP by f.containsEntity")
     List<CommitEntityStatistic> getCommitEntityStatistic();
 
+    @Query("SELECT new ru.ulstu.extractor.model.CommitTimeStatistic(cast(c.date as date), COUNT(DISTINCT c.hash)) FROM Commit c, FileChange f WHERE f MEMBER OF c.fileChanges AND f.containsEntity = true GROUP by cast(c.date as date) ORDER by cast(c.date as date)")
+    List<CommitTimeStatistic> getCommitTimeEntityStatistic();
+
 }
diff --git a/src/main/resources/templates/statistic.html b/src/main/resources/templates/statistic.html
index 2ed8f82..a1f9c9a 100644
--- a/src/main/resources/templates/statistic.html
+++ b/src/main/resources/templates/statistic.html
@@ -15,10 +15,6 @@
     <script src="/webjars/highcharts/7.0.0/highcharts.js"></script>
     <script th:inline="javascript">
         $(document).ready(function () {
-            var chart = {
-                type: 'scatter',
-                zoomType: 'xy'
-            };
             var title = {
                 text: 'Количество коммитов во времени'
             };
@@ -66,11 +62,15 @@
                     name: 'Коммиты',
                     color: 'rgba(119,152,191,0.5)',
                     data: [[${commitTimeData}]]
+                },
+                {
+                    name: 'Сущности',
+                    color: 'rgba(255,0,0,0.5)',
+                    data: [[${commitTimeEntityData}]]
                 }
             ];
 
             var json = {};
-            json.chart = chart;
             json.title = title;
             json.xAxis = xAxis;
             json.yAxis = yAxis;