diff --git a/alfa-client/apps/alfa-e2e/docker-compose.yml b/alfa-client/apps/alfa-e2e/docker-compose.yml
index 552a59c14cb9264c1e1c090cf624ca9303f2566f..e87654d697b9a340f65e9a666dff2fcca1b5ad98 100644
--- a/alfa-client/apps/alfa-e2e/docker-compose.yml
+++ b/alfa-client/apps/alfa-e2e/docker-compose.yml
@@ -94,8 +94,6 @@ services:
- LOGGING_CONFIG=classpath:log4j2-local.xml
- BPL_DEBUG_ENABLED=true
- BPL_DEBUG_PORT=5000
- # bescheid-wizard
- - OZGCLOUD_FEATURE_BESCHEID-WIZARD=true
- OZGCLOUD_VORGANG_BESCHEID_0_FORM_ENGINE_NAME=FormSolutions
- OZGCLOUD_VORGANG_BESCHEID_0_FORM_ID=KFAS_STAGE_KI_10_Haltverbot_LANDESHACKATHON
ports:
diff --git a/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml b/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml
index 480b4e1dd5db361f8aff3f159d6302851b98a875..c73587a0b07ff1fb36e484323bd8f5ea31a19300 100644
--- a/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml
+++ b/alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml
@@ -4,12 +4,11 @@ ozgcloud:
e2eTest: true
project:
destinations:
- - namespace: '*'
+ - namespace: "*"
server: https://kubernetes.default.svc
alfa:
env:
- overrideSpringProfiles: 'oc,e2e,dev'
- ozgcloud_feature_bescheid-wizard: "true"
+ overrideSpringProfiles: "oc,e2e,dev"
ingress:
use_staging_cert: true
ozgcloud:
@@ -20,7 +19,7 @@ alfa:
vorgang_manager:
env:
- overrideSpringProfiles: 'oc,e2e,dev'
+ overrideSpringProfiles: "oc,e2e,dev"
ozgcloud_bescheid_smart_documents_url: http://smocker:8080/smartdocuments
ozgcloud_bescheid_smart_documents_basic_auth_username: MGM
ozgcloud_bescheid_smart_documents_basic_auth_password: MGM
@@ -80,7 +79,7 @@ smocker:
response:
status: 500
headers:
- body: 'Da ist etwas schiefgelaufen'
+ body: "Da ist etwas schiefgelaufen"
# bayernid
- request:
diff --git a/alfa-server/src/main/resources/application-dev.yml b/alfa-server/src/main/resources/application-dev.yml
index 70ae53c6c499ef254dd591b6ef9a668022e741e9..52ca56a22d8fa5ded4dcecfae01b3e22553c2da1 100644
--- a/alfa-server/src/main/resources/application-dev.yml
+++ b/alfa-server/src/main/resources/application-dev.yml
@@ -10,7 +10,6 @@ server:
ozgcloud:
feature:
reply-always-allowed: true
- bescheid-wizard: true
production: false
stage:
production: false
diff --git a/alfa-server/src/main/resources/application-e2e.yml b/alfa-server/src/main/resources/application-e2e.yml
index d91ee9e7f3874a0799b8c92bcdb28dab13dcb9ad..7aa16cc6e02921c1fa3157a05b185fcbf08c623d 100644
--- a/alfa-server/src/main/resources/application-e2e.yml
+++ b/alfa-server/src/main/resources/application-e2e.yml
@@ -10,7 +10,6 @@ ozgcloud:
feature:
createBescheid: true
reply-always-allowed: true
- bescheid-wizard: true
forwarding:
lninfo:
url: classpath:files/LandesnetzInfo.html
diff --git a/alfa-server/src/main/resources/application-local.yml b/alfa-server/src/main/resources/application-local.yml
index 55480e664c9e5159bc787f902bd7c1d8e77eda1a..b113a7052d27746ebf67fdd3600b381e7e658dd5 100644
--- a/alfa-server/src/main/resources/application-local.yml
+++ b/alfa-server/src/main/resources/application-local.yml
@@ -18,7 +18,6 @@ grpc:
ozgcloud:
feature:
reply-always-allowed: true
- bescheid-wizard: true
production: false
user-assistance:
documentation:
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 1977b5ffb63dbf495578eeac0ebce27d6d7a4af5..1846ef681a80e682b12b20e191be1412107212f2 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
@@ -12,7 +12,6 @@ import org.springframework.hateoas.server.mvc.WebMvcLinkBuilder;
import org.springframework.stereotype.Component;
import de.ozgcloud.alfa.bescheid.BescheidController.BescheidByVorgangController;
-import de.ozgcloud.alfa.common.FeatureToggleProperties;
import de.ozgcloud.alfa.common.ModelBuilder;
import de.ozgcloud.alfa.common.command.CommandController.CommandByRelationController;
import de.ozgcloud.alfa.common.user.CurrentUserService;
@@ -30,7 +29,6 @@ class BescheidVorgangProcessor implements RepresentationModelProcessor<EntityMod
static final LinkRelation REL_BESCHEIDE = LinkRelation.of("bescheide");
private final BescheidService bescheidService;
- private final FeatureToggleProperties featureToggleProperties;
private final CurrentUserService currentUserService;
@Override
@@ -66,11 +64,11 @@ class BescheidVorgangProcessor implements RepresentationModelProcessor<EntityMod
}
BooleanSupplier isRetrievingDraftAllowed(Vorgang vorgang) {
- return () -> featureToggleProperties.isBescheidWizard() && isVorgangInBearbeitung(vorgang) && draftExists(vorgang);
+ return () -> isVorgangInBearbeitung(vorgang) && draftExists(vorgang);
}
BooleanSupplier isCreatingDraftAllowed(Vorgang vorgang) {
- return () -> featureToggleProperties.isBescheidWizard() && isVorgangInBearbeitung(vorgang) && !draftExists(vorgang);
+ return () -> isVorgangInBearbeitung(vorgang) && !draftExists(vorgang);
}
boolean isVorgangInBearbeitung(Vorgang vorgang) {
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/FeatureToggleProperties.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/FeatureToggleProperties.java
index 2e8d93a5e51a15f05418aac4952d926c64717300..b06e637da196c9b9d5dfb11a5d51a72fb505da7d 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/FeatureToggleProperties.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/FeatureToggleProperties.java
@@ -21,9 +21,4 @@ public class FeatureToggleProperties {
* Enable mail reply option regardless of other configuration.
*/
private boolean replyAlwaysAllowed = false;
-
- /**
- * Enable/Disable bescheid wizard feature.
- */
- private boolean bescheidWizard = false;
}
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 ec24740d58cd87f75c86a04801232b5076fe03f3..fc714d41d1e45acb791372084e94c4c0b0bddab8 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
@@ -20,7 +20,6 @@ import org.mockito.Spy;
import org.springframework.hateoas.EntityModel;
import org.springframework.hateoas.Link;
-import de.ozgcloud.alfa.common.FeatureToggleProperties;
import de.ozgcloud.alfa.common.UserProfileUrlProvider;
import de.ozgcloud.alfa.common.user.CurrentUserService;
import de.ozgcloud.alfa.common.user.UserRole;
@@ -43,9 +42,6 @@ class BescheidVorgangProcessorTest {
@Mock
private CurrentUserService currentUserService;
- @Mock
- private FeatureToggleProperties featureToggleProperties;
-
@Nested
class TestProcess {
@@ -215,7 +211,6 @@ class BescheidVorgangProcessorTest {
@Test
void shouldReturnTrue() {
- givenFeatureToggleEnabled(true);
givenVorgangInBearbeitung(true);
givenDraftExists(true);
@@ -224,18 +219,8 @@ class BescheidVorgangProcessorTest {
assertThat(booleanSupplier.getAsBoolean()).isTrue();
}
- @Test
- void shouldReturnFalseIfFeatureToggleIsDisabled() {
- givenFeatureToggleEnabled(false);
-
- var booleanSupplier = callMethod();
-
- assertThat(booleanSupplier.getAsBoolean()).isFalse();
- }
-
@Test
void shouldReturnFalseIfVorgangNotInBearbeitung() {
- givenFeatureToggleEnabled(true);
givenVorgangInBearbeitung(false);
var booleanSupplier = callMethod();
@@ -245,7 +230,6 @@ class BescheidVorgangProcessorTest {
@Test
void shouldReturnFalseIfDraftDoesNotExist() {
- givenFeatureToggleEnabled(true);
givenVorgangInBearbeitung(true);
givenDraftExists(false);
@@ -264,7 +248,6 @@ class BescheidVorgangProcessorTest {
@Test
void shouldReturnTrue() {
- givenFeatureToggleEnabled(true);
givenVorgangInBearbeitung(true);
givenDraftExists(false);
@@ -273,18 +256,8 @@ class BescheidVorgangProcessorTest {
assertThat(booleanSupplier.getAsBoolean()).isTrue();
}
- @Test
- void shouldReturnFalseIfFeatureToggleIsDisabled() {
- givenFeatureToggleEnabled(false);
-
- var booleanSupplier = callMethod();
-
- assertThat(booleanSupplier.getAsBoolean()).isFalse();
- }
-
@Test
void shouldReturnFalseIfVorgangNotInBearbeitung() {
- givenFeatureToggleEnabled(true);
givenVorgangInBearbeitung(false);
var booleanSupplier = callMethod();
@@ -294,7 +267,6 @@ class BescheidVorgangProcessorTest {
@Test
void shouldReturnFalseIfDraftExists() {
- givenFeatureToggleEnabled(true);
givenVorgangInBearbeitung(true);
givenDraftExists(true);
@@ -360,10 +332,6 @@ class BescheidVorgangProcessorTest {
}
}
- private void givenFeatureToggleEnabled(boolean enabled) {
- when(featureToggleProperties.isBescheidWizard()).thenReturn(enabled);
- }
-
private void givenVorgangInBearbeitung(boolean inBearbeitung) {
doReturn(inBearbeitung).when(processor).isVorgangInBearbeitung(vorgang);
}