diff --git a/lib/taskana-core/src/main/java/pro/taskana/WorkbasketAccessItem.java b/lib/taskana-core/src/main/java/pro/taskana/WorkbasketAccessItem.java index 7812dc516..91e68be6e 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/WorkbasketAccessItem.java +++ b/lib/taskana-core/src/main/java/pro/taskana/WorkbasketAccessItem.java @@ -28,6 +28,21 @@ public interface WorkbasketAccessItem { */ String getAccessId(); + /** + * Returns the name of the group or user for which this WorkbasketAccessItem controls access permissions. + * + * @return access name, this is the name of the group or user + */ + String getAccessName(); + + /** + * Set the name of the group or user for which this WorkbasketAccessItem controls access permissions. + * + * @param name + * the name of the group or user for which this WorkbasketAccessItem controls access permissions. + */ + void setAccessName(String name); + /** * Returns whether read of the referenced workbasket is permitted. * diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemImpl.java index 752083c1e..0887ec1cf 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemImpl.java @@ -11,6 +11,7 @@ public class WorkbasketAccessItemImpl implements WorkbasketAccessItem { private String id; private String workbasketId; private String accessId; + private String accessName; private boolean permRead; private boolean permOpen; private boolean permAppend; @@ -76,6 +77,24 @@ public class WorkbasketAccessItemImpl implements WorkbasketAccessItem { } } + /* + * (non-Javadoc) + * @see pro.taskana.impl.WorkbasketAccessItem#getAccessId() + */ + @Override + public String getAccessName() { + return accessName; + } + + /* + * (non-Javadoc) + * @see pro.taskana.impl.WorkbasketAccessItem#getAccessId() + */ + @Override + public void setAccessName(String accessName) { + this.accessName = accessName; + } + /* * (non-Javadoc) * @see pro.taskana.impl.WorkbasketAccessItem#isPermRead() diff --git a/lib/taskana-core/src/main/java/pro/taskana/mappings/QueryMapper.java b/lib/taskana-core/src/main/java/pro/taskana/mappings/QueryMapper.java index 1e27d52ed..26203d28c 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/mappings/QueryMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/mappings/QueryMapper.java @@ -319,7 +319,7 @@ public interface QueryMapper { @Select("") @@ -26,6 +26,7 @@ public interface WorkbasketAccessMapper { @Result(property = "id", column = "ID"), @Result(property = "workbasketId", column = "WORKBASKET_ID"), @Result(property = "accessId", column = "ACCESS_ID"), + @Result(property = "accessName", column = "ACCESS_NAME"), @Result(property = "permRead", column = "PERM_READ"), @Result(property = "permOpen", column = "PERM_OPEN"), @Result(property = "permAppend", column = "PERM_APPEND"), @@ -45,7 +46,7 @@ public interface WorkbasketAccessMapper { @Result(property = "permCustom12", column = "PERM_CUSTOM_12")}) WorkbasketAccessItemImpl findById(@Param("id") String id); - @Select("") @@ -53,6 +54,7 @@ public interface WorkbasketAccessMapper { @Result(property = "id", column = "ID"), @Result(property = "workbasketId", column = "WORKBASKET_ID"), @Result(property = "accessId", column = "ACCESS_ID"), + @Result(property = "accessName", column = "ACCESS_NAME"), @Result(property = "permRead", column = "PERM_READ"), @Result(property = "permOpen", column = "PERM_OPEN"), @Result(property = "permAppend", column = "PERM_APPEND"), @@ -72,12 +74,12 @@ public interface WorkbasketAccessMapper { @Result(property = "permCustom12", column = "PERM_CUSTOM_12")}) List findByWorkbasketId(@Param("id") String id); - @Insert("INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST (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) " - + "VALUES (#{workbasketAccessItem.id}, #{workbasketAccessItem.workbasketId}, #{workbasketAccessItem.accessId}, #{workbasketAccessItem.permRead}, #{workbasketAccessItem.permOpen}, #{workbasketAccessItem.permAppend}, #{workbasketAccessItem.permTransfer}, #{workbasketAccessItem.permDistribute}, #{workbasketAccessItem.permCustom1}, #{workbasketAccessItem.permCustom2}, #{workbasketAccessItem.permCustom3}, #{workbasketAccessItem.permCustom4}, #{workbasketAccessItem.permCustom5}, #{workbasketAccessItem.permCustom6}, #{workbasketAccessItem.permCustom7}, #{workbasketAccessItem.permCustom8}, #{workbasketAccessItem.permCustom9}, #{workbasketAccessItem.permCustom10}, #{workbasketAccessItem.permCustom11}, #{workbasketAccessItem.permCustom12})") + @Insert("INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST (ID, WORKBASKET_ID, ACCESS_ID, ACCESS_NAME, 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) " + + "VALUES (#{workbasketAccessItem.id}, #{workbasketAccessItem.workbasketId}, #{workbasketAccessItem.accessId}, #{workbasketAccessItem.accessName}, #{workbasketAccessItem.permRead}, #{workbasketAccessItem.permOpen}, #{workbasketAccessItem.permAppend}, #{workbasketAccessItem.permTransfer}, #{workbasketAccessItem.permDistribute}, #{workbasketAccessItem.permCustom1}, #{workbasketAccessItem.permCustom2}, #{workbasketAccessItem.permCustom3}, #{workbasketAccessItem.permCustom4}, #{workbasketAccessItem.permCustom5}, #{workbasketAccessItem.permCustom6}, #{workbasketAccessItem.permCustom7}, #{workbasketAccessItem.permCustom8}, #{workbasketAccessItem.permCustom9}, #{workbasketAccessItem.permCustom10}, #{workbasketAccessItem.permCustom11}, #{workbasketAccessItem.permCustom12})") @Options(keyProperty = "id", keyColumn = "ID") void insert(@Param("workbasketAccessItem") WorkbasketAccessItemImpl workbasketAccessItem); - @Update("UPDATE TASKANA.WORKBASKET_ACCESS_LIST SET WORKBASKET_ID = #{workbasketAccessItem.workbasketId}, ACCESS_ID = #{workbasketAccessItem.accessId}, PERM_READ = #{workbasketAccessItem.permRead}, PERM_OPEN = #{workbasketAccessItem.permOpen}, PERM_APPEND = #{workbasketAccessItem.permAppend}, PERM_TRANSFER = #{workbasketAccessItem.permTransfer}, PERM_DISTRIBUTE = #{workbasketAccessItem.permDistribute}, PERM_CUSTOM_1 = #{workbasketAccessItem.permCustom1}, PERM_CUSTOM_2 = #{workbasketAccessItem.permCustom2}, PERM_CUSTOM_3 = #{workbasketAccessItem.permCustom3}, PERM_CUSTOM_4 = #{workbasketAccessItem.permCustom4}, PERM_CUSTOM_5 = #{workbasketAccessItem.permCustom5}, PERM_CUSTOM_6 = #{workbasketAccessItem.permCustom6}, PERM_CUSTOM_7 = #{workbasketAccessItem.permCustom7}, PERM_CUSTOM_8 = #{workbasketAccessItem.permCustom8}, PERM_CUSTOM_9 = #{workbasketAccessItem.permCustom9}, PERM_CUSTOM_10 = #{workbasketAccessItem.permCustom10}, PERM_CUSTOM_11 = #{workbasketAccessItem.permCustom11}, PERM_CUSTOM_12 = #{workbasketAccessItem.permCustom12} " + @Update("UPDATE TASKANA.WORKBASKET_ACCESS_LIST SET WORKBASKET_ID = #{workbasketAccessItem.workbasketId}, ACCESS_ID = #{workbasketAccessItem.accessId}, ACCESS_NAME = #{workbasketAccessItem.accessName}, PERM_READ = #{workbasketAccessItem.permRead}, PERM_OPEN = #{workbasketAccessItem.permOpen}, PERM_APPEND = #{workbasketAccessItem.permAppend}, PERM_TRANSFER = #{workbasketAccessItem.permTransfer}, PERM_DISTRIBUTE = #{workbasketAccessItem.permDistribute}, PERM_CUSTOM_1 = #{workbasketAccessItem.permCustom1}, PERM_CUSTOM_2 = #{workbasketAccessItem.permCustom2}, PERM_CUSTOM_3 = #{workbasketAccessItem.permCustom3}, PERM_CUSTOM_4 = #{workbasketAccessItem.permCustom4}, PERM_CUSTOM_5 = #{workbasketAccessItem.permCustom5}, PERM_CUSTOM_6 = #{workbasketAccessItem.permCustom6}, PERM_CUSTOM_7 = #{workbasketAccessItem.permCustom7}, PERM_CUSTOM_8 = #{workbasketAccessItem.permCustom8}, PERM_CUSTOM_9 = #{workbasketAccessItem.permCustom9}, PERM_CUSTOM_10 = #{workbasketAccessItem.permCustom10}, PERM_CUSTOM_11 = #{workbasketAccessItem.permCustom11}, PERM_CUSTOM_12 = #{workbasketAccessItem.permCustom12} " + "WHERE id = #{workbasketAccessItem.id}") void update(@Param("workbasketAccessItem") WorkbasketAccessItemImpl workbasketAccessItem); @@ -101,6 +103,7 @@ public interface WorkbasketAccessMapper { @Result(property = "id", column = "ID"), @Result(property = "workbasketId", column = "WORKBASKET_ID"), @Result(property = "accessId", column = "ACCESS_ID"), + @Result(property = "accessName", column = "ACCESS_NAME"), @Result(property = "permRead", column = "P_READ"), @Result(property = "permOpen", column = "P_OPEN"), @Result(property = "permAppend", column = "P_APPEND"), @@ -131,6 +134,7 @@ public interface WorkbasketAccessMapper { @Results(value = { @Result(property = "workbasketId", column = "WORKBASKET_ID"), @Result(property = "accessId", column = "ACCESS_ID"), + @Result(property = "accessName", column = "ACCESS_NAME"), @Result(property = "permRead", column = "P_READ"), @Result(property = "permOpen", column = "P_OPEN"), @Result(property = "permAppend", column = "P_APPEND"), diff --git a/lib/taskana-core/src/main/resources/sql/taskana-schema-postgres.sql b/lib/taskana-core/src/main/resources/sql/taskana-schema-postgres.sql index 675dce7fc..6bb91b096 100644 --- a/lib/taskana-core/src/main/resources/sql/taskana-schema-postgres.sql +++ b/lib/taskana-core/src/main/resources/sql/taskana-schema-postgres.sql @@ -119,6 +119,7 @@ CREATE TABLE TASKANA.WORKBASKET_ACCESS_LIST( ID CHAR(40) NOT NULL, WORKBASKET_ID CHAR(40) NOT NULL, ACCESS_ID VARCHAR(255) NOT NULL, + ACCESS_NAME VARCHAR(255) NULL, PERM_READ BOOLEAN NOT NULL, PERM_OPEN BOOLEAN NOT NULL, PERM_APPEND BOOLEAN NOT NULL, diff --git a/lib/taskana-core/src/main/resources/sql/taskana-schema.sql b/lib/taskana-core/src/main/resources/sql/taskana-schema.sql index 6e30ffd68..f162ba3ca 100644 --- a/lib/taskana-core/src/main/resources/sql/taskana-schema.sql +++ b/lib/taskana-core/src/main/resources/sql/taskana-schema.sql @@ -117,6 +117,7 @@ CREATE TABLE TASKANA.WORKBASKET_ACCESS_LIST( ID CHAR(40) NOT NULL, WORKBASKET_ID CHAR(40) NOT NULL, ACCESS_ID VARCHAR(255) NOT NULL, + ACCESS_NAME VARCHAR(255) NULL, PERM_READ SMALLINT NOT NULL, PERM_OPEN SMALLINT NOT NULL, PERM_APPEND SMALLINT NOT NULL, diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java index 733469119..3f9816d65 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java @@ -5,6 +5,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; import java.sql.SQLException; +import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; @@ -144,4 +145,36 @@ public class CreateWorkbasketAccTest extends AbstractAccTest { } catch (InvalidWorkbasketException e) { } } + + @WithAccessId( + userName = "user_1_2", + groupNames = {"businessadmin"}) + @Test + public void testWorkbasketAccessItemSetName() + throws SQLException, NotAuthorizedException, InvalidArgumentException, WorkbasketNotFoundException, + InvalidWorkbasketException, WorkbasketAlreadyExistException, DomainNotFoundException { + WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); + int before = workbasketService.createWorkbasketQuery().domainIn("DOMAIN_A").list().size(); + + Workbasket workbasket = workbasketService.newWorkbasket("WBAIT1234", "DOMAIN_A"); + workbasket.setName("MyNewBasket"); + workbasket.setType(WorkbasketType.PERSONAL); + workbasket.setOrgLevel1("company"); + workbasket = workbasketService.createWorkbasket(workbasket); + WorkbasketAccessItem wbai = workbasketService.newWorkbasketAccessItem(workbasket.getId(), "user_1_2"); + wbai.setPermRead(true); + wbai.setAccessName("Karl Napf"); + workbasketService.createWorkbasketAccessItem(wbai); + + Workbasket createdWorkbasket = workbasketService.getWorkbasket("WBAIT1234", "DOMAIN_A"); + assertNotNull(createdWorkbasket); + assertNotNull(createdWorkbasket.getId()); + + List accessItems = workbasketService.getWorkbasketAccessItems(createdWorkbasket.getId()); + WorkbasketAccessItem item = accessItems.stream().filter(t -> wbai.getId().equals(t.getId())).findFirst().orElse( + null); + assertEquals("Karl Napf", item.getAccessName()); + + } + } diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java index f609e7cf0..250918b9f 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java @@ -57,10 +57,20 @@ public class UpdateWorkbasketAuthorizationsAccTest extends AbstractAccTest { accessItem.setPermRead(true); accessItem = workbasketService.createWorkbasketAccessItem(accessItem); + WorkbasketAccessItem newItem = accessItem; accessItem.setPermCustom1(true); accessItem.setPermAppend(false); - WorkbasketAccessItem updatedItem = workbasketService.updateWorkbasketAccessItem(accessItem); + accessItem.setAccessName("Rojas, Miguel"); + workbasketService.updateWorkbasketAccessItem(accessItem); + List items = workbasketService + .getWorkbasketAccessItems("WBI:100000000000000000000000000000000002"); + WorkbasketAccessItem updatedItem = items.stream() + .filter(t -> newItem.getId().equals(t.getId())) + .findFirst() + .orElse(null); + + Assert.assertEquals("Rojas, Miguel", updatedItem.getAccessName()); Assert.assertEquals(false, updatedItem.isPermAppend()); Assert.assertEquals(true, updatedItem.isPermRead()); Assert.assertEquals(true, updatedItem.isPermCustom11()); diff --git a/lib/taskana-core/src/test/resources/sql/workbasket-access-list.sql b/lib/taskana-core/src/test/resources/sql/workbasket-access-list.sql index 3a04f5742..7ce37edbb 100644 --- a/lib/taskana-core/src/test/resources/sql/workbasket-access-list.sql +++ b/lib/taskana-core/src/test/resources/sql/workbasket-access-list.sql @@ -1,49 +1,49 @@ --- KSC authorizations (ID , WB_ID , ACCESS_ID, READ, OPEN, APPEND, TRANSFER, DISTRIBUTE, C1, .., C12) +-- KSC authorizations (ID , WB_ID , ACCESS_ID, ACCESS_NAME , READ, OPEN, APPEND, TRANSFER, DISTRIBUTE, C1, .., C12) -- PPKs -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000001', 'WBI:100000000000000000000000000000000004', 'teamlead_1', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000002', 'WBI:100000000000000000000000000000000005', 'teamlead_2', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000006', 'user_1_1', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000004', 'WBI:100000000000000000000000000000000007', 'user_1_2', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000005', 'WBI:100000000000000000000000000000000008', 'user_2_1', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000006', 'WBI:100000000000000000000000000000000009', 'user_2_2', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000001', 'WBI:100000000000000000000000000000000004', 'teamlead_1', 'Meyer, Dominik' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000002', 'WBI:100000000000000000000000000000000005', 'teamlead_2', 'Hagen, Holger' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000006', 'user_1_1', 'Rojas, Miguel' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000004', 'WBI:100000000000000000000000000000000007', 'user_1_2', 'Lengl, Marcel' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000005', 'WBI:100000000000000000000000000000000008', 'user_2_1', 'Zorgati, Mustapha' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000006', 'WBI:100000000000000000000000000000000009', 'user_2_2', 'Breier, Bernd' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -- group internal access -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000007', 'WBI:100000000000000000000000000000000004', 'group_1', true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000008', 'WBI:100000000000000000000000000000000005', 'group_2', true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000009', 'WBI:100000000000000000000000000000000006', 'group_1', true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000010', 'WBI:100000000000000000000000000000000007', 'group_1', true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000011', 'WBI:100000000000000000000000000000000008', 'group_2', true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000012', 'WBI:100000000000000000000000000000000009', 'group_2', true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000007', 'WBI:100000000000000000000000000000000004', 'group_1', 'DevelopersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000008', 'WBI:100000000000000000000000000000000005', 'group_2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000009', 'WBI:100000000000000000000000000000000006', 'group_1', 'DevelopersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000010', 'WBI:100000000000000000000000000000000007', 'group_1', 'DevelopersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000011', 'WBI:100000000000000000000000000000000008', 'group_2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000012', 'WBI:100000000000000000000000000000000009', 'group_2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -- teamlead substitution -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000013', 'WBI:100000000000000000000000000000000004', 'teamlead_2', true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000014', 'WBI:100000000000000000000000000000000005', 'teamlead_1', true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000013', 'WBI:100000000000000000000000000000000004', 'teamlead_2', 'Hagen, Holger' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000014', 'WBI:100000000000000000000000000000000005', 'teamlead_1', 'Meyer, Dominik' , true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); -- cross team tranfers -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000015', 'WBI:100000000000000000000000000000000006', 'group_2', true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000016', 'WBI:100000000000000000000000000000000007', 'group_2', true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000017', 'WBI:100000000000000000000000000000000008', 'group_1', true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000018', 'WBI:100000000000000000000000000000000009', 'group_1', true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000015', 'WBI:100000000000000000000000000000000006', 'group_2', 'UsersGroup' , true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000016', 'WBI:100000000000000000000000000000000007', 'group_2', 'UsersGroup' , true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000017', 'WBI:100000000000000000000000000000000008', 'group_1', 'DevelopersGroup' , true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000018', 'WBI:100000000000000000000000000000000009', 'group_1', 'DevelopersGroup' , true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); -- Team GPK access -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000019', 'WBI:100000000000000000000000000000000002', 'group_1', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000020', 'WBI:100000000000000000000000000000000003', 'group_2', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000019', 'WBI:100000000000000000000000000000000002', 'group_1', 'DevelopersGroup' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000020', 'WBI:100000000000000000000000000000000003', 'group_2', 'UsersGroup' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -- Cross team GPK access -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000021', 'WBI:100000000000000000000000000000000001', 'teamlead_1', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000022', 'WBI:100000000000000000000000000000000001', 'teamlead_2', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000021', 'WBI:100000000000000000000000000000000001', 'teamlead_1', 'Meyer, Dominik' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000022', 'WBI:100000000000000000000000000000000001', 'teamlead_2', 'Hagen, Holger' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -- TPK access -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000123', 'WBI:100000000000000000000000000000000010', 'teamlead_1', true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000123', 'WBI:100000000000000000000000000000000010', 'teamlead_1', 'Meyer, Dominik' , true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false); -- Access to other domains -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000023', 'WBI:100000000000000000000000000000000012', 'group_1', true, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000024', 'WBI:100000000000000000000000000000000013', 'group_2', true, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000025', 'WBI:100000000000000000000000000000000014', 'group_2', true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000026', 'WBI:100000000000000000000000000000000015', 'group_2', true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000023', 'WBI:100000000000000000000000000000000012', 'group_1', 'DevelopersGroup' , true, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000024', 'WBI:100000000000000000000000000000000013', 'group_2', 'UsersGroup' , true, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000025', 'WBI:100000000000000000000000000000000014', 'group_2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000026', 'WBI:100000000000000000000000000000000015', 'group_2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -- Access to workbaskets for sorting test -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('900', '900', 'max', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('901', '901', 'max', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('902', '902', 'max', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('903', '903', 'max', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('904', '904', 'max', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('905', '905', 'max', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('906', '906', 'max', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('907', '907', 'max', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('908', '908', 'max', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('909', '909', 'max', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('900', '900', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('901', '901', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('902', '902', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('903', '903', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('904', '904', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('905', '905', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('906', '906', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('907', '907', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('908', '908', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('909', '909', 'max', 'Behrendt, Maximilian', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); diff --git a/rest/taskana-rest-spring-example/src/main/resources/sql/sample-data/workbasket-access-list.sql b/rest/taskana-rest-spring-example/src/main/resources/sql/sample-data/workbasket-access-list.sql index 99dfd4fc7..3bb3d31f4 100644 --- a/rest/taskana-rest-spring-example/src/main/resources/sql/sample-data/workbasket-access-list.sql +++ b/rest/taskana-rest-spring-example/src/main/resources/sql/sample-data/workbasket-access-list.sql @@ -1,41 +1,41 @@ -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('1', '1', 'Elena', true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('2', '2', 'Max', true, true, true, true, true, true, true, true, true, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('3', '3', 'Simone', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('4', '4', 'user_1_1', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('1', '1', 'Elena', 'Ferrante, Elena', true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('2', '2', 'Max', 'Behrendt, Maximilian', true, true, true, true, true, true, true, true, true, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('3', '3', 'Simone', 'Mueller, Simone', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('4', '4', 'user_1_1','Rojas, Miguel', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); --- KSC authorizations ( ID, WB_KEY, ACCESS_ID, READ, OPEN, APPEND, TRANSFER, DISTRIBUTE, C1, .., C12) +-- KSC authorizations ( ID, WB_KEY, ACCESS_ID, ACCESS_NAME , READ, OPEN, APPEND, TRANSFER, DISTRIBUTE, C1, .., C12) -- PPKs -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000001', 'WBI:100000000000000000000000000000000004', 'teamlead_1', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000002', 'WBI:100000000000000000000000000000000005', 'teamlead_2', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000006', 'user_1_1', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000004', 'WBI:100000000000000000000000000000000007', 'user_1_2', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000005', 'WBI:100000000000000000000000000000000008', 'user_2_1', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000006', 'WBI:100000000000000000000000000000000009', 'user_2_2', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000001', 'WBI:100000000000000000000000000000000004', 'teamlead_1', 'Meyer, Dominik' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000002', 'WBI:100000000000000000000000000000000005', 'teamlead_2', 'Hagen, Holger' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000006', 'user_1_1', 'Rojas, Miguel' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000004', 'WBI:100000000000000000000000000000000007', 'user_1_2', 'Lengl, Marcel' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000005', 'WBI:100000000000000000000000000000000008', 'user_2_1', 'Zorgati, Mustapha' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000006', 'WBI:100000000000000000000000000000000009', 'user_2_2', 'Breier, Bernd' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -- group internal access -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000007', 'WBI:100000000000000000000000000000000004', 'group_1', true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000008', 'WBI:100000000000000000000000000000000005', 'group_2', true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000009', 'WBI:100000000000000000000000000000000006', 'group_1', true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000010', 'WBI:100000000000000000000000000000000007', 'group_1', true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000011', 'WBI:100000000000000000000000000000000008', 'group_2', true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000012', 'WBI:100000000000000000000000000000000009', 'group_2', true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000007', 'WBI:100000000000000000000000000000000004', 'group_1', 'DevelopersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000008', 'WBI:100000000000000000000000000000000005', 'group_2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000009', 'WBI:100000000000000000000000000000000006', 'group_1', 'DevelopersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000010', 'WBI:100000000000000000000000000000000007', 'group_1', 'DevelopersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000011', 'WBI:100000000000000000000000000000000008', 'group_2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000012', 'WBI:100000000000000000000000000000000009', 'group_2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -- teamlead substitution -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000013', 'WBI:100000000000000000000000000000000004', 'teamlead_2', true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000014', 'WBI:100000000000000000000000000000000005', 'teamlead_1', true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000013', 'WBI:100000000000000000000000000000000004', 'teamlead_2', 'Hagen, Holger' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000014', 'WBI:100000000000000000000000000000000005', 'teamlead_1', 'Meyer, Dominik' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -- cross team tranfers -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000015', 'WBI:100000000000000000000000000000000006', 'group_2', true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000016', 'WBI:100000000000000000000000000000000007', 'group_2', true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000017', 'WBI:100000000000000000000000000000000008', 'group_1', true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000018', 'WBI:100000000000000000000000000000000009', 'group_1', true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000015', 'WBI:100000000000000000000000000000000006', 'group_2', 'UsersGroup' , true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000016', 'WBI:100000000000000000000000000000000007', 'group_2', 'UsersGroup' , true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000017', 'WBI:100000000000000000000000000000000008', 'group_1', 'DevelopersGroup' , true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000018', 'WBI:100000000000000000000000000000000009', 'group_1', 'DevelopersGroup' , true, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false); -- Team GPK access -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000019', 'WBI:100000000000000000000000000000000002', 'group_1', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000020', 'WBI:100000000000000000000000000000000003', 'group_2', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000019', 'WBI:100000000000000000000000000000000002', 'group_1', 'DevelopersGroup' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000020', 'WBI:100000000000000000000000000000000003', 'group_2', 'UsersGroup' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -- Cross team GPK access -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000021', 'WBI:100000000000000000000000000000000001', 'teamlead_1', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000022', 'WBI:100000000000000000000000000000000001', 'teamlead_2', true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000021', 'WBI:100000000000000000000000000000000001', 'teamlead_1', 'Meyer, Dominik' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000022', 'WBI:100000000000000000000000000000000001', 'teamlead_2', 'Hagen, Holger' , true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true); -- Access to other domains -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000023', 'WBI:100000000000000000000000000000000012', 'group_1', true, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000024', 'WBI:100000000000000000000000000000000013', 'group_2', true, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000025', 'WBI:100000000000000000000000000000000014', 'group_2', true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000026', 'WBI:100000000000000000000000000000000015', 'group_2', true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000023', 'WBI:100000000000000000000000000000000012', 'group_1', 'DevelopersGroup' , true, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000024', 'WBI:100000000000000000000000000000000013', 'group_2', 'UsersGroup' , true, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000025', 'WBI:100000000000000000000000000000000014', 'group_2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO TASKANA.WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000026', 'WBI:100000000000000000000000000000000015', 'group_2', 'UsersGroup' , true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false); diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResource.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResource.java index cdb992ef4..c346e0449 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResource.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResource.java @@ -19,6 +19,8 @@ public class WorkbasketAccessItemResource extends ResourceSupport { @NotNull public String accessId; + public String accessName; + public boolean permRead; public boolean permOpen; public boolean permAppend; @@ -61,6 +63,14 @@ public class WorkbasketAccessItemResource extends ResourceSupport { this.accessId = accessId; } + public String getAccessName() { + return accessName; + } + + public void setAccessName(String accessName) { + this.accessName = accessName; + } + public boolean isPermRead() { return permRead; }