Merge branch 'master' into OZG-4528-show-firmaname

alfa-client/apps/alfa-e2e/docker-compose.yml

@@ -56,6 +56,13 @@ services:
       - GRPC_CLIENT_INFO-MANAGER_NEGOTIATIONTYPE=PLAINTEXT
       - GRPC_CLIENT_COMMAND-MANAGER_NEGOTIATIONTYPE=PLAINTEXT
       - GRPC_SERVER_SECURITY_ENABLED=false
+      # Bescheid-Wizard
+      - OZGCLOUD_FEATURE_BESCHEID_ENABLE-DUMMY-DOCUMENT-PROCESSOR=false
+      - 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
+      - OZGCLOUD_BESCHEID_SMART_DOCUMENTS_TEMPLATE_GROUP=OzgCloudTest
+      - OZGCLOUD_BESCHEID_SMART_DOCUMENTS_TEMPLATE=Halteverbot
     ports:
       - 9091:9090
     depends_on:
@@ -87,6 +94,10 @@ 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:
       - 8080:8080
       - 5000:5000

alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/BescheidService.java

@@ -20,7 +20,7 @@ public class BescheidService {
 	}
 
 	public Stream<Bescheid> findByVorgangId(String vorgangId) {
-		return sortBescheids(remoteService.findByVorgangId(vorgangId));
+		return remoteService.findByVorgangId(vorgangId);
 	}
 
 	public Stream<Bescheid> findByVorgangIdSorted(String vorgangId) {