Relearning after unit updating (#647)

server/src/controllers/analytics_controller.ts

@@ -581,7 +581,7 @@ export async function getHSR(analyticUnit: AnalyticUnit.AnalyticUnit, from: numb
 
     if(analyticUnit.detectorType !== AnalyticUnit.DetectorType.ANOMALY) {
       return data;
-    } else {
+    }
     let cache = await AnalyticUnitCache.findById(analyticUnit.id);
     if(
       cache === null ||
@@ -608,8 +608,7 @@ export async function getHSR(analyticUnit: AnalyticUnit.AnalyticUnit, from: numb
     if(result.status !== AnalyticUnit.AnalyticUnitStatus.SUCCESS) {
       throw new Error(`Data processing error: ${result.error}`);
     }
-      return { values: result.payload.data, columns: data.columns }
+    return { values: result.payload.data, columns: data.columns };
-    }
   } catch (err) {
     const message = err.message || JSON.stringify(err);
     await AnalyticUnit.setStatus(analyticUnit.id, AnalyticUnit.AnalyticUnitStatus.FAILED, message);

server/src/models/analytic_units/analytic_unit_model.ts

@@ -4,6 +4,9 @@ import { Metric } from 'grafana-datasource-kit';
 
 
 export abstract class AnalyticUnit {
+
+  public learningAfterUpdateRequired = false;
+
   constructor(
     public name: string,
     public grafanaUrl: string,

server/src/models/analytic_units/anomaly_analytic_unit_model.ts

@@ -5,6 +5,9 @@ import { Metric } from 'grafana-datasource-kit';
 
 
 export class AnomalyAnalyticUnit extends AnalyticUnit {
+
+  public learningAfterUpdateRequired = true;
+
   constructor(
     name: string,
     grafanaUrl: string,

server/src/models/analytic_units/threshold_analytic_unit_model.ts

@@ -14,6 +14,9 @@ export enum Condition {
 };
 
 export class ThresholdAnalyticUnit extends AnalyticUnit {
+
+  public learningAfterUpdateRequired = true;
+
   constructor(
     name: string,
     grafanaUrl: string,

server/src/models/analytic_units/utils.ts

@@ -17,7 +17,7 @@ export function createAnalyticUnitFromObject(obj: any): AnalyticUnit {
     case DetectorType.PATTERN:
       return PatternAnalyticUnit.fromObject(obj);
     case DetectorType.ANOMALY:
-      return AnomalyAnalyticUnit.fromObject(obj)
+      return AnomalyAnalyticUnit.fromObject(obj);
     case DetectorType.THRESHOLD:
       return ThresholdAnalyticUnit.fromObject(obj);
 

server/src/routes/analytic_units_router.ts

@@ -56,12 +56,18 @@ async function createUnit(ctx: Router.IRouterContext) {
 }
 
 async function updateUnit(ctx: Router.IRouterContext) {
-  const analyticUnit = ctx.request.body as AnalyticUnit.AnalyticUnit;
+  const analyticUnitObj = ctx.request.body as AnalyticUnit.AnalyticUnit;
-  if(analyticUnit.id === undefined) {
+  if(analyticUnitObj.id === undefined) {
     throw new Error('Cannot update undefined id');
   }
 
-  await AnalyticUnit.update(analyticUnit.id, analyticUnit);
+  const updatedObj = await AnalyticUnit.update(analyticUnitObj.id, analyticUnitObj);
+  const analyticUnit = AnalyticUnit.createAnalyticUnitFromObject(updatedObj);
+
+  if(analyticUnit.learningAfterUpdateRequired) {
+    await AnalyticsController.runLearning(analyticUnitObj.id);
+  }
+
   ctx.response.body = {
     code: 200,
     message: 'Success'