Added zip export

hartmann-foto-documentation-app/pom.xml

@@ -226,7 +226,7 @@
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>${version.commons-io}</version>
+			<version>2.21.0</version>
 		</dependency>
 
 		<!-- Apache POI -->

hartmann-foto-documentation-app/src/main/java/marketing/heyday/hartmann/fotodocumentation/core/model/QuestionnaireCustomer.java

@@ -20,11 +20,13 @@ import jakarta.persistence.*;
 
 @Entity
 @Table(name = "questionnaire_customer")
+@NamedQuery(name =  QuestionnaireCustomer.FIND_ALL, query = "select c from QuestionnaireCustomer c order by c.name")
 @NamedQuery(name =  QuestionnaireCustomer.FIND_BY_NUMBER, query = "select c from QuestionnaireCustomer c where c.customerNumber = :customerNumber")
 public class QuestionnaireCustomer extends AbstractDateEntity {
 	private static final long serialVersionUID = 1L;
 	public static final String SEQUENCE = "questionnaire_customer_seq";
 	
+	public static final String FIND_ALL = "QuestionnaireCustomer.findAll";
 	public static final String FIND_BY_NUMBER = "QuestionnaireCustomer.findByNumber";
 	public static final String PARAM_NUMBER = "customerNumber";
 	

hartmann-foto-documentation-app/src/main/java/marketing/heyday/hartmann/fotodocumentation/core/query/QueryService.java

@@ -33,6 +33,14 @@ public class QueryService {
 	@PersistenceContext
 	private EntityManager eManager;
 
+	public <T> T callNamedQueryList(String namedQuery, Param... objects) {
+		Query query = eManager.createNamedQuery(namedQuery);
+		for (Param param : objects) {
+			query.setParameter(param.name(), param.value());
+		}
+		return (T) query.getResultList();
+	}
+
 	public <T> Optional<T> callNamedQuerySingleResult(String namedQuery, Param... params) {
 		return singleResult(eManager.createNamedQuery(namedQuery), Arrays.asList(params));
 	}

hartmann-foto-documentation-app/src/main/java/marketing/heyday/hartmann/fotodocumentation/core/service/QuestionnaireCustomerService.java

@@ -5,6 +5,7 @@ import java.util.*;
 import org.apache.commons.lang3.StringUtils;
 
 import jakarta.annotation.security.PermitAll;
+import jakarta.ejb.EJB;
 import jakarta.ejb.LocalBean;
 import jakarta.ejb.Stateless;
 import jakarta.inject.Inject;
@@ -12,8 +13,10 @@ import jakarta.persistence.TypedQuery;
 import jakarta.persistence.criteria.*;
 import marketing.heyday.hartmann.fotodocumentation.core.model.Questionnaire;
 import marketing.heyday.hartmann.fotodocumentation.core.model.QuestionnaireCustomer;
+import marketing.heyday.hartmann.fotodocumentation.core.query.QueryService;
 import marketing.heyday.hartmann.fotodocumentation.core.utils.CalendarUtil;
 import marketing.heyday.hartmann.fotodocumentation.core.utils.ExcelUtils;
+import marketing.heyday.hartmann.fotodocumentation.core.utils.ZipExportUtils;
 import marketing.heyday.hartmann.fotodocumentation.rest.vo.QuestionnaireCustomerListValue;
 import marketing.heyday.hartmann.fotodocumentation.rest.vo.QuestionnaireCustomerValue;
 
@@ -32,6 +35,12 @@ import marketing.heyday.hartmann.fotodocumentation.rest.vo.QuestionnaireCustomer
 @PermitAll
 public class QuestionnaireCustomerService extends AbstractService {
 
+	@EJB
+	private QueryService queryService;
+
+	@Inject
+	private ZipExportUtils zipExportUtils;
+
 	@Inject
 	private ExcelUtils excelUtils;
 
@@ -100,6 +109,11 @@ public class QuestionnaireCustomerService extends AbstractService {
 		return QuestionnaireCustomerValue.builder(customer);
 	}
 
+	public Optional<byte[]> getExport() {
+		List<QuestionnaireCustomer> customers = queryService.callNamedQueryList(QuestionnaireCustomer.FIND_ALL);
+		return zipExportUtils.getExport(customers);
+	}
+
 	public Optional<byte[]> getExport(Long id, Long questionnaireId) {
 		QuestionnaireCustomer customer = entityManager.find(QuestionnaireCustomer.class, id);
 		if (customer == null) {

hartmann-foto-documentation-app/src/main/java/marketing/heyday/hartmann/fotodocumentation/core/utils/ExcelUtils.java

@@ -38,7 +38,6 @@ public class ExcelUtils {
 		try (ByteArrayOutputStream bos = new ByteArrayOutputStream(); XSSFWorkbook workbook = new XSSFWorkbook()) {
 
 			for (var questionnaire : questionnaires) {
-				//TODO: set sheet name
 				writeSheet(workbook, customer, questionnaire);
 			}
 

hartmann-foto-documentation-app/src/main/java/marketing/heyday/hartmann/fotodocumentation/core/utils/ZipExportUtils.java

@@ -0,0 +1,55 @@
+package marketing.heyday.hartmann.fotodocumentation.core.utils;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import jakarta.inject.Inject;
+import marketing.heyday.hartmann.fotodocumentation.core.model.Questionnaire;
+import marketing.heyday.hartmann.fotodocumentation.core.model.QuestionnaireCustomer;
+
+/**
+ * 
+ * <p>Copyright: Copyright (c) 2024</p>
+ * <p>Company: heyday Marketing GmbH</p>
+ * @author <a href="mailto:p.verboom@heyday.marketing">Patrick Verboom</a>
+ * @version 1.0
+ * 
+ * created: 23 Feb 2026
+ */
+
+public class ZipExportUtils {
+	private static final Log LOG = LogFactory.getLog(ZipExportUtils.class);
+
+	@Inject
+	private ExcelUtils excelUtils;
+
+	public Optional<byte[]> getExport(List<QuestionnaireCustomer> customers) {
+		if (customers.isEmpty()) {
+			return Optional.empty();
+		}
+
+		try (ZipUtils zipUtils = new ZipUtils()) {
+			boolean hasContent = false;
+			for (var customer : customers) {
+				List<Questionnaire> questionnaires = customer.getQuestionnaires().stream().sorted((x, y) -> x.getQuestionnaireDate().compareTo(y.getQuestionnaireDate())).toList();
+				var file = excelUtils.create(customer, questionnaires);
+				if (file.isPresent()) {
+					zipUtils.addFile(customer.getName() + ".xlsx", file.get());
+					hasContent = true;
+				}
+			}
+			if (!hasContent) {
+				return Optional.empty();
+			}
+
+			return Optional.of(zipUtils.create());
+		} catch (IOException ioe) {
+			LOG.error("Failed to create zip file " + ioe.getMessage(), ioe);
+			return Optional.empty();
+		}
+	}
+}

hartmann-foto-documentation-app/src/main/java/marketing/heyday/hartmann/fotodocumentation/core/utils/ZipUtils.java

@@ -0,0 +1,41 @@
+package marketing.heyday.hartmann.fotodocumentation.core.utils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * 
+ * <p>Copyright: Copyright (c) 2024</p>
+ * <p>Company: heyday Marketing GmbH</p>
+ * @author <a href="mailto:p.verboom@heyday.marketing">Patrick Verboom</a>
+ * @version 1.0
+ * 
+ * created: 23 Feb 2026
+ */
+
+public class ZipUtils implements AutoCloseable {
+	private ByteArrayOutputStream baos = new ByteArrayOutputStream();
+	private ZipOutputStream zos = new ZipOutputStream(baos);
+
+	public void addFile(String name, byte[] file) throws IOException {
+		ZipEntry entry = new ZipEntry(name);
+
+		zos.putNextEntry(entry);
+		zos.write(file);
+		zos.closeEntry();
+	}
+
+	public byte[] create() throws IOException {
+		zos.flush();
+		zos.close();
+		return baos.toByteArray();
+	}
+
+	@Override
+	public void close() throws IOException {
+		zos.close();
+		baos.close();
+	}
+}

hartmann-foto-documentation-app/src/main/java/marketing/heyday/hartmann/fotodocumentation/rest/QuestionnaireCustomerResource.java

@@ -66,6 +66,28 @@ public class QuestionnaireCustomerResource {
 		return Response.ok().entity(retVal).build();
 	}
 	
+
+	@GZIP
+	@GET
+	@Path("exportall")
+	@Produces("application/zip")
+	@Operation(summary = "Get Export")
+	@ApiResponse(responseCode = "200", description = "Successfully retrieved export")
+	public Response doExport() {
+		LOG.debug("Create export for customer ");
+		Optional<byte[]> pdfOpt = questionnaireCustomerService.getExport();
+
+		if (pdfOpt.isEmpty()) {
+			return Response.status(Status.NOT_FOUND).build();
+		}
+
+		StreamingOutput streamingOutput = (OutputStream output) -> {
+			LOG.debug("Start writing content to OutputStream available bytes");
+			output.write(pdfOpt.get());
+		};
+		return Response.status(Status.OK).entity(streamingOutput).build();
+	}
+
 	@GZIP
 	@GET
 	@Path("export/{id}")

hartmann-foto-documentation-app/src/test/java/marketing/heyday/hartmann/fotodocumentation/core/utils/ExcelUtilsTest.java

@@ -3,17 +3,12 @@ package marketing.heyday.hartmann.fotodocumentation.core.utils;
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -32,8 +27,7 @@ import marketing.heyday.hartmann.fotodocumentation.core.model.QuestionnaireCusto
  *
  * created: 19 Feb 2026
  */
-class ExcelUtilsTest {
+class ExcelUtilsTest implements TestAble {
-	private static final Log LOG = LogFactory.getLog(ExcelUtilsTest.class);
 
 	private ExcelUtils excelUtils;
 
@@ -191,7 +185,6 @@ class ExcelUtilsTest {
 		}
 	}
 
-
 	// --- create: null handling ---
 
 	@Test
@@ -256,15 +249,4 @@ class ExcelUtilsTest {
 				.questions(QuestionnaireJsonParserTest.testJson1)
 				.build();
 	}
-	
-	public void writeToFile(final byte[] content, final String fileName) {
-		File file = new File("target/test/output/");
-		file.mkdirs();
-		try (FileOutputStream out = new FileOutputStream(new File(file, fileName))) {
-			
-			IOUtils.write(content, out);
-		} catch (Exception e) {
-			LOG.error("Error saveing pdf file", e);
-		}
-	}
 }

hartmann-foto-documentation-app/src/test/java/marketing/heyday/hartmann/fotodocumentation/core/utils/QuestionnaireJsonParserTest.java

@@ -139,7 +139,7 @@ public class QuestionnaireJsonParserTest {
             [
                 {
                     "id": "answer1",
-                    "answer": 47,
+                    "answer": "47",
                     "selected": true
                 }
             ]
@@ -172,7 +172,7 @@ public class QuestionnaireJsonParserTest {
                 {
                     "id": "answer4",
                     "answer": "Ontex",
-                    "selected": true
+                    "selected": false
                 },
                 {
                     "id": "answer5",
@@ -205,7 +205,7 @@ public class QuestionnaireJsonParserTest {
                         {
                             "id": "answer1",
                             "answer": "HARTMANN",
-                            "selected": true
+                            "selected": false
                         },
                         {
                             "id": "answer2",
@@ -261,7 +261,7 @@ public class QuestionnaireJsonParserTest {
                         {
                             "id": "answer3",
                             "answer": "Ontex",
-                            "selected": true
+                            "selected": false
                         }
                     ]
                 }

hartmann-foto-documentation-app/src/test/java/marketing/heyday/hartmann/fotodocumentation/core/utils/TestAble.java

@@ -0,0 +1,33 @@
+package marketing.heyday.hartmann.fotodocumentation.core.utils;
+
+import java.io.File;
+import java.io.FileOutputStream;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * 
+ * <p>Copyright: Copyright (c) 2024</p>
+ * <p>Company: heyday Marketing GmbH</p>
+ * @author <a href="mailto:p.verboom@heyday.marketing">Patrick Verboom</a>
+ * @version 1.0
+ * 
+ * created: 23 Feb 2026
+ */
+
+public interface TestAble {
+	public static final Log LOG = LogFactory.getLog(ExcelUtilsTest.class);
+
+	default void writeToFile(final byte[] content, final String fileName) {
+		File file = new File("target/test/output/");
+		file.mkdirs();
+		try (FileOutputStream out = new FileOutputStream(new File(file, fileName))) {
+			
+			IOUtils.write(content, out);
+		} catch (Exception e) {
+			LOG.error("Error saveing pdf file", e);
+		}
+	}
+}

hartmann-foto-documentation-app/src/test/java/marketing/heyday/hartmann/fotodocumentation/core/utils/ZipExportUtilsTest.java

@@ -0,0 +1,224 @@
+package marketing.heyday.hartmann.fotodocumentation.core.utils;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.*;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import marketing.heyday.hartmann.fotodocumentation.core.model.Questionnaire;
+import marketing.heyday.hartmann.fotodocumentation.core.model.QuestionnaireCustomer;
+
+/**
+ *
+ * <p>Copyright: Copyright (c) 2024</p>
+ * <p>Company: heyday Marketing GmbH</p>
+ * @author <a href="mailto:p.verboom@heyday.marketing">Patrick Verboom</a>
+ * @version 1.0
+ *
+ * created: 23 Feb 2026
+ */
+class ZipExportUtilsTest implements TestAble {
+
+	private ZipExportUtils zipExportUtils;
+	private ExcelUtils excelUtils;
+
+	@BeforeEach
+	void setUp() throws Exception {
+		zipExportUtils = new ZipExportUtils();
+		excelUtils = mock(ExcelUtils.class);
+
+		Field field = ZipExportUtils.class.getDeclaredField("excelUtils");
+		field.setAccessible(true);
+		field.set(zipExportUtils, excelUtils);
+	}
+
+	// --- getExport: empty input ---
+
+	@Test
+	void getExport_emptyList_returnsEmpty() {
+		Optional<byte[]> result = zipExportUtils.getExport(Collections.emptyList());
+
+		assertTrue(result.isEmpty());
+	}
+
+	// --- getExport: single customer ---
+
+	@Test
+	void getExport_singleCustomer_returnsPresent() {
+		QuestionnaireCustomer customer = createCustomerWithQuestionnaires("Müller Apotheke", 1);
+		when(excelUtils.create(any(), anyList())).thenReturn(Optional.of(new byte[] { 1, 2, 3 }));
+
+		Optional<byte[]> result = zipExportUtils.getExport(List.of(customer));
+
+		assertTrue(result.isPresent());
+	}
+
+	@Test
+	void getExport_singleCustomer_returnsValidZip() throws IOException {
+		QuestionnaireCustomer customer = createCustomerWithQuestionnaires("Müller Apotheke", 1);
+		when(excelUtils.create(any(), anyList())).thenReturn(Optional.of(new byte[] { 1, 2, 3 }));
+
+		byte[] bytes = zipExportUtils.getExport(List.of(customer)).orElseThrow();
+
+		List<String> entries = getZipEntryNames(bytes);
+		assertEquals(1, entries.size());
+	}
+
+	@Test
+	void getExport_singleCustomer_zipEntryNamedAfterCustomer() throws IOException {
+		QuestionnaireCustomer customer = createCustomerWithQuestionnaires("Müller Apotheke", 1);
+		when(excelUtils.create(any(), anyList())).thenReturn(Optional.of(new byte[] { 1, 2, 3 }));
+
+		byte[] bytes = zipExportUtils.getExport(List.of(customer)).orElseThrow();
+
+		List<String> entries = getZipEntryNames(bytes);
+		assertEquals("Müller Apotheke.xlsx", entries.get(0));
+	}
+
+	@Test
+	void getExport_singleCustomer_zipEntryContainsExcelContent() throws IOException {
+		byte[] excelContent = new byte[] { 10, 20, 30, 40, 50 };
+		QuestionnaireCustomer customer = createCustomerWithQuestionnaires("Test", 1);
+		when(excelUtils.create(any(), anyList())).thenReturn(Optional.of(excelContent));
+
+		byte[] bytes = zipExportUtils.getExport(List.of(customer)).orElseThrow();
+
+		byte[] entryContent = getZipEntryContent(bytes, "Test.xlsx");
+		assertArrayEquals(excelContent, entryContent);
+	}
+
+	// --- getExport: multiple customers ---
+
+	@Test
+	void getExport_multipleCustomers_createsEntryPerCustomer() throws IOException {
+		QuestionnaireCustomer c1 = createCustomerWithQuestionnaires("Apotheke A", 1);
+		QuestionnaireCustomer c2 = createCustomerWithQuestionnaires("Apotheke B", 1);
+		QuestionnaireCustomer c3 = createCustomerWithQuestionnaires("Apotheke C", 1);
+		when(excelUtils.create(any(), anyList())).thenReturn(Optional.of(new byte[] { 1 }));
+
+		byte[] bytes = zipExportUtils.getExport(List.of(c1, c2, c3)).orElseThrow();
+
+		List<String> entries = getZipEntryNames(bytes);
+		assertEquals(3, entries.size());
+		assertTrue(entries.contains("Apotheke A.xlsx"));
+		assertTrue(entries.contains("Apotheke B.xlsx"));
+		assertTrue(entries.contains("Apotheke C.xlsx"));
+
+		writeToFile(bytes, "getExport_multipleCustomers_createsEntryPerCustomer.zip");
+	}
+
+	// --- getExport: excel creation fails ---
+
+	@Test
+	void getExport_excelReturnsEmpty_returnsEmpty() {
+		QuestionnaireCustomer customer = createCustomerWithQuestionnaires("Test", 1);
+		when(excelUtils.create(any(), anyList())).thenReturn(Optional.empty());
+
+		Optional<byte[]> result = zipExportUtils.getExport(List.of(customer));
+
+		assertTrue(result.isEmpty());
+	}
+
+	@Test
+	void getExport_someExcelsFail_onlyIncludesSuccessful() throws IOException {
+		QuestionnaireCustomer c1 = createCustomerWithQuestionnaires("Success", 1);
+		QuestionnaireCustomer c2 = createCustomerWithQuestionnaires("Fail", 1);
+		when(excelUtils.create(eq(c1), anyList())).thenReturn(Optional.of(new byte[] { 1 }));
+		when(excelUtils.create(eq(c2), anyList())).thenReturn(Optional.empty());
+
+		byte[] bytes = zipExportUtils.getExport(List.of(c1, c2)).orElseThrow();
+
+		List<String> entries = getZipEntryNames(bytes);
+		assertEquals(1, entries.size());
+		assertEquals("Success.xlsx", entries.get(0));
+	}
+
+	// --- getExport: questionnaire sorting ---
+
+	@Test
+	void getExport_questionnairesPassedSortedByDate() {
+		QuestionnaireCustomer customer = new QuestionnaireCustomer.Builder()
+				.name("Test").customerNumber("C-001").build();
+
+		Questionnaire q1 = new Questionnaire.Builder().questionnaireDate(new Date(2000)).build();
+		Questionnaire q2 = new Questionnaire.Builder().questionnaireDate(new Date(1000)).build();
+		Questionnaire q3 = new Questionnaire.Builder().questionnaireDate(new Date(3000)).build();
+		customer.getQuestionnaires().addAll(Set.of(q1, q2, q3));
+
+		when(excelUtils.create(any(), anyList())).thenAnswer(invocation -> {
+			List<Questionnaire> questionnaires = invocation.getArgument(1);
+			for (int i = 0; i < questionnaires.size() - 1; i++) {
+				assertTrue(questionnaires.get(i).getQuestionnaireDate()
+						.compareTo(questionnaires.get(i + 1).getQuestionnaireDate()) <= 0,
+						"Questionnaires should be sorted by date");
+			}
+			return Optional.of(new byte[] { 1 });
+		});
+
+		zipExportUtils.getExport(List.of(customer));
+
+		verify(excelUtils).create(eq(customer), anyList());
+	}
+
+	// --- getExport: calls excelUtils correctly ---
+
+	@Test
+	void getExport_callsExcelUtilsForEachCustomer() {
+		QuestionnaireCustomer c1 = createCustomerWithQuestionnaires("A", 1);
+		QuestionnaireCustomer c2 = createCustomerWithQuestionnaires("B", 1);
+		when(excelUtils.create(any(), anyList())).thenReturn(Optional.of(new byte[] { 1 }));
+
+		zipExportUtils.getExport(List.of(c1, c2));
+
+		verify(excelUtils).create(eq(c1), anyList());
+		verify(excelUtils).create(eq(c2), anyList());
+	}
+
+	// --- helpers ---
+
+	private QuestionnaireCustomer createCustomerWithQuestionnaires(String name, int questionnaireCount) {
+		QuestionnaireCustomer customer = new QuestionnaireCustomer.Builder()
+				.name(name).customerNumber("C-" + name.hashCode()).build();
+
+		for (int i = 0; i < questionnaireCount; i++) {
+			Questionnaire q = new Questionnaire.Builder()
+					.questionnaireDate(new Date(1000L * (i + 1)))
+					.questions("[]")
+					.build();
+			customer.getQuestionnaires().add(q);
+		}
+		return customer;
+	}
+
+	private List<String> getZipEntryNames(byte[] zipBytes) throws IOException {
+		List<String> names = new ArrayList<>();
+		try (ZipInputStream zis = new ZipInputStream(new ByteArrayInputStream(zipBytes))) {
+			ZipEntry entry;
+			while ((entry = zis.getNextEntry()) != null) {
+				names.add(entry.getName());
+			}
+		}
+		return names;
+	}
+
+	private byte[] getZipEntryContent(byte[] zipBytes, String entryName) throws IOException {
+		try (ZipInputStream zis = new ZipInputStream(new ByteArrayInputStream(zipBytes))) {
+			ZipEntry entry;
+			while ((entry = zis.getNextEntry()) != null) {
+				if (entry.getName().equals(entryName)) {
+					return zis.readAllBytes();
+				}
+			}
+		}
+		throw new IOException("Entry not found: " + entryName);
+	}
+}

hartmann-foto-documentation-docker/src/test/java/marketing/heyday/hartmann/fotodocumentation/rest/AbstractTest.java

@@ -85,6 +85,8 @@ public abstract class AbstractTest {
 			repDataSet.addReplacementObject("NULL_DATE", null);
 			repDataSet.addReplacementObject("NULL_NUMBER", null);
 			repDataSet.addReplacementObject("NULL_STRING", null);
+			repDataSet.addReplacementObject("QUESTIONNAIRE_JSON", QUESTIONNAIRE_JSON);
+
 			try {
 				DatabaseOperation.CLEAN_INSERT.execute(conn, repDataSet);
 			} finally {
@@ -179,4 +181,323 @@ public abstract class AbstractTest {
 			throw new RuntimeException(e);
 		}
 	}
+
+	private static final String QUESTIONNAIRE_JSON = """
+			[
+			    {
+			        "id": "question1",
+			        "title": "",
+			        "order": 1,
+			        "type": "singleChoice",
+			        "data":
+			        {
+			            "answers":
+			            [
+			                {
+			                    "id": "answer1",
+			                    "answer": "Nicht-kaufender Kunde",
+			                    "selected": true
+			                },
+			                {
+			                    "id": "answer2",
+			                    "answer": "Bestandskunde",
+			                    "selected": false
+			                }
+			            ]
+			        }
+			    },
+			    {
+			        "id": "question2",
+			        "title": "Haben Sie Rezeptpatienten(GKV) für Inko?",
+			        "order": 2,
+			        "type": "singleChoice",
+			        "data":
+			        {
+			            "answers":
+			            [
+			                {
+			                    "id": "answer1",
+			                    "answer": "Ja",
+			                    "selected": false
+			                },
+			                {
+			                    "id": "answer1",
+			                    "answer": "Nein",
+			                    "selected": true
+			                }
+			            ]
+			        }
+			    },
+			    {
+			        "id": "question3",
+			        "title": "Warum nicht?",
+			        "order": 3,
+			        "type": "multiplChoice",
+			        "data":
+			        {
+			            "answers":
+			            [
+			                {
+			                    "id": "answer1",
+			                    "answer": "Lagergründe",
+			                    "selected": false
+			                },
+			                {
+			                    "id": "answer2",
+			                    "answer": "Wirtschaftlichkeitsgründe",
+			                    "selected": true
+			                },
+			                {
+			                    "id": "answer3",
+			                    "answer": "Administrativer Aufwand",
+			                    "selected": true
+			                },
+			                {
+			                    "id": "answer4",
+			                    "answer": "Personeller Aufwand",
+			                    "selected": false
+			                }
+			            ]
+			        }
+			    },
+			    {
+			        "id": "question4",
+			        "title": "Haben Sie Privatrezeptpatienten für inko?",
+			        "order": 4,
+			        "type": "singleChoice",
+			        "data":
+			        {
+			            "answers":
+			            [
+			                {
+			                    "id": "answer1",
+			                    "answer": "Ja",
+			                    "selected": false
+			                },
+			                {
+			                    "id": "answer2",
+			                    "answer": "Nein",
+			                    "selected": true
+			                }
+			            ]
+			        }
+			    },
+			    {
+			        "id": "question5",
+			        "title": "Wie viele Patienten versorgen Sie regelmäßig? (Privat) un GKV",
+			        "order": 5,
+			        "type": "number",
+			        "data":
+			        {
+			            "answers":
+			            [
+			                {
+			                    "id": "answer1",
+			                    "answer": 47,
+			                    "selected": true
+			                }
+			            ]
+			        }
+			    },
+			    {
+			        "id": "question6",
+			        "title": "Mit welchem Herstellern arbeiten Sie zusammen?",
+			        "order": 6,
+			        "type": "multiplChoice",
+			        "data":
+			        {
+			            "answers":
+			            [
+			                {
+			                    "id": "answer1",
+			                    "answer": "HARTMANN",
+			                    "selected": false
+			                },
+			                {
+			                    "id": "answer2",
+			                    "answer": "TZMO",
+			                    "selected": true
+			                },
+			                {
+			                    "id": "answer3",
+			                    "answer": "Essity",
+			                    "selected": true
+			                },
+			                {
+			                    "id": "answer4",
+			                    "answer": "Ontex",
+			                    "selected": false
+			                },
+			                {
+			                    "id": "answer5",
+			                    "answer": "Param",
+			                    "selected": false
+			                },
+			                {
+			                    "id": "answer6",
+			                    "answer": "Andere",
+			                    "selected": false
+			                }
+			            ]
+			        }
+			    },
+			    {
+			        "id": "question7",
+			        "title": "Was sind Ihre Gründe für die Zusammenarbeit?",
+			        "order": 7,
+			        "type": "matrix",
+			        "data":
+			        {
+			            "questions":
+			            [
+			                {
+			                    "id": "subq1",
+			                    "title": "Preis",
+			                    "order": 1,
+			                    "answers":
+			                    [
+			                        {
+			                            "id": "answer1",
+			                            "answer": "HARTMANN",
+			                            "selected": false
+			                        },
+			                        {
+			                            "id": "answer2",
+			                            "answer": "Essity",
+			                            "selected": true
+			                        },
+			                        {
+			                            "id": "answer3",
+			                            "answer": "Ontex",
+			                            "selected": false
+			                        }
+			                    ]
+			                },
+			                {
+			                    "id": "subq2",
+			                    "title": "Einkaufskondition",
+			                    "order": 2,
+			                    "answers":
+			                    [
+			                        {
+			                            "id": "answer1",
+			                            "answer": "HARTMANN",
+			                            "selected": false
+			                        },
+			                        {
+			                            "id": "answer2",
+			                            "answer": "Essity",
+			                            "selected": true
+			                        },
+			                        {
+			                            "id": "answer3",
+			                            "answer": "Ontex",
+			                            "selected": false
+			                        }
+			                    ]
+			                },
+			                {
+			                    "id": "subq3",
+			                    "title": "Qualität",
+			                    "order": 3,
+			                    "answers":
+			                    [
+			                        {
+			                            "id": "answer1",
+			                            "answer": "HARTMANN",
+			                            "selected": false
+			                        },
+			                        {
+			                            "id": "answer2",
+			                            "answer": "Essity",
+			                            "selected": true
+			                        },
+			                        {
+			                            "id": "answer3",
+			                            "answer": "Ontex",
+			                            "selected": false
+			                        }
+			                    ]
+			                }
+			            ]
+			        }
+			    },
+			    {
+			        "id": "question8",
+			        "title": "Beziehen Sie Produkte direkt oder über den Großhandel?",
+			        "order": 8,
+			        "type": "singleChoice",
+			        "data":
+			        {
+			            "answers":
+			            [
+			                {
+			                    "id": "answer1",
+			                    "answer": "primär direkt",
+			                    "selected": false
+			                },
+			                {
+			                    "id": "answer2",
+			                    "answer": "primär Großhandel",
+			                    "selected": true
+			                },
+			                {
+			                    "id": "answer3",
+			                    "answer": "ptimär teils. Großhandel",
+			                    "selected": true
+			                },
+			                {
+			                    "id": "answer4",
+			                    "answer": "unterschiedlich",
+			                    "selected": false
+			                }
+			            ]
+			        }
+			    },
+			    {
+			        "id": "question9",
+			        "title": "Gründe für Bezug?",
+			        "order": 10,
+			        "type": "singleChoice",
+			        "data":
+			        {
+			            "answers":
+			            [
+			                {
+			                    "id": "answer1",
+			                    "answer": "Umsatzziel mit Händler",
+			                    "selected": false
+			                },
+			                {
+			                    "id": "answer2",
+			                    "answer": "Warenverfügbarkeit/ Liefergeschwindigkeit und Frequent",
+			                    "selected": true
+			                },
+			                {
+			                    "id": "answer3",
+			                    "answer": "Einkaufskondition",
+			                    "selected": true
+			                }
+			            ]
+			        }
+			    },
+			    {
+			        "id": "question10",
+			        "title": "Weiter/Kommentare Hinweise?",
+			        "order": 11,
+			        "type": "freeText",
+			        "data":
+			        {
+			            "answers":
+			            [
+			                {
+			                    "id": "answer1",
+			                    "answer": "Kommentar eintragen",
+			                    "selected": true
+			                }
+			            ]
+			        }
+			    }
+			]
+			""";
 }

hartmann-foto-documentation-docker/src/test/java/marketing/heyday/hartmann/fotodocumentation/rest/QuestionnaireCustomerResourceTest.java

@@ -197,8 +197,26 @@ public class QuestionnaireCustomerResourceTest extends AbstractRestTest {
 	
 	@Test
 	@Order(1)
-	@Disabled // FIXME: enable when we have implemented excel download
+	public void doDownloadZip() throws IOException {
-	public void doDownload() throws IOException {
+		LOG.info("doDownload");
+
+		String authorization = getAuthorization();
+		LOG.info("authorization: " + authorization);
+		String path = deploymentURL + PATH + "/exportall";
+		Request request = Request.Get(path).addHeader("Accept", "application/zip")
+				.addHeader("Authorization", authorization);
+
+		HttpResponse httpResponse = executeRequest(request);
+		int code = httpResponse.getStatusLine().getStatusCode();
+		assertEquals(200, code);
+
+		byte[] text = getResponse(httpResponse);
+		writeFile(text, "doDownload.zip");
+	}
+
+	@Test
+	@Order(1)
+	public void doDownloadExcel() throws IOException {
 		LOG.info("doDownload");
 
 		String authorization = getAuthorization();
@@ -212,12 +230,12 @@ public class QuestionnaireCustomerResourceTest extends AbstractRestTest {
 		assertEquals(200, code);
 
 		byte[] text = getResponse(httpResponse);
-		writeFile(text, "doDownload.pdf");
+		writeFile(text, "doDownload.xlsx");
 	}
 
 	@Test
 	@Order(1)
-	public void doDownloadNotExist() throws IOException {
+	public void doDownloadExcelNotExist() throws IOException {
 		LOG.info("doDownloadNotExist");
 
 		String authorization = getAuthorization();

hartmann-foto-documentation-docker/src/test/resources/datasets/dataset.xml

@@ -36,14 +36,14 @@
 	<questionnaire_customer customer_id="3" customer_number="3456" name="Schmidt Apotheke" city="Hamburg" zip="56732" jpa_active="true" jpa_created="2024-10-24 10:09:30" jpa_updated="2024-10-24 10:09:30" jpa_version="0" />
 
 	<questionnaire questionnaire_id="1" username="verboomp" questionnaire_date="2026-01-01 10:09:30" comment="good looking picture 1" evaluation="1" jpa_active="true" jpa_created="2024-10-24 10:09:30" jpa_updated="2024-10-24 10:09:30" jpa_version="0" customer_id_fk="1" 
-		questions="{}"/>
+		questions="QUESTIONNAIRE_JSON"/>
 	<questionnaire questionnaire_id="2" username="verboomp" questionnaire_date="2026-01-02 10:09:30" comment="good looking picture 2" evaluation="1" jpa_active="true" jpa_created="2024-10-24 10:09:30" jpa_updated="2024-10-24 10:09:30" jpa_version="0" customer_id_fk="1"
-		questions="{}"/>
+		questions="QUESTIONNAIRE_JSON"/>
 	<questionnaire questionnaire_id="3" username="verboomp" questionnaire_date="2026-01-05 10:09:30" comment="good looking picture 3" evaluation="1" jpa_active="true" jpa_created="2024-10-24 10:09:30" jpa_updated="2024-10-24 10:09:30" jpa_version="0" customer_id_fk="2"
-		questions="{}"/>
+		questions="QUESTIONNAIRE_JSON"/>
 	<questionnaire questionnaire_id="4" username="verboomp" questionnaire_date="2026-01-07 10:09:30" comment="good looking picture 4" evaluation="1" jpa_active="true" jpa_created="2024-10-24 10:09:30" jpa_updated="2024-10-24 10:09:30" jpa_version="0" customer_id_fk="3"
-		questions="{}"/>
+		questions="QUESTIONNAIRE_JSON"/>
 	<questionnaire questionnaire_id="5" username="verboomp" questionnaire_date="2026-01-12 10:09:30" comment="good looking picture 5" evaluation="1" jpa_active="true" jpa_created="2024-10-24 10:09:30" jpa_updated="2024-10-24 10:09:30" jpa_version="0" customer_id_fk="3"
-	 	questions="{}"/>
+	 	questions="QUESTIONNAIRE_JSON"/>
 	
 </dataset>

hartmann-foto-documentation-web/pom.xml

@@ -20,43 +20,6 @@
 					<skipDeploy>true</skipDeploy>
 				</configuration>
 			</plugin>
-			<!--
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy_for_release</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/src/main/webapp</outputDirectory>
-							<resources>
-								<resource>
-									<directory>${basedir}/../../../-frontend/build/web/</directory>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-					<execution>
-						<id>copy_for_general</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/src/main/webapp</outputDirectory>
-							<resources>
-								<resource>
-									<directory>${basedir}/../-frontend/build/web/</directory>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			-->
 		</plugins>
 	</build>
 

hartmann-foto-documentation/pom.xml

@@ -231,7 +231,7 @@
 		<version.org.jboss.resteasy>6.2.5.Final</version.org.jboss.resteasy>
 
 		<subethamail.version>1.2</subethamail.version>
-		<version.commons-io>2.7</version.commons-io>
+		<version.commons-io>2.21.0</version.commons-io>
 		<version.commons-lang>2.6</version.commons-lang>
 		<version.commons-lang3>3.5</version.commons-lang3>
 		<version.commons-logging>1.2</version.commons-logging>