Merge pull request #21 from aquality-automation/feature/CannotImportIntoLastTestRun

VladislavKostyukevich · web-flow · commit 1c54982a6f7d · 2019-09-09T13:40:58.000+03:00
Feature/cannot import into last test run
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,18 @@
+# CHANGELOG
+
+## 0.3.2 (unreleased)
+
+Bugfixes:
+
+  - Import: Import to latest test Run not working when importing more than one file  -> [View Issue](https://github.com/aquality-automation/aquality-tracking-ui/issues/29)
+
+## 0.3.1 (2019-08-30)
+
+Features:
+
+  - Add ability to set Default Email Pattern
+  - Add regex search to Results Searcher
+
+Bugfixes:
+
+  - Fix Fail Reason Search
diff --git a/src/main/java/main/controllers/Project/SuiteController.java b/src/main/java/main/controllers/Project/SuiteController.java
@@ -46,6 +46,17 @@ public List<TestSuiteDto> get(TestSuiteDto template) throws AqualityException {
         return get(template, false);
     }
 
+    public TestSuiteDto get(String name, Integer projectId) throws AqualityException {
+        TestSuiteDto template = new TestSuiteDto();
+        template.setName(name);
+        template.setProject_id(projectId);
+        try{
+            return get(template, false).get(0);
+        } catch (Exception e) {
+            throw new AqualityException("The '%s' suite does not exist.", name);
+        }
+    }
+
     @Override
     public boolean delete(TestSuiteDto template) throws AqualityException {
         if(baseUser.isManager() || baseUser.getProjectUserBySuiteId(template.getId()).isManager()){
diff --git a/src/main/java/main/controllers/Project/TestRunController.java b/src/main/java/main/controllers/Project/TestRunController.java
@@ -65,6 +65,18 @@ public List<TestRunStatisticDto> get(TestRunStatisticDto template) throws Aquali
         return testRunStatisticDao.searchAll(template);
     }
 
+    public TestRunDto getLastSuiteTestRun(Integer suiteId, Integer projectId) throws AqualityException {
+        TestRunDto template = new TestRunDto();
+        template.setTest_suite_id(suiteId);
+        template.setProject_id(projectId);
+        List<TestRunDto> testRuns = get(template, false, 1);
+        if(testRuns.size() > 0){
+            return testRuns.get(0);
+        }
+
+        throw new AqualityException("There are no test runs for suite with '%s' id!", suiteId);
+    }
+
     @Override
     public boolean delete(TestRunDto template) throws AqualityException {
         if(baseUser.isManager() || baseUser.getProjectUser(template.getProject_id()).isEditor()){
diff --git a/src/main/java/main/exceptions/AqualityException.java b/src/main/java/main/exceptions/AqualityException.java
@@ -8,4 +8,8 @@ public class AqualityException extends Exception {
     public AqualityException(String error) {
         super(error);
     }
+
+    public AqualityException(String error, Object... args) {
+        super(String.format(error, args));
+    }
 }
diff --git a/src/main/java/main/view/Project/ExecuteImportServlet.java b/src/main/java/main/view/Project/ExecuteImportServlet.java
@@ -2,13 +2,13 @@
 
 
 import main.Session;
+import main.controllers.Project.SuiteController;
+import main.controllers.Project.TestRunController;
 import main.exceptions.AqualityException;
+import main.exceptions.AqualityQueryParameterException;
 import main.model.db.imports.Importer;
 import main.model.db.imports.TestNameNodeType;
-import main.model.dto.ImportDto;
-import main.model.dto.ImportTokenDto;
-import main.model.dto.TestRunDto;
-import main.model.dto.TestSuiteDto;
+import main.model.dto.*;
 import main.utils.FileUtils;
 import main.utils.PathUtils;
 import main.view.BaseServlet;
@@ -27,36 +27,38 @@
 @WebServlet("/import")
 @MultipartConfig
 public class ExecuteImportServlet extends BaseServlet implements IPost {
+
+    private Integer projectId;
+    private String buildName;
+    private String author;
+    private String suiteName;
+    private Integer testRunId;
+    private Boolean addToLastTestRun;
+    private String environment;
+    private String cilink;
+    private Boolean singleTestRun;
+    private String format;
+    private String importToken;
+    private SuiteController suiteController;
+    private TestRunController testRunController;
+
     @Override
     public void doPost(HttpServletRequest req, HttpServletResponse resp) {
         setPostResponseHeaders(resp);
         try {
-            Boolean singleTestRun = getBooleanQueryParameter(req, ImportParams.singleTestRun.name());
-            Integer projectId = getIntegerQueryParameter(req, ImportParams.projectId.name());
-            String format = getStringQueryParameter(req, ImportParams.format.name());
-            String buildName = getStringQueryParameter(req, ImportParams.buildName.name());
-            String author = getStringQueryParameter(req, ImportParams.author.name());
-            String suiteName = getStringQueryParameter(req, ImportParams.suite.name());
-            String importToken = getStringQueryParameter(req, ImportParams.importToken.name());
-            Integer testRunId = getIntegerQueryParameter(req, ImportParams.testRunId.name());
-            Boolean addToLastTestRun = getBooleanQueryParameter(req, ImportParams.addToLastTestRun.name());
-            String environment = getStringQueryParameter(req, ImportParams.environment.name());
-            String cilink = getStringQueryParameter(req, ImportParams.cilink.name());
-
-            validateRequest(singleTestRun, projectId, format, buildName, author, suiteName);
-
-            Session session;
-            if (importToken != null) {
-                session = new Session(importToken, projectId);
-            } else {
-                session = createSession(req);
-            }
+            readParameters(req);
+            Session session = importToken != null
+                    ? new Session(importToken, projectId)
+                    : createSession(req);
+
+            suiteController = session.controllerFactory.getHandler(new TestSuiteDto());
+            testRunController = session.controllerFactory.getHandler(new TestRunDto());
 
             List<String> filePaths = doUpload(req, resp, projectId);
 
             Importer importer = session.getImporter(
                     filePaths,
-                    prepareTestRun(session, testRunId, addToLastTestRun, environment, cilink, projectId, buildName, author, suiteName),
+                    prepareTestRun(),
                     getStringQueryParameter(req, ImportParams.pattern.name()),
                     getStringQueryParameter(req, ImportParams.format.name()),
                     getTestNameNodeType(req),
@@ -77,11 +79,25 @@ public void doOptions(HttpServletRequest req, HttpServletResponse resp) {
         setPostResponseHeaders(resp);
     }
 
-    private TestRunDto prepareTestRun(Session session, Integer testRunId, Boolean addToLastTestRun, String environment, String cilink,
-                                      Integer projectId, String buildName, String author, String suiteName) throws AqualityException {
+    private void readParameters(HttpServletRequest req) throws AqualityQueryParameterException {
+        singleTestRun = getBooleanQueryParameter(req, ImportParams.singleTestRun.name());
+        format = getStringQueryParameter(req, ImportParams.format.name());
+        importToken = getStringQueryParameter(req, ImportParams.importToken.name());
+        projectId = getIntegerQueryParameter(req, ImportParams.projectId.name());
+        buildName = getStringQueryParameter(req, ImportParams.buildName.name());
+        author = getStringQueryParameter(req, ImportParams.author.name());
+        suiteName = getStringQueryParameter(req, ImportParams.suite.name());
+        testRunId = getIntegerQueryParameter(req, ImportParams.testRunId.name());
+        addToLastTestRun = getBooleanQueryParameter(req, ImportParams.addToLastTestRun.name());
+        environment = getStringQueryParameter(req, ImportParams.environment.name());
+        cilink = getStringQueryParameter(req, ImportParams.cilink.name());
+        validateRequest();
+    }
 
+    private TestRunDto prepareTestRun() throws AqualityException {
         TestSuiteDto testSuiteTemplate = new TestSuiteDto();
         testSuiteTemplate.setName(suiteName);
+        testSuiteTemplate.setProject_id(projectId);
 
         TestRunDto testRunTemplate = new TestRunDto();
         testRunTemplate.setProject_id(projectId);
@@ -90,45 +106,38 @@ private TestRunDto prepareTestRun(Session session, Integer testRunId, Boolean ad
         testRunTemplate.setAuthor(author);
         testRunTemplate.setExecution_environment(environment);
         testRunTemplate.setTest_suite(testSuiteTemplate);
-        testRunTemplate.setId(getTestRunId(session, testRunId, addToLastTestRun, testSuiteTemplate));
+        testRunTemplate.setId(getTestRunId());
 
         return testRunTemplate;
     }
 
-    private Integer getTestRunId(Session session, Integer testRunId, Boolean addToLastTestRun, TestSuiteDto suite) throws AqualityException {
-        if(testRunId != null ){
+    private Integer getTestRunId() throws AqualityException {
+        if(testRunId != null) {
             return testRunId;
         }
 
         if(addToLastTestRun) {
-            List<TestSuiteDto> testSuites = session.controllerFactory.getHandler(suite).get(suite);
-            TestRunDto testRunTemplate = new TestRunDto();
-            testRunTemplate.setTest_suite_id(testSuites.get(0).getId());
-
-            List<TestRunDto> testRuns = session.controllerFactory.getHandler(testRunTemplate).get(testRunTemplate);
-            if(!testRuns.isEmpty()){
-                return testRuns.get(0).getId();
-            }
+            return testRunController.getLastSuiteTestRun(suiteController.get(suiteName, projectId).getId(), projectId).getId();
         }
 
         return null;
     }
 
-    private void validateRequest(Boolean singleTestRun, Integer projectId, String format, String buildName, String author, String suiteName) throws InvalidParameterException{
+    private void validateRequest() throws AqualityQueryParameterException {
 
         if(singleTestRun)
         {
             if (projectId == null || format == null || buildName == null || author == null){
-                throw new InvalidParameterException("ProjectId or/and Format or/and Author or/and BuildName parameters are missed.");
+                throw new AqualityQueryParameterException("ProjectId or/and Format or/and Author or/and BuildName parameters are missed.");
             }
         }else{
             if (projectId == null || format == null){
-                throw new InvalidParameterException("ProjectId or/and Format parameters are missed.");
+                throw new AqualityQueryParameterException("ProjectId or/and Format parameters are missed.");
             }
         }
         if(format.equals(ImportTypes.MSTest.name()) || format.equals(ImportTypes.Cucumber.name())){
             if (suiteName == null){
-                throw new InvalidParameterException("Suite parameter is missed.");
+                throw new AqualityQueryParameterException("Suite parameter is missed.");
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,8 @@ public class AqualityException extends Exception {`
`8`	`8`	`public AqualityException(String error) {`
`9`	`9`	`super(error);`
`10`	`10`	`}`
	`11`	`+`
	`12`	`+ public AqualityException(String error, Object... args) {`
	`13`	`+ super(String.format(error, args));`
	`14`	`+ }`
`11`	`15`	`}`