Merge pull request #14 from aquality-automation/feature/REPPORTQA-1043

VladislavKostyukevich · web-flow · commit 2e1bfcc228ce · 2019-08-27T12:40:38.000+03:00
Feature/repportqa 1043
diff --git a/src/main/java/main/controllers/Project/ResultController.java b/src/main/java/main/controllers/Project/ResultController.java
@@ -37,19 +37,18 @@ public TestResultDto create(TestResultDto template) throws AqualityException {
         }
     }
 
-    public List<TestResultDto> get(TestResultDto template, Integer limit) throws AqualityException {
+    @Override
+    public List<TestResultDto> get(TestResultDto template) throws AqualityException {
         if(baseUser.isFromGlobalManagement() || baseUser.getProjectUser(template.getProject_id()).isViewer()){
-            template.setLimit(limit);
+            if(template.getLimit() == null){
+                template.setLimit(0);
+            }
             return fillResults(testResultDao.searchAll(template));
         }else{
             throw new AqualityPermissionsException("Account is not allowed to view Test Results", baseUser);
         }
     }
 
-    @Override
-    public List<TestResultDto> get(TestResultDto template) throws AqualityException {
-        return get(template, 0);
-    }
 
     @Override
     public boolean delete(TestResultDto template) throws AqualityException {
diff --git a/src/main/java/main/controllers/Project/TestRunController.java b/src/main/java/main/controllers/Project/TestRunController.java
@@ -110,7 +110,7 @@ private List<TestRunDto> fillTestRunResults(List<TestRunDto> testRuns) throws Aq
             TestResultDto testResultTemplate = new TestResultDto();
             testResultTemplate.setTest_run_id(testRun.getId());
             testResultTemplate.setProject_id(testRun.getProject_id());
-            List<TestResultDto> results = resultController.get(testResultTemplate, 10000);
+            List<TestResultDto> results = resultController.get(testResultTemplate);
             testRun.setTestResults(results);
         }
         return testRuns;
diff --git a/src/main/java/main/model/db/dao/project/TestResultDao.java b/src/main/java/main/model/db/dao/project/TestResultDao.java
@@ -6,7 +6,7 @@
 public class TestResultDao extends DAO<TestResultDto> {
     public TestResultDao() {
         super(TestResultDto.class);
-        select = "{call SELECT_TEST_RESULT(?,?,?,?,?,?,?,?,?)}";
+        select = "{call SELECT_TEST_RESULT(?,?,?,?,?,?,?,?,?,?)}";
         insert = "{call INSERT_TEST_RESULT(?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";
         remove = "{call REMOVE_TEST_RESULT(?)}";
     }
diff --git a/src/main/java/main/model/dto/TestResultDto.java b/src/main/java/main/model/dto/TestResultDto.java
@@ -75,4 +75,7 @@ public class TestResultDto extends BaseDto {
     @DataBaseSearchable
     private Integer limit;
     private Integer pending;
+    @DataBaseName(name="request_fail_reason_regex")
+    @DataBaseSearchable
+    private String fail_reason_regex;
 }
diff --git a/src/main/java/main/view/Project/TestResult.java b/src/main/java/main/view/Project/TestResult.java
@@ -43,7 +43,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp){
             Session session = createSession(req);
             TestResultDto testResultTemplate = new TestResultDto();
             testResultTemplate.getSearchTemplateFromRequestParameters(req);
-            List<TestResultDto> testResults = session.controllerFactory.getHandler(testResultTemplate).get(testResultTemplate, 100000);
+            List<TestResultDto> testResults = session.controllerFactory.getHandler(testResultTemplate).get(testResultTemplate);
             setJSONContentType(resp);
             resp.getWriter().write(mapper.serialize(testResults));
         }catch (Exception e) {
diff --git a/src/main/resources/db_changelog/db.changelog-0.3.1.xml b/src/main/resources/db_changelog/db.changelog-0.3.1.xml
@@ -238,4 +238,84 @@
             END
         </rollback>
     </changeSet>
+
+    <changeSet id="start_date_idx for test results" author="v.kostyukevich">
+        <sql>
+            ALTER TABLE `test_results`
+            ADD INDEX `start_date_idx` (`start_date` ASC);
+        </sql>
+    </changeSet>
+
+    <changeSet id="add regex search for fail reason" author="v.kostyukevich">
+        <sql endDelimiter="#">
+            DROP procedure IF EXISTS `SELECT_TEST_RESULT`;
+
+            #
+
+            CREATE PROCEDURE `SELECT_TEST_RESULT`(
+            IN request_project_id VARCHAR(10),
+            IN request_id VARCHAR(10),
+            IN request_test_id VARCHAR(10),
+            IN request_final_result_id VARCHAR(10),
+            IN request_test_run_id VARCHAR(10),
+            IN request_test_resolution_id VARCHAR(10),
+            IN request_debug VARCHAR(1),
+            IN request_fail_reason VARCHAR(150),
+            IN request_fail_reason_regex VARCHAR(500),
+            In request_limit INT(10)
+            )
+            BEGIN
+            IF(request_fail_reason_regex = '') THEN SET request_fail_reason_regex = '.*';
+            END IF;
+
+            SELECT * FROM test_results as res
+            WHERE (
+            request_id = '' OR id=request_id)
+            AND (request_project_id = '' OR project_id = request_project_id)
+            AND (request_test_id = '' OR test_id=request_test_id)
+            AND (request_final_result_id = '' OR final_result_id=request_final_result_id)
+            AND (request_test_run_id = '' OR test_run_id=request_test_run_id)
+            AND (request_test_resolution_id = '' OR test_resolution_id=request_test_resolution_id)
+            AND (request_debug = '' OR debug=request_debug)
+            AND (request_fail_reason = '' OR INSTR(fail_reason, request_fail_reason) > 0)
+            AND IFNULL(fail_reason, '') REGEXP request_fail_reason_regex
+            ORDER BY start_date DESC
+            LIMIT request_limit
+            ;
+            END
+        </sql>
+        <rollback>
+            DROP procedure IF EXISTS `SELECT_TEST_RESULT`;
+
+            #
+
+            CREATE PROCEDURE `SELECT_TEST_RESULT`(
+            IN request_project_id VARCHAR(10),
+            IN request_id VARCHAR(10),
+            IN request_test_id VARCHAR(10),
+            IN request_final_result_id VARCHAR(10),
+            IN request_test_run_id VARCHAR(10),
+            IN request_test_resolution_id VARCHAR(10),
+            IN request_debug VARCHAR(1),
+            IN request_fail_reason VARCHAR(150),
+            In request_limit INT(10)
+            )
+            BEGIN
+
+            SELECT * FROM test_results as res
+            WHERE (
+            request_id = '' OR id=request_id)
+            AND (request_project_id = '' OR project_id = request_project_id)
+            AND (request_test_id = '' OR test_id=request_test_id)
+            AND (request_final_result_id = '' OR final_result_id=request_final_result_id)
+            AND (request_test_run_id = '' OR test_run_id=request_test_run_id)
+            AND (request_test_resolution_id = '' OR test_resolution_id=request_test_resolution_id)
+            AND (request_debug = '' OR debug=request_debug)
+            AND (request_fail_reason = '' OR INSTR(fail_reason, request_fail_reason) > 0)
+            ORDER BY start_date DESC
+            LIMIT request_limit
+            ;
+            END
+        </rollback>
+    </changeSet>
 </databaseChangeLog>

Original file line number	Diff line number	Diff line change
`@@ -37,19 +37,18 @@ public TestResultDto create(TestResultDto template) throws AqualityException {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`40`		`- public List<TestResultDto> get(TestResultDto template, Integer limit) throws AqualityException {`
	`40`	`+ @Override`
	`41`	`+ public List<TestResultDto> get(TestResultDto template) throws AqualityException {`
`41`	`42`	`if(baseUser.isFromGlobalManagement() \|\| baseUser.getProjectUser(template.getProject_id()).isViewer()){`
`42`		`- template.setLimit(limit);`
	`43`	`+ if(template.getLimit() == null){`
	`44`	`+ template.setLimit(0);`
	`45`	`+ }`
`43`	`46`	`return fillResults(testResultDao.searchAll(template));`
`44`	`47`	`}else{`
`45`	`48`	`throw new AqualityPermissionsException("Account is not allowed to view Test Results", baseUser);`
`46`	`49`	`}`
`47`	`50`	`}`
`48`	`51`
`49`		`- @Override`
`50`		`- public List<TestResultDto> get(TestResultDto template) throws AqualityException {`
`51`		`- return get(template, 0);`
`52`		`- }`
`53`	`52`
`54`	`53`	`@Override`
`55`	`54`	`public boolean delete(TestResultDto template) throws AqualityException {`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ private List<TestRunDto> fillTestRunResults(List<TestRunDto> testRuns) throws Aq`
`110`	`110`	`TestResultDto testResultTemplate = new TestResultDto();`
`111`	`111`	`testResultTemplate.setTest_run_id(testRun.getId());`
`112`	`112`	`testResultTemplate.setProject_id(testRun.getProject_id());`
`113`		`- List<TestResultDto> results = resultController.get(testResultTemplate, 10000);`
	`113`	`+ List<TestResultDto> results = resultController.get(testResultTemplate);`
`114`	`114`	`testRun.setTestResults(results);`
`115`	`115`	`}`
`116`	`116`	`return testRuns;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`public class TestResultDao extends DAO<TestResultDto> {`
`7`	`7`	`public TestResultDao() {`
`8`	`8`	`super(TestResultDto.class);`
`9`		`- select = "{call SELECT_TEST_RESULT(?,?,?,?,?,?,?,?,?)}";`
	`9`	`+ select = "{call SELECT_TEST_RESULT(?,?,?,?,?,?,?,?,?,?)}";`
`10`	`10`	`insert = "{call INSERT_TEST_RESULT(?,?,?,?,?,?,?,?,?,?,?,?,?,?)}";`
`11`	`11`	`remove = "{call REMOVE_TEST_RESULT(?)}";`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,4 +75,7 @@ public class TestResultDto extends BaseDto {`
`75`	`75`	`@DataBaseSearchable`
`76`	`76`	`private Integer limit;`
`77`	`77`	`private Integer pending;`
	`78`	`+ @DataBaseName(name="request_fail_reason_regex")`
	`79`	`+ @DataBaseSearchable`
	`80`	`+ private String fail_reason_regex;`
`78`	`81`	`}`