Performance improvement when inserting new execution queue.

Author: vertigo17

source/src/main/java/org/cerberus/core/servlet/crud/testexecution/CreateTestCaseExecutionQueue.java

@@ -197,6 +197,17 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
         Answer finalAnswer = new Answer(msg1);
         List<TestCaseExecutionQueue> insertedList = new ArrayList<>();
 
+        // Feed all queue entries already existing in tag contaxt.
+        executionQueueService = appContext.getBean(ITestCaseExecutionQueueService.class);
+        Map<String, TestCaseExecutionQueue> queueAlreadyInsertedInTag = new HashMap<>();
+        if (StringUtil.isNotEmptyOrNull(tag)) {
+            LOG.debug("We don't have the list of all already inserted entries. Let's get it from tag value : " + tag);
+            List<TestCaseExecutionQueue> queueFromTag = executionQueueService.convert(executionQueueService.readByTagByCriteria(tag, 0, 0, null, null, null));
+            for (TestCaseExecutionQueue tceQueue : queueFromTag) {
+                queueAlreadyInsertedInTag.put(executionQueueService.getUniqKey(tceQueue.getTest(), tceQueue.getTestCase(), tceQueue.getCountry(), tceQueue.getEnvironment()), tceQueue);
+            }
+        }
+
         for (Long myId : idList) {
 
             id = myId;
@@ -222,7 +233,6 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
                     /**
                      * All data seems cleans so we can call the services.
                      */
-                    executionQueueService = appContext.getBean(ITestCaseExecutionQueueService.class);
                     executionQueueFactory = appContext.getBean(IFactoryTestCaseExecutionQueue.class);
 
                     if (actionSave.equals("save")) {
@@ -259,14 +269,6 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
                         finalAnswer = AnswerUtil.agregateAnswer(finalAnswer, ansItem);
                         if (ansItem.isCodeEquals(MessageEventEnum.DATA_OPERATION_OK.getCode())) {
 
-                            // Feed all queue entries already existing in tag contaxt.
-                            LOG.debug("We don't have the list of all already inserted entries. Let's get it from tag value : " + tag);
-                            List<TestCaseExecutionQueue> queueFromTag = executionQueueService.convert(executionQueueService.readByTagByCriteria(tag, 0, 0, null, null, null));
-                            Map<String, TestCaseExecutionQueue> queueAlreadyInsertedInTag = new HashMap<>();
-                            for (TestCaseExecutionQueue tceQueue : queueFromTag) {
-                                queueAlreadyInsertedInTag.put(executionQueueService.getUniqKey(tceQueue.getTest(), tceQueue.getTestCase(), tceQueue.getCountry(), tceQueue.getEnvironment()), tceQueue);
-                            }
-
                             ansItem = executionQueueService.create(executionQueueData, withNewDep, id, TestCaseExecutionQueue.State.QUEUED, queueAlreadyInsertedInTag);
                             TestCaseExecutionQueue addedExecution = (TestCaseExecutionQueue) ansItem.getItem();
                             insertedList.add(addedExecution);

source/src/main/webapp/js/pages/TestCaseExecution.js

@@ -512,7 +512,7 @@ function updatePage(data, steps) {
         $("#rerunFromQueueandSee").attr("disabled", false);
         $("#rerunFromQueueandSee").unbind("click");
         $("#rerunFromQueueandSee").click(function () {
-            triggerTestCaseExecutionQueueandSee(data.queueId);
+            triggerTestCaseExecutionQueueandSee(data.queueId, data.tag);
         });
     }
 
@@ -1479,15 +1479,16 @@ function createVideo(videos) {
 
 }
 
-function triggerTestCaseExecutionQueueandSee(queueId) {
+function triggerTestCaseExecutionQueueandSee(queueId, tag) {
     $.ajax({
         url: "CreateTestCaseExecutionQueue",
         async: true,
         method: "POST",
         data: {
             id: queueId,
             actionState: "toQUEUED",
-            actionSave: "save"
+            actionSave: "save",
+            tag: tag
         },
         success: function (data) {
             if (getAlertType(data.messageType) === "success") {