add payment method field

backend/pom.xml

@@ -14,7 +14,7 @@
 		<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.5.1</revision>
+		<revision>0.6.0</revision>
 	</properties>
 
 	<parent>
@@ -102,7 +102,7 @@
 		<dependency>
 			<groupId>org.passay</groupId>
 			<artifactId>passay</artifactId>
-			<version>1.6.5</version>
+			<version>1.6.6</version>
 		</dependency>
 
 		<!-- Datbase -->

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

@@ -35,6 +35,13 @@ public class TurnoverValidator implements Validator {
             errors.rejectValue("price", "MIN");
         }
 
+        if (turnover.getPaymentMethod() == null) {
+            errors.rejectValue("paymentMethod", "REQUIRED");
+        } else if (!turnover.getPaymentMethod().equals("card")
+                && !turnover.getPaymentMethod().equals("cash")) {
+            errors.rejectValue("paymentMethod", "INVALID");
+        }
+
         if (turnover.getGiftcardPrice() != null && turnover.getGiftcardPrice() < 0) {
             errors.rejectValue("giftcardPrice", "MIN");
         } else if (turnover.getGiftcardPrice() != null && turnover.getGiftcardPrice() > turnover.getPrice()) {

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

@@ -40,6 +40,9 @@ public class Turnover {
     @Column(name = "price", nullable = false)
     private float price;
 
+    @Column(name = "payment_method", nullable = true)
+    private String paymentMethod;
+
     @Column(name = "time_investment", nullable = true)
     private float timeInvestment;
 
@@ -121,6 +124,14 @@ public class Turnover {
         this.price = price;
     }
 
+    public String getPaymentMethod() {
+        return paymentMethod;
+    }
+
+    public void setPaymentMethod(String paymentMethod) {
+        this.paymentMethod = paymentMethod;
+    }
+
     public float getTimeInvestment() {
         return timeInvestment;
     }
@@ -184,6 +195,9 @@ public class Turnover {
 
         equals &= price == turnover.getPrice();
 
+        equals &= paymentMethod == null && turnover.getPaymentMethod() == null
+                || paymentMethod != null && paymentMethod.equals(turnover.getPaymentMethod());
+
         equals &= timeInvestment == turnover.getTimeInvestment();
 
         equals &= remark == null && turnover.getRemark() == null