From 99f22c694c51dddc4bd5cd02663d07d2a99c25e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Wed, 30 Dec 2009 21:43:54 +0100
Subject: [PATCH]  ItEr41S17CUAsignarUsuarioAProxectoTraballoItEr40S22:
 corrected order authorizations model-controller to work with new orders

---
 .../web/orders/OrderCRUDController.java       |  2 +-
 .../web/users/OrderAuthorizationModel.java    | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
index 59d3c98dd..eea70678f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
@@ -290,9 +290,9 @@ public class OrderCRUDController extends GenericForwardComposer {
         if (!assignedTaskQualityFormController.confirm()) {
             return false;
         }
-        orderAuthorizationController.save();
         try {
             orderModel.save();
+            orderAuthorizationController.save();
             messagesForUser.showMessage(Level.INFO, _("Order saved"));
             return true;
         } catch (ValidationException e) {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java
index f3f4a2a0a..20044da16 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java
@@ -1,8 +1,14 @@
 package org.navalplanner.web.users;
 
+import static org.navalplanner.web.I18nHelper._;
+
 import java.util.ArrayList;
 import java.util.List;
 
+import org.hibernate.validator.InvalidValue;
+import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
+import org.navalplanner.business.common.exceptions.ValidationException;
+import org.navalplanner.business.orders.daos.IOrderDAO;
 import org.navalplanner.business.orders.entities.Order;
 import org.navalplanner.business.users.daos.IOrderAuthorizationDAO;
 import org.navalplanner.business.users.entities.OrderAuthorization;
@@ -35,6 +41,9 @@ public class OrderAuthorizationModel implements IOrderAuthorizationModel {
     @Autowired
     private IOrderAuthorizationDAO dao;
 
+    @Autowired
+    private IOrderDAO orderDAO;
+
     @Override
     public void addProfileOrderAuthorization(Profile profile,
             boolean readAuthorization, boolean writeAuthorization) {
@@ -76,6 +85,17 @@ public class OrderAuthorizationModel implements IOrderAuthorizationModel {
     @Override
     @Transactional
     public void confirmSave() {
+        try {
+            if(order.isNewObject()) {
+                //if it was new, we reload the order from the DAO
+                Order newOrder = orderDAO.find(order.getId());
+                replaceOrder(newOrder);
+            }
+        }catch (InstanceNotFoundException e) {
+            InvalidValue invalidValue = new InvalidValue(_("Order does not exist"),
+                    OrderAuthorization.class, "order", order, null);
+            throw new ValidationException(invalidValue);
+        }
         for(OrderAuthorization authorization : profileOrderAuthorizationList) {
             dao.save(authorization);
         }
@@ -166,4 +186,16 @@ public class OrderAuthorizationModel implements IOrderAuthorizationModel {
         return orderAuthorization;
     }
 
+    private void replaceOrder(Order newOrder) {
+        for(OrderAuthorization authorization : profileOrderAuthorizationList) {
+            authorization.setOrder(newOrder);
+            dao.save(authorization);
+        }
+        for(OrderAuthorization authorization : userOrderAuthorizationList) {
+            authorization.setOrder(newOrder);
+            dao.save(authorization);
+        }
+        this.order = newOrder;
+    }
+
 }