comparison src/app/services/feature-extraction/FeatureExtractionWorker.ts @ 248:4224929943bc

Small refactoring to avoid duplication of process and collect. It really seems like there is no need to have both methods.

       })
     );
   }
 
   process(request: SimpleRequest): Observable<StreamingResponse> {
-    return undefined;
+    return this.dispatch('process', request);
   }
 
   collect(request: SimpleRequest): Observable<StreamingResponse> {
+    return this.dispatch('collect', request);
+  }
+
+  protected dispatch(method: 'process' | 'collect',
+                     request: SimpleRequest): Observable<StreamingResponse> {
     const key = request.key.split(':')[0];
     return this.services.has(key) ?
-      this.services.get(key).collect(request) : Observable.throw('Invalid key');
+      this.services.get(key)[method](request) : Observable.throw('Invalid key');
   }
 }
 
 class ReducingAggregateService extends AggregateStreamingService {
   constructor() {
     super();
   }
 
-  collect(request: SimpleRequest): Observable<StreamingResponse> {
+  protected dispatch(method: 'process' | 'collect',
+                     request: SimpleRequest): Observable<StreamingResponse> {
     let lastPercentagePoint = 0;
-    return super.collect(request)
+    return super.dispatch(method, request)
       .scan(streamingResponseReducer)
       .filter(val => {
         const percentage =
           100 * (val.processedBlockCount / val.totalBlockCount) | 0;
         const pointDifference = (percentage - lastPercentagePoint);