diff --git a/src/main/java/de/rwth/swc/sqa/DataService.java b/src/main/java/de/rwth/swc/sqa/DataService.java index 1a415cfcd09e7ae6712971ff726bb224164b20ab..81d8c6c51e4722eb2183723cab435d89ada00b93 100644 --- a/src/main/java/de/rwth/swc/sqa/DataService.java +++ b/src/main/java/de/rwth/swc/sqa/DataService.java @@ -74,6 +74,16 @@ public class DataService { return isValid; } + public static boolean discountCanBeAppliedOnTheTicket(Ticket ticket){ + boolean applyDiscount=false; + if(ticket.getValidFor().getValue().equals("30d") || ticket.getValidFor().getValue().equals("1y")){ + if(ticket.getDiscountCard()==true){ + applyDiscount=true; + } + } + return applyDiscount; + } + //check if the discountCard can be applied for the requested ticket public static boolean discountCanBeApplied(DiscountCard discountCard, TicketValidationRequest ticketValidationRequest){ boolean applyDiscount=false; diff --git a/src/test/java/de/rwth/swc/sqa/TicketTest.java b/src/test/java/de/rwth/swc/sqa/TicketTest.java index 43532dfa3b1af0505885bab0c835f184546b5ad4..d430f1b6b98bbf427741aed36e226912e09d5666 100644 --- a/src/test/java/de/rwth/swc/sqa/TicketTest.java +++ b/src/test/java/de/rwth/swc/sqa/TicketTest.java @@ -50,7 +50,7 @@ public class TicketTest { parms1.put("validFor", "1d"); parms1.put("zone", "A"); parms1.put("student", false); - parms1.put("discountCard", true); + parms1.put("discountCard", false); parms1.put("disabled", true); parms1.put("validFrom", "2022-05-20 10:00:00"); RestAssured.given().header("content-Type", "application/json").and()