Merge pull request #38 from aquality-automation/feature/milestone_feature

Feature/milestone feature

Author: VladislavKostyukevich

CHANGELOG.md

@@ -7,6 +7,7 @@ Features:
 
 Bugfixes:
   - Add ALLOW_UNQUOTED_CONTROL_CHARS for mapper -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/45)
+  - Milestone View: Add functionality that displays the latest results of the tests from the test runs -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/11)
 
 ## 0.3.4 (2019-12-10)
 

src/main/java/main/controllers/Project/MilestoneController.java

@@ -37,7 +37,7 @@ public List<MilestoneDto> get(MilestoneDto template) throws AqualityException {
 
     @Override
     public boolean delete(MilestoneDto template) throws AqualityException {
-        if(baseUser.isManager() || baseUser.getProjectUser(template.getProject_id()).isEditor()){
+        if(baseUser.isManager() || baseUser.getProjectUserByMilestoneId(template.getId()).isEditor()){
             return milestoneDao.delete(template);
         }else{
             throw new AqualityPermissionsException("Account is not allowed to delete Milestones", baseUser);

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

@@ -69,6 +69,14 @@ public boolean delete(TestResultDto template) throws AqualityException {
         }
     }
 
+    public List<TestResultDto> getLatestResultsByMilestone(Integer milestoneId) throws AqualityException {
+        if(baseUser.isFromGlobalManagement() || baseUser.getProjectUserByMilestoneId(milestoneId).isViewer()){
+            return fillResults(testResultDao.selectLatestResultsByMilestone(milestoneId));
+        }else{
+            throw new AqualityPermissionsException("Account is not allowed to view Test Results", baseUser);
+        }
+    }
+
     public boolean updateMultipleTestResults(List<TestResultDto> entities) throws AqualityException {
         if(entities.size() > 0 && (baseUser.isManager() || baseUser.getProjectUser(entities.get(0).getProject_id()).isEditor())){
             return testResultDao.updateMultiply(entities);
@@ -107,27 +115,32 @@ private List<TestResultDto> fillResults(List<TestResultDto> results) throws Aqua
         if(results.size() > 0){
             List<FinalResultDto> finalResults = finalResultController.get(new FinalResultDto());
             List<ResultResolutionDto> resolutions = resultResolutionController.get(new ResultResolutionDto());
+
             TestDto testTemplate = new TestDto();
             testTemplate.setProject_id(results.get(0).getProject_id());
             List<TestDto> tests = testDao.searchAll(testTemplate);
 
+            ProjectUserDto projectUserDto = new ProjectUserDto();
+            projectUserDto.setProject_id(results.get(0).getProject_id());
+            List<ProjectUserDto> projectUsers = projectUserController.get(projectUserDto);
+
             for (TestResultDto result: results){
-                fillResult(result, finalResults, resolutions, tests);
+                fillResult(result, finalResults, resolutions, tests, projectUsers);
             }
         }
 
         return results;
     }
 
-    private void fillResult(TestResultDto result, List<FinalResultDto> finalResults, List<ResultResolutionDto> resolutions, List<TestDto> tests) throws AqualityException {
+    private void fillResult(TestResultDto result, List<FinalResultDto> finalResults, List<ResultResolutionDto> resolutions, List<TestDto> tests, List<ProjectUserDto> projectUsers) throws AqualityException {
         if (projectController.isStepsEnabled(result.getProject_id())) {
             fillResultSteps(result);
         }
 
         result.setFinal_result(finalResults.stream().filter(x -> x.getId().equals(result.getFinal_result_id())).findFirst().orElse(null));
         result.setTest(tests.stream().filter(x -> x.getId().equals(result.getTest_id())).findFirst().orElse(null));
         result.setTest_resolution(resolutions.stream().filter(x -> x.getId().equals(result.getTest_resolution_id())).findFirst().orElse(null));
-        fillResultAssignee(result);
+        fillResultAssignee(result, projectUsers);
     }
 
     private void fillResultSteps(TestResultDto result) throws AqualityException {
@@ -137,12 +150,10 @@ private void fillResultSteps(TestResultDto result) throws AqualityException {
         result.setSteps(stepResultController.get(stepResultTemplate));
     }
 
-    private void fillResultAssignee(TestResultDto result) throws AqualityException {
+    private void fillResultAssignee(TestResultDto result, List<ProjectUserDto> projectUsers) throws AqualityException {
         if (result.getAssignee() != null) {
-            ProjectUserDto projectUserDto = new ProjectUserDto();
-            projectUserDto.setUser_id(result.getAssignee());
-            projectUserDto.setProject_id(result.getProject_id());
-            result.setAssigned_user(projectUserController.get(projectUserDto).get(0));
+            ProjectUserDto projectUser = projectUsers.stream().filter(user -> user.getUser_id().equals(result.getAssignee())).findFirst().orElse(null);
+            result.setAssigned_user(projectUser);
         }
     }
 

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

@@ -19,6 +19,7 @@ public TestResultDao() {
 
 
     private String syncSuiteQuery = "{call SELECT_LEGACY_RESULTS(?,?)}";
+    private String latestResultsByMilestone = "{call SELECT_LATEST_RESULTS_BY_MILESTONE(?)}";
 
     /**
      * @param suiteId suite id for search
@@ -32,4 +33,10 @@ public List<TestResultDto> selectSuiteLegacyResults(@NotNull Integer suiteId, @N
         parameters.add(new ConnectionUrlParser.Pair<>("request_test_id", testId.toString()));
         return dtoMapper.mapObjects(CallStoredProcedure(syncSuiteQuery, parameters).toString());
     }
+
+    public List<TestResultDto> selectLatestResultsByMilestone(@NotNull Integer milestoneId) throws AqualityException {
+        List<ConnectionUrlParser.Pair<String, String>> parameters = new ArrayList<>();
+        parameters.add(new ConnectionUrlParser.Pair<>("request_milestone_id", milestoneId.toString()));
+        return dtoMapper.mapObjects(CallStoredProcedure(latestResultsByMilestone, parameters).toString());
+    }
 }

src/main/java/main/model/dto/UserDto.java

@@ -6,6 +6,7 @@
 import main.annotations.DataBaseName;
 import main.annotations.DataBaseSearchable;
 import main.exceptions.AqualityException;
+import main.model.db.dao.project.MilestoneDao;
 import main.model.db.dao.project.TestSuiteDao;
 import main.utils.BooleanUtil;
 
@@ -112,6 +113,14 @@ public ProjectUserDto getProjectUserBySuiteId(Integer suite_id) throws AqualityE
         return getProjectUser(template.getProject_id());
     }
 
+    public ProjectUserDto getProjectUserByMilestoneId(Integer milestone_id) throws AqualityException {
+        MilestoneDao milestoneDao = new MilestoneDao();
+        MilestoneDto template = new MilestoneDto();
+        template.setId(milestone_id);
+        template = milestoneDao.searchAll(template).get(0);
+        return getProjectUser(template.getProject_id());
+    }
+
     public UserDto toPublic(){
         this.setPassword("");
         this.setSession_code("");

src/main/java/main/view/Project/MilestoneTestResultsServlet.java

@@ -0,0 +1,40 @@
+package main.view.Project;
+
+
+import main.Session;
+import main.model.dto.TestResultDto;
+import main.model.dto.TestSuiteDto;
+import main.view.BaseServlet;
+import main.view.IDelete;
+import main.view.IGet;
+import main.view.IPost;
+
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@WebServlet("/milestone/results")
+public class MilestoneTestResultsServlet extends BaseServlet implements IGet{
+
+    @Override
+    public void doGet(HttpServletRequest req, HttpServletResponse resp){
+        setPostResponseHeaders(resp);
+        setEncoding(resp);
+
+        try {
+            Session session = createSession(req);
+            Integer milestoneId = getIntegerQueryParameter(req, "milestoneId");
+            List<TestResultDto> testResults = session.controllerFactory.getHandler(new TestResultDto()).getLatestResultsByMilestone(milestoneId);
+            setJSONContentType(resp);
+            resp.getWriter().write(mapper.serialize(testResults));
+        }catch (Exception e) {
+            handleException(resp, e);
+        }
+    }
+
+    @Override
+    public void doOptions(HttpServletRequest req, HttpServletResponse resp) {
+        setOptionsResponseHeaders(resp);
+    }
+}

src/main/resources/db_changelog/changelog.xml

@@ -27,4 +27,5 @@
     <include file="db.changelog-0.3.1.xml" relativeToChangelogFile="true"/>
     <include file="db.changelog-0.3.3.xml" relativeToChangelogFile="true"/>
     <include file="db.changelog-0.3.4.xml" relativeToChangelogFile="true"/>
+    <include file="db.changelog-0.3.5.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

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

@@ -0,0 +1,40 @@
+<?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="create SELECT_LATEST_RESULTS_BY_MILESTONE" author="v.kostyukevich">
+        <sql endDelimiter="#">
+
+            DROP procedure IF EXISTS `SELECT_LATEST_RESULTS_BY_MILESTONE`;
+
+            #
+
+            CREATE PROCEDURE `SELECT_LATEST_RESULTS_BY_MILESTONE`(
+            IN request_milestone_id VARCHAR(11)
+            )
+            BEGIN
+            SELECT *
+            FROM test_results
+            JOIN
+            (
+            SELECT res.test_id, MAX(res.finish_date) AS finish_date, test_suite_id
+            FROM
+            (
+            SELECT test_results.*, test_runs.test_suite_id FROM test_results
+            RIGHT JOIN test_runs ON test_results.test_run_id = test_runs.id
+            WHERE milestone_id = request_milestone_id AND test_runs.debug = 0
+            ) AS res
+            GROUP BY res.test_id, res.test_suite_id
+            ) AS tests
+            ON test_results.test_id = tests.test_id AND test_results.finish_date = tests.finish_date;
+            END
+        </sql>
+        <rollback>
+            DROP procedure IF EXISTS `SELECT_LATEST_RESULTS_BY_MILESTONE`;
+        </rollback>
+    </changeSet>
+
+</databaseChangeLog>