nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add 'category' and 'type' values to classification

This commit is contained in:
Benni Vier 2017-07-04 13:36:23 +02:00
parent f21cc21642
commit 82bc6235c9
6 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/taskana-core/src/main/java/org/taskana/model/Classification.java
View File

@ -12,6 +12,8 @@ public class Classification {
private String id;
private String tenantId;
private String parentClassificationId;
private String category;
private String type;
private Date created;
private Date modified;
private String name;
@ -44,6 +46,22 @@ public class Classification {
this.parentClassificationId = parentClassificationId;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getCategory() {
return category;
}
public void setCategory(String category) {
this.category = category;
}
public Date getCreated() {
return created;
}
@ -103,4 +121,5 @@ public class Classification {
public void setChildren(List<Classification> children) {
this.children = children;
}
}

6
lib/taskana-core/src/main/java/org/taskana/model/mappings/ClassificationMapper.java
View File

@ -12,6 +12,8 @@ public interface ClassificationMapper {
@Result(property="id", column="ID"),
@Result(property="tenantId", column="TENANT_ID"),
@Result(property="parentClassificationId", column="PARENT_CLASSIFICATION_ID"),
@Result(property="category", column="CATEGORY"),
@Result(property="type", column="TYPE"),
@Result(property="created", column="CREATED"),
@Result(property="modified", column="MODIFIED"),
@Result(property="name", column="NAME"),
@ -27,9 +29,9 @@ public interface ClassificationMapper {
@Select("SELECT * FROM BUSINESS_CLASSIFICATION WHERE ID = #{classificationId}")
Classification findById(@Param("classificationId") String classificationId);
@Insert("INSERT INTO BUSINESS_CLASSIFICATION (ID, TENANT_ID, PARENT_CLASSIFICATION_ID, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL) VALUES (#{classification.id}, #{classification.tenantId}, #{classification.parentClassificationId}, #{classification.created}, #{classification.name}, #{classification.description}, #{classification.priority}, #{classification.serviceLevel})")
@Insert("INSERT INTO BUSINESS_CLASSIFICATION (ID, TENANT_ID, PARENT_CLASSIFICATION_ID, CATEGORY, TYPE, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL) VALUES (#{classification.id}, #{classification.tenantId}, #{classification.parentClassificationId}, #{classification.category}, #{classification.type}, #{classification.created}, #{classification.name}, #{classification.description}, #{classification.priority}, #{classification.serviceLevel})")
void insert(@Param("classification") Classification classification);
@Update(value = "UPDATE BUSINESS_CLASSIFICATION SET TENANT_ID = #{classification.tenantId}, PARENT_CLASSIFICATION_ID = #{classification.parentClassificationId}, NAME = #{classification.name}, DESCRIPTION = #{classification.description}, PRIORITY = #{classification.priority}, SERVICE_LEVEL = #{classification.serviceLevel}, MODIFIED = #{classification.modified} WHERE ID = #{classification.id}")
@Update(value = "UPDATE BUSINESS_CLASSIFICATION SET TENANT_ID = #{classification.tenantId}, PARENT_CLASSIFICATION_ID = #{classification.parentClassificationId}, CATEGORY = #{classification.category}, TYPE = #{classification.type}, NAME = #{classification.name}, DESCRIPTION = #{classification.description}, PRIORITY = #{classification.priority}, SERVICE_LEVEL = #{classification.serviceLevel}, MODIFIED = #{classification.modified} WHERE ID = #{classification.id}")
void update(@Param("classification") Classification classification);
}

2
lib/taskana-core/src/main/resources/sql/db-structure.sql
View File

@ -41,6 +41,8 @@ CREATE TABLE IF NOT EXISTS BUSINESS_CLASSIFICATION(
ID varchar(255) NOT NULL,
TENANT_ID varchar(255) NULL,
PARENT_CLASSIFICATION_ID varchar(255),
CATEGORY varchar(255),
TYPE varchar(255),
CREATED DATE NULL,
MODIFIED DATE NULL,
NAME varchar(255) NULL,

16
rest/src/main/java/org/taskana/sampledata/SampleDataGenerator.java
View File

@ -1,16 +1,14 @@
package org.taskana.sampledata;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.sql.SQLException;
import javax.sql.DataSource;
import org.apache.ibatis.jdbc.ScriptRunner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.taskana.rest.RestApplication;
import javax.sql.DataSource;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.sql.SQLException;
public class SampleDataGenerator {
@ -23,7 +21,7 @@ public class SampleDataGenerator {
private static final String WORKBASKET = SQL + TEST_DATA + "/workbasket.sql";
private static final String DISTRIBUTION_TARGETS = SQL + TEST_DATA + "/distribution-targets.sql";
private static final String WORKBASKET_ACCESS_LIST = SQL + TEST_DATA + "/workbasket-access-list.sql";
private static final String CATEGORY = SQL + TEST_DATA + "/category.sql";
private static final String CATEGORY = SQL + TEST_DATA + "/classification.sql";
public SampleDataGenerator(DataSource dataSource) throws SQLException {

4
rest/src/main/resources/sql/sample-data/category.sql
View File

@ -1,4 +0,0 @@
INSERT INTO BUSINESS_CATEGORY (ID, TENANT_ID, PARENT_CATEGORY_ID, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL) VALUES ('1', 'NT', '', CURRENT_TIMESTAMP, 'ROOT', 'DESC', 1, 'SLA');
INSERT INTO BUSINESS_CATEGORY (ID, TENANT_ID, PARENT_CATEGORY_ID, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL) VALUES ('2', 'NT', '1', CURRENT_TIMESTAMP, 'CHILD', 'DESC', 1, 'SLA');
INSERT INTO BUSINESS_CATEGORY (ID, TENANT_ID, PARENT_CATEGORY_ID, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL) VALUES ('3', 'NT', '1', CURRENT_TIMESTAMP, 'ANOTHER CHILD', 'DESC', 1, 'SLA');
INSERT INTO BUSINESS_CATEGORY (ID, TENANT_ID, PARENT_CATEGORY_ID, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL) VALUES ('4', 'NT', '2', CURRENT_TIMESTAMP, 'GRANDCHILD', 'DESC', 1, 'SLA');

9
rest/src/main/resources/sql/sample-data/classification.sql Normal file
View File

@ -0,0 +1,9 @@
INSERT INTO BUSINESS_CLASSIFICATION (ID, TENANT_ID, PARENT_CLASSIFICATION_ID, CATEGORY, TYPE, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL) VALUES ('1', 'NT', '', 'EXTERN', 'BRIEF', CURRENT_TIMESTAMP, 'ROOT', 'DESC', 1, 'P1D');
INSERT INTO BUSINESS_CLASSIFICATION (ID, TENANT_ID, PARENT_CLASSIFICATION_ID, CATEGORY, TYPE, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL) VALUES ('2', 'NT', '1','MANUELL', 'BRIEF', CURRENT_TIMESTAMP, 'CHILD', 'DESC', 1, 'P1D');
INSERT INTO BUSINESS_CLASSIFICATION (ID, TENANT_ID, PARENT_CLASSIFICATION_ID, CATEGORY, TYPE, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL) VALUES ('3', 'NT', '1','MASCHINELL', 'BRIEF', CURRENT_TIMESTAMP, 'ANOTHER CHILD', 'DESC', 1, 'P2D');
INSERT INTO BUSINESS_CLASSIFICATION (ID, TENANT_ID, PARENT_CLASSIFICATION_ID, CATEGORY, TYPE, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL) VALUES ('4', 'NT', '2','PROZESS', 'EXCEL-SHEET', CURRENT_TIMESTAMP, 'GRANDCHILD', 'DESC', 1, 'P1DT4H12S');
INSERT INTO BUSINESS_CLASSIFICATION VALUES('13', 'NT', '3', 'MANUELL', '', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'ANOTHER GRANDCHILD', 'DESC', 3, 'P3DT12H', NULL);
INSERT INTO BUSINESS_CLASSIFICATION VALUES('14', 'NT', '4', 'MANUELL', '', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'BIG GRANDCHILD', 'DESC', 2, 'P2DT12H', NULL);
INSERT INTO BUSINESS_CLASSIFICATION VALUES('15', 'NT', '3', 'PROZESS', 'MINDMAP', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'SMALL GRANDCHILD', 'DESC', 4, 'P5DT12H', NULL);
INSERT INTO BUSINESS_CLASSIFICATION VALUES('16', 'NT', '4', 'MANUELL', '', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'NO GRANDCHILD', 'DESC', 3, 'P3DT', NULL);