Add giftcard fields, improve errors

backend/pom.xml

@@ -14,13 +14,13 @@
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<querydsl.version>5.1.0</querydsl.version>
-		<revision>0.4.3</revision>
+		<revision>0.5.0</revision>
 	</properties>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.3.4</version>
+		<version>3.3.5</version>
 		<relativePath />
 	</parent>
 

backend/src/main/java/de/champonthis/buntspecht/businesslogic/TurnoverManager.java

@@ -172,7 +172,8 @@ public class TurnoverManager {
 
 		JPAQuery<Tuple> query = jpaQueryFactory.from(qTurnover).where(builder.getValue()).groupBy(qTurnover.username)
 				.select(qTurnover.username.as("username"), qTurnover.price.sum().as("price"),
-						qTurnover.timeInvestment.sum().as("timeInvestment"));
+						qTurnover.timeInvestment.sum().as("timeInvestment"),
+						qTurnover.giftcardPrice.sum().as("giftcardPrice"));
 		Long total = query.clone().select(qTurnover.username.countDistinct()).fetchOne();
 
 		if (StringUtils.hasText(sortBy)) {

backend/src/main/java/de/champonthis/buntspecht/controller/validation/TurnoverValidator.java

@@ -34,5 +34,11 @@ public class TurnoverValidator implements Validator {
         if (turnover.getPrice() < 0) {
             errors.rejectValue("price", "POSITIVE_VALUE");
         }
+
+        if (turnover.getGiftcardPrice() != null && turnover.getGiftcardPrice() < 0) {
+            errors.rejectValue("giftcardPrice", "POSITIVE_VALUE");
+        } else if (turnover.getGiftcardPrice() != null && turnover.getGiftcardPrice() > turnover.getPrice()) {
+            errors.rejectValue("giftcardPrice", "GREATER_THAN_PRICE");
+        }
     }
 }

backend/src/main/java/de/champonthis/buntspecht/model/Turnover.java

@@ -51,6 +51,12 @@ public class Turnover {
     @Column(name = "material_consumption", nullable = true, length = 5000)
     private String materialConsumption;
 
+    @Column(name = "giftcard_number", nullable = true)
+    private String giftcardNumber;
+
+    @Column(name = "giftcard_price", nullable = true)
+    private Float giftcardPrice;
+
     public Long getId() {
         return id;
     }
@@ -139,6 +145,22 @@ public class Turnover {
         this.materialConsumption = materialConsumption;
     }
 
+    public String getGiftcardNumber() {
+        return giftcardNumber;
+    }
+
+    public void setGiftcardNumber(String giftcardNumber) {
+        this.giftcardNumber = giftcardNumber;
+    }
+
+    public Float getGiftcardPrice() {
+        return giftcardPrice;
+    }
+
+    public void setGiftcardPrice(Float giftcardPrice) {
+        this.giftcardPrice = giftcardPrice;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (!(obj instanceof Turnover)) {
@@ -170,6 +192,12 @@ public class Turnover {
         equals &= materialConsumption == null && turnover.getMaterialConsumption() == null
                 || materialConsumption != null && materialConsumption.equals(turnover.getMaterialConsumption());
 
+        equals &= giftcardNumber == null && turnover.getGiftcardNumber() == null
+                || giftcardNumber != null && giftcardNumber.equals(turnover.getGiftcardNumber());
+
+        equals &= giftcardPrice == null && turnover.getGiftcardPrice() == null
+                || giftcardPrice != null && giftcardPrice.equals(turnover.getGiftcardPrice());
+
         return equals;
     }
 }