hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 07:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

request.effects.ts pipeable operators fine-tuning

Browse Source
This commit is contained in:
Kristof De Langhe
2018-05-17 17:56:06 +02:00
parent f03126b550
commit 184d47bb41
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/core/data/request.effects.ts
View File

@@ -18,15 +18,23 @@ import { RequestEntry } from './request.reducer';
import { RequestService } from './request.service'; import { RequestService } from './request.service';
import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer'; import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
import { NormalizedObjectFactory } from '../cache/models/normalized-object-factory'; import { NormalizedObjectFactory } from '../cache/models/normalized-object-factory';
import { catchError, flatMap, map, tap } from 'rxjs/operators'; import { catchError, flatMap, map, take, tap } from 'rxjs/operators';
export const addToResponseCacheAndCompleteAction = (request: RestRequest) =>
(source: Observable<ErrorResponse>): Observable<RequestCompleteAction> =>
source.pipe(
tap((response: RestResponse) => this.responseCache.add(request.href, response, this.EnvConfig.cache.msToLive)),
map((response: RestResponse) => new RequestCompleteAction(request.uuid))
);
@Injectable() @Injectable()
export class RequestEffects { export class RequestEffects {
@Effect() execute = this.actions$.ofType(RequestActionTypes.EXECUTE).pipe( @Effect() execute = this.actions$.ofType(RequestActionTypes.EXECUTE).pipe(
flatMap((action: RequestExecuteAction) => { flatMap((action: RequestExecuteAction) => {
return this.requestService.getByUUID(action.payload) return this.requestService.getByUUID(action.payload).pipe(
.take(1); take(1)
);
}), }),
map((entry: RequestEntry) => entry.request), map((entry: RequestEntry) => entry.request),
flatMap((request: RestRequest) => { flatMap((request: RestRequest) => {
@@ -37,11 +45,9 @@ export class RequestEffects {
} }
return this.restApi.request(request.method, request.href, body).pipe( return this.restApi.request(request.method, request.href, body).pipe(
map((data: DSpaceRESTV2Response) => this.injector.get(request.getResponseParser()).parse(request, data)), map((data: DSpaceRESTV2Response) => this.injector.get(request.getResponseParser()).parse(request, data)),
tap((response: RestResponse) => this.responseCache.add(request.href, response, this.EnvConfig.cache.msToLive)), addToResponseCacheAndCompleteAction(request),
map((response: RestResponse) => new RequestCompleteAction(request.uuid)),
catchError((error: RequestError) => Observable.of(new ErrorResponse(error)).pipe( catchError((error: RequestError) => Observable.of(new ErrorResponse(error)).pipe(
tap((response: RestResponse) => this.responseCache.add(request.href, response, this.EnvConfig.cache.msToLive)), addToResponseCacheAndCompleteAction(request)
map((response: RestResponse) => new RequestCompleteAction(request.uuid))
)) ))
); );
}) })