From 9dc9b7e952b0cb5a9b71c5e0be1eef1bcf2a1cbd Mon Sep 17 00:00:00 2001
From: Klaus Richarz <kr@hbt.de>
Date: Thu, 4 Jul 2024 15:49:14 +0200
Subject: [PATCH] #372 ensure business rules captured in TimereportService are
 used

---
 .../action/DeleteTimereportFromDailyDisplayAction.java        | 4 +++-
 .../java/org/tb/dailyreport/rest/DailyReportRestEndpoint.java | 4 +---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/tb/dailyreport/action/DeleteTimereportFromDailyDisplayAction.java b/src/main/java/org/tb/dailyreport/action/DeleteTimereportFromDailyDisplayAction.java
index 693a8ef37..1e316926e 100644
--- a/src/main/java/org/tb/dailyreport/action/DeleteTimereportFromDailyDisplayAction.java
+++ b/src/main/java/org/tb/dailyreport/action/DeleteTimereportFromDailyDisplayAction.java
@@ -15,6 +15,7 @@
 import org.tb.dailyreport.persistence.TimereportDAO;
 import org.tb.dailyreport.domain.Workingday;
 import org.tb.dailyreport.persistence.WorkingdayDAO;
+import org.tb.dailyreport.service.TimereportService;
 import org.tb.dailyreport.viewhelper.TimereportHelper;
 import org.tb.employee.domain.Employeecontract;
 import org.tb.employee.persistence.EmployeecontractDAO;
@@ -39,6 +40,7 @@ public class DeleteTimereportFromDailyDisplayAction extends DailyReportAction<Sh
     private final EmployeeorderDAO employeeorderDAO;
     private final WorkingdayDAO workingdayDAO;
     private final TimereportHelper timereportHelper;
+    private final TimereportService timereportService;
 
     @Override
     public ActionForward executeAuthenticated(ActionMapping mapping, ShowDailyReportForm form, HttpServletRequest request, HttpServletResponse response) throws IOException {
@@ -53,7 +55,7 @@ public ActionForward executeAuthenticated(ActionMapping mapping, ShowDailyReport
             return mapping.getInputForward();
         }
 
-        if (!timereportDAO.deleteTimereportById(trId)) {
+        if (!timereportService.deleteTimereport(trId, authorizedUser)) {
             return mapping.findForward("error");
         }
 
diff --git a/src/main/java/org/tb/dailyreport/rest/DailyReportRestEndpoint.java b/src/main/java/org/tb/dailyreport/rest/DailyReportRestEndpoint.java
index f1498de8a..1d4a8f26c 100644
--- a/src/main/java/org/tb/dailyreport/rest/DailyReportRestEndpoint.java
+++ b/src/main/java/org/tb/dailyreport/rest/DailyReportRestEndpoint.java
@@ -169,8 +169,6 @@ public void deleteBooking(@RequestBody DailyReportData report) {
             throw new ResponseStatusException(UNAUTHORIZED);
         }
 
-        if (report.getId() != -1) {
-            timereportDAO.deleteTimereportById(report.getId());
-        }
+        timereportService.deleteTimereport(report.getId(), authorizedUser);
     }
 }