TSK-878: fixed conversion of taskresource -> task
This commit is contained in:
Mustapha Zorgati
Dennis Lehmann
parent
b43b6cecfb
commit
bc8c93a489
|
|
@ -97,7 +97,7 @@ public class TaskResource extends ResourceSupport {
|
|||
attachments =
|
||||
task.getAttachments()
|
||||
.stream()
|
||||
.map(attachment -> new AttachmentResource(attachment))
|
||||
.map(AttachmentResource::new)
|
||||
.collect(Collectors.toList());
|
||||
custom1 = task.getCustomAttribute("1");
|
||||
custom2 = task.getCustomAttribute("2");
|
||||
|
|
|
|||
|
|
@ -63,16 +63,19 @@ public class TaskResourceAssembler
|
|||
task.setCreated(Instant.parse(resource.getCreated()));
|
||||
}
|
||||
if (resource.getModified() != null) {
|
||||
task.setModified(Instant.parse(resource.getModified().toString()));
|
||||
task.setModified(Instant.parse(resource.getModified()));
|
||||
}
|
||||
if (resource.getClaimed() != null) {
|
||||
task.setClaimed(Instant.parse(resource.getClaimed().toString()));
|
||||
task.setClaimed(Instant.parse(resource.getClaimed()));
|
||||
}
|
||||
if (resource.getCompleted() != null) {
|
||||
task.setCompleted(Instant.parse(resource.getCompleted().toString()));
|
||||
task.setCompleted(Instant.parse(resource.getCompleted()));
|
||||
}
|
||||
if (resource.getDue() != null) {
|
||||
task.setDue(Instant.parse(resource.getDue().toString()));
|
||||
task.setDue(Instant.parse(resource.getDue()));
|
||||
}
|
||||
if (resource.getPlanned() != null) {
|
||||
task.setPlanned(Instant.parse(resource.getPlanned()));
|
||||
}
|
||||
task.setClassificationSummary(classificationAssembler.toModel(resource.getClassificationSummaryResource()));
|
||||
task.setWorkbasketSummary(workbasketAssembler.toModel(resource.getWorkbasketSummaryResource()));
|
||||
|
|
|
|||
|
|
@ -0,0 +1,162 @@
|
|||
package pro.taskana.rest.resource;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.test.context.ContextConfiguration;
|
||||
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
|
||||
import org.springframework.test.context.web.WebAppConfiguration;
|
||||
|
||||
import pro.taskana.Attachment;
|
||||
import pro.taskana.ObjectReference;
|
||||
import pro.taskana.Task;
|
||||
import pro.taskana.TaskService;
|
||||
import pro.taskana.TaskState;
|
||||
import pro.taskana.exceptions.InvalidArgumentException;
|
||||
import pro.taskana.rest.TestConfiguration;
|
||||
|
||||
/**
|
||||
* Test for {@link TaskResourceAssembler}.
|
||||
*/
|
||||
@RunWith(SpringJUnit4ClassRunner.class)
|
||||
@ContextConfiguration(classes = {TestConfiguration.class})
|
||||
@WebAppConfiguration
|
||||
public class TaskResourceAssemberTest {
|
||||
|
||||
@Autowired
|
||||
TaskService taskService;
|
||||
@Autowired
|
||||
TaskResourceAssembler taskResourceAssembler;
|
||||
|
||||
@Test
|
||||
public void testSimpleResourceToModel() throws InvalidArgumentException {
|
||||
//given
|
||||
ObjectReference primaryObjRef = new ObjectReference();
|
||||
primaryObjRef.setId("abc");
|
||||
WorkbasketSummaryResource workbasketResource = new WorkbasketSummaryResource();
|
||||
workbasketResource.setWorkbasketId("workbasketId");
|
||||
ClassificationSummaryResource classificationResource = new ClassificationSummaryResource();
|
||||
classificationResource.key = "keyabc";
|
||||
classificationResource.domain = "DOMAIN_A";
|
||||
classificationResource.type = "MANUAL";
|
||||
AttachmentResource attachement = new AttachmentResource();
|
||||
attachement.setClassificationSummary(classificationResource);
|
||||
attachement.setAttachmentId("attachementId");
|
||||
TaskResource resource = new TaskResource();
|
||||
resource.setTaskId("taskId");
|
||||
resource.setExternalId("externalId");
|
||||
resource.setCreated("2019-09-13T08:44:17.588Z");
|
||||
resource.setClaimed("2019-09-13T08:44:17.588Z");
|
||||
resource.setCompleted("2019-09-13T08:44:17.588Z");
|
||||
resource.setModified("2019-09-13T08:44:17.588Z");
|
||||
resource.setPlanned("2019-09-13T08:44:17.588Z");
|
||||
resource.setDue("2019-09-13T08:44:17.588Z");
|
||||
resource.setName("name");
|
||||
resource.setCreator("creator");
|
||||
resource.setDescription("desc");
|
||||
resource.setNote("note");
|
||||
resource.setPriority(123);
|
||||
resource.setState(TaskState.READY);
|
||||
resource.setClassificationSummaryResource(classificationResource);
|
||||
resource.setWorkbasketSummaryResource(workbasketResource);
|
||||
resource.setBusinessProcessId("businessProcessId");
|
||||
resource.setParentBusinessProcessId("parentBusinessProcessId");
|
||||
resource.setOwner("owner");
|
||||
resource.setPrimaryObjRef(primaryObjRef);
|
||||
resource.setRead(true);
|
||||
resource.setTransferred(true);
|
||||
resource.setCustomAttributes(Collections.singletonList(new TaskResource.CustomAttribute("abc", "def")));
|
||||
resource.setCallbackInfo(Collections.singletonList(new TaskResource.CustomAttribute("ghi", "jkl")));
|
||||
resource.setAttachments(Collections.singletonList(attachement));
|
||||
resource.setCustom1("custom1");
|
||||
resource.setCustom2("custom2");
|
||||
resource.setCustom3("custom3");
|
||||
resource.setCustom4("custom4");
|
||||
resource.setCustom5("custom5");
|
||||
resource.setCustom6("custom6");
|
||||
resource.setCustom7("custom7");
|
||||
resource.setCustom8("custom8");
|
||||
resource.setCustom9("custom9");
|
||||
resource.setCustom10("custom10");
|
||||
resource.setCustom11("custom11");
|
||||
resource.setCustom12("custom12");
|
||||
resource.setCustom13("custom13");
|
||||
resource.setCustom14("custom14");
|
||||
resource.setCustom15("custom15");
|
||||
//when
|
||||
Task task = taskResourceAssembler.toModel(resource);
|
||||
//then
|
||||
testEquality(task, resource);
|
||||
}
|
||||
|
||||
public void testEquality(Task task, TaskResource resource) throws InvalidArgumentException {
|
||||
Assert.assertEquals(task.getId(), resource.getTaskId());
|
||||
Assert.assertEquals(task.getExternalId(), resource.getExternalId());
|
||||
Assert.assertEquals(task.getCreated() == null ? null : task.getCreated().toString(), resource.getCreated());
|
||||
Assert.assertEquals(task.getClaimed() == null ? null : task.getClaimed().toString(), resource.getClaimed());
|
||||
Assert.assertEquals(task.getCompleted() == null ? null : task.getCompleted().toString(),
|
||||
resource.getCompleted());
|
||||
Assert.assertEquals(task.getModified() == null ? null : task.getModified().toString(), resource.getModified());
|
||||
Assert.assertEquals(task.getPlanned() == null ? null : task.getPlanned().toString(), resource.getPlanned());
|
||||
Assert.assertEquals(task.getDue() == null ? null : task.getDue().toString(), resource.getDue());
|
||||
Assert.assertEquals(task.getName(), resource.getName());
|
||||
Assert.assertEquals(task.getCreator(), resource.getCreator());
|
||||
Assert.assertEquals(task.getDescription(), resource.getDescription());
|
||||
Assert.assertEquals(task.getNote(), resource.getNote());
|
||||
Assert.assertEquals(task.getPriority(), resource.getPriority());
|
||||
Assert.assertEquals(task.getState(), resource.getState());
|
||||
Assert.assertEquals(task.getClassificationSummary().getId(),
|
||||
resource.getClassificationSummaryResource().getClassificationId());
|
||||
Assert.assertEquals(task.getWorkbasketSummary().getId(),
|
||||
resource.getWorkbasketSummaryResource().getWorkbasketId());
|
||||
Assert.assertEquals(task.getBusinessProcessId(), resource.getBusinessProcessId());
|
||||
Assert.assertEquals(task.getParentBusinessProcessId(), resource.getParentBusinessProcessId());
|
||||
Assert.assertEquals(task.getOwner(), resource.getOwner());
|
||||
Assert.assertEquals(task.getPrimaryObjRef(), resource.getPrimaryObjRef());
|
||||
Assert.assertEquals(task.isRead(), resource.isRead());
|
||||
Assert.assertEquals(task.isTransferred(), resource.isTransferred());
|
||||
testEquality(task.getCustomAttributes(), resource.getCustomAttributes());
|
||||
testEquality(task.getCallbackInfo(), resource.getCallbackInfo());
|
||||
testEqualityAttachements(task.getAttachments(), resource.getAttachments());
|
||||
Assert.assertEquals(task.getCustomAttribute("1"), resource.getCustom1());
|
||||
Assert.assertEquals(task.getCustomAttribute("2"), resource.getCustom2());
|
||||
Assert.assertEquals(task.getCustomAttribute("3"), resource.getCustom3());
|
||||
Assert.assertEquals(task.getCustomAttribute("4"), resource.getCustom4());
|
||||
Assert.assertEquals(task.getCustomAttribute("5"), resource.getCustom5());
|
||||
Assert.assertEquals(task.getCustomAttribute("6"), resource.getCustom6());
|
||||
Assert.assertEquals(task.getCustomAttribute("7"), resource.getCustom7());
|
||||
Assert.assertEquals(task.getCustomAttribute("8"), resource.getCustom8());
|
||||
Assert.assertEquals(task.getCustomAttribute("9"), resource.getCustom9());
|
||||
Assert.assertEquals(task.getCustomAttribute("10"), resource.getCustom10());
|
||||
Assert.assertEquals(task.getCustomAttribute("11"), resource.getCustom11());
|
||||
Assert.assertEquals(task.getCustomAttribute("12"), resource.getCustom12());
|
||||
Assert.assertEquals(task.getCustomAttribute("13"), resource.getCustom13());
|
||||
Assert.assertEquals(task.getCustomAttribute("14"), resource.getCustom14());
|
||||
Assert.assertEquals(task.getCustomAttribute("15"), resource.getCustom15());
|
||||
Assert.assertEquals(task.getCustomAttribute("16"), resource.getCustom16());
|
||||
|
||||
}
|
||||
|
||||
public void testEqualityAttachements(List<Attachment> attachments, List<AttachmentResource> resources) {
|
||||
Assert.assertEquals(attachments.size(), resources.size());
|
||||
for (int i = 0; i < resources.size(); i++) {
|
||||
AttachmentResource resource = resources.get(i);
|
||||
Attachment attachment = attachments.get(i);
|
||||
//Anything else shoulde be tested in AttachementResourceAssemblerTest
|
||||
Assert.assertEquals(attachment.getId(), resource.getAttachmentId());
|
||||
}
|
||||
}
|
||||
|
||||
public void testEquality(Map<String, String> customAttributes,
|
||||
List<TaskResource.CustomAttribute> resourceAttributes) {
|
||||
Assert.assertEquals(customAttributes.size(), resourceAttributes.size());
|
||||
resourceAttributes.forEach(
|
||||
attribute -> Assert.assertEquals(customAttributes.get(attribute.getKey()), attribute.getValue()));
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue