Merge pull request #72 from imonteroperez/ui-creation-config

Manual creation of Jira issues should use global config only

Author: imonteroperez

src/main/java/org/jenkinsci/plugins/JiraTestResultReporter/JiraIssueTrigger.java

@@ -0,0 +1,9 @@
+package org.jenkinsci.plugins.JiraTestResultReporter;
+
+/**
+ * Represents what triggered the request for a Jira issue creation
+ * @author imontero
+ */
+public enum JiraIssueTrigger {
+    JOB, UI
+}

src/main/java/org/jenkinsci/plugins/JiraTestResultReporter/JiraTestAction.java

@@ -247,7 +247,7 @@ public String getDisplayName() {
     @JavaScriptMethod
     public FormValidation createIssue() {
         try {
-            String id = JiraUtils.createIssue(job, project, testData.getEnvVars(), test);
+            String id = JiraUtils.createIssue(job, project, testData.getEnvVars(), test, JiraIssueTrigger.UI);
             return StringUtils.isBlank(id) ? FormValidation.error("Duplicate already exists") : setIssueKey(id);  
         } catch (RestClientException e) {
             JiraUtils.logError("Error when creating issue", e);

src/main/java/org/jenkinsci/plugins/JiraTestResultReporter/JiraTestDataPublisher.java

@@ -275,7 +275,7 @@ private boolean raiseIssues(TaskListener listener, Job project, Job job,
             for(CaseResult test : testCaseResults) {
                 if(test.isFailed()) {
                     try {
-                        JiraUtils.createIssue(job, project, envVars, test);
+                        JiraUtils.createIssue(job, project, envVars, test, JiraIssueTrigger.JOB);
                         raised = true;
                     } catch (RestClientException e) {
                         listener.error("Could not create issue for test " + test.getFullDisplayName() + "\n");
@@ -667,4 +667,4 @@ public List getListDescriptors() {
             return Jenkins.getInstance().getDescriptorList(AbstractFields.class);
         }
     }
-}
+}

src/main/java/org/jenkinsci/plugins/JiraTestResultReporter/JiraUtils.java

@@ -109,16 +109,16 @@ public static String getErrorMessage(RestClientException e, String newLine) {
     }
 
     public static String createIssue(Job job, EnvVars envVars, CaseResult test) throws RestClientException {
-        return createIssue(job, job, envVars, test);
+        return createIssue(job, job, envVars, test, JiraIssueTrigger.JOB);
     }
 
-    public static String createIssue(Job job, Job project, EnvVars envVars, CaseResult test) throws RestClientException {
+    public static String createIssue(Job job, Job project, EnvVars envVars, CaseResult test, JiraIssueTrigger trigger) throws RestClientException {
         synchronized (test.getId()) { //avoid creating duplicated issues
             if(TestToIssueMapping.getInstance().getTestIssueKey(job, test.getId()) != null) {
                 return null;
             }
 
-            IssueInput issueInput = JiraUtils.createIssueInput(project, test, envVars);
+            IssueInput issueInput = JiraUtils.createIssueInput(project, test, envVars, trigger);
             SearchResult searchResult = JiraUtils.findIssues(project, test, envVars, issueInput);
             if (searchResult != null && searchResult.getTotal() > 0) {
                 boolean duplicate = false;
@@ -159,7 +159,7 @@ public static Set<String> searchIssueKeys(Job job, EnvVars envVars, CaseResult t
                 return issueKeys;
             }
 
-            IssueInput issueInput = JiraUtils.createIssueInput(job, test, envVars);
+            IssueInput issueInput = JiraUtils.createIssueInput(job, test, envVars, JiraIssueTrigger.JOB);
             SearchResult searchResult = JiraUtils.findIssues(job, test, envVars, issueInput);
             if (searchResult != null && searchResult.getTotal() > 0) {
                 for (Issue issue: searchResult.getIssues()) {
@@ -170,16 +170,19 @@ public static Set<String> searchIssueKeys(Job job, EnvVars envVars, CaseResult t
         }
     }
 
-    private static IssueInput createIssueInput(Job project, TestResult test, EnvVars envVars) {
+    private static IssueInput createIssueInput(Job project, TestResult test, EnvVars envVars, JiraIssueTrigger trigger) {
         final IssueInputBuilder newIssueBuilder = new IssueInputBuilder(
                 JobConfigMapping.getInstance().getProjectKey(project),
                 JobConfigMapping.getInstance().getIssueType(project));
-        //first use the templates and then override them if other configs exist
+        //first use the templates and then override them if other configs exist and it is requested from a job execution (not UI badge)
         for(AbstractFields f : JiraTestDataPublisher.JiraTestDataPublisherDescriptor.templates) {
             newIssueBuilder.setFieldInput(f.getFieldInput(test, envVars));
         }
-        for (AbstractFields f : JobConfigMapping.getInstance().getConfig(project)) {
-            newIssueBuilder.setFieldInput(f.getFieldInput(test, envVars));
+        
+        if (trigger.equals(JiraIssueTrigger.JOB)) {
+            for (AbstractFields f : JobConfigMapping.getInstance().getConfig(project)) {
+                newIssueBuilder.setFieldInput(f.getFieldInput(test, envVars));
+            }
         }
         return newIssueBuilder.build();
     }

src/main/java/org/jenkinsci/plugins/JiraTestResultReporter/TestToIssueMapping.java

@@ -204,7 +204,7 @@ public void removeTestToIssueMapping(Job job, String testId, String issueKey) {
         }
 
         synchronized (jobMap) {
-            if(jobMap.get(testId).equals(issueKey)) {
+            if(jobMap.get(testId) != null && jobMap.get(testId).equals(issueKey)) {
                 jobMap.remove(testId);
                 saveMap(job, jobMap);
             }