Skip to content

ADPT-164: Set default value for taskana.manual-priority #515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ensarevlideveloper merged 1 commit into from
Dec 13, 2022
Merged

ADPT-164: Set default value for taskana.manual-priority #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 50 additions & 1 deletion ...a-spring-boot-test/src/test/java/pro/taskana/adapter/integration/TestTaskAcquisition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
import java.util.stream.Stream;
import org.camunda.bpm.engine.impl.calendar.DateTimeUtil;
import org.junit.jupiter.api.DynamicTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestFactory;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.function.ThrowingConsumer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down Expand Up @@ -704,7 +708,7 @@ void should_SetPlannedDateInTaskanaTask_When_StartCamundaTaskWithFollowUpDate()
assertThat(camundaTaskIds).hasSize(1);
camundaTaskId = camundaTaskIds.get(0);
taskanaTaskSummaryList = this.taskService.createTaskQuery().externalIdIn(camundaTaskId).list();
assertThat(taskanaTaskSummaryList.size()).isEqualTo(1);
assertThat(taskanaTaskSummaryList).hasSize(1);
taskanaTaskExternalId = taskanaTaskSummaryList.get(0).getExternalId();
assertThat(taskanaTaskExternalId).isEqualTo(camundaTaskId);
taskanaTaskId = taskanaTaskSummaryList.get(0).getId();
Expand All @@ -714,6 +718,51 @@ void should_SetPlannedDateInTaskanaTask_When_StartCamundaTaskWithFollowUpDate()
assertThat(taskanaTask.getPlanned()).isAfter(now);
}

@WithAccessId(
user = "teamlead_1",
groups = {"taskadmin"})
@TestFactory
Stream<DynamicTest> should_CreateTaskanaTask_When_StartCamundaTaskWithManualPriorityNull() {
Stream<Pair<String, String>> input =
Stream.of(
Pair.of(
"manual priority is empty",
"\"variables\": {\"taskana.manual-priority\": {\"value\":\"\", "
+ "\"type\":\"string\"}}"),
Pair.of(
"manual priority is null",
"\"variables\": {\"taskana.manual-priority\": {\"value\":\"null\", "
+ "\"type\":\"string\"}}"),
Pair.of("manual priority does not exist", "\"variables\": {}"));

ThrowingConsumer<Pair<String, String>> test =
p -> {
String variables = p.getRight();
String processInstanceId =
this.camundaProcessengineRequester.startCamundaProcessAndReturnId(
"simple_user_task_process", variables);
List<String> camundaTaskIds =
this.camundaProcessengineRequester.getTaskIdsFromProcessInstanceId(processInstanceId);

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

// Make sure we only have one Camunda Task, so we don't need a for-loop
assertThat(camundaTaskIds).hasSize(1);
String camundaTaskId = camundaTaskIds.get(0);
// retrieve and check taskanaTaskId
List<TaskSummary> taskanaTaskSummaryList =
this.taskService.createTaskQuery().externalIdIn(camundaTaskId).list();
assertThat(taskanaTaskSummaryList).hasSize(1);
String taskanaTaskExternalId = taskanaTaskSummaryList.get(0).getExternalId();
assertThat(taskanaTaskExternalId).isEqualTo(camundaTaskId);
String taskanaTaskId = taskanaTaskSummaryList.get(0).getId();
Task taskanaTask = this.taskService.getTask(taskanaTaskId);
assertThat(taskanaTask.getManualPriority()).isEqualTo(-1);
};

return DynamicTest.stream(input, Pair::getLeft, test);
}

private void setSystemConnector(String systemEngineIdentifier) {

StringTokenizer systemConfigParts = new StringTokenizer(configuredSystemConnectorUrls, "|");
Expand Down
8 changes: 7 additions & 1 deletion ...or/src/main/java/pro/taskana/adapter/taskanaconnector/api/impl/TaskInformationMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,13 @@ public Task convertToTaskanaTask(ReferencedTask referencedTask) {

taskanaTask.setPrimaryObjRef(createObjectReference());

taskanaTask.setManualPriority(Integer.parseInt(referencedTask.getManualPriority()));
if (referencedTask.getManualPriority() == null
|| referencedTask.getManualPriority().isEmpty()
|| "null".equals(referencedTask.getManualPriority())) {
taskanaTask.setManualPriority(-1);
} else {
taskanaTask.setManualPriority(Integer.parseInt(referencedTask.getManualPriority()));
}

setCustomIntegers(referencedTask, taskanaTask);

Expand Down