Remove unneccesary polling calls

Author: tommysitu

src/app/shared/models/hoverfly.model.ts

@@ -10,12 +10,3 @@ export interface Hoverfly {
   middleware: Middleware;
   usage: Usage;
 }
-
-export class NullHoverfly implements Hoverfly {
-  version = '';
-  mode = '';
-  destination = '';
-  middleware = {} as Middleware;
-  usage = {} as Usage;
-
-}

src/app/shared/services/hoverfly.service.spec.ts

@@ -45,42 +45,48 @@ describe('Service: Hoverfly', () => {
 
   });
 
-  it('getVersion should dispatch an update action', () => {
+  it('getHoverflyInfo should dispatch an update action', () => {
 
-    service.getVersion();
+    const hoverflyInfo = {
+      destination: 'hoverfly.io',
+      mode: 'simulate',
+      usage: {
+        counters: {
+          capture: 0,
+          modify: 0,
+          simulate: 0,
+          spy: 0,
+          synthesize: 0
+        }
+      },
+      version: 'v0.15.0',
+    };
+
+    service.getHoverflyInfo();
     lastConnection.mockRespond(new Response(new ResponseOptions({
-      body: { version: 'v0.11.4' },
+      body: hoverflyInfo,
       status: 200
     })));
 
     expect(lastConnection).toBeDefined();
-    expect(lastConnection.request.url).toBe('/api/v2/hoverfly/version');
+    expect(lastConnection.request.url).toBe('/api/v2/hoverfly');
     expect(lastConnection.request.method).toBe(RequestMethod.Get);
 
     expect(ngRedux.dispatch).toHaveBeenCalledWith({
       type: HOVERFLY_ACTIONS.UPDATE,
-      payload: { version: 'v0.11.4' }
+      payload: hoverflyInfo
     });
 
   });
 
-  it('getMode should dispatch an update action', () => {
+  it('getHoverflyInfo failed should dispatch an error notification action', () => {
 
-    service.getMode();
-    lastConnection.mockRespond(new Response(new ResponseOptions({
-      body: { mode: 'capture' },
-      status: 200
-    })));
+    service.getHoverflyInfo();
+    lastConnection.mockError(mockErrorResponse(0));
 
     expect(lastConnection).toBeDefined();
-    expect(lastConnection.request.url).toBe('/api/v2/hoverfly/mode');
-    expect(lastConnection.request.method).toBe(RequestMethod.Get);
-
-    expect(ngRedux.dispatch).toHaveBeenCalledWith({
-      type: HOVERFLY_ACTIONS.UPDATE,
-      payload: { mode: 'capture' }
-    });
 
+    expect(notifyService.sendError).toHaveBeenCalledWith(API_ERRORS.SERVICE_UNAVAILABLE);
   });
 
   it('setMode should send hoverfly mode', () => {
@@ -103,34 +109,6 @@ describe('Service: Hoverfly', () => {
 
   });
 
-  it('getDestination should dispatch an update action', () => {
-
-    service.getDestination();
-    lastConnection.mockRespond(new Response(new ResponseOptions({
-      body: { destination: 'destination.com' },
-      status: 200
-    })));
-
-    expect(lastConnection).toBeDefined();
-    expect(lastConnection.request.url).toBe('/api/v2/hoverfly/destination');
-    expect(lastConnection.request.method).toBe(RequestMethod.Get);
-
-    expect(ngRedux.dispatch).toHaveBeenCalledWith({
-      type: HOVERFLY_ACTIONS.UPDATE,
-      payload: { destination: 'destination.com' }
-    });
-
-  });
-
-  it('getDestination failed should dispatch an error notification action', () => {
-
-    service.getDestination();
-    lastConnection.mockError(mockErrorResponse(0));
-
-    expect(lastConnection).toBeDefined();
-
-    expect(notifyService.sendError).toHaveBeenCalledWith(API_ERRORS.SERVICE_UNAVAILABLE);
-  });
 
   it('getMiddleware should dispatch an update action', () => {
 
@@ -174,33 +152,4 @@ describe('Service: Hoverfly', () => {
 
   });
 
-  it('getUsage should dispatch an update action', () => {
-
-    const usageData = {
-      usage: {
-        counters: {
-          capture: 1,
-          modify: 2,
-          simulate: 3,
-          synthesize: 4
-        }
-      }
-    };
-
-    service.getUsage();
-
-    lastConnection.mockRespond(new Response(new ResponseOptions({
-      body: usageData,
-      status: 200
-    })));
-    expect(lastConnection).toBeDefined();
-    expect(lastConnection.request.url).toBe('/api/v2/hoverfly/usage');
-    expect(lastConnection.request.method).toBe(RequestMethod.Get);
-
-    expect(ngRedux.dispatch).toHaveBeenCalledWith({
-      type: HOVERFLY_ACTIONS.UPDATE,
-      payload: usageData
-    });
-  });
-
 });

src/app/shared/services/hoverfly.service.ts

@@ -18,21 +18,6 @@ export class HoverflyService {
   constructor(private http: Http, private ngRedux: NgRedux<AppState>, private notifyService: NotificationService) {
   }
 
-  getVersion(): void {
-    this.http.get('/api/v2/hoverfly/version')
-      .map(res => res.json())
-      .subscribe(
-        this.updateHoverfly(),
-        httpErrorHandler(this.notifyService));
-  }
-
-  getMode(): void {
-    this.http.get('/api/v2/hoverfly/mode')
-      .map(res => res.json())
-      .subscribe(
-        this.updateHoverfly(),
-        httpErrorHandler(this.notifyService));
-  }
 
   setMode(modeSelection): void {
     this.http.put('/api/v2/hoverfly/mode', JSON.stringify({ mode: modeSelection }))
@@ -42,8 +27,8 @@ export class HoverflyService {
         httpErrorHandler(this.notifyService));
   }
 
-  getDestination(): void {
-    this.http.get('/api/v2/hoverfly/destination')
+  getHoverflyInfo(): void {
+    this.http.get('/api/v2/hoverfly')
       .map(res => res.json())
       .subscribe(
         this.updateHoverfly(),
@@ -60,22 +45,13 @@ export class HoverflyService {
         httpErrorHandler(this.notifyService));
   }
 
-  getUsage(): void {
-      this.http.get('/api/v2/hoverfly/usage')
-        .map(res => res.json())
-        .subscribe(
-          this.updateHoverfly(),
-          httpErrorHandler(this.notifyService));
-  }
 
   pollHoverfly(): Subscription {
 
     return Observable.timer(0, 5000)
       .subscribe(() => {
-        this.getMode();
-        this.getDestination();
+        this.getHoverflyInfo();
         this.getMiddleware();
-        this.getUsage();
       });
 
   }

src/app/views/dashboard/dashboard.component.ts

@@ -30,7 +30,6 @@ export class DashboardComponent implements OnInit, OnDestroy {
       this.hoverfly = hoverfly.toJS();
     });
 
-    this.service.getVersion();
     this.pollingSubscription = this.service.pollHoverfly();
 
     this.notiffyService.errors