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 ddd7a40872ec5f94e58c44ed99351378e4b68316..30e7f2bbd5ef6d0e92736bb6cf3d567d48d5caaa 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 @@ -1,31 +1,18 @@ import { mock, Mock, useFromMock } from '@alfa-client/test-utils'; -import { - VorgangService, - VorgangWithEingangLinkRel, - VorgangWithEingangResource, -} from '@alfa-client/vorgang-shared'; +import { VorgangService, VorgangWithEingangResource } from '@alfa-client/vorgang-shared'; import { createVorgangWithEingangResource } from 'libs/vorgang-shared/test/vorgang'; import { BescheidFacade } from './+state/bescheid.facade'; import { BescheidService } from './bescheid.service'; import { buildCreateBescheidCommand } from './bescheid.util'; import { Observable, of } from 'rxjs'; -import { - createEmptyStateResource, - createStateResource, - StateResource, -} from '@alfa-client/tech-shared'; -import { CommandOrder, CommandService } from '@alfa-client/command-shared'; +import { createStateResource, StateResource } from '@alfa-client/tech-shared'; import { ResourceRepository } from '../../../tech-shared/src/lib/resource/resource.repository'; -import { createBescheid } from '../test/bescheid'; -import { createCommandResource } from '../../../command-shared/test/command'; -import { CommandLinkRel } from '../../../command-shared/src/lib/command.linkrel'; describe('BescheidService', () => { let service: BescheidService; let facade: Mock<BescheidFacade>; let vorgangService: Mock<VorgangService>; - let commandService: Mock<CommandService>; let resourceRepository: Mock<ResourceRepository>; const vorgangWithEingangStateResource$: Observable<StateResource<VorgangWithEingangResource>> = @@ -34,13 +21,11 @@ describe('BescheidService', () => { beforeEach(() => { facade = mock(BescheidFacade); vorgangService = mock(VorgangService); - commandService = mock(CommandService); resourceRepository = mock(ResourceRepository); vorgangService.getVorgangWithEingang.mockReturnValue(vorgangWithEingangStateResource$); service = new BescheidService( useFromMock(facade), useFromMock(vorgangService), - useFromMock(commandService), useFromMock(resourceRepository), ); }); @@ -69,52 +54,4 @@ describe('BescheidService', () => { ); }); }); - - describe('createBescheidDraft', () => { - const vorgangWithEingangResource = createVorgangWithEingangResource(); - const bescheidDraft = createBescheid(); - - it('should call command service', () => { - service.createBescheidDraft(vorgangWithEingangResource, bescheidDraft); - - expect(commandService.createCommand).toHaveBeenCalledWith( - vorgangWithEingangResource, - VorgangWithEingangLinkRel.CREATE_BESCHEID_DRAFT, - { - order: CommandOrder.CREATE_BESCHEID, - body: bescheidDraft, - }, - ); - }); - }); - - describe('ueberspringenUndAbschliessen', () => { - const vorgangWithEingangResource = createVorgangWithEingangResource(); - - it('should call command service', () => { - commandService.createCommand.mockReturnValue(of(createEmptyStateResource())); - - service.ueberspringenUndAbschliessen(vorgangWithEingangResource); - - expect(commandService.createCommand).toHaveBeenCalledWith( - vorgangWithEingangResource, - VorgangWithEingangLinkRel.UEBERSPRINGEN_UND_ABSCHLIESSEN, - { - order: CommandOrder.UEBERSPRINGEN_UND_ABSCHLIESSEN, - body: null, - }, - ); - }); - - it('should reload vorgang', (done) => { - commandService.createCommand.mockReturnValue( - of(createStateResource(createCommandResource([CommandLinkRel.EFFECTED_RESOURCE]))), - ); - - service.ueberspringenUndAbschliessen(vorgangWithEingangResource).subscribe(() => { - expect(vorgangService.reloadCurrentVorgang).toHaveBeenCalled(); - done(); - }); - }); - }); }); 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 e60f2e44fdeb13731ad606e0a4d87aa2604504ed..1c52716628b1f659cc436d3a90993ced4d43fec3 100644 --- a/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts +++ b/alfa-client/libs/bescheid-shared/src/lib/bescheid.service.ts @@ -1,9 +1,4 @@ -import { - CommandOrder, - CommandResource, - CommandService, - isSuccessfulDone, -} from '@alfa-client/command-shared'; +import { CommandResource } from '@alfa-client/command-shared'; import { StateResource } from '@alfa-client/tech-shared'; import { VorgangService, @@ -11,7 +6,7 @@ import { VorgangWithEingangResource, } from '@alfa-client/vorgang-shared'; import { Injectable } from '@angular/core'; -import { Observable, filter, tap } from 'rxjs'; +import { Observable } from 'rxjs'; import { ResourceServiceConfig } from '../../../tech-shared/src/lib/resource/resource.model'; import { ResourceRepository } from '../../../tech-shared/src/lib/resource/resource.repository'; import { ResourceService } from '../../../tech-shared/src/lib/resource/resource.service'; @@ -26,7 +21,6 @@ export class BescheidService { constructor( private readonly facade: BescheidFacade, private readonly vorgangService: VorgangService, - private readonly commandService: CommandService, repository: ResourceRepository, ) { this.resourceService = new ResourceService(this.buildConfig(), repository); @@ -52,36 +46,4 @@ export class BescheidService { public createBescheid(vorgangWithEingang: VorgangWithEingangResource, bescheid?: Bescheid): void { this.facade.createBescheid(vorgangWithEingang, buildCreateBescheidCommand(bescheid)); } - - public createBescheidDraft( - vorgangWithEingangResource: VorgangWithEingangResource, - bescheid: Bescheid, - ): Observable<StateResource<CommandResource>> { - return this.commandService.createCommand( - vorgangWithEingangResource, - VorgangWithEingangLinkRel.CREATE_BESCHEID_DRAFT, - { - order: CommandOrder.CREATE_BESCHEID, - body: bescheid, - }, - ); - } - - public ueberspringenUndAbschliessen( - vorgangWithEingangResource: VorgangWithEingangResource, - ): Observable<StateResource<CommandResource>> { - return this.commandService - .createCommand( - vorgangWithEingangResource, - VorgangWithEingangLinkRel.UEBERSPRINGEN_UND_ABSCHLIESSEN, - { - order: CommandOrder.UEBERSPRINGEN_UND_ABSCHLIESSEN, - body: null, - }, - ) - .pipe( - filter((command) => isSuccessfulDone(command.resource)), - tap(() => this.vorgangService.reloadCurrentVorgang()), - ); - } }