From ca57ad2b2d258da8659a716fe58276c5f6757464 Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Fri, 9 Jul 2010 11:52:37 +0200
Subject: [PATCH]  ItEr60S04ValidacionEProbasFuncionaisItEr59S04 : Fixing bug
 in the type of work hours class.

adds the checkConstraintUniqueName method to check if the name is unique.
---
 .../daos/ITypeOfWorkHoursDAO.java             |  6 ++++
 .../daos/TypeOfWorkHoursDAO.java              | 23 +++++++++++++
 .../entities/TypeOfWorkHours.java             | 24 ++++++++++++++
 .../rest-clients/type-work-hours-sample.xml   | 33 +++++++++++++++----
 4 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/ITypeOfWorkHoursDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/ITypeOfWorkHoursDAO.java
index fc6ddff69..ddd5a95ed 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/ITypeOfWorkHoursDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/ITypeOfWorkHoursDAO.java
@@ -46,4 +46,10 @@ public interface ITypeOfWorkHoursDAO extends
 
     TypeOfWorkHours findUniqueByCodeInAnotherTransaction(String code)
             throws InstanceNotFoundException;
+
+    TypeOfWorkHours findUniqueByNameInAnotherTransaction(String name)
+            throws InstanceNotFoundException;
+
+    TypeOfWorkHours findUniqueByName(String name)
+            throws InstanceNotFoundException;
 }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/TypeOfWorkHoursDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/TypeOfWorkHoursDAO.java
index c3c1ecd26..002335882 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/TypeOfWorkHoursDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/TypeOfWorkHoursDAO.java
@@ -102,4 +102,27 @@ public class TypeOfWorkHoursDAO extends IntegrationEntityDAO<TypeOfWorkHours>
             throws InstanceNotFoundException {
         return findUniqueByCode(code);
     }
+
+    @Override
+    @Transactional(readOnly = true, propagation = Propagation.REQUIRES_NEW)
+    public TypeOfWorkHours findUniqueByNameInAnotherTransaction(String name)
+            throws InstanceNotFoundException {
+        return findUniqueByName(name);
+    }
+
+    @Override
+    public TypeOfWorkHours findUniqueByName(String name)
+            throws InstanceNotFoundException {
+
+        Criteria c = getSession().createCriteria(TypeOfWorkHours.class);
+        c.add(Restrictions.eq("name", name.trim()).ignoreCase());
+
+        TypeOfWorkHours found = (TypeOfWorkHours) c.uniqueResult();
+        if (found == null) {
+            throw new InstanceNotFoundException(name, TypeOfWorkHours.class
+                    .getName());
+        }
+        return found;
+    }
+
 }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/TypeOfWorkHours.java b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/TypeOfWorkHours.java
index c1bd42561..e27ee5e8d 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/TypeOfWorkHours.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/TypeOfWorkHours.java
@@ -23,9 +23,11 @@ package org.navalplanner.business.costcategories.entities;
 import java.math.BigDecimal;
 
 import org.apache.commons.lang.StringUtils;
+import org.hibernate.validator.AssertTrue;
 import org.hibernate.validator.NotEmpty;
 import org.navalplanner.business.common.IntegrationEntity;
 import org.navalplanner.business.common.Registry;
+import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
 import org.navalplanner.business.costcategories.daos.ITypeOfWorkHoursDAO;
 
 /**
@@ -124,4 +126,26 @@ public class TypeOfWorkHours extends IntegrationEntity {
     protected ITypeOfWorkHoursDAO getIntegrationEntityDAO() {
         return Registry.getTypeOfWorkHoursDAO();
     }
+
+    @AssertTrue(message = "the type of work hours name has to be unique. It is already used")
+    public boolean checkConstraintUniqueName() {
+
+        if (StringUtils.isBlank(name)) {
+            return true;
+        }
+
+        try {
+        /* Check the constraint. */
+            TypeOfWorkHours type = Registry.getTypeOfWorkHoursDAO()
+                    .findUniqueByNameInAnotherTransaction(name);
+            if (isNewObject()) {
+                return false;
+            } else {
+                return type.getId().equals(getId());
+            }
+        } catch (InstanceNotFoundException e) {
+            return true;
+        }
+    }
+
 }
diff --git a/scripts/rest-clients/type-work-hours-sample.xml b/scripts/rest-clients/type-work-hours-sample.xml
index 431965275..f066575a3 100644
--- a/scripts/rest-clients/type-work-hours-sample.xml
+++ b/scripts/rest-clients/type-work-hours-sample.xml
@@ -1,9 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <type-work-hours-list xmlns="http://rest.ws.navalplanner.org">
-  <type-work-hours enabled="true" defaultPrice="8.00" name="Hora Extra"
-  code="code-E" />
-  <type-work-hours enabled="false" defaultPrice="5.00" name="Normal"
-  code="code-N" />
-  <type-work-hours enabled="true" defaultPrice="9.50"
-  name="Plus Nocturnidad" code="code-P" />
+<!-- Ok-->
+  <type-work-hours enabled="true" defaultPrice="8.00" name="Hora Extra" code="t1" />
+
+<!-- Ok-->
+  <type-work-hours enabled="false" defaultPrice="5.00" name="Normal" code="t2" />
+
+<!-- Ok-->
+  <type-work-hours enabled="true" defaultPrice="9.50" name="Plus Nocturnidad" code="t3" />
+
+<!-- [ without enabled property ] Ok -->
+  <type-work-hours defaultPrice="9.50" name="t4-name" code="t4" />
+
+<!-- [ without defaultPrice property ] Ok -->
+<type-work-hours enabled="true" name="t5-name" code="t5" />
+
+<!-- [ without name property ] -->
+  <type-work-hours enabled="true" defaultPrice="9.50" code="t6" />
+
+<!-- [ without code property ] -->
+<type-work-hours enabled="true" defaultPrice="9.50" name="t7-name"  />
+
+<!-- [ with a repeated name ] -->
+  <type-work-hours enabled="true" defaultPrice="9.50" name="Normal" code="t8" />
+
+<!-- [ with a repeated code ] OK updated -->
+<type-work-hours enabled="true" defaultPrice="9.50" name="t9-name" code="t1" />
+
 </type-work-hours-list>