diff --git a/alfa-client/libs/bescheid-shared/src/lib/bescheid-shared.module.ts b/alfa-client/libs/bescheid-shared/src/lib/bescheid-shared.module.ts index 6e13cc43051b22de074699c3a4dec84fe2a87c5f..7c011dec937b05f7d8233dc13605bb5b7e490101 100644 --- a/alfa-client/libs/bescheid-shared/src/lib/bescheid-shared.module.ts +++ b/alfa-client/libs/bescheid-shared/src/lib/bescheid-shared.module.ts @@ -21,31 +21,12 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ -import { CommandService } from '@alfa-client/command-shared'; -import { ResourceRepository } from '@alfa-client/tech-shared'; -import { VorgangService } from '@alfa-client/vorgang-shared'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { StoreModule } from '@ngrx/store'; import { BESCHEID_FEATURE_KEY, reducer } from './+state/bescheid.reducer'; -import { BescheidListResourceService, createBescheidListResourceService } from './bescheid-list-resource-service'; -import { BescheidResourceService, createBescheidResourceService } from './bescheid-resource-service'; -import { BescheidService } from './bescheid.service'; @NgModule({ imports: [CommonModule, StoreModule.forFeature(BESCHEID_FEATURE_KEY, reducer)], - providers: [ - BescheidService, - { - provide: BescheidResourceService, - useFactory: createBescheidResourceService, - deps: [ResourceRepository, CommandService, VorgangService], - }, - { - provide: BescheidListResourceService, - useFactory: createBescheidListResourceService, - deps: [ResourceRepository, VorgangService], - }, - ], }) export class BescheidSharedModule {} diff --git a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts index 9ce1e5f2ab726f6fb574fd43ff6fe02783d5780e..d22faf648e3d30b95e5d957b99673a29579e619b 100644 --- a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts +++ b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.spec.ts @@ -138,6 +138,12 @@ describe('BescheidService', () => { service._clearUploadedFiles = jest.fn(); }); + it('should reload bescheid list', () => { + service.exit(); + + expect(bescheidListResourceService.refresh).toHaveBeenCalled(); + }); + it('should reload postfach list', () => { service.exit(); 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 ec6a90a43ad27dd898eda39b580ddeb4f0d287be..f7b1e2f64bac1adb6a924aa1e6719cdbc1028ec5 100644 --- a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts +++ b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts @@ -64,15 +64,15 @@ export class BescheidService { private readonly binaryFileService = inject(BinaryFileService); private readonly resourceRepository = inject(ResourceRepository); private readonly postfachService = inject(PostfachService); - private readonly vorgangSvc = inject(VorgangService); + private readonly vorgangService = inject(VorgangService); // The injection of this service and the one below is problematic. // It must be analysed how to inject BescheidService via providers in BescheidSharedModule. private readonly bescheidResourceService = createBescheidResourceService( this.resourceRepository, this.commandService, - this.vorgangSvc, + this.vorgangService, ); - private readonly bescheidListResourceService = createBescheidListResourceService(this.resourceRepository, this.vorgangSvc); + private readonly bescheidListResourceService = createBescheidListResourceService(this.resourceRepository, this.vorgangService); readonly _bescheidDocument$: BehaviorSubject<BescheidDocument> = new BehaviorSubject(createEmptyBescheidDocument()); readonly _wizard$: BehaviorSubject<Wizard> = new BehaviorSubject(createInitialWizard()); @@ -83,6 +83,7 @@ export class BescheidService { } public exit(): void { + this.bescheidListResourceService.refresh(); this.postfachService.setPostfachMailOnReload(); this._clearUploadedFiles(); }