Browse Source

fix detection status router

pull/1/head
amper43 6 years ago
parent
commit
82f611e375
  1. 18
      server/src/routes/detection_status_router.ts

18
server/src/routes/detection_status_router.ts

@ -17,13 +17,13 @@ declare type DetectionStatus = {
state: DetectionState state: DetectionState
} }
declare type DetectionStatusResponce = { declare type DetectionStatusResponse = {
timeranges: DetectionStatus[] timeranges: DetectionStatus[]
} }
let runnnedDetections: DetectionStatus[] = []; let runnnedDetections: DetectionStatus[] = [];
export async function getDetectionStatus(ctx: Router.IRouterContext): Promise<DetectionStatusResponce> { export async function getDetectionStatus(ctx: Router.IRouterContext) {
let id: AnalyticUnitId = ctx.request.query.id; let id: AnalyticUnitId = ctx.request.query.id;
if(id === undefined || id === '') { if(id === undefined || id === '') {
throw new Error('analyticUnitId (id) is missing'); throw new Error('analyticUnitId (id) is missing');
@ -40,7 +40,7 @@ export async function getDetectionStatus(ctx: Router.IRouterContext): Promise<De
const previousRun = _.find(runnnedDetections, {id, from, to}); const previousRun = _.find(runnnedDetections, {id, from, to});
if(previousRun !== undefined) { if(previousRun !== undefined) {
return { ctx.response.body = {
timeranges: [ timeranges: [
previousRun previousRun
] ]
@ -56,13 +56,13 @@ export async function getDetectionStatus(ctx: Router.IRouterContext): Promise<De
runnnedDetections.push(currentRun); runnnedDetections.push(currentRun);
AnalyticsController.runDetect(id, from, to) AnalyticsController.runDetect(id, from, to)
.then(() => _.find(runnnedDetections, {id, from, to}).state = DetectionState.READY) .then(() => _.find(runnnedDetections, {id, from, to}).state = DetectionState.READY)
.catch(err => { .catch(err => {
console.error(err); console.error(err);
_.find(runnnedDetections, {id, from, to}).state = DetectionState.FAILED; _.find(runnnedDetections, {id, from, to}).state = DetectionState.FAILED;
}); });
return { ctx.response.body = {
timeranges: [ timeranges: [
currentRun currentRun
] ]

Loading…
Cancel
Save