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

Closes #2359 - Extend Custom Fields of Workbasket

This commit is contained in:
jamesrdi 2023-08-15 16:36:32 +02:00
parent 8460f1d5d7
commit 727ccf4de1
31 changed files with 702 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/taskana-common-data/src/main/resources/sql/monitor-data/monitor-sample-data.sql
View File

@ -1,10 +1,10 @@
-- WORKBASKET TABLE (ID , KEY , CREATED , MODIFIED , NAME , DOMAIN , TYPE , DESCRIPTION , OWNER , CUSTOM_1 , CUSTOM_2 , CUSTOM_3 , CUSTOM_4 , ORG_LEVEL_1 , ORG_LEVEL_2 , ORG_LEVEL_3 , ORG_LEVEL_4 , MARKED_FOR_DELETION );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000001', 'USER-1-1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 1 KSC 1', 'MONITOR_TEST_DOMAIN', 'PERSONAL', 'Monitor Test Postkorb 1', 'John' , '' , '' , '' , '' , 'org1' , '' , '' , '' , FALSE );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000002', 'USER-1-2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 1 KSC 2', 'MONITOR_TEST_DOMAIN', 'PERSONAL', 'Monitor Test Postkorb 2', 'John' , '' , '' , '' , '' , '' , '' , '' , '' , FALSE );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000003', 'USER-1-3' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 1 KSC 3', 'MONITOR_TEST_DOMAIN', 'PERSONAL', 'Monitor Test Postkorb 3', 'John' , '' , '' , '' , '' , 'org1' , '' , '' , '' , FALSE );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000004', 'USER-1-4' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 1 KSC 4', 'MONITOR_TEST_DOMAIN', 'PERSONAL', 'Monitor Test Postkorb 4', 'John' , '' , '' , '' , '' , '' , '' , '' , '' , FALSE );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000005', 'GPK-1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'GPK GruppenPk 1' , 'MONITOR_TEST_DOMAIN', 'GROUP' , 'Monitor Test Postkorb 5', 'John' , '' , '' , '' , '' , '' , '' , '' , '' , FALSE );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000006', 'TPK-VIP-1', RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'TPK VIP 1' , 'MONITOR_TEST_DOMAIN', 'TOPIC' , 'Monitor Test Postkorb 6', 'John' , '' , '' , '' , '' , '' , '' , '' , '' , FALSE );
-- WORKBASKET TABLE (ID , KEY , CREATED , MODIFIED , NAME , DOMAIN , TYPE , DESCRIPTION , OWNER , CUSTOM_1 , CUSTOM_2 , CUSTOM_3 , CUSTOM_4 , ORG_LEVEL_1 , ORG_LEVEL_2 , ORG_LEVEL_3 , ORG_LEVEL_4 , MARKED_FOR_DELETION , CUSTOM_5 , CUSTOM_6 , CUSTOM_7 , CUSTOM_8 );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000001', 'USER-1-1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 1 KSC 1', 'MONITOR_TEST_DOMAIN', 'PERSONAL', 'Monitor Test Postkorb 1', 'John' , '' , '' , '' , '' , 'org1' , '' , '' , '' , FALSE , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000002', 'USER-1-2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 1 KSC 2', 'MONITOR_TEST_DOMAIN', 'PERSONAL', 'Monitor Test Postkorb 2', 'John' , '' , '' , '' , '' , '' , '' , '' , '' , FALSE , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000003', 'USER-1-3' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 1 KSC 3', 'MONITOR_TEST_DOMAIN', 'PERSONAL', 'Monitor Test Postkorb 3', 'John' , '' , '' , '' , '' , 'org1' , '' , '' , '' , FALSE , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000004', 'USER-1-4' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 1 KSC 4', 'MONITOR_TEST_DOMAIN', 'PERSONAL', 'Monitor Test Postkorb 4', 'John' , '' , '' , '' , '' , '' , '' , '' , '' , FALSE , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000005', 'GPK-1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'GPK GruppenPk 1' , 'MONITOR_TEST_DOMAIN', 'GROUP' , 'Monitor Test Postkorb 5', 'John' , '' , '' , '' , '' , '' , '' , '' , '' , FALSE , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000006', 'TPK-VIP-1', RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'TPK VIP 1' , 'MONITOR_TEST_DOMAIN', 'TOPIC' , 'Monitor Test Postkorb 6', 'John' , '' , '' , '' , '' , '' , '' , '' , '' , FALSE , '' , '' , '' , '' );
-- CLASSIFICATION TABLE (ID , KEY , PARENT_ID , PARENT_KEY, CATEGORY , TYPE , DOMAIN , VALID_IN_DOMAIN, CREATED , MODIFIED ,NAME , DESCRIPTION , PRIORITY, SERVICE_LEVEL, APPLICATION_ENTRY_POINT, CUSTOM_1 , CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8 );
INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000001', 'L10000', '' , '' , 'EXTERN' , 'TASK' , 'DOMAIN_A' , TRUE , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'OLD-Leistungsfall' , 'OLD-Leistungsfall' , 3 , 'P1D' , '' , 'VNR,RVNR,KOLVNR' , '' , '' , '' , '' , '' , '' , '' );

74
common/taskana-common-data/src/main/resources/sql/sample-data/workbasket.sql
View File

@ -1,55 +1,55 @@
-- sample-data is used for rest tests and for the example application
-- KSC workbaskets
-- WORKBASKET TABLE (ID , KEY , CREATED , MODIFIED , NAME , DOMAIN , TYPE , DESCRIPTION , OWNER , CUSTOM_1 , CUSTOM_2 , CUSTOM_3 , CUSTOM_4 , ORG_LEVEL_1 , ORG_LEVEL_2, ORG_LEVEL_3, ORG_LEVEL_4, MARKED_FOR_DELETION );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000000', 'ADMIN' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Postkorb Admin' , 'DOMAIN_A' , 'PERSONAL', 'Postkorb Admin' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000001', 'GPK_KSC' , '2018-02-01 12:00:00', '2018-02-01 12:00:00', 'Gruppenpostkorb KSC' , 'DOMAIN_A' , 'GROUP' , 'Gruppenpostkorb KSC' , 'teamlead-1' , 'ABCQVW' , '' , 'xyz4' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000002', 'GPK_KSC_1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Gruppenpostkorb KSC 1' , 'DOMAIN_A' , 'GROUP' , 'Gruppenpostkorb KSC 1' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000003', 'GPK_KSC_2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Gruppenpostkorb KSC 2' , 'DOMAIN_A' , 'GROUP' , 'Gruppenpostkorb KSC 2' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000004', 'TEAMLEAD-1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK Teamlead KSC 1' , 'DOMAIN_A' , 'PERSONAL', 'PPK Teamlead KSC 1' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000005', 'TEAMLEAD-2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK Teamlead KSC 2' , 'DOMAIN_A' , 'PERSONAL', 'PPK Teamlead KSC 2' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000006', 'USER-1-1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 1 KSC 1' , 'DOMAIN_A' , 'PERSONAL', 'PPK User 1 KSC 1' , '' , '' , '' , '' , 'custom4z', '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000007', 'USER-1-2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 2 KSC 1' , 'DOMAIN_A' , 'PERSONAL', 'PPK User 2 KSC 1' , 'user-1-2' , 'custom1', 'custom2' , 'custom3', 'custom4' , 'versicherung', 'abteilung', 'projekt' , 'team' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000008', 'USER-2-1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 1 KSC 2' , 'DOMAIN_A' , 'PERSONAL', 'PPK User 1 KSC 2' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000009', 'USER-2-2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 2 KSC 2' , 'DOMAIN_A' , 'PERSONAL', 'PPK User 2 KSC 2' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000010', 'TPK_VIP' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Themenpostkorb VIP' , 'DOMAIN_A' , 'TOPIC' , 'Themenpostkorb VIP' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000016', 'TPK_VIP_2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Themenpostkorb VIP 2' , 'DOMAIN_A' , 'TOPIC' , 'Themenpostkorb VIP' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
-- WORKBASKET TABLE (ID , KEY , CREATED , MODIFIED , NAME , DOMAIN , TYPE , DESCRIPTION , OWNER , CUSTOM_1 , CUSTOM_2 , CUSTOM_3 , CUSTOM_4 , ORG_LEVEL_1 , ORG_LEVEL_2, ORG_LEVEL_3, ORG_LEVEL_4, MARKED_FOR_DELETION , CUSTOM_5 , CUSTOM_6 , CUSTOM_7 , CUSTOM_8 );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000000', 'ADMIN' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Postkorb Admin' , 'DOMAIN_A' , 'PERSONAL', 'Postkorb Admin' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000001', 'GPK_KSC' , '2018-02-01 12:00:00', '2018-02-01 12:00:00', 'Gruppenpostkorb KSC' , 'DOMAIN_A' , 'GROUP' , 'Gruppenpostkorb KSC' , 'teamlead-1' , 'ABCQVW' , '' , 'xyz4' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000002', 'GPK_KSC_1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Gruppenpostkorb KSC 1' , 'DOMAIN_A' , 'GROUP' , 'Gruppenpostkorb KSC 1' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000003', 'GPK_KSC_2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Gruppenpostkorb KSC 2' , 'DOMAIN_A' , 'GROUP' , 'Gruppenpostkorb KSC 2' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000004', 'TEAMLEAD-1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK Teamlead KSC 1' , 'DOMAIN_A' , 'PERSONAL', 'PPK Teamlead KSC 1' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000005', 'TEAMLEAD-2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK Teamlead KSC 2' , 'DOMAIN_A' , 'PERSONAL', 'PPK Teamlead KSC 2' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000006', 'USER-1-1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 1 KSC 1' , 'DOMAIN_A' , 'PERSONAL', 'PPK User 1 KSC 1' , '' , '' , '' , '' , 'custom4z', '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000007', 'USER-1-2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 2 KSC 1' , 'DOMAIN_A' , 'PERSONAL', 'PPK User 2 KSC 1' , 'user-1-2' , 'custom1', 'custom2' , 'custom3', 'custom4' , 'versicherung', 'abteilung', 'projekt' , 'team' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000008', 'USER-2-1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 1 KSC 2' , 'DOMAIN_A' , 'PERSONAL', 'PPK User 1 KSC 2' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000009', 'USER-2-2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 2 KSC 2' , 'DOMAIN_A' , 'PERSONAL', 'PPK User 2 KSC 2' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000010', 'TPK_VIP' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Themenpostkorb VIP' , 'DOMAIN_A' , 'TOPIC' , 'Themenpostkorb VIP' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000016', 'TPK_VIP_2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Themenpostkorb VIP 2' , 'DOMAIN_A' , 'TOPIC' , 'Themenpostkorb VIP' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000017', 'das_ist_ein_sehr_sehr_sehr_sehr_sehr_sehr_sehr_sehr_langer_key_1', RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Testpostkorb' , 'DOMAIN_TEST', 'TOPIC' , null , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000017', 'das_ist_ein_sehr_sehr_sehr_sehr_sehr_sehr_sehr_sehr_langer_key_1', RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Testpostkorb' , 'DOMAIN_TEST', 'TOPIC' , null , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
-- WORKBASKET TABLE (ID , KEY , CREATED , MODIFIED , NAME , DOMAIN , TYPE , DESCRIPTION , OWNER , CUSTOM_1 , CUSTOM_2 , CUSTOM_3 , CUSTOM_4 , ORG_LEVEL_1 , ORG_LEVEL_2, ORG_LEVEL_3, ORG_LEVEL_4, MARKED_FOR_DELETION );
-- WORKBASKET TABLE (ID , KEY , CREATED , MODIFIED , NAME , DOMAIN , TYPE , DESCRIPTION , OWNER , CUSTOM_1 , CUSTOM_2 , CUSTOM_3 , CUSTOM_4 , ORG_LEVEL_1 , ORG_LEVEL_2, ORG_LEVEL_3, ORG_LEVEL_4, MARKED_FOR_DELETION , CUSTOM_5 , CUSTOM_6 , CUSTOM_7 , CUSTOM_8 );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000018', 'das_ist_eine_lange_description_und_ein_langer_owner' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Testpostkorb' , 'DOMAIN_TEST', 'TOPIC' , CONCAT('Lorem ipsum dolor sit amet, consetetur sadipscing',
CONCAT('sed diam nonumy eirmod tempor invidunt ut labore ',
CONCAT('sed diam nonumy eirmod tempor invidunt ut labore ',
CONCAT('ore magna aliquyam erat, sed diam voluptua. At ve',
's et accusam et justo duo dolores abcdfiskdk ekeke')))), 'das_ist_eine_sehr_sehr_sehr_sehr_sehr_lange_user_id', '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000019', 'das_ist_ein_sehr_sehr_sehr_sehr_sehr_sehr_sehr_sehr_langer_key_2', RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'das_ist_ein_sehr_sehr_sehr_sehr_sehr_sehr_sehr_sehr_sehr_sehr_langer_Testpostkorbname_ohne_Leerzeichen' , 'DOMAIN_TEST', 'TOPIC' , 'langer Key und langer Name ohne Leerzeichen' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000020', 'das_ist_ein_sehr_sehr_sehr_sehr_sehr_sehr_sehr_sehr_langer_key_3', RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'das ist ein sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr langer Testpostkorbname mit Leerzeichen 1' , 'DOMAIN_TEST', 'TOPIC' , 'langer Key und langer Name mit Leerzeichen' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000021', 'das_ist_ein_sehr_sehr_sehr_sehr_sehr_sehr_sehr_sehr_langer_key_4', RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'das ist ein sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr langer Testpostkorbname mit Leerzeichen 2' , 'DOMAIN_TEST', 'TOPIC' , 'langer Key, langer Name mit Leerzeichen und lange UserId', 'das_ist_eine_sehr_sehr_sehr_sehr_sehr_lange_user_id', '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000022', 'kurzer_key' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'das ist ein sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr langer Testpostkorbname mit Leerzeichen 3' , 'DOMAIN_TEST', 'TOPIC' , 'kurzer Key und langer Name mit Leerzeichen' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
's et accusam et justo duo dolores abcdfiskdk ekeke')))), 'das_ist_eine_sehr_sehr_sehr_sehr_sehr_lange_user_id', '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000019', 'das_ist_ein_sehr_sehr_sehr_sehr_sehr_sehr_sehr_sehr_langer_key_2', RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'das_ist_ein_sehr_sehr_sehr_sehr_sehr_sehr_sehr_sehr_sehr_sehr_langer_Testpostkorbname_ohne_Leerzeichen' , 'DOMAIN_TEST', 'TOPIC' , 'langer Key und langer Name ohne Leerzeichen' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000020', 'das_ist_ein_sehr_sehr_sehr_sehr_sehr_sehr_sehr_sehr_langer_key_3', RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'das ist ein sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr langer Testpostkorbname mit Leerzeichen 1' , 'DOMAIN_TEST', 'TOPIC' , 'langer Key und langer Name mit Leerzeichen' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000021', 'das_ist_ein_sehr_sehr_sehr_sehr_sehr_sehr_sehr_sehr_langer_key_4', RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'das ist ein sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr langer Testpostkorbname mit Leerzeichen 2' , 'DOMAIN_TEST', 'TOPIC' , 'langer Key, langer Name mit Leerzeichen und lange UserId', 'das_ist_eine_sehr_sehr_sehr_sehr_sehr_lange_user_id', '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000022', 'kurzer_key' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'das ist ein sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr langer Testpostkorbname mit Leerzeichen 3' , 'DOMAIN_TEST', 'TOPIC' , 'kurzer Key und langer Name mit Leerzeichen' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000023', 'langer key, langer name, eine lange description, langer owner' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'das ist ein sehr sehr sehr sehr sehr sehr sehr sehr sehr sehr langer Testpostkorbname mit Leerzeichen 4' , 'DOMAIN_TEST', 'TOPIC' , CONCAT('Lorem ipsum dolor sit amet, consetetur sadipscing',
CONCAT('sed diam nonumy eirmod tempor invidunt ut labore ',
CONCAT('sed diam nonumy eirmod tempor invidunt ut labore ',
CONCAT('ore magna aliquyam erat, sed diam voluptua. At ve',
's et accusam et justo duo dolores abcdfiskdk ekeke')))), 'das_ist_eine_sehr_sehr_sehr_sehr_sehr_lange_user_id', '' , '' , '' , '' , '' , '' , '' , '' , false );
's et accusam et justo duo dolores abcdfiskdk ekeke')))), 'das_ist_eine_sehr_sehr_sehr_sehr_sehr_lange_user_id', '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
-- WORKBASKET TABLE (ID , KEY , CREATED , MODIFIED , NAME , DOMAIN , TYPE , DESCRIPTION , OWNER , CUSTOM_1 , CUSTOM_2 , CUSTOM_3 , CUSTOM_4 , ORG_LEVEL_1 , ORG_LEVEL_2, ORG_LEVEL_3, ORG_LEVEL_4, MARKED_FOR_DELETION );
-- WORKBASKET TABLE (ID , KEY , CREATED , MODIFIED , NAME , DOMAIN , TYPE , DESCRIPTION , OWNER , CUSTOM_1 , CUSTOM_2 , CUSTOM_3 , CUSTOM_4 , ORG_LEVEL_1 , ORG_LEVEL_2, ORG_LEVEL_3, ORG_LEVEL_4, MARKED_FOR_DELETION , CUSTOM_5 , CUSTOM_6 , CUSTOM_7 , CUSTOM_8 );
-- KSC workbaskets Domain_B
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000011', 'GPK_B_KSC' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Gruppenpostkorb KSC B' , 'DOMAIN_B' , 'GROUP' , 'Gruppenpostkorb KSC' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000012', 'GPK_B_KSC_1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Gruppenpostkorb KSC B1' , 'DOMAIN_B' , 'GROUP' , 'Gruppenpostkorb KSC 1' , '' , 'custom1', 'custom2' , 'custom3', 'custom4' , 'orgl1' , 'orgl2' , 'orgl3' , 'aorgl4' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000013', 'GPK_B_KSC_2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Gruppenpostkorb KSC B2' , 'DOMAIN_B' , 'GROUP' , 'Gruppenpostkorb KSC 2' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000014', 'USER-B-1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 1 KSC 1 Domain B' , 'DOMAIN_B' , 'PERSONAL', 'PPK User 1 KSC 1 Domain B' , '' , '' , 'custom20', '' , 'custom4' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000015', 'USER-B-2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 2 KSC 1 Domain B' , 'DOMAIN_B' , 'PERSONAL', 'PPK User 1 KSC 1 Domain B' , 'user-1-2' , 'ABCABC' , 'cust2' , 'cust3' , 'cust4' , 'orgl1' , 'orgl2' , 'orgl3' , 'orgl4' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000011', 'GPK_B_KSC' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Gruppenpostkorb KSC B' , 'DOMAIN_B' , 'GROUP' , 'Gruppenpostkorb KSC' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000012', 'GPK_B_KSC_1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Gruppenpostkorb KSC B1' , 'DOMAIN_B' , 'GROUP' , 'Gruppenpostkorb KSC 1' , '' , 'custom1', 'custom2' , 'custom3', 'custom4' , 'orgl1' , 'orgl2' , 'orgl3' , 'aorgl4' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000013', 'GPK_B_KSC_2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Gruppenpostkorb KSC B2' , 'DOMAIN_B' , 'GROUP' , 'Gruppenpostkorb KSC 2' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000014', 'USER-B-1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 1 KSC 1 Domain B' , 'DOMAIN_B' , 'PERSONAL', 'PPK User 1 KSC 1 Domain B' , '' , '' , 'custom20', '' , 'custom4' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000015', 'USER-B-2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 2 KSC 1 Domain B' , 'DOMAIN_B' , 'PERSONAL', 'PPK User 1 KSC 1 Domain B' , 'user-1-2' , 'ABCABC' , 'cust2' , 'cust3' , 'cust4' , 'orgl1' , 'orgl2' , 'orgl3' , 'orgl4' , false , '' , '' , '' , '' );
-- Workbaskets for sorting test
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000900', 'sort001' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'basxet0' , 'DOMAIN_A' , 'TOPIC' , 'Lorem ipsum dolor sit amet.' , 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000901', 'Sort002' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Basxet1' , 'DOMAIN_A' , 'TOPIC' , 'Lorem ipsum dolor sit amet.' , 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000902', 'sOrt003' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'bAsxet2' , 'DOMAIN_A' , 'TOPIC' , 'Lorem ipsum dolor sit amet.' , 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000903', 'soRt004' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'baSxet3' , 'DOMAIN_A' , 'TOPIC' , 'Lorem ipsum dolor sit amet.' , 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000904', 'sorT005' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'basXet4' , 'DOMAIN_A' , 'TOPIC' , 'Lorem ipsum dolor sit amet.' , 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000905', 'Sort006' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'basxEt5' , 'DOMAIN_A' , 'TOPIC' , 'Lorem ipsum dolor sit amet.' , 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000906', 'SOrt007' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'basxeT6' , 'DOMAIN_A' , 'TOPIC' , 'Lorem ipsum dolor sit amet.' , 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000907', 'SoRt008' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'BAsxet7' , 'DOMAIN_A' , 'TOPIC' , 'Lorem ipsum dolor sit amet.' , 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000908', 'SorT009' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'BaSxet8' , 'DOMAIN_A' , 'TOPIC' , 'Lorem ipsum dolor sit amet.' , 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000909', 'Sort010' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'BasXet9' , 'DOMAIN_A' , 'TOPIC' , 'Lorem ipsum dolor sit amet.' , 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000900', 'sort001' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'basxet0' , 'DOMAIN_A' , 'TOPIC' , 'Lorem ipsum dolor sit amet.' , 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000901', 'Sort002' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Basxet1' , 'DOMAIN_A' , 'TOPIC' , 'Lorem ipsum dolor sit amet.' , 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000902', 'sOrt003' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'bAsxet2' , 'DOMAIN_A' , 'TOPIC' , 'Lorem ipsum dolor sit amet.' , 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000903', 'soRt004' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'baSxet3' , 'DOMAIN_A' , 'TOPIC' , 'Lorem ipsum dolor sit amet.' , 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000904', 'sorT005' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'basXet4' , 'DOMAIN_A' , 'TOPIC' , 'Lorem ipsum dolor sit amet.' , 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000905', 'Sort006' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'basxEt5' , 'DOMAIN_A' , 'TOPIC' , 'Lorem ipsum dolor sit amet.' , 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000906', 'SOrt007' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'basxeT6' , 'DOMAIN_A' , 'TOPIC' , 'Lorem ipsum dolor sit amet.' , 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000907', 'SoRt008' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'BAsxet7' , 'DOMAIN_A' , 'TOPIC' , 'Lorem ipsum dolor sit amet.' , 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000908', 'SorT009' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'BaSxet8' , 'DOMAIN_A' , 'TOPIC' , 'Lorem ipsum dolor sit amet.' , 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000909', 'Sort010' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'BasXet9' , 'DOMAIN_A' , 'TOPIC' , 'Lorem ipsum dolor sit amet.' , 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );

54
common/taskana-common-data/src/main/resources/sql/test-data/workbasket.sql
View File

@ -1,34 +1,34 @@
-- test-data is used for all tests except for the rest tests
-- KSC workbaskets
-- WORKBASKET TABLE (ID , KEY , CREATED , MODIFIED , NAME , DOMAIN , TYPE , DESCRIPTION , OWNER , CUSTOM_1 , CUSTOM_2 , CUSTOM_3 , CUSTOM_4 , ORG_LEVEL_1 , ORG_LEVEL_2 , ORG_LEVEL_3 , ORG_LEVEL_4, MARKED_FOR_DELETION );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000001', 'GPK_KSC' , '2018-02-01 12:00:00', '2018-02-01 12:00:00', 'Gruppenpostkorb KSC' , 'DOMAIN_A', 'GROUP' , 'Gruppenpostkorb KSC' , 'teamlead-1' , 'ABCQVW' , '' , 'xyz4' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000002', 'GPK_KSC_1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Gruppenpostkorb KSC 1' , 'DOMAIN_A', 'GROUP' , 'Gruppenpostkorb KSC 1' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000003', 'GPK_KSC_2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Gruppenpostkorb KSC 2' , 'DOMAIN_A', 'GROUP' , 'Gruppenpostkorb KSC 2' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000004', 'TEAMLEAD-1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK Teamlead KSC 1' , 'DOMAIN_A', 'PERSONAL', 'PPK Teamlead KSC 1' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000005', 'TEAMLEAD-2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK Teamlead KSC 2' , 'DOMAIN_A', 'PERSONAL', 'PPK Teamlead KSC 2' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000006', 'USER-1-1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 1 KSC 1' , 'DOMAIN_A', 'PERSONAL', 'PPK User 1 KSC 1' , '' , '' , '' , '' , 'custom4z', '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000007', 'USER-1-2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 2 KSC 1' , 'DOMAIN_A', 'PERSONAL', 'PPK User 2 KSC 1' , 'user-1-2' , 'custom1', 'custom2' , 'custom3', 'custom4' , 'versicherung', 'abteilung' , 'projekt' , 'team' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000008', 'USER-2-1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 1 KSC 2' , 'DOMAIN_A', 'PERSONAL', 'PPK User 1 KSC 2' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000009', 'USER-2-2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 2 KSC 2' , 'DOMAIN_A', 'PERSONAL', 'PPK User 2 KSC 2' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000010', 'TPK_VIP' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Themenpostkorb VIP' , 'DOMAIN_A', 'TOPIC' , 'Themenpostkorb VIP' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
-- WORKBASKET TABLE (ID , KEY , CREATED , MODIFIED , NAME , DOMAIN , TYPE , DESCRIPTION , OWNER , CUSTOM_1 , CUSTOM_2 , CUSTOM_3 , CUSTOM_4 , ORG_LEVEL_1 , ORG_LEVEL_2 , ORG_LEVEL_3 , ORG_LEVEL_4, MARKED_FOR_DELETION , CUSTOM_5 , CUSTOM_6 , CUSTOM_7 , CUSTOM_8 );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000001', 'GPK_KSC' , '2018-02-01 12:00:00', '2018-02-01 12:00:00', 'Gruppenpostkorb KSC' , 'DOMAIN_A', 'GROUP' , 'Gruppenpostkorb KSC' , 'teamlead-1' , 'ABCQVW' , '' , 'xyz4' , '' , '' , '' , '' , '' , false , 'XYZ123' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000002', 'GPK_KSC_1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Gruppenpostkorb KSC 1' , 'DOMAIN_A', 'GROUP' , 'Gruppenpostkorb KSC 1' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , 'ABCABC' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000003', 'GPK_KSC_2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Gruppenpostkorb KSC 2' , 'DOMAIN_A', 'GROUP' , 'Gruppenpostkorb KSC 2' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000004', 'TEAMLEAD-1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK Teamlead KSC 1' , 'DOMAIN_A', 'PERSONAL', 'PPK Teamlead KSC 1' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000005', 'TEAMLEAD-2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK Teamlead KSC 2' , 'DOMAIN_A', 'PERSONAL', 'PPK Teamlead KSC 2' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000006', 'USER-1-1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 1 KSC 1' , 'DOMAIN_A', 'PERSONAL', 'PPK User 1 KSC 1' , '' , '' , '' , '' , 'custom4z', '' , '' , '' , '' , false , '' , '' , '' , 'cust8z' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000007', 'USER-1-2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 2 KSC 1' , 'DOMAIN_A', 'PERSONAL', 'PPK User 2 KSC 1' , 'user-1-2' , 'custom1', 'custom2' , 'custom3', 'custom4' , 'versicherung', 'abteilung' , 'projekt' , 'team' , false , 'custom5', 'custom6', 'custom7', 'custom8' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000008', 'USER-2-1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 1 KSC 2' , 'DOMAIN_A', 'PERSONAL', 'PPK User 1 KSC 2' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000009', 'USER-2-2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 2 KSC 2' , 'DOMAIN_A', 'PERSONAL', 'PPK User 2 KSC 2' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000010', 'TPK_VIP' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Themenpostkorb VIP' , 'DOMAIN_A', 'TOPIC' , 'Themenpostkorb VIP' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
-- KSC workbaskets Domain_B
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000011', 'GPK_B_KSC' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Gruppenpostkorb KSC B' , 'DOMAIN_B', 'GROUP' , 'Gruppenpostkorb KSC' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000012', 'GPK_B_KSC_1', RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Gruppenpostkorb KSC B1' , 'DOMAIN_B', 'GROUP' , 'Gruppenpostkorb KSC 1' , '' , 'custom1', 'custom2' , 'custom3', 'custom4' , 'orgl1' , 'orgl2' , 'orgl3' , 'aorgl4' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000013', 'GPK_B_KSC_2', RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Gruppenpostkorb KSC B2' , 'DOMAIN_B', 'GROUP' , 'Gruppenpostkorb KSC 2' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000014', 'USER-B-1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 1 KSC 1 Domain B', 'DOMAIN_B', 'PERSONAL', 'PPK User 1 KSC 1 Domain B' , '' , '' , 'custom20', '' , 'custom4' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000015', 'USER-B-2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 2 KSC 1 Domain B', 'DOMAIN_B', 'PERSONAL', 'PPK User 1 KSC 1 Domain B' , 'user-1-2' , 'ABCABC' , 'cust2' , 'cust3' , 'cust4' , 'orgl1' , 'orgl2' , 'orgl3' , 'orgl4' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000016', 'MASSNAHMEN' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'TPK Maßnahmen' , 'DOMAIN_B', 'TOPIC' , 'TPK Maßnahmen' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000011', 'GPK_B_KSC' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Gruppenpostkorb KSC B' , 'DOMAIN_B', 'GROUP' , 'Gruppenpostkorb KSC' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000012', 'GPK_B_KSC_1', RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Gruppenpostkorb KSC B1' , 'DOMAIN_B', 'GROUP' , 'Gruppenpostkorb KSC 1' , '' , 'custom1', 'custom2' , 'custom3', 'custom4' , 'orgl1' , 'orgl2' , 'orgl3' , 'aorgl4' , false , 'abc123' , '' , 'TSK123' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000013', 'GPK_B_KSC_2', RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Gruppenpostkorb KSC B2' , 'DOMAIN_B', 'GROUP' , 'Gruppenpostkorb KSC 2' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000014', 'USER-B-1' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 1 KSC 1 Domain B', 'DOMAIN_B', 'PERSONAL', 'PPK User 1 KSC 1 Domain B' , '' , '' , 'custom20', '' , 'custom4' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000015', 'USER-B-2' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'PPK User 2 KSC 1 Domain B', 'DOMAIN_B', 'PERSONAL', 'PPK User 1 KSC 1 Domain B' , 'user-1-2' , 'ABCABC' , 'cust2' , 'cust3' , 'cust4' , 'orgl1' , 'orgl2' , 'orgl3' , 'orgl4' , false , '' , 'cust6' , 'cust7' , 'cust8' );
INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000016', 'MASSNAHMEN' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'TPK Maßnahmen' , 'DOMAIN_B', 'TOPIC' , 'TPK Maßnahmen' , '' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
-- Workbaskets for sorting test
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000900', 'sort001' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'basxet0' , 'DOMAIN_A', 'TOPIC' , 'Lorem ipsum dolor sit amet.', 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000901', 'Sort002' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Basxet1' , 'DOMAIN_A', 'TOPIC' , 'Lorem ipsum dolor sit amet.', 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000902', 'sOrt003' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'bAsxet2' , 'DOMAIN_A', 'TOPIC' , 'Lorem ipsum dolor sit amet.', 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000903', 'soRt004' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'baSxet3' , 'DOMAIN_A', 'TOPIC' , 'Lorem ipsum dolor sit amet.', 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000904', 'sorT005' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'basXet4' , 'DOMAIN_A', 'TOPIC' , 'Lorem ipsum dolor sit amet.', 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000905', 'Sort006' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'basxEt5' , 'DOMAIN_A', 'TOPIC' , 'Lorem ipsum dolor sit amet.', 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000906', 'SOrt007' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'basxeT6' , 'DOMAIN_A', 'TOPIC' , 'Lorem ipsum dolor sit amet.', 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000907', 'SoRt008' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'BAsxet7' , 'DOMAIN_A', 'TOPIC' , 'Lorem ipsum dolor sit amet.', 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000908', 'SorT009' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'BaSxet8' , 'DOMAIN_A', 'TOPIC' , 'Lorem ipsum dolor sit amet.', 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000909', 'Sort010' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'BasXet9' , 'DOMAIN_A', 'TOPIC' , 'Lorem ipsum dolor sit amet.', 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000900', 'sort001' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'basxet0' , 'DOMAIN_A', 'TOPIC' , 'Lorem ipsum dolor sit amet.', 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000901', 'Sort002' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'Basxet1' , 'DOMAIN_A', 'TOPIC' , 'Lorem ipsum dolor sit amet.', 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000902', 'sOrt003' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'bAsxet2' , 'DOMAIN_A', 'TOPIC' , 'Lorem ipsum dolor sit amet.', 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000903', 'soRt004' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'baSxet3' , 'DOMAIN_A', 'TOPIC' , 'Lorem ipsum dolor sit amet.', 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000904', 'sorT005' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'basXet4' , 'DOMAIN_A', 'TOPIC' , 'Lorem ipsum dolor sit amet.', 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000905', 'Sort006' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'basxEt5' , 'DOMAIN_A', 'TOPIC' , 'Lorem ipsum dolor sit amet.', 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000906', 'SOrt007' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'basxeT6' , 'DOMAIN_A', 'TOPIC' , 'Lorem ipsum dolor sit amet.', 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000907', 'SoRt008' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'BAsxet7' , 'DOMAIN_A', 'TOPIC' , 'Lorem ipsum dolor sit amet.', 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000908', 'SorT009' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'BaSxet8' , 'DOMAIN_A', 'TOPIC' , 'Lorem ipsum dolor sit amet.', 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );
INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000909', 'Sort010' , RELATIVE_DATE(0) , RELATIVE_DATE(0) , 'BasXet9' , 'DOMAIN_A', 'TOPIC' , 'Lorem ipsum dolor sit amet.', 'user-1-3' , '' , '' , '' , '' , '' , '' , '' , '' , false , '' , '' , '' , '' );

4
common/taskana-common/src/main/resources/sql/db2/taskana-schema-db2.sql
View File

@ -66,6 +66,10 @@ CREATE TABLE WORKBASKET
ORG_LEVEL_3 VARCHAR(255) NULL,
ORG_LEVEL_4 VARCHAR(255) NULL,
MARKED_FOR_DELETION SMALLINT NOT NULL,
CUSTOM_5 VARCHAR(255) NULL,
CUSTOM_6 VARCHAR(255) NULL,
CUSTOM_7 VARCHAR(255) NULL,
CUSTOM_8 VARCHAR(255) NULL,
PRIMARY KEY (ID),
CONSTRAINT WB_KEY_DOMAIN UNIQUE (KEY, DOMAIN)
);

6
common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_6.2.0_to_6.4.0_db2.sql
View File

@ -10,3 +10,9 @@ CREATE TABLE PERMISSION_INFO
PERMISSION_ID VARCHAR(256) NOT NULL,
PRIMARY KEY (USER_ID, PERMISSION_ID)
);
ALTER TABLE WORKBASKET
ADD COLUMN CUSTOM_5 VARCHAR(255) NULL
ADD COLUMN CUSTOM_6 VARCHAR(255) NULL
ADD COLUMN CUSTOM_7 VARCHAR(255) NULL
ADD COLUMN CUSTOM_8 VARCHAR(255) NULL;

4
common/taskana-common/src/main/resources/sql/h2/taskana-schema-h2.sql
View File

@ -73,6 +73,10 @@ CREATE TABLE WORKBASKET
ORG_LEVEL_3 VARCHAR(255) NULL,
ORG_LEVEL_4 VARCHAR(255) NULL,
MARKED_FOR_DELETION SMALLINT NOT NULL,
CUSTOM_5 VARCHAR(255) NULL,
CUSTOM_6 VARCHAR(255) NULL,
CUSTOM_7 VARCHAR(255) NULL,
CUSTOM_8 VARCHAR(255) NULL,
PRIMARY KEY (ID),
CONSTRAINT WB_KEY_DOMAIN UNIQUE (KEY, DOMAIN)
);

8
common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_6.2.0_to_6.4.0_h2.sql
View File

@ -9,3 +9,11 @@ CREATE TABLE PERMISSION_INFO
PERMISSION_ID VARCHAR(256) NOT NULL,
PRIMARY KEY (USER_ID, PERMISSION_ID)
);
ALTER TABLE WORKBASKET
ADD (
`CUSTOM_5` VARCHAR(255) NULL,
`CUSTOM_6` VARCHAR(255) NULL,
`CUSTOM_7` VARCHAR(255) NULL,
`CUSTOM_8` VARCHAR(255) NULL
) AFTER `MARKED_FOR_DELETION`;

4
common/taskana-common/src/main/resources/sql/oracle/taskana-schema-oracle.sql
View File

@ -65,6 +65,10 @@ CREATE TABLE WORKBASKET
ORG_LEVEL_3 VARCHAR2(255) NULL,
ORG_LEVEL_4 VARCHAR2(255) NULL,
MARKED_FOR_DELETION NUMBER(1) NOT NULL CHECK (MARKED_FOR_DELETION IN (0,1)),
CUSTOM_5 VARCHAR2(255) NULL,
CUSTOM_6 VARCHAR2(255) NULL,
CUSTOM_7 VARCHAR2(255) NULL,
CUSTOM_8 VARCHAR2(255) NULL,
CONSTRAINT WORKBASKET_PKEY PRIMARY KEY (ID),
CONSTRAINT WB_KEY_DOMAIN UNIQUE (KEY, DOMAIN)
);

8
common/taskana-common/src/main/resources/sql/oracle/taskana_schema_update_6.2.0_to_6.4.0_oracle.sql
View File

@ -10,3 +10,11 @@ CREATE TABLE PERMISSION_INFO
PERMISSION_ID VARCHAR2(256) NOT NULL,
CONSTRAINT PERMISSION_INFO_PKEY PRIMARY KEY (USER_ID, PERMISSION_ID)
);
ALTER TABLE WORKBASKET
ADD (
CUSTOM_5 VARCHAR(255) NULL,
CUSTOM_6 VARCHAR(255) NULL,
CUSTOM_7 VARCHAR(255) NULL,
CUSTOM_8 VARCHAR(255) NULL
);

4
common/taskana-common/src/main/resources/sql/postgres/taskana-schema-postgres.sql
View File

@ -69,6 +69,10 @@ CREATE TABLE WORKBASKET
ORG_LEVEL_3 VARCHAR(255) NULL,
ORG_LEVEL_4 VARCHAR(255) NULL,
MARKED_FOR_DELETION BOOLEAN NOT NULL,
CUSTOM_5 VARCHAR(255) NULL,
CUSTOM_6 VARCHAR(255) NULL,
CUSTOM_7 VARCHAR(255) NULL,
CUSTOM_8 VARCHAR(255) NULL,
PRIMARY KEY (ID),
CONSTRAINT WB_KEY_DOMAIN UNIQUE (KEY, DOMAIN)
);

6
common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_6.2.0_to_6.4.0_postgres.sql
View File

@ -11,3 +11,9 @@ CREATE TABLE PERMISSION_INFO
PERMISSION_ID VARCHAR(256) NOT NULL,
PRIMARY KEY (USER_ID, PERMISSION_ID)
);
ALTER TABLE WORKBASKET
ADD COLUMN CUSTOM_5 VARCHAR(255) NULL,
ADD COLUMN CUSTOM_6 VARCHAR(255) NULL,
ADD COLUMN CUSTOM_7 VARCHAR(255) NULL,
ADD COLUMN CUSTOM_8 VARCHAR(255) NULL;

8
lib/taskana-core-test/src/test/java/acceptance/workbasket/get/GetWorkbasketAccTest.java
View File

@ -8,6 +8,10 @@ import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_1;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_2;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_3;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_4;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_5;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_6;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_7;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_8;
import java.util.List;
import java.util.stream.Stream;
@ -64,6 +68,10 @@ class GetWorkbasketAccTest {
.customAttribute(CUSTOM_2, "custom2")
.customAttribute(CUSTOM_3, "custom3")
.customAttribute(CUSTOM_4, "custom4")
.customAttribute(CUSTOM_5, "custom5")
.customAttribute(CUSTOM_6, "custom6")
.customAttribute(CUSTOM_7, "custom7")
.customAttribute(CUSTOM_8, "custom8")
.buildAndStoreAsSummary(workbasketService);
WorkbasketAccessItemBuilder.newWorkbasketAccessItem()

44
lib/taskana-core/src/main/java/pro/taskana/spi/history/api/events/workbasket/WorkbasketHistoryEvent.java
View File

@ -23,6 +23,10 @@ public class WorkbasketHistoryEvent {
protected String custom2;
protected String custom3;
protected String custom4;
protected String custom5;
protected String custom6;
protected String custom7;
protected String custom8;
protected String orgLevel1;
protected String orgLevel2;
protected String orgLevel3;
@ -45,6 +49,10 @@ public class WorkbasketHistoryEvent {
custom2 = workbasket.getCustomField(WorkbasketCustomField.CUSTOM_2);
custom3 = workbasket.getCustomField(WorkbasketCustomField.CUSTOM_3);
custom4 = workbasket.getCustomField(WorkbasketCustomField.CUSTOM_4);
custom5 = workbasket.getCustomField(WorkbasketCustomField.CUSTOM_5);
custom6 = workbasket.getCustomField(WorkbasketCustomField.CUSTOM_6);
custom7 = workbasket.getCustomField(WorkbasketCustomField.CUSTOM_7);
custom8 = workbasket.getCustomField(WorkbasketCustomField.CUSTOM_8);
orgLevel1 = workbasket.getOrgLevel1();
orgLevel2 = workbasket.getOrgLevel2();
orgLevel3 = workbasket.getOrgLevel3();
@ -65,6 +73,18 @@ public class WorkbasketHistoryEvent {
case CUSTOM_4:
custom4 = value;
break;
case CUSTOM_5:
custom5 = value;
break;
case CUSTOM_6:
custom6 = value;
break;
case CUSTOM_7:
custom7 = value;
break;
case CUSTOM_8:
custom8 = value;
break;
default:
throw new SystemException("Unknown customField '" + customField + "'");
}
@ -80,6 +100,14 @@ public class WorkbasketHistoryEvent {
return custom3;
case CUSTOM_4:
return custom4;
case CUSTOM_5:
return custom5;
case CUSTOM_6:
return custom6;
case CUSTOM_7:
return custom7;
case CUSTOM_8:
return custom8;
default:
throw new SystemException("Unknown customField '" + customField + "'");
}
@ -213,6 +241,10 @@ public class WorkbasketHistoryEvent {
custom2,
custom3,
custom4,
custom5,
custom6,
custom7,
custom8,
getOrgLevel1(),
getOrgLevel2(),
getOrgLevel3(),
@ -242,6 +274,10 @@ public class WorkbasketHistoryEvent {
&& Objects.equals(custom2, other.custom2)
&& Objects.equals(custom3, other.custom3)
&& Objects.equals(custom4, other.custom4)
&& Objects.equals(custom5, other.custom5)
&& Objects.equals(custom6, other.custom6)
&& Objects.equals(custom7, other.custom7)
&& Objects.equals(custom8, other.custom8)
&& Objects.equals(getOrgLevel1(), other.getOrgLevel1())
&& Objects.equals(getOrgLevel2(), other.getOrgLevel2())
&& Objects.equals(getOrgLevel3(), other.getOrgLevel3())
@ -277,6 +313,14 @@ public class WorkbasketHistoryEvent {
+ custom3
+ ", custom4="
+ custom4
+ ", custom5="
+ custom5
+ ", custom6="
+ custom6
+ ", custom7="
+ custom7
+ ", custom8="
+ custom8
+ ", orgLevel1="
+ orgLevel1
+ ", orgLevel2="

6
lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketCustomField.java
View File

@ -4,5 +4,9 @@ public enum WorkbasketCustomField {
CUSTOM_1,
CUSTOM_2,
CUSTOM_3,
CUSTOM_4
CUSTOM_4,
CUSTOM_5,
CUSTOM_6,
CUSTOM_7,
CUSTOM_8
}

24
lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketMapper.java
View File

@ -34,6 +34,10 @@ public interface WorkbasketMapper {
@Result(property = "orgLevel3", column = "ORG_LEVEL_3")
@Result(property = "orgLevel4", column = "ORG_LEVEL_4")
@Result(property = "markedForDeletion", column = "MARKED_FOR_DELETION")
@Result(property = "custom5", column = "CUSTOM_5")
@Result(property = "custom6", column = "CUSTOM_6")
@Result(property = "custom7", column = "CUSTOM_7")
@Result(property = "custom8", column = "CUSTOM_8")
WorkbasketImpl findById(@Param("id") String id);
@SelectProvider(type = WorkbasketSqlProvider.class, method = "findByKeyAndDomain")
@ -55,6 +59,10 @@ public interface WorkbasketMapper {
@Result(property = "orgLevel3", column = "ORG_LEVEL_3")
@Result(property = "orgLevel4", column = "ORG_LEVEL_4")
@Result(property = "markedForDeletion", column = "MARKED_FOR_DELETION")
@Result(property = "custom5", column = "CUSTOM_5")
@Result(property = "custom6", column = "CUSTOM_6")
@Result(property = "custom7", column = "CUSTOM_7")
@Result(property = "custom8", column = "CUSTOM_8")
WorkbasketImpl findByKeyAndDomain(@Param("key") String key, @Param("domain") String domain);
@SelectProvider(type = WorkbasketSqlProvider.class, method = "findDistributionTargets")
@ -73,6 +81,10 @@ public interface WorkbasketMapper {
@Result(property = "orgLevel2", column = "ORG_LEVEL_2")
@Result(property = "orgLevel3", column = "ORG_LEVEL_3")
@Result(property = "orgLevel4", column = "ORG_LEVEL_4")
@Result(property = "custom5", column = "CUSTOM_5")
@Result(property = "custom6", column = "CUSTOM_6")
@Result(property = "custom7", column = "CUSTOM_7")
@Result(property = "custom8", column = "CUSTOM_8")
List<WorkbasketSummaryImpl> findDistributionTargets(@Param("id") String id);
@SelectProvider(type = WorkbasketSqlProvider.class, method = "findDistributionSources")
@ -91,6 +103,10 @@ public interface WorkbasketMapper {
@Result(property = "orgLevel2", column = "ORG_LEVEL_2")
@Result(property = "orgLevel3", column = "ORG_LEVEL_3")
@Result(property = "orgLevel4", column = "ORG_LEVEL_4")
@Result(property = "custom5", column = "CUSTOM_5")
@Result(property = "custom6", column = "CUSTOM_6")
@Result(property = "custom7", column = "CUSTOM_7")
@Result(property = "custom8", column = "CUSTOM_8")
List<WorkbasketSummaryImpl> findDistributionSources(@Param("id") String id);
@SelectProvider(type = WorkbasketSqlProvider.class, method = "findSummaryById")
@ -109,6 +125,10 @@ public interface WorkbasketMapper {
@Result(property = "orgLevel2", column = "ORG_LEVEL_2")
@Result(property = "orgLevel3", column = "ORG_LEVEL_3")
@Result(property = "orgLevel4", column = "ORG_LEVEL_4")
@Result(property = "custom5", column = "CUSTOM_5")
@Result(property = "custom6", column = "CUSTOM_6")
@Result(property = "custom7", column = "CUSTOM_7")
@Result(property = "custom8", column = "CUSTOM_8")
List<WorkbasketSummaryImpl> findSummaryById(@Param("key") String id);
@SelectProvider(type = WorkbasketSqlProvider.class, method = "findAll")
@ -127,6 +147,10 @@ public interface WorkbasketMapper {
@Result(property = "orgLevel2", column = "ORG_LEVEL_2")
@Result(property = "orgLevel3", column = "ORG_LEVEL_3")
@Result(property = "orgLevel4", column = "ORG_LEVEL_4")
@Result(property = "custom5", column = "CUSTOM_5")
@Result(property = "custom6", column = "CUSTOM_6")
@Result(property = "custom7", column = "CUSTOM_7")
@Result(property = "custom8", column = "CUSTOM_8")
List<WorkbasketSummaryImpl> findAll();
@InsertProvider(type = WorkbasketSqlProvider.class, method = "insert")

80
lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryImpl.java
View File

@ -59,6 +59,14 @@ public class WorkbasketQueryImpl implements WorkbasketQuery {
private String[] custom3Like;
private String[] custom4In;
private String[] custom4Like;
private String[] custom5In;
private String[] custom5Like;
private String[] custom6In;
private String[] custom6Like;
private String[] custom7In;
private String[] custom7Like;
private String[] custom8In;
private String[] custom8Like;
private String[] orgLevel1In;
private String[] orgLevel1Like;
private String[] orgLevel2In;
@ -271,6 +279,18 @@ public class WorkbasketQueryImpl implements WorkbasketQuery {
case CUSTOM_4:
custom4In = searchArguments;
break;
case CUSTOM_5:
custom5In = searchArguments;
break;
case CUSTOM_6:
custom6In = searchArguments;
break;
case CUSTOM_7:
custom7In = searchArguments;
break;
case CUSTOM_8:
custom8In = searchArguments;
break;
default:
throw new SystemException("Unknown customField '" + customField + "'");
}
@ -293,6 +313,18 @@ public class WorkbasketQueryImpl implements WorkbasketQuery {
case CUSTOM_4:
custom4Like = toLowerCopy(searchArguments);
break;
case CUSTOM_5:
custom5Like = toLowerCopy(searchArguments);
break;
case CUSTOM_6:
custom6Like = toLowerCopy(searchArguments);
break;
case CUSTOM_7:
custom7Like = toLowerCopy(searchArguments);
break;
case CUSTOM_8:
custom8Like = toLowerCopy(searchArguments);
break;
default:
throw new SystemException("Unknown customField '" + customField + "'");
}
@ -512,6 +544,38 @@ public class WorkbasketQueryImpl implements WorkbasketQuery {
return custom4Like;
}
public String[] getCustom5In() {
return custom5In;
}
public String[] getCustom5Like() {
return custom5Like;
}
public String[] getCustom6In() {
return custom6In;
}
public String[] getCustom6Like() {
return custom6Like;
}
public String[] getCustom7In() {
return custom7In;
}
public String[] getCustom7Like() {
return custom7Like;
}
public String[] getCustom8In() {
return custom8In;
}
public String[] getCustom8Like() {
return custom8Like;
}
public String[] getOrgLevel1In() {
return orgLevel1In;
}
@ -702,6 +766,22 @@ public class WorkbasketQueryImpl implements WorkbasketQuery {
+ Arrays.toString(custom4In)
+ ", custom4Like="
+ Arrays.toString(custom4Like)
+ ", custom5In="
+ Arrays.toString(custom5In)
+ ", custom5Like="
+ Arrays.toString(custom5Like)
+ ", custom6In="
+ Arrays.toString(custom6In)
+ ", custom6Like="
+ Arrays.toString(custom6Like)
+ ", custom7In="
+ Arrays.toString(custom7In)
+ ", custom7Like="
+ Arrays.toString(custom7Like)
+ ", custom8In="
+ Arrays.toString(custom8In)
+ ", custom8Like="
+ Arrays.toString(custom8Like)
+ ", orgLevel1In="
+ Arrays.toString(orgLevel1In)
+ ", orgLevel1Like="

31
lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryMapper.java
View File

@ -14,7 +14,7 @@ public interface WorkbasketQueryMapper {
@Select(
"<script>"
+ "SELECT DISTINCT "
+ "w.ID, w.KEY, w.NAME, w.DOMAIN, W.TYPE, w.DESCRIPTION, w.OWNER, w.CUSTOM_1, w.CUSTOM_2, w.CUSTOM_3, w.CUSTOM_4, w.ORG_LEVEL_1, w.ORG_LEVEL_2, w.ORG_LEVEL_3, w.ORG_LEVEL_4, w.MARKED_FOR_DELETION from WORKBASKET w "
+ "w.ID, w.KEY, w.NAME, w.DOMAIN, W.TYPE, w.DESCRIPTION, w.OWNER, w.CUSTOM_1, w.CUSTOM_2, w.CUSTOM_3, w.CUSTOM_4, w.ORG_LEVEL_1, w.ORG_LEVEL_2, w.ORG_LEVEL_3, w.ORG_LEVEL_4, w.MARKED_FOR_DELETION, w.CUSTOM_5, w.CUSTOM_6, w.CUSTOM_7, w.CUSTOM_8 from WORKBASKET w "
+ "<if test = 'joinWithAccessList'> "
+ "<choose>"
+ "<when test=\"_databaseId == 'db2' || _databaseId == 'oracle'\">"
@ -56,6 +56,14 @@ public interface WorkbasketQueryMapper {
+ "<if test='custom3Like != null'>AND (<foreach item='item' collection='custom3Like' separator=' OR ' >LOWER(w.CUSTOM_3) LIKE #{item}</foreach>)</if> "
+ "<if test='custom4In != null'>AND w.CUSTOM_4 IN(<foreach item='item' collection='custom4In' separator=',' >#{item}</foreach>)</if> "
+ "<if test='custom4Like != null'>AND (<foreach item='item' collection='custom4Like' separator=' OR ' >LOWER(w.CUSTOM_4) LIKE #{item}</foreach>)</if> "
+ "<if test='custom5In != null'>AND w.CUSTOM_5 IN(<foreach item='item' collection='custom5In' separator=',' >#{item}</foreach>)</if> "
+ "<if test='custom5Like != null'>AND (<foreach item='item' collection='custom5Like' separator=' OR ' >LOWER(w.CUSTOM_5) LIKE #{item}</foreach>)</if> "
+ "<if test='custom6In != null'>AND w.CUSTOM_6 IN(<foreach item='item' collection='custom6In' separator=',' >#{item}</foreach>)</if> "
+ "<if test='custom6Like != null'>AND (<foreach item='item' collection='custom6Like' separator=' OR ' >LOWER(w.CUSTOM_6) LIKE #{item}</foreach>)</if> "
+ "<if test='custom7In != null'>AND w.CUSTOM_7 IN(<foreach item='item' collection='custom7In' separator=',' >#{item}</foreach>)</if> "
+ "<if test='custom7Like != null'>AND (<foreach item='item' collection='custom7Like' separator=' OR ' >LOWER(w.CUSTOM_7) LIKE #{item}</foreach>)</if> "
+ "<if test='custom8In != null'>AND w.CUSTOM_8 IN(<foreach item='item' collection='custom8In' separator=',' >#{item}</foreach>)</if> "
+ "<if test='custom8Like != null'>AND (<foreach item='item' collection='custom8Like' separator=' OR ' >LOWER(w.CUSTOM_8) LIKE #{item}</foreach>)</if> "
+ "<if test='orgLevel1In != null'>AND w.ORG_LEVEL_1 IN(<foreach item='item' collection='orgLevel1In' separator=',' >#{item}</foreach>)</if> "
+ "<if test='orgLevel1Like != null'>AND (<foreach item='item' collection='orgLevel1Like' separator=' OR ' >LOWER(w.ORG_LEVEL_1) LIKE #{item}</foreach>)</if> "
+ "<if test='orgLevel2In != null'>AND w.ORG_LEVEL_2 IN(<foreach item='item' collection='orgLevel2In' separator=',' >#{item}</foreach>)</if> "
@ -115,6 +123,10 @@ public interface WorkbasketQueryMapper {
@Result(property = "orgLevel3", column = "ORG_LEVEL_3")
@Result(property = "orgLevel4", column = "ORG_LEVEL_4")
@Result(property = "markedForDeletion", column = "MARKED_FOR_DELETION")
@Result(property = "custom5", column = "CUSTOM_5")
@Result(property = "custom6", column = "CUSTOM_6")
@Result(property = "custom7", column = "CUSTOM_7")
@Result(property = "custom8", column = "CUSTOM_8")
List<WorkbasketSummaryImpl> queryWorkbasketSummaries(WorkbasketQueryImpl workbasketQuery);
@Select(
@ -205,6 +217,14 @@ public interface WorkbasketQueryMapper {
+ "<if test='custom3Like != null'>AND (<foreach item='item' collection='custom3Like' separator=' OR ' >LOWER(w.CUSTOM_3) LIKE #{item}</foreach>)</if> "
+ "<if test='custom4In != null'>AND LOWER(w.CUSTOM_4) IN(<foreach item='item' collection='custom4In' separator=',' >#{item}</foreach>)</if> "
+ "<if test='custom4Like != null'>AND (<foreach item='item' collection='custom4Like' separator=' OR ' >LOWER(w.CUSTOM_4) LIKE #{item}</foreach>)</if> "
+ "<if test='custom5In != null'>AND LOWER(w.CUSTOM_5) IN(<foreach item='item' collection='custom5In' separator=',' >#{item}</foreach>)</if> "
+ "<if test='custom5Like != null'>AND (<foreach item='item' collection='custom5Like' separator=' OR ' >LOWER(w.CUSTOM_5) LIKE #{item}</foreach>)</if> "
+ "<if test='custom6In != null'>AND LOWER(w.CUSTOM_6) IN(<foreach item='item' collection='custom6In' separator=',' >#{item}</foreach>)</if> "
+ "<if test='custom6Like != null'>AND (<foreach item='item' collection='custom6Like' separator=' OR ' >LOWER(w.CUSTOM_6) LIKE #{item}</foreach>)</if> "
+ "<if test='custom7In != null'>AND LOWER(w.CUSTOM_7) IN(<foreach item='item' collection='custom7In' separator=',' >#{item}</foreach>)</if> "
+ "<if test='custom7Like != null'>AND (<foreach item='item' collection='custom7Like' separator=' OR ' >LOWER(w.CUSTOM_7) LIKE #{item}</foreach>)</if> "
+ "<if test='custom8In != null'>AND LOWER(w.CUSTOM_8) IN(<foreach item='item' collection='custom8In' separator=',' >#{item}</foreach>)</if> "
+ "<if test='custom8Like != null'>AND (<foreach item='item' collection='custom8Like' separator=' OR ' >LOWER(w.CUSTOM_8) LIKE #{item}</foreach>)</if> "
+ "<if test='orgLevel1In != null'>AND LOWER(w.ORG_LEVEL_1) IN(<foreach item='item' collection='orgLevel1In' separator=',' >#{item}</foreach>)</if> "
+ "<if test='orgLevel1Like != null'>AND (<foreach item='item' collection='orgLevel1Like' separator=' OR ' >LOWER(w.ORG_LEVEL_1) LIKE #{item}</foreach>)</if> "
+ "<if test='orgLevel2In != null'>AND LOWER(w.ORG_LEVEL_2) IN(<foreach item='item' collection='orgLevel2In' separator=',' >#{item}</foreach>)</if> "
@ -299,10 +319,19 @@ public interface WorkbasketQueryMapper {
+ "<if test='custom1In != null'>AND w.CUSTOM_1 IN(<foreach item='item' collection='custom1In' separator=',' >#{item}</foreach>)</if> "
+ "<if test='custom1Like != null'>AND (<foreach item='item' collection='custom1Like' separator=' OR ' >LOWER(w.CUSTOM_1) LIKE #{item}</foreach>)</if> "
+ "<if test='custom2In != null'>AND w.CUSTOM_2 IN(<foreach item='item' collection='custom2In' separator=',' >#{item}</foreach>)</if> "
+ "<if test='custom2Like != null'>AND (<foreach item='item' collection='custom2Like' separator=' OR ' >LOWER(w.CUSTOM_2) LIKE #{item}</foreach>)</if> "
+ "<if test='custom3In != null'>AND w.CUSTOM_3 IN(<foreach item='item' collection='custom3In' separator=',' >#{item}</foreach>)</if> "
+ "<if test='custom3Like != null'>AND (<foreach item='item' collection='custom3Like' separator=' OR ' >LOWER(w.CUSTOM_3) LIKE #{item}</foreach>)</if> "
+ "<if test='custom4In != null'>AND w.CUSTOM_4 IN(<foreach item='item' collection='custom4In' separator=',' >#{item}</foreach>)</if> "
+ "<if test='custom4Like != null'>AND (<foreach item='item' collection='custom4Like' separator=' OR ' >LOWER(w.CUSTOM_4) LIKE #{item}</foreach>)</if> "
+ "<if test='custom5In != null'>AND w.CUSTOM_5 IN(<foreach item='item' collection='custom5In' separator=',' >#{item}</foreach>)</if> "
+ "<if test='custom5Like != null'>AND (<foreach item='item' collection='custom5Like' separator=' OR ' >LOWER(w.CUSTOM_5) LIKE #{item}</foreach>)</if> "
+ "<if test='custom6In != null'>AND w.CUSTOM_6 IN(<foreach item='item' collection='custom6In' separator=',' >#{item}</foreach>)</if> "
+ "<if test='custom6Like != null'>AND (<foreach item='item' collection='custom6Like' separator=' OR ' >LOWER(w.CUSTOM_6) LIKE #{item}</foreach>)</if> "
+ "<if test='custom7In != null'>AND w.CUSTOM_7 IN(<foreach item='item' collection='custom7In' separator=',' >#{item}</foreach>)</if> "
+ "<if test='custom7Like != null'>AND (<foreach item='item' collection='custom7Like' separator=' OR ' >LOWER(w.CUSTOM_7) LIKE #{item}</foreach>)</if> "
+ "<if test='custom8In != null'>AND w.CUSTOM_8 IN(<foreach item='item' collection='custom8In' separator=',' >#{item}</foreach>)</if> "
+ "<if test='custom8Like != null'>AND (<foreach item='item' collection='custom8Like' separator=' OR ' >LOWER(w.CUSTOM_8) LIKE #{item}</foreach>)</if> "
+ "<if test='orgLevel1In != null'>AND w.ORG_LEVEL_1 IN(<foreach item='item' collection='orgLevel1In' separator=',' >#{item}</foreach>)</if> "
+ "<if test='orgLevel1Like != null'>AND (<foreach item='item' collection='orgLevel1Like' separator=' OR ' >LOWER(w.ORG_LEVEL_1) LIKE #{item}</foreach>)</if> "
+ "<if test='orgLevel2In != null'>AND w.ORG_LEVEL_2 IN(<foreach item='item' collection='orgLevel2In' separator=',' >#{item}</foreach>)</if> "

6
lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketSqlProvider.java
View File

@ -30,7 +30,11 @@ public class WorkbasketSqlProvider {
Pair.of("ORG_LEVEL_2", "#{workbasket.orgLevel2}"),
Pair.of("ORG_LEVEL_3", "#{workbasket.orgLevel3}"),
Pair.of("ORG_LEVEL_4", "#{workbasket.orgLevel4}"),
Pair.of("MARKED_FOR_DELETION", "#{workbasket.markedForDeletion}"));
Pair.of("MARKED_FOR_DELETION", "#{workbasket.markedForDeletion}"),
Pair.of("CUSTOM_5", "#{workbasket.custom5}"),
Pair.of("CUSTOM_6", "#{workbasket.custom6}"),
Pair.of("CUSTOM_7", "#{workbasket.custom7}"),
Pair.of("CUSTOM_8", "#{workbasket.custom8}"));
private WorkbasketSqlProvider() {}

28
lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/models/WorkbasketImpl.java
View File

@ -44,6 +44,18 @@ public class WorkbasketImpl extends WorkbasketSummaryImpl implements Workbasket
case CUSTOM_4:
custom4 = value;
break;
case CUSTOM_5:
custom5 = value;
break;
case CUSTOM_6:
custom6 = value;
break;
case CUSTOM_7:
custom7 = value;
break;
case CUSTOM_8:
custom8 = value;
break;
default:
throw new SystemException("Unknown customField '" + customField + "'");
}
@ -86,6 +98,10 @@ public class WorkbasketImpl extends WorkbasketSummaryImpl implements Workbasket
result.setCustom2(this.getCustom2());
result.setCustom3(this.getCustom3());
result.setCustom4(this.getCustom4());
result.setCustom5(this.getCustom5());
result.setCustom6(this.getCustom6());
result.setCustom7(this.getCustom7());
result.setCustom8(this.getCustom8());
result.setOrgLevel1(this.getOrgLevel1());
result.setOrgLevel2(this.getOrgLevel2());
result.setOrgLevel3(this.getOrgLevel3());
@ -115,6 +131,10 @@ public class WorkbasketImpl extends WorkbasketSummaryImpl implements Workbasket
custom2,
custom3,
custom4,
custom5,
custom6,
custom7,
custom8,
orgLevel1,
orgLevel2,
orgLevel3,
@ -168,6 +188,14 @@ public class WorkbasketImpl extends WorkbasketSummaryImpl implements Workbasket
+ custom3
+ ", custom4="
+ custom4
+ ", custom5="
+ custom5
+ ", custom6="
+ custom6
+ ", custom7="
+ custom7
+ ", custom8="
+ custom8
+ ", orgLevel1="
+ orgLevel1
+ ", orgLevel2="

64
lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/models/WorkbasketSummaryImpl.java
View File

@ -20,6 +20,10 @@ public class WorkbasketSummaryImpl implements WorkbasketSummary {
protected String custom2;
protected String custom3;
protected String custom4;
protected String custom5;
protected String custom6;
protected String custom7;
protected String custom8;
protected String orgLevel1;
protected String orgLevel2;
protected String orgLevel3;
@ -38,6 +42,10 @@ public class WorkbasketSummaryImpl implements WorkbasketSummary {
custom2 = copyFrom.custom2;
custom3 = copyFrom.custom3;
custom4 = copyFrom.custom4;
custom5 = copyFrom.custom5;
custom6 = copyFrom.custom6;
custom7 = copyFrom.custom7;
custom8 = copyFrom.custom8;
orgLevel1 = copyFrom.orgLevel1;
orgLevel2 = copyFrom.orgLevel2;
orgLevel3 = copyFrom.orgLevel3;
@ -125,6 +133,14 @@ public class WorkbasketSummaryImpl implements WorkbasketSummary {
return custom3;
case CUSTOM_4:
return custom4;
case CUSTOM_5:
return custom5;
case CUSTOM_6:
return custom6;
case CUSTOM_7:
return custom7;
case CUSTOM_8:
return custom8;
default:
throw new SystemException("Unknown customField '" + customField + "'");
}
@ -212,6 +228,38 @@ public class WorkbasketSummaryImpl implements WorkbasketSummary {
this.custom4 = custom4 == null ? null : custom4.trim();
}
public String getCustom5() {
return custom5;
}
public void setCustom5(String custom5) {
this.custom5 = custom5 == null ? null : custom5.trim();
}
public String getCustom6() {
return custom6;
}
public void setCustom6(String custom6) {
this.custom6 = custom6 == null ? null : custom6.trim();
}
public String getCustom7() {
return custom7;
}
public void setCustom7(String custom7) {
this.custom7 = custom7 == null ? null : custom7.trim();
}
public String getCustom8() {
return custom8;
}
public void setCustom8(String custom8) {
this.custom8 = custom8 == null ? null : custom8.trim();
}
protected boolean canEqual(Object other) {
return (other instanceof WorkbasketSummaryImpl);
}
@ -230,6 +278,10 @@ public class WorkbasketSummaryImpl implements WorkbasketSummary {
custom2,
custom3,
custom4,
custom5,
custom6,
custom7,
custom8,
orgLevel1,
orgLevel2,
orgLevel3,
@ -261,6 +313,10 @@ public class WorkbasketSummaryImpl implements WorkbasketSummary {
&& Objects.equals(custom2, other.custom2)
&& Objects.equals(custom3, other.custom3)
&& Objects.equals(custom4, other.custom4)
&& Objects.equals(custom5, other.custom5)
&& Objects.equals(custom6, other.custom6)
&& Objects.equals(custom7, other.custom7)
&& Objects.equals(custom8, other.custom8)
&& Objects.equals(orgLevel1, other.orgLevel1)
&& Objects.equals(orgLevel2, other.orgLevel2)
&& Objects.equals(orgLevel3, other.orgLevel3)
@ -291,6 +347,14 @@ public class WorkbasketSummaryImpl implements WorkbasketSummary {
+ custom3
+ ", custom4="
+ custom4
+ ", custom5="
+ custom5
+ ", custom6="
+ custom6
+ ", custom7="
+ custom7
+ ", custom8="
+ custom8
+ ", orgLevel1="
+ orgLevel1
+ ", orgLevel2="

12
lib/taskana-core/src/test/java/acceptance/workbasket/WorkbasketModelsCloneTest.java
View File

@ -5,6 +5,10 @@ import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_1;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_2;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_3;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_4;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_5;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_6;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_7;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_8;
import org.junit.jupiter.api.Test;
import pro.taskana.workbasket.api.WorkbasketPermission;
@ -22,6 +26,10 @@ class WorkbasketModelsCloneTest {
dummyWorkbasketForSummaryTest.setCustomField(CUSTOM_2, "dummyCustom2");
dummyWorkbasketForSummaryTest.setCustomField(CUSTOM_3, "dummyCustom3");
dummyWorkbasketForSummaryTest.setCustomField(CUSTOM_4, "dummyCustom4");
dummyWorkbasketForSummaryTest.setCustomField(CUSTOM_5, "dummyCustom5");
dummyWorkbasketForSummaryTest.setCustomField(CUSTOM_6, "dummyCustom6");
dummyWorkbasketForSummaryTest.setCustomField(CUSTOM_7, "dummyCustom7");
dummyWorkbasketForSummaryTest.setCustomField(CUSTOM_8, "dummyCustom8");
dummyWorkbasketForSummaryTest.setDescription("dummyDescription");
dummyWorkbasketForSummaryTest.setMarkedForDeletion(false);
dummyWorkbasketForSummaryTest.setName("dummyName");
@ -51,6 +59,10 @@ class WorkbasketModelsCloneTest {
dummyWorkbasket.setCustom2("dummyCustom2");
dummyWorkbasket.setCustom3("dummyCustom3");
dummyWorkbasket.setCustom4("dummyCustom4");
dummyWorkbasket.setCustom5("dummyCustom5");
dummyWorkbasket.setCustom6("dummyCustom6");
dummyWorkbasket.setCustom7("dummyCustom7");
dummyWorkbasket.setCustom8("dummyCustom8");
dummyWorkbasket.setDescription("dummyDescription");
dummyWorkbasket.setMarkedForDeletion(false);
dummyWorkbasket.setName("dummyName");

43
lib/taskana-core/src/test/java/acceptance/workbasket/create/CreateWorkbasketAccTest.java
View File

@ -14,6 +14,7 @@ import pro.taskana.common.api.exceptions.InvalidArgumentException;
import pro.taskana.common.api.exceptions.NotAuthorizedException;
import pro.taskana.common.test.security.JaasExtension;
import pro.taskana.common.test.security.WithAccessId;
import pro.taskana.workbasket.api.WorkbasketCustomField;
import pro.taskana.workbasket.api.WorkbasketPermission;
import pro.taskana.workbasket.api.WorkbasketService;
import pro.taskana.workbasket.api.WorkbasketType;
@ -57,6 +58,48 @@ class CreateWorkbasketAccTest extends AbstractAccTest {
assertThat(createdWorkbasket2).isEqualTo(createdWorkbasket);
}
@WithAccessId(user = "businessadmin")
@Test
void should_CreateWorkbasketWithCustomValues() throws Exception {
WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
Workbasket workbasket = workbasketService.newWorkbasket("NT2345", "DOMAIN_A");
workbasket.setName("Megabasket");
workbasket.setType(WorkbasketType.GROUP);
workbasket.setOrgLevel1("company");
workbasket.setCustomField(WorkbasketCustomField.CUSTOM_1, "custom1");
workbasket.setCustomField(WorkbasketCustomField.CUSTOM_2, "custom2");
workbasket.setCustomField(WorkbasketCustomField.CUSTOM_3, "custom3");
workbasket.setCustomField(WorkbasketCustomField.CUSTOM_4, "custom4");
workbasket.setCustomField(WorkbasketCustomField.CUSTOM_5, "custom5");
workbasket.setCustomField(WorkbasketCustomField.CUSTOM_6, "custom6");
workbasket.setCustomField(WorkbasketCustomField.CUSTOM_7, "custom7");
workbasket.setCustomField(WorkbasketCustomField.CUSTOM_8, "custom8");
workbasket = workbasketService.createWorkbasket(workbasket);
WorkbasketAccessItem wbai =
workbasketService.newWorkbasketAccessItem(workbasket.getId(), "user-1-2");
wbai.setPermission(WorkbasketPermission.READ, true);
workbasketService.createWorkbasketAccessItem(wbai);
Workbasket receivedWorkbasket = workbasketService.getWorkbasket(workbasket.getId());
assertThat(receivedWorkbasket.getCustomField(WorkbasketCustomField.CUSTOM_1))
.isEqualTo("custom1");
assertThat(receivedWorkbasket.getCustomField(WorkbasketCustomField.CUSTOM_2))
.isEqualTo("custom2");
assertThat(receivedWorkbasket.getCustomField(WorkbasketCustomField.CUSTOM_3))
.isEqualTo("custom3");
assertThat(receivedWorkbasket.getCustomField(WorkbasketCustomField.CUSTOM_4))
.isEqualTo("custom4");
assertThat(receivedWorkbasket.getCustomField(WorkbasketCustomField.CUSTOM_5))
.isEqualTo("custom5");
assertThat(receivedWorkbasket.getCustomField(WorkbasketCustomField.CUSTOM_6))
.isEqualTo("custom6");
assertThat(receivedWorkbasket.getCustomField(WorkbasketCustomField.CUSTOM_7))
.isEqualTo("custom7");
assertThat(receivedWorkbasket.getCustomField(WorkbasketCustomField.CUSTOM_8))
.isEqualTo("custom8");
}
@WithAccessId(user = "user-1-1")
@WithAccessId(user = "taskadmin")
@TestTemplate

186
lib/taskana-core/src/test/java/acceptance/workbasket/query/QueryWorkbasketAccTest.java
View File

@ -33,7 +33,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "teamlead-1")
@Test
void testQueryAllForUserMultipleTimes() {
void should_QueryAllMultipleTimes_When_UserIsTeamlead1() {
WorkbasketQuery query = WORKBASKET_SERVICE.createWorkbasketQuery();
int count = (int) query.count();
assertThat(count).isEqualTo(4);
@ -45,7 +45,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "businessadmin")
@Test
void testQueryAllForBusinessAdminMultipleTimes() {
void should_QueryAllMultipleTimes_When_UserIsBusinessAdmin() {
WorkbasketQuery query = WORKBASKET_SERVICE.createWorkbasketQuery();
int count = (int) query.count();
assertThat(count).isEqualTo(26);
@ -57,7 +57,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "admin")
@Test
void testQueryAllForAdminMultipleTimes() {
void should_QueryAllMultipleTimes_When_UserIsAdmin() {
WorkbasketQuery query = WORKBASKET_SERVICE.createWorkbasketQuery();
int count = (int) query.count();
assertThat(count).isEqualTo(26);
@ -69,7 +69,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "teamlead-1", groups = GROUP_1_DN)
@Test
void testQueryWorkbasketValuesForColumnName() {
void should_QueryWorkbasketValues_When_ColumnIsName() {
List<String> columnValueList =
WORKBASKET_SERVICE.createWorkbasketQuery().listValues(NAME, null);
assertThat(columnValueList).hasSize(10);
@ -85,7 +85,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "teamlead-1", groups = GROUP_1_DN)
@Test
void testQueryWorkbasketByDomain() {
void should_ApplyFilter_When_QueryingForDomainIn() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().domainIn("DOMAIN_B").list();
assertThat(results).hasSize(1);
@ -93,7 +93,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "teamlead-1", groups = GROUP_1_DN)
@Test
void testQueryWorkbasketByDomainAndType() {
void should_ApplyFilter_When_QueryingForDomainInAndTypeIn() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
@ -129,7 +129,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "teamlead-1", groups = GROUP_1_DN)
@Test
void testQueryWorkbasketByNameStartsWith() {
void should_ApplyFilter_When_QueryingForNameStartsWith() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().nameLike("%Gruppenpostkorb KSC%").list();
assertThat(results).hasSize(3);
@ -137,7 +137,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "teamlead-1", groups = GROUP_1_DN)
@Test
void testQueryWorkbasketByNameContains() {
void should_ApplyFilter_When_QueryingForNameContains() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
@ -148,7 +148,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "teamlead-1", groups = GROUP_1_DN)
@Test
void testQueryWorkbasketByNameContainsCaseInsensitive() {
void should_ApplyFilter_When_QueryingForNameContainsCaseInsensitive() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().nameLike("%TEAMLEAD%").list();
assertThat(results).hasSize(2);
@ -156,7 +156,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "teamlead-1", groups = GROUP_1_DN)
@Test
void testQueryWorkbasketByDescription() {
void should_ApplyFilter_When_QueryingForDescriptionLike() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
@ -169,7 +169,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "teamlead-1", groups = GROUP_1_DN)
@Test
void testQueryWorkbasketByOwnerLike() {
void should_ApplyFilter_When_QueryingForOwnerLike() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
@ -181,7 +181,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "teamlead-1", groups = GROUP_1_DN)
@Test
void testQueryWorkbasketByKey() {
void should_QuerySingleWb_When_UsingKeyIn() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().keyIn("GPK_KSC").list();
assertThat(results).hasSize(1);
@ -189,7 +189,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "teamlead-1", groups = GROUP_1_DN)
@Test
void testQueryWorkbasketByMultipleKeys() {
void should_QueryMultipleWbs_When_UsingKeyIn() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().keyIn("GPK_KSC_1", "GPK_KSC").list();
assertThat(results).hasSize(2);
@ -197,7 +197,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "teamlead-1", groups = GROUP_1_DN)
@Test
void testQueryWorkbasketByMultipleKeysWithUnknownKey() {
void should_QueryMultipleWbs_When_UsingKeyInWithUnknownKey() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
@ -208,7 +208,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "teamlead-1", groups = GROUP_1_DN)
@Test
void testQueryWorkbasketByKeyContains() {
void should_QueryByKeyContains_When_UsingKeyIn() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().keyLike("%KSC%").list();
assertThat(results).hasSize(3);
@ -216,7 +216,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "teamlead-1", groups = GROUP_1_DN)
@Test
void testQueryWorkbasketByKeyContainsIgnoreCase() {
void should_QueryByKeyContainsIgnoreCase_When_UsingKeyIn() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().keyLike("%kSc%").list();
assertThat(results).hasSize(3);
@ -224,7 +224,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "teamlead-1", groups = GROUP_1_DN)
@Test
void testQueryWorkbasketByKeyOrNameContainsIgnoreCase() {
void should_QueryByKeyOrNameContainsIgnoreCase_When_UsingKeyIn() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().keyOrNameLike("%kSc%").list();
assertThat(results).hasSize(9);
@ -232,7 +232,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "teamlead-1", groups = GROUP_1_DN)
@Test
void testQueryWorkbasketByNameStartsWithSortedByNameAscending() {
void should_QueryByNameStartsWithSortedByNameAscending_When_UsingNameLike() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
@ -247,7 +247,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "user-b-1")
@Test
void testQueryWorkbasketByNameStartsWithSortedByNameDescending() {
void should_QueryByNameStartsWithSortedByNameDescending_When_UsingNameLike() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
@ -262,7 +262,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "user-b-1")
@Test
void testQueryWorkbasketByNameStartsWithSortedByKeyAscending() {
void should_QueryByNameStartsWithSortedByKeyAscending_When_UsingNameLike() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().nameLike("basxet%").orderByKey(ASCENDING).list();
assertThat(results)
@ -273,7 +273,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "user-b-1")
@Test
void testQueryWorkbasketByNameStartsWithSortedByKeyDescending() {
void should_QueryByNameStartsWithSortedByKeyDescending_When_UsingNameLike() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
@ -288,7 +288,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "teamlead-1", groups = GROUP_1_DN)
@Test
void testQueryWorkbasketByCreated() {
void should_ApplyFilter_When_QueryingForCreatedWithin() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().createdWithin(toDaysInterval()).list();
assertThat(results).hasSize(9);
@ -296,7 +296,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "teamlead-1", groups = GROUP_1_DN)
@Test
void testQueryWorkbasketByModified() {
void should_ApplyFilter_When_QueryingForModifiedWithinW() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().modifiedWithin(toDaysInterval()).list();
assertThat(results).hasSize(9);
@ -304,7 +304,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "admin")
@Test
void testQueryWorkbasketByAdmin() throws Exception {
void should_QueryWorkbaskets_When_UserIsAdmin() throws Exception {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().nameLike("%").orderByName(DESCENDING).list();
assertThat(results)
@ -326,7 +326,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "teamlead-1", groups = GROUP_1_DN)
@Test
void testQueryWorkbasketByDomainLike() {
void should_ApplyFilter_When_QueryingForDomainLike() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
@ -351,7 +351,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "admin")
@Test
void testQueryWorkbasketByOwnerInOrderByDomainDesc() {
void should_ApplyFilter_When_QueryingForOwnerInOrderByDomainDesc() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
@ -366,7 +366,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "teamlead-1")
@Test
void testQueryForCustom1In() {
void should_ApplyFilter_When_QueryingForCustom1In() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
@ -380,7 +380,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "admin")
@Test
void testQueryForCustom1Like() {
void should_ApplyFilter_When_QueryingForCustom1Like() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
@ -391,7 +391,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "admin")
@Test
void testQueryForCustom2In() {
void should_ApplyFilter_When_QueryingForCustom2In() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
@ -402,7 +402,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "admin")
@Test
void testQueryForCustom2Like() {
void should_ApplyFilter_When_QueryingForCustom2Like() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
@ -413,7 +413,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "admin")
@Test
void testQueryForCustom3In() {
void should_ApplyFilter_When_QueryingForCustom3In() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
@ -424,7 +424,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "admin")
@Test
void testQueryForCustom3Like() {
void should_ApplyFilter_When_QueryingForCustom3Like() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
@ -435,7 +435,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "admin")
@Test
void testQueryForCustom4In() {
void should_ApplyFilter_When_QueryingForCustom4In() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
@ -446,7 +446,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "admin")
@Test
void testQueryForCustom4Like() {
void should_ApplyFilter_When_QueryingForCustom4Like() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
@ -457,7 +457,101 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "admin")
@Test
void testQueryForOrgLevl1In() {
void should_ApplyFilter_When_QueryingForCustom5In() throws Exception {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
.customAttributeIn(WorkbasketCustomField.CUSTOM_5, "custom5")
.list();
assertThat(results).hasSize(1);
}
@WithAccessId(user = "admin")
@Test
void should_ApplyFilter_When_QueryingForCustom5Like() throws Exception {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
.customAttributeLike(WorkbasketCustomField.CUSTOM_5, "custo%")
.list();
assertThat(results).hasSize(1);
}
@WithAccessId(user = "admin")
@Test
void should_ApplyFilter_When_QueryingForCustom6In() throws Exception {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
.customAttributeIn(WorkbasketCustomField.CUSTOM_6, "custom6")
.list();
assertThat(results).hasSize(1);
}
@WithAccessId(user = "admin")
@Test
void should_ApplyFilter_When_QueryingForCustom6Like() throws Exception {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
.customAttributeLike(WorkbasketCustomField.CUSTOM_6, "cust%")
.list();
assertThat(results).hasSize(2);
}
@WithAccessId(user = "admin")
@Test
void should_ApplyFilter_When_QueryingForCustom7In() throws Exception {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
.customAttributeIn(WorkbasketCustomField.CUSTOM_7, "custom7")
.list();
assertThat(results).hasSize(1);
}
@WithAccessId(user = "admin")
@Test
void should_ApplyFilter_When_QueryingForCustom7Like() throws Exception {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
.customAttributeLike(WorkbasketCustomField.CUSTOM_7, "cust%")
.list();
assertThat(results).hasSize(2);
}
@WithAccessId(user = "admin")
@Test
void should_ApplyFilter_When_QueryingForCustom8In() throws Exception {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
.customAttributeIn(WorkbasketCustomField.CUSTOM_8, "custom8")
.list();
assertThat(results).hasSize(1);
}
@WithAccessId(user = "admin")
@Test
void should_ApplyFilter_When_QueryingForCustom8Like() throws Exception {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE
.createWorkbasketQuery()
.customAttributeLike(WorkbasketCustomField.CUSTOM_8, "cust%")
.list();
assertThat(results).hasSize(3);
}
@WithAccessId(user = "admin")
@Test
void should_ApplyFilter_When_QueryingForOrgLevel1In() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().orgLevel1In("orgl1", "").list();
assertThat(results).hasSize(25);
@ -465,7 +559,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "admin")
@Test
void testQueryForOrgLevel1Like() {
void should_ApplyFilter_When_QueryingForOrgLevel1Like() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().orgLevel1Like("%1").list();
assertThat(results).hasSize(2);
@ -473,7 +567,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "admin")
@Test
void testQueryForOrgLevel2In() {
void should_ApplyFilter_When_QueryingForOrgLevel2In() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().orgLevel2In("abteilung").list();
assertThat(results).hasSize(1);
@ -481,7 +575,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "admin")
@Test
void testQueryForOrgLevel2Like() {
void should_ApplyFilter_When_QueryingForOrgLevel2Like() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().orgLevel2Like("ab%").list();
assertThat(results).hasSize(1);
@ -489,7 +583,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "admin")
@Test
void testQueryForOrgLevel3In() {
void should_ApplyFilter_When_QueryingForOrgLevel3In() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().orgLevel3In("orgl3").list();
assertThat(results).hasSize(2);
@ -497,7 +591,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "admin")
@Test
void testQueryForOrgLevel3Like() {
void should_ApplyFilter_When_QueryingForOrgLevel3Like() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().orgLevel3Like("org%").list();
assertThat(results).hasSize(2);
@ -505,7 +599,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "admin")
@Test
void testQueryForOrgLevel4In() {
void should_ApplyFilter_When_QueryingForOrgLevel4In() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().orgLevel4In("team", "orgl4").list();
assertThat(results).hasSize(2);
@ -513,7 +607,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "admin")
@Test
void testQueryForOrgLevel4Like() {
void should_ApplyFilter_When_QueryingForOrgLevel4Like() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().orgLevel4Like("%").list();
assertThat(results).hasSize(26);
@ -521,7 +615,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "admin")
@Test
void testQueryForOrderByOrgLevel1Desc() {
void should_OrderByOrgLevel1Desc_When_QueryingWorkbaskets() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().orderByOrgLevel1(DESCENDING).list();
@ -533,7 +627,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "admin")
@Test
void testQueryForOrderByOrgLevel2Asc() {
void should_OrderByOrgLevel2Asc_When_QueryingWorkbaskets() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().orderByOrgLevel2(ASCENDING).list();
@ -545,7 +639,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "admin")
@Test
void testQueryForOrderByOrgLevel3Desc() {
void should_OrderByOrgLevel3Desc_When_QueryingWorkbaskets() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().orderByOrgLevel3(DESCENDING).list();
@ -557,7 +651,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest {
@WithAccessId(user = "admin")
@Test
void testQueryForOrderByOrgLevel4Asc() {
void should_OrderByOrgLevel4Asc_When_QueryingWorkbaskets() {
List<WorkbasketSummary> results =
WORKBASKET_SERVICE.createWorkbasketQuery().orderByOrgLevel4(ASCENDING).list();

4
lib/taskana-core/src/test/java/acceptance/workbasket/update/UpdateWorkbasketAccTest.java
View File

@ -45,6 +45,10 @@ class UpdateWorkbasketAccTest extends AbstractAccTest {
workbasket.setCustomField(WorkbasketCustomField.CUSTOM_2, "new custom 2");
workbasket.setCustomField(WorkbasketCustomField.CUSTOM_3, "new custom 3");
workbasket.setCustomField(WorkbasketCustomField.CUSTOM_4, "new custom 4");
workbasket.setCustomField(WorkbasketCustomField.CUSTOM_5, "new custom 5");
workbasket.setCustomField(WorkbasketCustomField.CUSTOM_6, "new custom 6");
workbasket.setCustomField(WorkbasketCustomField.CUSTOM_7, "new custom 7");
workbasket.setCustomField(WorkbasketCustomField.CUSTOM_8, "new custom 8");
workbasket.setDescription("new description");
workbasketService.updateWorkbasket(workbasket);

8
lib/taskana-test-api/src/test/java/pro/taskana/testapi/builder/WorkbasketBuilderTest.java
View File

@ -78,6 +78,10 @@ class WorkbasketBuilderTest {
.customAttribute(WorkbasketCustomField.CUSTOM_2, "custom 2 value")
.customAttribute(WorkbasketCustomField.CUSTOM_3, "custom 3 value")
.customAttribute(WorkbasketCustomField.CUSTOM_4, "custom 4 value")
.customAttribute(WorkbasketCustomField.CUSTOM_5, "custom 5 value")
.customAttribute(WorkbasketCustomField.CUSTOM_6, "custom 6 value")
.customAttribute(WorkbasketCustomField.CUSTOM_7, "custom 7 value")
.customAttribute(WorkbasketCustomField.CUSTOM_8, "custom 8 value")
.orgLevel1("org level 1")
.orgLevel2("org level 2")
.orgLevel3("org level 3")
@ -97,6 +101,10 @@ class WorkbasketBuilderTest {
expectedWorkbasket.setCustomField(WorkbasketCustomField.CUSTOM_2, "custom 2 value");
expectedWorkbasket.setCustomField(WorkbasketCustomField.CUSTOM_3, "custom 3 value");
expectedWorkbasket.setCustomField(WorkbasketCustomField.CUSTOM_4, "custom 4 value");
expectedWorkbasket.setCustomField(WorkbasketCustomField.CUSTOM_5, "custom 5 value");
expectedWorkbasket.setCustomField(WorkbasketCustomField.CUSTOM_6, "custom 6 value");
expectedWorkbasket.setCustomField(WorkbasketCustomField.CUSTOM_7, "custom 7 value");
expectedWorkbasket.setCustomField(WorkbasketCustomField.CUSTOM_8, "custom 8 value");
expectedWorkbasket.setOrgLevel1("org level 1");
expectedWorkbasket.setOrgLevel2("org level 2");
expectedWorkbasket.setOrgLevel3("org level 3");

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

@ -415,6 +415,10 @@ public class WorkbasketController {
CUSTOM_2((query, sort) -> query.orderByCustomAttribute(WorkbasketCustomField.CUSTOM_2, sort)),
CUSTOM_3((query, sort) -> query.orderByCustomAttribute(WorkbasketCustomField.CUSTOM_3, sort)),
CUSTOM_4((query, sort) -> query.orderByCustomAttribute(WorkbasketCustomField.CUSTOM_4, sort)),
CUSTOM_5((query, sort) -> query.orderByCustomAttribute(WorkbasketCustomField.CUSTOM_5, sort)),
CUSTOM_6((query, sort) -> query.orderByCustomAttribute(WorkbasketCustomField.CUSTOM_6, sort)),
CUSTOM_7((query, sort) -> query.orderByCustomAttribute(WorkbasketCustomField.CUSTOM_7, sort)),
CUSTOM_8((query, sort) -> query.orderByCustomAttribute(WorkbasketCustomField.CUSTOM_8, sort)),
DOMAIN(WorkbasketQuery::orderByDomain),
ORG_LEVEL_1(WorkbasketQuery::orderByOrgLevel1),
ORG_LEVEL_2(WorkbasketQuery::orderByOrgLevel2),

8
rest/taskana-rest-spring/src/main/java/pro/taskana/workbasket/rest/assembler/WorkbasketRepresentationModelAssembler.java
View File

@ -49,6 +49,10 @@ public class WorkbasketRepresentationModelAssembler
repModel.setCustom2(workbasket.getCustomField(WorkbasketCustomField.CUSTOM_2));
repModel.setCustom3(workbasket.getCustomField(WorkbasketCustomField.CUSTOM_3));
repModel.setCustom4(workbasket.getCustomField(WorkbasketCustomField.CUSTOM_4));
repModel.setCustom5(workbasket.getCustomField(WorkbasketCustomField.CUSTOM_5));
repModel.setCustom6(workbasket.getCustomField(WorkbasketCustomField.CUSTOM_6));
repModel.setCustom7(workbasket.getCustomField(WorkbasketCustomField.CUSTOM_7));
repModel.setCustom8(workbasket.getCustomField(WorkbasketCustomField.CUSTOM_8));
repModel.setOrgLevel1(workbasket.getOrgLevel1());
repModel.setOrgLevel2(workbasket.getOrgLevel2());
repModel.setOrgLevel3(workbasket.getOrgLevel3());
@ -75,6 +79,10 @@ public class WorkbasketRepresentationModelAssembler
workbasket.setCustom2(repModel.getCustom2());
workbasket.setCustom3(repModel.getCustom3());
workbasket.setCustom4(repModel.getCustom4());
workbasket.setCustom5(repModel.getCustom5());
workbasket.setCustom6(repModel.getCustom6());
workbasket.setCustom7(repModel.getCustom7());
workbasket.setCustom8(repModel.getCustom8());
workbasket.setOrgLevel1(repModel.getOrgLevel1());
workbasket.setOrgLevel2(repModel.getOrgLevel2());
workbasket.setOrgLevel3(repModel.getOrgLevel3());

8
rest/taskana-rest-spring/src/main/java/pro/taskana/workbasket/rest/assembler/WorkbasketSummaryRepresentationModelAssembler.java
View File

@ -54,6 +54,10 @@ public class WorkbasketSummaryRepresentationModelAssembler
repModel.setCustom2(workbasketSummary.getCustomField(WorkbasketCustomField.CUSTOM_2));
repModel.setCustom3(workbasketSummary.getCustomField(WorkbasketCustomField.CUSTOM_3));
repModel.setCustom4(workbasketSummary.getCustomField(WorkbasketCustomField.CUSTOM_4));
repModel.setCustom5(workbasketSummary.getCustomField(WorkbasketCustomField.CUSTOM_5));
repModel.setCustom6(workbasketSummary.getCustomField(WorkbasketCustomField.CUSTOM_6));
repModel.setCustom7(workbasketSummary.getCustomField(WorkbasketCustomField.CUSTOM_7));
repModel.setCustom8(workbasketSummary.getCustomField(WorkbasketCustomField.CUSTOM_8));
repModel.setOrgLevel1(workbasketSummary.getOrgLevel1());
repModel.setOrgLevel2(workbasketSummary.getOrgLevel2());
repModel.setOrgLevel3(workbasketSummary.getOrgLevel3());
@ -75,6 +79,10 @@ public class WorkbasketSummaryRepresentationModelAssembler
workbasket.setCustom2(repModel.getCustom2());
workbasket.setCustom3(repModel.getCustom3());
workbasket.setCustom4(repModel.getCustom4());
workbasket.setCustom5(repModel.getCustom5());
workbasket.setCustom6(repModel.getCustom6());
workbasket.setCustom7(repModel.getCustom7());
workbasket.setCustom8(repModel.getCustom8());
workbasket.setOrgLevel1(repModel.getOrgLevel1());
workbasket.setOrgLevel2(repModel.getOrgLevel2());
workbasket.setOrgLevel3(repModel.getOrgLevel3());

40
rest/taskana-rest-spring/src/main/java/pro/taskana/workbasket/rest/models/WorkbasketSummaryRepresentationModel.java
View File

@ -33,6 +33,14 @@ public class WorkbasketSummaryRepresentationModel
protected String custom3;
/** A custom property with name "4". */
protected String custom4;
/** A custom property with name "5". */
protected String custom5;
/** A custom property with name "6". */
protected String custom6;
/** A custom property with name "7". */
protected String custom7;
/** A custom property with name "8". */
protected String custom8;
/**
* The first Org Level (the top one).
*
@ -138,6 +146,38 @@ public class WorkbasketSummaryRepresentationModel
this.custom4 = custom4;
}
public String getCustom5() {
return custom5;
}
public void setCustom5(String custom5) {
this.custom5 = custom5;
}
public String getCustom6() {
return custom6;
}
public void setCustom6(String custom6) {
this.custom6 = custom6;
}
public String getCustom7() {
return custom7;
}
public void setCustom7(String custom7) {
this.custom7 = custom7;
}
public String getCustom8() {
return custom8;
}
public void setCustom8(String custom8) {
this.custom8 = custom8;
}
public String getOrgLevel1() {
return orgLevel1;
}

12
rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketRepresentationModelAssemblerTest.java
View File

@ -45,6 +45,10 @@ class WorkbasketRepresentationModelAssemblerTest {
workbasket.setCustom2("2");
workbasket.setCustom3("3");
workbasket.setCustom4("4");
workbasket.setCustom5("5");
workbasket.setCustom6("6");
workbasket.setCustom7("7");
workbasket.setCustom8("8");
workbasket.setOwner("Lars");
workbasket.setCreated(Instant.parse("2010-01-01T12:00:00Z"));
workbasket.setModified(Instant.parse("2010-01-01T12:00:00Z"));
@ -68,6 +72,10 @@ class WorkbasketRepresentationModelAssemblerTest {
workbasketRepresentationModel.setCustom2("Custom2");
workbasketRepresentationModel.setCustom3("Custom3");
workbasketRepresentationModel.setCustom4("Custom4");
workbasketRepresentationModel.setCustom5("Custom5");
workbasketRepresentationModel.setCustom6("Custom6");
workbasketRepresentationModel.setCustom7("Custom7");
workbasketRepresentationModel.setCustom8("Custom8");
workbasketRepresentationModel.setDescription("Test Ressource");
workbasketRepresentationModel.setDomain("DOMAIN_A");
workbasketRepresentationModel.setKey("1");
@ -100,6 +108,10 @@ class WorkbasketRepresentationModelAssemblerTest {
workbasket.setCustomField(WorkbasketCustomField.CUSTOM_2, "2");
workbasket.setCustomField(WorkbasketCustomField.CUSTOM_3, "3");
workbasket.setCustomField(WorkbasketCustomField.CUSTOM_4, "4");
workbasket.setCustomField(WorkbasketCustomField.CUSTOM_5, "5");
workbasket.setCustomField(WorkbasketCustomField.CUSTOM_6, "6");
workbasket.setCustomField(WorkbasketCustomField.CUSTOM_7, "7");
workbasket.setCustomField(WorkbasketCustomField.CUSTOM_8, "8");
workbasket.setOwner("Lars");
workbasket.setCreated(Instant.parse("2010-01-01T12:00:00Z"));
workbasket.setModified(Instant.parse("2010-01-01T12:00:00Z"));

20
rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketSummaryRepresentationModelAssemblerTest.java
View File

@ -5,6 +5,10 @@ import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_1;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_2;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_3;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_4;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_5;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_6;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_7;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_8;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@ -43,6 +47,10 @@ class WorkbasketSummaryRepresentationModelAssemblerTest {
workbasketSummary.setCustom2("custom2");
workbasketSummary.setCustom3("custom3");
workbasketSummary.setCustom4("custom4");
workbasketSummary.setCustom5("custom5");
workbasketSummary.setCustom6("custom6");
workbasketSummary.setCustom7("custom7");
workbasketSummary.setCustom8("custom8");
workbasketSummary.setOrgLevel1("Org1");
workbasketSummary.setOrgLevel2("Org2");
workbasketSummary.setOrgLevel3("Org3");
@ -64,6 +72,10 @@ class WorkbasketSummaryRepresentationModelAssemblerTest {
repModel.setCustom2("Custom2");
repModel.setCustom3("Custom3");
repModel.setCustom4("Custom4");
repModel.setCustom5("Custom5");
repModel.setCustom6("Custom6");
repModel.setCustom7("Custom7");
repModel.setCustom8("Custom8");
repModel.setDescription("Test Ressource");
repModel.setDomain("DOMAIN_A");
repModel.setKey("1");
@ -91,6 +103,10 @@ class WorkbasketSummaryRepresentationModelAssemblerTest {
workbasketSummary.setCustom2("custom2");
workbasketSummary.setCustom3("custom3");
workbasketSummary.setCustom4("custom4");
workbasketSummary.setCustom5("custom5");
workbasketSummary.setCustom6("custom6");
workbasketSummary.setCustom7("custom7");
workbasketSummary.setCustom8("custom8");
workbasketSummary.setOrgLevel1("Org1");
workbasketSummary.setOrgLevel2("Org2");
workbasketSummary.setOrgLevel3("Org3");
@ -120,6 +136,10 @@ class WorkbasketSummaryRepresentationModelAssemblerTest {
assertThat(summary.getCustomField(CUSTOM_2)).isEqualTo(repModel.getCustom2());
assertThat(summary.getCustomField(CUSTOM_3)).isEqualTo(repModel.getCustom3());
assertThat(summary.getCustomField(CUSTOM_4)).isEqualTo(repModel.getCustom4());
assertThat(summary.getCustomField(CUSTOM_5)).isEqualTo(repModel.getCustom5());
assertThat(summary.getCustomField(CUSTOM_6)).isEqualTo(repModel.getCustom6());
assertThat(summary.getCustomField(CUSTOM_7)).isEqualTo(repModel.getCustom7());
assertThat(summary.getCustomField(CUSTOM_8)).isEqualTo(repModel.getCustom8());
assertThat(summary.getOrgLevel1()).isEqualTo(repModel.getOrgLevel1());
assertThat(summary.getOrgLevel2()).isEqualTo(repModel.getOrgLevel2());
assertThat(summary.getOrgLevel3()).isEqualTo(repModel.getOrgLevel3());