Merge branch 'master' into heartbeat

1 files changed, 27 insertions, 1 deletions

diff --git a/src/server/index.ts b/src/server/index.ts
index 6e6bde3cb..8b2e18847 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -4,6 +4,7 @@ import * as mobileDetect from 'mobile-detect';
 import * as path from 'path';
 import * as qs from 'query-string';
 import { log_execution } from './ActionUtilities';
+import DataVizManager from './ApiManagers/DataVizManager';
 import DeleteManager from './ApiManagers/DeleteManager';
 import DownloadManager from './ApiManagers/DownloadManager';
 import GeneralGoogleManager from './ApiManagers/GeneralGoogleManager';
@@ -18,6 +19,7 @@ import { GoogleCredentialsLoader, SSL } from './apis/google/CredentialsLoader';
 import { GoogleApiServerUtils } from './apis/google/GoogleApiServerUtils';
 import { DashSessionAgent } from './DashSession/DashSessionAgent';
 import { AppliedSessionAgent } from './DashSession/Session/agents/applied_session_agent';
+import { DashStats } from './DashStats';
 import { DashUploadUtils } from './DashUploadUtils';
 import { Database } from './database';
 import { Logger } from './ProcessFactory';
@@ -62,7 +64,19 @@ async function preliminaryFunctions() {
  * with the server
  */
 function routeSetter({ isRelease, addSupervisedRoute, logRegistrationOutcome }: RouteManager) {
-    const managers = [new SessionManager(), new UserManager(), new UploadManager(), new DownloadManager(), new SearchManager(), new PDFManager(), new DeleteManager(), new UtilManager(), new GeneralGoogleManager(), new GooglePhotosManager()];
+    const managers = [
+        new SessionManager(),
+        new UserManager(),
+        new UploadManager(),
+        new DownloadManager(),
+        new SearchManager(),
+        new PDFManager(),
+        new DeleteManager(),
+        new UtilManager(),
+        new GeneralGoogleManager(),
+        new GooglePhotosManager(),
+        new DataVizManager(),
+    ];
 
     // initialize API Managers
     console.log(yellow('\nregistering server routes...'));
@@ -85,6 +99,18 @@ function routeSetter({ isRelease, addSupervisedRoute, logRegistrationOutcome }:
 
     addSupervisedRoute({
         method: Method.GET,
+        subscription: '/stats',
+        secureHandler: ({ res }) => DashStats.handleStats(res),
+    });
+
+    addSupervisedRoute({
+        method: Method.GET,
+        subscription: '/statsview',
+        secureHandler: ({ res }) => DashStats.handleStatsView(res),
+    });
+
+    addSupervisedRoute({
+        method: Method.GET,
         subscription: '/resolvedPorts',
         secureHandler: ({ res }) => res.send(resolvedPorts),
         publicHandler: ({ res }) => res.send(resolvedPorts),