From 15bbcde0c4e474a7519dfd4f9bcdc55399f2d3c0 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Wed, 30 Jan 2013 17:19:13 +0100
Subject: [PATCH] jira-integration: Use new predefined work report type in
 JiraTimesheetSynchronizer

FEA: ItEr77S16JiraAndTimConnectorContributionIntegration
---
 .../importers/JiraTimesheetSynchronizer.java  | 31 +++++++------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/importers/JiraTimesheetSynchronizer.java b/libreplan-webapp/src/main/java/org/libreplan/importers/JiraTimesheetSynchronizer.java
index 566f186fd..0f937d6da 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/importers/JiraTimesheetSynchronizer.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/importers/JiraTimesheetSynchronizer.java
@@ -39,6 +39,7 @@ import org.libreplan.business.workingday.EffortDuration;
 import org.libreplan.business.workreports.daos.IWorkReportDAO;
 import org.libreplan.business.workreports.daos.IWorkReportLineDAO;
 import org.libreplan.business.workreports.daos.IWorkReportTypeDAO;
+import org.libreplan.business.workreports.entities.PredefinedWorkReportTypes;
 import org.libreplan.business.workreports.entities.WorkReport;
 import org.libreplan.business.workreports.entities.WorkReportLine;
 import org.libreplan.business.workreports.entities.WorkReportType;
@@ -95,13 +96,7 @@ public class JiraTimesheetSynchronizer implements IJiraTimesheetSynchronizer {
     public void syncJiraTimesheetWithJiraIssues(List<Issue> issues, Order order) {
         jiraSyncInfo = new JiraSyncInfo();
 
-        workReportType = findWorkReportType("Jira-connector");
-        if (workReportType == null) {
-            jiraSyncInfo
-                    .addSyncFailedReason("Work repor type \"Jira-connector\" not found");
-            return;
-        }
-
+        workReportType = getJiraTimesheetsWorkReportType();
         typeOfWorkHours = getTypeOfWorkHours();
 
         workers = getWorkers();
@@ -268,24 +263,22 @@ public class JiraTimesheetSynchronizer implements IJiraTimesheetSynchronizer {
     }
 
     /**
-     * Searches for {@link WorkReportType} for the specified parameter
-     * <code>name</code>
+     * Returns {@link WorkReportType} for JIRA connector
      *
-     * @param name
-     *            unique name
-     * @return WorkReportType if found, null otherwise
+     * @return WorkReportType for JIRA connector
      */
-    private WorkReportType findWorkReportType(String name) {
+    private WorkReportType getJiraTimesheetsWorkReportType() {
+        WorkReportType workReportType;
         try {
-            return workReportTypeDAO.findUniqueByName(name);
+            workReportType = workReportTypeDAO
+                    .findUniqueByName(PredefinedWorkReportTypes.JIRA_TIMESHEETS
+                            .getName());
         } catch (NonUniqueResultException e) {
-            jiraSyncInfo
-                    .addSyncFailedReason("Work report type 'Jira-connector' is not unique");
+            throw new RuntimeException(e);
         } catch (InstanceNotFoundException e) {
-            jiraSyncInfo
-                    .addSyncFailedReason("Work report type 'Jira-connector' not found");
+            throw new RuntimeException(e);
         }
-        return null;
+        return workReportType;
     }
 
     /**