Merge pull request #13 from aquality-automation/feature/REPPORTQA-1042

Feature/repportqa 1042

Author: VladislavKostyukevich

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(?)}";
     }

src/main/java/main/model/dto/TestResultDto.java

@@ -64,6 +64,7 @@ public class TestResultDto extends BaseDto {
     @JsonDeserialize(using=CustomerDateAndTimeDeserialize.class)
     private Date final_result_updated;
     @DataBaseName(name="request_fail_reason")
+    @DataBaseSearchable
     @DataBaseInsert
     private String fail_reason;
     @DataBaseName(name="request_assignee")

src/main/java/main/utils/PropertyUtils.java

@@ -1,5 +1,6 @@
 package main.utils;
 
+
 import main.exceptions.AqualityException;
 
 import java.io.IOException;

src/main/java/main/view/Project/ImportTokenServlet.java

@@ -12,19 +12,19 @@
 import javax.servlet.http.HttpServletResponse;
 
 @WebServlet("/project/importToken")
-public class ImportTokenServlet extends BaseServlet implements IPost {
+public class ImportTokenServlet extends BaseServlet implements IGet {
 
     @Override
-    public void doPost(HttpServletRequest req, HttpServletResponse resp) {
+    public void doGet(HttpServletRequest req, HttpServletResponse resp) {
         setPostResponseHeaders(resp);
         setEncoding(resp);
 
         try {
             Session session = createSession(req);
-            DtoMapper<ImportTokenDto> mapper = new DtoMapper<ImportTokenDto>(ImportTokenDto.class){};
-            ImportTokenDto tokenDto = mapper.mapObject(getRequestJson(req));
-            String importToken = session.controllerFactory.getHandler(tokenDto).create(tokenDto).getImport_token();
-            resp.getWriter().write(String.format("{\"token\":\"%s\"}", importToken));
+            ImportTokenDto tokenDto = new ImportTokenDto();
+            tokenDto.getSearchTemplateFromRequestParameters(req);
+            tokenDto.setImport_token(session.controllerFactory.getHandler(tokenDto).create(tokenDto).getImport_token());
+            resp.getWriter().write(mapper.serialize(tokenDto));
         } catch (Exception e) {
             handleException(resp, e);
         }

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

@@ -171,4 +171,71 @@
             END
         </rollback>
     </changeSet>
+
+    <changeSet id="Add fail reason contains search" 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_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
+
+        </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>