127655: refactor to use buildFromRequestUUID

Author: Atmire-Kristof

src/app/core/submission/submission-rest.service.spec.ts

@@ -14,6 +14,8 @@ import {
   SubmissionRequest
 } from '../data/request.models';
 import { FormFieldMetadataValueObject } from '../../shared/form/builder/models/form-field-metadata-value.model';
+import { of } from 'rxjs';
+import { RequestEntry } from '../data/request-entry.model';
 
 describe('SubmissionRestService test suite', () => {
   let scheduler: TestScheduler;
@@ -38,7 +40,9 @@ describe('SubmissionRestService test suite', () => {
   }
 
   beforeEach(() => {
-    requestService = getMockRequestService();
+    requestService = getMockRequestService(of(Object.assign(new RequestEntry(), {
+      request: new SubmissionRequest('mock-request-uuid', 'mock-request-href'),
+    })));
     rdbService = getMockRemoteDataBuildService();
     scheduler = getTestScheduler();
     halService = new HALEndpointServiceStub(resourceEndpointURL);

src/app/core/submission/submission-rest.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 
 import { Observable, skipWhile } from 'rxjs';
-import { distinctUntilChanged, filter, map, mergeMap, tap } from 'rxjs/operators';
+import { distinctUntilChanged, filter, map, mergeMap, switchMap, tap } from 'rxjs/operators';
 
 import { RequestService } from '../data/request.service';
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
@@ -21,7 +21,6 @@ import { getFirstCompletedRemoteData } from '../shared/operators';
 import { URLCombiner } from '../url-combiner/url-combiner';
 import { RemoteData } from '../data/remote-data';
 import { SubmissionResponse } from './submission-response.model';
-import { RestRequest } from '../data/rest-request.model';
 
 /**
  * Retrieve the first emitting payload's dataDefinition, or throw an error if the request failed
@@ -126,9 +125,12 @@ export class SubmissionRestService {
       filter((href: string) => isNotEmpty(href)),
       distinctUntilChanged(),
       mergeMap((endpointURL: string) => {
-        const request = this.sendGetDataRequest(endpointURL, useCachedVersionIfAvailable);
+        this.sendGetDataRequest(endpointURL, useCachedVersionIfAvailable);
         const startTime: number = new Date().getTime();
-        return this.rdbService.buildSingle(request.href).pipe(
+        return this.requestService.getByHref(endpointURL).pipe(
+          map((requestEntry) => requestEntry.request.uuid),
+          distinctUntilChanged(),
+          switchMap((requestId) => this.rdbService.buildFromRequestUUID<SubmissionResponse>(requestId)),
           // This skip ensures that if a stale object is present in the cache when you do a
           // call it isn't immediately returned, but we wait until the remote data for the new request
           // is created. If useCachedVersionIfAvailable is false it also ensures you don't get a
@@ -152,14 +154,11 @@ export class SubmissionRestService {
    *    Endpoint URL of the submission data
    * @param useCachedVersionIfAvailable
    *    If this is true, the request will only be sent if there's no valid & cached version. Defaults to false
-   * @return RestRequest
-   *    Request sent
    */
-  private sendGetDataRequest(href: string, useCachedVersionIfAvailable = false): RestRequest {
+  private sendGetDataRequest(href: string, useCachedVersionIfAvailable = false) {
     const requestId = this.requestService.generateRequestId();
     const request = new SubmissionRequest(requestId, href);
     this.requestService.send(request, useCachedVersionIfAvailable);
-    return request;
   }
 
   /**