From ea2708f3035b442316dbb7d7f4ee14886d70f8d2 Mon Sep 17 00:00:00 2001
From: Josef Rokos <pepa@bukova.info>
Date: Mon, 27 Jun 2016 21:14:31 +0200
Subject: [PATCH] =?UTF-8?q?Opraveno=20ru=C5=A1en=C3=AD=20schv=C3=A1len?=
 =?UTF-8?q?=C3=AD=20vy=C3=BA=C4=8Dtov=C3=A1n=C3=AD=20SC=20z=20agendy=20po?=
 =?UTF-8?q?=C5=BEadavk=C5=AF=20closes=20#270?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tripbill/TripBillApprovalServiceImpl.java | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/info/bukova/isspst/services/tripbill/TripBillApprovalServiceImpl.java b/src/main/java/info/bukova/isspst/services/tripbill/TripBillApprovalServiceImpl.java
index b05a9730..18e29174 100644
--- a/src/main/java/info/bukova/isspst/services/tripbill/TripBillApprovalServiceImpl.java
+++ b/src/main/java/info/bukova/isspst/services/tripbill/TripBillApprovalServiceImpl.java
@@ -12,7 +12,10 @@ import info.bukova.isspst.services.IsspstException;
 import info.bukova.isspst.services.requirement.RequirementBaseServiceImpl;
 import info.bukova.isspst.services.requirement.RequirementTypeService;
 import info.bukova.isspst.services.signeddocs.SignedDocumentService;
+import info.bukova.isspst.storage.StorageException;
 import org.hibernate.Query;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +34,8 @@ public class TripBillApprovalServiceImpl extends RequirementBaseServiceImpl<Trip
 	@Autowired
 	private SignedDocumentService signedDocumentService;
 
+	private final static Logger logger = LoggerFactory.getLogger(TripBillApproval.class);
+
 	@Override
 	public TripBillApproval createApproval(TripBill bill) {
 		if (bill.getApproval() != null) {
@@ -72,9 +77,24 @@ public class TripBillApprovalServiceImpl extends RequirementBaseServiceImpl<Trip
 	@Transactional
 	@PreAuthorize("hasPermission(this, 'PERM_DELETE') or this.canApprove(#bill.approval)")
 	public void cancelApproval(TripBill bill) {
+		TripBillApproval approval = bill.getApproval();
+
+		if (approval != null) {
+			super.delete(approval);
+		}
+
+		removeApproval(bill);
+	}
+
+	private void removeApproval(TripBill bill) {
 		bill.setApproval(null);
-		signedDocumentService.deleteForEntity(bill);
 		tripBillService.update(bill);
+
+		try {
+			signedDocumentService.deleteForEntity(bill);
+		} catch (StorageException e) {
+			logger.warn(e.getMessage());
+		}
 	}
 
 	@Override
@@ -96,7 +116,7 @@ public class TripBillApprovalServiceImpl extends RequirementBaseServiceImpl<Trip
 
 		if (bill != null) {
 			dao.delete(entity);
-			cancelApproval(bill);
+			removeApproval(bill);
 		} else {
 			super.delete(entity);
 		}