From 6304365ec6f23f9b235bf8d2496dcb4204b609fc Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Thu, 15 Apr 2021 16:11:44 +0400
Subject: [PATCH] Change entity pie

---
 .../controller/StatisticController.java          | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ru/ulstu/extractor/controller/StatisticController.java b/src/main/java/ru/ulstu/extractor/controller/StatisticController.java
index eaa2340..eaddd6b 100644
--- a/src/main/java/ru/ulstu/extractor/controller/StatisticController.java
+++ b/src/main/java/ru/ulstu/extractor/controller/StatisticController.java
@@ -61,7 +61,21 @@ public class StatisticController {
         List<Object[]> timeEntityCommits = commitRepository.getCommitTimeEntityStatistic().stream()
                 .map(stat -> new Object[]{stat.getDate(), stat.getCountCommit()})
                 .collect(Collectors.toList());
-        model.addAttribute("commitTimeEntityData", timeEntityCommits);
+        List<Object[]> allTimeEntityCommits = commitRepository.getCommitTimeStatistic().stream()
+                .map(stat -> new Object[]{stat.getDate(), stat.getCountCommit()})
+                .collect(Collectors.toList());
+        int j = 0;
+        for (int i = 0; i < allTimeEntityCommits.size(); i++) {
+            if ((j < timeEntityCommits.size()) && (allTimeEntityCommits.get(i)[0].equals(timeEntityCommits.get(j)[0]))) {
+                allTimeEntityCommits.get(i)[1] = timeEntityCommits.get(j)[1];
+                j++;
+            } else {
+                if (i > 0) {
+                    allTimeEntityCommits.get(i)[1] = allTimeEntityCommits.get(i - 1)[1];
+                }
+            }
+        }
+        model.addAttribute("commitTimeEntityData", allTimeEntityCommits);
         return STATISTIC;
     }
 }