From 0048a971816588396d5aa50e37cefe8533c28dc8 Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@atmire.com>
Date: Fri, 29 Nov 2019 15:15:06 +0100
Subject: [PATCH] fix issue where submission requests would time out before
 they could be used once

---
 src/app/core/submission/submission-rest.service.spec.ts | 3 +--
 src/app/core/submission/submission-rest.service.ts      | 7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/app/core/submission/submission-rest.service.spec.ts b/src/app/core/submission/submission-rest.service.spec.ts
index 30fe9f9163..eefc815435 100644
--- a/src/app/core/submission/submission-rest.service.spec.ts
+++ b/src/app/core/submission/submission-rest.service.spec.ts
@@ -59,12 +59,11 @@ describe('SubmissionRestService test suite', () => {
   describe('getDataById', () => {
     it('should configure a new SubmissionRequest', () => {
       const expected = new SubmissionRequest(requestService.generateRequestId(), resourceHref);
-      // set cache time to zero
-      expected.responseMsToLive = 0;
       expected.forceBypassCache = true;
       scheduler.schedule(() => service.getDataById(resourceEndpoint, resourceScope).subscribe());
       scheduler.flush();
 
+      expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(resourceHref);
       expect(requestService.configure).toHaveBeenCalledWith(expected);
     });
   });
diff --git a/src/app/core/submission/submission-rest.service.ts b/src/app/core/submission/submission-rest.service.ts
index 58aa507314..b4f8185767 100644
--- a/src/app/core/submission/submission-rest.service.ts
+++ b/src/app/core/submission/submission-rest.service.ts
@@ -109,11 +109,10 @@ export class SubmissionRestService {
       filter((href: string) => isNotEmpty(href)),
       distinctUntilChanged(),
       map((endpointURL: string) => new SubmissionRequest(requestId, endpointURL)),
-      map ((request: RestRequest) => {
-        request.responseMsToLive = 0;
-        return request;
+      tap((request: RestRequest) => {
+        this.requestService.removeByHrefSubstring(request.href);
+        this.requestService.configure(request);
       }),
-      tap((request: RestRequest) => this.requestService.configure(request)),
       flatMap(() => this.fetchRequest(requestId)),
       distinctUntilChanged());
   }