diff --git a/alfa-client/apps/admin/src/test/helm/network_policy_test.yaml b/alfa-client/apps/admin/src/test/helm/network_policy_test.yaml
index 7f7cedbca17f4c24972c206bf45d4d079cf771c7..2032db88a659c5b7fcf67aa199d6dba893bf5397 100644
--- a/alfa-client/apps/admin/src/test/helm/network_policy_test.yaml
+++ b/alfa-client/apps/admin/src/test/helm/network_policy_test.yaml
@@ -28,20 +28,26 @@ release:
namespace: by-helm-test
templates:
- templates/network_policy.yaml
-set:
- networkPolicy:
- dnsServerNamespace: kube-system
- ssoPublicIp: 1.1.1.1/32
+
tests:
- it: should match apiVersion
+ set:
+ networkPolicy:
+ dnsServerNamespace: kube-system
asserts:
- isAPIVersion:
of: networking.k8s.io/v1
- it: should match kind
+ set:
+ networkPolicy:
+ dnsServerNamespace: kube-system
asserts:
- isKind:
of: NetworkPolicy
- it: validate metadata
+ set:
+ networkPolicy:
+ dnsServerNamespace: kube-system
asserts:
- equal:
path: metadata
@@ -50,6 +56,9 @@ tests:
namespace: by-helm-test
- it: should add egress rule to administration service
+ set:
+ networkPolicy:
+ dnsServerNamespace: kube-system
asserts:
- contains:
path: spec.egress
@@ -84,7 +93,6 @@ tests:
- it: should add additionalIngressConfig local
set:
networkPolicy:
- ssoPublicIp: 51.89.117.53/32
dnsServerNamespace: test-namespace-dns
additionalIngressConfigLocal:
- from:
@@ -102,7 +110,6 @@ tests:
- it: should add additionalIngressConfig global
set:
networkPolicy:
- ssoPublicIp: 51.89.117.53/32
dnsServerNamespace: test-namespace-dns
additionalIngressConfigGlobal:
- from:
@@ -121,7 +128,6 @@ tests:
- it: should add additionalEgressConfig local
set:
networkPolicy:
- ssoPublicIp: 51.89.117.53/32
dnsServerNamespace: test-dns-namespace
additionalEgressConfigLocal:
- to:
@@ -138,7 +144,6 @@ tests:
- it: should add additionalEgressConfig global
set:
networkPolicy:
- ssoPublicIp: 51.89.117.53/32
dnsServerNamespace: test-dns-namespace
additionalEgressConfigGlobal:
- to:
@@ -164,9 +169,23 @@ tests:
- it: test network policy unset should be disabled
set:
networkPolicy:
- ssoPublicIp: 1.1.1.1
disabled: false
dnsServerNamespace: test-dns-server-namespace
asserts:
- hasDocuments:
count: 1
+ - it: test network policy dnsServerNamespace must be set message
+ set:
+ networkPolicy:
+ disabled: false
+ asserts:
+ - failedTemplate:
+ errorMessage: networkPolicy.dnsServerNamespace must be set
+
+ - it: test network policy should be enabled by default
+ set:
+ networkPolicy:
+ dnsServerNamespace: test-dns-server-namespace
+ asserts:
+ - hasDocuments:
+ count: 1
\ No newline at end of file
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/components/attachment/attachment.e2e.component.ts b/alfa-client/apps/alfa-e2e/src/components/attachment/attachment.e2e.component.ts
index 4c4377f0230fec13df94e92332742f5776c6cec3..3277623c9aec9bf551906c97e921c752cf292862 100644
--- a/alfa-client/apps/alfa-e2e/src/components/attachment/attachment.e2e.component.ts
+++ b/alfa-client/apps/alfa-e2e/src/components/attachment/attachment.e2e.component.ts
@@ -21,7 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-import { getTestElement } from '../../support/cypress-helper';
import { convertToDataTestId } from '../../support/tech.util';
export class AttachmentContainerE2EComponent {
@@ -39,7 +38,7 @@ export class AttachmentContainerE2EComponent {
export class AttachmentListE2EComponent {
private readonly locatorRoot: string = 'file-list';
- private readonly downloadAttachmentsButton: string = 'download-button';
+ private readonly downloadAttachmentsButton: string = 'download-archive-file-button';
public getRoot() {
return cy.getTestElement(this.locatorRoot);
@@ -49,12 +48,12 @@ export class AttachmentListE2EComponent {
return new AttachmentE2EItem(fileName);
}
- public getDownloadAttachmentsButton(): Cypress.Chainable<JQuery<HTMLElement>> {
- return getTestElement(this.downloadAttachmentsButton);
+ public getDownloadAttachmentsButton(parent: any): Cypress.Chainable<JQuery<HTMLElement>> {
+ return cy.get(parent).getTestElementWithClass(this.downloadAttachmentsButton);
}
- public downloadAttachments() {
- return this.getDownloadAttachmentsButton().should('exist').click();
+ public downloadAttachments(parent: any): Cypress.Chainable<any> {
+ return this.getDownloadAttachmentsButton(parent).click();
}
}
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-anhang/vorgang-anhang-herunterladen.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-anhang/vorgang-anhang-herunterladen.cy.ts
index 81e7d7c8526043a1cf2690022eefc9dce35bb5a3..0d31452e0acf9a4540d9c3e0b409f3faca96f1dc 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-anhang/vorgang-anhang-herunterladen.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-anhang/vorgang-anhang-herunterladen.cy.ts
@@ -43,6 +43,7 @@ import {
} from '../../../support/binary-file-util';
import {
countDownloadFiles,
+ deleteDownloadFolder,
dropCollections,
getDownloadFiles,
readFileFromDownloads,
@@ -68,6 +69,8 @@ describe('Vorgang Anhänge', () => {
const attachmentList: AttachmentListE2EComponent = new AttachmentListE2EComponent();
const formularDatenContainer: VorgangFormularDatenE2EComponent =
vorgangPage.getFormularDatenContainer();
+ const vorgangDatenFormular: VorgangFormularDatenE2EComponent =
+ vorgangPage.getFormularDatenContainer();
const xmlRepresentation: FileDataE2E = createXmlRepresentation();
@@ -138,14 +141,18 @@ describe('Vorgang Anhänge', () => {
exist(readFileFromDownloads(buildDownloadFileName(pdfAttachmentName)));
});
- it('should download attachments', () => {
- attachmentList.downloadAttachments().then(() => {
- getDownloadFiles().then((files) => {
- unzipDownloadFile(files[0]);
- });
+ it('should download attachment zip file', () => {
+ deleteDownloadFolder().then(() => {
+ attachmentList.downloadAttachments(vorgangDatenFormular.getRoot());
+ });
+ });
- countDownloadFiles().then((count) => {
- expect(count).to.eq(6);
+ it('should unzip attachment file', () => {
+ getDownloadFiles().then((files) => {
+ unzipDownloadFile(files[0]).then(() => {
+ countDownloadFiles().then((count) => {
+ expect(count).to.eq(3);
+ });
});
});
});
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-dateien-tab.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-dateien-tab.cy.ts
index ffb27bceffefc12a051fddd406c9037ca77b876d..85fe66298c9e1653dd2d47ddb8b6e4108c71fc2c 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-dateien-tab.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-dateien-tab.cy.ts
@@ -127,7 +127,7 @@ describe('Dateien Tab', () => {
it('should show attachments and download button', () => {
exist(vorgangDatenFormular.getFileElementByName(jpgFileName));
exist(vorgangDatenFormular.getFileElementByName(pdfFileName));
- exist(attachmentList.getDownloadAttachmentsButton());
+ exist(attachmentList.getDownloadAttachmentsButton(vorgangDatenFormular.getRoot()));
});
});
});
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-client/apps/alfa-e2e/src/support/cypress-helper.ts b/alfa-client/apps/alfa-e2e/src/support/cypress-helper.ts
index 729036172148758e8b0c9563f107f5a15b7d8d0a..7666dbcaf8155666c509a50bc3f954b4da517961 100644
--- a/alfa-client/apps/alfa-e2e/src/support/cypress-helper.ts
+++ b/alfa-client/apps/alfa-e2e/src/support/cypress-helper.ts
@@ -138,8 +138,8 @@ export function deleteDownloadFolder() {
return cy.task(CypressTasks.DELETE_FOLDER, DOWNLOAD_FOLDER);
}
-export function unzipDownloadFile(file: string): void {
- cy.task(CypressTasks.UNZIP_FILE, { folderName: DOWNLOAD_FOLDER, fileName: file });
+export function unzipDownloadFile(file: string) {
+ return cy.task(CypressTasks.UNZIP_FILE, { folderName: DOWNLOAD_FOLDER, fileName: file });
}
export function getDownloadFiles(): Cypress.Chainable<Array<string>> {
diff --git a/alfa-client/libs/design-system/src/lib/button/button.component.ts b/alfa-client/libs/design-system/src/lib/button/button.component.ts
index 6975ba2e675a7b25128b6c4f0861e84b55d3f50a..58ba7ec0d96c8c0eb0516c9fbc367b885d686837 100644
--- a/alfa-client/libs/design-system/src/lib/button/button.component.ts
+++ b/alfa-client/libs/design-system/src/lib/button/button.component.ts
@@ -38,7 +38,7 @@ type ButtonVariants = VariantProps<typeof buttonVariants>;
[disabled]="isLoading"
[attr.aria-disabled]="isLoading"
[attr.aria-label]="text"
- data-test-id="download-button"
+ [attr.data-test-id]="dataTestId"
(click)="clickEmitter.emit()"
>
<ng-content *ngIf="!isLoading" select="[icon]"></ng-content>
diff --git a/alfa-client/libs/design-system/test/helm/network_policy_test.yaml b/alfa-client/libs/design-system/test/helm/network_policy_test.yaml
index 7e828b00c019b1f771e7c6adc373b09a431e0a76..7820c1acdcdfafa48427c049c6292757ba2ae6f5 100644
--- a/alfa-client/libs/design-system/test/helm/network_policy_test.yaml
+++ b/alfa-client/libs/design-system/test/helm/network_policy_test.yaml
@@ -28,20 +28,26 @@ release:
namespace: by-helm-test
templates:
- templates/network_policy.yaml
-set:
- networkPolicy:
- dnsServerNamespace: kube-system
- ssoPublicIp: 1.1.1.1/32
+
tests:
- it: should match apiVersion
+ set:
+ networkPolicy:
+ dnsServerNamespace: kube-system
asserts:
- isAPIVersion:
of: networking.k8s.io/v1
- it: should match kind
+ set:
+ networkPolicy:
+ dnsServerNamespace: kube-system
asserts:
- isKind:
of: NetworkPolicy
- it: validate metadata
+ set:
+ networkPolicy:
+ dnsServerNamespace: kube-system
asserts:
- equal:
path: metadata
@@ -75,7 +81,6 @@ tests:
- it: should add additionalIngressConfig local
set:
networkPolicy:
- ssoPublicIp: 51.89.117.53/32
dnsServerNamespace: test-namespace-dns
additionalIngressConfigLocal:
- from:
@@ -93,7 +98,6 @@ tests:
- it: should add additionalIngressConfig global
set:
networkPolicy:
- ssoPublicIp: 51.89.117.53/32
dnsServerNamespace: test-namespace-dns
additionalIngressConfigGlobal:
- from:
@@ -112,7 +116,6 @@ tests:
- it: should add additionalEgressConfig local
set:
networkPolicy:
- ssoPublicIp: 51.89.117.53/32
dnsServerNamespace: test-dns-namespace
additionalEgressConfigLocal:
- to:
@@ -129,7 +132,6 @@ tests:
- it: should add additionalEgressConfig global
set:
networkPolicy:
- ssoPublicIp: 51.89.117.53/32
dnsServerNamespace: test-dns-namespace
additionalEgressConfigGlobal:
- to:
@@ -155,9 +157,23 @@ tests:
- it: test network policy unset should be disabled
set:
networkPolicy:
- ssoPublicIp: 1.1.1.1
disabled: false
dnsServerNamespace: test-dns-server-namespace
asserts:
- hasDocuments:
count: 1
+ - it: test network policy dnsServerNamespace must be set message
+ set:
+ networkPolicy:
+ disabled: false
+ asserts:
+ - failedTemplate:
+ errorMessage: networkPolicy.dnsServerNamespace must be set
+
+ - it: test network policy should be enabled by default
+ set:
+ networkPolicy:
+ dnsServerNamespace: test-dns-server-namespace
+ asserts:
+ - hasDocuments:
+ count: 1
\ No newline at end of file
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.spec.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.spec.ts
index 9e29f9d8172e162e37e5187cb5729efe2dd45eaf..5c631ffeb6e6c4007028f95655df19047482b1b9 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.spec.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.spec.ts
@@ -9,10 +9,10 @@ import {
import { BinaryFileResource } from '@alfa-client/binary-file-shared';
import { CommandLinkRel, CommandResource } from '@alfa-client/command-shared';
import {
- createStateResource,
EMPTY_STRING,
- formatForDatabase,
StateResource,
+ createStateResource,
+ formatForDatabase,
} from '@alfa-client/tech-shared';
import { Mock, mock, useFromMock } from '@alfa-client/test-utils';
import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
@@ -114,6 +114,22 @@ describe('BescheidenFormService', () => {
expect(service.sendByManual.value).toBeFalsy();
});
+ it('should not emit if value not changed', () => {
+ service.sendByManual.next(true);
+ service.sendByManual.next = jest.fn();
+
+ service.updateSendByManual(BescheidSendBy.MANUAL);
+
+ expect(service.sendByManual.next).not.toHaveBeenCalled();
+ });
+ it('should emit on value change', () => {
+ service.sendByManual.next(false);
+ service.sendByManual.next = jest.fn();
+
+ service.updateSendByManual(BescheidSendBy.MANUAL);
+
+ expect(service.sendByManual.next).toHaveBeenCalled();
+ });
});
describe('initializeFormChanges', () => {
diff --git a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.ts b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.ts
index d9e05716a5c15264f7f5b671ecec6a8f61cc1ca1..b079362062868d5fd121503655948db80538f466 100644
--- a/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.ts
+++ b/alfa-client/libs/vorgang-detail/src/lib/vorgang-detail-page/vorgang-detail-bescheiden/bescheiden.formservice.ts
@@ -10,14 +10,14 @@ import { BinaryFileResource } from '@alfa-client/binary-file-shared';
import { CommandResource, tapOnCommandSuccessfullyDone } from '@alfa-client/command-shared';
import {
AbstractFormService,
- convertToBoolean,
EMPTY_STRING,
- formatForDatabase,
HttpError,
+ StateResource,
+ convertToBoolean,
+ formatForDatabase,
isLoaded,
isNotEmpty,
isNotNil,
- StateResource,
} from '@alfa-client/tech-shared';
import { VorgangWithEingangResource } from '@alfa-client/vorgang-shared';
import { Injectable, OnDestroy } from '@angular/core';
@@ -28,18 +28,18 @@ import {
UntypedFormControl,
UntypedFormGroup,
} from '@angular/forms';
-import { getUrl, hasLink, Resource, ResourceUri } from '@ngxp/rest';
+import { Resource, ResourceUri, getUrl, hasLink } from '@ngxp/rest';
import { isEmpty, isNil, isUndefined } from 'lodash-es';
import {
BehaviorSubject,
+ Observable,
+ Subject,
+ Subscription,
combineLatest,
filter,
first,
map,
- Observable,
startWith,
- Subject,
- Subscription,
} from 'rxjs';
@Injectable()
@@ -92,7 +92,8 @@ export class BescheidenFormService extends AbstractFormService implements OnDest
}
updateSendByManual(sendBy: BescheidSendBy): void {
- this.sendByManual.next(sendBy === BescheidSendBy.MANUAL);
+ const isSendByManual = sendBy === BescheidSendBy.MANUAL;
+ if (isSendByManual !== this.sendByManual.value) this.sendByManual.next(isSendByManual);
}
initializeFormChanges(): void {
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/bescheid/DocumentRemoteService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/DocumentRemoteService.java
index 0cef6022ccd7c3ec41b83c090e732d467d7492a3..628f7a930eb4fd1df57ee334722661b43a980728 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/DocumentRemoteService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/bescheid/DocumentRemoteService.java
@@ -1,13 +1,9 @@
package de.ozgcloud.alfa.bescheid;
-import java.util.UUID;
-
-import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import de.ozgcloud.alfa.common.GrpcUtil;
-import de.ozgcloud.alfa.common.binaryfile.FileId;
import de.ozgcloud.document.DocumentServiceGrpc.DocumentServiceBlockingStub;
import de.ozgcloud.document.GrpcGetDocumentRequest;
import net.devh.boot.grpc.client.inject.GrpcClient;
@@ -21,14 +17,6 @@ class DocumentRemoteService {
private DocumentMapper documentMapper;
public Document getDocument(String documentId) {
- // DUMMY
- if (StringUtils.equals(documentId, "DOCUMENT_URI")) {
- return Document.builder()
- .id(UUID.randomUUID().toString())
- .fileId(FileId.from("DOCUMENT_FILE_URI"))
- .build();
- }
- //
var response = documentServiceStub.getDocument(GrpcGetDocumentRequest.newBuilder().setId(documentId).build());
return documentMapper.fromGrpc(response.getDocument());
}
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);
}
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index cad88f7ba2e55da7b791497853c8ff633af6aaac..b7221ad6bd6407099a01862c2ffb85bb5199d49d 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -98,7 +98,7 @@ spec:
{{- if ((.Values.ozgcloud).vorgang).bescheid}}
{{- range $index, $bescheid := ((.Values.ozgcloud).vorgang).bescheid }}
- name: ozgcloud_vorgang_bescheid_{{ $index }}_formId
- value: {{ $bescheid.formId }}
+ value: {{ $bescheid.formId | quote }}
- name: ozgcloud_vorgang_bescheid_{{ $index }}_formEngineName
value: {{ $bescheid.formEngineName }}
{{- end }}
diff --git a/src/test/helm/deployment_defaults_env_test.yaml b/src/test/helm/deployment_defaults_env_test.yaml
index 99d108c95f63fc674e22cf2cc369af4db57c0ae5..0bf3a7adbf32e293791d0af1a2804bf7c8c4d6df 100644
--- a/src/test/helm/deployment_defaults_env_test.yaml
+++ b/src/test/helm/deployment_defaults_env_test.yaml
@@ -92,7 +92,7 @@ tests:
- formEngineName: AFM
formId: form_id_1
- formEngineName: FormSolutions
- formId: form_id_2
+ formId: 2290
asserts:
- contains:
path: spec.template.spec.containers[0].env
@@ -108,7 +108,7 @@ tests:
path: spec.template.spec.containers[0].env
content:
name: ozgcloud_vorgang_bescheid_1_formId
- value: form_id_2
+ value: "2290"
- contains:
path: spec.template.spec.containers[0].env
content:
diff --git a/src/test/helm/network_policy_test.yaml b/src/test/helm/network_policy_test.yaml
index c74aa40bad0792d6da348b499eae6a22315ea6fa..af65c804e62b7fb9aebb26f65f2322b536f71550 100644
--- a/src/test/helm/network_policy_test.yaml
+++ b/src/test/helm/network_policy_test.yaml
@@ -28,21 +28,30 @@ release:
namespace: by-helm-test
templates:
- templates/network_policy.yaml
-set:
- networkPolicy:
- dnsServerNamespace: kube-system
- ssoPublicIp: 1.1.1.1/32
+
tests:
- it: should match apiVersion
+ set:
+ networkPolicy:
+ dnsServerNamespace: kube-system
+ ssoPublicIp: 1.1.1.1/32
asserts:
- isAPIVersion:
of: networking.k8s.io/v1
- it: should match kind
+ set:
+ networkPolicy:
+ dnsServerNamespace: kube-system
+ ssoPublicIp: 1.1.1.1/32
asserts:
- isKind:
of: NetworkPolicy
- it: validate metadata
+ set:
+ networkPolicy:
+ dnsServerNamespace: kube-system
+ ssoPublicIp: 1.1.1.1/32
asserts:
- equal:
path: metadata
@@ -187,3 +196,31 @@ tests:
asserts:
- hasDocuments:
count: 1
+
+ - it: test network policy dnsServerNamespace must be set message
+ set:
+ networkPolicy:
+ disabled: false
+ ssoPublicIp: 1.1.1.1/32
+ asserts:
+ - failedTemplate:
+ errorMessage: networkPolicy.dnsServerNamespace must be set
+
+
+ - it: test network policy ssoPublicIp must be set message
+ set:
+ networkPolicy:
+ disabled: false
+ dnsServerNamespace: test-dns-server-namespace
+ asserts:
+ - failedTemplate:
+ errorMessage: networkPolicy.ssoPublicIp must be set
+
+ - it: test network policy should be enabled by default
+ set:
+ networkPolicy:
+ ssoPublicIp: 1.1.1.1
+ dnsServerNamespace: test-dns-server-namespace
+ asserts:
+ - hasDocuments:
+ count: 1
\ No newline at end of file