Merge pull request #276 from MicroFocus/domelian_defect_1847115

defect #1847115: return unavailable status in case didn't find job
MicroFocus · Jun 9, 2022 · 097135a · 097135a
2 parents 65326d3 + eadb7ff
commit 097135a
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/src/main/java/com/microfocus/application/automation/tools/octane/CIJenkinsServicesImpl.java b/src/main/java/com/microfocus/application/automation/tools/octane/CIJenkinsServicesImpl.java
@@ -51,6 +51,8 @@
 import com.hp.octane.integrations.dto.scm.Branch;
 import com.hp.octane.integrations.dto.securityscans.FodServerConfiguration;
 import com.hp.octane.integrations.dto.securityscans.SSCProjectConfiguration;
+import com.hp.octane.integrations.dto.snapshots.CIBuildResult;
+import com.hp.octane.integrations.dto.snapshots.CIBuildStatus;
 import com.hp.octane.integrations.exceptions.ConfigurationException;
 import com.hp.octane.integrations.exceptions.PermissionException;
 import com.hp.octane.integrations.services.configurationparameters.FortifySSCTokenParameter;
@@ -354,8 +356,12 @@ public CIBuildStatusInfo getJobBuildStatus(String jobCiId, String parameterName,
             if (!hasRead) {
                 throw new PermissionException("Missing READ permission to job " + jobCiId,  HttpStatus.SC_FORBIDDEN);
             }
-            AbstractProjectProcessor jobProcessor = JobProcessorFactory.getFlowProcessor(job);
-            return jobProcessor.getBuildStatus(parameterName, parameterValue);
+            if(job == null) {
+                return getUnavailableJobStatus(jobCiId, parameterName, parameterValue);
+            } else {
+                AbstractProjectProcessor jobProcessor = JobProcessorFactory.getFlowProcessor(job);
+                return jobProcessor.getBuildStatus(parameterName, parameterValue);
+            }
         } finally {
             stopImpersonation(securityContext);
         }
@@ -670,6 +676,15 @@ private PipelineNode createPipelineNodeFromJobName(String name) {
                 .setName(name);
     }
 
+    private CIBuildStatusInfo getUnavailableJobStatus(String ciJobId, String paramName, String paramValue) {
+        return DTOFactory.getInstance().newDTO(CIBuildStatusInfo.class)
+                .setBuildStatus(CIBuildStatus.UNAVAILABLE)
+                .setJobCiId(ciJobId)
+                .setParamName(paramName)
+                .setParamValue(paramValue)
+                .setResult(CIBuildResult.UNAVAILABLE);
+    }
+
     private void addParametersAndDefaultBranchFromConfig(Item item, PipelineNode result) {
         String defaultBranchesConfig = config != null ? config.getDefaultBranches() : null;
         if(defaultBranchesConfig != null && !defaultBranchesConfig.isEmpty()) {