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

TSK-1567: Fixed creating a task using a TaskRouter

This commit is contained in:
SebastianRoseneck 2021-04-20 14:42:48 +02:00 committed by Mustapha Zorgati
parent 7b48d8bb20
commit 542ca3d7eb
4 changed files with 70 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/assembler/TaskRepresentationModelAssembler.java
View File

@ -112,8 +112,12 @@ public class TaskRepresentationModelAssembler
public Task toEntityModel(TaskRepresentationModel repModel) throws InvalidArgumentException {
verifyCorrectCustomAttributesFormat(repModel);
TaskImpl task =
(TaskImpl) taskService.newTask(repModel.getWorkbasketSummary().getWorkbasketId());
TaskImpl task;
if (repModel.getWorkbasketSummary() != null) {
task = (TaskImpl) taskService.newTask(repModel.getWorkbasketSummary().getWorkbasketId());
} else {
task = (TaskImpl) taskService.newTask();
}
task.setId(repModel.getTaskId());
task.setExternalId(repModel.getExternalId());
task.setCreated(repModel.getCreated());
@ -130,7 +134,9 @@ public class TaskRepresentationModelAssembler
task.setState(repModel.getState());
task.setClassificationSummary(
classificationAssembler.toEntityModel(repModel.getClassificationSummary()));
if (repModel.getWorkbasketSummary() != null) {
task.setWorkbasketSummary(workbasketAssembler.toEntityModel(repModel.getWorkbasketSummary()));
}
task.setBusinessProcessId(repModel.getBusinessProcessId());
task.setParentBusinessProcessId(repModel.getParentBusinessProcessId());
task.setOwner(repModel.getOwner());

2
rest/taskana-rest-spring/src/main/java/pro/taskana/task/rest/assembler/TaskSummaryRepresentationModelAssembler.java
View File

@ -116,8 +116,10 @@ public class TaskSummaryRepresentationModelAssembler
taskSummary.setState(repModel.getState());
taskSummary.setClassificationSummary(
classificationAssembler.toEntityModel(repModel.getClassificationSummary()));
if (repModel.getWorkbasketSummary() != null) {
taskSummary.setWorkbasketSummary(
workbasketAssembler.toEntityModel(repModel.getWorkbasketSummary()));
}
taskSummary.setBusinessProcessId(repModel.getBusinessProcessId());
taskSummary.setParentBusinessProcessId(repModel.getParentBusinessProcessId());
taskSummary.setOwner(repModel.getOwner());

29
rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/TaskRepresentationModelAssemberTest.java
View File

@ -116,6 +116,35 @@ class TaskRepresentationModelAssemberTest {
testEquality(task, repModel);
}
@Test
void should_ReturnEntity_When_ConvertingRepresentationModelWithoutWorkbasketSummaryToEntity()
throws Exception {
// given
ObjectReferenceRepresentationModel primaryObjRef = new ObjectReferenceRepresentationModel();
primaryObjRef.setId("abc");
ClassificationSummaryRepresentationModel classificationSummary =
new ClassificationSummaryRepresentationModel();
classificationSummary.setKey("keyabc");
classificationSummary.setDomain("DOMAIN_A");
classificationSummary.setType("MANUAL");
AttachmentRepresentationModel attachment = new AttachmentRepresentationModel();
attachment.setClassificationSummary(classificationSummary);
attachment.setAttachmentId("attachmentId");
attachment.setObjectReference(primaryObjRef);
TaskRepresentationModel repModel = new TaskRepresentationModel();
repModel.setTaskId("taskId");
repModel.setExternalId("externalId");
repModel.setClassificationSummary(classificationSummary);
repModel.setPrimaryObjRef(primaryObjRef);
// when
Task task = assembler.toEntityModel(repModel);
// then
assertThat(repModel.getWorkbasketSummary()).isNull();
assertThat(task.getWorkbasketSummary())
.isNotNull()
.hasAllNullFieldsOrPropertiesExcept("markedForDeletion");
}
@Test
void should_ReturnRepresentationModel_When_ConvertingEntityToRepresentationModel()
throws Exception {

28
rest/taskana-rest-spring/src/test/java/pro/taskana/task/rest/assembler/TaskSummaryRepresentationModelAssemblerTest.java
View File

@ -186,6 +186,34 @@ class TaskSummaryRepresentationModelAssemblerTest {
testEquality(task, repModel);
}
@Test
void should_ReturnEntity_When_ConvertingRepresentationModelWithoutWorkbasketSummaryToEntity() {
// given
ObjectReferenceRepresentationModel primaryObjRef = new ObjectReferenceRepresentationModel();
primaryObjRef.setId("abc");
ClassificationSummaryRepresentationModel classificationSummary =
new ClassificationSummaryRepresentationModel();
classificationSummary.setKey("keyabc");
classificationSummary.setDomain("DOMAIN_A");
classificationSummary.setType("MANUAL");
AttachmentRepresentationModel attachment = new AttachmentRepresentationModel();
attachment.setClassificationSummary(classificationSummary);
attachment.setAttachmentId("attachmentId");
attachment.setObjectReference(primaryObjRef);
TaskRepresentationModel repModel = new TaskRepresentationModel();
repModel.setTaskId("taskId");
repModel.setExternalId("externalId");
repModel.setClassificationSummary(classificationSummary);
repModel.setPrimaryObjRef(primaryObjRef);
// when
TaskSummary taskSummary = assembler.toEntityModel(repModel);
// then
assertThat(repModel.getWorkbasketSummary()).isNull();
assertThat(taskSummary.getWorkbasketSummary())
.isNotNull()
.hasAllNullFieldsOrPropertiesExcept("markedForDeletion");
}
@Test
void should_Equal_When_ComparingEntityWithConvertedEntity() {
// given