Merge pull request #65 from aquality-automation/feature/fix_testrun_view_performance

Feature/fix testrun view performance

Author: VladislavKostyukevich

CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 0.3.10 (unreleased)
+
+Features:
+
+Bugfixes:
+  - Test run View Page performance is bad -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/99)
+
 ## 0.3.9 (2020-04-21)
 
 Features:

pom.xml

@@ -6,7 +6,7 @@
     <groupId>unifi_reporting_api</groupId>
     <artifactId>api</artifactId>
     <packaging>war</packaging>
-    <version>0.3.9</version>
+    <version>0.3.10</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/main/controllers/Project/ResultController.java

@@ -108,28 +108,31 @@ private void createPendingStepResults(TestResultDto template) throws AqualityExc
     private List<TestResultDto> fillResults(List<TestResultDto> results) throws AqualityException {
 
         if (results.size() > 0) {
+            int projectId = results.get(0).getProject_id();
             List<FinalResultDto> finalResults = finalResultController.get(new FinalResultDto());
             IssueDto issueDto = new IssueDto();
-            issueDto.setProject_id(results.get(0).getProject_id());
+            issueDto.setProject_id(projectId);
             List<IssueDto> issues = issueController.get(issueDto);
 
             TestDto testTemplate = new TestDto();
-            testTemplate.setProject_id(results.get(0).getProject_id());
+            testTemplate.setProject_id(projectId);
             List<TestDto> tests = testController.get(testTemplate);
 
             ProjectUserDto projectUserDto = new ProjectUserDto();
-            projectUserDto.setProject_id(results.get(0).getProject_id());
+            projectUserDto.setProject_id(projectId);
+
+            boolean isStepsEnabled = projectController.isStepsEnabled(projectId);
 
             for (TestResultDto result : results) {
-                fillResult(result, finalResults, tests, issues);
+                fillResult(result, finalResults, tests, issues, isStepsEnabled);
             }
         }
 
         return results;
     }
 
-    private void fillResult(TestResultDto result, List<FinalResultDto> finalResults, List<TestDto> tests, List<IssueDto> issues) throws AqualityException {
-        if (projectController.isStepsEnabled(result.getProject_id())) {
+    private void fillResult(TestResultDto result, List<FinalResultDto> finalResults, List<TestDto> tests, List<IssueDto> issues, boolean isStepsEnabled) throws AqualityException {
+        if (isStepsEnabled) {
             fillResultSteps(result);
         }
 

src/main/java/main/controllers/Project/TestController.java

@@ -13,11 +13,11 @@
 import java.util.stream.Collectors;
 
 public class TestController extends BaseController<TestDto> {
-    private TestDao testDao;
-    private TestSuiteDao suiteDao;
-    private TestResultDao resultDao;
-    private Test2SuiteController test2SuiteController;
-    private ProjectUserController projectUserController;
+    private final TestDao testDao;
+    private final TestSuiteDao suiteDao;
+    private final TestResultDao resultDao;
+    private final Test2SuiteController test2SuiteController;
+    private final ProjectUserController projectUserController;
 
     public TestController(UserDto user) {
         super(user);
@@ -54,10 +54,8 @@ public TestDto createOrUpdate(TestDto test) throws AqualityException {
         if(existingTests.size() > 0) {
             TestDto existingTest = existingTests.get(0);
             if(existingTest.getSuites() != null) {
-                TestSuiteDto testSuite = existingTest.getSuites().stream().filter(suite -> suite.getId().equals(test.getSuites().get(0).getId())).findFirst().orElse(null);
-                if(testSuite != null) {
-                    existingTest.getSuites().add(test.getSuites().get(0));
-                }
+                existingTest.getSuites().stream()
+                        .filter(suite -> suite.getId().equals(test.getSuites().get(0).getId())).findFirst().ifPresent(testSuite -> existingTest.getSuites().add(test.getSuites().get(0)));
             }else {
                 existingTest.setSuites(test.getSuites());
             }
@@ -98,12 +96,12 @@ public boolean delete(TestDto template) throws AqualityException {
         }
     }
 
-    public boolean updateMultipleTests(List<TestDto> entities) throws AqualityException {
+    public void updateMultipleTests(List<TestDto> entities) throws AqualityException {
         if (entities.size() > 0 && (baseUser.isManager() || baseUser.getProjectUser(entities.get(0).getProject_id()).isEditor())) {
             for (TestDto test : entities) {
                 updateSuites(test);
             }
-            return testDao.updateMultiply(entities);
+            testDao.updateMultiply(entities);
         } else {
             throw new AqualityPermissionsException("Account is not allowed to update Test ", baseUser);
         }
@@ -162,16 +160,12 @@ private List<TestDto> fillTests(List<TestDto> tests) throws AqualityException {
             TestSuiteDto testSuiteDto = new TestSuiteDto();
             testSuiteDto.setProject_id(projectId);
             List<TestSuiteDto> testSuites = suiteDao.searchAll(testSuiteDto);
-            List<Test2SuiteDto> test2Suites = new ArrayList<>();
             ProjectDto projectDto = new ProjectDto();
             projectDto.setId(tests.get(0).getProject_id());
 
-            for (TestSuiteDto testSuite : testSuites) {
-                Test2SuiteDto test2Suite = new Test2SuiteDto();
-                test2Suite.setSuite_id(testSuite.getId());
-                test2Suites.addAll(test2SuiteController.get(test2Suite));
-            }
-
+            Test2SuiteDto test2Suite = new Test2SuiteDto();
+            test2Suite.setProject_id(projectId);
+            List<Test2SuiteDto> test2Suites = test2SuiteController.get(test2Suite);
 
             for (TestDto test : tests) {
                 if (test.getDeveloper_id() != null) {
@@ -192,7 +186,8 @@ private void updateSuites(TestDto test) throws AqualityException {
         test2SuiteDto.setTest_id(test.getId());
         List<Test2SuiteDto> oldSuites = test2SuiteController.get(test2SuiteDto);
         if (test.getSuites() != null && test.getSuites().size() > 0) {
-            for (TestSuiteDto newSuite : test.getSuites()) {
+            List<TestSuiteDto> suites = test.getSuites();
+            for (TestSuiteDto newSuite : suites) {
                 Test2SuiteDto alreadyExists = oldSuites.stream().filter(x -> Objects.equals(x.getSuite_id(), newSuite.getId())).findAny().orElse(null);
                 if (alreadyExists != null) {
                     oldSuites.removeIf(x -> Objects.equals(x.getSuite_id(), alreadyExists.getSuite_id()));

src/main/java/main/model/db/dao/project/Test2SuiteDao.java

@@ -6,7 +6,7 @@
 public class Test2SuiteDao extends DAO<Test2SuiteDto> {
     public Test2SuiteDao() {
         super(Test2SuiteDto.class);
-        select = "{call SELECT_TEST_SUITES(?,?)}";
+        select = "{call SELECT_TEST_SUITES(?,?,?)}";
         insert = "{call INSERT_TEST_TO_SUITE(?,?)}";
         remove = "{call REMOVE_TEST_FROM_SUITE(?,?)}";
     }

src/main/java/main/model/dto/project/Test2SuiteDto.java

@@ -17,4 +17,7 @@ public class Test2SuiteDto extends BaseDto {
     @DataBaseInsert
     @DataBaseSearchable
     private Integer suite_id;
+    @DataBaseName(name="request_project_id")
+    @DataBaseSearchable
+    private Integer project_id;
 }

src/main/resources/db_changelog/changelog.xml

@@ -32,4 +32,5 @@
     <include file="db.changelog-0.3.7.xml" relativeToChangelogFile="true"/>
     <include file="db.changelog-0.3.8.xml" relativeToChangelogFile="true"/>
     <include file="db.changelog-0.3.9.xml" relativeToChangelogFile="true"/>
+    <include file="db.changelog-0.3.10.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

src/main/resources/db_changelog/db.changelog-0.3.10.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
+
+    <changeSet id="Update SELECT_TEST_SUITES add project_id" author="v.kostyukevich">
+        <sql endDelimiter="#">
+
+            DROP procedure IF EXISTS `SELECT_TEST_SUITES`;
+
+            #
+            CREATE PROCEDURE `SELECT_TEST_SUITES`(
+            IN request_test_id VARCHAR(11),
+            IN request_suite_id VARCHAR(11),
+            IN request_project_id VARCHAR(11)
+            )
+            BEGIN
+            Select suite_tests.*, tests.project_id as project_id
+            FROM suite_tests LEFT JOIN tests on test_id = tests.id
+            where (request_test_id = '' OR test_id = request_test_id)
+            AND (request_suite_id = '' OR suite_id = request_suite_id)
+            AND (request_project_id='' OR project_id = request_project_id);
+            END
+        </sql>
+        <rollback>
+        </rollback>
+    </changeSet>
+
+</databaseChangeLog>