From e21ca5059ecbd416de242f2564c731c7474c2e6c Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Mon, 6 Mar 2023 11:22:20 +0200
Subject: [PATCH] update last changed before the request

---
 src/lib/services/generic.service.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/lib/services/generic.service.ts b/src/lib/services/generic.service.ts
index 8e121fc..817b54c 100644
--- a/src/lib/services/generic.service.ts
+++ b/src/lib/services/generic.service.ts
@@ -2,7 +2,7 @@ import { HttpClient, HttpEvent, HttpParams } from '@angular/common/http';
 import { inject } from '@angular/core';
 import { Observable } from 'rxjs';
 import { HeadersConfiguration, List, RequiredParam, Validate } from '../utils';
-import { map, tap } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 
 const ROOT_CHANGES_KEY = 'root';
 
@@ -37,16 +37,17 @@ export abstract class GenericService<I> {
     getAll<R extends I[]>(modelPath?: string, queryParams?: List<QueryParam>): Observable<R>;
     getAll<R = I[]>(modelPath?: string, queryParams?: List<QueryParam>): Observable<R>;
     getAll<R = I[]>(modelPath = this._defaultModelPath, queryParams?: List<QueryParam>): Observable<R> {
-        const request$ = this._http.get<R>(`/${encodeURI(modelPath)}`, {
+        this._updateLastChanged();
+        return this._http.get<R>(`/${encodeURI(modelPath)}`, {
             headers: HeadersConfiguration.getHeaders({ contentType: false }),
             observe: 'body',
             params: this._queryParams(queryParams),
         });
-        return request$.pipe(tap(() => this._updateLastChanged()));
     }
 
     getFor<R = I[]>(entityId: string, queryParams?: List<QueryParam>): Observable<R> {
-        return this.getAll<R>(`${this._defaultModelPath}/${entityId}`, queryParams).pipe(tap(() => this._updateLastChanged(entityId)));
+        this._updateLastChanged(entityId);
+        return this.getAll<R>(`${this._defaultModelPath}/${entityId}`, queryParams);
     }
 
     @Validate()