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

Closes #2286 - adjust REST with READTASKS and EDITTASKS

This commit is contained in:
Elena Mokeeva 2023-06-13 15:44:30 +02:00 committed by holgerhagen
parent e905dfffbc
commit 5b6fb0a9b6
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rest/taskana-rest-spring/src/main/java/pro/taskana/workbasket/rest/assembler/WorkbasketAccessItemRepresentationModelAssembler.java
View File

@ -55,8 +55,10 @@ public class WorkbasketAccessItemRepresentationModelAssembler
repModel.setAccessItemId(wbAccItem.getId()); repModel.setAccessItemId(wbAccItem.getId());
repModel.setAccessName(wbAccItem.getAccessName()); repModel.setAccessName(wbAccItem.getAccessName());
repModel.setPermRead(wbAccItem.getPermission(WorkbasketPermission.READ)); repModel.setPermRead(wbAccItem.getPermission(WorkbasketPermission.READ));
repModel.setPermReadTasks(wbAccItem.getPermission(WorkbasketPermission.READTASKS));
repModel.setPermOpen(wbAccItem.getPermission(WorkbasketPermission.OPEN)); repModel.setPermOpen(wbAccItem.getPermission(WorkbasketPermission.OPEN));
repModel.setPermAppend(wbAccItem.getPermission(WorkbasketPermission.APPEND)); repModel.setPermAppend(wbAccItem.getPermission(WorkbasketPermission.APPEND));
repModel.setPermEditTasks(wbAccItem.getPermission(WorkbasketPermission.EDITTASKS));
repModel.setPermTransfer(wbAccItem.getPermission(WorkbasketPermission.TRANSFER)); repModel.setPermTransfer(wbAccItem.getPermission(WorkbasketPermission.TRANSFER));
repModel.setPermDistribute(wbAccItem.getPermission(WorkbasketPermission.DISTRIBUTE)); repModel.setPermDistribute(wbAccItem.getPermission(WorkbasketPermission.DISTRIBUTE));
repModel.setPermCustom1(wbAccItem.getPermission(WorkbasketPermission.CUSTOM_1)); repModel.setPermCustom1(wbAccItem.getPermission(WorkbasketPermission.CUSTOM_1));
@ -82,8 +84,10 @@ public class WorkbasketAccessItemRepresentationModelAssembler
wbAccItemModel.setWorkbasketKey(repModel.getWorkbasketKey()); wbAccItemModel.setWorkbasketKey(repModel.getWorkbasketKey());
wbAccItemModel.setAccessName(repModel.getAccessName()); wbAccItemModel.setAccessName(repModel.getAccessName());
wbAccItemModel.setPermission(WorkbasketPermission.READ, repModel.isPermRead()); wbAccItemModel.setPermission(WorkbasketPermission.READ, repModel.isPermRead());
wbAccItemModel.setPermission(WorkbasketPermission.READTASKS, repModel.isPermReadTasks());
wbAccItemModel.setPermission(WorkbasketPermission.OPEN, repModel.isPermOpen()); wbAccItemModel.setPermission(WorkbasketPermission.OPEN, repModel.isPermOpen());
wbAccItemModel.setPermission(WorkbasketPermission.APPEND, repModel.isPermAppend()); wbAccItemModel.setPermission(WorkbasketPermission.APPEND, repModel.isPermAppend());
wbAccItemModel.setPermission(WorkbasketPermission.EDITTASKS, repModel.isPermEditTasks());
wbAccItemModel.setPermission(WorkbasketPermission.TRANSFER, repModel.isPermTransfer()); wbAccItemModel.setPermission(WorkbasketPermission.TRANSFER, repModel.isPermTransfer());
wbAccItemModel.setPermission(WorkbasketPermission.DISTRIBUTE, repModel.isPermDistribute()); wbAccItemModel.setPermission(WorkbasketPermission.DISTRIBUTE, repModel.isPermDistribute());
wbAccItemModel.setPermission(WorkbasketPermission.CUSTOM_1, repModel.isPermCustom1()); wbAccItemModel.setPermission(WorkbasketPermission.CUSTOM_1, repModel.isPermCustom1());

20
rest/taskana-rest-spring/src/main/java/pro/taskana/workbasket/rest/models/WorkbasketAccessItemRepresentationModel.java
View File

@ -19,12 +19,16 @@ public class WorkbasketAccessItemRepresentationModel
private String accessName; private String accessName;
/** The permission to read the information about the workbasket. */ /** The permission to read the information about the workbasket. */
private boolean permRead; private boolean permRead;
/** The permission to access a task from the workbasket. */
private boolean permReadTasks;
/** The permission to view the content (the tasks) of a workbasket. */ /** The permission to view the content (the tasks) of a workbasket. */
private boolean permOpen; private boolean permOpen;
/** /**
* The permission to add tasks to the workbasket. Required for creation and transferring of tasks. * The permission to add tasks to the workbasket. Required for creation and transferring of tasks.
*/ */
private boolean permAppend; private boolean permAppend;
/** The permission to edit a task from the workbasket. */
private boolean permEditTasks;
/** The permission to transfer tasks (out of the current workbasket). */ /** The permission to transfer tasks (out of the current workbasket). */
private boolean permTransfer; private boolean permTransfer;
/** The permission to distribute tasks from the workbasket. */ /** The permission to distribute tasks from the workbasket. */
@ -102,6 +106,14 @@ public class WorkbasketAccessItemRepresentationModel
this.permRead = permRead; this.permRead = permRead;
} }
public boolean isPermReadTasks() {
return permReadTasks;
}
public void setPermReadTasks(boolean permReadTasks) {
this.permReadTasks = permReadTasks;
}
public boolean isPermOpen() { public boolean isPermOpen() {
return permOpen; return permOpen;
} }
@ -118,6 +130,14 @@ public class WorkbasketAccessItemRepresentationModel
this.permAppend = permAppend; this.permAppend = permAppend;
} }
public boolean isPermEditTasks() {
return permEditTasks;
}
public void setPermEditTasks(boolean permEditTasks) {
this.permEditTasks = permEditTasks;
}
public boolean isPermTransfer() { public boolean isPermTransfer() {
return permTransfer; return permTransfer;
} }

10
rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketAccessItemRepresentationModelAssemblerTest.java
View File

@ -15,8 +15,10 @@ import static pro.taskana.workbasket.api.WorkbasketPermission.CUSTOM_7;
import static pro.taskana.workbasket.api.WorkbasketPermission.CUSTOM_8; import static pro.taskana.workbasket.api.WorkbasketPermission.CUSTOM_8;
import static pro.taskana.workbasket.api.WorkbasketPermission.CUSTOM_9; import static pro.taskana.workbasket.api.WorkbasketPermission.CUSTOM_9;
import static pro.taskana.workbasket.api.WorkbasketPermission.DISTRIBUTE; import static pro.taskana.workbasket.api.WorkbasketPermission.DISTRIBUTE;
import static pro.taskana.workbasket.api.WorkbasketPermission.EDITTASKS;
import static pro.taskana.workbasket.api.WorkbasketPermission.OPEN; import static pro.taskana.workbasket.api.WorkbasketPermission.OPEN;
import static pro.taskana.workbasket.api.WorkbasketPermission.READ; import static pro.taskana.workbasket.api.WorkbasketPermission.READ;
import static pro.taskana.workbasket.api.WorkbasketPermission.READTASKS;
import static pro.taskana.workbasket.api.WorkbasketPermission.TRANSFER; import static pro.taskana.workbasket.api.WorkbasketPermission.TRANSFER;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -51,8 +53,10 @@ class WorkbasketAccessItemRepresentationModelAssemblerTest {
accessItem.setAccessName("accessName"); accessItem.setAccessName("accessName");
accessItem.setWorkbasketKey("workbasketKey"); accessItem.setWorkbasketKey("workbasketKey");
accessItem.setPermission(READ, false); accessItem.setPermission(READ, false);
accessItem.setPermission(READTASKS, false);
accessItem.setPermission(OPEN, true); accessItem.setPermission(OPEN, true);
accessItem.setPermission(APPEND, false); accessItem.setPermission(APPEND, false);
accessItem.setPermission(EDITTASKS, false);
accessItem.setPermission(DISTRIBUTE, false); accessItem.setPermission(DISTRIBUTE, false);
accessItem.setPermission(TRANSFER, true); accessItem.setPermission(TRANSFER, true);
accessItem.setPermission(CUSTOM_1, false); accessItem.setPermission(CUSTOM_1, false);
@ -84,7 +88,9 @@ class WorkbasketAccessItemRepresentationModelAssemblerTest {
accessItem.setAccessName("accessName"); accessItem.setAccessName("accessName");
accessItem.setPermission(OPEN, true); accessItem.setPermission(OPEN, true);
accessItem.setPermission(READ, false); accessItem.setPermission(READ, false);
accessItem.setPermission(READTASKS, false);
accessItem.setPermission(APPEND, false); accessItem.setPermission(APPEND, false);
accessItem.setPermission(EDITTASKS, false);
accessItem.setPermission(TRANSFER, true); accessItem.setPermission(TRANSFER, true);
accessItem.setPermission(DISTRIBUTE, false); accessItem.setPermission(DISTRIBUTE, false);
accessItem.setPermission(CUSTOM_1, false); accessItem.setPermission(CUSTOM_1, false);
@ -120,7 +126,9 @@ class WorkbasketAccessItemRepresentationModelAssemblerTest {
repModel.setWorkbasketId("1"); repModel.setWorkbasketId("1");
repModel.setAccessName("accessName"); repModel.setAccessName("accessName");
repModel.setPermRead(true); repModel.setPermRead(true);
repModel.setPermReadTasks(true);
repModel.setPermAppend(false); repModel.setPermAppend(false);
repModel.setPermEditTasks(true);
repModel.setPermDistribute(false); repModel.setPermDistribute(false);
repModel.setPermOpen(false); repModel.setPermOpen(false);
repModel.setPermTransfer(true); repModel.setPermTransfer(true);
@ -152,8 +160,10 @@ class WorkbasketAccessItemRepresentationModelAssemblerTest {
assertThat(repModel.getAccessId()).isEqualTo(accessItem.getAccessId()); assertThat(repModel.getAccessId()).isEqualTo(accessItem.getAccessId());
assertThat(repModel.getAccessName()).isEqualTo(accessItem.getAccessName()); assertThat(repModel.getAccessName()).isEqualTo(accessItem.getAccessName());
assertThat(repModel.isPermRead()).isEqualTo(accessItem.getPermission(READ)); assertThat(repModel.isPermRead()).isEqualTo(accessItem.getPermission(READ));
assertThat(repModel.isPermReadTasks()).isEqualTo(accessItem.getPermission(READTASKS));
assertThat(repModel.isPermOpen()).isEqualTo(accessItem.getPermission(OPEN)); assertThat(repModel.isPermOpen()).isEqualTo(accessItem.getPermission(OPEN));
assertThat(repModel.isPermAppend()).isEqualTo(accessItem.getPermission(APPEND)); assertThat(repModel.isPermAppend()).isEqualTo(accessItem.getPermission(APPEND));
assertThat(repModel.isPermEditTasks()).isEqualTo(accessItem.getPermission(EDITTASKS));
assertThat(repModel.isPermTransfer()).isEqualTo(accessItem.getPermission(TRANSFER)); assertThat(repModel.isPermTransfer()).isEqualTo(accessItem.getPermission(TRANSFER));
assertThat(repModel.isPermDistribute()).isEqualTo(accessItem.getPermission(DISTRIBUTE)); assertThat(repModel.isPermDistribute()).isEqualTo(accessItem.getPermission(DISTRIBUTE));
assertThat(repModel.isPermCustom1()).isEqualTo(accessItem.getPermission(CUSTOM_1)); assertThat(repModel.isPermCustom1()).isEqualTo(accessItem.getPermission(CUSTOM_1));