intermediate commit

src/app/core/data/request.effects.ts

@@ -1,30 +1,33 @@
-
-import {of as observableOf,  Observable } from 'rxjs';
+import { Observable, of as observableOf } from 'rxjs';
 import { Inject, Injectable, Injector } from '@angular/core';
-import { Request } from '@angular/http';
-import { RequestArgs } from '@angular/http/src/interfaces';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 
 import { GLOBAL_CONFIG, GlobalConfig } from '../../../config';
 import { isNotEmpty } from '../../shared/empty.util';
-import { ErrorResponse, RestResponse } from '../cache/response-cache.models';
-import { ResponseCacheService } from '../cache/response-cache.service';
 import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
 
 import { DSpaceRESTv2Service } from '../dspace-rest-v2/dspace-rest-v2.service';
-import { RequestActionTypes, RequestCompleteAction, RequestExecuteAction } from './request.actions';
+import {
+  RequestActionTypes,
+  RequestCompleteAction,
+  RequestExecuteAction,
+  ResetResponseTimestampsAction
+} from './request.actions';
 import { RequestError, RestRequest } from './request.models';
 import { RequestEntry } from './request.reducer';
 import { RequestService } from './request.service';
 import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
 import { NormalizedObjectFactory } from '../cache/models/normalized-object-factory';
 import { catchError, flatMap, map, take, tap } from 'rxjs/operators';
+import { ErrorResponse, RestResponse } from '../cache/response.models';
+import { StoreActionTypes } from '../../store.actions';
 
-export const addToResponseCacheAndCompleteAction = (request: RestRequest, responseCache: ResponseCacheService, envConfig: GlobalConfig) =>
-  (source: Observable<ErrorResponse>): Observable<RequestCompleteAction> =>
+export const addToResponseCacheAndCompleteAction = (request: RestRequest, envConfig: GlobalConfig) =>
+  (source: Observable<RestResponse>): Observable<RequestCompleteAction> =>
     source.pipe(
-      tap((response: RestResponse) => responseCache.add(request.href, response, request.responseMsToLive ? request.responseMsToLive : envConfig.cache.msToLive.default)),
-      map((response: RestResponse) => new RequestCompleteAction(request.uuid))
+      map((response: RestResponse) => {
+        return new RequestCompleteAction(request.uuid, response)
+      })
     );
 
 @Injectable()
@@ -46,20 +49,32 @@ export class RequestEffects {
       }
       return this.restApi.request(request.method, request.href, body, request.options).pipe(
         map((data: DSpaceRESTV2Response) => this.injector.get(request.getResponseParser()).parse(request, data)),
-        addToResponseCacheAndCompleteAction(request, this.responseCache, this.EnvConfig),
+        addToResponseCacheAndCompleteAction(request, this.EnvConfig),
         catchError((error: RequestError) => observableOf(new ErrorResponse(error)).pipe(
-          addToResponseCacheAndCompleteAction(request, this.responseCache, this.EnvConfig)
+          addToResponseCacheAndCompleteAction(request, this.EnvConfig)
         ))
       );
     })
   );
 
+  /**
+   * When the store is rehydrated in the browser, set all cache
+   * timestamps to 'now', because the time zone of the server can
+   * differ from the client.
+   *
+   * This assumes that the server cached everything a negligible
+   * time ago, and will likely need to be revisited later
+   */
+  @Effect() fixTimestampsOnRehydrate = this.actions$
+    .pipe(ofType(StoreActionTypes.REHYDRATE),
+      map(() => new ResetResponseTimestampsAction(new Date().getTime()))
+    );
+
   constructor(
     @Inject(GLOBAL_CONFIG) private EnvConfig: GlobalConfig,
     private actions$: Actions,
     private restApi: DSpaceRESTv2Service,
     private injector: Injector,
-    private responseCache: ResponseCacheService,
     protected requestService: RequestService
   ) { }