From 9080e7ecb403341a1c52c329d044a778cc254f0f Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Mon, 18 Jun 2012 09:00:06 +0100
Subject: [PATCH] implements an empty method called "beforeSaving" in the
 GenericRESTService and overrides it in the ExpenseSheetServiceRest in order
 to save the sum of expenses.

FEA: ItEr76S22ExpenseTrackingSystem
---
 .../ws/common/impl/GenericRESTService.java    |  8 +++
 .../impl/ExpenseSheetServiceREST.java         | 57 ++-----------------
 2 files changed, 13 insertions(+), 52 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/GenericRESTService.java b/libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/GenericRESTService.java
index 3ca7948b1..278bad001 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/GenericRESTService.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/GenericRESTService.java
@@ -141,6 +141,7 @@ public abstract class GenericRESTService<E extends IntegrationEntity,
                  * Validate and save (insert or update) the entity.
                  */
                 entity.validate();
+                beforeSaving(entity);
                 entityDAO.saveWithoutValidating(entity);
 
                 return null;
@@ -153,6 +154,13 @@ public abstract class GenericRESTService<E extends IntegrationEntity,
 
     }
 
+    /**
+     * it adds operations that must be done before saving.
+     */
+    protected void beforeSaving(E entity) {
+
+    }
+
     /**
      * It creates an entity from a DTO.
      *
diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/expensesheets/impl/ExpenseSheetServiceREST.java b/libreplan-webapp/src/main/java/org/libreplan/ws/expensesheets/impl/ExpenseSheetServiceREST.java
index 8f5347db0..b10beac17 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/ws/expensesheets/impl/ExpenseSheetServiceREST.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/ws/expensesheets/impl/ExpenseSheetServiceREST.java
@@ -27,9 +27,7 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
 
-import org.libreplan.business.common.IOnTransaction;
 import org.libreplan.business.common.daos.IIntegrationEntityDAO;
-import org.libreplan.business.common.exceptions.InstanceNotFoundException;
 import org.libreplan.business.common.exceptions.ValidationException;
 import org.libreplan.business.expensesheet.daos.IExpenseSheetDAO;
 import org.libreplan.business.expensesheet.entities.ExpenseSheet;
@@ -62,56 +60,11 @@ public class ExpenseSheetServiceREST extends
     @Autowired
     private IExpenseSheetDAO expenseSheetDAO;
 
-    /**
-     * It saves (inserts or updates) an entity DTO by using a new transaction.
-     *
-     * @throws ValidationException if validations are not passed
-     * @throws RecoverableErrorException if a recoverable error occurs
-     * @author Susana Montes Pedreira <smontes@wirelessgalicia.com>
-     *
-     */
-    protected void insertOrUpdate(final ExpenseSheetDTO entityDTO)
-            throws ValidationException, RecoverableErrorException {
-        /*
-         * NOTE: ValidationException and RecoverableErrorException are runtime
-         * exceptions. In consequence, if any of them occurs, transaction is
-         * automatically rolled back.
-         */
-
-        IOnTransaction<Void> save = new IOnTransaction<Void>() {
-
-            @Override
-            public Void execute() {
-
-                ExpenseSheet entity = null;
-                IIntegrationEntityDAO<ExpenseSheet> entityDAO = getIntegrationEntityDAO();
-
-                /* Insert or update? */
-                try {
-                    entity = entityDAO.findByCode(entityDTO.code);
-                    updateEntity(entity, entityDTO);
-                } catch (InstanceNotFoundException e) {
-                    entity = toEntity(entityDTO);
-                }
-
-                /*
-                 * Validate and save (insert or update) the entity.
-                 */
-                entity.validate();
-                sumExpensesDAO
-                        .updateRelatedSumExpensesWithExpenseSheetLineSet(entity
-                                .getExpenseSheetLines());
-                entity.updateCalculatedProperties();
-
-                entityDAO.saveWithoutValidating(entity);
-
-                return null;
-
-            }
-
-        };
-
-        transactionService.runOnAnotherTransaction(save);
+    @Override
+    protected void beforeSaving(ExpenseSheet entity) {
+        sumExpensesDAO.updateRelatedSumExpensesWithExpenseSheetLineSet(entity
+                .getExpenseSheetLines());
+        entity.updateCalculatedProperties();
     }
 
     @Override