From 84b4493249f23280d57578b41e247af3ae44bc3f Mon Sep 17 00:00:00 2001 From: Martin <git@mail.de> Date: Thu, 20 Mar 2025 16:33:50 +0100 Subject: [PATCH] OZG-7501 add underscore prefix for protected functions --- .../src/lib/bescheid.service.ts | 32 ++++- .../src/lib/kommentar.service.spec.ts | 61 ++++----- .../src/lib/kommentar.service.ts | 36 +++--- .../kommentar-form.component.ts | 11 +- ...tar-list-in-vorgang-container.component.ts | 2 +- .../src/lib/postfach.service.spec.ts | 120 +++++++++--------- .../src/lib/postfach.service.ts | 96 +++++++------- .../postfach-mail-list-container.component.ts | 4 +- .../src/lib/wiedervorlage.service.spec.ts | 60 ++++----- .../src/lib/wiedervorlage.service.ts | 52 ++++---- ...age-list-in-vorgang-container.component.ts | 2 +- 11 files changed, 254 insertions(+), 222 deletions(-) diff --git a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts index f7b1e2f64b..f87f719381 100644 --- a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts +++ b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts @@ -44,10 +44,34 @@ import { DocumentResource, Wizard, } from '@alfa-client/bescheid-shared'; -import { BinaryFileListLinkRel, BinaryFileListResource, BinaryFileResource, BinaryFileService, } from '@alfa-client/binary-file-shared'; -import { CommandOrder, CommandResource, CommandService, getEffectedResourceUrl, notHasCommandError, tapOnCommandSuccessfullyDone, } from '@alfa-client/command-shared'; +import { + BinaryFileListLinkRel, + BinaryFileListResource, + BinaryFileResource, + BinaryFileService, +} from '@alfa-client/binary-file-shared'; +import { + CommandOrder, + CommandResource, + CommandService, + getEffectedResourceUrl, + notHasCommandError, + tapOnCommandSuccessfullyDone, +} from '@alfa-client/command-shared'; import { PostfachService } from '@alfa-client/postfach-shared'; -import { createEmptyStateResource, createStateResource, filterIsLoadedOrHasError, getEmbeddedResources, hasStateResourceError, isLoaded, isNotEmpty, isNotNil, ResourceRepository, sortByGermanDateStr, StateResource, } from '@alfa-client/tech-shared'; +import { + createEmptyStateResource, + createStateResource, + filterIsLoadedOrHasError, + getEmbeddedResources, + hasStateResourceError, + isLoaded, + isNotEmpty, + isNotNil, + ResourceRepository, + sortByGermanDateStr, + StateResource, +} from '@alfa-client/tech-shared'; import { VorgangCommandService, VorgangService, VorgangWithEingangResource } from '@alfa-client/vorgang-shared'; import { inject, Injectable } from '@angular/core'; import { getUrl, hasLink, LinkRel, Resource, ResourceUri } from '@ngxp/rest'; @@ -84,7 +108,7 @@ export class BescheidService { public exit(): void { this.bescheidListResourceService.refresh(); - this.postfachService.setPostfachMailOnReload(); + this.postfachService._setPostfachMailOnReload(); this._clearUploadedFiles(); } diff --git a/alfa-client/libs/kommentar-shared/src/lib/kommentar.service.spec.ts b/alfa-client/libs/kommentar-shared/src/lib/kommentar.service.spec.ts index 31a2db7ad1..5860d36428 100644 --- a/alfa-client/libs/kommentar-shared/src/lib/kommentar.service.spec.ts +++ b/alfa-client/libs/kommentar-shared/src/lib/kommentar.service.spec.ts @@ -85,20 +85,21 @@ describe('KommentarService', () => { beforeEach(() => { repository.findKommentare.mockReturnValue(of(kommentarList)); - service.setListLoadingTrue = jest.fn(); - service.setKommentarList = jest.fn(); + service._setListLoadingTrue = jest.fn(); + service._setKommentarList = jest.fn(); service._refreshVorgangSubscription = jest.fn(); }); it('should call refresh vorgang subscription', () => { service.getKommentareByVorgang(vorgang); + expect(service._refreshVorgangSubscription).toHaveBeenCalled(); }); it('should set loading to true', () => { service.getKommentareByVorgang(vorgang); - expect(service.setListLoadingTrue).toHaveBeenCalled(); + expect(service._setListLoadingTrue).toHaveBeenCalled(); }); it('should call repository', () => { @@ -110,7 +111,7 @@ describe('KommentarService', () => { it('should set loaded resource', () => { service.getKommentareByVorgang(vorgang); - expect(service.setKommentarList).toHaveBeenCalledWith(kommentarList); + expect(service._setKommentarList).toHaveBeenCalledWith(kommentarList); }); }); @@ -156,28 +157,28 @@ describe('KommentarService', () => { expect(commandService.createCommand).toHaveBeenCalledWith( service.kommentarList$.value.resource, KommentarListLinkRel.CREATE_KOMMENTAR, - service.createCreateKommentarCommand(kommentar), + service._createCreateKommentarCommand(kommentar), ); }); it('should call getEffectedResource', () => { - service.afterCreateOrEditKommentar = jest.fn(); + service._afterCreateOrEditKommentar = jest.fn(); service.createKommentar(kommentar).subscribe(); - expect(service.afterCreateOrEditKommentar).toHaveBeenCalledWith(commandStateResource); + expect(service._afterCreateOrEditKommentar).toHaveBeenCalledWith(commandStateResource); }); it('should call createCreateKommentarCommand', () => { - service.createCreateKommentarCommand = jest.fn(); + service._createCreateKommentarCommand = jest.fn(); service.createKommentar(kommentar); - expect(service.createCreateKommentarCommand).toHaveBeenCalledWith(kommentar); + expect(service._createCreateKommentarCommand).toHaveBeenCalledWith(kommentar); }); it('should create CreateKommentarCommand', () => { - var command: CreateCommand = service.createCreateKommentarCommand(kommentar); + var command: CreateCommand = service._createCreateKommentarCommand(kommentar); expect(command).toEqual({ order: CommandOrder.CREATE_KOMMENTAR, body: kommentar }); }); @@ -208,28 +209,28 @@ describe('KommentarService', () => { expect(commandService.createCommand).toHaveBeenCalledWith( kommentarResource, KommentarLinkRel.EDIT, - service.createEditKommentarCommand(kommentar), + service._createEditKommentarCommand(kommentar), ); }); it('should call getEffectedResource', () => { - service.afterCreateOrEditKommentar = jest.fn(); + service._afterCreateOrEditKommentar = jest.fn(); service.editKommentar(kommentarResource, kommentar).subscribe(); - expect(service.afterCreateOrEditKommentar).toHaveBeenCalledWith(commandStateResource); + expect(service._afterCreateOrEditKommentar).toHaveBeenCalledWith(commandStateResource); }); it('should call createEditKommentarCommand', () => { - service.createEditKommentarCommand = jest.fn(); + service._createEditKommentarCommand = jest.fn(); service.editKommentar(kommentarResource, kommentar); - expect(service.createEditKommentarCommand).toHaveBeenCalledWith(kommentar); + expect(service._createEditKommentarCommand).toHaveBeenCalledWith(kommentar); }); it('should create CreateKommentarCommand', () => { - var command: CreateCommand = service.createEditKommentarCommand(kommentar); + var command: CreateCommand = service._createEditKommentarCommand(kommentar); expect(command).toEqual({ order: CommandOrder.EDIT_KOMMENTAR, body: kommentar }); }); @@ -247,7 +248,7 @@ describe('KommentarService', () => { it('should hide formular', () => { service.hideFormular = jest.fn(); - service.afterCreateOrEditKommentar({ + service._afterCreateOrEditKommentar({ ...commandStateResource, resource: createCommandResource([CommandLinkRel.EFFECTED_RESOURCE]), }); @@ -256,7 +257,7 @@ describe('KommentarService', () => { }); it('should reload vorgang', () => { - service.afterCreateOrEditKommentar({ + service._afterCreateOrEditKommentar({ ...commandStateResource, resource: createCommandResource([CommandLinkRel.EFFECTED_RESOURCE]), }); @@ -265,20 +266,20 @@ describe('KommentarService', () => { }); it('should set kommentar list on reload', () => { - service.setKommentarListReload = jest.fn(); + service._setKommentarListReload = jest.fn(); - service.afterCreateOrEditKommentar({ + service._afterCreateOrEditKommentar({ ...commandStateResource, resource: createCommandResource([CommandLinkRel.EFFECTED_RESOURCE]), }); - expect(service.setKommentarListReload).toHaveBeenCalled(); + expect(service._setKommentarListReload).toHaveBeenCalled(); }); }); describe('on command is pending', () => { it('should do nothing', () => { - service.afterCreateOrEditKommentar({ + service._afterCreateOrEditKommentar({ ...commandStateResource, resource: createCommandResource([CommandLinkRel.UPDATE]), }); @@ -295,13 +296,13 @@ describe('KommentarService', () => { }); it('should clear uploaded files', () => { - service.onNavigation({}); + service._onNavigation({}); expect(service.clearUploadedFiles).toHaveBeenCalled(); }); it('should hide forumlar', () => { - service.onNavigation({}); + service._onNavigation({}); expect(service.hideFormular).toHaveBeenCalled(); }); @@ -310,7 +311,7 @@ describe('KommentarService', () => { it('should set reload flag of kommentar list', () => { service.kommentarList$.next(createEmptyStateResource()); - service.onNavigation({}); + service._onNavigation({}); expect(service.kommentarList$.value.reload).toEqual(true); }); @@ -320,7 +321,7 @@ describe('KommentarService', () => { it('should set kommentar list to reload', () => { service.kommentarList$.next(createEmptyStateResource()); - service.onNavigation({ vorgangWithEingangUrl: 'X' }); + service._onNavigation({ vorgangWithEingangUrl: 'X' }); expect(service.kommentarList$.value.reload).toEqual(true); }); @@ -330,13 +331,13 @@ describe('KommentarService', () => { describe('attachments', () => { it('should be loaded if link avaible', () => { const kommentarResource = createKommentarResource([KommentarLinkRel.ATTACHMENTS]); - service.getAttachments(kommentarResource); + service._getAttachments(kommentarResource); expect(binaryFileService.getFiles).toHaveBeenCalledWith(kommentarResource, KommentarLinkRel.ATTACHMENTS); }); it('should not be loaded if no link available', () => { - service.getAttachments(kommentarResource); + service._getAttachments(kommentarResource); expect(binaryFileService.getFiles).not.toHaveBeenCalled(); }); @@ -491,7 +492,7 @@ describe('KommentarService', () => { describe('on setted reload flag', () => { beforeEach(() => { - service.setKommentarListReload = jest.fn(); + service._setKommentarListReload = jest.fn(); service.shouldReload = true; }); @@ -499,7 +500,7 @@ describe('KommentarService', () => { it('should call set kommentar list reload', () => { service._handleVorgangChange(vorgangWithEingangStateResource); - expect(service.setKommentarListReload).toHaveBeenCalled(); + expect(service._setKommentarListReload).toHaveBeenCalled(); }); it('and loaded vorgang resource should call set kommentar list reload', () => { diff --git a/alfa-client/libs/kommentar-shared/src/lib/kommentar.service.ts b/alfa-client/libs/kommentar-shared/src/lib/kommentar.service.ts index c5ef0dd2f8..395872897b 100644 --- a/alfa-client/libs/kommentar-shared/src/lib/kommentar.service.ts +++ b/alfa-client/libs/kommentar-shared/src/lib/kommentar.service.ts @@ -72,14 +72,14 @@ export class KommentarService { private listenToNavigation(): void { this.unsubscribe(); - this.navigationSub = this.navigationService.urlChanged().subscribe((params: Params) => this.onNavigation(params)); + this.navigationSub = this.navigationService.urlChanged().subscribe((params: Params) => this._onNavigation(params)); } private unsubscribe(): void { if (!isNil(this.navigationSub)) this.navigationSub.unsubscribe(); } - onNavigation(params: Params): void { + _onNavigation(params: Params): void { this.clearUploadedFiles(); this.hideFormular(); if (NavigationService.isVorgangListPage(params)) { @@ -118,7 +118,7 @@ export class KommentarService { this.shouldReload = true; } if (isLoaded(vorgangWithEingangStateResource) && this.shouldReload) { - this.setKommentarListReload(); + this._setKommentarListReload(); this.shouldReload = false; } } @@ -131,23 +131,23 @@ export class KommentarService { } private loadKommentare(vorgang: VorgangResource): void { - this.setListLoadingTrue(); + this._setListLoadingTrue(); const sub: Subscription = this.repository.findKommentare(vorgang).subscribe((kommentarList: KommentarListResource) => { - this.setKommentarList(kommentarList); + this._setKommentarList(kommentarList); sub.unsubscribe(); }); } - setListLoadingTrue(): void { + _setListLoadingTrue(): void { this.kommentarList$.next({ ...this.kommentarList$.value, loading: true }); } - setKommentarListReload() { + _setKommentarListReload() { this.kommentarList$.next({ ...this.kommentarList$.value, reload: true }); } - setKommentarList(kommentarList: KommentarListResource): void { + _setKommentarList(kommentarList: KommentarListResource): void { this.kommentarList$.next(createStateResource(kommentarList)); } @@ -173,45 +173,45 @@ export class KommentarService { } public createKommentar(kommentar: Kommentar): Observable<StateResource<CommandResource>> { - return this.createKommentarCommand( + return this._createKommentarCommand( this.kommentarList$.value.resource, KommentarListLinkRel.CREATE_KOMMENTAR, - this.createCreateKommentarCommand(kommentar), + this._createCreateKommentarCommand(kommentar), ); } - createCreateKommentarCommand(kommentar: Kommentar): CreateCommand { + _createCreateKommentarCommand(kommentar: Kommentar): CreateCommand { return { order: CommandOrder.CREATE_KOMMENTAR, body: kommentar }; } public editKommentar(kommentar: KommentarResource, toPatch: Kommentar): Observable<StateResource<CommandResource>> { - return this.createKommentarCommand(kommentar, KommentarLinkRel.EDIT, this.createEditKommentarCommand(toPatch)); + return this._createKommentarCommand(kommentar, KommentarLinkRel.EDIT, this._createEditKommentarCommand(toPatch)); } - createEditKommentarCommand(kommentar: Kommentar): CreateCommand { + _createEditKommentarCommand(kommentar: Kommentar): CreateCommand { return { order: CommandOrder.EDIT_KOMMENTAR, body: kommentar }; } - createKommentarCommand( + _createKommentarCommand( resource: Resource, linkRel: string, command: CreateCommand, ): Observable<StateResource<CommandResource>> { return this.commandService.createCommand(resource, linkRel, command).pipe( - tap((createdCommand: StateResource<CommandResource>) => this.afterCreateOrEditKommentar(createdCommand)), + tap((createdCommand: StateResource<CommandResource>) => this._afterCreateOrEditKommentar(createdCommand)), startWith(createEmptyStateResource<CommandResource>(true)), ); } - afterCreateOrEditKommentar(command: StateResource<CommandResource>): void { + _afterCreateOrEditKommentar(command: StateResource<CommandResource>): void { if (isDone(command.resource)) { this.hideFormular(); - this.setKommentarListReload(); + this._setKommentarListReload(); this.vorgangService.reloadCurrentVorgang(); } } - getAttachments(kommentar: KommentarResource): Observable<StateResource<BinaryFileListResource>> { + _getAttachments(kommentar: KommentarResource): Observable<StateResource<BinaryFileListResource>> { if (hasLink(kommentar, KommentarLinkRel.ATTACHMENTS)) { return this.binaryFileService.getFiles(kommentar, KommentarLinkRel.ATTACHMENTS); } diff --git a/alfa-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.ts b/alfa-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.ts index 0566d0f19e..851cf4590f 100644 --- a/alfa-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.ts +++ b/alfa-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-form/kommentar-form.component.ts @@ -23,7 +23,14 @@ */ import { BinaryFileListLinkRel, BinaryFileResource } from '@alfa-client/binary-file-shared'; import { CommandResource, tapOnCommandSuccessfullyDone } from '@alfa-client/command-shared'; -import { KOMMENTAR_UPLOADED_ATTACHMENTS, KommentarLinkRel, KommentarListLinkRel, KommentarListResource, KommentarResource, KommentarService, } from '@alfa-client/kommentar-shared'; +import { + KOMMENTAR_UPLOADED_ATTACHMENTS, + KommentarLinkRel, + KommentarListLinkRel, + KommentarListResource, + KommentarResource, + KommentarService, +} from '@alfa-client/kommentar-shared'; import { createEmptyStateResource, getEmbeddedResources, StateResource } from '@alfa-client/tech-shared'; import { Component, EventEmitter, Input, OnChanges, Output } from '@angular/core'; import { isNil } from 'lodash-es'; @@ -66,7 +73,7 @@ export class KommentarFormComponent implements OnChanges { private updateAttachments() { this.attachments$ = this.kommentarService - .getAttachments(this.kommentar) + ._getAttachments(this.kommentar) .pipe(map((stateResource) => getEmbeddedResources<BinaryFileResource>(stateResource, BinaryFileListLinkRel.FILE_LIST))); } diff --git a/alfa-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang-container.component.ts b/alfa-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang-container.component.ts index 21d3159a29..78bdbb63fd 100644 --- a/alfa-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang-container.component.ts +++ b/alfa-client/libs/kommentar/src/lib/kommentar-list-in-vorgang-container/kommentar-list-in-vorgang-container.component.ts @@ -55,7 +55,7 @@ export class KommentarListInVorgangContainerComponent implements OnChanges, OnIn reloadKommentarListOnVorgangReload(): void { if (this.vorgangStateResource.reload) { - this.kommentarService.setKommentarListReload(); + this.kommentarService._setKommentarListReload(); } } diff --git a/alfa-client/libs/postfach-shared/src/lib/postfach.service.spec.ts b/alfa-client/libs/postfach-shared/src/lib/postfach.service.spec.ts index e2fde67bc1..9149471c8d 100644 --- a/alfa-client/libs/postfach-shared/src/lib/postfach.service.spec.ts +++ b/alfa-client/libs/postfach-shared/src/lib/postfach.service.spec.ts @@ -127,7 +127,7 @@ describe('PostfachService', () => { describe('reload postfach list', () => { beforeEach(() => { - service.refreshPostfachMailList = jest.fn(); + service._refreshPostfachMailList = jest.fn(); }); it('should execute on command is done', () => { @@ -138,7 +138,7 @@ describe('PostfachService', () => { service.sendMail(postfachMail); - expect(service.refreshPostfachMailList).toHaveBeenCalledWith(commandStateResource); + expect(service._refreshPostfachMailList).toHaveBeenCalledWith(commandStateResource); }); it('should not execute on pending command', () => { @@ -146,7 +146,7 @@ describe('PostfachService', () => { service.sendMail(postfachMail); - expect(service.refreshPostfachMailList).not.toHaveBeenCalled(); + expect(service._refreshPostfachMailList).not.toHaveBeenCalled(); }); }); }); @@ -158,13 +158,13 @@ describe('PostfachService', () => { const commandStateResource: StateResource<CommandResource> = createStateResource(createCommandResource()); it('should call doSendNachricht', () => { - service.doSendNachricht = jest.fn(); + service._doSendNachricht = jest.fn(); commandService.createCommand.mockReturnValue(of(commandStateResource)); vorgangService.getPendingSendPostfachMailCommand.mockReturnValue(of(commandStateResource)); service.sendExistingMail(postfachNachricht, nachricht); - expect(service.doSendNachricht).toHaveBeenCalledWith( + expect(service._doSendNachricht).toHaveBeenCalledWith( postfachNachricht, PostfachMailLinkRel.SEND, createSendPostfachMailCommand(nachricht), @@ -176,7 +176,7 @@ describe('PostfachService', () => { const postfachMailResource: PostfachMailResource = createPostfachMailResource(); beforeEach(() => { - service.handleSendPostfachMailIsDone = jest.fn(); + service._handleSendPostfachMailIsDone = jest.fn(); commandService.createCommand.mockReturnValue(of(createStateResource(createCommandResource()))); vorgangService.getPendingSendPostfachMailCommand.mockReturnValue(of(createStateResource(createCommandResource()))); @@ -204,7 +204,7 @@ describe('PostfachService', () => { commandService.createCommand.mockReturnValue(of(createStateResource(createCommandResource([CommandLinkRel.UPDATE])))); service.resendMail(postfachMailResource); - expect(service.handleSendPostfachMailIsDone).not.toHaveBeenCalled(); + expect(service._handleSendPostfachMailIsDone).not.toHaveBeenCalled(); }); it('should call handleSendPostfachMailIsDone if command is done', () => { @@ -215,7 +215,7 @@ describe('PostfachService', () => { service.resendMail(postfachMailResource); - expect(service.handleSendPostfachMailIsDone).toHaveBeenCalledWith(commandResponse); + expect(service._handleSendPostfachMailIsDone).toHaveBeenCalledWith(commandResponse); }); }); @@ -223,25 +223,25 @@ describe('PostfachService', () => { const commandStateResource: StateResource<CommandResource> = createStateResource(createCommandResource()); beforeEach(() => { - service.commandIsDone = jest.fn(); + service._commandIsDone = jest.fn(); }); it('should call vorgang service', () => { - service.handleSendNachrichtCommand(commandStateResource); + service._handleSendNachrichtCommand(commandStateResource); expect(vorgangService.setPendingSendPostfachMailCommand).toHaveBeenCalledWith(commandStateResource); }); it('should call commandIsDone', () => { - service.handleSendNachrichtCommand(commandStateResource); + service._handleSendNachrichtCommand(commandStateResource); - expect(service.commandIsDone).toHaveBeenCalledWith(commandStateResource); + expect(service._commandIsDone).toHaveBeenCalledWith(commandStateResource); }); }); describe('commandIsDone', () => { beforeEach(() => { - service.handleSendPostfachMailIsDone = jest.fn(); + service._handleSendPostfachMailIsDone = jest.fn(); }); it('should call handleSendPostfachMailIsDone', () => { @@ -249,9 +249,9 @@ describe('PostfachService', () => { createCommandResource([CommandLinkRel.EFFECTED_RESOURCE]), ); - service.commandIsDone(commandStateResource); + service._commandIsDone(commandStateResource); - expect(service.handleSendPostfachMailIsDone).toHaveBeenCalledWith(commandStateResource); + expect(service._handleSendPostfachMailIsDone).toHaveBeenCalledWith(commandStateResource); }); describe('on command is done', () => { @@ -261,7 +261,7 @@ describe('PostfachService', () => { errorMessage: null, }); - service.commandIsDone(commandStateResource); + service._commandIsDone(commandStateResource); expect(snackbarService.show).toHaveBeenCalledWith(commandStateResource.resource, PostfachMessages.SEND_SUCCESSFUL); }); @@ -273,7 +273,7 @@ describe('PostfachService', () => { createCommandErrorResource([CommandLinkRel.EFFECTED_RESOURCE]), ); - service.commandIsDone(commandStateResource); + service._commandIsDone(commandStateResource); expect(snackbarService.showError).toHaveBeenCalledWith(PostfachMessages.SEND_FAILED); }); @@ -282,58 +282,58 @@ describe('PostfachService', () => { describe('listenToNavigation', () => { it('should call usnsubcribeToNavigation', () => { - service.listenToNavigation(); + service._listenToNavigation(); expect(navigationService.urlChanged).toHaveBeenCalled(); }); it('should call navigation service', () => { - service.unsubscribeToNavigation = jest.fn(); + service._unsubscribeToNavigation = jest.fn(); - service.listenToNavigation(); + service._listenToNavigation(); - expect(service.unsubscribeToNavigation).toHaveBeenCalled(); + expect(service._unsubscribeToNavigation).toHaveBeenCalled(); }); it('should call onNavigation', () => { - service.onNavigation = jest.fn(); + service._onNavigation = jest.fn(); - service.listenToNavigation(); + service._listenToNavigation(); - expect(service.onNavigation).toHaveBeenCalledWith(urlChangedParams); + expect(service._onNavigation).toHaveBeenCalledWith(urlChangedParams); }); }); describe('onNavigation', () => { describe('to vorgang list', () => { beforeEach(() => { - service.setPollingFalse = jest.fn(); - service.clearPostfachMailList = jest.fn(); - service.unsubscribe = jest.fn(); + service._setPollingFalse = jest.fn(); + service._clearPostfachMailList = jest.fn(); + service._unsubscribe = jest.fn(); }); it('should set polling false', () => { - service.onNavigation({}); + service._onNavigation({}); - expect(service.setPollingFalse).toHaveBeenCalled(); + expect(service._setPollingFalse).toHaveBeenCalled(); }); it('should call clearPostfachMailList', () => { - service.onNavigation({}); + service._onNavigation({}); - expect(service.clearPostfachMailList).toHaveBeenCalled(); + expect(service._clearPostfachMailList).toHaveBeenCalled(); }); it('should call closeOpenDialogs', () => { - service.onNavigation({}); + service._onNavigation({}); expect(dialog.closeAll).toHaveBeenCalled(); }); it('should call unsubscribe', () => { - service.onNavigation({}); + service._onNavigation({}); - expect(service.unsubscribe).toHaveBeenCalled(); + expect(service._unsubscribe).toHaveBeenCalled(); }); }); @@ -341,7 +341,7 @@ describe('PostfachService', () => { it('should set postfach nachrichten list to reload', () => { service.postfachMailList$.next(createEmptyStateResource()); - service.onNavigation({ vorgangWithEingangUrl: 'X' }); + service._onNavigation({ vorgangWithEingangUrl: 'X' }); expect(service.postfachMailList$.value.reload).toEqual(true); }); @@ -349,12 +349,12 @@ describe('PostfachService', () => { describe('to postfach page', () => { beforeEach(() => { - service.resetHasNewPostfachNachrichten = jest.fn(); + service._resetHasNewPostfachNachrichten = jest.fn(); navigationService.isPostfachPage.mockReturnValue(true); }); it('should call navigationService', () => { - service.onNavigation({}); + service._onNavigation({}); expect(navigationService.isPostfachPage).toHaveBeenCalled(); }); @@ -362,17 +362,17 @@ describe('PostfachService', () => { it('should reset hasNewPostfachNachrichten', () => { navigationService.isPostfachPage.mockReturnValue(true); - service.onNavigation({}); + service._onNavigation({}); - expect(service.resetHasNewPostfachNachrichten).toHaveBeenCalled(); + expect(service._resetHasNewPostfachNachrichten).toHaveBeenCalled(); }); }); }); describe('getPendingSendPostfachMailCommand', () => { beforeEach(() => { - service.unsubscribe = jest.fn(); - service.pollSendPostfachMailCommand = jest.fn(); + service._unsubscribe = jest.fn(); + service._pollSendPostfachMailCommand = jest.fn(); commandService.pollCommand.mockReturnValue(of(createStateResource(createCommandResource()))); vorgangService.getPendingSendPostfachMailCommand.mockReturnValue(of(createStateResource(createCommandResource()))); @@ -390,12 +390,12 @@ describe('PostfachService', () => { it('should call doResetHasNewPostfachNachrichten', () => { service.getPostfachMailListByVorgang = jest.fn(); - service.doResetHasNewPostfachNachrichten = jest.fn(); + service._doResetHasNewPostfachNachrichten = jest.fn(); (<any>service.getPostfachMailListByVorgang).mockReturnValue(of(postfachListNachrichtenResource)); - service.resetHasNewPostfachNachrichten(); + service._resetHasNewPostfachNachrichten(); - expect(service.doResetHasNewPostfachNachrichten).toHaveBeenCalled(); + expect(service._doResetHasNewPostfachNachrichten).toHaveBeenCalled(); }); }); @@ -411,7 +411,7 @@ describe('PostfachService', () => { }); it('should call repository if link exists', () => { - service.doResetHasNewPostfachNachrichten(); + service._doResetHasNewPostfachNachrichten(); expect(repository.resetHasNewPostfachNachrichten).toHaveBeenCalledWith(postfachNachrichtenListResource); }); @@ -421,7 +421,7 @@ describe('PostfachService', () => { const postfachNachrichtenListResource: PostfachMailListResource = createPostfachMailListResource(); service.postfachMailList$.next(createStateResource(postfachNachrichtenListResource)); - service.doResetHasNewPostfachNachrichten(); + service._doResetHasNewPostfachNachrichten(); expect(repository.resetHasNewPostfachNachrichten).not.toHaveBeenCalled(); }); @@ -432,8 +432,8 @@ describe('PostfachService', () => { beforeEach(() => { repository.loadPostfachMailList.mockReturnValue(of(postfachMailList)); - service.setPostfachMailListLoading = jest.fn(); - service.setPostfachMailList = jest.fn(); + service._setPostfachMailListLoading = jest.fn(); + service._setPostfachMailList = jest.fn(); vorgangService.getVorgangWithEingang.mockReturnValue(of(createStateResource(createVorgangWithEingangResource()))); service.postfachMailList$.next(createEmptyStateResource()); service._refreshVorgangSubscription = jest.fn(); @@ -448,7 +448,7 @@ describe('PostfachService', () => { it('should set loading to true', () => { service.getPostfachMailListByVorgang(); - expect(service.setPostfachMailListLoading).toHaveBeenCalled(); + expect(service._setPostfachMailListLoading).toHaveBeenCalled(); }); it('should call vorgang service', () => { @@ -466,7 +466,7 @@ describe('PostfachService', () => { it('should set loading to false', () => { service.getPostfachMailListByVorgang(); - expect(service.setPostfachMailList).toHaveBeenCalled(); + expect(service._setPostfachMailList).toHaveBeenCalled(); }); }); @@ -474,28 +474,28 @@ describe('PostfachService', () => { const stateResource: StateResource<CommandResource> = createStateResource(createCommandResource()); beforeEach(() => { - service.setPollingFalse = jest.fn(); - service.setPostfachMailList = jest.fn(); + service._setPollingFalse = jest.fn(); + service._setPostfachMailList = jest.fn(); commandService.getEffectedResource.mockReturnValue(of(createCommandResource())); }); it('should call command service to get effected resource', () => { - service.handleSendPostfachMailIsDone(stateResource); + service._handleSendPostfachMailIsDone(stateResource); expect(commandService.getEffectedResource).toHaveBeenCalledWith(stateResource.resource); }); it('should set postfachMailList', () => { - service.handleSendPostfachMailIsDone(stateResource); + service._handleSendPostfachMailIsDone(stateResource); - expect(service.setPostfachMailList).toHaveBeenCalled(); + expect(service._setPostfachMailList).toHaveBeenCalled(); }); it('should set polling to false', () => { - service.handleSendPostfachMailIsDone(stateResource); + service._handleSendPostfachMailIsDone(stateResource); - expect(service.setPollingFalse).toHaveBeenCalled(); + expect(service._setPollingFalse).toHaveBeenCalled(); }); }); @@ -568,7 +568,7 @@ describe('PostfachService', () => { }); it('should clear uploaded files', () => { - service.closeOpenDialogs(); + service._closeOpenDialogs(); expect(service.clearUploadedFiles).toHaveBeenCalled(); }); @@ -613,7 +613,7 @@ describe('PostfachService', () => { describe('on setted reload flag', () => { beforeEach(() => { - service.setPostfachMailOnReload = jest.fn(); + service._setPostfachMailOnReload = jest.fn(); service.shouldReload = true; }); @@ -621,7 +621,7 @@ describe('PostfachService', () => { it('should call set kommentar list reload', () => { service._handleVorgangChange(vorgangWithEingangStateResource); - expect(service.setPostfachMailOnReload).toHaveBeenCalled(); + expect(service._setPostfachMailOnReload).toHaveBeenCalled(); }); it('and loaded vorgang resource should call set kommentar list reload', () => { diff --git a/alfa-client/libs/postfach-shared/src/lib/postfach.service.ts b/alfa-client/libs/postfach-shared/src/lib/postfach.service.ts index 2eef75c2cf..f650edd3f4 100644 --- a/alfa-client/libs/postfach-shared/src/lib/postfach.service.ts +++ b/alfa-client/libs/postfach-shared/src/lib/postfach.service.ts @@ -92,12 +92,12 @@ export class PostfachService { shouldReload: boolean = false; constructor() { - this.listenToNavigation(); + this._listenToNavigation(); this._listenToVorgangChange(); } public sendMail(postfachMail: PostfachMail): Observable<StateResource<CommandResource>> { - return this.doSendNachricht( + return this._doSendNachricht( this.postfachMailList$.value.resource, PostfachMailListLinkRel.SEND_POSTFACH_MAIL, createSendPostfachMailCommand(postfachMail), @@ -108,18 +108,18 @@ export class PostfachService { postfachMailResource: PostfachMailResource, postfachMail: PostfachMail, ): Observable<StateResource<CommandResource>> { - return this.doSendNachricht(postfachMailResource, PostfachMailLinkRel.SEND, createSendPostfachMailCommand(postfachMail)); + return this._doSendNachricht(postfachMailResource, PostfachMailLinkRel.SEND, createSendPostfachMailCommand(postfachMail)); } public resendMail(postfachMailResource: PostfachMailResource): Observable<StateResource<CommandResource>> { - return this.doSendNachricht( + return this._doSendNachricht( postfachMailResource, PostfachMailLinkRel.RESEND_POSTFACH_MAIL, createResendPostfachMailCommand(), ); } - doSendNachricht( + _doSendNachricht( resource: Resource, linkRel: string, command: CreatePostfachMailCommand, @@ -129,20 +129,20 @@ export class PostfachService { this.commandService .createCommand(resource, linkRel, command) .pipe(first()) - .subscribe((createdCommand) => this.handleSendNachrichtCommand(createdCommand)); + .subscribe((createdCommand) => this._handleSendNachrichtCommand(createdCommand)); return this.getPendingSendPostfachMailCommand(); } - handleSendNachrichtCommand(commandStateResource: StateResource<CommandResource>): void { + _handleSendNachrichtCommand(commandStateResource: StateResource<CommandResource>): void { this.vorgangService.setPendingSendPostfachMailCommand(commandStateResource); - this.commandIsDone(commandStateResource); + this._commandIsDone(commandStateResource); } - commandIsDone(commandStateResource: StateResource<CommandResource>): void { + _commandIsDone(commandStateResource: StateResource<CommandResource>): void { doIfCommandIsDone(commandStateResource.resource, () => { this.showSnackbar(commandStateResource.resource); - this.handleSendPostfachMailIsDone(commandStateResource); + this._handleSendPostfachMailIsDone(commandStateResource); }); } @@ -157,79 +157,79 @@ export class PostfachService { public getPendingSendPostfachMailCommand(): Observable<StateResource<CommandResource>> { return this.vorgangService .getPendingSendPostfachMailCommand() - .pipe(map((pendingCommand) => this.pollSendPostfachMailCommand(pendingCommand))); + .pipe(map((pendingCommand) => this._pollSendPostfachMailCommand(pendingCommand))); } - listenToNavigation(): void { - this.unsubscribeToNavigation(); - this.navigationSubscription = this.navigationService.urlChanged().subscribe((params) => this.onNavigation(params)); + _listenToNavigation(): void { + this._unsubscribeToNavigation(); + this.navigationSubscription = this.navigationService.urlChanged().subscribe((params) => this._onNavigation(params)); } - unsubscribeToNavigation(): void { + _unsubscribeToNavigation(): void { if (!isNil(this.navigationSubscription)) this.navigationSubscription.unsubscribe(); } - onNavigation(params: Params): void { + _onNavigation(params: Params): void { if (NavigationService.isVorgangListPage(params)) { - this.setPollingFalse(); - this.clearPostfachMailList(); - this.closeOpenDialogs(); - this.unsubscribe(); + this._setPollingFalse(); + this._clearPostfachMailList(); + this._closeOpenDialogs(); + this._unsubscribe(); } if (NavigationService.isVorgangDetailPage(params, VorgangService.VORGANG_WITH_EINGANG_URL)) { - this.setPostfachMailOnReload(); + this._setPostfachMailOnReload(); } if (this.navigationService.isPostfachPage()) { - this.resetHasNewPostfachNachrichten(); + this._resetHasNewPostfachNachrichten(); } } - setPollingFalse(): void { + _setPollingFalse(): void { this.isPollSendPostachMail.next(false); } - clearPostfachMailList(): void { + _clearPostfachMailList(): void { this.postfachMailList$.next(createEmptyStateResource<PostfachMailListResource>()); } - closeOpenDialogs(): void { + _closeOpenDialogs(): void { this.dialog.closeAll(); this.clearUploadedFiles(); } - unsubscribe(): void { + _unsubscribe(): void { if (isNotUndefined(this.sendPostfachMailSubscription)) this.sendPostfachMailSubscription.unsubscribe(); if (isNotUndefined(this.loadPostfachMailSubscription)) this.loadPostfachMailSubscription.unsubscribe(); if (isNotUndefined(this.vorgangSubscription)) this.vorgangSubscription.unsubscribe(); } - setPostfachMailOnReload(): void { + _setPostfachMailOnReload(): void { this.postfachMailList$.next({ ...this.postfachMailList$.value, reload: true }); } - resetHasNewPostfachNachrichten(): void { + _resetHasNewPostfachNachrichten(): void { this.postfachNachrichtenListSubscription = this.getPostfachMailListByVorgang().subscribe((postfachNachrichtenList) => { if (isNotNull(postfachNachrichtenList.resource)) { setTimeout(() => this.postfachNachrichtenListSubscription.unsubscribe(), 0); - this.doResetHasNewPostfachNachrichten(); + this._doResetHasNewPostfachNachrichten(); } }); } - doResetHasNewPostfachNachrichten(): void { + _doResetHasNewPostfachNachrichten(): void { if (hasLink(this.postfachMailList$.value.resource, PostfachMailListLinkRel.RESET_HAS_NEW_POSTFACH_NACHRICHT)) { this.repository.resetHasNewPostfachNachrichten(this.postfachMailList$.value.resource).pipe(take(1)).subscribe(); } } - pollSendPostfachMailCommand(command: StateResource<CommandResource>): StateResource<CommandResource> { + _pollSendPostfachMailCommand(command: StateResource<CommandResource>): StateResource<CommandResource> { if (this.shouldPoll(command)) { - this.setPollingTrue(); + this._setPollingTrue(); this.sendPostfachMailSubscription = this.commandService.pollCommand(command.resource).subscribe((updatedStateResource) => { this.vorgangService.setPendingSendPostfachMailCommand(updatedStateResource); if (isDone(updatedStateResource.resource)) { - this.handleSendPostfachMailIsDone(updatedStateResource); + this._handleSendPostfachMailIsDone(updatedStateResource); setTimeout(() => this.sendPostfachMailSubscription.unsubscribe(), 0); } }); @@ -241,31 +241,31 @@ export class PostfachService { return command.loaded && isPending(command.resource) && !this.isPollSendPostachMail.value; } - setPollingTrue(): void { + _setPollingTrue(): void { this.isPollSendPostachMail.next(true); } - handleSendPostfachMailIsDone(updatedStateResource: StateResource<CommandResource>): void { - this.refreshPostfachMailList(updatedStateResource); - this.setPollingFalse(); + _handleSendPostfachMailIsDone(updatedStateResource: StateResource<CommandResource>): void { + this._refreshPostfachMailList(updatedStateResource); + this._setPollingFalse(); } - refreshPostfachMailList(updatedStateResource: StateResource<CommandResource>): void { - this.setPostfachMailListLoading(); - this.getEffectedResource(updatedStateResource) + _refreshPostfachMailList(updatedStateResource: StateResource<CommandResource>): void { + this._setPostfachMailListLoading(); + this._getEffectedResource(updatedStateResource) .pipe(first()) .subscribe((effectedResource) => { - this.setPostfachMailList(effectedResource); + this._setPostfachMailList(effectedResource); }); } - getEffectedResource(updatedStateResource: StateResource<CommandResource>): Observable<PostfachMailListResource> { + _getEffectedResource(updatedStateResource: StateResource<CommandResource>): Observable<PostfachMailListResource> { return this.commandService.getEffectedResource<PostfachMailListResource>(updatedStateResource.resource); } public getPostfachMailListByGivenVorgang(vorgang: VorgangResource): Observable<StateResource<PostfachMailListResource>> { doIfLoadingRequired(this.postfachMailList$.value, () => { - this.setPostfachMailListLoading(); + this._setPostfachMailListLoading(); this.loadPostfachMailsByVorgang(vorgang); }); return this.postfachMailList$.asObservable(); @@ -274,7 +274,7 @@ export class PostfachService { public getPostfachMailListByVorgang(): Observable<StateResource<PostfachMailListResource>> { this._refreshVorgangSubscription(); doIfLoadingRequired(this.postfachMailList$.value, () => { - this.setPostfachMailListLoading(); + this._setPostfachMailListLoading(); this.vorgangSubscription = this.vorgangService.getVorgangWithEingang().subscribe((vorgangWithEingangStateResource) => { if (vorgangWithEingangStateResource.resource) { this.loadPostfachMailsByVorgang(vorgangWithEingangStateResource.resource); @@ -303,7 +303,7 @@ export class PostfachService { this.shouldReload = true; } if (isLoaded(vorgangWithEingangStateResource) && this.shouldReload) { - this.setPostfachMailOnReload(); + this._setPostfachMailOnReload(); this.shouldReload = false; } } @@ -315,20 +315,20 @@ export class PostfachService { ); } - setPostfachMailListLoading(): void { + _setPostfachMailListLoading(): void { this.postfachMailList$.next({ ...this.postfachMailList$.value, loading: true }); } public loadPostfachMailsByVorgang(vorgang: VorgangResource): void { this.loadPostfachMailSubscription = this.repository.loadPostfachMailList(vorgang).subscribe((postfachMaiList) => { if (!isNull(postfachMaiList)) { - this.setPostfachMailList(postfachMaiList); + this._setPostfachMailList(postfachMaiList); setTimeout(() => this.loadPostfachMailSubscription.unsubscribe(), 0); } }); } - setPostfachMailList(postfachMailList: PostfachMailListResource): void { + _setPostfachMailList(postfachMailList: PostfachMailListResource): void { this.postfachMailList$.next(createStateResource(postfachMailList)); } diff --git a/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list-container.component.ts b/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list-container.component.ts index 70ae1c3856..14c858585f 100644 --- a/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list-container.component.ts +++ b/alfa-client/libs/postfach/src/lib/postfach-mail-list-container/postfach-mail-list-container.component.ts @@ -21,10 +21,10 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -import { Component, Input, OnChanges } from '@angular/core'; import { ON_PAGE, PostfachMailListResource, PostfachService } from '@alfa-client/postfach-shared'; import { isNotNull, StateResource } from '@alfa-client/tech-shared'; import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared'; +import { Component, Input, OnChanges } from '@angular/core'; import { Observable } from 'rxjs'; @Component({ @@ -51,7 +51,7 @@ export class PostfachMailListContainerComponent implements OnChanges { reloadPostfachMailListOnVorgangReload(): void { if (this.vorgangStateResource.reload) { - this.postfachService.setPostfachMailOnReload(); + this.postfachService._setPostfachMailOnReload(); } } } diff --git a/alfa-client/libs/wiedervorlage-shared/src/lib/wiedervorlage.service.spec.ts b/alfa-client/libs/wiedervorlage-shared/src/lib/wiedervorlage.service.spec.ts index e5de206c37..13e5fcd714 100644 --- a/alfa-client/libs/wiedervorlage-shared/src/lib/wiedervorlage.service.spec.ts +++ b/alfa-client/libs/wiedervorlage-shared/src/lib/wiedervorlage.service.spec.ts @@ -125,11 +125,11 @@ describe('WiedervorlageService', () => { }); it.skip('should call loadWiedervorlagenByVorgang if required', (done) => { - service.loadWiedervorlagenByVorgang = jest.fn(); + service._loadWiedervorlagenByVorgang = jest.fn(); // service.wiedervorlageList$.next({ ...wiedervorlageListStateResource, reload: true }); service.getWiedervorlageList().subscribe((list) => { - expect(service.loadWiedervorlagenByVorgang).toHaveBeenCalled(); + expect(service._loadWiedervorlagenByVorgang).toHaveBeenCalled(); done(); }); // expect(service.loadWiedervorlagenByVorgang).toHaveBeenCalled(); @@ -139,12 +139,12 @@ describe('WiedervorlageService', () => { }); it('should NOT call loadWiedervorlagenByVorgang if already loaded', () => { - service.loadWiedervorlagenByVorgang = jest.fn(); + service._loadWiedervorlagenByVorgang = jest.fn(); service.wiedervorlageList$.asObservable = jest.fn().mockReturnValue(of(wiedervorlageListStateResource)); service.getWiedervorlageList(); - expect(service.loadWiedervorlagenByVorgang).not.toHaveBeenCalled(); + expect(service._loadWiedervorlagenByVorgang).not.toHaveBeenCalled(); }); }); @@ -173,21 +173,21 @@ describe('WiedervorlageService', () => { }); it('should load wiedervorlagen by vorgang if required', () => { - service.loadWiedervorlagenByVorgang = jest.fn(); + service._loadWiedervorlagenByVorgang = jest.fn(); service.wiedervorlageList$.next(createEmptyStateResource()); service.getWiedervorlageListByGivenVorgang(vorgang).subscribe(); - expect(service.loadWiedervorlagenByVorgang).toHaveBeenCalledWith(vorgang); + expect(service._loadWiedervorlagenByVorgang).toHaveBeenCalledWith(vorgang); }); it('should NOT load wiedervorlagen by vorgang if already loaded', () => { - service.loadWiedervorlagenByVorgang = jest.fn(); + service._loadWiedervorlagenByVorgang = jest.fn(); service.wiedervorlageList$.next(wiedervorlageListStateResource); service.getWiedervorlageListByGivenVorgang(vorgang).subscribe(); - expect(service.loadWiedervorlagenByVorgang).not.toHaveBeenCalled(); + expect(service._loadWiedervorlagenByVorgang).not.toHaveBeenCalled(); }); }); @@ -227,11 +227,11 @@ describe('WiedervorlageService', () => { }); it('should set loading to true', () => { - service.setWiedervorlageLoading = jest.fn(); + service._setWiedervorlageLoading = jest.fn(); service.getWiedervorlage().subscribe(); - expect(service.setWiedervorlageLoading).toHaveBeenCalled(); + expect(service._setWiedervorlageLoading).toHaveBeenCalled(); }); it('should call navigationService', () => { @@ -291,12 +291,12 @@ describe('WiedervorlageService', () => { }); it('should call proceedAfterRecieveCommand', () => { - service.proceedAfterReceiveCommand = jest.fn(); + service._proceedAfterReceiveCommand = jest.fn(); service.saveWiedervorlage(wiedervorlageResource, wiedervorlage).subscribe(); const expectedMessage = WiedervorlageMessages.SAVED.replace('{betreff}', wiedervorlage.betreff); - expect(service.proceedAfterReceiveCommand).toHaveBeenCalledWith( + expect(service._proceedAfterReceiveCommand).toHaveBeenCalledWith( createStateResource(commandResourceWithEffectedResourceLink), expectedMessage, ); @@ -336,12 +336,12 @@ describe('WiedervorlageService', () => { }); it('should call proceedAfterReceiveCommand', () => { - service.proceedAfterReceiveCommand = jest.fn(); + service._proceedAfterReceiveCommand = jest.fn(); service.createWiedervorlage(wiedervorlage).subscribe(); const expectedMessage = WiedervorlageMessages.CREATED.replace('{betreff}', wiedervorlage.betreff); - expect(service.proceedAfterReceiveCommand).toHaveBeenCalledWith(createStateResource(commandResource), expectedMessage); + expect(service._proceedAfterReceiveCommand).toHaveBeenCalledWith(createStateResource(commandResource), expectedMessage); }); }); @@ -351,13 +351,13 @@ describe('WiedervorlageService', () => { }); it('should set reload on wiedervorlageList', () => { - service.proceedAfterReceiveCommand(createStateResource(commandResourceWithEffectedResourceLink), null); + service._proceedAfterReceiveCommand(createStateResource(commandResourceWithEffectedResourceLink), null); expect(service.wiedervorlageList$.value.reload).toBe(true); }); it('should do nothing on apiError', () => { - service.proceedAfterReceiveCommand(createEmptyStateResource(), null); + service._proceedAfterReceiveCommand(createEmptyStateResource(), null); expect(service.wiedervorlageList$.value.reload).toBe(false); }); @@ -366,13 +366,13 @@ describe('WiedervorlageService', () => { snackbarService.show = jest.fn(); const snackbarMessage: string = 'XX wurde XX'; - service.proceedAfterReceiveCommand(createStateResource(commandResourceWithEffectedResourceLink), snackbarMessage); + service._proceedAfterReceiveCommand(createStateResource(commandResourceWithEffectedResourceLink), snackbarMessage); expect(snackbarService.show).toHaveBeenCalledWith(commandResourceWithEffectedResourceLink, snackbarMessage); }); it('should clear uploaded files', () => { - service.proceedAfterReceiveCommand(createStateResource(commandResourceWithEffectedResourceLink), null); + service._proceedAfterReceiveCommand(createStateResource(commandResourceWithEffectedResourceLink), null); expect(service.clearUploadedFiles).toHaveBeenCalled(); }); @@ -461,7 +461,7 @@ describe('WiedervorlageService', () => { it('should call service if command is done', () => { const commandResource: CommandResource = createCommandResource([CommandLinkRel.EFFECTED_RESOURCE]); - service.showSnackBar(commandResource, message); + service._showSnackBar(commandResource, message); expect(snackbarService.show).toHaveBeenCalledWith(commandResource, message); }); @@ -469,7 +469,7 @@ describe('WiedervorlageService', () => { it('should NOT call service if command is pending', () => { const commandResource: CommandResource = createCommandResource(); - service.showSnackBar(commandResource, message); + service._showSnackBar(commandResource, message); expect(snackbarService.show).not.toHaveBeenCalled(); }); @@ -479,14 +479,14 @@ describe('WiedervorlageService', () => { beforeEach(() => { (<any>service).navigateToVorgangDetailPage = jest.fn(); - service.setWiedervorlageListReload = jest.fn(); + service._setWiedervorlageListReload = jest.fn(); (<any>service).forceWiedervorlageReload = jest.fn(); - service.clearWiedervorlagenList = jest.fn(); + service._clearWiedervorlagenList = jest.fn(); service.clearUploadedFiles = jest.fn(); }); it('should clear uploaded files', () => { - service.onNavigation({}); + service._onNavigation({}); expect(service.clearUploadedFiles).toHaveBeenCalled(); }); @@ -497,13 +497,13 @@ describe('WiedervorlageService', () => { }); it('should set wiedervorlage list on reload', () => { - service.onNavigation({}); + service._onNavigation({}); - expect(service.setWiedervorlageListReload).toHaveBeenCalled(); + expect(service._setWiedervorlageListReload).toHaveBeenCalled(); }); it('should set wiedervorlage on reload', () => { - service.onNavigation({}); + service._onNavigation({}); expect((<any>service).forceWiedervorlageReload).toHaveBeenCalled(); }); @@ -511,9 +511,9 @@ describe('WiedervorlageService', () => { describe('to vorgang list', () => { it('should clear list', () => { - service.onNavigation({}); + service._onNavigation({}); - expect(service.clearWiedervorlagenList).toHaveBeenCalled(); + expect(service._clearWiedervorlagenList).toHaveBeenCalled(); }); }); }); @@ -614,7 +614,7 @@ describe('WiedervorlageService', () => { describe('on setted reload flag', () => { beforeEach(() => { - service.setWiedervorlageListReload = jest.fn(); + service._setWiedervorlageListReload = jest.fn(); service.shouldReload = true; }); @@ -622,7 +622,7 @@ describe('WiedervorlageService', () => { it('should call set wiedervorlage list reload', () => { service._handleVorgangChange(vorgangWithEingangStateResource); - expect(service.setWiedervorlageListReload).toHaveBeenCalled(); + expect(service._setWiedervorlageListReload).toHaveBeenCalled(); }); it('and loaded vorgang resource should call set wiedervorlage list reload', () => { diff --git a/alfa-client/libs/wiedervorlage-shared/src/lib/wiedervorlage.service.ts b/alfa-client/libs/wiedervorlage-shared/src/lib/wiedervorlage.service.ts index a39e1a9ab7..6590ff6738 100644 --- a/alfa-client/libs/wiedervorlage-shared/src/lib/wiedervorlage.service.ts +++ b/alfa-client/libs/wiedervorlage-shared/src/lib/wiedervorlage.service.ts @@ -99,7 +99,7 @@ export class WiedervorlageService implements OnDestroy { return combineLatest([this.wiedervorlageList$.asObservable(), this.vorgangService.getVorgangWithEingang()]).pipe( tap(([wiedervorlageList, vorgangResource]) => { if (isNotNull(vorgangResource.resource)) { - doIfLoadingRequired(wiedervorlageList, () => this.loadWiedervorlagenByVorgang(vorgangResource.resource)); + doIfLoadingRequired(wiedervorlageList, () => this._loadWiedervorlagenByVorgang(vorgangResource.resource)); } }), map(([wiedervorlageList]) => wiedervorlageList), @@ -111,7 +111,7 @@ export class WiedervorlageService implements OnDestroy { vorgangResource: VorgangResource, ): Observable<StateResource<WiedervorlageListResource>> { this._refreshVorgangSubscription(); - doIfLoadingRequired(this.wiedervorlageList$.value, () => this.loadWiedervorlagenByVorgang(vorgangResource)); + doIfLoadingRequired(this.wiedervorlageList$.value, () => this._loadWiedervorlagenByVorgang(vorgangResource)); return this.wiedervorlageList$.asObservable(); } @@ -133,7 +133,7 @@ export class WiedervorlageService implements OnDestroy { this.shouldReload = true; } if (isLoaded(vorgangWithEingangStateResource) && this.shouldReload) { - this.setWiedervorlageListReload(); + this._setWiedervorlageListReload(); this.shouldReload = false; } } @@ -145,16 +145,16 @@ export class WiedervorlageService implements OnDestroy { ); } - loadWiedervorlagenByVorgang(vorgangResource: VorgangResource): void { + _loadWiedervorlagenByVorgang(vorgangResource: VorgangResource): void { if (hasLink(vorgangResource, VorgangHeaderLinkRel.WIEDERVORLAGEN)) { const subscription: Subscription = this.repository.getWiedervorlageList(vorgangResource).subscribe((wiedervorlagenList) => { if (!isNull(wiedervorlagenList)) { - this.setWiedervorlagenList(wiedervorlagenList); + this._setWiedervorlagenList(wiedervorlagenList); subscription.unsubscribe(); } }); } else { - this.clearWiedervorlagenList(); + this._clearWiedervorlagenList(); } } @@ -167,7 +167,7 @@ export class WiedervorlageService implements OnDestroy { ); } - setWiedervorlagenList(wiedervorlagenList: WiedervorlageListResource): void { + _setWiedervorlagenList(wiedervorlagenList: WiedervorlageListResource): void { this.wiedervorlageList$.next(createStateResource(wiedervorlagenList)); } @@ -179,13 +179,13 @@ export class WiedervorlageService implements OnDestroy { } private updateWiedervorlage(): void { - this.setWiedervorlageLoading(); + this._setWiedervorlageLoading(); this.loadAndSetWiedervorlageByUrl(this.getWiedervorlageUri()); } private loadAndSetWiedervorlageByUrl(url: ResourceUri): void { - this.setWiedervorlageLoading(); + this._setWiedervorlageLoading(); const subscription: Subscription = this.repository.getWiedervorlage(url).subscribe((wiedervorlage) => { this.wiedervorlage$.next(createStateResource(wiedervorlage)); @@ -199,23 +199,23 @@ export class WiedervorlageService implements OnDestroy { private listenToNavigation(): void { this.unsubscribe(); - this.subscription = this.navigationService.urlChanged().subscribe((params) => this.onNavigation(params)); + this.subscription = this.navigationService.urlChanged().subscribe((params) => this._onNavigation(params)); } - onNavigation(params: Params): void { + _onNavigation(params: Params): void { this.clearUploadedFiles(); if (this.navigateToVorgangDetailPage(params)) { - this.setWiedervorlageListReload(); + this._setWiedervorlageListReload(); this.forceWiedervorlageReload(); this.submitInProgress$.next(createEmptyStateResource<CommandResource>()); } if (NavigationService.isVorgangListPage(params)) { - this.clearWiedervorlagenList(); + this._clearWiedervorlagenList(); this.submitInProgress$.next(createEmptyStateResource<CommandResource>()); } } - clearWiedervorlagenList(): void { + _clearWiedervorlagenList(): void { this.wiedervorlageList$.next(createEmptyStateResource<WiedervorlageListResource>()); } @@ -234,23 +234,23 @@ export class WiedervorlageService implements OnDestroy { return this.navigationService.getDecodedParam(WiedervorlageService.encodedWiedervorlageUriParam); } - setWiedervorlageLoading(): void { + _setWiedervorlageLoading(): void { this.wiedervorlage$.next({ ...this.wiedervorlage$.value, loading: true }); } public createWiedervorlage(wiedervorlage: Wiedervorlage): Observable<StateResource<CommandResource>> { this.setSubmitInProgressLoading(); - return this.createCreateWiedervorlageCommand(this.wiedervorlageList$.value.resource, wiedervorlage).pipe( + return this._createCreateWiedervorlageCommand(this.wiedervorlageList$.value.resource, wiedervorlage).pipe( filter((commandStateResource) => !commandStateResource.loading), tap((commandStateResource) => - this.proceedAfterReceiveCommand(commandStateResource, this.buildMessage(WiedervorlageMessages.CREATED, wiedervorlage)), + this._proceedAfterReceiveCommand(commandStateResource, this.buildMessage(WiedervorlageMessages.CREATED, wiedervorlage)), ), startWith(createEmptyStateResource<CommandResource>(true)), ); } - createCreateWiedervorlageCommand( + _createCreateWiedervorlageCommand( wiedervorlageListResource: WiedervorlageListResource, wiedervorlage: Wiedervorlage, ): Observable<StateResource<CommandResource>> { @@ -271,10 +271,10 @@ export class WiedervorlageService implements OnDestroy { ): Observable<StateResource<CommandResource>> { this.setSubmitInProgressLoading(); - return this.createSaveWiedervorlageCommand(wiedervorlageResource, wiedervorlage).pipe( + return this._createSaveWiedervorlageCommand(wiedervorlageResource, wiedervorlage).pipe( filter((commandStateResource) => !commandStateResource.loading), tap((commandStateResource) => - this.proceedAfterReceiveCommand(commandStateResource, this.buildMessage(WiedervorlageMessages.SAVED, wiedervorlage)), + this._proceedAfterReceiveCommand(commandStateResource, this.buildMessage(WiedervorlageMessages.SAVED, wiedervorlage)), ), startWith(createEmptyStateResource<CommandResource>(true)), ); @@ -284,7 +284,7 @@ export class WiedervorlageService implements OnDestroy { this.submitInProgress$.next({ ...this.submitInProgress$.value, loading: true }); } - createSaveWiedervorlageCommand( + _createSaveWiedervorlageCommand( wiedervorlageResource: WiedervorlageResource, wiedervorlage: Wiedervorlage, ): Observable<StateResource<CommandResource>> { @@ -299,7 +299,7 @@ export class WiedervorlageService implements OnDestroy { return { order: CommandOrder.EDIT_WIEDERVORLAGE, body: wiedervorlage }; } - proceedAfterReceiveCommand(commandStateResource: StateResource<CommandResource>, message: string): void { + _proceedAfterReceiveCommand(commandStateResource: StateResource<CommandResource>, message: string): void { this.submitInProgress$.next({ ...this.submitInProgress$.value, resource: commandStateResource.resource, @@ -307,14 +307,14 @@ export class WiedervorlageService implements OnDestroy { if (isDone(commandStateResource.resource)) { this.submitInProgress$.next(createStateResource(commandStateResource.resource)); this.snackbarService.show(commandStateResource.resource, message); - this.setWiedervorlageListReload(); + this._setWiedervorlageListReload(); this.clearUploadedFiles(); } else if (hasStateResourceError(commandStateResource)) { this.submitInProgress$.next(createStateResource(commandStateResource.resource)); } } - setWiedervorlageListReload(): void { + _setWiedervorlageListReload(): void { this.wiedervorlageList$.next({ ...this.wiedervorlageList$.value, reload: true }); } @@ -349,7 +349,7 @@ export class WiedervorlageService implements OnDestroy { .subscribe((commandStateResource) => { if (isDone(commandStateResource.resource)) { this.handleSource(commandStateResource.resource); - this.showSnackBar( + this._showSnackBar( commandStateResource.resource, this.buildMessage(snackBarMessage, this.wiedervorlage$.value.resource), ); @@ -372,7 +372,7 @@ export class WiedervorlageService implements OnDestroy { return replacePlaceholder(message, 'betreff', wiedervorlage.betreff); } - showSnackBar(commandResource: CommandResource, message: string) { + _showSnackBar(commandResource: CommandResource, message: string) { if (isDone(commandResource)) { this.snackbarService.show(commandResource, message); } diff --git a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang-container.component.ts b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang-container.component.ts index 49636b773f..4313ee4c1f 100644 --- a/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang-container.component.ts +++ b/alfa-client/libs/wiedervorlage/src/lib/wiedervorlage-list-in-vorgang-container/wiedervorlage-list-in-vorgang-container.component.ts @@ -51,7 +51,7 @@ export class WiedervorlageListInVorgangContainerComponent implements OnChanges { reloadWiedervorlageListOnVorgangReload(): void { if (this.vorgangStateResource.reload) { - this.wiedervorlageService.setWiedervorlageListReload(); + this.wiedervorlageService._setWiedervorlageListReload(); } } } -- GitLab