diff --git a/alfa-client/libs/command-shared/src/lib/command.model.ts b/alfa-client/libs/command-shared/src/lib/command.model.ts
index 96fa5ebf8aee5f489e3565265028757e58368767..1dbd3046f91c9e6079ad54cf6ccdd3ec7712ac0e 100644
--- a/alfa-client/libs/command-shared/src/lib/command.model.ts
+++ b/alfa-client/libs/command-shared/src/lib/command.model.ts
@@ -80,7 +80,6 @@ export enum CommandOrder {
LOESCH_ANFORDERUNG_ZURUECKNEHMEN = 'LOESCH_ANFORDERUNG_ZURUECKNEHMEN',
CREATE_BESCHEID = 'CREATE_BESCHEID',
SET_AKTENZEICHEN = 'SET_AKTENZEICHEN',
- UEBERSPRINGEN_UND_ABSCHLIESSEN = 'UEBERSPRINGEN_UND_ABSCHLIESSEN',
}
export enum CommandOrderType {
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.html
index 984f063d935652d953565328af00f61c5e8e5ca9..4127fdefb5e7a1c4f61ddb8a5ae39b0a1d1d0006 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.html
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.html
@@ -28,7 +28,3 @@
[activeStep]="activeStep"
>
</alfa-vorgang-detail-bescheiden-step-content>
-
-<alfa-vorgang-detail-bescheiden-ueberspringen-button
- *ngIf="activeStep === 1"
-></alfa-vorgang-detail-bescheiden-ueberspringen-button>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.spec.ts
index 8c7cfbe684fd5a0c1719e31f19f75c62d04d8f5a..ce71487fa6d042b8622573fce274a89fb3f20993 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component.spec.ts
@@ -7,7 +7,6 @@ import { VorgangDetailBescheidenWeiterButtonComponent } from '../vorgang-detail-
import { VorgangDetailAntragBescheidenStepComponent } from './vorgang-detail-bescheiden-antrag-bescheiden-step/vorgang-detail-antrag-bescheiden-step.component';
import { VorgangDetailBescheidenStepContentComponent } from './vorgang-detail-bescheiden-step-content/vorgang-detail-bescheiden-step-content.component';
import { VorgangDetailBescheidenStepsContentComponent } from './vorgang-detail-bescheiden-steps-content.component';
-import { VorgangDetailBescheidenUeberspringenButtonComponent } from './vorgang-detail-bescheiden-ueberspringen-button/vorgang-detail-bescheiden-ueberspringen-button.component';
describe('VorgangDetailBescheidenStepsContentComponent', () => {
let component: VorgangDetailBescheidenStepsContentComponent;
@@ -21,7 +20,6 @@ describe('VorgangDetailBescheidenStepsContentComponent', () => {
MockComponent(VorgangDetailBescheidenStepTitleComponent),
MockComponent(VorgangDetailBescheidenStepContentComponent),
MockComponent(VorgangDetailAntragBescheidenStepComponent),
- MockComponent(VorgangDetailBescheidenUeberspringenButtonComponent),
],
}).compileComponents();
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-ueberspringen-button/vorgang-detail-bescheiden-ueberspringen-button.component.html b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-ueberspringen-button/vorgang-detail-bescheiden-ueberspringen-button.component.html
deleted file mode 100644
index 739d33cc4a07497e37bcb771abb564ae89ac0a7b..0000000000000000000000000000000000000000
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-ueberspringen-button/vorgang-detail-bescheiden-ueberspringen-button.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<button (click)="bescheiden()" class="select-none text-left text-primary hover:underline">
- Bescheiderstellung überspringen<br />und abschließen
-</button>
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-ueberspringen-button/vorgang-detail-bescheiden-ueberspringen-button.component.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-ueberspringen-button/vorgang-detail-bescheiden-ueberspringen-button.component.spec.ts
deleted file mode 100644
index 2de0a9362a34de5356ee86a03d265f9acfc6e854..0000000000000000000000000000000000000000
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-ueberspringen-button/vorgang-detail-bescheiden-ueberspringen-button.component.spec.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { mock } from '@alfa-client/test-utils';
-import { DialogRef } from '@angular/cdk/dialog';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { VorgangDetailBescheidenUeberspringenButtonComponent } from './vorgang-detail-bescheiden-ueberspringen-button.component';
-
-describe('VorgangDetailBescheidenUeberspringenButtonComponent', () => {
- let component: VorgangDetailBescheidenUeberspringenButtonComponent;
- let fixture: ComponentFixture<VorgangDetailBescheidenUeberspringenButtonComponent>;
-
- const dialogRef = mock(DialogRef);
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- declarations: [VorgangDetailBescheidenUeberspringenButtonComponent],
- providers: [
- {
- provide: DialogRef,
- useValue: dialogRef,
- },
- ],
- }).compileComponents();
-
- fixture = TestBed.createComponent(VorgangDetailBescheidenUeberspringenButtonComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-
- describe('bescheiden', () => {
- it('should call dialog.close', () => {
- component.bescheiden();
-
- expect(dialogRef.close).toHaveBeenCalled();
- });
- });
-});
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-ueberspringen-button/vorgang-detail-bescheiden-ueberspringen-button.component.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-ueberspringen-button/vorgang-detail-bescheiden-ueberspringen-button.component.ts
deleted file mode 100644
index f7d3f3d456edfe1699209535b65649a35110131a..0000000000000000000000000000000000000000
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-ueberspringen-button/vorgang-detail-bescheiden-ueberspringen-button.component.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import {
- BescheidenWizardReturnValue,
- VorgangWithEingangResource,
-} from '@alfa-client/vorgang-shared';
-import { DialogRef } from '@angular/cdk/dialog';
-import { Component, Input } from '@angular/core';
-
-@Component({
- selector: 'alfa-vorgang-detail-bescheiden-ueberspringen-button',
- templateUrl: './vorgang-detail-bescheiden-ueberspringen-button.component.html',
- styles: [':host {@apply flex flex-1 items-end}'],
-})
-export class VorgangDetailBescheidenUeberspringenButtonComponent {
- @Input() vorgang: VorgangWithEingangResource;
-
- constructor(public dialogRef: DialogRef<string>) {}
-
- public bescheiden(): void {
- this.dialogRef.close(BescheidenWizardReturnValue.UEBERSPRINGEN_UND_ABSCHLIESSEN);
- }
-}
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
index 6b94e96db23bc266f6325c06554df9a344938201..76194ddd0d5a2534b259ccff3135060600d0b69c 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail.module.ts
@@ -73,7 +73,6 @@ import { VorgangDetailBescheidenStepTitleComponent } from './vorgang-detail-page
import { VorgangDetailAntragBescheidenStepComponent } from './vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-antrag-bescheiden-step/vorgang-detail-antrag-bescheiden-step.component';
import { VorgangDetailBescheidenStepContentComponent } from './vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-step-content/vorgang-detail-bescheiden-step-content.component';
import { VorgangDetailBescheidenStepsContentComponent } from './vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-steps-content.component';
-import { VorgangDetailBescheidenUeberspringenButtonComponent } from './vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps-content/vorgang-detail-bescheiden-ueberspringen-button/vorgang-detail-bescheiden-ueberspringen-button.component';
import { VorgangDetailBescheidenStepsComponent } from './vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-steps.component';
import { VorgangDetailBescheidenWeiterButtonComponent } from './vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden-steps/vorgang-detail-bescheiden-weiter-button/vorgang-detail-bescheiden-weiter-button.component';
import { VorgangDetailBescheidenComponent } from './vorgang-detail-page/vorgang-detail-bescheiden/vorgang-detail-bescheiden.component';
@@ -151,7 +150,6 @@ const routes: Routes = [
VorgangDetailBescheidenStepContentComponent,
VorgangDetailBescheidenResultStatusComponent,
VorgangDetailAntragBescheidenStepComponent,
- VorgangDetailBescheidenUeberspringenButtonComponent,
],
exports: [
VorgangDetailAntragstellerComponent,
diff --git a/alfa-client/libs/vorgang-shared/src/lib/vorgang.linkrel.ts b/alfa-client/libs/vorgang-shared/src/lib/vorgang.linkrel.ts
index f49ddb1b57cd60961dd2f29d50e12abe48e8b691..3ee8483333198b707bea7ffa26c0c053bccc1499 100644
--- a/alfa-client/libs/vorgang-shared/src/lib/vorgang.linkrel.ts
+++ b/alfa-client/libs/vorgang-shared/src/lib/vorgang.linkrel.ts
@@ -62,7 +62,6 @@ export enum VorgangWithEingangLinkRel {
SET_AKTENZEICHEN = 'set_aktenzeichen',
BESCHEID_DRAFT = 'bescheidDraft',
- UEBERSPRINGEN_UND_ABSCHLIESSEN = 'ueberspringen_und_abschliessen',
}
export enum LoeschAnforderungLinkRel {
diff --git a/alfa-client/libs/vorgang-shared/src/lib/vorgang.model.ts b/alfa-client/libs/vorgang-shared/src/lib/vorgang.model.ts
index 2be184496d684bc4924d2bf4e1446433a4aa7521..8efb82099e48fa5f69ada4435f722db6f4b79ae4 100644
--- a/alfa-client/libs/vorgang-shared/src/lib/vorgang.model.ts
+++ b/alfa-client/libs/vorgang-shared/src/lib/vorgang.model.ts
@@ -182,7 +182,3 @@ export interface AdditionalActions {
additionalSuccessAction: () => TypedAction<string>;
additionalFailureAction: (error: HttpErrorResponse) => TypedAction<string>;
}
-
-export enum BescheidenWizardReturnValue {
- UEBERSPRINGEN_UND_ABSCHLIESSEN = 'ueberspringen_und_abschliessen',
-}
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidCommandByVorgangController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidCommandByVorgangController.java
deleted file mode 100644
index 52b09eb3c48ed33ce60acaa2a73ddfea279e5ecf..0000000000000000000000000000000000000000
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidCommandByVorgangController.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package de.ozgcloud.alfa.bescheid;
-
-import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.*;
-
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import de.ozgcloud.alfa.common.command.CommandController;
-import de.ozgcloud.alfa.common.command.CreateCommand;
-import lombok.RequiredArgsConstructor;
-
-@RestController
-@RequestMapping(BescheidCommandByVorgangController.PATH)
-@RequiredArgsConstructor
-public class BescheidCommandByVorgangController {
-
- static final String PATH = "/api/vorgangs/{vorgangId}/relations/{relationId}/{relationVersion}/bescheidCommands"; // NOSONAR
-
- private final BescheidService bescheidService;
-
- @PostMapping
- public ResponseEntity<Void> bescheidUeberpsringenUndVorgangAbschliessen(@PathVariable String vorgangId,
- @PathVariable String relationId, @PathVariable long relationVersion, @RequestBody CreateCommand command) {
- var created = bescheidService.ueberspringenUndAbschliessen(vorgangId, relationId, relationVersion);
- return ResponseEntity.created(linkTo(CommandController.class).slash(created.getId()).toUri()).build();
-
- }
-}
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidService.java
index 94e5e3518118f3d5397449ff543a2abfd35cfcb7..67bef19968599583c09c5ab5ecde6b241aed3a4d 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidService.java
@@ -4,10 +4,6 @@ import java.util.Optional;
import org.springframework.stereotype.Service;
-import de.ozgcloud.alfa.common.command.Command;
-import de.ozgcloud.alfa.common.command.CommandOrder;
-import de.ozgcloud.alfa.common.command.CommandService;
-import de.ozgcloud.alfa.common.command.CreateCommand;
import lombok.RequiredArgsConstructor;
@Service
@@ -15,18 +11,8 @@ import lombok.RequiredArgsConstructor;
public class BescheidService {
private final BescheidRemoteService remoteService;
- private final CommandService commandService;
public Optional<Bescheid> getBescheidDraft(String vorgangId) {
return remoteService.getBescheidDraft(vorgangId);
}
-
- public Command ueberspringenUndAbschliessen(String vorgangId, String relationId, long relationVersion) {
- return this.commandService.createCommand(createVorgangAbschliessenCommand(vorgangId, relationId, relationVersion));
- }
-
- CreateCommand createVorgangAbschliessenCommand(String vorgangId, String relationId, long relationVersion) {
- return CreateCommand.builder().order(CommandOrder.VORGANG_ABSCHLIESSEN).vorgangId(vorgangId).relationVersion(relationVersion)
- .relationId(relationId).build();
- }
}
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidVorgangProcessor.java b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidVorgangProcessor.java
index de1477752487d64964f1f6cf83c23f05ae593da1..a0113b5e929ecb32b24e7777200a696628da7d24 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidVorgangProcessor.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidVorgangProcessor.java
@@ -19,7 +19,6 @@ import lombok.RequiredArgsConstructor;
class BescheidVorgangProcessor implements RepresentationModelProcessor<EntityModel<? extends Vorgang>> {
static final String REL_DRAFT = "bescheidDraft";
- static final String REL_UEBERSPRINGEN_UND_ABSCHLIESSEN = "ueberspringen_und_abschliessen";
private final FeatureToggleProperties featureToggleProperties;
private final BescheidService bescheidService;
@@ -36,9 +35,6 @@ class BescheidVorgangProcessor implements RepresentationModelProcessor<EntityMod
.ifMatch(shouldAddLinkToDraft(vorgang))
.addLink(linkTo(methodOn(BescheidController.class).getDraft(vorgang.getId(), BescheidController.REQUEST_PARAM_STATUS_DRAFT)).withRel(
REL_DRAFT))
- .ifMatch(featureToggleProperties::isBescheidWizard)
- .addLink(linkTo(methodOn(BescheidCommandByVorgangController.class).bescheidUeberpsringenUndVorgangAbschliessen(vorgang.getId(),
- vorgang.getId(), vorgang.getVersion(), null)).withRel(REL_UEBERSPRINGEN_UND_ABSCHLIESSEN))
.buildModel();
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidCommandByVorgangControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidCommandByVorgangControllerTest.java
deleted file mode 100644
index 9e80564725496ca8ddbaf9a77dd8f3dec8b8cf35..0000000000000000000000000000000000000000
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidCommandByVorgangControllerTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package de.ozgcloud.alfa.bescheid;
-
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.util.UriTemplate;
-
-import de.ozgcloud.alfa.common.command.Command;
-import de.ozgcloud.alfa.common.command.CommandController;
-import de.ozgcloud.alfa.common.command.CommandTestFactory;
-import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
-
-class BescheidCommandByVorgangControllerTest {
-
- @InjectMocks
- private BescheidCommandByVorgangController controller;
-
- @Mock
- private BescheidService bescheidService;
-
- @Nested
- class BescheidUeberpsringenUndVorgangAbschliessenTest {
-
- private final Command command = CommandTestFactory.create();
-
- @BeforeEach
- void setUp() {
- when(bescheidService.ueberspringenUndAbschliessen(VorgangHeaderTestFactory.ID, CommandTestFactory.RELATION_ID,
- CommandTestFactory.RELATION_VERSION)).thenReturn(command);
- }
-
- @Test
- void shouldCallBescheidService() {
- callController();
-
- verify(bescheidService).ueberspringenUndAbschliessen(VorgangHeaderTestFactory.ID, CommandTestFactory.RELATION_ID,
- CommandTestFactory.RELATION_VERSION);
- }
-
- @Test
- void shouldReturnCreated() {
- var response = callController();
-
- assertThat(response.getStatusCode()).isEqualTo(HttpStatus.CREATED);
- }
-
- @Test
- void shouldReturnResponseWithLocationHeader() {
- var response = callController();
-
- assertThat(response.getHeaders().getLocation()).isEqualTo(
- new UriTemplate(CommandController.COMMANDS_PATH + "/{id}").expand(CommandTestFactory.ID));
- }
-
- private ResponseEntity<Void> callController() {
- return controller.bescheidUeberpsringenUndVorgangAbschliessen(VorgangHeaderTestFactory.ID, CommandTestFactory.RELATION_ID,
- CommandTestFactory.RELATION_VERSION, null);
- }
- }
-
-}
\ No newline at end of file
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidServiceTest.java
index 4b8e2d21817aba5bb2b80b943086973083e0ec94..6241bdce4c6a7c514c9e6273a7235d11736156ba 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidServiceTest.java
@@ -5,18 +5,12 @@ import static org.mockito.Mockito.*;
import java.util.Optional;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.ozgcloud.alfa.common.command.Command;
-import de.ozgcloud.alfa.common.command.CommandOrder;
-import de.ozgcloud.alfa.common.command.CommandService;
-import de.ozgcloud.alfa.common.command.CommandTestFactory;
-import de.ozgcloud.alfa.common.command.CreateCommand;
import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
class BescheidServiceTest {
@@ -26,8 +20,6 @@ class BescheidServiceTest {
private BescheidService service;
@Mock
private BescheidRemoteService remoteService;
- @Mock
- private CommandService commandService;
@Nested
class TestGetBescheidDraft {
@@ -49,62 +41,4 @@ class BescheidServiceTest {
assertThat(result).isEqualTo(remoteServiceResult);
}
}
-
- @Nested
- class CreateVorgangAbschliessenCommandTest {
-
- @Test
- void shouldHaveOrderVorgangAbschliessen() {
- var createCommand = service.createVorgangAbschliessenCommand(VorgangHeaderTestFactory.ID, CommandTestFactory.RELATION_ID,
- CommandTestFactory.RELATION_VERSION);
-
- assertThat(createCommand.getOrder()).isEqualTo(CommandOrder.VORGANG_ABSCHLIESSEN);
- }
-
- @Test
- void shouldHavaRelationId() {
- var createCommand = service.createVorgangAbschliessenCommand(VorgangHeaderTestFactory.ID, CommandTestFactory.RELATION_ID,
- CommandTestFactory.RELATION_VERSION);
-
- assertThat(createCommand.getRelationId()).isEqualTo(CommandTestFactory.RELATION_ID);
- }
-
- @Test
- void shouldHaveRelationVersion() {
- var createCommand = service.createVorgangAbschliessenCommand(VorgangHeaderTestFactory.ID, CommandTestFactory.RELATION_ID,
- CommandTestFactory.RELATION_VERSION);
-
- assertThat(createCommand.getRelationVersion()).isEqualTo(CommandTestFactory.RELATION_VERSION);
- }
- }
-
- @Nested
- class UeberspringenUndAbschliessenTest {
-
- private final CreateCommand createCommand = CommandTestFactory.createCreateCommand();
- private final Command command = CommandTestFactory.create();
-
- @BeforeEach
- void setUp() {
- doReturn(createCommand).when(service).createVorgangAbschliessenCommand(VorgangHeaderTestFactory.ID, CommandTestFactory.RELATION_ID,
- CommandTestFactory.RELATION_VERSION);
- when(commandService.createCommand(createCommand)).thenReturn(command);
- }
-
- @Test
- void shouldCallCommandService() {
- service.ueberspringenUndAbschliessen(VorgangHeaderTestFactory.ID, CommandTestFactory.RELATION_ID,
- CommandTestFactory.RELATION_VERSION);
-
- verify(commandService).createCommand(createCommand);
- }
-
- @Test
- void shouldReturnCommand() {
- var resultCommand = service.ueberspringenUndAbschliessen(VorgangHeaderTestFactory.ID, CommandTestFactory.RELATION_ID,
- CommandTestFactory.RELATION_VERSION);
-
- assertThat(resultCommand).isEqualTo(command);
- }
- }
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidVorgangProcessorTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidVorgangProcessorTest.java
index c7fcc369f8449c97f80ba23ea4e52a50319e573f..229f25f7dc8900c850f7a1a5d1b79bcedeb1fe6a 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidVorgangProcessorTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/bescheid/BescheidVorgangProcessorTest.java
@@ -17,7 +17,6 @@ import org.mockito.Mock;
import org.mockito.Spy;
import org.springframework.hateoas.EntityModel;
import org.springframework.hateoas.Link;
-import org.springframework.web.util.UriTemplate;
import de.ozgcloud.alfa.common.FeatureToggleProperties;
import de.ozgcloud.alfa.common.UserProfileUrlProvider;
@@ -79,26 +78,6 @@ class BescheidVorgangProcessorTest {
+ BescheidController.REQUEST_PARAM_STATUS_DRAFT);
}
- @Test
- void shouldHaveLinkToBescheidUeberspringenUndVorgangAbschliessen() {
- givenFeatureToggleEnabled(true);
-
- var model = callProcess();
-
- assertThat(model.getLink(BescheidVorgangProcessor.REL_UEBERSPRINGEN_UND_ABSCHLIESSEN)).isPresent().map(Link::getHref)
- .hasValue(new UriTemplate(BescheidCommandByVorgangController.PATH).expand(VorgangHeaderTestFactory.ID,
- VorgangHeaderTestFactory.ID, VorgangHeaderTestFactory.VERSION).toString());
- }
-
- @Test
- void shouldNotHaveLinkToBescheidUeberspringenUndVorgangAbschliessen() {
- givenFeatureToggleEnabled(false);
-
- var model = callProcess();
-
- assertThat(model.getLink(BescheidVorgangProcessor.REL_UEBERSPRINGEN_UND_ABSCHLIESSEN)).isEmpty();
- }
-
private void givenDraftLinkShouldBeAdded(boolean shouldBeAdded) {
doReturn((BooleanSupplier) () -> shouldBeAdded).when(processor).shouldAddLinkToDraft(vorgang);
}