Fixes unit test and problem in map fuction.

This commit is contained in:
Michael W Spalti
2019-09-12 16:57:11 -07:00
parent 2988146d59
commit ac95a8b8d6
3 changed files with 14 additions and 3 deletions

View File

@@ -44,7 +44,10 @@ export class AuthRequestService {
map((endpointURL) => this.getEndpointByMethod(endpointURL, method)), map((endpointURL) => this.getEndpointByMethod(endpointURL, method)),
distinctUntilChanged(), distinctUntilChanged(),
map((endpointURL: string) => new AuthPostRequest(this.requestService.generateRequestId(), endpointURL, body, options)), map((endpointURL: string) => new AuthPostRequest(this.requestService.generateRequestId(), endpointURL, body, options)),
map ((request: PostRequest) => request.responseMsToLive = 0), map ((request: PostRequest) => {
request.responseMsToLive = 0;
return request;
}),
tap((request: PostRequest) => this.requestService.configure(request)), tap((request: PostRequest) => this.requestService.configure(request)),
mergeMap((request: PostRequest) => this.fetchRequest(request)), mergeMap((request: PostRequest) => this.fetchRequest(request)),
distinctUntilChanged()); distinctUntilChanged());
@@ -56,7 +59,10 @@ export class AuthRequestService {
map((endpointURL) => this.getEndpointByMethod(endpointURL, method)), map((endpointURL) => this.getEndpointByMethod(endpointURL, method)),
distinctUntilChanged(), distinctUntilChanged(),
map((endpointURL: string) => new AuthGetRequest(this.requestService.generateRequestId(), endpointURL, options)), map((endpointURL: string) => new AuthGetRequest(this.requestService.generateRequestId(), endpointURL, options)),
map ((request: GetRequest) => request.responseMsToLive = 0), map ((request: GetRequest) => {
request.responseMsToLive = 0;
return request;
}),
tap((request: GetRequest) => this.requestService.configure(request)), tap((request: GetRequest) => this.requestService.configure(request)),
mergeMap((request: GetRequest) => this.fetchRequest(request)), mergeMap((request: GetRequest) => this.fetchRequest(request)),
distinctUntilChanged()); distinctUntilChanged());

View File

@@ -59,6 +59,8 @@ describe('SubmissionRestService test suite', () => {
describe('getDataById', () => { describe('getDataById', () => {
it('should configure a new SubmissionRequest', () => { it('should configure a new SubmissionRequest', () => {
const expected = new SubmissionRequest(requestService.generateRequestId(), resourceHref); const expected = new SubmissionRequest(requestService.generateRequestId(), resourceHref);
// set cache time to zero
expected.responseMsToLive = 0;
scheduler.schedule(() => service.getDataById(resourceEndpoint, resourceScope).subscribe()); scheduler.schedule(() => service.getDataById(resourceEndpoint, resourceScope).subscribe());
scheduler.flush(); scheduler.flush();

View File

@@ -109,7 +109,10 @@ export class SubmissionRestService {
filter((href: string) => isNotEmpty(href)), filter((href: string) => isNotEmpty(href)),
distinctUntilChanged(), distinctUntilChanged(),
map((endpointURL: string) => new SubmissionRequest(requestId, endpointURL)), map((endpointURL: string) => new SubmissionRequest(requestId, endpointURL)),
map ((request: RestRequest) => request.responseMsToLive = 0), map ((request: RestRequest) => {
request.responseMsToLive = 0;
return request;
}),
tap((request: RestRequest) => this.requestService.configure(request)), tap((request: RestRequest) => this.requestService.configure(request)),
flatMap(() => this.fetchRequest(requestId)), flatMap(() => this.fetchRequest(requestId)),
distinctUntilChanged()); distinctUntilChanged());