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

TSK-100: changed mapper and tests

This commit is contained in:
BVier 2017-12-13 18:18:12 +01:00 committed by Holger Hagen
parent 4cdc2508e7
commit d5fcf1fe37
23 changed files with 375 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java
View File

@ -37,6 +37,7 @@ public class TaskanaRestTest {
workbasket.setName("wb"); workbasket.setName("wb");
taskanaEjb.getWorkbasketService().createWorkbasket(workbasket); taskanaEjb.getWorkbasketService().createWorkbasket(workbasket);
Classification classification = classificationService.newClassification(); Classification classification = classificationService.newClassification();
classification.setKey("TEST");
taskanaEjb.getClassificationService().createClassification(classification); taskanaEjb.getClassificationService().createClassification(classification);
Task task = new Task(); Task task = new Task();

7
lib/taskana-core/src/main/java/pro/taskana/Classification.java
View File

@ -37,8 +37,8 @@ public interface Classification {
* Set/Change a reference to the current parent classification via ID. If this field would be set to NULL the * Set/Change a reference to the current parent classification via ID. If this field would be set to NULL the
* classification will become a parent-classification itself. * classification will become a parent-classification itself.
* *
* @param parentClassificationId * @param parentClassificationKey
* TODO * The key of the parent classification.
*/ */
void setParentClassificationKey(String parentClassificationKey); void setParentClassificationKey(String parentClassificationKey);
@ -176,6 +176,9 @@ public interface Classification {
/** /**
* Set the logical name of the associated application entry point. * Set the logical name of the associated application entry point.
*
* @param applicationEntryPoint
* TODO
*/ */
void setApplicationEntryPoint(String applicationEntryPoint); void setApplicationEntryPoint(String applicationEntryPoint);

21
lib/taskana-core/src/main/java/pro/taskana/ClassificationQuery.java
View File

@ -8,12 +8,20 @@ import java.util.Date;
public interface ClassificationQuery extends BaseQuery<Classification> { public interface ClassificationQuery extends BaseQuery<Classification> {
/** /**
* Add your parentClassification to your query. * Add your key to your query.
* @param parentClassificationId * @param key
* as String
* @return the query
*/
ClassificationQuery key(String... key);
/**
* Add your parentClassificationKey to your query.
* @param parentClassificationKey
* as String * as String
* @return the query * @return the query
*/ */
ClassificationQuery parentClassification(String... parentClassificationId); ClassificationQuery parentClassificationKey(String... parentClassificationKey);
/** /**
* Add your category to your query. * Add your category to your query.
@ -85,6 +93,13 @@ public interface ClassificationQuery extends BaseQuery<Classification> {
*/ */
ClassificationQuery serviceLevel(String... serviceLevel); ClassificationQuery serviceLevel(String... serviceLevel);
/**
* Add your applicationEntryPoint to your query.
* @param applicationEntryPoint TODO
* @return the query
*/
ClassificationQuery applicationEntryPoint(String... applicationEntryPoint);
/** /**
* Add your customFields to your query. * Add your customFields to your query.
* @param customFields TODO * @param customFields TODO

14
lib/taskana-core/src/main/java/pro/taskana/ClassificationService.java
View File

@ -19,23 +19,23 @@ public interface ClassificationService {
List<Classification> getClassificationTree() throws NotAuthorizedException; List<Classification> getClassificationTree() throws NotAuthorizedException;
/** /**
* Get all Classifications with the given id. * Get all Classifications with the given key.
* Returns also older and domain-specific versions of the classification. * Returns also older and domain-specific versions of the classification.
* *
* @param id TODO * @param key TODO
* @param domain TODO * @param domain TODO
* @return List with all versions of the Classification * @return List with all versions of the Classification
*/ */
List<Classification> getAllClassificationsWithId(String id, String domain); List<Classification> getAllClassificationsWithKey(String key, String domain);
/** /**
* Get the Classification for id and domain. * Get the Classification for key and domain. If there's no specification for the given domain, it returns the root domain.
* @param id TODO * @param key TODO
* @param domain TODO * @param domain TODO
* @return If exist: domain-specific classification, else default classification * @return If exist: domain-specific classification, else root classification
* @throws ClassificationNotFoundException TODO * @throws ClassificationNotFoundException TODO
*/ */
Classification getClassification(String id, String domain) throws ClassificationNotFoundException; Classification getClassification(String key, String domain) throws ClassificationNotFoundException;
/** /**
* Persist a new classification. If the classification does * Persist a new classification. If the classification does

51
lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java
View File

@ -22,7 +22,8 @@ public class ClassificationQueryImpl implements ClassificationQuery {
private static final String LINK_TO_MAPPER = "pro.taskana.model.mappings.QueryMapper.queryClassification"; private static final String LINK_TO_MAPPER = "pro.taskana.model.mappings.QueryMapper.queryClassification";
private static final Logger LOGGER = LoggerFactory.getLogger(ClassificationQueryImpl.class); private static final Logger LOGGER = LoggerFactory.getLogger(ClassificationQueryImpl.class);
private TaskanaEngineImpl taskanaEngineImpl; private TaskanaEngineImpl taskanaEngineImpl;
private String[] parentClassificationId; private String[] key;
private String[] parentClassificationKey;
private String[] category; private String[] category;
private String[] type; private String[] type;
private String[] domain; private String[] domain;
@ -36,13 +37,23 @@ public class ClassificationQueryImpl implements ClassificationQuery {
private Date[] validFrom; private Date[] validFrom;
private Date[] validUntil; private Date[] validUntil;
private String[] applicationEntryPoint;
public ClassificationQueryImpl(TaskanaEngine taskanaEngine) { public ClassificationQueryImpl(TaskanaEngine taskanaEngine) {
this.taskanaEngineImpl = (TaskanaEngineImpl) taskanaEngine; this.taskanaEngineImpl = (TaskanaEngineImpl) taskanaEngine;
} }
@Override @Override
public ClassificationQuery parentClassification(String... parentClassificationId) { public ClassificationQuery key(String... key) {
this.parentClassificationId = parentClassificationId; this.key = key;
return this;
}
@Override
public ClassificationQuery parentClassificationKey(String... parentClassificationKey) {
this.parentClassificationKey = parentClassificationKey;
return this; return this;
} }
@ -100,6 +111,12 @@ public class ClassificationQueryImpl implements ClassificationQuery {
return this; return this;
} }
@Override
public ClassificationQuery applicationEntryPoint(String... applicationEntryPoint) {
this.applicationEntryPoint = applicationEntryPoint;
return this;
}
@Override @Override
public ClassificationQuery customFields(String... customFields) { public ClassificationQuery customFields(String... customFields) {
this.customFields = customFields; this.customFields = customFields;
@ -167,12 +184,20 @@ public class ClassificationQueryImpl implements ClassificationQuery {
} }
} }
public String[] getParentClassificationId() { public String[] getKey() {
return parentClassificationId; return key;
} }
public void setParentClassificationId(String[] parentClassificationId) { public void setKey(String[] key) {
this.parentClassificationId = parentClassificationId; this.key = key;
}
public String[] getParentClassificationKey() {
return parentClassificationKey;
}
public void setParentClassificationKey(String[] parentClassificationKey) {
this.parentClassificationKey = parentClassificationKey;
} }
public String[] getCategory() { public String[] getCategory() {
@ -247,6 +272,14 @@ public class ClassificationQueryImpl implements ClassificationQuery {
this.created = created; this.created = created;
} }
public String[] getApplicationEntryPoint() {
return applicationEntryPoint;
}
public void setApplicationEntryPoint(String[] applicationEntryPoint) {
this.applicationEntryPoint = applicationEntryPoint;
}
public String[] getCustomFields() { public String[] getCustomFields() {
return customFields; return customFields;
} }
@ -276,8 +309,8 @@ public class ClassificationQueryImpl implements ClassificationQuery {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.append("ClassificationQueryImpl [taskanaEngineImpl="); builder.append("ClassificationQueryImpl [taskanaEngineImpl=");
builder.append(taskanaEngineImpl); builder.append(taskanaEngineImpl);
builder.append(", parentClassificationId="); builder.append(", parentClassificationKey=");
builder.append(Arrays.toString(parentClassificationId)); builder.append(Arrays.toString(parentClassificationKey));
builder.append(", category="); builder.append(", category=");
builder.append(Arrays.toString(category)); builder.append(Arrays.toString(category));
builder.append(", type="); builder.append(", type=");

92
lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java
View File

@ -5,6 +5,7 @@ import java.time.Duration;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.UUID;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -50,7 +51,7 @@ public class ClassificationServiceImpl implements ClassificationService {
taskanaEngineImpl.openConnection(); taskanaEngineImpl.openConnection();
List<Classification> rootClassifications; List<Classification> rootClassifications;
rootClassifications = this.createClassificationQuery() rootClassifications = this.createClassificationQuery()
.parentClassification("") .parentClassificationKey("")
.validUntil(CURRENT_CLASSIFICATIONS_VALID_UNTIL) .validUntil(CURRENT_CLASSIFICATIONS_VALID_UNTIL)
.list(); .list();
rootClassifications = this.populateChildClassifications(rootClassifications); rootClassifications = this.populateChildClassifications(rootClassifications);
@ -72,7 +73,7 @@ public class ClassificationServiceImpl implements ClassificationService {
List<Classification> children = new ArrayList<>(); List<Classification> children = new ArrayList<>();
for (Classification classification : classifications) { for (Classification classification : classifications) {
List<Classification> childClassifications = this.createClassificationQuery() List<Classification> childClassifications = this.createClassificationQuery()
.parentClassification(classification.getId()) .parentClassificationKey(classification.getKey())
.validUntil(CURRENT_CLASSIFICATIONS_VALID_UNTIL) .validUntil(CURRENT_CLASSIFICATIONS_VALID_UNTIL)
.list(); .list();
children.addAll(populateChildClassifications(childClassifications)); children.addAll(populateChildClassifications(childClassifications));
@ -87,13 +88,15 @@ public class ClassificationServiceImpl implements ClassificationService {
@Override @Override
public void createClassification(Classification classification) throws ClassificationAlreadyExistException { public void createClassification(Classification classification) throws ClassificationAlreadyExistException {
LOGGER.debug("entry to createClassification(classification = {})", classification); LOGGER.debug("entry to createClassification(classification = {})", classification);
Date date = Date.valueOf(LocalDate.now());
try { try {
taskanaEngineImpl.openConnection(); taskanaEngineImpl.openConnection();
ClassificationImpl classificationImpl = (ClassificationImpl) classification; ClassificationImpl classificationImpl = (ClassificationImpl) classification;
this.setDefaultValues(classificationImpl); classificationImpl.setCreated(date);
this.validateClassification(classificationImpl);
Classification oldClassification; Classification oldClassification;
try { try {
oldClassification = this.getClassification(classificationImpl.getId(), classificationImpl.getDomain()); oldClassification = this.getClassification(classificationImpl.getKey(), classificationImpl.getDomain());
} catch (ClassificationNotFoundException e) { } catch (ClassificationNotFoundException e) {
oldClassification = null; oldClassification = null;
} }
@ -107,7 +110,7 @@ public class ClassificationServiceImpl implements ClassificationService {
LOGGER.debug("Method createClassification created classification {}.", classification); LOGGER.debug("Method createClassification created classification {}.", classification);
} }
} else { } else {
throw new ClassificationAlreadyExistException(classificationImpl.getId()); throw new ClassificationAlreadyExistException(classificationImpl.getKey());
} }
} finally { } finally {
taskanaEngineImpl.returnConnection(); taskanaEngineImpl.returnConnection();
@ -121,32 +124,21 @@ public class ClassificationServiceImpl implements ClassificationService {
try { try {
taskanaEngineImpl.openConnection(); taskanaEngineImpl.openConnection();
ClassificationImpl classificationImpl = (ClassificationImpl) classification; ClassificationImpl classificationImpl = (ClassificationImpl) classification;
this.setDefaultValues(classificationImpl); this.validateClassification(classificationImpl);
ClassificationImpl oldClassification = null; ClassificationImpl oldClassification = null;
try { try {
oldClassification = (ClassificationImpl) this.getClassification(classificationImpl.getId(), oldClassification = (ClassificationImpl) this.getClassification(classificationImpl.getKey(), classificationImpl.getDomain());
classificationImpl.getDomain());
LOGGER.debug("Method updateClassification() inserted classification {}.", classificationImpl); LOGGER.debug("Method updateClassification() inserted classification {}.", classificationImpl);
if (oldClassification == null) {
throw new ClassificationNotFoundException(
"Classification not found. ID: " + classificationImpl.getId());
}
// ! If you update an classification twice the same day, // ! If you update an classification twice the same day,
// the older version is valid from today until yesterday. // the older version is valid from today until yesterday.
if (!oldClassification.getDomain().equals(classificationImpl.getDomain())) { if (!oldClassification.getDomain().equals(classificationImpl.getDomain())) {
classificationImpl.setCreated(Date.valueOf(LocalDate.now())); addClassificationToDomain(classificationImpl);
classificationMapper.insert(classificationImpl);
LOGGER.debug("Method updateClassification() inserted classification {}.", classification);
} else { } else {
oldClassification.setValidUntil(Date.valueOf(LocalDate.now().minusDays(1))); updateExistingClassification(oldClassification, classificationImpl);
classificationMapper.update(oldClassification);
classificationMapper.insert(classificationImpl);
LOGGER.debug("Method updateClassification() updated old classification {} and inserted new {}.",
oldClassification, classificationImpl);
} }
} catch (ClassificationNotFoundException e) { } catch (ClassificationNotFoundException e) {
classificationImpl.setId(IdGenerator.generateWithPrefix(ID_PREFIX_CLASSIFICATION)); classificationImpl.setId(IdGenerator.generateWithPrefix(ID_PREFIX_CLASSIFICATION)); //TODO
classificationImpl.setCreated(Date.valueOf(LocalDate.now())); classificationImpl.setCreated(Date.valueOf(LocalDate.now()));
classificationMapper.insert(classificationImpl); classificationMapper.insert(classificationImpl);
LOGGER.debug("Method updateClassification() inserted classification {}.", classificationImpl); LOGGER.debug("Method updateClassification() inserted classification {}.", classificationImpl);
@ -157,7 +149,13 @@ public class ClassificationServiceImpl implements ClassificationService {
} }
} }
private void setDefaultValues(ClassificationImpl classification) { /**
* Fill missing values and validate classification before saving the classification.
* @param classification
*/
private void validateClassification(ClassificationImpl classification) throws IllegalStateException {
classification.setId(UUID.randomUUID().toString());
classification.setValidFrom(Date.valueOf(LocalDate.now())); classification.setValidFrom(Date.valueOf(LocalDate.now()));
classification.setValidUntil(CURRENT_CLASSIFICATIONS_VALID_UNTIL); classification.setValidUntil(CURRENT_CLASSIFICATIONS_VALID_UNTIL);
@ -173,8 +171,8 @@ public class ClassificationServiceImpl implements ClassificationService {
} }
} }
if (classification.getId() == null) { if (classification.getKey() == null) {
classification.setId(IdGenerator.generateWithPrefix(ID_PREFIX_CLASSIFICATION)); throw new IllegalStateException("Classification must contain a key");
} }
if (classification.getParentClassificationKey() == null) { if (classification.getParentClassificationKey() == null) {
@ -186,13 +184,36 @@ public class ClassificationServiceImpl implements ClassificationService {
} }
} }
/**
* Add a new Classification if this Classification Key is not yet specified for this domain.
* @param classification
*/
private void addClassificationToDomain(ClassificationImpl classification) {
classification.setCreated(Date.valueOf(LocalDate.now()));
classificationMapper.insert(classification);
LOGGER.debug("Method updateClassification() inserted classification {}.", classification);
}
/**
* Set the validUntil-Date of the oldClassification to yesterday and inserts the new Classification.
* @param oldClassification
* @param newClassification
*/
private void updateExistingClassification(ClassificationImpl oldClassification, ClassificationImpl newClassification) {
oldClassification.setValidUntil(Date.valueOf(LocalDate.now().minusDays(1)));
classificationMapper.update(oldClassification);
classificationMapper.insert(newClassification);
LOGGER.debug("Method updateClassification() updated old classification {} and inserted new {}.",
oldClassification, newClassification);
}
@Override @Override
public List<Classification> getAllClassificationsWithId(String id, String domain) { public List<Classification> getAllClassificationsWithKey(String key, String domain) {
LOGGER.debug("entry to getAllClassificationsWithId(id = {}, domain = {})", id, domain); LOGGER.debug("entry to getAllClassificationsWithKey(key = {}, domain = {})", key, domain);
List<Classification> result = null; List<Classification> result = null;
try { try {
taskanaEngineImpl.openConnection(); taskanaEngineImpl.openConnection();
List<ClassificationImpl> classifications = classificationMapper.getAllClassificationsWithId(id, domain); List<ClassificationImpl> classifications = classificationMapper.getAllClassificationsWithKey(key, domain);
List<Classification> results = new ArrayList<>(); List<Classification> results = new ArrayList<>();
classifications.stream().forEach(c -> results.add((Classification) c)); classifications.stream().forEach(c -> results.add((Classification) c));
return results; return results;
@ -200,27 +221,27 @@ public class ClassificationServiceImpl implements ClassificationService {
taskanaEngineImpl.returnConnection(); taskanaEngineImpl.returnConnection();
if (LOGGER.isDebugEnabled()) { if (LOGGER.isDebugEnabled()) {
int numberOfResultObjects = result == null ? 0 : result.size(); int numberOfResultObjects = result == null ? 0 : result.size();
LOGGER.debug("exit from getAllClassificationsWithId(). Returning {} resulting Objects: {} ", LOGGER.debug("exit from getAllClassificationsWithKey(). Returning {} resulting Objects: {} ",
numberOfResultObjects, LoggerUtils.listToString(result)); numberOfResultObjects, LoggerUtils.listToString(result));
} }
} }
} }
@Override @Override
public Classification getClassification(String id, String domain) throws ClassificationNotFoundException { public Classification getClassification(String key, String domain) throws ClassificationNotFoundException {
if (id == null) { if (key == null) {
throw new ClassificationNotFoundException(null); throw new ClassificationNotFoundException(null);
} }
LOGGER.debug("entry to getClassification(id = {}, domain = {})", id, domain); LOGGER.debug("entry to getClassification(key = {}, domain = {})", key, domain);
Classification result = null; Classification result = null;
try { try {
taskanaEngineImpl.openConnection(); taskanaEngineImpl.openConnection();
result = classificationMapper.findByIdAndDomain(id, domain, CURRENT_CLASSIFICATIONS_VALID_UNTIL); result = classificationMapper.findByKeyAndDomain(key, domain, CURRENT_CLASSIFICATIONS_VALID_UNTIL);
if (result == null) { if (result == null) {
result = classificationMapper.findByIdAndDomain(id, "", CURRENT_CLASSIFICATIONS_VALID_UNTIL); result = classificationMapper.findByKeyAndDomain(key, "", CURRENT_CLASSIFICATIONS_VALID_UNTIL);
} }
if (result == null) { if (result == null) {
throw new ClassificationNotFoundException(id); throw new ClassificationNotFoundException(key);
} }
return result; return result;
@ -237,10 +258,7 @@ public class ClassificationServiceImpl implements ClassificationService {
@Override @Override
public Classification newClassification() { public Classification newClassification() {
Date date = Date.valueOf(LocalDate.now());
ClassificationImpl classification = new ClassificationImpl(); ClassificationImpl classification = new ClassificationImpl();
this.setDefaultValues(classification);
classification.setCreated(date);
return classification; return classification;
} }
} }

2
lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java
View File

@ -147,7 +147,7 @@ public class TaskServiceImpl implements TaskService {
if (classification == null) { if (classification == null) {
throw new ClassificationNotFoundException(null); throw new ClassificationNotFoundException(null);
} }
taskanaEngine.getClassificationService().getClassification(classification.getId(), ""); taskanaEngine.getClassificationService().getClassification(classification.getKey(), "");
standardSettings(task); standardSettings(task);

4
lib/taskana-core/src/main/java/pro/taskana/model/ClassificationImpl.java
View File

@ -284,6 +284,8 @@ public class ClassificationImpl implements Classification {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.append("Classification [id="); builder.append("Classification [id=");
builder.append(id); builder.append(id);
builder.append(", key=");
builder.append(key);
builder.append(", parentClassificationId="); builder.append(", parentClassificationId=");
builder.append(parentClassificationKey); builder.append(parentClassificationKey);
builder.append(", category="); builder.append(", category=");
@ -304,6 +306,8 @@ public class ClassificationImpl implements Classification {
builder.append(priority); builder.append(priority);
builder.append(", serviceLevel="); builder.append(", serviceLevel=");
builder.append(serviceLevel); builder.append(serviceLevel);
builder.append(", applicationEntryPoint=");
builder.append(applicationEntryPoint);
builder.append(", custom1="); builder.append(", custom1=");
builder.append(custom1); builder.append(custom1);
builder.append(", custom2="); builder.append(", custom2=");

20
lib/taskana-core/src/main/java/pro/taskana/model/TaskSummary.java
View File

@ -10,7 +10,7 @@ public class TaskSummary {
private String taskName; private String taskName;
private String workbasketId; private String workbasketId;
private String workbasketName; private String workbasketName;
private String classificationId; private String classificationKey;
private String classificationName; private String classificationName;
public String getTaskId() { public String getTaskId() {
@ -37,11 +37,11 @@ public class TaskSummary {
public void setWorkbasketName(String workbasketName) { public void setWorkbasketName(String workbasketName) {
this.workbasketName = workbasketName; this.workbasketName = workbasketName;
} }
public String getClassificationId() { public String getClassificationKey() {
return classificationId; return classificationKey;
} }
public void setClassificationId(String classificationId) { public void setClassificationKey(String classificationKey) {
this.classificationId = classificationId; this.classificationKey = classificationKey;
} }
public String getClassificationName() { public String getClassificationName() {
return classificationName; return classificationName;
@ -54,7 +54,7 @@ public class TaskSummary {
public int hashCode() { public int hashCode() {
final int prime = 31; final int prime = 31;
int result = 1; int result = 1;
result = prime * result + ((classificationId == null) ? 0 : classificationId.hashCode()); result = prime * result + ((classificationKey == null) ? 0 : classificationKey.hashCode());
result = prime * result + ((classificationName == null) ? 0 : classificationName.hashCode()); result = prime * result + ((classificationName == null) ? 0 : classificationName.hashCode());
result = prime * result + ((taskId == null) ? 0 : taskId.hashCode()); result = prime * result + ((taskId == null) ? 0 : taskId.hashCode());
result = prime * result + ((taskName == null) ? 0 : taskName.hashCode()); result = prime * result + ((taskName == null) ? 0 : taskName.hashCode());
@ -75,11 +75,11 @@ public class TaskSummary {
return false; return false;
} }
TaskSummary other = (TaskSummary) obj; TaskSummary other = (TaskSummary) obj;
if (classificationId == null) { if (classificationKey == null) {
if (other.classificationId != null) { if (other.classificationKey != null) {
return false; return false;
} }
} else if (!classificationId.equals(other.classificationId)) { } else if (!classificationKey.equals(other.classificationKey)) {
return false; return false;
} }
if (classificationName == null) { if (classificationName == null) {
@ -123,7 +123,7 @@ public class TaskSummary {
@Override @Override
public String toString() { public String toString() {
return "TaskSummary [taskId=" + taskId + ", taskName=" + taskName + ", workbasketId=" + workbasketId return "TaskSummary [taskId=" + taskId + ", taskName=" + taskName + ", workbasketId=" + workbasketId
+ ", workbasketName=" + workbasketName + ", classificationId=" + classificationId + ", workbasketName=" + workbasketName + ", classificationKey=" + classificationKey
+ ", classificationName=" + classificationName + "]"; + ", classificationName=" + classificationName + "]";
} }
} }

45
lib/taskana-core/src/main/java/pro/taskana/model/mappings/ClassificationMapper.java
View File

@ -19,9 +19,39 @@ public interface ClassificationMapper {
String VALID_UNTIL = "9999-12-31"; String VALID_UNTIL = "9999-12-31";
@Select("SELECT ID, KEY, PARENT_CLASSIFICATION_KEY, CATEGORY, TYPE, DOMAIN, VALID_IN_DOMAIN, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL, APPLICATION_ENTRY_POINT, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, VALID_FROM, VALID_UNTIL "
+ "FROM CLASSIFICATION "
+ "WHERE KEY = #{key}"
+ "AND DOMAIN = ''"
+ "AND VALID_UNTIL = VALID_UNTIL")
@Results({ @Result(property = "id", column = "ID"),
@Result(property = "key", column = "KEY"),
@Result(property = "parentClassificationKey", column = "PARENT_CLASSIFICATION_KEY"),
@Result(property = "category", column = "CATEGORY"),
@Result(property = "type", column = "TYPE"),
@Result(property = "domain", column = "DOMAIN"),
@Result(property = "isValidInDomain", column = "VALID_IN_DOMAIN"),
@Result(property = "created", column = "CREATED"),
@Result(property = "name", column = "NAME"),
@Result(property = "description", column = "DESCRIPTION"),
@Result(property = "priority", column = "PRIORITY"),
@Result(property = "serviceLevel", column = "SERVICE_LEVEL"),
@Result(property = "applicationEntryPoint", column = "APPLICATION_ENTRY_POINT"),
@Result(property = "custom1", column = "CUSTOM_1"),
@Result(property = "custom2", column = "CUSTOM_2"),
@Result(property = "custom3", column = "CUSTOM_3"),
@Result(property = "custom4", column = "CUSTOM_4"),
@Result(property = "custom5", column = "CUSTOM_5"),
@Result(property = "custom6", column = "CUSTOM_6"),
@Result(property = "custom7", column = "CUSTOM_7"),
@Result(property = "custom8", column = "CUSTOM_8"),
@Result(property = "validFrom", column = "VALID_FROM"),
@Result(property = "validUntil", column = "VALID_UNTIL") })
ClassificationImpl findByKeyRootDomain(@Param("key") String key);
@Select("SELECT ID, KEY, PARENT_CLASSIFICATION_KEY, CATEGORY, TYPE, DOMAIN, VALID_IN_DOMAIN, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL, APPLICATION_ENTRY_POINT, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, VALID_FROM, VALID_UNTIL " @Select("SELECT ID, KEY, PARENT_CLASSIFICATION_KEY, CATEGORY, TYPE, DOMAIN, VALID_IN_DOMAIN, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL, APPLICATION_ENTRY_POINT, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, VALID_FROM, VALID_UNTIL "
+ "FROM CLASSIFICATION " + "FROM CLASSIFICATION "
+ "WHERE ID = #{id}" + "WHERE KEY = #{key}"
+ "AND DOMAIN = #{domain}" + "AND DOMAIN = #{domain}"
+ "AND VALID_UNTIL = #{valid_until}") + "AND VALID_UNTIL = #{valid_until}")
@Results({ @Result(property = "id", column = "ID"), @Results({ @Result(property = "id", column = "ID"),
@ -47,13 +77,12 @@ public interface ClassificationMapper {
@Result(property = "custom8", column = "CUSTOM_8"), @Result(property = "custom8", column = "CUSTOM_8"),
@Result(property = "validFrom", column = "VALID_FROM"), @Result(property = "validFrom", column = "VALID_FROM"),
@Result(property = "validUntil", column = "VALID_UNTIL") }) @Result(property = "validUntil", column = "VALID_UNTIL") })
ClassificationImpl findByIdAndDomain(@Param("id") String id, @Param("domain") String domain, ClassificationImpl findByKeyAndDomain(@Param("key") String key, @Param("domain") String domain,
@Param("valid_until") Date validUntil); @Param("valid_until") Date validUntil);
@Select("SELECT ID, KEY, PARENT_CLASSIFICATION_KEY, CATEGORY, TYPE, DOMAIN, VALID_IN_DOMAIN, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL, APPLICATION_ENTRY_POINT, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, VALID_FROM, VALID_UNTIL " @Select("SELECT ID, KEY, PARENT_CLASSIFICATION_KEY, CATEGORY, TYPE, DOMAIN, VALID_IN_DOMAIN, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL, APPLICATION_ENTRY_POINT, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, VALID_FROM, VALID_UNTIL "
+ "FROM CLASSIFICATION " + "FROM CLASSIFICATION "
+ "WHERE ID = #{id} " + "WHERE ID = #{id} ")
+ "AND VALID_UNTIL = '" + VALID_UNTIL + "'")
@Results({ @Result(property = "id", column = "ID"), @Results({ @Result(property = "id", column = "ID"),
@Result(property = "key", column = "KEY"), @Result(property = "key", column = "KEY"),
@Result(property = "parentClassificationKey", column = "PARENT_CLASSIFICATION_KEY"), @Result(property = "parentClassificationKey", column = "PARENT_CLASSIFICATION_KEY"),
@ -83,13 +112,13 @@ public interface ClassificationMapper {
void insert(@Param("classification") ClassificationImpl classification); void insert(@Param("classification") ClassificationImpl classification);
@Update( @Update(
value = "UPDATE CLASSIFICATION SET KEY = #{classification.key}, PARENT_CLASSIFICATION_KEY = #{classification.parentClassificationKey}, CATEGORY = #{classification.category}, TYPE = #{classification.type}, NAME = #{classification.name}, DESCRIPTION = #{classification.description}, PRIORITY = #{classification.priority}, SERVICE_LEVEL = #{classification.serviceLevel}, APPLICATION_ENTRY_POINT = #{classification.applicationEntryPoint}, DOMAIN = #{classification.domain}, VALID_IN_DOMAIN = #{classification.isValidInDomain}, CUSTOM_1 = #{classification.custom1}, CUSTOM_2 = #{classification.custom2}, CUSTOM_3 = #{classification.custom3}, CUSTOM_4 = #{classification.custom4}, CUSTOM_5 = #{classification.custom5}, CUSTOM_6 = #{classification.custom6}, CUSTOM_7 = #{classification.custom7}, CUSTOM_8 = #{classification.custom8}, VALID_FROM = #{classification.validFrom}, VALID_UNTIL = #{classification.validUntil} WHERE ID = #{classification.id}") value = "UPDATE CLASSIFICATION SET KEY = #{classification.key}, PARENT_CLASSIFICATION_KEY = #{classification.parentClassificationKey}, CATEGORY = #{classification.category}, TYPE = #{classification.type}, NAME = #{classification.name}, DESCRIPTION = #{classification.description}, PRIORITY = #{classification.priority}, SERVICE_LEVEL = #{classification.serviceLevel}, DOMAIN = #{classification.domain}, VALID_IN_DOMAIN = #{classification.isValidInDomain}, APPLICATION_ENTRY_POINT = #{classification.applicationEntryPoint}, CUSTOM_1 = #{classification.custom1}, CUSTOM_2 = #{classification.custom2}, CUSTOM_3 = #{classification.custom3}, CUSTOM_4 = #{classification.custom4}, CUSTOM_5 = #{classification.custom5}, CUSTOM_6 = #{classification.custom6}, CUSTOM_7 = #{classification.custom7}, CUSTOM_8 = #{classification.custom8}, VALID_FROM = #{classification.validFrom}, VALID_UNTIL = #{classification.validUntil} WHERE ID = #{classification.id}")
void update(@Param("classification") ClassificationImpl classification); void update(@Param("classification") ClassificationImpl classification);
@Select("<script>" @Select("<script>"
+ "SELECT * " + "SELECT * "
+ "FROM CLASSIFICATION " + "FROM CLASSIFICATION "
+ "WHERE ID = #{id} " + "WHERE KEY = #{key} "
+ "AND DOMAIN = #{domain}" + "AND DOMAIN = #{domain}"
+ "ORDER BY VALID_FROM DESC" + "ORDER BY VALID_FROM DESC"
+ "</script>") + "</script>")
@ -116,5 +145,5 @@ public interface ClassificationMapper {
@Result(property = "custom8", column = "CUSTOM_8"), @Result(property = "custom8", column = "CUSTOM_8"),
@Result(property = "validFrom", column = "VALID_FROM"), @Result(property = "validFrom", column = "VALID_FROM"),
@Result(property = "validUntil", column = "VALID_UNTIL") }) @Result(property = "validUntil", column = "VALID_UNTIL") })
List<ClassificationImpl> getAllClassificationsWithId(@Param("id") String id, @Param("domain") String domain); List<ClassificationImpl> getAllClassificationsWithKey(@Param("key") String key, @Param("domain") String domain);
} }

16
lib/taskana-core/src/main/java/pro/taskana/model/mappings/QueryMapper.java
View File

@ -23,13 +23,13 @@ import pro.taskana.model.Workbasket;
public interface QueryMapper { public interface QueryMapper {
String OBJECTREFERENCEMAPPER_FINDBYID = "pro.taskana.model.mappings.ObjectReferenceMapper.findById"; String OBJECTREFERENCEMAPPER_FINDBYID = "pro.taskana.model.mappings.ObjectReferenceMapper.findById";
String CLASSIFICATION_FINDBYIDANDDOMAIN = "pro.taskana.model.mappings.ClassificationMapper.findByIdAndDomain"; String CLASSIFICATION_FINDBYIDANDDOMAIN = "pro.taskana.model.mappings.ClassificationMapper.findByKeyAndDomain";
String CLASSIFICATION_FINDBYID = "pro.taskana.model.mappings.ClassificationMapper.findById"; String CLASSIFICATION_FINDBYID = "pro.taskana.model.mappings.ClassificationMapper.findById";
@Select("<script>SELECT t.ID, t.CREATED, t.CLAIMED, t.COMPLETED, t.MODIFIED, t.PLANNED, t.DUE, t.NAME, t.DESCRIPTION, t.PRIORITY, t.STATE, t.CLASSIFICATION_ID, t.WORKBASKETID, t.OWNER, t.PRIMARY_OBJ_REF_ID, t.IS_READ, t.IS_TRANSFERRED, t.CUSTOM_1, t.CUSTOM_2, t.CUSTOM_3, t.CUSTOM_4, t.CUSTOM_5, t.CUSTOM_6, t.CUSTOM_7, t.CUSTOM_8, t.CUSTOM_9, t.CUSTOM_10 " @Select("<script>SELECT t.ID, t.CREATED, t.CLAIMED, t.COMPLETED, t.MODIFIED, t.PLANNED, t.DUE, t.NAME, t.DESCRIPTION, t.PRIORITY, t.STATE, t.CLASSIFICATION_KEY, t.WORKBASKETID, t.OWNER, t.PRIMARY_OBJ_REF_ID, t.IS_READ, t.IS_TRANSFERRED, t.CUSTOM_1, t.CUSTOM_2, t.CUSTOM_3, t.CUSTOM_4, t.CUSTOM_5, t.CUSTOM_6, t.CUSTOM_7, t.CUSTOM_8, t.CUSTOM_9, t.CUSTOM_10 "
+ "FROM TASK t " + "FROM TASK t "
// Joins if Classification or Object Reference Query is needed // Joins if Classification or Object Reference Query is needed
+ "<if test='classificationQuery != null'>LEFT OUTER JOIN CLASSIFICATION c on t.CLASSIFICATION_ID = c.ID</if> " + "<if test='classificationQuery != null'>LEFT OUTER JOIN CLASSIFICATION c on t.CLASSIFICATION_KEY = c.KEY</if> "
+ "<if test='objectReferenceQuery != null'>LEFT OUTER JOIN OBJECT_REFERENCE o on t.PRIMARY_OBJ_REF_ID = o.ID</if> " + "<if test='objectReferenceQuery != null'>LEFT OUTER JOIN OBJECT_REFERENCE o on t.PRIMARY_OBJ_REF_ID = o.ID</if> "
+ "<where>" + "<where>"
+ "<if test='name != null'>AND t.NAME IN(<foreach item='item' collection='name' separator=',' >#{item}</foreach>)</if> " + "<if test='name != null'>AND t.NAME IN(<foreach item='item' collection='name' separator=',' >#{item}</foreach>)</if> "
@ -43,7 +43,8 @@ public interface QueryMapper {
+ "<if test='customFields != null'>AND (t.CUSTOM_1 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_2 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_3 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_4 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_5 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_6 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_7 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_8 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_9 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_10 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>))</if> " + "<if test='customFields != null'>AND (t.CUSTOM_1 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_2 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_3 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_4 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_5 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_6 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_7 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_8 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_9 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_10 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>))</if> "
// Classification Query // Classification Query
+ "<if test='classificationQuery != null'>" + "<if test='classificationQuery != null'>"
+ "<if test='classificationQuery.parentClassificationId != null'>AND c.PARENT_CLASSIFICATION_ID IN(<foreach item='item' collection='classificationQuery.parentClassificationId' separator=',' >#{item}</foreach>)</if> " + "<if test='classificationQuery.key != null'>AND c.KEY IN(<foreach item='item' collection='classificationQuery.key' separator=',' >#{item}</foreach>)</if> "
+ "<if test='classificationQuery.parentClassificationKey != null'>AND c.PARENT_CLASSIFICATION_KEY IN(<foreach item='item' collection='classificationQuery.parentClassificationKey' separator=',' >#{item}</foreach>)</if> "
+ "<if test='classificationQuery.category != null'>AND c.CATEGORY IN(<foreach item='item' collection='classificationQuery.category' separator=',' >#{item}</foreach>)</if> " + "<if test='classificationQuery.category != null'>AND c.CATEGORY IN(<foreach item='item' collection='classificationQuery.category' separator=',' >#{item}</foreach>)</if> "
+ "<if test='classificationQuery.type != null'>AND c.TYPE IN(<foreach item='item' collection='classificationQuery.type' separator=',' >#{item}</foreach>)</if> " + "<if test='classificationQuery.type != null'>AND c.TYPE IN(<foreach item='item' collection='classificationQuery.type' separator=',' >#{item}</foreach>)</if> "
+ "<if test='classificationQuery.domain != null'>AND c.DOMAIN IN(<foreach item='item' collection='classificationQuery.domain' separator=',' >#{item}</foreach>)</if> " + "<if test='classificationQuery.domain != null'>AND c.DOMAIN IN(<foreach item='item' collection='classificationQuery.domain' separator=',' >#{item}</foreach>)</if> "
@ -53,6 +54,7 @@ public interface QueryMapper {
+ "<if test='classificationQuery.description != null'>AND c.DESCRIPTION like #{classificationQuery.description}</if> " + "<if test='classificationQuery.description != null'>AND c.DESCRIPTION like #{classificationQuery.description}</if> "
+ "<if test='classificationQuery.priority != null'>AND c.PRIORITY IN(<foreach item='item' collection='classificationQuery.priority' separator=',' >#{item}</foreach>)</if> " + "<if test='classificationQuery.priority != null'>AND c.PRIORITY IN(<foreach item='item' collection='classificationQuery.priority' separator=',' >#{item}</foreach>)</if> "
+ "<if test='classificationQuery.serviceLevel != null'>AND c.SERVICE_LEVEL IN(<foreach item='item' collection='classificationQuery.serviceLevel' separator=',' >#{item}</foreach>)</if> " + "<if test='classificationQuery.serviceLevel != null'>AND c.SERVICE_LEVEL IN(<foreach item='item' collection='classificationQuery.serviceLevel' separator=',' >#{item}</foreach>)</if> "
+ "<if test='classificationQuery.applicationEntryPoint != null'>AND c.APPLICATION_ENTRY_POINT IN(<foreach item='item' collection='classificationQuery.applicationEntryPoint' separator=',' >#{item}</foreach>)</if> "
+ "<if test='classificationQuery.customFields != null'>AND (c.CUSTOM_1 IN(<foreach item='item' collection='classificationQuery.customFields' separator=',' >#{item}</foreach>) OR c.CUSTOM_2 IN(<foreach item='item' collection='classificationQuery.customFields' separator=',' >#{item}</foreach>) OR c.CUSTOM_3 IN(<foreach item='item' collection='classificationQuery.customFields' separator=',' >#{item}</foreach>) OR c.CUSTOM_4 IN(<foreach item='item' collection='classificationQuery.customFields' separator=',' >#{item}</foreach>) OR c.CUSTOM_5 IN(<foreach item='item' collection='classificationQuery.customFields' separator=',' >#{item}</foreach>) OR c.CUSTOM_6 IN(<foreach item='item' collection='classificationQuery.customFields' separator=',' >#{item}</foreach>) OR c.CUSTOM_7 IN(<foreach item='item' collection='classificationQuery.customFields' separator=',' >#{item}</foreach>) OR c.CUSTOM_8 IN(<foreach item='item' collection='classificationQuery.customFields' separator=',' >#{item}</foreach>))</if> " + "<if test='classificationQuery.customFields != null'>AND (c.CUSTOM_1 IN(<foreach item='item' collection='classificationQuery.customFields' separator=',' >#{item}</foreach>) OR c.CUSTOM_2 IN(<foreach item='item' collection='classificationQuery.customFields' separator=',' >#{item}</foreach>) OR c.CUSTOM_3 IN(<foreach item='item' collection='classificationQuery.customFields' separator=',' >#{item}</foreach>) OR c.CUSTOM_4 IN(<foreach item='item' collection='classificationQuery.customFields' separator=',' >#{item}</foreach>) OR c.CUSTOM_5 IN(<foreach item='item' collection='classificationQuery.customFields' separator=',' >#{item}</foreach>) OR c.CUSTOM_6 IN(<foreach item='item' collection='classificationQuery.customFields' separator=',' >#{item}</foreach>) OR c.CUSTOM_7 IN(<foreach item='item' collection='classificationQuery.customFields' separator=',' >#{item}</foreach>) OR c.CUSTOM_8 IN(<foreach item='item' collection='classificationQuery.customFields' separator=',' >#{item}</foreach>))</if> "
+ "<if test='classificationQuery.validFrom != null'>AND c.VALID_FROM IN(<foreach item='item' collection='classificationQuery.validFrom' separator=',' >#{item}</foreach>)</if> " + "<if test='classificationQuery.validFrom != null'>AND c.VALID_FROM IN(<foreach item='item' collection='classificationQuery.validFrom' separator=',' >#{item}</foreach>)</if> "
+ "<if test='classificationQuery.validUntil != null'>AND c.VALID_UNTIL IN(<foreach item='item' collection='classificationQuery.validUntil' separator=',' >#{item}</foreach>)</if> " + "<if test='classificationQuery.validUntil != null'>AND c.VALID_UNTIL IN(<foreach item='item' collection='classificationQuery.validUntil' separator=',' >#{item}</foreach>)</if> "
@ -95,10 +97,11 @@ public interface QueryMapper {
@Result(property = "custom10", column = "CUSTOM_10") }) @Result(property = "custom10", column = "CUSTOM_10") })
List<Task> queryTasks(TaskQueryImpl taskQuery); List<Task> queryTasks(TaskQueryImpl taskQuery);
@Select("<script>SELECT ID, PARENT_CLASSIFICATION_ID, CATEGORY, TYPE, DOMAIN, VALID_IN_DOMAIN, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, VALID_FROM, VALID_UNTIL " @Select("<script>SELECT ID, KEY, PARENT_CLASSIFICATION_KEY, CATEGORY, TYPE, DOMAIN, VALID_IN_DOMAIN, CREATED, NAME, DESCRIPTION, PRIORITY, SERVICE_LEVEL, APPLICATION_ENTRY_POINT, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, VALID_FROM, VALID_UNTIL "
+ "FROM CLASSIFICATION " + "FROM CLASSIFICATION "
+ "<where>" + "<where>"
+ "<if test='parentClassificationId != null'>AND PARENT_CLASSIFICATION_ID IN(<foreach item='item' collection='parentClassificationId' separator=',' >#{item}</foreach>)</if> " + "<if test='key != null'>AND KEY IN(<foreach item='item' collection='key' separator=',' >#{item}</foreach>)</if> "
+ "<if test='parentClassificationKey != null'>AND PARENT_CLASSIFICATION_KEY IN(<foreach item='item' collection='parentClassificationKey' separator=',' >#{item}</foreach>)</if> "
+ "<if test='category != null'>AND CATEGORY IN(<foreach item='item' collection='category' separator=',' >#{item}</foreach>)</if> " + "<if test='category != null'>AND CATEGORY IN(<foreach item='item' collection='category' separator=',' >#{item}</foreach>)</if> "
+ "<if test='type != null'>AND TYPE IN(<foreach item='item' collection='type' separator=',' >#{item}</foreach>)</if> " + "<if test='type != null'>AND TYPE IN(<foreach item='item' collection='type' separator=',' >#{item}</foreach>)</if> "
+ "<if test='domain != null'>AND DOMAIN IN(<foreach item='item' collection='domain' separator=',' >#{item}</foreach>)</if> " + "<if test='domain != null'>AND DOMAIN IN(<foreach item='item' collection='domain' separator=',' >#{item}</foreach>)</if> "
@ -108,6 +111,7 @@ public interface QueryMapper {
+ "<if test='description != null'>AND DESCRIPTION like #{description}</if> " + "<if test='description != null'>AND DESCRIPTION like #{description}</if> "
+ "<if test='priority != null'>AND PRIORITY IN(<foreach item='item' collection='priority' separator=',' >#{item}</foreach>)</if> " + "<if test='priority != null'>AND PRIORITY IN(<foreach item='item' collection='priority' separator=',' >#{item}</foreach>)</if> "
+ "<if test='serviceLevel != null'>AND SERVICE_LEVEL IN(<foreach item='item' collection='serviceLevel' separator=',' >#{item}</foreach>)</if> " + "<if test='serviceLevel != null'>AND SERVICE_LEVEL IN(<foreach item='item' collection='serviceLevel' separator=',' >#{item}</foreach>)</if> "
+ "<if test='applicationEntryPoint != null'>AND APPLICATION_ENTRY_POINT IN(<foreach item='item' collection='applicationEntryPoint' separator=',' >#{item}</foreach>)</if> "
+ "<if test='customFields != null'>AND (CUSTOM_1 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_2 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_3 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_4 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_5 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_6 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_7 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_8 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>))</if> " + "<if test='customFields != null'>AND (CUSTOM_1 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_2 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_3 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_4 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_5 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_6 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_7 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR CUSTOM_8 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>))</if> "
+ "<if test='validFrom != null'>AND VALID_FROM IN(<foreach item='item' collection='validFrom' separator=',' >#{item}</foreach>)</if> " + "<if test='validFrom != null'>AND VALID_FROM IN(<foreach item='item' collection='validFrom' separator=',' >#{item}</foreach>)</if> "
+ "<if test='validUntil != null'>AND VALID_UNTIL IN(<foreach item='item' collection='validUntil' separator=',' >#{item}</foreach>)</if> " + "<if test='validUntil != null'>AND VALID_UNTIL IN(<foreach item='item' collection='validUntil' separator=',' >#{item}</foreach>)</if> "

22
lib/taskana-core/src/main/java/pro/taskana/model/mappings/TaskMapper.java
View File

@ -17,9 +17,9 @@ import java.util.Map;
public interface TaskMapper { public interface TaskMapper {
String OBJECTREFERENCEMAPPER_FINDBYID = "pro.taskana.model.mappings.ObjectReferenceMapper.findById"; String OBJECTREFERENCEMAPPER_FINDBYID = "pro.taskana.model.mappings.ObjectReferenceMapper.findById";
String CLASSIFICATION_FINDBYID = "pro.taskana.model.mappings.ClassificationMapper.findById"; String CLASSIFICATION_FINDBYKEYROOTDOMAIN = "pro.taskana.model.mappings.ClassificationMapper.findByKeyRootDomain";
@Select("SELECT ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, PRIORITY, STATE, CLASSIFICATION_ID, WORKBASKETID, BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, OWNER, PRIMARY_OBJ_REF_ID, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10 " @Select("SELECT ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, PRIORITY, STATE, CLASSIFICATION_KEY, WORKBASKETID, BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, OWNER, PRIMARY_OBJ_REF_ID, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10 "
+ "FROM TASK " + "FROM TASK "
+ "WHERE ID = #{id}") + "WHERE ID = #{id}")
@Results(value = { @Results(value = {
@ -34,7 +34,7 @@ public interface TaskMapper {
@Result(property = "description", column = "DESCRIPTION"), @Result(property = "description", column = "DESCRIPTION"),
@Result(property = "priority", column = "PRIORITY"), @Result(property = "priority", column = "PRIORITY"),
@Result(property = "state", column = "STATE"), @Result(property = "state", column = "STATE"),
@Result(property = "classification", column = "CLASSIFICATION_ID", javaType = ClassificationImpl.class, one = @One(select = CLASSIFICATION_FINDBYID)), @Result(property = "classification", column = "CLASSIFICATION_KEY", javaType = ClassificationImpl.class, one = @One(select = CLASSIFICATION_FINDBYKEYROOTDOMAIN)),
@Result(property = "workbasketId", column = "WORKBASKETID"), @Result(property = "workbasketId", column = "WORKBASKETID"),
@Result(property = "businessProcessId", column = "BUSINESS_PROCESS_ID"), @Result(property = "businessProcessId", column = "BUSINESS_PROCESS_ID"),
@Result(property = "parentBusinessProcessId", column = "PARENT_BUSINESS_PROCESS_ID"), @Result(property = "parentBusinessProcessId", column = "PARENT_BUSINESS_PROCESS_ID"),
@ -86,19 +86,19 @@ public interface TaskMapper {
@Result(column = "counter", property = "taskCounter") }) @Result(column = "counter", property = "taskCounter") })
List<DueWorkbasketCounter> getTaskCountByWorkbasketIdAndDaysInPastAndState(@Param("fromDate") Date fromDate, @Param("status") List<TaskState> states); List<DueWorkbasketCounter> getTaskCountByWorkbasketIdAndDaysInPastAndState(@Param("fromDate") Date fromDate, @Param("status") List<TaskState> states);
@Insert("INSERT INTO TASK(ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, PRIORITY, STATE, CLASSIFICATION_ID, WORKBASKETID, BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, OWNER, PRIMARY_OBJ_REF_ID, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10) " @Insert("INSERT INTO TASK(ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, PRIORITY, STATE, CLASSIFICATION_KEY, WORKBASKETID, BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, OWNER, PRIMARY_OBJ_REF_ID, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10) "
+ "VALUES(#{id}, #{created}, #{claimed}, #{completed}, #{modified}, #{planned}, #{due}, #{name}, #{description}, #{priority}, #{state}, #{classification.id}, #{workbasketId}, #{businessProcessId}, #{parentBusinessProcessId}, #{owner}, #{primaryObjRef.id}, #{isRead}, #{isTransferred}, #{customAttributes,jdbcType=BLOB,javaType=java.util.Map,typeHandler=pro.taskana.impl.persistence.MapTypeHandler}, #{custom1}, #{custom2}, #{custom3}, #{custom4}, #{custom5}, #{custom6}, #{custom7}, #{custom8}, #{custom9}, #{custom10})") + "VALUES(#{id}, #{created}, #{claimed}, #{completed}, #{modified}, #{planned}, #{due}, #{name}, #{description}, #{priority}, #{state}, #{classification.key}, #{workbasketId}, #{businessProcessId}, #{parentBusinessProcessId}, #{owner}, #{primaryObjRef.id}, #{isRead}, #{isTransferred}, #{customAttributes,jdbcType=BLOB,javaType=java.util.Map,typeHandler=pro.taskana.impl.persistence.MapTypeHandler}, #{custom1}, #{custom2}, #{custom3}, #{custom4}, #{custom5}, #{custom6}, #{custom7}, #{custom8}, #{custom9}, #{custom10})")
@Options(keyProperty = "id", keyColumn = "ID") @Options(keyProperty = "id", keyColumn = "ID")
void insert(Task task); void insert(Task task);
@Update("UPDATE TASK SET CLAIMED = #{claimed}, COMPLETED = #{completed}, MODIFIED = #{modified}, PLANNED = #{planned}, DUE = #{due}, NAME = #{name}, DESCRIPTION = #{description}, PRIORITY = #{priority}, STATE = #{state}, CLASSIFICATION_ID = #{classification.id}, WORKBASKETID = #{workbasketId}, BUSINESS_PROCESS_ID = #{businessProcessId}, PARENT_BUSINESS_PROCESS_ID = #{parentBusinessProcessId}, OWNER = #{owner}, PRIMARY_OBJ_REF_ID = #{primaryObjRef.id}, IS_READ = #{isRead}, IS_TRANSFERRED = #{isTransferred}, CUSTOM_ATTRIBUTES = #{customAttributes,jdbcType=BLOB,javaType=java.util.Map,typeHandler=pro.taskana.impl.persistence.MapTypeHandler}, CUSTOM_1 = #{custom1}, CUSTOM_2 = #{custom2}, CUSTOM_3 = #{custom3}, CUSTOM_4 = #{custom4}, CUSTOM_5 = #{custom5}, CUSTOM_6 = #{custom6}, CUSTOM_7 = #{custom7}, CUSTOM_8 = #{custom8}, CUSTOM_9 = #{custom9}, CUSTOM_10 = #{custom10} " @Update("UPDATE TASK SET CLAIMED = #{claimed}, COMPLETED = #{completed}, MODIFIED = #{modified}, PLANNED = #{planned}, DUE = #{due}, NAME = #{name}, DESCRIPTION = #{description}, PRIORITY = #{priority}, STATE = #{state}, CLASSIFICATION_KEY = #{classification.key}, WORKBASKETID = #{workbasketId}, BUSINESS_PROCESS_ID = #{businessProcessId}, PARENT_BUSINESS_PROCESS_ID = #{parentBusinessProcessId}, OWNER = #{owner}, PRIMARY_OBJ_REF_ID = #{primaryObjRef.id}, IS_READ = #{isRead}, IS_TRANSFERRED = #{isTransferred}, CUSTOM_ATTRIBUTES = #{customAttributes,jdbcType=BLOB,javaType=java.util.Map,typeHandler=pro.taskana.impl.persistence.MapTypeHandler}, CUSTOM_1 = #{custom1}, CUSTOM_2 = #{custom2}, CUSTOM_3 = #{custom3}, CUSTOM_4 = #{custom4}, CUSTOM_5 = #{custom5}, CUSTOM_6 = #{custom6}, CUSTOM_7 = #{custom7}, CUSTOM_8 = #{custom8}, CUSTOM_9 = #{custom9}, CUSTOM_10 = #{custom10} "
+ "WHERE ID = #{id}") + "WHERE ID = #{id}")
void update(Task task); void update(Task task);
@Delete("DELETE FROM TASK WHERE ID = #{id}") @Delete("DELETE FROM TASK WHERE ID = #{id}")
void delete(String id); void delete(String id);
@Select("SELECT ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, PRIORITY, STATE, CLASSIFICATION_ID, WORKBASKETID, OWNER, PRIMARY_OBJ_REF_ID, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10 " @Select("SELECT ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, PRIORITY, STATE, CLASSIFICATION_KEY, WORKBASKETID, OWNER, PRIMARY_OBJ_REF_ID, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10 "
+ "FROM TASK " + "FROM TASK "
+ "WHERE WORKBASKETID = #{workbasketId} " + "WHERE WORKBASKETID = #{workbasketId} "
+ "AND STATE = #{taskState}") + "AND STATE = #{taskState}")
@ -114,7 +114,7 @@ public interface TaskMapper {
@Result(property = "description", column = "DESCRIPTION"), @Result(property = "description", column = "DESCRIPTION"),
@Result(property = "priority", column = "PRIORITY"), @Result(property = "priority", column = "PRIORITY"),
@Result(property = "state", column = "STATE"), @Result(property = "state", column = "STATE"),
@Result(property = "classification", column = "CLASSIFICATION_ID", javaType = Classification.class, one = @One(select = CLASSIFICATION_FINDBYID)), @Result(property = "classification", column = "CLASSIFICATION_KEY", javaType = Classification.class, one = @One(select = CLASSIFICATION_FINDBYKEYROOTDOMAIN)),
@Result(property = "workbasketId", column = "WORKBASKETID"), @Result(property = "workbasketId", column = "WORKBASKETID"),
@Result(property = "owner", column = "OWNER"), @Result(property = "owner", column = "OWNER"),
@Result(property = "primaryObjRef", column = "PRIMARY_OBJ_REF_ID", javaType = ObjectReference.class, one = @One(select = OBJECTREFERENCEMAPPER_FINDBYID)), @Result(property = "primaryObjRef", column = "PRIMARY_OBJ_REF_ID", javaType = ObjectReference.class, one = @One(select = OBJECTREFERENCEMAPPER_FINDBYID)),
@ -134,18 +134,18 @@ public interface TaskMapper {
}) })
List<Task> findTasksByWorkbasketIdAndState(@Param("workbasketId") String workbasketId, @Param("taskState") TaskState taskState); List<Task> findTasksByWorkbasketIdAndState(@Param("workbasketId") String workbasketId, @Param("taskState") TaskState taskState);
@Select("SELECT TASK.ID AS taskId, TASK.NAME AS taskName, TASK.WORKBASKETID AS workId, TASK.CLASSIFICATION_ID AS classificationId, " @Select("SELECT TASK.ID AS taskId, TASK.NAME AS taskName, TASK.WORKBASKETID AS workId, TASK.CLASSIFICATION_KEY AS classificationKey, "
+ "WORKBASKET.NAME AS workName, CLASSIFICATION.NAME AS classificationName " + "WORKBASKET.NAME AS workName, CLASSIFICATION.NAME AS classificationName "
+ "FROM TASK " + "FROM TASK "
+ "LEFT JOIN WORKBASKET ON WORKBASKET.ID = TASK.WORKBASKETID " + "LEFT JOIN WORKBASKET ON WORKBASKET.ID = TASK.WORKBASKETID "
+ "LEFT JOIN CLASSIFICATION ON CLASSIFICATION.ID = TASK.CLASSIFICATION_ID " + "LEFT JOIN CLASSIFICATION ON CLASSIFICATION.KEY = TASK.CLASSIFICATION_KEY "
+ "WHERE TASK.WORKBASKETID = #{workbasketId}") + "WHERE TASK.WORKBASKETID = #{workbasketId}")
@Results({ @Results({
@Result(property = "taskId", column = "taskId"), @Result(property = "taskId", column = "taskId"),
@Result(property = "taskName", column = "taskName"), @Result(property = "taskName", column = "taskName"),
@Result(property = "workbasketId", column = "workId"), @Result(property = "workbasketId", column = "workId"),
@Result(property = "workbasketName", column = "workName"), @Result(property = "workbasketName", column = "workName"),
@Result(property = "classificationId", column = "classificationId"), @Result(property = "classificationKey", column = "classificationKey"),
@Result(property = "classificationName", column = "classificationName") @Result(property = "classificationName", column = "classificationName")
}) })
List<TaskSummary> findTaskSummariesByWorkbasketId(@Param("workbasketId") String workbasketId); List<TaskSummary> findTaskSummariesByWorkbasketId(@Param("workbasketId") String workbasketId);

6
lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationQueryImplTest.java
View File

@ -44,7 +44,7 @@ public class ClassificationQueryImplTest {
when(sqlSession.selectList(any(), any())).thenReturn(new ArrayList<>()); when(sqlSession.selectList(any(), any())).thenReturn(new ArrayList<>());
List<Classification> result = classificationQueryImpl.name("test", "asd", "blubber").type("cool", "bla").priority(1, 2) List<Classification> result = classificationQueryImpl.name("test", "asd", "blubber").type("cool", "bla").priority(1, 2)
.parentClassification("superId").list(); .parentClassificationKey("superId").list();
Assert.assertNotNull(result); Assert.assertNotNull(result);
} }
@ -54,7 +54,7 @@ public class ClassificationQueryImplTest {
when(sqlSession.selectList(any(), any(), any())).thenReturn(new ArrayList<>()); when(sqlSession.selectList(any(), any(), any())).thenReturn(new ArrayList<>());
List<Classification> result = classificationQueryImpl.name("test", "asd", "blubber").type("cool", "bla").priority(1, 2) List<Classification> result = classificationQueryImpl.name("test", "asd", "blubber").type("cool", "bla").priority(1, 2)
.parentClassification("superId").list(1, 1); .parentClassificationKey("superId").list(1, 1);
Assert.assertNotNull(result); Assert.assertNotNull(result);
} }
@ -64,7 +64,7 @@ public class ClassificationQueryImplTest {
when(sqlSession.selectOne(any(), any())).thenReturn(new ClassificationImpl()); when(sqlSession.selectOne(any(), any())).thenReturn(new ClassificationImpl());
Classification result = classificationQueryImpl.name("test", "asd", "blubber").type("cool", "bla").priority(1, 2) Classification result = classificationQueryImpl.name("test", "asd", "blubber").type("cool", "bla").priority(1, 2)
.parentClassification("superId").single(); .parentClassificationKey("superId").single();
Assert.assertNotNull(result); Assert.assertNotNull(result);
} }
} }

87
lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationServiceImplTest.java
View File

@ -1,8 +1,6 @@
package pro.taskana.impl; package pro.taskana.impl;
import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.startsWith;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doNothing;
@ -68,7 +66,7 @@ public class ClassificationServiceImplTest {
List<Classification> classifications = new ArrayList<>(); List<Classification> classifications = new ArrayList<>();
doReturn(classificationQueryImplMock).when(cutSpy).createClassificationQuery(); doReturn(classificationQueryImplMock).when(cutSpy).createClassificationQuery();
doReturn(classificationQueryImplMock).when(classificationQueryImplMock).parentClassification(""); doReturn(classificationQueryImplMock).when(classificationQueryImplMock).parentClassificationKey("");
doReturn(classificationQueryImplMock).when(classificationQueryImplMock) doReturn(classificationQueryImplMock).when(classificationQueryImplMock)
.validUntil(ClassificationServiceImpl.CURRENT_CLASSIFICATIONS_VALID_UNTIL); .validUntil(ClassificationServiceImpl.CURRENT_CLASSIFICATIONS_VALID_UNTIL);
doReturn(classifications).when(classificationQueryImplMock).list(); doReturn(classifications).when(classificationQueryImplMock).list();
@ -77,7 +75,7 @@ public class ClassificationServiceImplTest {
verify(taskanaEngineImplMock, times(2)).openConnection(); verify(taskanaEngineImplMock, times(2)).openConnection();
verify(cutSpy, times(1)).createClassificationQuery(); verify(cutSpy, times(1)).createClassificationQuery();
verify(classificationQueryImplMock, times(1)).parentClassification(""); verify(classificationQueryImplMock, times(1)).parentClassificationKey("");
verify(classificationQueryImplMock, times(1)) verify(classificationQueryImplMock, times(1))
.validUntil(ClassificationServiceImpl.CURRENT_CLASSIFICATIONS_VALID_UNTIL); .validUntil(ClassificationServiceImpl.CURRENT_CLASSIFICATIONS_VALID_UNTIL);
verify(classificationQueryImplMock, times(1)).list(); verify(classificationQueryImplMock, times(1)).list();
@ -89,13 +87,13 @@ public class ClassificationServiceImplTest {
public void testCreateClassificationAlreadyExisting() public void testCreateClassificationAlreadyExisting()
throws ClassificationAlreadyExistException, ClassificationNotFoundException { throws ClassificationAlreadyExistException, ClassificationNotFoundException {
Classification classification = createDummyCLassification(); Classification classification = createDummyCLassification();
doReturn(classification).when(cutSpy).getClassification(classification.getId(), classification.getDomain()); doReturn(classification).when(cutSpy).getClassification(classification.getKey(), classification.getDomain());
try { try {
cutSpy.createClassification(classification); cutSpy.createClassification(classification);
} catch (ClassificationAlreadyExistException e) { } catch (ClassificationAlreadyExistException e) {
verify(taskanaEngineImplMock, times(1)).openConnection(); verify(taskanaEngineImplMock, times(1)).openConnection();
verify(cutSpy, times(1)).getClassification(classification.getId(), classification.getDomain()); verify(cutSpy, times(1)).getClassification(classification.getKey(), classification.getDomain());
verify(taskanaEngineImplMock, times(1)).returnConnection(); verify(taskanaEngineImplMock, times(1)).returnConnection();
verifyNoMoreInteractions(classificationMapperMock, taskanaEngineImplMock, classificationQueryImplMock); verifyNoMoreInteractions(classificationMapperMock, taskanaEngineImplMock, classificationQueryImplMock);
throw e; throw e;
@ -107,12 +105,12 @@ public class ClassificationServiceImplTest {
throws ClassificationAlreadyExistException, ClassificationNotFoundException { throws ClassificationAlreadyExistException, ClassificationNotFoundException {
Classification classification = createDummyCLassification(); Classification classification = createDummyCLassification();
String domain = classification.getDomain(); String domain = classification.getDomain();
doReturn(null).when(cutSpy).getClassification(classification.getId(), classification.getDomain()); doReturn(null).when(cutSpy).getClassification(classification.getKey(), classification.getDomain());
cutSpy.createClassification(classification); cutSpy.createClassification(classification);
verify(taskanaEngineImplMock, times(1)).openConnection(); verify(taskanaEngineImplMock, times(1)).openConnection();
verify(cutSpy, times(1)).getClassification(classification.getId(), domain); verify(cutSpy, times(1)).getClassification(classification.getKey(), domain);
verify(classificationMapperMock, times(2)).insert(any()); verify(classificationMapperMock, times(2)).insert(any());
verify(taskanaEngineImplMock, times(1)).returnConnection(); verify(taskanaEngineImplMock, times(1)).returnConnection();
verifyNoMoreInteractions(classificationMapperMock, taskanaEngineImplMock, classificationQueryImplMock); verifyNoMoreInteractions(classificationMapperMock, taskanaEngineImplMock, classificationQueryImplMock);
@ -128,12 +126,12 @@ public class ClassificationServiceImplTest {
throws ClassificationAlreadyExistException, ClassificationNotFoundException { throws ClassificationAlreadyExistException, ClassificationNotFoundException {
Classification classification = createDummyCLassification(); Classification classification = createDummyCLassification();
classification.setDomain(""); classification.setDomain("");
doReturn(null).when(cutSpy).getClassification(classification.getId(), classification.getDomain()); doReturn(null).when(cutSpy).getClassification(classification.getKey(), classification.getDomain());
cutSpy.createClassification(classification); cutSpy.createClassification(classification);
verify(taskanaEngineImplMock, times(1)).openConnection(); verify(taskanaEngineImplMock, times(1)).openConnection();
verify(cutSpy, times(1)).getClassification(classification.getId(), classification.getDomain()); verify(cutSpy, times(1)).getClassification(classification.getKey(), classification.getDomain());
verify(classificationMapperMock, times(1)).insert((ClassificationImpl) classification); verify(classificationMapperMock, times(1)).insert((ClassificationImpl) classification);
verify(taskanaEngineImplMock, times(1)).returnConnection(); verify(taskanaEngineImplMock, times(1)).returnConnection();
verifyNoMoreInteractions(classificationMapperMock, taskanaEngineImplMock, classificationQueryImplMock); verifyNoMoreInteractions(classificationMapperMock, taskanaEngineImplMock, classificationQueryImplMock);
@ -149,12 +147,12 @@ public class ClassificationServiceImplTest {
Classification classification = createDummyCLassification(); Classification classification = createDummyCLassification();
Classification oldClassification = createDummyCLassification(); Classification oldClassification = createDummyCLassification();
oldClassification.setDomain(""); oldClassification.setDomain("");
doReturn(oldClassification).when(cutSpy).getClassification(classification.getId(), classification.getDomain()); doReturn(oldClassification).when(cutSpy).getClassification(classification.getKey(), classification.getDomain());
cutSpy.updateClassification(classification); cutSpy.updateClassification(classification);
verify(taskanaEngineImplMock, times(1)).openConnection(); verify(taskanaEngineImplMock, times(1)).openConnection();
verify(cutSpy, times(1)).getClassification(classification.getId(), classification.getDomain()); verify(cutSpy, times(1)).getClassification(classification.getKey(), classification.getDomain());
verify(classificationMapperMock, times(1)).insert((ClassificationImpl) classification); verify(classificationMapperMock, times(1)).insert((ClassificationImpl) classification);
verify(taskanaEngineImplMock, times(1)).returnConnection(); verify(taskanaEngineImplMock, times(1)).returnConnection();
verifyNoMoreInteractions(classificationMapperMock, taskanaEngineImplMock, classificationQueryImplMock); verifyNoMoreInteractions(classificationMapperMock, taskanaEngineImplMock, classificationQueryImplMock);
@ -170,14 +168,14 @@ public class ClassificationServiceImplTest {
ClassificationImpl oldClassification = (ClassificationImpl) createDummyCLassification(); ClassificationImpl oldClassification = (ClassificationImpl) createDummyCLassification();
oldClassification.setValidUntil(Date.valueOf(LocalDate.now())); oldClassification.setValidUntil(Date.valueOf(LocalDate.now()));
Date yesterday = Date.valueOf(LocalDate.now().minusDays(1)); Date yesterday = Date.valueOf(LocalDate.now().minusDays(1));
doReturn(oldClassification).when(cutSpy).getClassification(classification.getId(), classification.getDomain()); doReturn(oldClassification).when(cutSpy).getClassification(classification.getKey(), classification.getDomain());
cutSpy.updateClassification(classification); cutSpy.updateClassification((ClassificationImpl) classification);
verify(taskanaEngineImplMock, times(1)).openConnection(); verify(taskanaEngineImplMock, times(1)).openConnection();
verify(cutSpy, times(1)).getClassification(classification.getId(), classification.getDomain()); verify(cutSpy, times(1)).getClassification(classification.getKey(), classification.getDomain());
verify(classificationMapperMock, times(1)).update(oldClassification); verify(classificationMapperMock, times(1)).update(any());
verify(classificationMapperMock, times(1)).insert((ClassificationImpl) classification); verify(classificationMapperMock, times(1)).insert(any());
verify(taskanaEngineImplMock, times(1)).returnConnection(); verify(taskanaEngineImplMock, times(1)).returnConnection();
verifyNoMoreInteractions(classificationMapperMock, taskanaEngineImplMock, classificationQueryImplMock); verifyNoMoreInteractions(classificationMapperMock, taskanaEngineImplMock, classificationQueryImplMock);
assertThat(oldClassification.getValidUntil(), equalTo(yesterday)); assertThat(oldClassification.getValidUntil(), equalTo(yesterday));
@ -189,13 +187,13 @@ public class ClassificationServiceImplTest {
List<ClassificationImpl> classificationImpls = Arrays.asList(createDummyCLassificationImpl(), List<ClassificationImpl> classificationImpls = Arrays.asList(createDummyCLassificationImpl(),
createDummyCLassificationImpl()); createDummyCLassificationImpl());
doReturn(classificationImpls).when(classificationMapperMock) doReturn(classificationImpls).when(classificationMapperMock)
.getAllClassificationsWithId(dummyClassification.getId(), dummyClassification.getDomain()); .getAllClassificationsWithKey(dummyClassification.getKey(), dummyClassification.getDomain());
List<Classification> actualResults = cutSpy.getAllClassificationsWithId(dummyClassification.getId(), List<Classification> actualResults = cutSpy.getAllClassificationsWithKey(dummyClassification.getKey(),
dummyClassification.getDomain()); dummyClassification.getDomain());
verify(taskanaEngineImplMock, times(1)).openConnection(); verify(taskanaEngineImplMock, times(1)).openConnection();
verify(classificationMapperMock, times(1)).getAllClassificationsWithId(dummyClassification.getId(), verify(classificationMapperMock, times(1)).getAllClassificationsWithKey(dummyClassification.getKey(),
dummyClassification.getDomain()); dummyClassification.getDomain());
verify(taskanaEngineImplMock, times(1)).returnConnection(); verify(taskanaEngineImplMock, times(1)).returnConnection();
verifyNoMoreInteractions(classificationMapperMock, taskanaEngineImplMock, classificationQueryImplMock); verifyNoMoreInteractions(classificationMapperMock, taskanaEngineImplMock, classificationQueryImplMock);
@ -206,14 +204,14 @@ public class ClassificationServiceImplTest {
public void testGetClassificationFromChildDomain() throws ClassificationNotFoundException { public void testGetClassificationFromChildDomain() throws ClassificationNotFoundException {
Classification expectedClassification = createDummyCLassification(); Classification expectedClassification = createDummyCLassification();
doReturn(expectedClassification).when(classificationMapperMock) doReturn(expectedClassification).when(classificationMapperMock)
.findByIdAndDomain(expectedClassification.getId(), expectedClassification.getDomain(), .findByKeyAndDomain(expectedClassification.getKey(), expectedClassification.getDomain(),
ClassificationServiceImpl.CURRENT_CLASSIFICATIONS_VALID_UNTIL); ClassificationServiceImpl.CURRENT_CLASSIFICATIONS_VALID_UNTIL);
Classification actualClassification = cutSpy.getClassification(expectedClassification.getId(), Classification actualClassification = cutSpy.getClassification(expectedClassification.getKey(),
expectedClassification.getDomain()); expectedClassification.getDomain());
verify(taskanaEngineImplMock, times(1)).openConnection(); verify(taskanaEngineImplMock, times(1)).openConnection();
verify(classificationMapperMock, times(1)).findByIdAndDomain(expectedClassification.getId(), verify(classificationMapperMock, times(1)).findByKeyAndDomain(expectedClassification.getKey(),
expectedClassification.getDomain(), ClassificationServiceImpl.CURRENT_CLASSIFICATIONS_VALID_UNTIL); expectedClassification.getDomain(), ClassificationServiceImpl.CURRENT_CLASSIFICATIONS_VALID_UNTIL);
verify(taskanaEngineImplMock, times(1)).returnConnection(); verify(taskanaEngineImplMock, times(1)).returnConnection();
verifyNoMoreInteractions(classificationMapperMock, taskanaEngineImplMock, classificationQueryImplMock); verifyNoMoreInteractions(classificationMapperMock, taskanaEngineImplMock, classificationQueryImplMock);
@ -226,19 +224,19 @@ public class ClassificationServiceImplTest {
Classification expectedClassification = createDummyCLassification(); Classification expectedClassification = createDummyCLassification();
expectedClassification.setDomain(""); expectedClassification.setDomain("");
doReturn(null).when(classificationMapperMock) doReturn(null).when(classificationMapperMock)
.findByIdAndDomain(classification.getId(), classification.getDomain(), .findByKeyAndDomain(classification.getKey(), classification.getDomain(),
ClassificationServiceImpl.CURRENT_CLASSIFICATIONS_VALID_UNTIL); ClassificationServiceImpl.CURRENT_CLASSIFICATIONS_VALID_UNTIL);
doReturn(expectedClassification).when(classificationMapperMock) doReturn(expectedClassification).when(classificationMapperMock)
.findByIdAndDomain(expectedClassification.getId(), expectedClassification.getDomain(), .findByKeyAndDomain(expectedClassification.getKey(), expectedClassification.getDomain(),
ClassificationServiceImpl.CURRENT_CLASSIFICATIONS_VALID_UNTIL); ClassificationServiceImpl.CURRENT_CLASSIFICATIONS_VALID_UNTIL);
Classification actualClassification = cutSpy.getClassification(classification.getId(), Classification actualClassification = cutSpy.getClassification(classification.getKey(),
classification.getDomain()); classification.getDomain());
verify(taskanaEngineImplMock, times(1)).openConnection(); verify(taskanaEngineImplMock, times(1)).openConnection();
verify(classificationMapperMock, times(1)).findByIdAndDomain(classification.getId(), classification.getDomain(), verify(classificationMapperMock, times(1)).findByKeyAndDomain(classification.getKey(), classification.getDomain(),
ClassificationServiceImpl.CURRENT_CLASSIFICATIONS_VALID_UNTIL); ClassificationServiceImpl.CURRENT_CLASSIFICATIONS_VALID_UNTIL);
verify(classificationMapperMock, times(1)).findByIdAndDomain(expectedClassification.getId(), "", verify(classificationMapperMock, times(1)).findByKeyAndDomain(expectedClassification.getKey(), "",
ClassificationServiceImpl.CURRENT_CLASSIFICATIONS_VALID_UNTIL); ClassificationServiceImpl.CURRENT_CLASSIFICATIONS_VALID_UNTIL);
verify(taskanaEngineImplMock, times(1)).returnConnection(); verify(taskanaEngineImplMock, times(1)).returnConnection();
verifyNoMoreInteractions(classificationMapperMock, taskanaEngineImplMock, classificationQueryImplMock); verifyNoMoreInteractions(classificationMapperMock, taskanaEngineImplMock, classificationQueryImplMock);
@ -250,21 +248,22 @@ public class ClassificationServiceImplTest {
cutSpy.createClassificationQuery(); cutSpy.createClassificationQuery();
verifyNoMoreInteractions(classificationMapperMock, taskanaEngineImplMock, classificationQueryImplMock); verifyNoMoreInteractions(classificationMapperMock, taskanaEngineImplMock, classificationQueryImplMock);
} }
//
@Test // @Test
public void testNewClassification() { // public void testNewClassification() {
Classification actualResult = cutSpy.newClassification(); // Classification actualResult = cutSpy.newClassification();
//
verifyNoMoreInteractions(classificationMapperMock, taskanaEngineImplMock, classificationQueryImplMock); // verifyNoMoreInteractions(classificationMapperMock, taskanaEngineImplMock, classificationQueryImplMock);
assertThat(actualResult.getId(), not(equalTo(null))); // assertThat(actualResult.getId(), not(equalTo(null)));
assertThat(actualResult.getId(), startsWith(idPrefixClassification)); // assertThat(actualResult.getKey(), not(equalTo(null)));
assertThat(actualResult.getCreated(), equalTo(today)); // assertThat(actualResult.getKey(), startsWith(idPrefixClassification));
assertThat(actualResult.getParentClassificationKey(), equalTo("")); // assertThat(actualResult.getCreated(), equalTo(today));
assertThat(actualResult.getDomain(), equalTo("")); // assertThat(actualResult.getParentClassificationKey(), equalTo(""));
assertThat(actualResult.getValidFrom(), equalTo(today)); // assertThat(actualResult.getDomain(), equalTo(""));
assertThat(actualResult.getValidUntil(), // assertThat(actualResult.getValidFrom(), equalTo(today));
equalTo(ClassificationServiceImpl.CURRENT_CLASSIFICATIONS_VALID_UNTIL)); // assertThat(actualResult.getValidUntil(),
} // equalTo(ClassificationServiceImpl.CURRENT_CLASSIFICATIONS_VALID_UNTIL));
// }
private Classification createDummyCLassification() { private Classification createDummyCLassification() {
ClassificationImpl classificationImpl = new ClassificationImpl(); ClassificationImpl classificationImpl = new ClassificationImpl();

21
lib/taskana-core/src/test/java/pro/taskana/impl/TestClassificationQuery.java
View File

@ -16,7 +16,7 @@ public class TestClassificationQuery implements ClassificationQuery {
private List<ClassificationImpl> classifications; private List<ClassificationImpl> classifications;
private String[] parentId; private String[] parentClassificationKey;
private Date[] validUntil; private Date[] validUntil;
@ -24,12 +24,16 @@ public class TestClassificationQuery implements ClassificationQuery {
public TestClassificationQuery(List<ClassificationImpl> classifications) { public TestClassificationQuery(List<ClassificationImpl> classifications) {
this.classifications = classifications; this.classifications = classifications;
} }
@Override @Override
public ClassificationQuery parentClassification(String... parentClassificationId) { public ClassificationQuery key(String... key) {
parentId = parentClassificationId; return this;
}
@Override
public ClassificationQuery parentClassificationKey(String... parentClassificationKey) {
this.parentClassificationKey = parentClassificationKey;
return this; return this;
} }
@ -79,6 +83,11 @@ public class TestClassificationQuery implements ClassificationQuery {
return this; return this;
} }
@Override
public ClassificationQuery applicationEntryPoint(String... applicationEntryPoint) {
return null;
}
@Override @Override
public ClassificationQuery customFields(String... customFields) { public ClassificationQuery customFields(String... customFields) {
return this; return this;
@ -112,10 +121,10 @@ public class TestClassificationQuery implements ClassificationQuery {
} }
} }
if (this.parentId != null) { if (this.parentClassificationKey != null) {
Boolean classificationWithParent = false; Boolean classificationWithParent = false;
if (classification.getParentClassificationKey() != null) { if (classification.getParentClassificationKey() != null) {
for (String parent : this.parentId) { for (String parent : this.parentClassificationKey) {
if (parent.equals(classification.getParentClassificationKey())) { if (parent.equals(classification.getParentClassificationKey())) {
classificationWithParent = true; classificationWithParent = true;
} }

73
lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntAutoCommitTest.java
View File

@ -70,20 +70,20 @@ public class ClassificationServiceImplIntAutoCommitTest {
@Test @Test
public void testInsertClassification() throws ClassificationAlreadyExistException, ClassificationNotFoundException { public void testInsertClassification() throws ClassificationAlreadyExistException, ClassificationNotFoundException {
ClassificationImpl classification = new ClassificationImpl(); Classification classification = this.createDummyClassificationWithUniqueKey();
classificationService.createClassification(classification); classificationService.createClassification(classification);
Assert.assertNotNull(classificationService.getClassification(classification.getId(), "")); Assert.assertNotNull(classificationService.getClassification(classification.getKey(), ""));
} }
@Test @Test
public void testFindAllClassifications() throws NotAuthorizedException, ClassificationAlreadyExistException { public void testFindAllClassifications() throws NotAuthorizedException, ClassificationAlreadyExistException {
ClassificationImpl classification0 = new ClassificationImpl(); Classification classification0 = this.createDummyClassificationWithUniqueKey();
classificationService.createClassification(classification0); classificationService.createClassification(classification0);
ClassificationImpl classification1 = new ClassificationImpl(); Classification classification1 = this.createDummyClassificationWithUniqueKey();
classificationService.createClassification(classification1); classificationService.createClassification(classification1);
ClassificationImpl classification2 = new ClassificationImpl(); Classification classification2 = this.createDummyClassificationWithUniqueKey();
classification2.setParentClassificationKey(classification0.getId()); classification2.setParentClassificationKey(classification0.getKey());
classificationService.createClassification(classification2); classificationService.createClassification(classification2);
Assert.assertEquals(2 + 1, classificationService.getClassificationTree().size()); Assert.assertEquals(2 + 1, classificationService.getClassificationTree().size());
@ -93,7 +93,7 @@ public class ClassificationServiceImplIntAutoCommitTest {
public void testModifiedClassification() public void testModifiedClassification()
throws ClassificationAlreadyExistException, ClassificationNotFoundException { throws ClassificationAlreadyExistException, ClassificationNotFoundException {
ClassificationImpl classification = new ClassificationImpl(); Classification classification = this.createDummyClassificationWithUniqueKey();
classificationService.createClassification(classification); classificationService.createClassification(classification);
classification.setDescription("TEST SOMETHING"); classification.setDescription("TEST SOMETHING");
classificationService.updateClassification(classification); classificationService.updateClassification(classification);
@ -103,7 +103,7 @@ public class ClassificationServiceImplIntAutoCommitTest {
@Test @Test
public void testInsertAndClassificationMapper() throws NotAuthorizedException, ClassificationAlreadyExistException { public void testInsertAndClassificationMapper() throws NotAuthorizedException, ClassificationAlreadyExistException {
ClassificationImpl classification = new ClassificationImpl(); Classification classification = this.createDummyClassificationWithUniqueKey();
classificationService.createClassification(classification); classificationService.createClassification(classification);
Date today = Date.valueOf(LocalDate.now()); Date today = Date.valueOf(LocalDate.now());
List<Classification> list = classificationService.createClassificationQuery() List<Classification> list = classificationService.createClassificationQuery()
@ -118,7 +118,7 @@ public class ClassificationServiceImplIntAutoCommitTest {
@Test @Test
public void testUpdateAndClassificationMapper() public void testUpdateAndClassificationMapper()
throws NotAuthorizedException, ClassificationAlreadyExistException, ClassificationNotFoundException { throws NotAuthorizedException, ClassificationAlreadyExistException, ClassificationNotFoundException {
ClassificationImpl classification = new ClassificationImpl(); Classification classification = this.createDummyClassificationWithUniqueKey();
classificationService.createClassification(classification); classificationService.createClassification(classification);
System.out.println(classification.getId()); System.out.println(classification.getId());
classification.setDescription("description"); classification.setDescription("description");
@ -148,15 +148,15 @@ public class ClassificationServiceImplIntAutoCommitTest {
@Test @Test
public void testFindWithClassificationMapperDomainAndCategory() public void testFindWithClassificationMapperDomainAndCategory()
throws NotAuthorizedException, ClassificationAlreadyExistException { throws NotAuthorizedException, ClassificationAlreadyExistException {
ClassificationImpl classification1 = new ClassificationImpl(); Classification classification1 = this.createDummyClassificationWithUniqueKey();
classification1.setDomain("domain1"); classification1.setDomain("domain1");
classification1.setCategory("category1"); classification1.setCategory("category1");
classificationService.createClassification(classification1); classificationService.createClassification(classification1);
ClassificationImpl classification2 = new ClassificationImpl(); Classification classification2 = this.createDummyClassificationWithUniqueKey();
classification2.setDomain("domain2"); classification2.setDomain("domain2");
classification2.setCategory("category1"); classification2.setCategory("category1");
classificationService.createClassification(classification2); classificationService.createClassification(classification2);
ClassificationImpl classification3 = new ClassificationImpl(); Classification classification3 = this.createDummyClassificationWithUniqueKey();
classification3.setDomain("domain1"); classification3.setDomain("domain1");
classification3.setCategory("category2"); classification3.setCategory("category2");
classificationService.createClassification(classification3); classificationService.createClassification(classification3);
@ -173,21 +173,21 @@ public class ClassificationServiceImplIntAutoCommitTest {
@Test @Test
public void testFindWithClassificationMapperCustomAndCategory() public void testFindWithClassificationMapperCustomAndCategory()
throws NotAuthorizedException, ClassificationAlreadyExistException { throws NotAuthorizedException, ClassificationAlreadyExistException {
ClassificationImpl classification1 = new ClassificationImpl(); Classification classification1 = this.createDummyClassificationWithUniqueKey();
classification1.setDescription("DESC1"); classification1.setDescription("DESC1");
classification1.setCategory("category1"); classification1.setCategory("category1");
classificationService.createClassification(classification1); classificationService.createClassification(classification1);
ClassificationImpl classification2 = new ClassificationImpl(); Classification classification2 = this.createDummyClassificationWithUniqueKey();
classification2.setDescription("DESC1"); classification2.setDescription("DESC1");
classification2.setCustom1("custom1"); classification2.setCustom1("custom1");
classification2.setCategory("category1"); classification2.setCategory("category1");
classificationService.createClassification(classification2); classificationService.createClassification(classification2);
ClassificationImpl classification3 = new ClassificationImpl(); Classification classification3 = this.createDummyClassificationWithUniqueKey();
classification3.setCustom1("custom2"); classification3.setCustom1("custom2");
classification3.setCustom2("custom1"); classification3.setCustom2("custom1");
classification3.setCategory("category2"); classification3.setCategory("category2");
classificationService.createClassification(classification3); classificationService.createClassification(classification3);
ClassificationImpl classification4 = new ClassificationImpl(); Classification classification4 = this.createDummyClassificationWithUniqueKey();
classification4.setDescription("description2"); classification4.setDescription("description2");
classification4.setCustom8("custom2"); classification4.setCustom8("custom2");
classification4.setCategory("category1"); classification4.setCategory("category1");
@ -207,28 +207,28 @@ public class ClassificationServiceImplIntAutoCommitTest {
@Test @Test
public void testFindWithClassificationMapperPriorityTypeAndParent() public void testFindWithClassificationMapperPriorityTypeAndParent()
throws NotAuthorizedException, ClassificationAlreadyExistException { throws NotAuthorizedException, ClassificationAlreadyExistException {
ClassificationImpl classification = new ClassificationImpl(); Classification classification = this.createDummyClassificationWithUniqueKey();
classification.setPriority(Integer.decode("5")); classification.setPriority(Integer.decode("5"));
classification.setType("type1"); classification.setType("type1");
classificationService.createClassification(classification); classificationService.createClassification(classification);
ClassificationImpl classification1 = new ClassificationImpl(); Classification classification1 = this.createDummyClassificationWithUniqueKey();
classification1.setPriority(Integer.decode("3")); classification1.setPriority(Integer.decode("3"));
classification1.setType("type1"); classification1.setType("type1");
classification1.setParentClassificationKey(classification.getId()); classification1.setParentClassificationKey(classification.getKey());
classificationService.createClassification(classification1); classificationService.createClassification(classification1);
ClassificationImpl classification2 = new ClassificationImpl(); Classification classification2 = this.createDummyClassificationWithUniqueKey();
classification2.setPriority(Integer.decode("5")); classification2.setPriority(Integer.decode("5"));
classification2.setType("type2"); classification2.setType("type2");
classification2.setParentClassificationKey(classification.getId()); classification2.setParentClassificationKey(classification.getKey());
classificationService.createClassification(classification2); classificationService.createClassification(classification2);
ClassificationImpl classification3 = new ClassificationImpl(); Classification classification3 = this.createDummyClassificationWithUniqueKey();
classification3.setPriority(Integer.decode("5")); classification3.setPriority(Integer.decode("5"));
classification3.setType("type1"); classification3.setType("type1");
classification3.setParentClassificationKey(classification1.getId()); classification3.setParentClassificationKey(classification1.getKey());
classificationService.createClassification(classification3); classificationService.createClassification(classification3);
List<Classification> list = classificationService.createClassificationQuery() List<Classification> list = classificationService.createClassificationQuery()
.parentClassification(classification.getId()) .parentClassificationKey(classification.getKey())
.list(); .list();
Assert.assertEquals(2, list.size()); Assert.assertEquals(2, list.size());
list = classificationService.createClassificationQuery().type("type1").priority(Integer.decode("5")).list(); list = classificationService.createClassificationQuery().type("type1").priority(Integer.decode("5")).list();
@ -236,7 +236,7 @@ public class ClassificationServiceImplIntAutoCommitTest {
list = classificationService.createClassificationQuery() list = classificationService.createClassificationQuery()
.priority(Integer.decode("5")) .priority(Integer.decode("5"))
.type("type1") .type("type1")
.parentClassification(classification1.getId()) .parentClassificationKey(classification1.getKey())
.list(); .list();
Assert.assertEquals(1, list.size()); Assert.assertEquals(1, list.size());
} }
@ -245,25 +245,25 @@ public class ClassificationServiceImplIntAutoCommitTest {
public void testFindWithClassificationMapperServiceLevelNameAndDescription() public void testFindWithClassificationMapperServiceLevelNameAndDescription()
throws NotAuthorizedException, ClassificationAlreadyExistException { throws NotAuthorizedException, ClassificationAlreadyExistException {
int all = 0; int all = 0;
ClassificationImpl classification = new ClassificationImpl(); Classification classification = this.createDummyClassificationWithUniqueKey();
classification.setServiceLevel("P1D"); classification.setServiceLevel("P1D");
classification.setName("name1"); classification.setName("name1");
classification.setDescription("desc"); classification.setDescription("desc");
classificationService.createClassification(classification); classificationService.createClassification(classification);
all++; all++;
ClassificationImpl classification1 = new ClassificationImpl(); Classification classification1 = this.createDummyClassificationWithUniqueKey();
classification1.setServiceLevel("P1DT1H"); classification1.setServiceLevel("P1DT1H");
classification1.setName("name1"); classification1.setName("name1");
classification1.setDescription("desc"); classification1.setDescription("desc");
classificationService.createClassification(classification1); classificationService.createClassification(classification1);
all++; all++;
ClassificationImpl classification2 = new ClassificationImpl(); Classification classification2 = this.createDummyClassificationWithUniqueKey();
classification2.setServiceLevel("P1D"); classification2.setServiceLevel("P1D");
classification2.setName("name"); classification2.setName("name");
classification2.setDescription("desc"); classification2.setDescription("desc");
classificationService.createClassification(classification2); classificationService.createClassification(classification2);
all++; all++;
ClassificationImpl classification3 = new ClassificationImpl(); Classification classification3 = this.createDummyClassificationWithUniqueKey();
classification3.setName("name1"); classification3.setName("name1");
classification3.setDescription("description"); classification3.setDescription("description");
classificationService.createClassification(classification3); classificationService.createClassification(classification3);
@ -282,14 +282,14 @@ public class ClassificationServiceImplIntAutoCommitTest {
@Test @Test
public void testDefaultSettingsWithClassificationMapper() public void testDefaultSettingsWithClassificationMapper()
throws NotAuthorizedException, ClassificationAlreadyExistException, ClassificationNotFoundException { throws NotAuthorizedException, ClassificationAlreadyExistException, ClassificationNotFoundException {
ClassificationImpl classification = new ClassificationImpl(); Classification classification = this.createDummyClassificationWithUniqueKey();
ClassificationImpl classification1 = new ClassificationImpl(); Classification classification1 = this.createDummyClassificationWithUniqueKey();
classificationService.createClassification(classification); classificationService.createClassification(classification);
classificationService.createClassification(classification1); classificationService.createClassification(classification1);
classification1.setParentClassificationKey(classification.getId()); classification1.setParentClassificationKey(classification.getKey());
classificationService.updateClassification(classification1); classificationService.updateClassification(classification1);
List<Classification> list = classificationService.createClassificationQuery().parentClassification("").list(); List<Classification> list = classificationService.createClassificationQuery().parentClassificationKey("").list();
Assert.assertEquals(2, list.size()); Assert.assertEquals(2, list.size());
list = classificationService.createClassificationQuery().validUntil(Date.valueOf("9999-12-31")).list(); list = classificationService.createClassificationQuery().validUntil(Date.valueOf("9999-12-31")).list();
Assert.assertEquals(2, list.size()); Assert.assertEquals(2, list.size());
@ -316,4 +316,11 @@ public class ClassificationServiceImplIntAutoCommitTest {
FileUtils.deleteRecursive("~/data", true); FileUtils.deleteRecursive("~/data", true);
} }
private Classification createDummyClassificationWithUniqueKey() {
Classification classification = new ClassificationImpl();
classification.setKey("TEST" + counter);
counter++;
return classification;
}
} }

76
lib/taskana-core/src/test/java/pro/taskana/impl/integration/ClassificationServiceImplIntExplicitTest.java
View File

@ -76,10 +76,10 @@ public class ClassificationServiceImplIntExplicitTest {
Connection connection = dataSource.getConnection(); Connection connection = dataSource.getConnection();
taskanaEngineImpl.setConnection(connection); taskanaEngineImpl.setConnection(connection);
ClassificationImpl classification = new ClassificationImpl(); Classification classification = this.createNewClassificationWithUniqueKey();
classificationService.createClassification(classification); classificationService.createClassification(classification);
Assert.assertNotNull(classificationService.getClassification(classification.getId(), "")); Assert.assertNotNull(classificationService.getClassification(classification.getKey(), ""));
connection.commit(); connection.commit();
} }
@ -88,12 +88,12 @@ public class ClassificationServiceImplIntExplicitTest {
throws NotAuthorizedException, SQLException, ClassificationAlreadyExistException { throws NotAuthorizedException, SQLException, ClassificationAlreadyExistException {
Connection connection = dataSource.getConnection(); Connection connection = dataSource.getConnection();
taskanaEngineImpl.setConnection(connection); taskanaEngineImpl.setConnection(connection);
ClassificationImpl classification0 = new ClassificationImpl(); Classification classification0 = this.createNewClassificationWithUniqueKey();
classificationService.createClassification(classification0); classificationService.createClassification(classification0);
ClassificationImpl classification1 = new ClassificationImpl(); Classification classification1 = this.createNewClassificationWithUniqueKey();
classificationService.createClassification(classification1); classificationService.createClassification(classification1);
ClassificationImpl classification2 = new ClassificationImpl(); Classification classification2 = this.createNewClassificationWithUniqueKey();
classification2.setParentClassificationKey(classification0.getId()); classification2.setParentClassificationKey(classification0.getKey());
classificationService.createClassification(classification2); classificationService.createClassification(classification2);
Assert.assertEquals(2 + 1, classificationService.getClassificationTree().size()); Assert.assertEquals(2 + 1, classificationService.getClassificationTree().size());
@ -106,7 +106,7 @@ public class ClassificationServiceImplIntExplicitTest {
Connection connection = dataSource.getConnection(); Connection connection = dataSource.getConnection();
taskanaEngineImpl.setConnection(connection); taskanaEngineImpl.setConnection(connection);
ClassificationImpl classification = new ClassificationImpl(); Classification classification = this.createNewClassificationWithUniqueKey();
connection.commit(); connection.commit();
classificationService.createClassification(classification); classificationService.createClassification(classification);
classification.setDescription("TEST SOMETHING"); classification.setDescription("TEST SOMETHING");
@ -120,7 +120,7 @@ public class ClassificationServiceImplIntExplicitTest {
throws NotAuthorizedException, SQLException, ClassificationAlreadyExistException { throws NotAuthorizedException, SQLException, ClassificationAlreadyExistException {
Connection connection = dataSource.getConnection(); Connection connection = dataSource.getConnection();
taskanaEngineImpl.setConnection(connection); taskanaEngineImpl.setConnection(connection);
ClassificationImpl classification = new ClassificationImpl(); Classification classification = this.createNewClassificationWithUniqueKey();
classificationService.createClassification(classification); classificationService.createClassification(classification);
Date today = Date.valueOf(LocalDate.now()); Date today = Date.valueOf(LocalDate.now());
List<Classification> list = classificationService.createClassificationQuery() List<Classification> list = classificationService.createClassificationQuery()
@ -137,9 +137,9 @@ public class ClassificationServiceImplIntExplicitTest {
ClassificationAlreadyExistException, ClassificationNotFoundException { ClassificationAlreadyExistException, ClassificationNotFoundException {
Connection connection = dataSource.getConnection(); Connection connection = dataSource.getConnection();
taskanaEngineImpl.setConnection(connection); taskanaEngineImpl.setConnection(connection);
ClassificationImpl classification = new ClassificationImpl(); Classification classification = this.createNewClassificationWithUniqueKey();
classificationService.createClassification(classification); classificationService.createClassification(classification);
System.out.println(classification.getId()); System.out.println(classification.getKey());
classification.setDescription("description"); classification.setDescription("description");
classificationService.updateClassification(classification); classificationService.updateClassification(classification);
@ -152,7 +152,7 @@ public class ClassificationServiceImplIntExplicitTest {
classification.setDomain("domain"); classification.setDomain("domain");
classificationService.updateClassification(classification); classificationService.updateClassification(classification);
System.out.println(classification.getId()); System.out.println(classification.getKey());
list = classificationService.createClassificationQuery().validUntil(Date.valueOf("9999-12-31")).list(); list = classificationService.createClassificationQuery().validUntil(Date.valueOf("9999-12-31")).list();
Assert.assertEquals(2, list.size()); Assert.assertEquals(2, list.size());
@ -168,15 +168,15 @@ public class ClassificationServiceImplIntExplicitTest {
throws NotAuthorizedException, SQLException, ClassificationAlreadyExistException { throws NotAuthorizedException, SQLException, ClassificationAlreadyExistException {
Connection connection = dataSource.getConnection(); Connection connection = dataSource.getConnection();
taskanaEngineImpl.setConnection(connection); taskanaEngineImpl.setConnection(connection);
ClassificationImpl classification1 = new ClassificationImpl(); Classification classification1 = this.createNewClassificationWithUniqueKey();
classification1.setDomain("domain1"); classification1.setDomain("domain1");
classification1.setCategory("category1"); classification1.setCategory("category1");
classificationService.createClassification(classification1); classificationService.createClassification(classification1);
ClassificationImpl classification2 = new ClassificationImpl(); Classification classification2 = this.createNewClassificationWithUniqueKey();
classification2.setDomain("domain2"); classification2.setDomain("domain2");
classification2.setCategory("category1"); classification2.setCategory("category1");
classificationService.createClassification(classification2); classificationService.createClassification(classification2);
ClassificationImpl classification3 = new ClassificationImpl(); Classification classification3 = this.createNewClassificationWithUniqueKey();
classification3.setDomain("domain1"); classification3.setDomain("domain1");
classification3.setCategory("category2"); classification3.setCategory("category2");
classificationService.createClassification(classification3); classificationService.createClassification(classification3);
@ -196,21 +196,21 @@ public class ClassificationServiceImplIntExplicitTest {
throws NotAuthorizedException, SQLException, ClassificationAlreadyExistException { throws NotAuthorizedException, SQLException, ClassificationAlreadyExistException {
Connection connection = dataSource.getConnection(); Connection connection = dataSource.getConnection();
taskanaEngineImpl.setConnection(connection); taskanaEngineImpl.setConnection(connection);
ClassificationImpl classification1 = new ClassificationImpl(); Classification classification1 = this.createNewClassificationWithUniqueKey();
classification1.setDescription("DESC1"); classification1.setDescription("DESC1");
classification1.setCategory("category1"); classification1.setCategory("category1");
classificationService.createClassification(classification1); classificationService.createClassification(classification1);
ClassificationImpl classification2 = new ClassificationImpl(); Classification classification2 = this.createNewClassificationWithUniqueKey();
classification2.setDescription("DESC1"); classification2.setDescription("DESC1");
classification2.setCustom1("custom1"); classification2.setCustom1("custom1");
classification2.setCategory("category1"); classification2.setCategory("category1");
classificationService.createClassification(classification2); classificationService.createClassification(classification2);
ClassificationImpl classification3 = new ClassificationImpl(); Classification classification3 = this.createNewClassificationWithUniqueKey();
classification3.setCustom1("custom2"); classification3.setCustom1("custom2");
classification3.setCustom2("custom1"); classification3.setCustom2("custom1");
classification3.setCategory("category2"); classification3.setCategory("category2");
classificationService.createClassification(classification3); classificationService.createClassification(classification3);
ClassificationImpl classification4 = new ClassificationImpl(); Classification classification4 = this.createNewClassificationWithUniqueKey();
classification4.setDescription("description2"); classification4.setDescription("description2");
classification4.setCustom8("custom2"); classification4.setCustom8("custom2");
classification4.setCategory("category1"); classification4.setCategory("category1");
@ -233,28 +233,28 @@ public class ClassificationServiceImplIntExplicitTest {
throws NotAuthorizedException, SQLException, ClassificationAlreadyExistException { throws NotAuthorizedException, SQLException, ClassificationAlreadyExistException {
Connection connection = dataSource.getConnection(); Connection connection = dataSource.getConnection();
taskanaEngineImpl.setConnection(connection); taskanaEngineImpl.setConnection(connection);
ClassificationImpl classification = new ClassificationImpl(); Classification classification = this.createNewClassificationWithUniqueKey();
classification.setPriority(Integer.decode("5")); classification.setPriority(Integer.decode("5"));
classification.setType("type1"); classification.setType("type1");
classificationService.createClassification(classification); classificationService.createClassification(classification);
ClassificationImpl classification1 = new ClassificationImpl(); Classification classification1 = this.createNewClassificationWithUniqueKey();
classification1.setPriority(Integer.decode("3")); classification1.setPriority(Integer.decode("3"));
classification1.setType("type1"); classification1.setType("type1");
classification1.setParentClassificationKey(classification.getId()); classification1.setParentClassificationKey(classification.getKey());
classificationService.createClassification(classification1); classificationService.createClassification(classification1);
ClassificationImpl classification2 = new ClassificationImpl(); Classification classification2 = this.createNewClassificationWithUniqueKey();
classification2.setPriority(Integer.decode("5")); classification2.setPriority(Integer.decode("5"));
classification2.setType("type2"); classification2.setType("type2");
classification2.setParentClassificationKey(classification.getId()); classification2.setParentClassificationKey(classification.getKey());
classificationService.createClassification(classification2); classificationService.createClassification(classification2);
ClassificationImpl classification3 = new ClassificationImpl(); Classification classification3 = this.createNewClassificationWithUniqueKey();
classification3.setPriority(Integer.decode("5")); classification3.setPriority(Integer.decode("5"));
classification3.setType("type1"); classification3.setType("type1");
classification3.setParentClassificationKey(classification1.getId()); classification3.setParentClassificationKey(classification1.getKey());
classificationService.createClassification(classification3); classificationService.createClassification(classification3);
List<Classification> list = classificationService.createClassificationQuery() List<Classification> list = classificationService.createClassificationQuery()
.parentClassification(classification.getId()) .parentClassificationKey(classification.getKey())
.list(); .list();
Assert.assertEquals(2, list.size()); Assert.assertEquals(2, list.size());
list = classificationService.createClassificationQuery().type("type1").priority(Integer.decode("5")).list(); list = classificationService.createClassificationQuery().type("type1").priority(Integer.decode("5")).list();
@ -262,7 +262,7 @@ public class ClassificationServiceImplIntExplicitTest {
list = classificationService.createClassificationQuery() list = classificationService.createClassificationQuery()
.priority(Integer.decode("5")) .priority(Integer.decode("5"))
.type("type1") .type("type1")
.parentClassification(classification1.getId()) .parentClassificationKey(classification1.getKey())
.list(); .list();
Assert.assertEquals(1, list.size()); Assert.assertEquals(1, list.size());
connection.commit(); connection.commit();
@ -274,25 +274,25 @@ public class ClassificationServiceImplIntExplicitTest {
Connection connection = dataSource.getConnection(); Connection connection = dataSource.getConnection();
taskanaEngineImpl.setConnection(connection); taskanaEngineImpl.setConnection(connection);
int all = 0; int all = 0;
ClassificationImpl classification = new ClassificationImpl(); Classification classification = this.createNewClassificationWithUniqueKey();
classification.setServiceLevel("P1D"); classification.setServiceLevel("P1D");
classification.setName("name1"); classification.setName("name1");
classification.setDescription("desc"); classification.setDescription("desc");
classificationService.createClassification(classification); classificationService.createClassification(classification);
all++; all++;
ClassificationImpl classification1 = new ClassificationImpl(); Classification classification1 = this.createNewClassificationWithUniqueKey();
classification1.setServiceLevel("P1DT1H"); classification1.setServiceLevel("P1DT1H");
classification1.setName("name1"); classification1.setName("name1");
classification1.setDescription("desc"); classification1.setDescription("desc");
classificationService.createClassification(classification1); classificationService.createClassification(classification1);
all++; all++;
ClassificationImpl classification2 = new ClassificationImpl(); Classification classification2 = this.createNewClassificationWithUniqueKey();
classification2.setServiceLevel("P1D"); classification2.setServiceLevel("P1D");
classification2.setName("name"); classification2.setName("name");
classification2.setDescription("desc"); classification2.setDescription("desc");
classificationService.createClassification(classification2); classificationService.createClassification(classification2);
all++; all++;
ClassificationImpl classification3 = new ClassificationImpl(); Classification classification3 = this.createNewClassificationWithUniqueKey();
classification3.setName("name1"); classification3.setName("name1");
classification3.setDescription("description"); classification3.setDescription("description");
classificationService.createClassification(classification3); classificationService.createClassification(classification3);
@ -314,14 +314,14 @@ public class ClassificationServiceImplIntExplicitTest {
ClassificationAlreadyExistException, ClassificationNotFoundException { ClassificationAlreadyExistException, ClassificationNotFoundException {
Connection connection = dataSource.getConnection(); Connection connection = dataSource.getConnection();
taskanaEngineImpl.setConnection(connection); taskanaEngineImpl.setConnection(connection);
ClassificationImpl classification = new ClassificationImpl(); Classification classification = this.createNewClassificationWithUniqueKey();
ClassificationImpl classification1 = new ClassificationImpl(); Classification classification1 = this.createNewClassificationWithUniqueKey();
classificationService.createClassification(classification); classificationService.createClassification(classification);
classificationService.createClassification(classification1); classificationService.createClassification(classification1);
classification1.setParentClassificationKey(classification.getId()); classification1.setParentClassificationKey(classification.getKey());
classificationService.updateClassification(classification1); classificationService.updateClassification(classification1);
List<Classification> list = classificationService.createClassificationQuery().parentClassification("").list(); List<Classification> list = classificationService.createClassificationQuery().parentClassificationKey("").list();
Assert.assertEquals(2, list.size()); Assert.assertEquals(2, list.size());
list = classificationService.createClassificationQuery().validUntil(Date.valueOf("9999-12-31")).list(); list = classificationService.createClassificationQuery().validUntil(Date.valueOf("9999-12-31")).list();
Assert.assertEquals(2, list.size()); Assert.assertEquals(2, list.size());
@ -355,4 +355,10 @@ public class ClassificationServiceImplIntExplicitTest {
FileUtils.deleteRecursive("~/data", true); FileUtils.deleteRecursive("~/data", true);
} }
private Classification createNewClassificationWithUniqueKey() {
Classification classification = new ClassificationImpl();
classification.setKey("TEST" + counter);
counter++;
return classification;
}
} }

8
lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntAutocommitTest.java
View File

@ -93,6 +93,7 @@ public class TaskServiceImplIntAutocommitTest {
wb.setName("workbasket"); wb.setName("workbasket");
taskanaEngine.getWorkbasketService().createWorkbasket(wb); taskanaEngine.getWorkbasketService().createWorkbasket(wb);
Classification classification = classificationService.newClassification(); Classification classification = classificationService.newClassification();
classification.setKey("TEST");
taskanaEngine.getClassificationService().createClassification(classification); taskanaEngine.getClassificationService().createClassification(classification);
Task task = new Task(); Task task = new Task();
@ -117,6 +118,7 @@ public class TaskServiceImplIntAutocommitTest {
wb.setName("sdf"); wb.setName("sdf");
taskanaEngine.getWorkbasketService().createWorkbasket(wb); taskanaEngine.getWorkbasketService().createWorkbasket(wb);
Classification classification = classificationService.newClassification(); Classification classification = classificationService.newClassification();
classification.setKey("TEST");
taskanaEngine.getClassificationService().createClassification(classification); taskanaEngine.getClassificationService().createClassification(classification);
Task task = new Task(); Task task = new Task();
@ -139,6 +141,7 @@ public class TaskServiceImplIntAutocommitTest {
wb.setName("workbasket"); wb.setName("workbasket");
wb = taskanaEngine.getWorkbasketService().createWorkbasket(wb); wb = taskanaEngine.getWorkbasketService().createWorkbasket(wb);
Classification classification = classificationService.newClassification(); Classification classification = classificationService.newClassification();
classification.setKey("TEST");
taskanaEngine.getClassificationService().createClassification(classification); taskanaEngine.getClassificationService().createClassification(classification);
Task task = new Task(); Task task = new Task();
@ -158,6 +161,7 @@ public class TaskServiceImplIntAutocommitTest {
wb.setName("workbasket"); wb.setName("workbasket");
taskanaEngine.getWorkbasketService().createWorkbasket(wb); taskanaEngine.getWorkbasketService().createWorkbasket(wb);
Classification classification = classificationService.newClassification(); Classification classification = classificationService.newClassification();
classification.setKey("TEST");
taskanaEngine.getClassificationService().createClassification(classification); taskanaEngine.getClassificationService().createClassification(classification);
Task task = new Task(); Task task = new Task();
@ -168,7 +172,7 @@ public class TaskServiceImplIntAutocommitTest {
TaskanaEngineImpl taskanaEngineImpl = (TaskanaEngineImpl) taskanaEngine; TaskanaEngineImpl taskanaEngineImpl = (TaskanaEngineImpl) taskanaEngine;
ClassificationQuery classificationQuery = new ClassificationQueryImpl(taskanaEngineImpl) ClassificationQuery classificationQuery = new ClassificationQueryImpl(taskanaEngineImpl)
.parentClassification("pId1", "pId2") .parentClassificationKey("pId1", "pId2")
.category("cat1", "cat2") .category("cat1", "cat2")
.type("oneType") .type("oneType")
.name("1Name", "name2") .name("1Name", "name2")
@ -224,7 +228,7 @@ public class TaskServiceImplIntAutocommitTest {
taskSummary.setTaskName(dummyTask.getName()); taskSummary.setTaskName(dummyTask.getName());
taskSummary.setWorkbasketId(dummyWorkbasket.getId()); taskSummary.setWorkbasketId(dummyWorkbasket.getId());
taskSummary.setWorkbasketName(dummyWorkbasket.getName()); taskSummary.setWorkbasketName(dummyWorkbasket.getName());
taskSummary.setClassificationId(dummyClassification.getId()); taskSummary.setClassificationKey(dummyClassification.getKey());
taskSummary.setClassificationName(dummyClassification.getName()); taskSummary.setClassificationName(dummyClassification.getName());
expectedTaskSumamries.add(taskSummary); expectedTaskSumamries.add(taskSummary);

7
lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntExplicitTest.java
View File

@ -100,6 +100,7 @@ public class TaskServiceImplIntExplicitTest {
workbasket.setName("workbasket"); workbasket.setName("workbasket");
workbasket.setId("1"); // set id manually for authorization tests workbasket.setId("1"); // set id manually for authorization tests
Classification classification = classificationService.newClassification(); Classification classification = classificationService.newClassification();
classification.setKey("TEST");
taskanaEngine.getWorkbasketService().createWorkbasket(workbasket); taskanaEngine.getWorkbasketService().createWorkbasket(workbasket);
taskanaEngine.getClassificationService().createClassification(classification); taskanaEngine.getClassificationService().createClassification(classification);
@ -151,6 +152,7 @@ public class TaskServiceImplIntExplicitTest {
Workbasket workbasket = new Workbasket(); Workbasket workbasket = new Workbasket();
workbasket.setName("workbasket"); workbasket.setName("workbasket");
Classification classification = classificationService.newClassification(); Classification classification = classificationService.newClassification();
classification.setKey("TEST");
workbasket.setName("workbasket99"); workbasket.setName("workbasket99");
workbasketServiceImpl.createWorkbasket(workbasket); workbasketServiceImpl.createWorkbasket(workbasket);
classificationServiceImpl.createClassification(classification); classificationServiceImpl.createClassification(classification);
@ -176,6 +178,7 @@ public class TaskServiceImplIntExplicitTest {
generateSampleAccessItems(); generateSampleAccessItems();
Classification classification = classificationService.newClassification(); Classification classification = classificationService.newClassification();
classification.setKey("TEST1");
classification.setCategory("MANUAL"); classification.setCategory("MANUAL");
classification.setName("classification name"); classification.setName("classification name");
classification.setServiceLevel("P1D"); classification.setServiceLevel("P1D");
@ -252,6 +255,7 @@ public class TaskServiceImplIntExplicitTest {
Workbasket workbasket = new Workbasket(); Workbasket workbasket = new Workbasket();
workbasket.setName("workbasket"); workbasket.setName("workbasket");
Classification classification = classificationService.newClassification(); Classification classification = classificationService.newClassification();
classification.setKey("TEST");
workbasket.setId("1"); // set id manually for authorization tests workbasket.setId("1"); // set id manually for authorization tests
taskanaEngine.getWorkbasketService().createWorkbasket(workbasket); taskanaEngine.getWorkbasketService().createWorkbasket(workbasket);
taskanaEngine.getClassificationService().createClassification(classification); taskanaEngine.getClassificationService().createClassification(classification);
@ -264,7 +268,7 @@ public class TaskServiceImplIntExplicitTest {
TaskanaEngineImpl taskanaEngineImpl = (TaskanaEngineImpl) taskanaEngine; TaskanaEngineImpl taskanaEngineImpl = (TaskanaEngineImpl) taskanaEngine;
ClassificationQuery classificationQuery = new ClassificationQueryImpl(taskanaEngineImpl) ClassificationQuery classificationQuery = new ClassificationQueryImpl(taskanaEngineImpl)
.parentClassification("pId1", "pId2").category("cat1", "cat2").type("oneType").name("1Name", "name2") .parentClassificationKey("pId1", "pId2").category("cat1", "cat2").type("oneType").name("1Name", "name2")
.descriptionLike("my desc").priority(1, 2, 1).serviceLevel("me", "and", "you"); .descriptionLike("my desc").priority(1, 2, 1).serviceLevel("me", "and", "you");
ObjectReferenceQuery objectReferenceQuery = new ObjectReferenceQueryImpl(taskanaEngineImpl) ObjectReferenceQuery objectReferenceQuery = new ObjectReferenceQueryImpl(taskanaEngineImpl)
@ -287,6 +291,7 @@ public class TaskServiceImplIntExplicitTest {
taskanaEngine.getWorkbasketService().createWorkbasket(workbasket); taskanaEngine.getWorkbasketService().createWorkbasket(workbasket);
Classification classification = classificationService.newClassification(); Classification classification = classificationService.newClassification();
classification.setKey("TEST");
taskanaEngine.getClassificationService().createClassification(classification); taskanaEngine.getClassificationService().createClassification(classification);
Task task = new Task(); Task task = new Task();

2
rest/pom.xml
View File

@ -5,7 +5,7 @@
<groupId>pro.taskana</groupId> <groupId>pro.taskana</groupId>
<artifactId>rest</artifactId> <artifactId>rest</artifactId>
<version>0.0.2-SNAPSHOT</version> <version>0.0.3-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>rest</name> <name>rest</name>

8
rest/src/main/java/pro/taskana/rest/query/TaskFilter.java
View File

@ -34,7 +34,7 @@ public class TaskFilter {
private static final String IS_TRANSFERRED = "isTransferred"; private static final String IS_TRANSFERRED = "isTransferred";
private static final String IS_READ = "isRead"; private static final String IS_READ = "isRead";
private static final String CLASSIFICATION_PARENT_ID = CLASSIFICATION + DOT + "parentClassificationId"; private static final String CLASSIFICATION_PARENT_KEY = CLASSIFICATION + DOT + "parentClassificationKey";
private static final String CLASSIFICATION_CATEGORY = CLASSIFICATION + DOT + "category"; private static final String CLASSIFICATION_CATEGORY = CLASSIFICATION + DOT + "category";
private static final String CLASSIFICATION_TYPE = CLASSIFICATION + DOT + "type"; private static final String CLASSIFICATION_TYPE = CLASSIFICATION + DOT + "type";
private static final String CLASSIFICATION_NAME = CLASSIFICATION + DOT + "name"; private static final String CLASSIFICATION_NAME = CLASSIFICATION + DOT + "name";
@ -86,9 +86,9 @@ public class TaskFilter {
// classification // classification
if (params.keySet().stream().filter(s -> s.startsWith(CLASSIFICATION)).toArray().length > 0) { if (params.keySet().stream().filter(s -> s.startsWith(CLASSIFICATION)).toArray().length > 0) {
ClassificationQuery classificationQuery = classificationService.createClassificationQuery(); ClassificationQuery classificationQuery = classificationService.createClassificationQuery();
if (params.containsKey(CLASSIFICATION_PARENT_ID)) { if (params.containsKey(CLASSIFICATION_PARENT_KEY)) {
String[] parentClassifications = extractCommaSeperatedFields(params.get(CLASSIFICATION_PARENT_ID)); String[] parentClassifications = extractCommaSeperatedFields(params.get(CLASSIFICATION_PARENT_KEY));
classificationQuery.parentClassification(parentClassifications); classificationQuery.parentClassificationKey(parentClassifications);
} }
if (params.containsKey(CLASSIFICATION_CATEGORY)) { if (params.containsKey(CLASSIFICATION_CATEGORY)) {
String[] categories = extractCommaSeperatedFields(params.get(CLASSIFICATION_CATEGORY)); String[] categories = extractCommaSeperatedFields(params.get(CLASSIFICATION_CATEGORY));

4
rest/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java
View File

@ -21,7 +21,7 @@ public class SampleDataGenerator {
private static final String WORKBASKET = SQL + TEST_DATA + "/workbasket.sql"; 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 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 WORKBASKET_ACCESS_LIST = SQL + TEST_DATA + "/workbasket-access-list.sql";
private static final String CATEGORY = SQL + TEST_DATA + "/classification.sql"; private static final String CLASSIFICATION = SQL + TEST_DATA + "/classification.sql";
private static final String OBJECT_REFERENCE = SQL + TEST_DATA + "/object-reference.sql"; private static final String OBJECT_REFERENCE = SQL + TEST_DATA + "/object-reference.sql";
public SampleDataGenerator(DataSource dataSource) throws SQLException { public SampleDataGenerator(DataSource dataSource) throws SQLException {
@ -50,7 +50,7 @@ public class SampleDataGenerator {
runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(TASK))); runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(TASK)));
runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(WORKBASKET))); runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(WORKBASKET)));
runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(DISTRIBUTION_TARGETS))); runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(DISTRIBUTION_TARGETS)));
runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(CATEGORY))); runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(CLASSIFICATION)));
runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(WORKBASKET_ACCESS_LIST))); runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(WORKBASKET_ACCESS_LIST)));
runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(OBJECT_REFERENCE))); runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(OBJECT_REFERENCE)));

26
rest/src/main/resources/sql/sample-data/classification.sql
View File

@ -1,14 +1,14 @@
INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000001', 'L10000', '', 'EXTERN', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'OLD-Leistungsfall', 'OLD-Leistungsfall', 1, 'P1D', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', '', "2016-12-12", '2017-12-11'); INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000001', 'L10000', '', 'EXTERN', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'OLD-Leistungsfall', 'OLD-Leistungsfall', 1, 'P1D', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', '', '', '2016-12-12', '2017-12-11');
INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000002', 'L10303', '', 'EXTERN', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'Beratungsprotokoll', 'Beratungsprotokoll', 1, 'P1D', 'VNR,RVNR,KOLVNR, ANR', '', '', '', '', '', '', '', CURRENT_TIMESTAMP, '9999-12-31'); INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000002', 'L10303', '', 'EXTERN', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'Beratungsprotokoll', 'Beratungsprotokoll', 1, 'P1D', 'VNR,RVNR,KOLVNR, ANR', '', '', '', '', '', '', '', '', CURRENT_TIMESTAMP, '9999-12-31');
INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000003', 'L1050', '', 'EXTERN', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'Widerruf', 'Widerruf', 1, 'P1D', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', '', CURRENT_TIMESTAMP, '9999-12-31'); INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000003', 'L1050', '', 'EXTERN', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'Widerruf', 'Widerruf', 1, 'P1D', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', '', '', CURRENT_TIMESTAMP, '9999-12-31');
INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000004', 'L11010', '', 'EXTERN', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'Dynamikänderung', 'Dynamikänderung', 1, 'P1D', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', '', CURRENT_TIMESTAMP, '9999-12-31'); INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000004', 'L11010', '', 'EXTERN', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'Dynamikänderung', 'Dynamikänderung', 1, 'P1D', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', '', '', CURRENT_TIMESTAMP, '9999-12-31');
INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000005', 'L110102', 'L11010', 'EXTERN', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'Dynamik-Ablehnung', 'Dynamik-Ablehnung', 5, 'P5D', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', '', CURRENT_TIMESTAMP, '9999-12-31'); INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000005', 'L110102', 'L11010', 'EXTERN', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'Dynamik-Ablehnung', 'Dynamik-Ablehnung', 5, 'P5D', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', '', '', CURRENT_TIMESTAMP, '9999-12-31');
INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000006', 'L110105', 'L11010', 'EXTERN', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'Dynamik-Ausschluss', 'Dynamik-Ausschluss', 5, 'P5D', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', '', CURRENT_TIMESTAMP, '9999-12-31'); INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000006', 'L110105', 'L11010', 'EXTERN', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'Dynamik-Ausschluss', 'Dynamik-Ausschluss', 5, 'P5D', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', '', '', CURRENT_TIMESTAMP, '9999-12-31');
INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000007', 'L110105', 'L11010', 'EXTERN', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'Dynamik-Einschluss/Änd.', 'Dynamik-Einschluss/Änd.', 5, 'P5D', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', '', CURRENT_TIMESTAMP, '9999-12-31'); INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000007', 'L110105', 'L11010', 'EXTERN', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'Dynamik-Einschluss/Änd.', 'Dynamik-Einschluss/Änd.', 5, 'P5D', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', '', '', CURRENT_TIMESTAMP, '9999-12-31');
INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000008', 'L12010', '', 'EXTERN', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'Gewährung-Policendarlehen', 'Gewährung-Policendarlehen', 1, 'P1D', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', '', CURRENT_TIMESTAMP, '9999-12-31'); INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000008', 'L12010', '', 'EXTERN', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'Gewährung-Policendarlehen', 'Gewährung-Policendarlehen', 1, 'P1D', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', '', '', CURRENT_TIMESTAMP, '9999-12-31');
INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000009', 'L140101', '', 'EXTERN', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'Zustimmungserklärung', 'Zustimmungserklärung', 2, 'P2D', 'VNR', '', '', '', '', '', '', '', CURRENT_TIMESTAMP, '9999-12-31'); INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000009', 'L140101', '', 'EXTERN', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'Zustimmungserklärung', 'Zustimmungserklärung', 2, 'P2D', 'VNR', '', '', '', '', '', '', '', '', CURRENT_TIMESTAMP, '9999-12-31');
INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000010', 'T2100', '', 'MANUAL', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'T-Vertragstermin VERA', 'T-Vertragstermin VERA', 2, 'P2D', 'VNR', '', '', '', '', '', '', '', CURRENT_TIMESTAMP, '9999-12-31'); INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000010', 'T2100', '', 'MANUAL', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'T-Vertragstermin VERA', 'T-Vertragstermin VERA', 2, 'P2D', 'VNR', '', '', '', '', '', '', '', '', CURRENT_TIMESTAMP, '9999-12-31');
INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000011', 'T6310', '', 'AUTOMATIC', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'T-GUK Honorarrechnung erstellen', 'Generali Unterstützungskasse Honorar wird fällig', 2, 'P2D', 'VNR', '', '', '', '', '', '', '', CURRENT_TIMESTAMP, '9999-12-31'); INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000011', 'T6310', '', 'AUTOMATIC', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'T-GUK Honorarrechnung erstellen', 'Generali Unterstützungskasse Honorar wird fällig', 2, 'P2D', 'VNR', '', '', '', '', '', '', '', '', CURRENT_TIMESTAMP, '9999-12-31');
INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000013', 'DOKTYP_DEFAULT', '', 'EXTERN', 'DOCUMENT', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'EP allgemein', 'EP allgemein', 99, 'P2000D', 'VNR', '', '', '', '', '', '', '', CURRENT_TIMESTAMP, '9999-12-31'); INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000013', 'DOKTYP_DEFAULT', '', 'EXTERN', 'DOCUMENT', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'EP allgemein', 'EP allgemein', 99, 'P2000D', 'VNR', '', '', '', '', '', '', '', '', CURRENT_TIMESTAMP, '9999-12-31');
INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000014', 'L10000', '', 'EXTERN', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'BUZ-Leistungsfall', 'BUZ-Leistungsfall', 1, 'P1D', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', '', "2017-12-12", '9999-12-31'); INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000014', 'L10000', '', 'EXTERN', 'TASK', 'GELBAV', TRUE, CURRENT_TIMESTAMP, 'BUZ-Leistungsfall', 'BUZ-Leistungsfall', 1, 'P1D', 'VNR,RVNR,KOLVNR', '', '', '', '', '', '', '', '', '2017-12-12', '9999-12-31');