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

TSK-227: REST - Workbasket ID for Controller instead of KEY.

This commit is contained in:
Marcel Lengl 2018-02-21 17:17:48 +01:00
parent c065590711
commit 36974006af
8 changed files with 94 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java
View File

@ -613,7 +613,7 @@ public class WorkbasketServiceImpl implements WorkbasketService {
// delete workbasket and sub-tables
distributionTargetMapper.deleteAllDistributionTargetsBySourceId(wb.getId());
distributionTargetMapper.deleteAllDistributionTargetsByTargetId(wb.getId());
workbasketAccessMapper.deleteAllForWorkbasketkey(wb.getKey());
workbasketAccessMapper.deleteAllForWorkbasketId(wb.getId());
workbasketMapper.delete(workbasketId);
} finally {
taskanaEngine.returnConnection();

29
lib/taskana-core/src/main/java/pro/taskana/mappings/WorkbasketAccessMapper.java
View File

@ -43,33 +43,6 @@ public interface WorkbasketAccessMapper {
@Result(property = "permCustom12", column = "PERM_CUSTOM_12")})
WorkbasketAccessItemImpl findById(@Param("id") String id);
// @Select("SELECT ID, WORKBASKET_ID, ACCESS_ID, PERM_READ, PERM_OPEN, PERM_APPEND, PERM_TRANSFER, PERM_DISTRIBUTE,
// PERM_CUSTOM_1, PERM_CUSTOM_2, PERM_CUSTOM_3, PERM_CUSTOM_4, PERM_CUSTOM_5, PERM_CUSTOM_6, PERM_CUSTOM_7,
// PERM_CUSTOM_8, PERM_CUSTOM_9, PERM_CUSTOM_10, PERM_CUSTOM_11, PERM_CUSTOM_12 "
// + "FROM WORKBASKET_ACCESS_LIST WHERE ACCESS_ID = #{accessId}")
// @Results(value = {
// @Result(property = "id", column = "ID"),
// @Result(property = "workbasketId", column = "WORKBASKET_ID"),
// @Result(property = "accessId", column = "ACCESS_ID"),
// @Result(property = "permRead", column = "PERM_READ"),
// @Result(property = "permOpen", column = "PERM_OPEN"),
// @Result(property = "permAppend", column = "PERM_APPEND"),
// @Result(property = "permTransfer", column = "PERM_TRANSFER"),
// @Result(property = "permDistribute", column = "PERM_DISTRIBUTE"),
// @Result(property = "permCustom1", column = "PERM_CUSTOM_1"),
// @Result(property = "permCustom2", column = "PERM_CUSTOM_2"),
// @Result(property = "permCustom3", column = "PERM_CUSTOM_3"),
// @Result(property = "permCustom4", column = "PERM_CUSTOM_4"),
// @Result(property = "permCustom5", column = "PERM_CUSTOM_5"),
// @Result(property = "permCustom6", column = "PERM_CUSTOM_6"),
// @Result(property = "permCustom7", column = "PERM_CUSTOM_7"),
// @Result(property = "permCustom8", column = "PERM_CUSTOM_8"),
// @Result(property = "permCustom9", column = "PERM_CUSTOM_9"),
// @Result(property = "permCustom10", column = "PERM_CUSTOM_10"),
// @Result(property = "permCustom11", column = "PERM_CUSTOM_11"),
// @Result(property = "permCustom12", column = "PERM_CUSTOM_12")})
// List<WorkbasketAccessItemImpl> findByAccessId(@Param("accessId") String accessId);
@Select("SELECT ID, WORKBASKET_ID, ACCESS_ID, PERM_READ, PERM_OPEN, PERM_APPEND, PERM_TRANSFER, PERM_DISTRIBUTE, PERM_CUSTOM_1, PERM_CUSTOM_2, PERM_CUSTOM_3, PERM_CUSTOM_4, PERM_CUSTOM_5, PERM_CUSTOM_6, PERM_CUSTOM_7, PERM_CUSTOM_8, PERM_CUSTOM_9, PERM_CUSTOM_10, PERM_CUSTOM_11, PERM_CUSTOM_12 "
+ "FROM WORKBASKET_ACCESS_LIST WHERE WORKBASKET_ID = #{id}")
@Results(value = {
@ -108,7 +81,7 @@ public interface WorkbasketAccessMapper {
void delete(@Param("id") String id);
@Delete("DELETE FROM WORKBASKET_ACCESS_LIST where WORKBASKET_ID = #{workbasketId}")
void deleteAllForWorkbasketkey(@Param("workbasketId") String workbasketId);
void deleteAllForWorkbasketId(@Param("workbasketId") String workbasketId);
@Select("<script>SELECT MAX(PERM_READ) AS P_READ, MAX(PERM_OPEN) AS P_OPEN, MAX(PERM_APPEND) AS P_APPEND, MAX(PERM_TRANSFER) AS P_TRANSFER, MAX(PERM_DISTRIBUTE) AS P_DISTRIBUTE, MAX(PERM_CUSTOM_1) AS P_CUSTOM_1, MAX(PERM_CUSTOM_2) AS P_CUSTOM_2, MAX(PERM_CUSTOM_3) AS P_CUSTOM_3, MAX(PERM_CUSTOM_4) AS P_CUSTOM_4, MAX(PERM_CUSTOM_5) AS P_CUSTOM_5, MAX(PERM_CUSTOM_6) AS P_CUSTOM_6, MAX(PERM_CUSTOM_7) AS P_CUSTOM_7, MAX(PERM_CUSTOM_8) AS P_CUSTOM_8, MAX(PERM_CUSTOM_9) AS P_CUSTOM_9, MAX(PERM_CUSTOM_10) AS P_CUSTOM_10, MAX(PERM_CUSTOM_11) AS P_CUSTOM_11, MAX(PERM_CUSTOM_12) AS P_CUSTOM_12 "
+ "FROM WORKBASKET_ACCESS_LIST "

2
lib/taskana-core/src/main/java/pro/taskana/mappings/WorkbasketMapper.java
View File

@ -123,7 +123,7 @@ public interface WorkbasketMapper {
@Select("<script>SELECT W.ID, W.KEY, W.NAME, W.DESCRIPTION, W.OWNER, W.DOMAIN, W.TYPE, W.ORG_LEVEL_1, W.ORG_LEVEL_2, W.ORG_LEVEL_3, W.ORG_LEVEL_4 FROM WORKBASKET AS W "
+ "INNER JOIN WORKBASKET_ACCESS_LIST AS ACL "
+ "ON (W.KEY = ACL.WORKBASKET_KEY AND ACL.ACCESS_ID = #{accessId}) "
+ "ON (W.ID = ACL.WORKBASKET_ID AND ACL.ACCESS_ID = #{accessId}) "
+ "WHERE <foreach collection='authorizations' item='authorization' separator=' AND '>"
+ "<if test=\"authorization.name() == 'OPEN'\">PERM_OPEN</if>"
+ "<if test=\"authorization.name() == 'READ'\">PERM_READ</if>"

2
lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketServiceImplTest.java
View File

@ -516,7 +516,7 @@ public class WorkbasketServiceImplTest {
verify(taskQueryMock, times(1)).list();
verify(distributionTargetMapperMock, times(1)).deleteAllDistributionTargetsBySourceId(wb.getId());
verify(distributionTargetMapperMock, times(1)).deleteAllDistributionTargetsByTargetId(wb.getId());
verify(workbasketAccessMapperMock, times(1)).deleteAllForWorkbasketkey(wb.getKey());
verify(workbasketAccessMapperMock, times(1)).deleteAllForWorkbasketId(wb.getId());
verify(workbasketMapperMock, times(1)).delete(wb.getId());
verify(taskanaEngineImplMock, times(1)).returnConnection();
verifyNoMoreInteractions(taskQueryMock, taskServiceMock, workbasketMapperMock, workbasketAccessMapperMock,

47
rest/src/main/java/pro/taskana/rest/WorkbasketController.java
View File

@ -124,36 +124,47 @@ public class WorkbasketController {
}
@RequestMapping(method = RequestMethod.POST)
public ResponseEntity<WorkbasketResource> createWorkbasket(@RequestBody Workbasket workbasket) {
Workbasket createdWorkbasket;
public ResponseEntity<WorkbasketResource> createWorkbasket(@RequestBody WorkbasketResource workbasketResource) {
try {
createdWorkbasket = workbasketService.createWorkbasket(workbasket);
return new ResponseEntity<>(workbasketMapper.toResource(createdWorkbasket), HttpStatus.CREATED);
Workbasket workbasket = workbasketMapper.toModel(workbasketResource);
workbasket = workbasketService.createWorkbasket(workbasket);
return new ResponseEntity<>(workbasketMapper.toResource(workbasket), HttpStatus.CREATED);
} catch (InvalidWorkbasketException e) {
return new ResponseEntity<>(HttpStatus.PRECONDITION_FAILED);
}
}
@RequestMapping(value = "/{workbasketKey}", method = RequestMethod.PUT)
@RequestMapping(value = "/{workbasketId}", method = RequestMethod.PUT)
public ResponseEntity<WorkbasketResource> updateWorkbasket(
@PathVariable(value = "workbasketKey") String workbasketKey,
@RequestBody Workbasket workbasket) {
@PathVariable(value = "workbasketId") String workbasketId,
@RequestBody WorkbasketResource workbasketResource) {
ResponseEntity<WorkbasketResource> result;
try {
Workbasket updatedWorkbasket = workbasketService.updateWorkbasket(workbasket);
return new ResponseEntity<>(workbasketMapper.toResource(updatedWorkbasket), HttpStatus.OK);
if (workbasketId.equals(workbasketResource.workbasketId)) {
Workbasket workbasket = workbasketMapper.toModel(workbasketResource);
workbasket = workbasketService.updateWorkbasket(workbasket);
result = ResponseEntity.ok(workbasketMapper.toResource(workbasket));
} else {
throw new InvalidWorkbasketException(
"Target-WB-ID('" + workbasketId
+ "') is not identical with the WB-ID of to object which should be updated. ID=('"
+ workbasketResource.getId() + "')");
}
} catch (InvalidWorkbasketException e) {
return new ResponseEntity<>(HttpStatus.PRECONDITION_FAILED);
result = new ResponseEntity<>(HttpStatus.PRECONDITION_FAILED);
} catch (WorkbasketNotFoundException e) {
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
result = new ResponseEntity<>(HttpStatus.NOT_FOUND);
} catch (NotAuthorizedException e) {
return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
result = new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
}
return result;
}
@RequestMapping(value = "/{workbasketKey}/authorizations", method = RequestMethod.GET)
@RequestMapping(value = "/{workbasketId}/authorizations", method = RequestMethod.GET)
public ResponseEntity<List<WorkbasketAccessItemResource>> getWorkbasketAuthorizations(
@PathVariable(value = "workbasketKey") String workbasketKey) {
List<WorkbasketAccessItem> wbAuthorizations = workbasketService.getWorkbasketAuthorizations(workbasketKey);
@PathVariable(value = "workbasketId") String workbasketId) {
List<WorkbasketAccessItem> wbAuthorizations = workbasketService.getWorkbasketAuthorizations(workbasketId);
return new ResponseEntity<>(wbAuthorizations.stream()
.map(accItem -> workbasketAccessItemMapper.toResource(accItem))
.collect(Collectors.toList()), HttpStatus.OK);
@ -161,7 +172,8 @@ public class WorkbasketController {
@RequestMapping(value = "/authorizations", method = RequestMethod.POST)
public ResponseEntity<WorkbasketAccessItemResource> createWorkbasketAuthorization(
@RequestBody WorkbasketAccessItem workbasketAccessItem) {
@RequestBody WorkbasketAccessItemResource workbasketAccessItemResource) {
WorkbasketAccessItem workbasketAccessItem = workbasketAccessItemMapper.toModel(workbasketAccessItemResource);
workbasketAccessItem = workbasketService.createWorkbasketAuthorization(workbasketAccessItem);
return new ResponseEntity<>(workbasketAccessItemMapper.toResource(workbasketAccessItem), HttpStatus.OK);
}
@ -169,7 +181,8 @@ public class WorkbasketController {
@RequestMapping(value = "/authorizations/{authId}", method = RequestMethod.PUT)
public ResponseEntity<WorkbasketAccessItemResource> updateWorkbasketAuthorization(
@PathVariable(value = "authId") String authId,
@RequestBody WorkbasketAccessItem workbasketAccessItem) throws InvalidArgumentException {
@RequestBody WorkbasketAccessItemResource workbasketAccessItemResource) throws InvalidArgumentException {
WorkbasketAccessItem workbasketAccessItem = workbasketAccessItemMapper.toModel(workbasketAccessItemResource);
workbasketAccessItem = workbasketService.updateWorkbasketAuthorization(workbasketAccessItem);
return new ResponseEntity<>(workbasketAccessItemMapper.toResource(workbasketAccessItem), HttpStatus.OK);
}

3
rest/src/main/java/pro/taskana/rest/resource/WorkbasketResource.java
View File

@ -37,7 +37,8 @@ public class WorkbasketResource extends ResourceSupport {
public String orgLevel3;
public String orgLevel4;
public WorkbasketResource(String workbasketId, String key, String name, String domain, WorkbasketType type, Instant created,
public WorkbasketResource(String workbasketId, String key, String name, String domain, WorkbasketType type,
Instant created,
Instant modified, String description, String owner, String custom1, String custom2, String custom3,
String custom4, String orgLevel1, String orgLevel2, String orgLevel3, String orgLevel4) {
super();

31
rest/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketAccessItemMapper.java
View File

@ -3,12 +3,19 @@ package pro.taskana.rest.resource.mapper;
import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn;
import org.springframework.beans.factory.annotation.Autowired;
import pro.taskana.WorkbasketAccessItem;
import pro.taskana.WorkbasketService;
import pro.taskana.impl.WorkbasketAccessItemImpl;
import pro.taskana.rest.WorkbasketController;
import pro.taskana.rest.resource.WorkbasketAccessItemResource;
public class WorkbasketAccessItemMapper {
@Autowired
private WorkbasketService workbasketService;
public WorkbasketAccessItemResource toResource(WorkbasketAccessItem wbAccItem) {
WorkbasketAccessItemResource resource = new WorkbasketAccessItemResource(wbAccItem.getId(),
wbAccItem.getWorkbasketId(),
@ -26,4 +33,28 @@ public class WorkbasketAccessItemMapper {
.withSelfRel());
return resource;
}
public WorkbasketAccessItem toModel(WorkbasketAccessItemResource wbAccItemRecource) {
WorkbasketAccessItemImpl wbAccItemModel = (WorkbasketAccessItemImpl) workbasketService
.newWorkbasketAccessItem(wbAccItemRecource.workbasketId, wbAccItemRecource.accessId);
wbAccItemModel.setId(wbAccItemRecource.accessItemId);
wbAccItemModel.setPermRead(wbAccItemRecource.permRead);
wbAccItemModel.setPermOpen(wbAccItemRecource.permOpen);
wbAccItemModel.setPermAppend(wbAccItemRecource.permAppend);
wbAccItemModel.setPermTransfer(wbAccItemRecource.permTransfer);
wbAccItemModel.setPermDistribute(wbAccItemRecource.permDistribute);
wbAccItemModel.setPermCustom1(wbAccItemRecource.permCustom1);
wbAccItemModel.setPermCustom2(wbAccItemRecource.permCustom2);
wbAccItemModel.setPermCustom3(wbAccItemRecource.permCustom3);
wbAccItemModel.setPermCustom4(wbAccItemRecource.permCustom4);
wbAccItemModel.setPermCustom5(wbAccItemRecource.permCustom5);
wbAccItemModel.setPermCustom6(wbAccItemRecource.permCustom6);
wbAccItemModel.setPermCustom7(wbAccItemRecource.permCustom7);
wbAccItemModel.setPermCustom8(wbAccItemRecource.permCustom8);
wbAccItemModel.setPermCustom9(wbAccItemRecource.permCustom9);
wbAccItemModel.setPermCustom10(wbAccItemRecource.permCustom10);
wbAccItemModel.setPermCustom11(wbAccItemRecource.permCustom11);
wbAccItemModel.setPermCustom12(wbAccItemRecource.permCustom12);
return wbAccItemModel;
}
}

27
rest/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketMapper.java
View File

@ -3,12 +3,19 @@ package pro.taskana.rest.resource.mapper;
import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn;
import org.springframework.beans.factory.annotation.Autowired;
import pro.taskana.Workbasket;
import pro.taskana.WorkbasketService;
import pro.taskana.impl.WorkbasketImpl;
import pro.taskana.rest.WorkbasketController;
import pro.taskana.rest.resource.WorkbasketResource;
public class WorkbasketMapper {
@Autowired
private WorkbasketService workbasketService;
public WorkbasketResource toResource(Workbasket wb) {
WorkbasketResource resource = new WorkbasketResource(wb.getId(), wb.getKey(), wb.getName(), wb.getDomain(),
wb.getType(), wb.getCreated(),
@ -20,4 +27,24 @@ public class WorkbasketMapper {
resource.add(linkTo(methodOn(WorkbasketController.class).getWorkbasket(wb.getId())).withSelfRel());
return resource;
}
public Workbasket toModel(WorkbasketResource wbResource) {
WorkbasketImpl wbModel = (WorkbasketImpl) workbasketService.newWorkbasket(wbResource.key, wbResource.domain);
wbModel.setId(wbResource.workbasketId);
wbModel.setName(wbResource.name);
wbModel.setType(wbResource.type);
wbModel.setCreated(wbResource.created);
wbModel.setModified(wbResource.modified);
wbModel.setDescription(wbResource.description);
wbModel.setOwner(wbResource.owner);
wbModel.setCustom1(wbResource.custom1);
wbModel.setCustom2(wbResource.custom2);
wbModel.setCustom3(wbResource.custom3);
wbModel.setCustom4(wbResource.custom4);
wbModel.setOrgLevel1(wbResource.orgLevel1);
wbModel.setOrgLevel2(wbResource.orgLevel2);
wbModel.setOrgLevel3(wbResource.orgLevel3);
wbModel.setOrgLevel4(wbResource.orgLevel4);
return wbModel;
}
}