From 7b7fd20cdfb4098aad564d8a33876addf3c9d359 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Thu, 17 Feb 2022 14:03:01 +0200 Subject: [PATCH] refactor private methods in dossiers service --- .../services/entity-services/dossiers.service.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts index 6869264b0..5d7a7174b 100644 --- a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts @@ -33,7 +33,7 @@ const GENERIC_MSG = _('add-dossier-dialog.errors.generic'); providedIn: 'root', }) export class DossiersService extends EntitiesService { - readonly generalStats$ = this.all$.pipe(switchMap(entities => this._generalStats$(entities))); + readonly generalStats$ = this.all$.pipe(switchMap(entities => this.#generalStats$(entities))); readonly dossierFileChanges$ = new Subject(); constructor( @@ -47,7 +47,7 @@ export class DossiersService extends EntitiesService { timer(CHANGED_CHECK_INTERVAL, CHANGED_CHECK_INTERVAL) .pipe( switchMap(() => this.loadOnlyChanged()), - tap(changes => this._emitFileChanges(changes)), + tap(changes => this.#emitFileChanges(changes)), ) .subscribe(); } @@ -64,7 +64,7 @@ export class DossiersService extends EntitiesService { } loadOnlyChanged(): Observable { - const load = (changes: DossierChanges) => forkJoin(changes.map(change => this.load(change.dossierId))); + const load = (changes: DossierChanges) => forkJoin(changes.map(change => this._load(change.dossierId))); return this.hasChangesDetails$().pipe( switchMap(changes => load(changes.dossierChanges).pipe(mapTo(changes))), @@ -122,7 +122,7 @@ export class DossiersService extends EntitiesService { return this.all.filter(dossier => dossier.dossierStatusId === dossierStatusId).length; } - load(id: string, queryParams?: List): Observable { + private _load(id: string, queryParams?: List): Observable { return super._getOne([id], this._defaultModelPath, queryParams).pipe( map(entity => new Dossier(entity)), switchMap(dossier => this._dossierStatsService.getFor([dossier.dossierId]).pipe(mapTo(dossier))), @@ -130,11 +130,11 @@ export class DossiersService extends EntitiesService { ); } - private _emitFileChanges(changes: ChangesDetails): void { + #emitFileChanges(changes: ChangesDetails): void { changes.dossierChanges.filter(change => change.fileChanges).forEach(change => this.dossierFileChanges$.next(change.dossierId)); } - private _computeStats(entities: List): IDossiersStats { + #computeStats(entities: List): IDossiersStats { let totalAnalyzedPages = 0; const totalPeople = new Set(); @@ -149,11 +149,11 @@ export class DossiersService extends EntitiesService { }; } - private _generalStats$(entities: List): Observable { + #generalStats$(entities: List): Observable { const stats$ = entities.map(entity => this._dossierStatsService.watch$(entity.dossierId)); return combineLatest(stats$).pipe( filter(stats => stats.every(s => !!s)), - map(() => this._computeStats(entities)), + map(() => this.#computeStats(entities)), shareLast(), ); }