From 5b6fb0a9b6ae94f8111c08cf38ed97707ce7fbda Mon Sep 17 00:00:00 2001 From: Elena Mokeeva Date: Tue, 13 Jun 2023 15:44:30 +0200 Subject: [PATCH] Closes #2286 - adjust REST with READTASKS and EDITTASKS --- ...ccessItemRepresentationModelAssembler.java | 4 ++++ ...rkbasketAccessItemRepresentationModel.java | 20 +++++++++++++++++++ ...sItemRepresentationModelAssemblerTest.java | 10 ++++++++++ 3 files changed, 34 insertions(+) diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/workbasket/rest/assembler/WorkbasketAccessItemRepresentationModelAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/workbasket/rest/assembler/WorkbasketAccessItemRepresentationModelAssembler.java index b2e6206fe..1283b0e37 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/workbasket/rest/assembler/WorkbasketAccessItemRepresentationModelAssembler.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/workbasket/rest/assembler/WorkbasketAccessItemRepresentationModelAssembler.java @@ -55,8 +55,10 @@ public class WorkbasketAccessItemRepresentationModelAssembler repModel.setAccessItemId(wbAccItem.getId()); repModel.setAccessName(wbAccItem.getAccessName()); repModel.setPermRead(wbAccItem.getPermission(WorkbasketPermission.READ)); + repModel.setPermReadTasks(wbAccItem.getPermission(WorkbasketPermission.READTASKS)); repModel.setPermOpen(wbAccItem.getPermission(WorkbasketPermission.OPEN)); repModel.setPermAppend(wbAccItem.getPermission(WorkbasketPermission.APPEND)); + repModel.setPermEditTasks(wbAccItem.getPermission(WorkbasketPermission.EDITTASKS)); repModel.setPermTransfer(wbAccItem.getPermission(WorkbasketPermission.TRANSFER)); repModel.setPermDistribute(wbAccItem.getPermission(WorkbasketPermission.DISTRIBUTE)); repModel.setPermCustom1(wbAccItem.getPermission(WorkbasketPermission.CUSTOM_1)); @@ -82,8 +84,10 @@ public class WorkbasketAccessItemRepresentationModelAssembler wbAccItemModel.setWorkbasketKey(repModel.getWorkbasketKey()); wbAccItemModel.setAccessName(repModel.getAccessName()); wbAccItemModel.setPermission(WorkbasketPermission.READ, repModel.isPermRead()); + wbAccItemModel.setPermission(WorkbasketPermission.READTASKS, repModel.isPermReadTasks()); wbAccItemModel.setPermission(WorkbasketPermission.OPEN, repModel.isPermOpen()); wbAccItemModel.setPermission(WorkbasketPermission.APPEND, repModel.isPermAppend()); + wbAccItemModel.setPermission(WorkbasketPermission.EDITTASKS, repModel.isPermEditTasks()); wbAccItemModel.setPermission(WorkbasketPermission.TRANSFER, repModel.isPermTransfer()); wbAccItemModel.setPermission(WorkbasketPermission.DISTRIBUTE, repModel.isPermDistribute()); wbAccItemModel.setPermission(WorkbasketPermission.CUSTOM_1, repModel.isPermCustom1()); diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/workbasket/rest/models/WorkbasketAccessItemRepresentationModel.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/workbasket/rest/models/WorkbasketAccessItemRepresentationModel.java index 8bff0061f..97e75cd2b 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/workbasket/rest/models/WorkbasketAccessItemRepresentationModel.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/workbasket/rest/models/WorkbasketAccessItemRepresentationModel.java @@ -19,12 +19,16 @@ public class WorkbasketAccessItemRepresentationModel private String accessName; /** The permission to read the information about the workbasket. */ 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. */ private boolean permOpen; /** * The permission to add tasks to the workbasket. Required for creation and transferring of tasks. */ 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). */ private boolean permTransfer; /** The permission to distribute tasks from the workbasket. */ @@ -102,6 +106,14 @@ public class WorkbasketAccessItemRepresentationModel this.permRead = permRead; } + public boolean isPermReadTasks() { + return permReadTasks; + } + + public void setPermReadTasks(boolean permReadTasks) { + this.permReadTasks = permReadTasks; + } + public boolean isPermOpen() { return permOpen; } @@ -118,6 +130,14 @@ public class WorkbasketAccessItemRepresentationModel this.permAppend = permAppend; } + public boolean isPermEditTasks() { + return permEditTasks; + } + + public void setPermEditTasks(boolean permEditTasks) { + this.permEditTasks = permEditTasks; + } + public boolean isPermTransfer() { return permTransfer; } diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketAccessItemRepresentationModelAssemblerTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketAccessItemRepresentationModelAssemblerTest.java index e1b37803d..fb8a77222 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketAccessItemRepresentationModelAssemblerTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketAccessItemRepresentationModelAssemblerTest.java @@ -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_9; 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.READ; +import static pro.taskana.workbasket.api.WorkbasketPermission.READTASKS; import static pro.taskana.workbasket.api.WorkbasketPermission.TRANSFER; import org.junit.jupiter.api.Test; @@ -51,8 +53,10 @@ class WorkbasketAccessItemRepresentationModelAssemblerTest { accessItem.setAccessName("accessName"); accessItem.setWorkbasketKey("workbasketKey"); accessItem.setPermission(READ, false); + accessItem.setPermission(READTASKS, false); accessItem.setPermission(OPEN, true); accessItem.setPermission(APPEND, false); + accessItem.setPermission(EDITTASKS, false); accessItem.setPermission(DISTRIBUTE, false); accessItem.setPermission(TRANSFER, true); accessItem.setPermission(CUSTOM_1, false); @@ -84,7 +88,9 @@ class WorkbasketAccessItemRepresentationModelAssemblerTest { accessItem.setAccessName("accessName"); accessItem.setPermission(OPEN, true); accessItem.setPermission(READ, false); + accessItem.setPermission(READTASKS, false); accessItem.setPermission(APPEND, false); + accessItem.setPermission(EDITTASKS, false); accessItem.setPermission(TRANSFER, true); accessItem.setPermission(DISTRIBUTE, false); accessItem.setPermission(CUSTOM_1, false); @@ -120,7 +126,9 @@ class WorkbasketAccessItemRepresentationModelAssemblerTest { repModel.setWorkbasketId("1"); repModel.setAccessName("accessName"); repModel.setPermRead(true); + repModel.setPermReadTasks(true); repModel.setPermAppend(false); + repModel.setPermEditTasks(true); repModel.setPermDistribute(false); repModel.setPermOpen(false); repModel.setPermTransfer(true); @@ -152,8 +160,10 @@ class WorkbasketAccessItemRepresentationModelAssemblerTest { assertThat(repModel.getAccessId()).isEqualTo(accessItem.getAccessId()); assertThat(repModel.getAccessName()).isEqualTo(accessItem.getAccessName()); assertThat(repModel.isPermRead()).isEqualTo(accessItem.getPermission(READ)); + assertThat(repModel.isPermReadTasks()).isEqualTo(accessItem.getPermission(READTASKS)); assertThat(repModel.isPermOpen()).isEqualTo(accessItem.getPermission(OPEN)); assertThat(repModel.isPermAppend()).isEqualTo(accessItem.getPermission(APPEND)); + assertThat(repModel.isPermEditTasks()).isEqualTo(accessItem.getPermission(EDITTASKS)); assertThat(repModel.isPermTransfer()).isEqualTo(accessItem.getPermission(TRANSFER)); assertThat(repModel.isPermDistribute()).isEqualTo(accessItem.getPermission(DISTRIBUTE)); assertThat(repModel.isPermCustom1()).isEqualTo(accessItem.getPermission(CUSTOM_1));