RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr32S09ValidacionEProbasFuncionaisItEr31S12: [Bug #68] Fix to remove OrderElement in DB when they are deleted from interface.

Browse source
This commit is contained in:
Susana Montes Pedreira 2009-10-26 19:26:33 +01:00 • committed by Javier Moran Rua
parent f4a1d78bcf
commit 311b1a9f28
4 changed files with 41 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/IOrderElementDAO.java
View file

@ -34,6 +34,9 @@ import org.navalplanner.business.orders.entities.OrderElement;
* @author Susana Montes Pedreira <smontes@wirelessgalicia.com>
*/
public interface IOrderElementDAO extends IGenericDAO<OrderElement, Long> {
public List<OrderElement> findWithoutParent();
public List<OrderElement> findByCode(String code);
public OrderElement findUniqueByCode(String code)

7
navalplanner-business/src/main/java/org/navalplanner/business/orders/daos/OrderElementDAO.java
View file

@ -53,6 +53,13 @@ public class OrderElementDAO extends GenericDAOHibernate<OrderElement, Long>
@Autowired
private IWorkReportLineDAO workReportLineDAO;
@Override
public List<OrderElement> findWithoutParent() {
Criteria c = getSession().createCriteria(OrderElement.class);
c.add(Restrictions.isNull("parent"));
return (List<OrderElement>) c.list();
}
public List<OrderElement> findByCode(String code) {
Criteria c = getSession().createCriteria(OrderElement.class);
c.add(Restrictions.eq("code", code));

2
navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml
View file

@ -57,7 +57,7 @@
<joined-subclass name="OrderLine">
<key column="ORDERELEMENTID"></key>
<set name="hoursGroups" access="field" cascade="all" inverse="true">
<set name="hoursGroups" access="field" cascade="all,delete-orphan" inverse="true">
<key column="PARENT_ORDER_LINE" not-null="false"></key>
<one-to-many class="HoursGroup" />
</set>

44
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
View file

@ -2,20 +2,20 @@
* This file is part of ###PROJECT_NAME###
*
* Copyright (C) 2009 Fundación para o Fomento da Calidade Industrial e
* Desenvolvemento Tecnolóxico de Galicia
* Desenvolvemento Tecnolóxico de Galicia
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License as published by the Free
* Software Foundation, either version 3 of the License, or (at your option) any
* later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
* details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.web.orders;
@ -128,8 +128,7 @@ public class OrderModel implements IOrderModel {
List<CriterionType> criterionTypes = criterionTypeDAO
.getCriterionTypes();
for (CriterionType criterionType : criterionTypes) {
List<Criterion> criterions = new ArrayList<Criterion>(
criterionDAO
List<Criterion> criterions = new ArrayList<Criterion>(criterionDAO
.findByType(criterionType));
mapCriterions.put(criterionType, criterions);
@ -218,6 +217,23 @@ public class OrderModel implements IOrderModel {
order.checkValid();
this.orderDAO.save(order);
deleteOrderElementNotParent();
}
private void deleteOrderElementNotParent() throws ValidationException {
List<OrderElement> listToBeRemoved = orderElementDAO
.findWithoutParent();
for (OrderElement orderElement : listToBeRemoved) {
if (!(orderElement instanceof Order)) {
try {
orderElementDAO.remove(orderElement.getId());
} catch (InstanceNotFoundException e) {
throw new ValidationException(_(""
+ "It not could remove the order element "
+ orderElement.getName()));
}
}
}
}
private void reattachCriterions() {
@ -324,8 +340,8 @@ public class OrderModel implements IOrderModel {
} else {
OrderLine line = (OrderLine) order;
if (line.getHoursGroups().isEmpty())
throw new IllegalArgumentException(
_("The line must have at least one {0} associated",
throw new IllegalArgumentException(_(
"The line must have at least one {0} associated",
HoursGroup.class.getSimpleName()));
return line.getHoursGroups().size() > 1 ? convertToTaskGroup(line)
: convertToTask(line);