From a8e57499afcfa1bf1a1e6c759bd84a64294e9cd4 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Fri, 2 Nov 2012 17:16:26 +0100
Subject: [PATCH] Use code instead of id for ResourceHoursService

Using code from now on in order to make it coherent with the rest of services.

FEA: ItEr77S04BugFixing
---
 .../business/resources/daos/IWorkerDAO.java      |  2 +-
 .../business/resources/daos/WorkerDAO.java       | 16 ++++++++--------
 .../resources/impl/ResourceHoursServiceREST.java |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/daos/IWorkerDAO.java b/libreplan-business/src/main/java/org/libreplan/business/resources/daos/IWorkerDAO.java
index 67ac2b10e..b75034983 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/resources/daos/IWorkerDAO.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/resources/daos/IWorkerDAO.java
@@ -111,7 +111,7 @@ public interface IWorkerDAO extends IIntegrationEntityDAO<Worker> {
     List<Worker> findByFirstNameSecondNameAndNifAnotherTransaction(
             String firstname, String surname, String nif);
 
-    List<Object[]> getWorkingHoursGroupedPerWorker(List<String> workerNifs,
+    List<Object[]> getWorkingHoursGroupedPerWorker(List<String> workerCodes,
             Date startingDate, Date endingDate);
 
     Worker findByNifAnotherTransaction(String nif)
diff --git a/libreplan-business/src/main/java/org/libreplan/business/resources/daos/WorkerDAO.java b/libreplan-business/src/main/java/org/libreplan/business/resources/daos/WorkerDAO.java
index 92079d838..9c52c4645 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/resources/daos/WorkerDAO.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/resources/daos/WorkerDAO.java
@@ -147,8 +147,8 @@ public class WorkerDAO extends IntegrationEntityDAO<Worker>
     @Override
     @Transactional(readOnly = true)
     public List<Object[]> getWorkingHoursGroupedPerWorker(
-            List<String> workerNifs, Date startingDate, Date endingDate) {
-        String strQuery = "SELECT worker.nif, SUM(wrl.effort) "
+            List<String> workerCodes, Date startingDate, Date endingDate) {
+        String strQuery = "SELECT worker.code, SUM(wrl.effort) "
                 + "FROM Worker worker, WorkReportLine wrl "
                 + "LEFT OUTER JOIN wrl.resource resource "
                 + "WHERE resource.id = worker.id ";
@@ -165,15 +165,15 @@ public class WorkerDAO extends IntegrationEntityDAO<Worker>
         }
 
         // Set workers
-        if (workerNifs != null && !workerNifs.isEmpty()) {
-            strQuery += "AND worker.nif IN (:workerNifs) ";
+        if (workerCodes != null && !workerCodes.isEmpty()) {
+            strQuery += "AND worker.code IN (:workerCodes) ";
         }
 
         // Group by
-        strQuery += "GROUP BY worker.nif ";
+        strQuery += "GROUP BY worker.code ";
 
         // Order by
-        strQuery += "ORDER BY worker.nif";
+        strQuery += "ORDER BY worker.code";
 
         // Set parameters
         Query query = getSession().createQuery(strQuery);
@@ -183,8 +183,8 @@ public class WorkerDAO extends IntegrationEntityDAO<Worker>
         if (endingDate != null) {
             query.setParameter("endingDate", endingDate);
         }
-        if (workerNifs != null && !workerNifs.isEmpty()) {
-            query.setParameterList("workerNifs", workerNifs);
+        if (workerCodes != null && !workerCodes.isEmpty()) {
+            query.setParameterList("workerCodes", workerCodes);
         }
 
         // Get result
diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceHoursServiceREST.java b/libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceHoursServiceREST.java
index 3f4a634cd..8d67aebdd 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceHoursServiceREST.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/ws/resources/impl/ResourceHoursServiceREST.java
@@ -87,13 +87,13 @@ public class ResourceHoursServiceREST implements IResourceHoursService {
             throw new RuntimeException(e);
         }
 
-        List<String> workerNifs = null;
+        List<String> workerCodes = null;
         if (resourceCode != null) {
-            workerNifs = Arrays.asList(resourceCode);
+            workerCodes = Arrays.asList(resourceCode);
         }
 
         List<Object[]> hoursPerWorker = workerDAO
-                .getWorkingHoursGroupedPerWorker(workerNifs, startingDate,
+                .getWorkingHoursGroupedPerWorker(workerCodes, startingDate,
                         endingDate);
 
         for (Object[] pair : hoursPerWorker) {