X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=blobdiff_plain;f=ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fakraino%2Fvalidation%2Fui%2Fservice%2FJenkinsJobNotificationService.java;fp=ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fakraino%2Fvalidation%2Fui%2Fservice%2FJenkinsJobNotificationService.java;h=429696a43b39a44929a008904823367fc7466035;hp=c2482b29b131183e6a483536e794706e9a331de8;hb=2eba847ebb6acb2686be08eb1cdafc1b12071e7d;hpb=f86b9715d156238532fcb0bf464bd72e9cf7ce96

diff --git a/ui/src/main/java/org/akraino/validation/ui/service/JenkinsJobNotificationService.java b/ui/src/main/java/org/akraino/validation/ui/service/JenkinsJobNotificationService.java
index c2482b2..429696a 100644
--- a/ui/src/main/java/org/akraino/validation/ui/service/JenkinsJobNotificationService.java
+++ b/ui/src/main/java/org/akraino/validation/ui/service/JenkinsJobNotificationService.java
@@ -15,12 +15,16 @@
  */
 package org.akraino.validation.ui.service;
 
-import org.akraino.validation.ui.conf.UiUtils;
-import org.akraino.validation.ui.data.BlueprintLayer;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.akraino.validation.ui.client.nexus.resources.ValidationNexusTestResult;
+import org.akraino.validation.ui.dao.ValidationTestResultDAO;
 import org.akraino.validation.ui.data.JnksJobNotify;
 import org.akraino.validation.ui.data.SubmissionStatus;
 import org.akraino.validation.ui.entity.LabSilo;
 import org.akraino.validation.ui.entity.Submission;
+import org.akraino.validation.ui.entity.ValidationDbTestResult;
 import org.akraino.validation.ui.service.utils.SubmissionHelper;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,11 +41,20 @@ public class JenkinsJobNotificationService {
     private SubmissionHelper submissionHelper;
 
     @Autowired
-    private SubmissionService submissionService;
+    private DbSubmissionAdapter submissionService;
 
     @Autowired
     private SiloService siloService;
 
+    @Autowired
+    private DbResultAdapter dbAdapter;
+
+    @Autowired
+    private IntegratedResultService iService;
+
+    @Autowired
+    private ValidationTestResultDAO vTestResultDAO;
+
     public void handle(JnksJobNotify jnksJobNotify) throws Exception {
         String jenkinsJobName = System.getenv("JENKINS_JOB_NAME");
         if (!jenkinsJobName.equals(jnksJobNotify.getName())) {
@@ -59,20 +72,24 @@ public class JenkinsJobNotificationService {
             }
         }
         if (siloText == null) {
-            throw new Exception("Could not retrieve silo of the selected lab : "
+            throw new IllegalArgumentException("Could not retrieve silo of the selected lab : "
                     + submission.getTimeslot().getLab().getLab().toString());
         }
-
-        String nexusUrl = UiUtils.NEXUS_URL + "/" + siloText + "/job/" + System.getenv("JENKINS_JOB_NAME") + "/"
-                + String.valueOf(jnksJobNotify.getbuildNumber() + "/results");
-        if (!submission.getBlueprintInstanceForValidation().getLayer().equals(BlueprintLayer.All)) {
-            nexusUrl = nexusUrl + "/" + submission.getBlueprintInstanceForValidation().getLayer().name().toLowerCase();
-        }
-        submission.setNexusResultUrl(nexusUrl);
         LOGGER.info(EELFLoggerDelegate.applicationLogger,
                 "Updating submission with id: " + submission.getSubmissionId());
         submission.setSubmissionStatus(SubmissionStatus.Completed);
         submissionHelper.saveSubmission(submission);
+        ValidationDbTestResult vDbResult = vTestResultDAO.getValidationTestResult(submission);
+        if (vDbResult != null) {
+            ValidationNexusTestResult vNexusResult = iService.getResult(vDbResult.getBlueprintName(),
+                    vDbResult.getVersion(), vDbResult.getLab().getLab(), jnksJobNotify.getTimestamp());
+            if (vNexusResult != null) {
+                List<ValidationNexusTestResult> vNexusResults = new ArrayList<ValidationNexusTestResult>();
+                vNexusResults.add(vNexusResult);
+                dbAdapter.storeResultInDb(vNexusResults);
+            }
+        }
+        dbAdapter.updateTimestamp(jnksJobNotify);
     }
 
 }