Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public class ReferencedTask {
private String description;
private String owner;
private String priority;
private String manualPriority;
private String suspended;
private String systemUrl;
private String taskDefinitionKey;
Expand Down Expand Up @@ -123,6 +124,14 @@ public void setPriority(String priority) {
this.priority = priority;
}

public String getManualPriority() {
return manualPriority;
}

public void setManualPriority(String manualPriority) {
this.manualPriority = manualPriority;
}

public String getSuspended() {
return suspended;
}
Expand Down Expand Up @@ -200,6 +209,7 @@ public int hashCode() {
description,
owner,
priority,
manualPriority,
suspended,
systemUrl,
taskDefinitionKey,
Expand Down Expand Up @@ -233,6 +243,7 @@ public boolean equals(Object obj) {
&& Objects.equals(description, other.description)
&& Objects.equals(owner, other.owner)
&& Objects.equals(priority, other.priority)
&& Objects.equals(manualPriority, other.manualPriority)
&& Objects.equals(suspended, other.suspended)
&& Objects.equals(systemUrl, other.systemUrl)
&& Objects.equals(taskDefinitionKey, other.taskDefinitionKey)
Expand All @@ -258,6 +269,8 @@ public String toString() {
+ assignee
+ ", created="
+ created
+ ", planned="
+ planned
+ ", due="
+ due
+ ", description="
Expand All @@ -266,6 +279,8 @@ public String toString() {
+ owner
+ ", priority="
+ priority
+ ", manualPriority="
+ manualPriority
+ ", suspended="
+ suspended
+ ", systemUrl="
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ private String getReferencedTaskJson(DelegateTask delegateTask) throws JsonProce
getUserTaskExtensionProperty(delegateTask, "taskana.classification-key"));
referencedTask.setDomain(getDomainVariable(delegateTask));
referencedTask.setWorkbasketKey(getWorkbasketKey(delegateTask));
referencedTask.setManualPriority(getManualPriority(delegateTask));
referencedTask.setVariables(getProcessVariables(delegateTask));
String referencedTaskJson = objectMapper.writeValueAsString(referencedTask);
LOGGER.debug("Exit from getReferencedTaskJson. Returning {}.", referencedTaskJson);
Expand Down Expand Up @@ -343,6 +344,24 @@ private List<String> splitVariableNamesString(String variableNamesConcatenated)
return Arrays.asList(variableNamesConcatenated.trim().split("\\s*,\\s*"));
}

private String getManualPriority(DelegateTask delegateTask) {
String manualPriority = "-1";
try {
Object manualPriorityObj = delegateTask.getVariable("taskana.manual-priority");
if (manualPriorityObj instanceof String) {
manualPriority = (String) manualPriorityObj;
}
} catch (Exception e) {
LOGGER.warn(
"Caught exception while trying to retrieve taskana.manual-priority "
+ "for task {} in ProcessDefinition {}",
delegateTask.getName(),
delegateTask.getProcessDefinitionId(),
e);
}
return manualPriority;
}

private String getWorkbasketKey(DelegateTask delegateTask) {
String workbasketKey = null;
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,51 @@ void user_task_process_instance_started_in_camunda_via_rest_should_result_in_tas
});
}

@WithAccessId(
user = "teamlead_1",
groups = {"taskadmin"})
@Test
void task_with_manual_priority_should_result_in_taskanaTask_with_this_manual_priority()
throws Exception {

String variables =
"\"variables\": {\"taskana.manual-priority\": {\"value\":\"555\", "
+ "\"type\":\"string\"}}";
String processInstanceId =
this.camundaProcessengineRequester.startCamundaProcessAndReturnId(
"simple_user_task_process", variables);
List<String> camundaTaskIds =
this.camundaProcessengineRequester.getTaskIdsFromProcessInstanceId(processInstanceId);

Thread.sleep((long) (this.adapterTaskPollingInterval * 1.2));

TaskSummary taskanaTask =
taskService.createTaskQuery().externalIdIn(camundaTaskIds.get(0)).single();

assertThat(taskanaTask.getManualPriority()).isEqualTo(555);
}

@WithAccessId(
user = "teamlead_1",
groups = {"taskadmin"})
@Test
void task_without_manual_priority_should_result_in_taskanaTask_with_default_manual_priority()
throws Exception {

String processInstanceId =
this.camundaProcessengineRequester.startCamundaProcessAndReturnId(
"simple_user_task_process", "");
List<String> camundaTaskIds =
this.camundaProcessengineRequester.getTaskIdsFromProcessInstanceId(processInstanceId);

Thread.sleep((long) (this.adapterTaskPollingInterval * 1.2));

TaskSummary taskanaTask =
taskService.createTaskQuery().externalIdIn(camundaTaskIds.get(0)).single();

assertThat(taskanaTask.getManualPriority()).isEqualTo(-1);
}

@WithAccessId(
user = "teamlead_1",
groups = {"taskadmin"})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ public Task convertToTaskanaTask(ReferencedTask referencedTask) {

taskanaTask.setPrimaryObjRef(createObjectReference());

taskanaTask.setManualPriority(Integer.parseInt(referencedTask.getManualPriority()));

return taskanaTask;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public class ReferencedTask {
private String description;
private String owner;
private String priority;
private String manualPriority;
private String suspended;
private String systemUrl;
private String taskDefinitionKey;
Expand Down Expand Up @@ -123,6 +124,14 @@ public void setPriority(String priority) {
this.priority = priority;
}

public String getManualPriority() {
return manualPriority;
}

public void setManualPriority(String manualPriority) {
this.manualPriority = manualPriority;
}

public String getSuspended() {
return suspended;
}
Expand Down Expand Up @@ -200,6 +209,7 @@ public int hashCode() {
description,
owner,
priority,
manualPriority,
suspended,
systemUrl,
taskDefinitionKey,
Expand Down Expand Up @@ -233,6 +243,7 @@ public boolean equals(Object obj) {
&& Objects.equals(description, other.description)
&& Objects.equals(owner, other.owner)
&& Objects.equals(priority, other.priority)
&& Objects.equals(manualPriority, other.manualPriority)
&& Objects.equals(suspended, other.suspended)
&& Objects.equals(systemUrl, other.systemUrl)
&& Objects.equals(taskDefinitionKey, other.taskDefinitionKey)
Expand Down Expand Up @@ -266,6 +277,8 @@ public String toString() {
+ owner
+ ", priority="
+ priority
+ ", manualPriority="
+ manualPriority
+ ", suspended="
+ suspended
+ ", systemUrl="
Expand Down