Merge pull request #51 from aquality-automation/feature/last_results_exclude_debug

Merge branch 'master' into develop

Author: VladislavKostyukevich

CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 0.3.7 (unreleased)
+
+Features:
+  - Improve Test Run and Test List page performance -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/71)
+  - Exclude Debug results from last results column -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/70)
+
+Bugfixes:
+
 ## 0.3.6 (2020-02-24)
 
 Features:

pom.xml

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

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

@@ -13,7 +13,6 @@
 
 public class TestController extends BaseController<TestDto> {
     private TestDao testDao;
-    private ProjectDao projectDao;
     private TestSuiteDao suiteDao;
     private TestResultDao resultDao;
     private Test2SuiteController test2SuiteController;
@@ -24,7 +23,6 @@ public TestController(UserDto user) {
 
         testDao = new TestDao();
         suiteDao = new TestSuiteDao();
-        projectDao = new ProjectDao();
         resultDao = new TestResultDao();
         test2SuiteController = new Test2SuiteController(user);
         projectUserController = new ProjectUserController(user);
@@ -157,7 +155,6 @@ private List<TestDto> fillTests(List<TestDto> tests) throws AqualityException {
             List<Test2SuiteDto> test2Suites = new ArrayList<>();
             ProjectDto projectDto = new ProjectDto();
             projectDto.setId(tests.get(0).getProject_id());
-            projectDto = projectDao.getEntityById(projectDto);
 
             for (TestSuiteDto testSuite : testSuites) {
                 Test2SuiteDto test2Suite = new Test2SuiteDto();
@@ -171,10 +168,6 @@ private List<TestDto> fillTests(List<TestDto> tests) throws AqualityException {
                     test.setDeveloper(projectUsers.stream().filter(x -> x.getUser().getId().equals(test.getDeveloper_id())).findFirst().orElse(null));
                 }
 
-                if(projectDto.getStability_count() != null) {
-                    test.setLastResultColors(testDao.getLastColors(test.getId(), projectDto.getStability_count()));
-                }
-
                 List<Test2SuiteDto> testSuiteLinks = test2Suites.stream().filter(x -> x.getTest_id().equals(test.getId())).collect(Collectors.toList());
                 test.setSuites(test2SuiteController.convertToSuites(testSuiteLinks, testSuites));
                 filledTests.add(test);

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

@@ -1,15 +1,7 @@
 package main.model.db.dao.project;
 
-import com.mysql.cj.core.conf.url.ConnectionUrlParser;
-import main.exceptions.AqualityException;
 import main.model.db.dao.DAO;
-import main.model.dto.DtoMapper;
-import main.model.dto.LastResultColorsDto;
 import main.model.dto.TestDto;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.List;
 
 public class TestDao extends DAO<TestDto> {
     public TestDao() {
@@ -18,12 +10,4 @@ public TestDao() {
         insert = "{call INSERT_TEST(?,?,?,?,?,?)}";
         remove = "{call REMOVE_TEST(?)}";
     }
-
-    public LastResultColorsDto getLastColors(@NotNull Integer testId, @NotNull Integer limit) throws AqualityException {
-        DtoMapper<LastResultColorsDto> lastResultColorsMapper = new DtoMapper<>(LastResultColorsDto.class);
-        List<ConnectionUrlParser.Pair<String, String>> parameters = new ArrayList<>();
-        parameters.add(new ConnectionUrlParser.Pair<>("request_test_id", testId.toString()));
-        parameters.add(new ConnectionUrlParser.Pair<>("request_limit", limit.toString()));
-        return lastResultColorsMapper.mapObjects(CallStoredProcedure("{call SELECT_LAST_RESULT_COLORS(?,?)}", parameters).toString()).get(0);
-    }
 }

src/main/java/main/model/db/imports/BaseImporter.java

@@ -62,6 +62,7 @@ private void createResults(boolean update) throws AqualityException {
                 result.setTest(tests.get(i));
             }
 
+            result.setDebug(testRun.getDebug());
             result.setTest_id(result.getTest().getId());
             result.setTest_run_id(testRun.getId());
             result.setFinal_result_updated(result.getFinish_date());

src/main/java/main/model/dto/LastResultColorsDto.java

@@ -39,5 +39,7 @@ public class TestDto extends BaseDto {
     @DataBaseName(name="request_test_suite_id")
     @DataBaseSearchable
     private Integer test_suite_id;
-    private LastResultColorsDto lastResultColors;
+    private String resolution_colors;
+    private String result_colors;
+    private String result_ids;
 }

src/main/java/main/model/dto/TestDto.java

@@ -29,4 +29,5 @@
     <include file="db.changelog-0.3.4.xml" relativeToChangelogFile="true"/>
     <include file="db.changelog-0.3.5.xml" relativeToChangelogFile="true"/>
     <include file="db.changelog-0.3.6.xml" relativeToChangelogFile="true"/>
+    <include file="db.changelog-0.3.7.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>