- Milestone: Add Due Date to Milestone. -> [View Issue](aquality-automation/aquality-tracking#61)

  - Milestone: Add possibility to Close Milestone. -> [View Issue](aquality-automation/aquality-tracking#62)

Author: VladislavKostyukevich

CHANGELOG.md

@@ -6,6 +6,8 @@ Features:
   - Improve Test Run and Test List page performance -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/71)
   - Exclude Debug results from last results column -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/70)
   - Milestone: Add selected Suites to milestone -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/63)
+  - Milestone: Add Due Date to Milestone. -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/61)
+  - Milestone: Add possibility to Close Milestone. -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/62)
 
 Bugfixes:
 

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

@@ -7,8 +7,8 @@ public class MilestoneDao extends DAO<MilestoneDto> {
 
     public MilestoneDao(){
         super(MilestoneDto.class);
-        select = "{call SELECT_MILESTONE(?,?,?)}";
-        insert = "{call INSERT_MILESTONE(?,?,?)}";
+        select = "{call SELECT_MILESTONE(?,?,?,?)}";
+        insert = "{call INSERT_MILESTONE(?,?,?,?,?)}";
         remove = "{call REMOVE_MILESTONE(?)}";
     }
 }

src/main/java/main/model/dto/MilestoneDto.java

@@ -1,8 +1,11 @@
 package main.model.dto;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.Data; import lombok.EqualsAndHashCode;
 import main.annotations.*;
+import main.utils.CustomerDateAndTimeDeserialize;
 
+import java.util.Date;
 import java.util.List;
 
 
@@ -20,5 +23,13 @@ public class MilestoneDto extends BaseDto{
     @DataBaseName(name = "request_project_id")
     @DataBaseInsert
     private Integer project_id;
+    @DataBaseSearchable
+    @DataBaseName(name = "request_active")
+    @DataBaseInsert
+    private Integer active;
+    @DataBaseName(name = "request_due_date")
+    @DataBaseInsert
+    @JsonDeserialize(using= CustomerDateAndTimeDeserialize.class)
+    private Date due_date;
     private List<TestSuiteDto> suites;
 }

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

@@ -150,7 +150,7 @@
             CREATE FUNCTION `empty_or_equal`(
             request_value longtext,
             current_value longtext
-            ) RETURNS int(1)
+            ) RETURNS longtext
             BEGIN
             RETURN request_value = '' OR current_value = request_value;
             END
@@ -564,5 +564,101 @@
         </rollback>
     </changeSet>
 
+    <changeSet id="Update Milestones table with active and due_date columns" author="v.kostyukevich">
+        <sql endDelimiter="#">
+            ALTER TABLE `milestones`
+            ADD COLUMN `active` INT(1) NOT NULL DEFAULT 1 AFTER `project_id`,
+            ADD COLUMN `due_date` DATETIME NULL AFTER `active`;
+        </sql>
+        <rollback>
+            ALTER TABLE `milestones`
+            DROP COLUMN `due_date`,
+            DROP COLUMN `active`;
+        </rollback>
+    </changeSet>
+
+    <changeSet id="Create apply_or_remove_date" author="v.kostyukevich">
+        <sql endDelimiter="#">
+
+            DROP FUNCTION IF EXISTS `apply_or_remove_date`;
+
+            #
+
+            CREATE FUNCTION `apply_or_remove_date`(
+            request_value varchar(5000),
+            current_value varchar(5000)
+            ) RETURNS datetime
+            BEGIN
+            RETURN IF (request_value='', current_value, IF(request_value='$blank', '', FROM_UNIXTIME(request_value)));
+            END
+        </sql>
+        <rollback>
+            DROP FUNCTION IF EXISTS `apply_or_remove_date`;
+        </rollback>
+    </changeSet>
+
+    <changeSet id="Update Insert Milestone with active and due_date columns" author="v.kostyukevich">
+        <sql endDelimiter="#">
+
+            DROP PROCEDURE IF EXISTS `INSERT_MILESTONE`;
+
+            #
+
+            CREATE PROCEDURE `INSERT_MILESTONE`(
+            IN request_id varchar(10),
+            IN request_name VARCHAR(500),
+            IN request_project_id VARCHAR(500),
+            IN request_active INT(1),
+            IN request_due_date VARCHAR(500)
+            )
+            BEGIN
+            INSERT INTO milestones (id, name, project_id, active, due_date)
+            VALUES (
+            IF(request_id='',null,request_id),
+            request_name,
+            request_project_id,
+            request_active,
+            apply_or_remove_date(request_due_date, due_date))
+            ON DUPLICATE KEY UPDATE
+            name = request_name,
+            project_id = request_project_id,
+            active = replace_empty(request_active, active),
+            due_date = apply_or_remove_date(request_due_date, due_date)
+            ;
+            SET @insert_id = IF(request_id = '', (SELECT LAST_INSERT_ID()), request_id);
+            SELECT * from milestones where id = @insert_id;
+            END
+        </sql>
+        <rollback>
+            DROP FUNCTION IF EXISTS `INSERT_MILESTONE`;
+        </rollback>
+    </changeSet>
+
+    <changeSet id="Update SELECT_MILESTONE with active column" author="v.kostyukevich">
+        <sql endDelimiter="#">
+
+            DROP PROCEDURE IF EXISTS `SELECT_MILESTONE`;
+
+            #
+
+            CREATE PROCEDURE `SELECT_MILESTONE`(
+            IN request_id VARCHAR(11),
+            IN request_name VARCHAR(500),
+            IN request_project_id VARCHAR(11),
+            IN request_active VARCHAR(1)
+            )
+            BEGIN
+            SELECT *
+            FROM milestones
+            WHERE empty_or_equal(request_id, id)
+            AND empty_or_equal(request_name, name)
+            AND empty_or_equal(request_project_id, project_id)
+            AND empty_or_equal(request_active, active);
+            END
+        </sql>
+        <rollback>
+            DROP FUNCTION IF EXISTS `SELECT_MILESTONE`;
+        </rollback>
+    </changeSet>
 
 </databaseChangeLog>