From 6b4ee3641cf511a424c536542ea1eb0692e65b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= <ltilve@igalia.com>
Date: Thu, 7 Feb 2013 13:30:38 +0100
Subject: [PATCH] Reverted unnecesary changes on Label and Criterion save
 operations to clear removed entities

Since the "foreign key" constraint with onDelete parameter introduced into liquibase is handling
at database level the integrity, the external operations to clean the setting values are not longer
needed.

FEA: ItEr77S15FilteringEnhancements
---
 .../business/users/daos/IUserDAO.java         |  6 ------
 .../business/users/daos/UserDAO.java          | 16 ---------------
 .../libreplan/web/labels/LabelTypeModel.java  | 18 -----------------
 .../resources/criterion/CriterionsModel.java  | 20 -------------------
 4 files changed, 60 deletions(-)

diff --git a/libreplan-business/src/main/java/org/libreplan/business/users/daos/IUserDAO.java b/libreplan-business/src/main/java/org/libreplan/business/users/daos/IUserDAO.java
index c909947ef..a6ed0d376 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/users/daos/IUserDAO.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/users/daos/IUserDAO.java
@@ -25,8 +25,6 @@ import java.util.List;
 
 import org.libreplan.business.common.daos.IGenericDAO;
 import org.libreplan.business.common.exceptions.InstanceNotFoundException;
-import org.libreplan.business.labels.entities.Label;
-import org.libreplan.business.resources.entities.Criterion;
 import org.libreplan.business.resources.entities.Worker;
 import org.libreplan.business.scenarios.entities.Scenario;
 import org.libreplan.business.users.entities.OrderAuthorization;
@@ -104,8 +102,4 @@ public interface IUserDAO extends IGenericDAO<User, Long>{
 
     List<User> findAll();
 
-    public List<User> findByLabelFilterSetting(List<Label> removedLabels);
-
-    public List<User> findByCriterionFilterSetting(List<Criterion> criteria);
-
 }
diff --git a/libreplan-business/src/main/java/org/libreplan/business/users/daos/UserDAO.java b/libreplan-business/src/main/java/org/libreplan/business/users/daos/UserDAO.java
index 73f3c394d..0d919d0cb 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/users/daos/UserDAO.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/users/daos/UserDAO.java
@@ -28,8 +28,6 @@ import org.hibernate.Criteria;
 import org.hibernate.criterion.Restrictions;
 import org.libreplan.business.common.daos.GenericDAOHibernate;
 import org.libreplan.business.common.exceptions.InstanceNotFoundException;
-import org.libreplan.business.labels.entities.Label;
-import org.libreplan.business.resources.entities.Criterion;
 import org.libreplan.business.resources.entities.Worker;
 import org.libreplan.business.scenarios.entities.Scenario;
 import org.libreplan.business.users.entities.OrderAuthorization;
@@ -180,18 +178,4 @@ public class UserDAO extends GenericDAOHibernate<User, Long>
         return list(User.class);
     }
 
-    @Override
-    public List<User> findByLabelFilterSetting(List<Label> labels) {
-        Criteria c = getSession().createCriteria(User.class);
-        c.add(Restrictions.in("projectsFilterLabel", labels));
-        return c.list();
-    }
-
-    @Override
-    public List<User> findByCriterionFilterSetting(List<Criterion> criteria) {
-        Criteria c = getSession().createCriteria(User.class);
-        c.add(Restrictions.in("resourcesLoadFilterCriterion", criteria));
-        return c.list();
-    }
-
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java
index 7d6fd7af4..2fd00fb4a 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/labels/LabelTypeModel.java
@@ -39,9 +39,6 @@ import org.libreplan.business.labels.daos.ILabelDAO;
 import org.libreplan.business.labels.daos.ILabelTypeDAO;
 import org.libreplan.business.labels.entities.Label;
 import org.libreplan.business.labels.entities.LabelType;
-import org.libreplan.business.users.daos.IUserDAO;
-import org.libreplan.business.users.entities.User;
-import org.libreplan.web.common.FilterUtils;
 import org.libreplan.web.common.IntegrationEntityModel;
 import org.libreplan.web.common.concurrentdetection.OnConcurrentModification;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -68,13 +65,8 @@ public class LabelTypeModel extends IntegrationEntityModel implements
     @Autowired
     private IConfigurationDAO configurationDAO;
 
-    @Autowired
-    private IUserDAO userDAO;
-
     private LabelType labelType;
 
-    private List<Label> removedLabels = new ArrayList<Label>();
-
     public LabelTypeModel() {
 
     }
@@ -137,15 +129,6 @@ public class LabelTypeModel extends IntegrationEntityModel implements
 
         generateCodes();
         labelTypeDAO.save(labelType);
-
-        if (!removedLabels.isEmpty()) {
-            List<User> users = userDAO.findByLabelFilterSetting(removedLabels);
-            for (User user : users) {
-                user.setProjectsFilterLabel(null);
-                userDAO.save(user);
-            }
-            FilterUtils.clearBandboxes();
-        }
     }
 
     @Override
@@ -250,7 +233,6 @@ public class LabelTypeModel extends IntegrationEntityModel implements
     @Override
     public void confirmDeleteLabel(Label label) {
         labelType.removeLabel(label);
-        removedLabels.add(label);
     }
 
     @Override
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java
index 7eff02d15..c73c0bb3f 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/resources/criterion/CriterionsModel.java
@@ -31,7 +31,6 @@ import java.util.Set;
 import org.apache.commons.lang.Validate;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.hibernate.annotations.Filters;
 import org.libreplan.business.common.IntegrationEntity;
 import org.libreplan.business.common.daos.IConfigurationDAO;
 import org.libreplan.business.common.entities.EntityNameEnum;
@@ -45,9 +44,6 @@ import org.libreplan.business.resources.entities.CriterionType;
 import org.libreplan.business.resources.entities.ICriterionType;
 import org.libreplan.business.resources.entities.Resource;
 import org.libreplan.business.resources.entities.Worker;
-import org.libreplan.business.users.daos.IUserDAO;
-import org.libreplan.business.users.entities.User;
-import org.libreplan.web.common.FilterUtils;
 import org.libreplan.web.common.IntegrationEntityModel;
 import org.libreplan.web.common.concurrentdetection.OnConcurrentModification;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -82,17 +78,12 @@ public class CriterionsModel extends IntegrationEntityModel implements ICriterio
     @Autowired
     private IConfigurationDAO configurationDAO;
 
-    @Autowired
-    private IUserDAO userDAO;
-
     private CriterionType criterionType;
 
     private Criterion criterion;
 
     private ICriterionTreeModel criterionTreeModel;
 
-    private List<Criterion> removedCriterion = new ArrayList<Criterion>();
-
     @Override
     @Transactional(readOnly = true)
     public List<CriterionType> getTypes() {
@@ -196,16 +187,6 @@ public class CriterionsModel extends IntegrationEntityModel implements ICriterio
         }
         criterionTreeModel.saveCriterions(criterionType);
         criterionTypeDAO.save(criterionType);
-
-        if (!removedCriterion.isEmpty()) {
-            List<User> users = userDAO
-                    .findByCriterionFilterSetting(removedCriterion);
-            for (User user : users) {
-                user.setResourcesLoadFilterCriterion(null);
-                userDAO.save(user);
-            }
-            FilterUtils.clearBandboxes();
-        }
     }
 
     @Override
@@ -282,7 +263,6 @@ public class CriterionsModel extends IntegrationEntityModel implements ICriterio
     @Override
     public void addForRemoval(Criterion criterion) {
         criterionType.getCriterions().remove(criterion);
-        removedCriterion.add(criterion);
     }
 
     @Override