Replace StoreEndpoint with StoreRequestStateUpdater.

src/app/core/user/services/user.endpoint.ts

@@ -3,32 +3,29 @@ import {HttpClient, HttpErrorResponse} from '@angular/common/http';
 import {Observable, throwError} from 'rxjs';
 import {map, catchError} from 'rxjs/operators';
 
-import {StoreEndpoint} from '../../../shared/types/store-endpoint';
 import {ApiResponse} from '../../../shared/types/api-response';
-import {UserStore} from './user.store';
 import {USER_CONFIG} from '../user.config';
 import {User} from '../types/user';
+import {StoreRequestStateUpdater} from '../../../shared/types/store-request-state-updater';
 
 @Injectable()
-export class UserEndpoint extends StoreEndpoint {
-    constructor(private http: HttpClient) {
-        super();
-    }
+export class UserEndpoint {
+    constructor(private http: HttpClient) {}
 
-    getUser(store: UserStore): Observable<User> {
+    getUser(requestStateUpdater: StoreRequestStateUpdater): Observable<User> {
         const request = USER_CONFIG.requests.getUser;
-        this.setRequestState(store, request, {
+        requestStateUpdater(request.name, {
             inProgress: true,
         });
         return this.http.get<ApiResponse<User>>(request.url).pipe(
             map(response => {
-                this.setRequestState(store, request, {
+                requestStateUpdater(request.name, {
                     inProgress: false,
                 });
                 return response.data as User;
             }),
             catchError((error: HttpErrorResponse) => {
-                this.setRequestState(store, request, {
+                requestStateUpdater(request.name, {
                     inProgress: false,
                     error: true,
                 });

src/app/core/user/services/user.store.ts

@@ -6,23 +6,29 @@ import {map, tap} from 'rxjs/operators';
 import {UserEndpoint} from './user.endpoint';
 import {UserStoreState} from './user.store.state';
 import {User} from '../types/user';
+import {StoreRequestStateUpdater} from '../../../shared/types/store-request-state-updater';
+import * as endpointHelpers from '../../../shared/helpers/endpoint.helpers';
 
 @Injectable()
 export class UserStore extends Store<UserStoreState> {
     user$: Observable<User>;
+    private storeRequestStateUpdater: StoreRequestStateUpdater;
 
     constructor(private endpoint: UserEndpoint) {
         super(new UserStoreState());
 
         this.user$ = this.state$.pipe(map(state => state.user));
+        this.storeRequestStateUpdater = endpointHelpers.getStoreRequestStateUpdater(
+            this
+        );
     }
 
     get user(): User {
         return this.state.user;
     }
 
     loadUser(): Observable<User> {
-        return this.endpoint.getUser(this).pipe(
+        return this.endpoint.getUser(this.storeRequestStateUpdater).pipe(
             tap((user: User) => {
                 this.handleGetUserResponse(user);
             })

src/app/features/coffee-list/services/coffee-list.endpoint.ts

@@ -3,44 +3,37 @@ import {HttpClient, HttpErrorResponse} from '@angular/common/http';
 import {Observable, throwError} from 'rxjs';
 import {map, catchError, delay} from 'rxjs/operators';
 
-import {StoreEndpoint} from '../../../shared/types/store-endpoint';
 import {ApiResponse} from '../../../shared/types/api-response';
-import {CoffeeListStore} from './coffee-list.store';
 import {COFFEE_LIST_CONFIG} from '../coffee-list.config';
 import {Candidate} from '../types/candidate';
 import * as endpointHelpers from '../../../shared/helpers/endpoint.helpers';
 import * as sortHelpers from '../../../shared/helpers/sort.helpers';
-import {RequestStateUpdater} from '../../../shared/types/request-state-updater';
+import {StoreRequestStateUpdater} from '../../../shared/types/store-request-state-updater';
+import {CustomRequestStateUpdater} from '../../../shared/types/custom-request-state-updater';
 import {Sort} from '../../../shared/types/sort';
 import {SortOrder} from '../../../app.constants';
 
 @Injectable()
-export class CoffeeListEndpoint extends StoreEndpoint {
-    constructor(private http: HttpClient) {
-        super();
-    }
+export class CoffeeListEndpoint {
+    constructor(private http: HttpClient) {}
 
     listCandidates(
-        store: CoffeeListStore,
-        sort: Sort
+        sort: Sort,
+        requestStateUpdater: StoreRequestStateUpdater
     ): Observable<Candidate[]> {
         const request = COFFEE_LIST_CONFIG.requests.listCandidates;
         const options = {
             params: {
                 ...sortHelpers.convertSortToRequestParams(sort),
             },
         };
-        this.setRequestState(store, request, {
-            inProgress: true,
-        });
+        requestStateUpdater(request.name, {inProgress: true});
         return this.http
             .get<ApiResponse<Candidate[]>>(request.url, options)
             .pipe(
                 delay(2000), // Simulate request delay
                 map(response => {
-                    this.setRequestState(store, request, {
-                        inProgress: false,
-                    });
+                    requestStateUpdater(request.name, {inProgress: false});
                     // Simulate sorting on server
                     const candidates = response.data.sort(
                         (c1: Candidate, c2: Candidate): number => {
@@ -63,7 +56,7 @@ export class CoffeeListEndpoint extends StoreEndpoint {
                     return candidates;
                 }),
                 catchError((error: HttpErrorResponse) => {
-                    this.setRequestState(store, request, {
+                    requestStateUpdater(request.name, {
                         inProgress: false,
                         error: true,
                     });
@@ -74,7 +67,7 @@ export class CoffeeListEndpoint extends StoreEndpoint {
 
     addVote(
         candidate: Candidate,
-        requestStateUpdater: RequestStateUpdater
+        requestStateUpdater: CustomRequestStateUpdater
     ): Observable<null> {
         const url = endpointHelpers.getUrlWithParams(
             COFFEE_LIST_CONFIG.requests.addVote.url,
@@ -98,7 +91,7 @@ export class CoffeeListEndpoint extends StoreEndpoint {
 
     removeVote(
         candidate: Candidate,
-        requestStateUpdater: RequestStateUpdater
+        requestStateUpdater: CustomRequestStateUpdater
     ): Observable<null> {
         const url = endpointHelpers.getUrlWithParams(
             COFFEE_LIST_CONFIG.requests.removeVote.url,

src/app/features/coffee-list/services/coffee-list.store.ts

@@ -11,7 +11,9 @@ import * as candidateHelpers from '../helpers/candidate.helpers';
 import {UserStore} from '../../../core/user/services/user.store';
 import {User} from '../../../core/user/types/user';
 import {UserAction} from '../coffee-list.constants';
-import {RequestStateUpdater} from '../../../shared/types/request-state-updater';
+import * as endpointHelpers from '../../../shared/helpers/endpoint.helpers';
+import {StoreRequestStateUpdater} from '../../../shared/types/store-request-state-updater';
+import {CustomRequestStateUpdater} from '../../../shared/types/custom-request-state-updater';
 import {Sort} from '../../../shared/types/sort';
 
 @Injectable()
@@ -20,6 +22,7 @@ export class CoffeeListStore extends Store<CoffeeListStoreState>
     private ngUnsubscribe$: Subject<undefined> = new Subject();
     private reloadCandidates$: Subject<undefined> = new Subject();
     private detailsModal: ModalComponent;
+    private storeRequestStateUpdater: StoreRequestStateUpdater;
 
     constructor(
         private endpoint: CoffeeListEndpoint,
@@ -31,6 +34,10 @@ export class CoffeeListStore extends Store<CoffeeListStoreState>
     init(): void {
         this.initReloadCandidates$();
         this.subscribeToUserUpdates();
+
+        this.storeRequestStateUpdater = endpointHelpers.getStoreRequestStateUpdater(
+            this
+        );
     }
 
     ngOnDestroy(): void {
@@ -102,8 +109,8 @@ export class CoffeeListStore extends Store<CoffeeListStoreState>
             .pipe(
                 switchMap(() => {
                     return this.endpoint.listCandidates(
-                        this,
-                        this.state.candidateList.sort
+                        this.state.candidateList.sort,
+                        this.storeRequestStateUpdater
                     );
                 }),
                 tap(candidates => {
@@ -141,7 +148,7 @@ export class CoffeeListStore extends Store<CoffeeListStoreState>
 
     private getUpdateCandidateRequestStateUpdater(
         candidate: Candidate
-    ): RequestStateUpdater {
+    ): CustomRequestStateUpdater {
         return requestState => {
             this.setState({
                 ...this.state,

src/app/shared/helpers/endpoint.helpers.ts

@@ -1,3 +1,5 @@
+import {StoreRequestStateUpdater} from '../types/store-request-state-updater';
+
 export function getUrlWithParams(
     url: string,
     params: {[key: string]: any}
@@ -8,3 +10,17 @@ export function getUrlWithParams(
     });
     return url;
 }
+
+export function getStoreRequestStateUpdater(
+    store: any,
+): StoreRequestStateUpdater {
+    return (requestName, requestState) => {
+        store.setState({
+            ...store.state,
+            requests: {
+                ...store.state.requests,
+                [requestName]: requestState,
+            },
+        });
+    };
+}

src/app/shared/types/custom-request-state-updater.ts

@@ -0,0 +1,3 @@
+import {RequestState} from './request-state';
+
+export type CustomRequestStateUpdater = (requestState: RequestState) => void;

src/app/shared/types/store-request-state-updater.ts

@@ -0,0 +1,6 @@
+import {RequestState} from './request-state';
+
+export type StoreRequestStateUpdater = (
+    requestName: string,
+    requestState: RequestState
+) => void;