Save work on steps

VladislavKostyukevich · VladislavKostyukevich · commit 20897a1e7e61 · 2019-10-18T18:02:21.000+03:00
diff --git a/src/main/java/main/controllers/Project/StepController.java b/src/main/java/main/controllers/Project/StepController.java
@@ -46,4 +46,8 @@ public boolean removeFromTest(Step2TestDto entity) throws AqualityException {
     public boolean updateOrder(List<Step2TestDto> entities) throws AqualityException {
         return step2TestDao.updateMultiply(entities);
     }
+
+    public List<StepDto> getTestSteps(Step2TestDto stepToTest) throws AqualityException {
+        return step2TestDao.getTestSteps(stepToTest);
+    }
 }
diff --git a/src/main/java/main/exceptions/AqualitySQLException.java b/src/main/java/main/exceptions/AqualitySQLException.java
@@ -22,8 +22,12 @@ private static String getErrorMessage(SQLException exception){
                 return "You are trying to edit entity which is locked. Please retry the operation.";
             case "23000":
                 return String.format("You have missed required parameter: %s", exception.getMessage());
+            case "HY000":
+                return "Your Data Base does not support UTF characters, please contact administrator to allow it.";
+            case "42S02":
+                return "There is some missed table in your Data Base, please contact administrator.";
             default:
-                return String.format("Unknown SQL Error: %s", exception.getSQLState());
+                return String.format("Unknown SQL Error: %s \n Message: %s", exception.getSQLState(), exception.getMessage());
         }
     }
 
@@ -35,6 +39,8 @@ private static Integer getErrorCode(String sqlcode){
                 return 409;
             case "42000":
             case "23000":
+            case "HY000":
+            case "42S02":
                 return 400;
             default:
                 return 500;
diff --git a/src/main/java/main/model/db/dao/DAO.java b/src/main/java/main/model/db/dao/DAO.java
@@ -19,6 +19,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static javax.swing.UIManager.get;
+
 public abstract class DAO<T extends BaseDto> {
     private Connection connection;
     private Class<T> type;
@@ -119,8 +121,12 @@ public boolean delete(T entity) throws AqualityException {
      */
     public T create(T entity) throws AqualityException {
         List<Pair<String, String>> parameters = entity.getParameters();
+        List<T> results = dtoMapper.mapObjects(CallStoredProcedure(insert, parameters).toString());
+        if(results.size() > 0){
+            return results.get(0);
+        }
 
-        return dtoMapper.mapObjects(CallStoredProcedure(insert, parameters).toString()).get(0);
+        throw new AqualitySQLException(new SQLException("Possible duplicate error.", "23505"));
     }
 
     /**
diff --git a/src/main/java/main/model/db/dao/project/Step2TestDao.java b/src/main/java/main/model/db/dao/project/Step2TestDao.java
@@ -1,12 +1,42 @@
 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.Step2TestDto;
+import main.model.dto.StepDto;
+
+import java.util.List;
 
 public class Step2TestDao extends DAO<Step2TestDto> {
     public Step2TestDao() {
         super(Step2TestDto.class);
-        insert = "{call INSERT_STEP_TO_TEST(?,?)}";
-        remove = "{call REMOVE_STEP_TO_TEST(?)}";
+        insert = "{call INSERT_STEP_TO_TEST(?,?,?,?)}";
+        select = "{call SELECT_TEST_STEPS(?,?)}";
+        remove = "{call REMOVE_STEP_TO_TEST(?,?,?)}";
+    }
+
+    /**
+     * Create Entity
+     * @param entity entity to create
+     * @return created entity
+     */
+    public Step2TestDto create(Step2TestDto entity) throws AqualityException {
+        List<ConnectionUrlParser.Pair<String, String>> parameters = entity.getParameters();
+        CallStoredProcedure(insert, parameters);
+        return entity;
     }
+
+    /**
+     * Create Entity
+     * @param entity entity to get
+     * @return created entity
+     */
+    public List<StepDto> getTestSteps(Step2TestDto entity) throws AqualityException {
+        List<ConnectionUrlParser.Pair<String, String>> parameters = entity.getSearchParameters();
+        List<StepDto> results = new DtoMapper<>(StepDto.class).mapObjects(CallStoredProcedure(select, parameters).toString());
+        return results;
+    }
+
 }
diff --git a/src/main/java/main/model/dto/Step2TestDto.java b/src/main/java/main/model/dto/Step2TestDto.java
@@ -13,7 +13,6 @@ public class Step2TestDto extends BaseDto {
     @DataBaseName(name="request_step_id")
     @DataBaseID
     @DataBaseInsert
-    @DataBaseSearchable
     private Integer step_id;
     @DataBaseName(name="request_test_id")
     @DataBaseID
@@ -23,4 +22,10 @@ public class Step2TestDto extends BaseDto {
     @DataBaseName(name="request_order")
     @DataBaseInsert
     private Integer order;
+    @DataBaseName(name="request_project_id")
+    @DataBaseInsert
+    @DataBaseSearchable
+    @DataBaseID
+    private Integer project_id;
+
 }
diff --git a/src/main/java/main/model/dto/StepDto.java b/src/main/java/main/model/dto/StepDto.java
@@ -27,4 +27,5 @@ public class StepDto extends BaseDto {
     @DataBaseInsert
     @DataBaseSearchable
     private Integer project_id;
+    private Integer order;
 }
diff --git a/src/main/java/main/view/Project/StepToTestServlet.java b/src/main/java/main/view/Project/StepToTestServlet.java
@@ -5,14 +5,16 @@
 import main.model.dto.StepDto;
 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("/step/toTest")
-public class StepToTest extends BaseServlet implements IPost, IDelete {
+@WebServlet("/test/steps")
+public class StepToTestServlet extends BaseServlet implements IPost, IDelete, IGet {
 
     @Override
     public void doPost(HttpServletRequest req, HttpServletResponse resp) {
@@ -30,6 +32,22 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) {
         }
     }
 
+    @Override
+    public void doGet(HttpServletRequest req, HttpServletResponse resp) {
+        setPostResponseHeaders(resp);
+        setEncoding(resp);
+
+        try {
+            Session session = createSession(req);
+            Step2TestDto stepToTest = new Step2TestDto();
+            stepToTest.getSearchTemplateFromRequestParameters(req);
+            List<StepDto> steps = session.controllerFactory.getHandler(new StepDto()).getTestSteps(stepToTest);
+            resp.getWriter().write(mapper.serialize(steps));
+        }catch (Exception e) {
+            handleException(resp, e);
+        }
+    }
+
     @Override
     public void doDelete(HttpServletRequest req, HttpServletResponse resp) {
         setPostResponseHeaders(resp);
diff --git a/src/main/resources/db_changelog/db.changelog-0.3.3.xml b/src/main/resources/db_changelog/db.changelog-0.3.3.xml
@@ -122,8 +122,8 @@
             )
             BEGIN
             SET @sql = CONCAT("SELECT * FROM ", "project_steps_",  request_project_id, " WHERE
-            ('", request_id, "' = '' OR id='", request_id, "')
-            AND ('", request_name, "' = '' OR name='", request_name, "');");
+            (", QUOTE(request_id), " = '' OR id=", QUOTE(request_id), ")
+            AND (", QUOTE(request_name), " = '' OR name=", QUOTE(request_name), ");");
             PREPARE statement FROM @sql;
             EXECUTE statement;
             DEALLOCATE PREPARE statement;
@@ -150,12 +150,12 @@
             BEGIN
             SET @sql = CONCAT("INSERT INTO project_steps_",  request_project_id, " (id, name, type_id)
             VALUES (
-            IF('", request_id, "' = '', null, '", request_id, "'),
-            IF('", request_name, "' = '', null, '", request_name, "'),
-            IF('", request_type_id, "' = '', null, '", request_type_id, "')
+            IF(", QUOTE(request_id), " = '', null, ", QUOTE(request_id), "),
+            IF(", QUOTE(request_name), " = '', null, ", QUOTE(request_name), "),
+            IF(", QUOTE(request_type_id), " = '', null, ", QUOTE(request_type_id), ")
             ) ON DUPLICATE KEY UPDATE
-            name = IF('", request_name, "' = '', name, '", request_name, "')
-            , type_id = IF('", request_type_id, "' = '', type_id, '", request_type_id, "');");
+            name = IF(", QUOTE(request_name), " = '', name, ", QUOTE(request_name), ")
+            , type_id = IF(", QUOTE(request_type_id), " = '', type_id, ", QUOTE(request_type_id), ");");
             PREPARE statement FROM @sql;
             EXECUTE statement;
             DEALLOCATE PREPARE statement;
@@ -448,5 +448,58 @@
         </rollback>
     </changeSet>
 
+    <changeSet id="stored procedure INSERT_STEP_TO_TEST" author="v.kostyukevich">
+        <sql endDelimiter="#">
+
+            DROP procedure IF EXISTS `INSERT_STEP_TO_TEST`;
+
+            #
+
+            CREATE PROCEDURE `INSERT_STEP_TO_TEST`(
+            IN request_project_id  VARCHAR(11),
+            IN request_step_id varchar(11),
+            IN request_test_id varchar(11),
+            IN request_order varchar(11)
+            )
+            BEGIN
+            SET @sql = CONCAT("INSERT INTO project_step_to_test_",  request_project_id, " (`step_id`, `test_id`, `order`)
+            VALUES (", QUOTE(request_step_id), ", " , QUOTE(request_test_id), ", " , QUOTE(request_order), ");");
+            PREPARE statement FROM @sql;
+            EXECUTE statement;
+            DEALLOCATE PREPARE statement;
+            END
+        </sql>
+        <rollback>
+            DROP procedure IF EXISTS `INSERT_STEP_TO_TEST`;
+        </rollback>
+    </changeSet>
+
+    <changeSet id="stored procedure SELECT_TEST_STEPS" author="v.kostyukevich">
+        <sql endDelimiter="#">
+
+            DROP procedure IF EXISTS `SELECT_TEST_STEPS`;
+
+            #
+
+            CREATE PROCEDURE `SELECT_TEST_STEPS`(
+            IN request_project_id  VARCHAR(11),
+            IN request_test_id VARCHAR(11)
+            )
+            BEGIN
+            SET @sql = CONCAT("SELECT project_steps_",  request_project_id, ".*, project_step_to_test_",  request_project_id, ".order
+            FROM project_step_to_test_",  request_project_id, "
+            LEFT JOIN project_steps_",  request_project_id, "
+            ON project_step_to_test_",  request_project_id, ".step_id = project_steps_",  request_project_id, ".id
+            WHERE test_id=", request_test_id, " ORDER BY project_step_to_test_",  request_project_id, ".order;");
+            PREPARE statement FROM @sql;
+            EXECUTE statement;
+            DEALLOCATE PREPARE statement;
+            END
+        </sql>
+        <rollback>
+            DROP procedure IF EXISTS `SELECT_TEST_STEPS`;
+        </rollback>
+    </changeSet>
+
 </databaseChangeLog>
 

Original file line number	Diff line number	Diff line change
`@@ -46,4 +46,8 @@ public boolean removeFromTest(Step2TestDto entity) throws AqualityException {`
`46`	`46`	`public boolean updateOrder(List<Step2TestDto> entities) throws AqualityException {`
`47`	`47`	`return step2TestDao.updateMultiply(entities);`
`48`	`48`	`}`
	`49`	`+`
	`50`	`+ public List<StepDto> getTestSteps(Step2TestDto stepToTest) throws AqualityException {`
	`51`	`+ return step2TestDao.getTestSteps(stepToTest);`
	`52`	`+ }`
`49`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,5 @@ public class StepDto extends BaseDto {`
`27`	`27`	`@DataBaseInsert`
`28`	`28`	`@DataBaseSearchable`
`29`	`29`	`private Integer project_id;`
	`30`	`+ private Integer order;`
`30`	`31`	`}`