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

TSK-15-fixedNotAuthorizedException-in-TaskServiceImplIntExplicitTest.testCreateManualTask

This commit is contained in:
BerndBreier 2017-11-30 15:39:13 +01:00
parent 650fcfde4d
commit f753ef6767
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@ public class TaskServiceImpl implements TaskService {
private static final String ID_PREFIX_OBJECTR_EFERENCE = "ORI"; private static final String ID_PREFIX_OBJECTR_EFERENCE = "ORI";
private static final String ID_PREFIX_TASK = "TKI"; private static final String ID_PREFIX_TASK = "TKI";
private static final String ID_PREFIX_BUSINESS_PROCESS = "BPI"; private static final String ID_PREFIX_BUSINESS_PROCESS = "BPI";
private static final String TYPE_MANUAL = "MANUAL";
private TaskanaEngine taskanaEngine; private TaskanaEngine taskanaEngine;
private TaskanaEngineImpl taskanaEngineImpl; private TaskanaEngineImpl taskanaEngineImpl;
@ -124,7 +125,7 @@ public class TaskServiceImpl implements TaskService {
taskanaEngine.getWorkbasketService().getWorkbasket(workbasketId); taskanaEngine.getWorkbasketService().getWorkbasket(workbasketId);
Classification classification = taskanaEngine.getClassificationService().getClassification(classificationId, domain); Classification classification = taskanaEngine.getClassificationService().getClassification(classificationId, domain);
if (classification.getCategory() != "MANUAL") { if (!TYPE_MANUAL.equals(classification.getCategory())) {
throw new NotAuthorizedException("You're not allowed to add a task manually to a '" + classification.getCategory() + "'- Classification!"); throw new NotAuthorizedException("You're not allowed to add a task manually to a '" + classification.getCategory() + "'- Classification!");
} }
@ -139,7 +140,7 @@ public class TaskServiceImpl implements TaskService {
task.setDescription(description); task.setDescription(description);
this.standardSettings(task); this.standardSettings(task);
this.setCustomers(task); this.setCustomAttributes(task);
this.taskMapper.insert(task); this.taskMapper.insert(task);
@ -263,9 +264,9 @@ public class TaskServiceImpl implements TaskService {
taskanaEngineImpl.returnConnection(); taskanaEngineImpl.returnConnection();
} }
return (resultList == null) ? new ArrayList<>() : resultList; return (resultList == null) ? new ArrayList<>() : resultList;
} }
private void standardSettings(Task task) { private void standardSettings(Task task) {
Timestamp now = new Timestamp(System.currentTimeMillis()); Timestamp now = new Timestamp(System.currentTimeMillis());
task.setId(IdGenerator.generateWithPrefix(ID_PREFIX_TASK)); task.setId(IdGenerator.generateWithPrefix(ID_PREFIX_TASK));
task.setState(TaskState.READY); task.setState(TaskState.READY);
@ -313,7 +314,7 @@ public class TaskServiceImpl implements TaskService {
} }
} }
private void setCustomers(Task task) { private void setCustomAttributes(Task task) {
if (task.getCustomAttributes() != null) { if (task.getCustomAttributes() != null) {
for (String custom : task.getCustomAttributes().keySet()) { for (String custom : task.getCustomAttributes().keySet()) {
if (task.getCustom1() == null) { if (task.getCustom1() == null) {