added tests and enabled the schema validation for upload

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

@@ -5,17 +5,11 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.nio.charset.Charset;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import jakarta.ws.rs.Consumes;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.MultivaluedMap;
-import jakarta.ws.rs.ext.MessageBodyReader;
-import jakarta.ws.rs.ext.Provider;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -25,6 +19,15 @@ import com.networknt.schema.JsonSchema;
 import com.networknt.schema.JsonSchemaFactory;
 import com.networknt.schema.ValidationMessage;
 
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.WebApplicationException;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.ext.MessageBodyReader;
+import jakarta.ws.rs.ext.Provider;
+
 /**
  * 
  * 
@@ -65,8 +68,9 @@ public class ValidatedMessageBodyReader implements MessageBodyReader<SchemaValid
 		Optional<JsonSchemaValidate> annotation = Arrays.stream(annotations).filter(a -> a.annotationType() == JsonSchemaValidate.class).map(a -> (JsonSchemaValidate) a).findAny();
 		if (annotation.isPresent()) {
 			ValidationReply reply = validate(annotation.get(), jsonData);
-			if (!reply.success) {
-				throw new WebApplicationException(reply.getErrorResponse());
+			if (!reply.success()) {
+				var response = Response.status(Status.BAD_REQUEST).entity(reply.errors()).build();
+				throw new WebApplicationException(response);
 			}
 		}
 
@@ -87,12 +91,12 @@ public class ValidatedMessageBodyReader implements MessageBodyReader<SchemaValid
 			Set<ValidationMessage> errors = schema.validate(node);
 			if (!errors.isEmpty()) {
 				LOG.error("Failed to validate json to schema " + schemaPath);
-				errors.stream().forEach(LOG::error);
+				errors.forEach(LOG::error);
 			}
-			return new ValidationReply.Builder().success(errors.isEmpty()).errors(errors).build();
+			return new ValidationReply(errors.isEmpty(), errors);
 		} catch (IOException e) {
 			LOG.error(e.getMessage(), e);
-			return new ValidationReply.Builder().success(false).build();
+			return new ValidationReply(false, new HashSet<>());
 		}
 	}
 

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

@@ -1,11 +1,7 @@
 package marketing.heyday.hartmann.fotodocumentation.rest.jackson;
 
-import java.util.HashSet;
 import java.util.Set;
 
-import jakarta.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status;
-
 import com.networknt.schema.ValidationMessage;
 
 /**
@@ -17,35 +13,5 @@ import com.networknt.schema.ValidationMessage;
  * 
  * created: Feb 14, 2017
  */
-public final class ValidationReply {
-	public final boolean success;
-	public final Set<ValidationMessage> errors = new HashSet<>();
-
-	private ValidationReply(boolean success, Set<ValidationMessage> errors) {
-		this.success = success;
-		this.errors.addAll(errors);
-	}
-
-	public Response getErrorResponse() {
-		return Response.status(Status.BAD_REQUEST).entity(errors).build();
-	}
-
-	public static final class Builder {
-		private boolean success;
-		private Set<ValidationMessage> errors = new HashSet<>();
-
-		public Builder success(boolean success) {
-			this.success = success;
-			return this;
-		}
-
-		public Builder errors(Set<ValidationMessage> errors) {
-			this.errors = errors;
-			return this;
-		}
-
-		public ValidationReply build() {
-			return new ValidationReply(success, errors);
-		}
-	}
+public record ValidationReply(boolean success, Set<ValidationMessage> errors) {
 }

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

@@ -3,6 +3,7 @@ package marketing.heyday.hartmann.fotodocumentation.rest.vo;
 import java.util.Date;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import marketing.heyday.hartmann.fotodocumentation.rest.jackson.SchemaValidated;
 
 /**
  * 
@@ -14,6 +15,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
  * created: 19 Jan 2026
  */
 @Schema(name = "CustomerPictureUpload")
-public record CustomerPictureValue(String username, String pharmacyName, String customerNumber, Date date, String comment, String category, String base64String) {
+public record CustomerPictureValue(String username, String pharmacyName, String customerNumber, Date date, String comment, String category, String base64String) implements SchemaValidated {
 
 }

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

@@ -112,4 +112,12 @@ public abstract class AbstractRestTest extends AbstractTest {
 		String className = this.getClass().getName();
 		return getResponseText(httpResponse, () -> className + "-" + name + ".json");
 	}
+	
+	protected int customerCount() {
+		return getCount("select count(*) from customer");
+	}
+	
+	protected int pictureCount() {
+		return getCount("select count(*) from picture");
+	}
 }

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

@@ -37,10 +37,13 @@ public class CustomerPictureResourceTest extends AbstractRestTest {
 	}
 
 	@Test
-	@Order(1)
+	@Order(2)
 	public void doAddCustomerPicture() throws IOException {
 		LOG.info("doAddCustomerPicture");
-
+		
+		assertEquals(3, customerCount());
+		assertEquals(5, pictureCount());
+		
 		String authorization = getBasicHeader();
 		LOG.info("authorization: " + authorization);
 		String path = deploymentURL + PATH;
@@ -51,10 +54,56 @@ public class CustomerPictureResourceTest extends AbstractRestTest {
 		HttpResponse httpResponse = executeRequest(request);
 		int code = httpResponse.getStatusLine().getStatusCode();
 		assertEquals(200, code);
+		
+		assertEquals(3, customerCount());
+		assertEquals(6, pictureCount());
+	}
+	
+	@Test
+	@Order(3)
+	public void doAddCustomerWithPicture() throws IOException {
+		LOG.info("doAddCustomerWithPicture");
+		
+		assertEquals(3, customerCount());
+		assertEquals(6, pictureCount());
+		
+		String authorization = getBasicHeader();
+		LOG.info("authorization: " + authorization);
+		String path = deploymentURL + PATH;
+		Request request = Request.Post(path).addHeader("Accept", "application/json; charset=utf-8")
+				.addHeader("Authorization", authorization)
+				.bodyFile(new File(BASE_UPLOAD + "addNewCustomer.json"), ContentType.APPLICATION_JSON);
+
+		HttpResponse httpResponse = executeRequest(request);
+		int code = httpResponse.getStatusLine().getStatusCode();
+		assertEquals(200, code);
+		
+		assertEquals(4, customerCount());
+		assertEquals(7, pictureCount());
+	}
+	
+	@Test
+	@Order(1)
+	public void doAddCustomerPictureWrongJson() throws IOException {
+		LOG.info("doAddCustomerPictureWrongJson");
+		
+		String authorization = getBasicHeader();
+		LOG.info("authorization: " + authorization);
+		String path = deploymentURL + PATH;
+		Request request = Request.Post(path).addHeader("Accept", "application/json; charset=utf-8")
+				.addHeader("Authorization", authorization)
+				.bodyFile(new File(BASE_UPLOAD + "addWrong.json"), ContentType.APPLICATION_JSON);
+
+		HttpResponse httpResponse = executeRequest(request);
+		int code = httpResponse.getStatusLine().getStatusCode();
+		assertEquals(400, code);
+		
+		String text = getResponseText(httpResponse, "doGetAll");
+		System.out.println(text);
 	}
 
 	@Test
-	@Order(2)
+	@Order(1)
 	public void doAddCustomerPictureNoAuth() throws IOException {
 		LOG.info("doAddCustomerPictureNoAuth");
 
@@ -74,6 +123,6 @@ public class CustomerPictureResourceTest extends AbstractRestTest {
 		test.username = "adm";
 		test.password = "x1t0e7Pb49";
 
-		test.doAddCustomerPicture();
+		test.doAddCustomerPictureWrongJson();
 	}
 }

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

@@ -48,13 +48,12 @@ public class CustomerResourceTest extends AbstractRestTest {
 		HttpResponse httpResponse = executeRequest(request);
 		int code = httpResponse.getStatusLine().getStatusCode();
 		assertEquals(200, code);
-		
 
 		String text = getResponseText(httpResponse, "doGetAll");
 		String expected = fileToString(BASE_DOWNLOAD + "doGetAll.json");
 		jsonAssert(expected, text);
 	}
-	
+
 	@Test
 	@Order(1)
 	public void doGetCustomer() throws IOException {
@@ -62,14 +61,13 @@ public class CustomerResourceTest extends AbstractRestTest {
 
 		String authorization = getAuthorization();
 		LOG.info("authorization: " + authorization);
-		String path = deploymentURL + PATH +"/1";
+		String path = deploymentURL + PATH + "/1";
 		Request request = Request.Get(path).addHeader("Accept", "application/json; charset=utf-8")
 				.addHeader("Authorization", authorization);
 
 		HttpResponse httpResponse = executeRequest(request);
 		int code = httpResponse.getStatusLine().getStatusCode();
 		assertEquals(200, code);
-		
 
 		String text = getResponseText(httpResponse, "doGetCustomer");
 		String expected = fileToString(BASE_DOWNLOAD + "doGetCustomer.json");

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

@@ -27,7 +27,7 @@ import org.junit.jupiter.api.TestMethodOrder;
 public class PictureResourceTest extends AbstractRestTest {
 	private static final Log LOG = LogFactory.getLog(PictureResourceTest.class);
 	private static final String PATH = "api/picture";
-	
+
 	@BeforeAll
 	public static void init() {
 		initDB();
@@ -50,7 +50,7 @@ public class PictureResourceTest extends AbstractRestTest {
 
 		assertEquals(4, pictureCount());
 	}
-	
+
 	@Test
 	@Order(1)
 	public void doDeleteNotFound() throws IOException {
@@ -68,8 +68,5 @@ public class PictureResourceTest extends AbstractRestTest {
 
 		assertEquals(5, pictureCount());
 	}
-	
-	private int pictureCount() {
-		return getCount("select count(*) from picture");
-	}
+
 }