From 504d42e96c8bcd67b1d192ddc296c4270068040f Mon Sep 17 00:00:00 2001
From: "michele.artini" <michele.artini@isti.cnr.it>
Date: Wed, 17 Feb 2021 12:19:20 +0100
Subject: [PATCH] summary with total of events from ES and from DB

---
 .../broker/controllers/AjaxController.java    | 19 +++++++++++++++++--
 .../src/main/resources/sql/totalEvents.sql    |  1 +
 .../main/resources/static/html/summary.html   | 12 +++++++++---
 3 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 apps/dhp-broker-application/src/main/resources/sql/totalEvents.sql

diff --git a/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/AjaxController.java b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/AjaxController.java
index ded48595..2b6399a1 100644
--- a/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/AjaxController.java
+++ b/apps/dhp-broker-application/src/main/java/eu/dnetlib/broker/controllers/AjaxController.java
@@ -4,8 +4,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -54,6 +56,9 @@ public class AjaxController extends AbstractDnetController {
 	@Autowired
 	private ThreadManager threadManager;
 
+	@Autowired
+	private JdbcTemplate jdbcTemplate;
+
 	@Value("${lbs.elastic.homepage}")
 	private String elasticSearchUiUrl;
 
@@ -92,14 +97,24 @@ public class AjaxController extends AbstractDnetController {
 			currentStatus.setDispatchers(dispatchers);
 			currentStatus.setThreads(threads);
 			currentStatus.getTotals().put("topics", topicTypeRepo.count());
-			currentStatus.getTotals().put("events", eventRepository.count());
+			currentStatus.getTotals().put("events_es", eventRepository.count());
+			currentStatus.getTotals().put("events_db", countEventsInTheDb());
 			currentStatus.getTotals().put("subscriptions", subscriptionRepo.count());
-			currentStatus.getTotals().put("notifications", notificationRepository.count());
+			currentStatus.getTotals().put("notifications_es", notificationRepository.count());
 
 			return currentStatus;
 		}
 	}
 
+	private Long countEventsInTheDb() {
+		try {
+			final String sql = IOUtils.toString(getClass().getResourceAsStream("/sql/totalEvents.sql"));
+			return jdbcTemplate.queryForObject(sql, Long.class);
+		} catch (final Exception e) {
+			return 0l;
+		}
+	}
+
 	@GetMapping("/resetCounters")
 	public CurrentStatus resetCounters() {
 		dispatcherManager.getDispatchers().forEach(NotificationDispatcher::resetCount);
diff --git a/apps/dhp-broker-application/src/main/resources/sql/totalEvents.sql b/apps/dhp-broker-application/src/main/resources/sql/totalEvents.sql
new file mode 100644
index 00000000..33bfd5ec
--- /dev/null
+++ b/apps/dhp-broker-application/src/main/resources/sql/totalEvents.sql
@@ -0,0 +1 @@
+select sum(size) from oa_datasource_stats;
diff --git a/apps/dhp-broker-application/src/main/resources/static/html/summary.html b/apps/dhp-broker-application/src/main/resources/static/html/summary.html
index b2e9dc60..0dc74bf3 100644
--- a/apps/dhp-broker-application/src/main/resources/static/html/summary.html
+++ b/apps/dhp-broker-application/src/main/resources/static/html/summary.html
@@ -22,9 +22,15 @@
 						</td>
 					</tr>
 					<tr>
-						<th class="col-xs-6">n. events</th>
+						<th class="col-xs-6">n. events (total)</th>
 						<td class="col-xs-6 text-right">
-							{{summary.totals.events}}
+							{{summary.totals.events_db}}
+						</td>
+					</tr>
+					<tr>
+						<th class="col-xs-6">n. events (on ES)</th>
+						<td class="col-xs-6 text-right">
+							{{summary.totals.events_es}}
 						</td>
 					</tr>
 					<tr>
@@ -36,7 +42,7 @@
 					<tr>
 						<th class="col-xs-6">n. notifications</th>
 						<td class="col-xs-6 text-right">
-							{{summary.totals.notifications}}
+							{{summary.totals.notifications_es}}
 						</td>
 					</tr>
 				</table>