Refactor time monitor (#815)

* Remove old code
* Add helper for maxTime for data cube
* Encapsulate logic inside time monitor and remove creating max time query from settings manager

src/common/utils/query/max-time-query.ts

@@ -15,6 +15,11 @@
  */
 
 import { $, Dataset, Executor, ply, RefExpression } from "plywood";
+import { QueryableDataCube } from "../../models/data-cube/queryable-data-cube";
+
+export function maxTimeQueryForCube({ timeAttribute, executor }: QueryableDataCube): Promise<Date> {
+  return maxTimeQuery(timeAttribute, executor);
+}
 
 export function maxTimeQuery(timeAttribute?: RefExpression, executor?: Executor): Promise<Date> {
   if (!executor) {

src/common/utils/time-monitor/time-monitor.ts

@@ -16,36 +16,35 @@
  */
 
 import { Logger } from "../../logger/logger";
+import { DataCube } from "../../models/data-cube/data-cube";
+import { QueryableDataCube } from "../../models/data-cube/queryable-data-cube";
 import { TimeTag } from "../../models/time-tag/time-tag";
 import { Timekeeper } from "../../models/timekeeper/timekeeper";
-
-export type Check = () => Promise<Date>;
+import { Nullary } from "../functional/functional";
+import { maxTimeQueryForCube } from "../query/max-time-query";
 
 export class TimeMonitor {
-  public logger: Logger;
-  public regularCheckInterval: number;
-  public specialCheckInterval: number;
   public timekeeper: Timekeeper;
-  public checks: Map<string, Check>;
+  private regularCheckInterval: number;
+  private checks: Map<string, Nullary<Promise<Date>>>;
   private doingChecks = false;
 
-  constructor(logger: Logger) {
-    this.logger = logger;
+  constructor(private logger: Logger) {
     this.checks = new Map();
     this.regularCheckInterval = 60000;
-    this.specialCheckInterval = 60000;
     this.timekeeper = Timekeeper.EMPTY;
     setInterval(this.doChecks, 1000);
   }
 
-  removeCheck(name: string): this {
+  removeCheck({ name }: DataCube): this {
     this.checks.delete(name);
     this.timekeeper = this.timekeeper.removeTimeTagFor(name);
     return this;
   }
 
-  addCheck(name: string, check: Check): this {
-    this.checks.set(name, check);
+  addCheck(cube: QueryableDataCube): this {
+    const { name } = cube;
+    this.checks.set(name, () => maxTimeQueryForCube(cube));
     this.timekeeper = this.timekeeper.addTimeTagFor(name);
     return this;
   }

src/server/utils/settings-manager/settings-manager.ts

@@ -33,7 +33,6 @@ import dataCubeToExternal from "../../../common/utils/external/datacube-to-exter
 import { noop, Unary } from "../../../common/utils/functional/functional";
 import { pluralIfNeeded } from "../../../common/utils/general/general";
 import { timeout } from "../../../common/utils/promise/promise";
-import { maxTimeQuery } from "../../../common/utils/query/max-time-query";
 import { TimeMonitor } from "../../../common/utils/time-monitor/time-monitor";
 import { ClusterManager } from "../cluster-manager/cluster-manager";
 import { FileManager } from "../file-manager/file-manager";
@@ -206,9 +205,7 @@ export class SettingsManager {
     const queryableDataCube = attachDatasetExecutor(dataCube, changedDataset);
 
     if (queryableDataCube.refreshRule.isQuery()) {
-      this.timeMonitor.addCheck(dataCube.name, () => {
-        return maxTimeQuery(queryableDataCube.timeAttribute, queryableDataCube.executor);
-      });
+      this.timeMonitor.addCheck(queryableDataCube);
     }
 
     this.sources = addOrUpdateDataCube(sources, queryableDataCube);
@@ -227,9 +224,7 @@ export class SettingsManager {
     const queryableDataCube = attachExternalExecutor(dataCube, changedExternal);
 
     if (queryableDataCube.refreshRule.isQuery()) {
-      this.timeMonitor.addCheck(queryableDataCube.name, () => {
-        return maxTimeQuery(queryableDataCube.timeAttribute, queryableDataCube.executor);
-      });
+      this.timeMonitor.addCheck(queryableDataCube);
     }
 
     this.sources = addOrUpdateDataCube(sources, queryableDataCube);
@@ -245,7 +240,7 @@ export class SettingsManager {
     let dataCube = getDataCube(sources, dataCubeName);
     if (dataCube) {
       this.sources = deleteDataCube(sources, dataCube);
-      this.timeMonitor.removeCheck(dataCube.name);
+      this.timeMonitor.removeCheck(dataCube);
     }
     return Promise.resolve(null);
   };