diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile b/alfa-client/apps/alfa-e2e/Jenkinsfile
index 3e2c42250d1972c8da035506c48b64a13adf0776..0d76398068254cea09517834db5ade6da7328147 100644
--- a/alfa-client/apps/alfa-e2e/Jenkinsfile
+++ b/alfa-client/apps/alfa-e2e/Jenkinsfile
@@ -28,7 +28,7 @@ pipeline {
options {
timeout(time: 2, unit: 'HOURS')
disableConcurrentBuilds()
- buildDiscarder(logRotator(numToKeepStr: '5'))
+ buildDiscarder(logRotator(numToKeepStr: '15'))
skipDefaultCheckout(true)
}
diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile-static b/alfa-client/apps/alfa-e2e/Jenkinsfile-static
index 3182e1110f15268a1f66b8ae91ed1117d3c64558..d7022abc0c597dc044c8e3da8944bf480d5d9c09 100644
--- a/alfa-client/apps/alfa-e2e/Jenkinsfile-static
+++ b/alfa-client/apps/alfa-e2e/Jenkinsfile-static
@@ -30,7 +30,7 @@ pipeline {
options {
timeout(time: 2, unit: 'HOURS')
disableConcurrentBuilds()
- buildDiscarder(logRotator(numToKeepStr: '10'))
+ buildDiscarder(logRotator(numToKeepStr: '15'))
skipDefaultCheckout(true)
}
diff --git a/alfa-client/apps/alfa-e2e/cypress-ci-einheitlicher-ansprechpartner.config.ts b/alfa-client/apps/alfa-e2e/cypress-ci-einheitlicher-ansprechpartner.config.ts
index 13cefd098ae4abd5959c34e625cae8aab8723697..464428138059c10708a6ff1e3cd707ec731578c0 100644
--- a/alfa-client/apps/alfa-e2e/cypress-ci-einheitlicher-ansprechpartner.config.ts
+++ b/alfa-client/apps/alfa-e2e/cypress-ci-einheitlicher-ansprechpartner.config.ts
@@ -17,7 +17,7 @@ export default defineConfig({
experimentalStrategy: 'detect-flake-and-pass-on-threshold',
experimentalOptions: {
maxRetries: 2,
- passesRequired: 2,
+ passesRequired: 1,
},
openMode: true,
runMode: true,
diff --git a/alfa-client/apps/alfa-e2e/cypress-ci-main-tests.config.ts b/alfa-client/apps/alfa-e2e/cypress-ci-main-tests.config.ts
index 9e90e297f1d80329dcd0020fb0763e61dff963ee..daf52b990285916f94b2102e4c022be5a177fec2 100644
--- a/alfa-client/apps/alfa-e2e/cypress-ci-main-tests.config.ts
+++ b/alfa-client/apps/alfa-e2e/cypress-ci-main-tests.config.ts
@@ -17,7 +17,7 @@ export default defineConfig({
experimentalStrategy: 'detect-flake-and-pass-on-threshold',
experimentalOptions: {
maxRetries: 2,
- passesRequired: 2,
+ passesRequired: 1,
},
openMode: true,
runMode: true,
diff --git a/alfa-client/apps/alfa-e2e/cypress.config.ts b/alfa-client/apps/alfa-e2e/cypress.config.ts
index a39449b9c96551d36cfcc969df2c141bc07e12e7..a72d7976359485c9e3da118e39d8cc8dc818c18e 100644
--- a/alfa-client/apps/alfa-e2e/cypress.config.ts
+++ b/alfa-client/apps/alfa-e2e/cypress.config.ts
@@ -16,7 +16,7 @@ export default defineConfig({
experimentalStrategy: 'detect-flake-and-pass-on-threshold',
experimentalOptions: {
maxRetries: 2,
- passesRequired: 2,
+ passesRequired: 1,
},
openMode: true,
runMode: true,
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/historie/historie.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/historie/historie.cy.ts
index 55dc7090bbdb95a9a364f6ac1f2828ceeba7def6..493a03c50135410cddc764a41f799763f3374855 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/historie/historie.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/historie/historie.cy.ts
@@ -46,7 +46,6 @@ import { createVorgang, initVorgang } from '../../../support/vorgang-util';
registerLocaleData(localeDe, 'de', localeDeExtra);
-// TODO getUser*() funktionieren nicht länger
describe('Historie', () => {
const mainPage: MainPage = new MainPage();
const vorgangList: VorgangListE2EComponent = mainPage.getVorgangList();
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/user-profile/user-profile-icon-in-kommentar-error.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/user-profile/user-profile-icon-in-kommentar-error.cy.ts
index 53ad50e9a9865b34446a4e42e70d5cafe45f2854..115d402bf21f2122ba24974497ea670de0b5dfd7 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/user-profile/user-profile-icon-in-kommentar-error.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/user-profile/user-profile-icon-in-kommentar-error.cy.ts
@@ -31,7 +31,7 @@ import { VorgangPage } from '../../../page-objects/vorgang.po';
import { dropCollections, interceptWithResponse, scrollToWindowBottom, waitOfInterceptor } from '../../../support/cypress-helper';
import { exist, notExist } from '../../../support/cypress.util';
import { createKommentar } from '../../../support/kommentar.util';
-import { getUserManagerUserSabine, initUsermanagerUsers, loginAsSabine } from '../../../support/user-util';
+import { loginAsSabine } from '../../../support/user-util';
import { createVorgang, initVorgang } from '../../../support/vorgang-util';
// TODO Deaktiviert, weil die beiden Testfälle in user-profile-icon-in-postfach-nachricht-error.e2e-spec.ts abgedeckt sind.
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-detailansicht-formdata.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-detailansicht-formdata.cy.ts
index 9d37472dafc77c2a9ac02d38a1d5971916a28f3f..8a9ba891a24ea08dafecb531e6c4af292897cc0e 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-detailansicht-formdata.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-detailansicht-formdata.cy.ts
@@ -32,7 +32,7 @@ import { VorgangE2E } from '../../../model/vorgang';
import { MainPage, waitForSpinnerToDisappear } from '../../../page-objects/main.po';
import { VorgangPage } from '../../../page-objects/vorgang.po';
import { dropCollections } from '../../../support/cypress-helper';
-import { getUserManagerUserSabine, initUsermanagerUsers, loginAsSabine } from '../../../support/user-util';
+import { loginAsSabine } from '../../../support/user-util';
import { buildVorgang, createVorgang, initVorgaenge, objectIds } from '../../../support/vorgang-util';
registerLocaleData(localeDe, 'de', localeDeExtra);
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-list-pagination.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-list-pagination.cy.ts
index 8ef5b087dea485560de6728f4d685783306a8902..c31333b4febeb81b0ff70a83e923ef13f2301213 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-list-pagination.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-list-pagination.cy.ts
@@ -31,7 +31,7 @@ import { generateIds } from '../../../support/tech.util';
import { loginAsSabine } from '../../../support/user-util';
import { buildVorgang, initSearchIndex, initVorgaenge } from '../../../support/vorgang-util';
-describe('VorgangList: search and pagination', () => {
+describe.skip('VorgangList: search and pagination', () => {
const mainPage: MainPage = new MainPage();
diff --git a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-list.search.cy.ts b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-list.search.cy.ts
index ebabefff3c2b4a35258e3059b93d48760f050dbb..b292f316cf3d8d6741ff98a452a928099ecc79ce 100644
--- a/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-list.search.cy.ts
+++ b/alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-list/vorgang-list.search.cy.ts
@@ -30,7 +30,7 @@ import { UserE2E } from 'apps/alfa-e2e/src/model/user';
import { EingangE2E, VorgangE2E, VorgangStatusE2E } from 'apps/alfa-e2e/src/model/vorgang';
import { HeaderE2EComponent } from 'apps/alfa-e2e/src/page-objects/header.po';
import { VorgangPage } from 'apps/alfa-e2e/src/page-objects/vorgang.po';
-import { dropCollections, dropSearchIndex, wait } from 'apps/alfa-e2e/src/support/cypress-helper';
+import { dropCollections, dropSearchIndex } from 'apps/alfa-e2e/src/support/cypress-helper';
import { AntragstellerE2ETestData, EingangE2ETestData, EingangHeaderE2ETestData, buildVorgang, createVorgang, initSearchIndex, initVorgaenge, objectIds } from 'apps/alfa-e2e/src/support/vorgang-util';
import { MainPage, waitForSpinnerToDisappear } from '../../../page-objects/main.po';
import { backspaceOn, enterWith, exist, haveText, haveValue, notExist } from '../../../support/cypress.util';
diff --git a/alfa-client/pom.xml b/alfa-client/pom.xml
index 749de0ce431fc3265f961096d0e6be52b076f714..4b5df1b2180fb9c74feec5e675386f3f76634731 100644
--- a/alfa-client/pom.xml
+++ b/alfa-client/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/alfa-server/pom.xml b/alfa-server/pom.xml
index 16ad87f6af7d8e386c0783420b1564e44bc56673..8765c271edfae79d7486590f9e66386ead0c7802 100644
--- a/alfa-server/pom.xml
+++ b/alfa-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>alfa-server</artifactId>
diff --git a/alfa-service/pom.xml b/alfa-service/pom.xml
index 8e01183819421bd9d69fcba0427b4f807237e119..1fe37647502d07000c758a66bc39ab127f87c434 100644
--- a/alfa-service/pom.xml
+++ b/alfa-service/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>alfa-service</artifactId>
diff --git a/alfa-xdomea/pom.xml b/alfa-xdomea/pom.xml
index d4d2b5b35dfad832f17fc795dc7cc62b9ef7b249..8ded4007610e3532651eb004f02c86276263f343 100644
--- a/alfa-xdomea/pom.xml
+++ b/alfa-xdomea/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>alfa-xdomea</artifactId>
diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/ExportServiceITCase.java b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/ExportServiceITCase.java
new file mode 100644
index 0000000000000000000000000000000000000000..7f5909d46e0d2f6570859326f88c4d9990a8d869
--- /dev/null
+++ b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/ExportServiceITCase.java
@@ -0,0 +1,62 @@
+package de.ozgcloud.alfa.export;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.HexFormat;
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.mock.mockito.SpyBean;
+
+import de.ozgcloud.alfa.common.binaryfile.FileId;
+import de.ozgcloud.alfa.common.file.OzgFile;
+import de.ozgcloud.alfa.common.file.OzgFileTestFactory;
+import de.ozgcloud.alfa.file.ExportFileService;
+import de.ozgcloud.alfa.vorgang.ExportVorgangService;
+import de.ozgcloud.alfa.vorgang.VorgangWithEingangTestFactory;
+import de.ozgcloud.common.test.ITCase;
+
+@ITCase
+class ExportServiceITCase {
+
+ @SpyBean
+ private ExportFileService exportFileService;
+ @SpyBean
+ private ExportVorgangService exportVorgangService;
+ @Autowired
+ private ExportService exportService;
+
+ @Nested
+ class TestWriteExport {
+
+ @BeforeEach
+ void setup() {
+ doReturn(VorgangWithEingangTestFactory.create()).when(exportVorgangService).getVorgang(anyString());
+ doReturn(List.of(createOzgFile())).when(exportFileService).getAllPdfs(anyString());
+ doNothing().when(exportFileService).writeOzgFile(any(), any());
+ }
+
+ @Test
+ void shouldNotThrowException() {
+ assertDoesNotThrow(() -> exportService.writeExport(UUID.randomUUID().toString(), UUID.randomUUID().toString(), new ByteArrayOutputStream()));
+ }
+ }
+
+ private static OzgFile createOzgFile() {
+ return OzgFileTestFactory.createBuilder()
+ .id(FileId.from(createMongoDbObjectId()))
+ .build();
+ }
+
+ private static String createMongoDbObjectId() {
+ return HexFormat.of().formatHex(RandomStringUtils.randomAlphanumeric(24).getBytes(StandardCharsets.UTF_8));
+ }
+}
diff --git a/pom.xml b/pom.xml
index b782bc03dbaaa38dffec4294e07a05e255fdba32..6ca4246a58b4fa5a7b9687f98d4de4c1ba6f5fa8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
<groupId>de.ozgcloud.alfa</groupId>
<artifactId>alfa</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<name>Alfa Parent</name>
<packaging>pom</packaging>