Merge pull request #33 from T-Systems-MMS/bugfix/call_after_handler_for_cancelled_requests

add call of after handler for cancelled requests

Author: amjmhs

src/mustache/api.service.mustache

@@ -21,15 +21,17 @@ import { CustomQueryEncoderHelper }                          from '../encoder';
 {{^useRxJS6}}
 import { Observable }                                        from 'rxjs/Observable';
 import { Subject }                                           from 'rxjs/Subject';
+import { Subscription }                                      from 'rxjs/Subscription';
 {{/useRxJS6}}
 {{#useRxJS6}}
-import { Observable, Subject }                               from 'rxjs';
-import { catchError, takeUntil, tap }                        from 'rxjs/operators';
+import { Observable, Subject, Subscription }                 from 'rxjs';
+import { catchError, takeUntil, tap, share }                 from 'rxjs/operators';
 {{/useRxJS6}}
 {{^useHttpClient}}
 import '../rxjs-operators';
 import 'rxjs/add/operator/takeUntil';
 import 'rxjs/add/operator/tap';
+import 'rxjs/add/operator/share';
 {{/useHttpClient}}
 
 {{#imports}}
@@ -339,8 +341,6 @@ export class {{classname}} {
         if (cancelPreviousRequest) {
             if (this.cancelMap['{{operationIdOriginal}}']) {
                 this.cancelMap['{{operationIdOriginal}}'].next();
-                this.cancelMap['{{operationIdOriginal}}'].complete();
-                this.cancelMap['{{operationIdOriginal}}'] = null;
             }
             this.cancelMap['{{operationIdOriginal}}'] = '{{httpMethod}}'.toUpperCase() === 'GET' ? new Subject<any>() : null;
             if(this.cancelMap['{{operationIdOriginal}}']) {
@@ -351,12 +351,30 @@ export class {{classname}} {
         if (typeof this.configuration.beforeHandler === 'function') {
           this.configuration.beforeHandler('{{operationIdOriginal}}', '{{httpMethod}}'.toUpperCase());
         }
-        if (typeof this.configuration.afterHandler === 'function') {
-          handle = handle.pipe(tap(
-            result => this.configuration.afterHandler('{{operationIdOriginal}}', '{{httpMethod}}'.toUpperCase(), result),
-            err => this.configuration.afterHandler('{{operationIdOriginal}}', '{{httpMethod}}'.toUpperCase(), err)
-          ));
-        }
+        let afterSubscription: Subscription;
+        const afterHandler = (result: any = null) => {
+          if (afterSubscription) {
+            afterSubscription.unsubscribe();
+          }
+          // stop cancellation to prevent calling afterHandler on next service call
+          if (cancelPreviousRequest && this.cancelMap['{{operationIdOriginal}}']) {
+            this.cancelMap['{{operationIdOriginal}}'].complete();
+            delete this.cancelMap['{{operationIdOriginal}}'];
+          }
+          if (typeof this.configuration.afterHandler === 'function') {
+            this.configuration.afterHandler(
+              '{{operationIdOriginal}}',
+              '{{httpMethod}}'.toUpperCase(),
+              result ? result : new Error('CANCELLED')
+            );
+          }
+        };
+        handle = handle.pipe(share());
+        afterSubscription = handle.subscribe(
+          result => afterHandler(result),
+          err => afterHandler(err),
+          () => afterHandler()
+        );
 
         if (typeof this.configuration.errorHandler === 'function') {
           return handle.pipe(catchError(err => this.configuration.errorHandler(err, '{{operationIdOriginal}}')));
@@ -391,8 +409,6 @@ export class {{classname}} {
         if (cancelPreviousRequest) {
             if (this.cancelMap['{{operationIdOriginal}}']) {
                 this.cancelMap['{{operationIdOriginal}}'].next();
-                this.cancelMap['{{operationIdOriginal}}'].complete();
-                this.cancelMap['{{operationIdOriginal}}'] = null;
             }
             this.cancelMap['{{operationIdOriginal}}'] = '{{httpMethod}}'.toUpperCase() === 'GET' ? new Subject<any>() : null;
             if(this.cancelMap['{{operationIdOriginal}}']) {
@@ -403,12 +419,30 @@ export class {{classname}} {
         if (typeof this.configuration.beforeHandler === 'function') {
           this.configuration.beforeHandler('{{operationIdOriginal}}', '{{httpMethod}}'.toUpperCase());
         }
-        if (typeof this.configuration.afterHandler === 'function') {
-          handle = handle.tap(
-            result => this.configuration.afterHandler('{{operationIdOriginal}}', '{{httpMethod}}'.toUpperCase(), result),
-            err => this.configuration.afterHandler('{{operationIdOriginal}}', '{{httpMethod}}'.toUpperCase(), err)
-          );
-        }
+        let afterSubscription: Subscription;
+        const afterHandler = (result: any = null) => {
+          if (afterSubscription) {
+            afterSubscription.unsubscribe();
+          }
+          // stop cancellation to prevent calling afterHandler on next service call
+          if (cancelPreviousRequest && this.cancelMap['{{operationIdOriginal}}']) {
+            this.cancelMap['{{operationIdOriginal}}'].complete();
+            delete this.cancelMap['{{operationIdOriginal}}'];
+          }
+          if (typeof this.configuration.afterHandler === 'function') {
+            this.configuration.afterHandler(
+              '{{operationIdOriginal}}',
+              '{{httpMethod}}'.toUpperCase(),
+              result ? result : new Error('CANCELLED')
+            );
+          }
+        };
+        handle = handle.share();
+        afterSubscription = handle.subscribe(
+          result => afterHandler(result),
+          err => afterHandler(err),
+          () => afterHandler()
+        );
 
         if (typeof this.configuration.errorHandler === 'function') {
           return handle.catch(err => this.configuration.errorHandler(err, '{{operationIdOriginal}}'));