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

TSK-877: fixed conversion workbasketresource -> workbasket without created or modified

This commit is contained in:
Mustapha Zorgati 2019-09-13 10:25:04 +02:00 committed by Dennis Lehmann
parent c3857fe3a3
commit b43b6cecfb
2 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketResourceAssembler.java
View File

@ -35,8 +35,12 @@ public class WorkbasketResourceAssembler {
BeanUtils.copyProperties(wbResource, workbasket);
workbasket.setId(wbResource.workbasketId);
workbasket.setModified(Instant.parse(wbResource.modified));
workbasket.setCreated(Instant.parse(wbResource.created));
if (wbResource.modified != null) {
workbasket.setModified(Instant.parse(wbResource.modified));
}
if (wbResource.created != null) {
workbasket.setCreated(Instant.parse(wbResource.created));
}
return workbasket;
}

44
rest/taskana-rest-spring/src/test/java/pro/taskana/rest/resource/WorkbasketResourceAssemblerTest.java
View File

@ -56,6 +56,32 @@ public class WorkbasketResourceAssemblerTest {
testEquality(workbasket, workbasketResource);
}
@Test
public void resourceWithoutCreated() {
//given
WorkbasketResource resource = new WorkbasketResource();
resource.setWorkbasketId("1");
resource.setModified("2010-01-01T12:00:00Z");
resource.setType(WorkbasketType.PERSONAL);
//when
Workbasket workbasket = workbasketResourceAssembler.toModel(resource);
//then
testEquality(workbasket, resource);
}
@Test
public void resourceWithoutModified() {
//given
WorkbasketResource resource = new WorkbasketResource();
resource.setWorkbasketId("1");
resource.setCreated("2010-01-01T12:00:00Z");
resource.setType(WorkbasketType.PERSONAL);
//when
Workbasket workbasket = workbasketResourceAssembler.toModel(resource);
//then
testEquality(workbasket, resource);
}
@Test
public void resourceToWorkbasket() {
// given
@ -85,21 +111,23 @@ public class WorkbasketResourceAssemblerTest {
private void testEquality(Workbasket workbasket, WorkbasketResource workbasketResource) {
Assert.assertEquals(workbasket.getId(), workbasketResource.workbasketId);
Assert.assertEquals(workbasket.getKey(), workbasketResource.key);
Assert.assertEquals(workbasket.getCreated() == null ? null : workbasket.getCreated().toString(),
workbasketResource.created);
Assert.assertEquals(workbasket.getModified() == null ? null : workbasket.getModified().toString(),
workbasketResource.modified);
Assert.assertEquals(workbasket.getName(), workbasketResource.name);
Assert.assertEquals(workbasket.getDescription(), workbasketResource.description);
Assert.assertEquals(workbasket.getOwner(), workbasketResource.owner);
Assert.assertEquals(workbasket.getDomain(), workbasketResource.domain);
Assert.assertEquals(workbasket.getType(), workbasketResource.type);
Assert.assertEquals(workbasket.getCustom1(), workbasketResource.custom1);
Assert.assertEquals(workbasket.getCustom2(), workbasketResource.custom2);
Assert.assertEquals(workbasket.getCustom3(), workbasketResource.custom3);
Assert.assertEquals(workbasket.getCustom4(), workbasketResource.custom4);
Assert.assertEquals(workbasket.getDescription(), workbasketResource.description);
Assert.assertEquals(workbasket.getCreated().toString(), workbasketResource.created);
Assert.assertEquals(workbasket.getModified().toString(), workbasketResource.modified);
Assert.assertEquals(workbasket.getKey(), workbasketResource.key);
Assert.assertEquals(workbasket.getDomain(), workbasketResource.domain);
Assert.assertEquals(workbasket.getName(), workbasketResource.name);
Assert.assertEquals(workbasket.getOrgLevel1(), workbasketResource.orgLevel1);
Assert.assertEquals(workbasket.getOrgLevel2(), workbasketResource.orgLevel2);
Assert.assertEquals(workbasket.getOrgLevel3(), workbasketResource.orgLevel3);
Assert.assertEquals(workbasket.getOrgLevel4(), workbasketResource.orgLevel4);
Assert.assertEquals(workbasket.getOwner(), workbasketResource.owner);
Assert.assertEquals(workbasket.getType(), workbasketResource.type);
}
}