From b4c2cdef7d59b2354ab4190b874c0b00e642809a Mon Sep 17 00:00:00 2001
From: downtownallday <downtownallday@gmail.com>
Date: Thu, 8 Apr 2021 13:29:04 -0400
Subject: [PATCH] Include IMAP connection records in overall db stats table

---
 management/reporting/ui/capture-db-stats.js     | 16 ++++++++--------
 management/reporting/uidata/capture_db_stats.py |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/management/reporting/ui/capture-db-stats.js b/management/reporting/ui/capture-db-stats.js
index 13b4f092..b828dc5d 100644
--- a/management/reporting/ui/capture-db-stats.js
+++ b/management/reporting/ui/capture-db-stats.js
@@ -6,7 +6,7 @@ Vue.component('capture-db-stats', {
 
     template:'<div>'+
         '<template v-if="stats">'+
-           '<caption class="text-nowrap">Database date range</caption><div class="ml-2">First: {{stats.mta_connect.connect_time.min_str}}</div><div class="ml-2">Last: {{stats.mta_connect.connect_time.max_str}}</div>'+
+           '<caption class="text-nowrap">Database date range</caption><div class="ml-2">First: {{stats.db_stats.connect_time.min_str}}</div><div class="ml-2">Last: {{stats.db_stats.connect_time.max_str}}</div>'+
            '<div class="mt-2">'+
            '  <b-table-lite small caption="Connections by disposition" caption-top :fields="row_counts.fields" :items=row_counts.items></b-table-lite>'+
            '</div>'+
@@ -37,9 +37,9 @@ Vue.component('capture-db-stats', {
                     // convert dates
                     var parser = d3.utcParse(this.stats.date_parse_format);
                     [ 'min', 'max' ].forEach( k => {
-                        var d = parser(this.stats.mta_connect.connect_time[k]);
-                        this.stats.mta_connect.connect_time[k] = d;
-                        this.stats.mta_connect.connect_time[k+'_str'] =
+                        var d = parser(this.stats.db_stats.connect_time[k]);
+                        this.stats.db_stats.connect_time[k] = d;
+                        this.stats.db_stats.connect_time[k+'_str'] =
                             d==null ? '-' : DateFormatter.dt_long(d);
                     });
 
@@ -63,11 +63,11 @@ Vue.component('capture-db-stats', {
                     this.row_counts.fields[0].tdClass = 'text-capitalize';
 
 
-                    const total = this.stats.mta_connect.count;
-                    for (var name in this.stats.mta_connect.disposition)
+                    const total = this.stats.db_stats.count;
+                    for (var name in this.stats.db_stats.disposition)
                     {
                         const count =
-                              this.stats.mta_connect.disposition[name].count;
+                              this.stats.db_stats.disposition[name].count;
                         this.row_counts.items.push({
                             name: name,
                             count: count,
@@ -80,7 +80,7 @@ Vue.component('capture-db-stats', {
                     })
                     this.row_counts.items.push({
                         name:'Total',
-                        count:this.stats.mta_connect.count,
+                        count:this.stats.db_stats.count,
                         percent:1,
                         '_rowVariant': 'primary'
                     });
diff --git a/management/reporting/uidata/capture_db_stats.py b/management/reporting/uidata/capture_db_stats.py
index a4df3a0a..76b28345 100644
--- a/management/reporting/uidata/capture_db_stats.py
+++ b/management/reporting/uidata/capture_db_stats.py
@@ -17,10 +17,10 @@ def capture_db_stats(conn):
     if stats:
         return stats
     
-    select_1 = 'SELECT min(connect_time) AS `min`, max(connect_time) AS `max`, count(*) AS `count` FROM mta_connection'
+    select_1 = 'SELECT min(`min`) AS `min`, max(`max`) AS `max`, sum(`count`) AS `count` FROM (SELECT min(connect_time) AS `min`, max(connect_time) AS `max`, count(*) AS `count` FROM mta_connection  UNION  SELECT min(connect_time) AS `min`, max(connect_time) AS `max`, count(*) AS `count` FROM imap_connection)'
 
     # table scan
-    select_2 = 'SELECT disposition, count(*) AS `count` FROM mta_connection GROUP BY disposition'
+    select_2 = 'SELECT disposition, sum(count) as `count` FROM (SELECT disposition, count(*) AS `count` FROM mta_connection GROUP BY disposition  UNION  SELECT disposition, count(*) AS `count` FROM imap_connection GROUP BY disposition) GROUP BY disposition'
     
     c = conn.cursor()
     stats = {
@@ -29,7 +29,7 @@ def capture_db_stats(conn):
     }
     try:
         row = c.execute(select_1).fetchone()
-        stats['mta_connect'] = {
+        stats['db_stats'] = {
             'connect_time': {
                 'min': row['min'],
                 'max': row['max'], # YYYY-MM-DD HH:MM:SS (utc)
@@ -39,7 +39,7 @@ def capture_db_stats(conn):
         }
 
         for row in c.execute(select_2):
-            stats['mta_connect']['disposition'][row['disposition']] =  {
+            stats['db_stats']['disposition'][row['disposition']] =  {
                 'count': row['count']
             }