From 3e252e78cc738ec568645331c17bda560892903a Mon Sep 17 00:00:00 2001 From: jamesrdi Date: Tue, 15 Aug 2023 16:36:32 +0200 Subject: [PATCH] Closes #2359 - Extend Custom Fields of Workbasket --- .../sql/monitor-data/monitor-sample-data.sql | 14 +- .../resources/sql/sample-data/workbasket.sql | 74 +++--- .../resources/sql/test-data/workbasket.sql | 54 ++--- .../resources/sql/db2/taskana-schema-db2.sql | 4 + ...skana_schema_update_6.3.1_to_6.4.0_db2.sql | 11 + .../resources/sql/h2/taskana-schema-h2.sql | 4 + ...askana_schema_update_6.3.1_to_6.4.0_h2.sql | 13 + .../sql/oracle/taskana-schema-oracle.sql | 4 + ...na_schema_update_6.3.1_to_6.4.0_oracle.sql | 14 ++ .../sql/postgres/taskana-schema-postgres.sql | 4 + ..._schema_update_6.3.1_to_6.4.0_postgres.sql | 12 + .../workbasket/get/GetWorkbasketAccTest.java | 8 + .../workbasket/api/WorkbasketCustomField.java | 6 +- .../workbasket/internal/WorkbasketMapper.java | 24 ++ .../internal/WorkbasketQueryImpl.java | 80 +++++++ .../internal/WorkbasketQueryMapper.java | 31 ++- .../internal/WorkbasketSqlProvider.java | 6 +- .../internal/models/WorkbasketImpl.java | 28 +++ .../models/WorkbasketSummaryImpl.java | 64 +++++ .../workbasket/WorkbasketModelsCloneTest.java | 12 + .../create/CreateWorkbasketAccTest.java | 43 ++++ .../query/QueryWorkbasketAccTest.java | 225 ++++++++++++++++-- .../update/UpdateWorkbasketAccTest.java | 4 + .../builder/WorkbasketBuilderTest.java | 8 + .../workbasket/rest/WorkbasketController.java | 4 + ...orkbasketRepresentationModelAssembler.java | 8 + ...etSummaryRepresentationModelAssembler.java | 8 + .../WorkbasketSummaryRepresentationModel.java | 40 ++++ ...asketRepresentationModelAssemblerTest.java | 12 + ...mmaryRepresentationModelAssemblerTest.java | 20 ++ 30 files changed, 745 insertions(+), 94 deletions(-) create mode 100644 common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_6.3.1_to_6.4.0_db2.sql create mode 100644 common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_6.3.1_to_6.4.0_h2.sql create mode 100644 common/taskana-common/src/main/resources/sql/oracle/taskana_schema_update_6.3.1_to_6.4.0_oracle.sql create mode 100644 common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_6.3.1_to_6.4.0_postgres.sql diff --git a/common/taskana-common-data/src/main/resources/sql/monitor-data/monitor-sample-data.sql b/common/taskana-common-data/src/main/resources/sql/monitor-data/monitor-sample-data.sql index 359af64bb9..91ceded363 100644 --- a/common/taskana-common-data/src/main/resources/sql/monitor-data/monitor-sample-data.sql +++ b/common/taskana-common-data/src/main/resources/sql/monitor-data/monitor-sample-data.sql @@ -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' , '' , '' , '' , '' , '' , '' , '' ); diff --git a/common/taskana-common-data/src/main/resources/sql/sample-data/workbasket.sql b/common/taskana-common-data/src/main/resources/sql/sample-data/workbasket.sql index bc9d7d1db0..459bf40e02 100644 --- a/common/taskana-common-data/src/main/resources/sql/sample-data/workbasket.sql +++ b/common/taskana-common-data/src/main/resources/sql/sample-data/workbasket.sql @@ -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 , '' , '' , '' , '' ); diff --git a/common/taskana-common-data/src/main/resources/sql/test-data/workbasket.sql b/common/taskana-common-data/src/main/resources/sql/test-data/workbasket.sql index 580bf5b7bd..7aefbb4e1a 100644 --- a/common/taskana-common-data/src/main/resources/sql/test-data/workbasket.sql +++ b/common/taskana-common-data/src/main/resources/sql/test-data/workbasket.sql @@ -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 , '' , '' , '' , '' ); +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 , '' , '' , '' , '' ); -- 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 , '' , '' , '' , '' ); +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 , '' , '' , '' , '' ); -- 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 , '' , '' , '' , '' ); diff --git a/common/taskana-common/src/main/resources/sql/db2/taskana-schema-db2.sql b/common/taskana-common/src/main/resources/sql/db2/taskana-schema-db2.sql index 61b2069f37..caa7f2caf9 100644 --- a/common/taskana-common/src/main/resources/sql/db2/taskana-schema-db2.sql +++ b/common/taskana-common/src/main/resources/sql/db2/taskana-schema-db2.sql @@ -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) ); diff --git a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_6.3.1_to_6.4.0_db2.sql b/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_6.3.1_to_6.4.0_db2.sql new file mode 100644 index 0000000000..12f09e298b --- /dev/null +++ b/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_6.3.1_to_6.4.0_db2.sql @@ -0,0 +1,11 @@ +-- this script updates the TASKANA database schema from version 6.3.1 to version 6.4.0. +SET SCHEMA %schemaName%; + +INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED) +VALUES (TASKANA_SCHEMA_VERSION_ID_SEQ.NEXTVAL, '6.4.0', CURRENT_TIMESTAMP); + +ALTER TABLE WORKBASKET + ADD COLUMN CUSTOM_5 VARCHAR(255) NULL DEFAULT '' + ADD COLUMN CUSTOM_6 VARCHAR(255) NULL DEFAULT '' + ADD COLUMN CUSTOM_7 VARCHAR(255) NULL DEFAULT '' + ADD COLUMN CUSTOM_8 VARCHAR(255) NULL DEFAULT ''; diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana-schema-h2.sql b/common/taskana-common/src/main/resources/sql/h2/taskana-schema-h2.sql index 0402ec4a34..92b05566dd 100644 --- a/common/taskana-common/src/main/resources/sql/h2/taskana-schema-h2.sql +++ b/common/taskana-common/src/main/resources/sql/h2/taskana-schema-h2.sql @@ -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) ); diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_6.3.1_to_6.4.0_h2.sql b/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_6.3.1_to_6.4.0_h2.sql new file mode 100644 index 0000000000..506614fe36 --- /dev/null +++ b/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_6.3.1_to_6.4.0_h2.sql @@ -0,0 +1,13 @@ +-- this script updates the TASKANA database schema from version 6.3.1 to version 6.4.0. +SET SCHEMA %schemaName%; + +INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED) +VALUES (nextval('TASKANA_SCHEMA_VERSION_ID_SEQ'), '6.4.0', CURRENT_TIMESTAMP); + +ALTER TABLE WORKBASKET + ADD ( + `COLUMN_5` VARCHAR(255) DEFAULT '' NULL, + `COLUMN_6` VARCHAR(255) DEFAULT '' NULL, + `COLUMN_7` VARCHAR(255) DEFAULT '' NULL, + `COLUMN_8` VARCHAR(255) DEFAULT '' NULL + ) AFTER `MARKED_FOR_DELETION`; diff --git a/common/taskana-common/src/main/resources/sql/oracle/taskana-schema-oracle.sql b/common/taskana-common/src/main/resources/sql/oracle/taskana-schema-oracle.sql index 4248be6872..5092d3a89b 100644 --- a/common/taskana-common/src/main/resources/sql/oracle/taskana-schema-oracle.sql +++ b/common/taskana-common/src/main/resources/sql/oracle/taskana-schema-oracle.sql @@ -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) ); diff --git a/common/taskana-common/src/main/resources/sql/oracle/taskana_schema_update_6.3.1_to_6.4.0_oracle.sql b/common/taskana-common/src/main/resources/sql/oracle/taskana_schema_update_6.3.1_to_6.4.0_oracle.sql new file mode 100644 index 0000000000..b3d783806e --- /dev/null +++ b/common/taskana-common/src/main/resources/sql/oracle/taskana_schema_update_6.3.1_to_6.4.0_oracle.sql @@ -0,0 +1,14 @@ +-- this script updates the TASKANA database schema from version 6.3.0 to version 6.4.0. +ALTER +SESSION SET CURRENT_SCHEMA = %schemaName%; + +INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED) +VALUES (TASKANA_SCHEMA_VERSION_ID_SEQ.NEXTVAL, '6.4.0', CURRENT_TIMESTAMP); + +ALTER TABLE WORKBASKET +ADD ( + CUSTOM_5 VARCHAR(255) DEFAULT '' NULL, + CUSTOM_6 VARCHAR(255) DEFAULT '' NULL, + CUSTOM_7 VARCHAR(255) DEFAULT '' NULL, + CUSTOM_8 VARCHAR(255) DEFAULT '' NULL +); diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana-schema-postgres.sql b/common/taskana-common/src/main/resources/sql/postgres/taskana-schema-postgres.sql index de19e76c5c..5149d26815 100644 --- a/common/taskana-common/src/main/resources/sql/postgres/taskana-schema-postgres.sql +++ b/common/taskana-common/src/main/resources/sql/postgres/taskana-schema-postgres.sql @@ -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) ); diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_6.3.1_to_6.4.0_postgres.sql b/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_6.3.1_to_6.4.0_postgres.sql new file mode 100644 index 0000000000..328765763f --- /dev/null +++ b/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_6.3.1_to_6.4.0_postgres.sql @@ -0,0 +1,12 @@ +-- this script updates the TASKANA database schema from version 6.3.1 to version 6.4.0. +SET +search_path = %schemaName%; + +INSERT INTO TASKANA_SCHEMA_VERSION (ID, VERSION, CREATED) +VALUES (nextval('TASKANA_SCHEMA_VERSION_ID_SEQ'), '6.4.0', CURRENT_TIMESTAMP); + +ALTER TABLE WORKBASKET + ADD COLUMN COLUMN_5 VARCHAR(255) DEFAULT '' NULL, + ADD COLUMN COLUMN_6 VARCHAR(255) DEFAULT '' NULL, + ADD COLUMN COLUMN_7 VARCHAR(255) DEFAULT '' NULL, + ADD COLUMN COLUMN_8 VARCHAR(255) DEFAULT '' NULL; diff --git a/lib/taskana-core-test/src/test/java/acceptance/workbasket/get/GetWorkbasketAccTest.java b/lib/taskana-core-test/src/test/java/acceptance/workbasket/get/GetWorkbasketAccTest.java index b1a07b0c52..9567217993 100644 --- a/lib/taskana-core-test/src/test/java/acceptance/workbasket/get/GetWorkbasketAccTest.java +++ b/lib/taskana-core-test/src/test/java/acceptance/workbasket/get/GetWorkbasketAccTest.java @@ -8,6 +8,10 @@ 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 @@ void setup() throws Exception { .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() diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketCustomField.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketCustomField.java index 5c4c207ad6..6db2e86db0 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketCustomField.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/api/WorkbasketCustomField.java @@ -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 } diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketMapper.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketMapper.java index f98506150b..0713915c75 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketMapper.java @@ -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 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 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 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 findAll(); @InsertProvider(type = WorkbasketSqlProvider.class, method = "insert") diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryImpl.java index bdf56c594c..bd253fef76 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryImpl.java @@ -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 WorkbasketQuery customAttributeIn( 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 WorkbasketQuery customAttributeLike( 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 String[] getCustom4Like() { 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 String toString() { + 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=" diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryMapper.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryMapper.java index 4e1500e414..a69e4bea08 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryMapper.java @@ -14,7 +14,7 @@ public interface WorkbasketQueryMapper { @Select( "