From d90643d9bef4e0b2afe9e3cdac688349a3e62172 Mon Sep 17 00:00:00 2001 From: Marcel Lengl <52546181+LenglBoy@users.noreply.github.com> Date: Tue, 21 Nov 2017 13:01:52 +0100 Subject: [PATCH] Removed all 'tenant_id' from Task/workbasket/objectreference/... - core, rest, and UI (Angular Projects) --- admin/src/app/model/workbasket.ts | 1 - .../workbasket-details.component.html | 3 -- ...orkbasket-distributiontargets.component.ts | 1 - .../workbasketeditor.component.ts | 2 +- .../workbasketlist.component.ts | 2 +- .../persistence/ObjectReferenceQueryImpl.java | 15 ---------- .../impl/persistence/TaskQueryImpl.java | 15 ---------- .../pro/taskana/model/ObjectReference.java | 10 ------- .../src/main/java/pro/taskana/model/Task.java | 10 ------- .../java/pro/taskana/model/Workbasket.java | 9 ------ .../model/mappings/ObjectReferenceMapper.java | 16 ++++------- .../taskana/model/mappings/QueryMapper.java | 9 ++---- .../taskana/model/mappings/TaskMapper.java | 9 +++--- .../model/mappings/WorkbasketMapper.java | 12 +++----- .../persistence/ObjectReferenceQuery.java | 9 ------ .../pro/taskana/persistence/TaskQuery.java | 8 ------ .../src/main/resources/sql/taskana-schema.sql | 3 -- .../TaskServiceImplTransactionTest.java | 4 +-- .../pro/taskana/rest/query/TaskFilter.java | 8 ------ .../sql/sample-data/object-reference.sql | 6 ++-- .../main/resources/sql/sample-data/task.sql | 28 +++++++++---------- .../resources/sql/sample-data/workbasket.sql | 6 ++-- workplace/src/app/model/task.ts | 2 -- .../taskdetails/taskdetails.component.html | 1 - 24 files changed, 40 insertions(+), 149 deletions(-) diff --git a/admin/src/app/model/workbasket.ts b/admin/src/app/model/workbasket.ts index 92efee025..a3679ff30 100644 --- a/admin/src/app/model/workbasket.ts +++ b/admin/src/app/model/workbasket.ts @@ -1,7 +1,6 @@ export class Workbasket { constructor( public id: string, - public tenantId: string, public created: string, public modified: string, public name: string, diff --git a/admin/src/app/workbasket-details/workbasket-details.component.html b/admin/src/app/workbasket-details/workbasket-details.component.html index f432201c1..90eb215b0 100644 --- a/admin/src/app/workbasket-details/workbasket-details.component.html +++ b/admin/src/app/workbasket-details/workbasket-details.component.html @@ -13,9 +13,6 @@
Id
{{ workbasketClone.id }}
-
Tenant Id
-
{{ workbasketClone.tenantId }}
-
Created Date
{{ workbasketClone.created | date: 'dd/MM/yyyy HH:mm' }}
Modified Date
diff --git a/admin/src/app/workbasket-distributiontargets/workbasket-distributiontargets.component.ts b/admin/src/app/workbasket-distributiontargets/workbasket-distributiontargets.component.ts index 06cb79cef..c3d821897 100644 --- a/admin/src/app/workbasket-distributiontargets/workbasket-distributiontargets.component.ts +++ b/admin/src/app/workbasket-distributiontargets/workbasket-distributiontargets.component.ts @@ -88,7 +88,6 @@ export class WorkbasketDistributiontargetsComponent implements OnInit { this.workbasket.name = result.name; this.workbasket.description = result.description; this.workbasket.owner = result.owner; - this.workbasket.tenantId = result.tenantId; this.workbasket.distributionTargets = result.distributionTargets; }, (err) => { this.alerts = [{ diff --git a/admin/src/app/workbasketeditor/workbasketeditor.component.ts b/admin/src/app/workbasketeditor/workbasketeditor.component.ts index 26fa52bc1..8498fbfdd 100644 --- a/admin/src/app/workbasketeditor/workbasketeditor.component.ts +++ b/admin/src/app/workbasketeditor/workbasketeditor.component.ts @@ -15,7 +15,7 @@ export class WorkbasketeditorComponent implements OnInit { constructor() { } ngOnInit() { - this.workbasket = new Workbasket("", "", "", "", "", "", "", null); + this.workbasket = new Workbasket("", "", "", "", "", "", null); } onSubmit() { diff --git a/admin/src/app/workbasketlist/workbasketlist.component.ts b/admin/src/app/workbasketlist/workbasketlist.component.ts index 97e8f08bf..3e9822e07 100644 --- a/admin/src/app/workbasketlist/workbasketlist.component.ts +++ b/admin/src/app/workbasketlist/workbasketlist.component.ts @@ -92,7 +92,7 @@ export class WorkbasketlistComponent implements OnInit { } getEmptyObject() { - return new Workbasket("", "", "", "", "", "", "", null); + return new Workbasket("", "", "", "", "", "", null); } onClickWB() { diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/persistence/ObjectReferenceQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/persistence/ObjectReferenceQueryImpl.java index 0e55d6b55..c40360434 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/persistence/ObjectReferenceQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/persistence/ObjectReferenceQueryImpl.java @@ -17,7 +17,6 @@ public class ObjectReferenceQueryImpl implements ObjectReferenceQuery { private static final String LINK_TO_MAPPER = "pro.taskana.model.mappings.QueryMapper.queryObjectReference"; private TaskanaEngineImpl taskanaEngine; - private String tenantId; private String[] company; private String[] system; private String[] systemInstance; @@ -28,12 +27,6 @@ public class ObjectReferenceQueryImpl implements ObjectReferenceQuery { this.taskanaEngine = (TaskanaEngineImpl) taskanaEngine; } - @Override - public ObjectReferenceQuery tenantId(String tenantIds) { - this.tenantId = tenantIds; - return this; - } - @Override public ObjectReferenceQuery company(String... companies) { this.company = companies; @@ -80,14 +73,6 @@ public class ObjectReferenceQueryImpl implements ObjectReferenceQuery { return taskanaEngine.getSession().selectOne(LINK_TO_MAPPER, this); } - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - public String[] getCompany() { return company; } diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/persistence/TaskQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/persistence/TaskQueryImpl.java index 2431bbcec..2e9257a72 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/persistence/TaskQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/persistence/TaskQueryImpl.java @@ -22,7 +22,6 @@ public class TaskQueryImpl implements TaskQuery { private TaskanaEngineImpl taskanaEngine; - private String tenantId; private String[] name; private String description; private int[] priority; @@ -39,12 +38,6 @@ public class TaskQueryImpl implements TaskQuery { this.taskanaEngine = (TaskanaEngineImpl) taskanaEngine; } - @Override - public TaskQuery tenantId(String tenantId) { - this.tenantId = tenantId; - return this; - } - @Override public TaskQuery name(String... names) { this.name = names; @@ -151,14 +144,6 @@ public class TaskQueryImpl implements TaskQuery { this.taskanaEngine = taskanaEngine; } - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - public String[] getName() { return name; } diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/ObjectReference.java b/lib/taskana-core/src/main/java/pro/taskana/model/ObjectReference.java index 53da57435..e46ce1164 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/model/ObjectReference.java +++ b/lib/taskana-core/src/main/java/pro/taskana/model/ObjectReference.java @@ -6,7 +6,6 @@ package pro.taskana.model; public class ObjectReference { private String id; - private String tenantId; private String company; private String system; private String systemInstance; @@ -21,14 +20,6 @@ public class ObjectReference { this.id = id; } - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - public String getCompany() { return company; } @@ -74,7 +65,6 @@ public class ObjectReference { StringBuffer sb = new StringBuffer(); sb.append("ObjectReference("); sb.append("id=" + id); - sb.append(", tenantId=" + tenantId); sb.append(", company=" + company); sb.append(", system=" + system); sb.append(", systemInstance=" + systemInstance); diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/Task.java b/lib/taskana-core/src/main/java/pro/taskana/model/Task.java index 3f950151a..3db15b472 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/model/Task.java +++ b/lib/taskana-core/src/main/java/pro/taskana/model/Task.java @@ -10,7 +10,6 @@ import java.util.Map; public class Task { private String id; - private String tenantId; private Timestamp created; private Timestamp claimed; private Timestamp completed; @@ -48,14 +47,6 @@ public class Task { this.id = id; } - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - public Timestamp getCreated() { return created; } @@ -276,7 +267,6 @@ public class Task { StringBuffer sb = new StringBuffer(); sb.append("TASK("); sb.append("id=" + id); - sb.append(", tenantId=" + tenantId); sb.append(", created=" + created); sb.append(", claimed=" + claimed); sb.append(", completed=" + completed); diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/Workbasket.java b/lib/taskana-core/src/main/java/pro/taskana/model/Workbasket.java index 782f61053..cb49ad224 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/model/Workbasket.java +++ b/lib/taskana-core/src/main/java/pro/taskana/model/Workbasket.java @@ -10,7 +10,6 @@ import java.util.List; public class Workbasket { private String id; - private String tenantId; private Timestamp created; private Timestamp modified; private String name; @@ -26,14 +25,6 @@ public class Workbasket { this.id = id; } - public String getTenantId() { - return tenantId; - } - - public void setTenantId(String tenantId) { - this.tenantId = tenantId; - } - public Timestamp getCreated() { return created; } diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/mappings/ObjectReferenceMapper.java b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/ObjectReferenceMapper.java index 8afdfb961..db1a17515 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/model/mappings/ObjectReferenceMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/ObjectReferenceMapper.java @@ -15,12 +15,11 @@ import pro.taskana.model.ObjectReference; */ public interface ObjectReferenceMapper { - @Select("SELECT ID, TENANT_ID, COMPANY, SYSTEM, SYSTEM_INSTANCE, TYPE, VALUE " + @Select("SELECT ID, COMPANY, SYSTEM, SYSTEM_INSTANCE, TYPE, VALUE " + "FROM OBJECT_REFERENCE " + "ORDER BY ID") @Results({ @Result(property = "id", column = "ID"), - @Result(property = "tenantId", column = "TENANT_ID"), @Result(property = "company", column = "COMPANY"), @Result(property = "system", column = "SYSTEM"), @Result(property = "systemInstance", column = "SYSTEM_INSTANCE"), @@ -28,12 +27,11 @@ public interface ObjectReferenceMapper { @Result(property = "value", column = "VALUE") }) List findAll(); - @Select("SELECT ID, TENANT_ID, COMPANY, SYSTEM, SYSTEM_INSTANCE, TYPE, VALUE " + @Select("SELECT ID, COMPANY, SYSTEM, SYSTEM_INSTANCE, TYPE, VALUE " + "FROM OBJECT_REFERENCE " + "WHERE ID = #{id}") @Results({ @Result(property = "id", column = "ID"), - @Result(property = "tenantId", column = "TENANT_ID"), @Result(property = "company", column = "COMPANY"), @Result(property = "system", column = "SYSTEM"), @Result(property = "systemInstance", column = "SYSTEM_INSTANCE"), @@ -41,17 +39,15 @@ public interface ObjectReferenceMapper { @Result(property = "value", column = "VALUE") }) ObjectReference findById(@Param("id") String id); - @Select("SELECT ID, TENANT_ID, COMPANY, SYSTEM, SYSTEM_INSTANCE, TYPE, VALUE " + @Select("SELECT ID, COMPANY, SYSTEM, SYSTEM_INSTANCE, TYPE, VALUE " + "FROM OBJECT_REFERENCE " - + "WHERE TENANT_ID = #{objectReference.tenantId} " - + "AND COMPANY = #{objectReference.company} " + + "WHERE COMPANY = #{objectReference.company} " + "AND SYSTEM = #{objectReference.system} " + "AND SYSTEM_INSTANCE = #{objectReference.systemInstance} " + "AND TYPE = #{objectReference.type} " + "AND VALUE = #{objectReference.value}") @Results({ @Result(property = "id", column = "ID"), - @Result(property = "tenantId", column = "TENANT_ID"), @Result(property = "company", column = "COMPANY"), @Result(property = "system", column = "SYSTEM"), @Result(property = "systemInstance", column = "SYSTEM_INSTANCE"), @@ -59,10 +55,10 @@ public interface ObjectReferenceMapper { @Result(property = "value", column = "VALUE") }) ObjectReference findByObjectReference(@Param("objectReference") ObjectReference objectReference); - @Insert("INSERT INTO OBJECT_REFERENCE (ID, TENANT_ID, COMPANY, SYSTEM, SYSTEM_INSTANCE, TYPE, VALUE) VALUES (#{ref.id}, #{ref.tenantId}, #{ref.company}, #{ref.system}, #{ref.systemInstance}, #{ref.type}, #{ref.value})") + @Insert("INSERT INTO OBJECT_REFERENCE (ID, COMPANY, SYSTEM, SYSTEM_INSTANCE, TYPE, VALUE) VALUES (#{ref.id}, #{ref.company}, #{ref.system}, #{ref.systemInstance}, #{ref.type}, #{ref.value})") void insert(@Param("ref") ObjectReference ref); - @Update(value = "UPDATE OBJECT_REFERENCE SET TENANT_ID = #{ref.tenantId}, COMPANY = #{ref.company}, SYSTEM = #{ref.system}, SYSTEM_INSTANCE = #{ref.systemInstance}, TYPE = #{ref.type}, VALUE = #{ref.value} WHERE ID = #{ref.id}") + @Update(value = "UPDATE OBJECT_REFERENCE SET COMPANY = #{ref.company}, SYSTEM = #{ref.system}, SYSTEM_INSTANCE = #{ref.systemInstance}, TYPE = #{ref.type}, VALUE = #{ref.value} WHERE ID = #{ref.id}") void update(@Param("ref") ObjectReference ref); @Delete("DELETE FROM OBJECT_REFERENCE WHERE ID = #{id}") diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/mappings/QueryMapper.java b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/QueryMapper.java index 41d966c06..18125e0bc 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/model/mappings/QueryMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/QueryMapper.java @@ -21,13 +21,12 @@ public interface QueryMapper { String OBJECTREFERENCEMAPPER_FINDBYID = "pro.taskana.model.mappings.ObjectReferenceMapper.findById"; String CLASSIFICATION_FINDBYID = "pro.taskana.model.mappings.ClassificationMapper.findByIdAndDomain"; - @Select("") @Results(value = { @Result(property = "id", column = "ID"), - @Result(property = "tenantId", column = "TENANT_ID"), @Result(property = "created", column = "CREATED"), @Result(property = "claimed", column = "CLAIMED"), @Result(property = "completed", column = "COMPLETED"), @@ -135,10 +132,9 @@ public interface QueryMapper { List queryClassification(ClassificationQueryImpl classificationQuery); - @Select("") @Results({ @Result(property = "id", column = "ID"), - @Result(property = "tenantId", column = "TENANT_ID"), @Result(property = "company", column = "COMPANY"), @Result(property = "system", column = "SYSTEM"), @Result(property = "systemInstance", column = "SYSTEM_INSTANCE"), diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/mappings/TaskMapper.java b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/TaskMapper.java index 5ac4eed0e..99178d1db 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/model/mappings/TaskMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/TaskMapper.java @@ -17,12 +17,11 @@ public interface TaskMapper { String OBJECTREFERENCEMAPPER_FINDBYID = "pro.taskana.model.mappings.ObjectReferenceMapper.findById"; String CLASSIFICATION_FINDBYID = "pro.taskana.model.mappings.ClassificationMapper.findByIdAndDomain"; - @Select("SELECT ID, TENANT_ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, PRIORITY, STATE, CLASSIFICATION_ID, WORKBASKETID, OWNER, PRIMARY_OBJ_REF_ID, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10 " + @Select("SELECT ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, PRIORITY, STATE, CLASSIFICATION_ID, WORKBASKETID, OWNER, PRIMARY_OBJ_REF_ID, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10 " + "FROM TASK " + "WHERE ID = #{id}") @Results(value = { @Result(property = "id", column = "ID"), - @Result(property = "tenantId", column = "TENANT_ID"), @Result(property = "created", column = "CREATED"), @Result(property = "claimed", column = "CLAIMED"), @Result(property = "completed", column = "COMPLETED"), @@ -83,12 +82,12 @@ public interface TaskMapper { @Result(column = "counter", property = "taskCounter") }) List getTaskCountByWorkbasketIdAndDaysInPastAndState(@Param("fromDate") Date fromDate, @Param("status") List states); - @Insert("INSERT INTO TASK(ID, TENANT_ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, PRIORITY, STATE, CLASSIFICATION_ID, WORKBASKETID, OWNER, PRIMARY_OBJ_REF_ID, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10) " - + "VALUES(#{id}, #{tenantId}, #{created}, #{claimed}, #{completed}, #{modified}, #{planned}, #{due}, #{name}, #{description}, #{priority}, #{state}, #{classification.id}, #{workbasketId}, #{owner}, #{primaryObjRef.id}, #{isRead}, #{isTransferred}, #{customAttributes,jdbcType=BLOB,javaType=java.util.Map,typeHandler=pro.taskana.impl.persistence.MapTypeHandler}, #{custom1}, #{custom2}, #{custom3}, #{custom4}, #{custom5}, #{custom6}, #{custom7}, #{custom8}, #{custom9}, #{custom10})") + @Insert("INSERT INTO TASK(ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, PRIORITY, STATE, CLASSIFICATION_ID, WORKBASKETID, OWNER, PRIMARY_OBJ_REF_ID, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10) " + + "VALUES(#{id}, #{created}, #{claimed}, #{completed}, #{modified}, #{planned}, #{due}, #{name}, #{description}, #{priority}, #{state}, #{classification.id}, #{workbasketId}, #{owner}, #{primaryObjRef.id}, #{isRead}, #{isTransferred}, #{customAttributes,jdbcType=BLOB,javaType=java.util.Map,typeHandler=pro.taskana.impl.persistence.MapTypeHandler}, #{custom1}, #{custom2}, #{custom3}, #{custom4}, #{custom5}, #{custom6}, #{custom7}, #{custom8}, #{custom9}, #{custom10})") @Options(keyProperty = "id", keyColumn = "ID") void insert(Task task); - @Update("UPDATE TASK SET TENANT_ID = #{tenantId}, CLAIMED = #{claimed}, COMPLETED = #{completed}, MODIFIED = #{modified}, PLANNED = #{planned}, DUE = #{due}, NAME = #{name}, DESCRIPTION = #{description}, PRIORITY = #{priority}, STATE = #{state}, CLASSIFICATION_ID = #{classification.id}, WORKBASKETID = #{workbasketId}, OWNER = #{owner}, PRIMARY_OBJ_REF_ID = #{primaryObjRef.id}, IS_READ = #{isRead}, IS_TRANSFERRED = #{isTransferred}, CUSTOM_ATTRIBUTES = #{customAttributes,jdbcType=BLOB,javaType=java.util.Map,typeHandler=pro.taskana.impl.persistence.MapTypeHandler}, CUSTOM_1 = #{custom1}, CUSTOM_2 = #{custom2}, CUSTOM_3 = #{custom3}, CUSTOM_4 = #{custom4}, CUSTOM_5 = #{custom5}, CUSTOM_6 = #{custom6}, CUSTOM_7 = #{custom7}, CUSTOM_8 = #{custom8}, CUSTOM_9 = #{custom9}, CUSTOM_10 = #{custom10} " + @Update("UPDATE TASK SET CLAIMED = #{claimed}, COMPLETED = #{completed}, MODIFIED = #{modified}, PLANNED = #{planned}, DUE = #{due}, NAME = #{name}, DESCRIPTION = #{description}, PRIORITY = #{priority}, STATE = #{state}, CLASSIFICATION_ID = #{classification.id}, WORKBASKETID = #{workbasketId}, OWNER = #{owner}, PRIMARY_OBJ_REF_ID = #{primaryObjRef.id}, IS_READ = #{isRead}, IS_TRANSFERRED = #{isTransferred}, CUSTOM_ATTRIBUTES = #{customAttributes,jdbcType=BLOB,javaType=java.util.Map,typeHandler=pro.taskana.impl.persistence.MapTypeHandler}, CUSTOM_1 = #{custom1}, CUSTOM_2 = #{custom2}, CUSTOM_3 = #{custom3}, CUSTOM_4 = #{custom4}, CUSTOM_5 = #{custom5}, CUSTOM_6 = #{custom6}, CUSTOM_7 = #{custom7}, CUSTOM_8 = #{custom8}, CUSTOM_9 = #{custom9}, CUSTOM_10 = #{custom10} " + "WHERE ID = #{id}") void update(Task task); diff --git a/lib/taskana-core/src/main/java/pro/taskana/model/mappings/WorkbasketMapper.java b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/WorkbasketMapper.java index 6f2f12277..0499091e5 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/model/mappings/WorkbasketMapper.java +++ b/lib/taskana-core/src/main/java/pro/taskana/model/mappings/WorkbasketMapper.java @@ -19,9 +19,8 @@ import pro.taskana.model.WorkbasketAuthorization; */ public interface WorkbasketMapper { - @Select("SELECT ID, TENANT_ID, CREATED, MODIFIED, NAME, DESCRIPTION, OWNER FROM WORKBASKET WHERE ID = #{id}") + @Select("SELECT ID, CREATED, MODIFIED, NAME, DESCRIPTION, OWNER FROM WORKBASKET WHERE ID = #{id}") @Results(value = { @Result(property = "id", column = "ID"), - @Result(property = "tenantId", column = "TENANT_ID"), @Result(property = "created", column = "CREATED"), @Result(property = "modified", column = "MODIFIED"), @Result(property = "name", column = "NAME"), @@ -33,7 +32,6 @@ public interface WorkbasketMapper { @Select("SELECT * FROM WORKBASKET WHERE id IN (SELECT TARGET_ID FROM DISTRIBUTION_TARGETS WHERE SOURCE_ID = #{id})") @Results(value = { @Result(property = "id", column = "ID"), - @Result(property = "tenantId", column = "TENANT_ID"), @Result(property = "created", column = "CREATED"), @Result(property = "modified", column = "MODIFIED"), @Result(property = "name", column = "NAME"), @@ -45,7 +43,6 @@ public interface WorkbasketMapper { @Select("SELECT * FROM WORKBASKET ORDER BY id") @Results(value = { @Result(property = "id", column = "ID"), - @Result(property = "tenantId", column = "TENANT_ID"), @Result(property = "created", column = "CREATED"), @Result(property = "modified", column = "MODIFIED"), @Result(property = "name", column = "NAME"), @@ -54,7 +51,7 @@ public interface WorkbasketMapper { @Result(property = "distributionTargets", column = "ID", javaType = List.class, many = @Many(fetchType = FetchType.DEFAULT, select = "findByDistributionTargets")) }) List findAll(); - @Select("") @Results(value = { @Result(property = "id", column = "ID"), - @Result(property = "tenantId", column = "TENANT_ID"), @Result(property = "created", column = "CREATED"), @Result(property = "modified", column = "MODIFIED"), @Result(property = "name", column = "NAME"), @@ -74,11 +70,11 @@ public interface WorkbasketMapper { @Result(property = "distributionTargets", column = "ID", javaType = List.class, many = @Many(fetchType = FetchType.DEFAULT, select = "findByDistributionTargets")) }) List findByPermission(@Param("authorizations") List authorizations, @Param("userId") String userId); - @Insert("INSERT INTO WORKBASKET (ID, TENANT_ID, CREATED, MODIFIED, NAME, DESCRIPTION, OWNER) VALUES (#{workbasket.id}, #{workbasket.tenantId}, #{workbasket.created}, #{workbasket.modified}, #{workbasket.name}, #{workbasket.description}, #{workbasket.owner})") + @Insert("INSERT INTO WORKBASKET (ID, CREATED, MODIFIED, NAME, DESCRIPTION, OWNER) VALUES (#{workbasket.id}, #{workbasket.created}, #{workbasket.modified}, #{workbasket.name}, #{workbasket.description}, #{workbasket.owner})") @Options(keyProperty = "id", keyColumn = "ID") void insert(@Param("workbasket") Workbasket workbasket); - @Update("UPDATE WORKBASKET SET TENANT_ID = #{workbasket.tenantId}, MODIFIED = #{workbasket.modified}, NAME = #{workbasket.name}, DESCRIPTION = #{workbasket.description}, OWNER = #{workbasket.owner} WHERE id = #{workbasket.id}") + @Update("UPDATE WORKBASKET SET MODIFIED = #{workbasket.modified}, NAME = #{workbasket.name}, DESCRIPTION = #{workbasket.description}, OWNER = #{workbasket.owner} WHERE id = #{workbasket.id}") void update(@Param("workbasket") Workbasket workbasket); @Delete("DELETE FROM WORKBASKET where id = #{id}") diff --git a/lib/taskana-core/src/main/java/pro/taskana/persistence/ObjectReferenceQuery.java b/lib/taskana-core/src/main/java/pro/taskana/persistence/ObjectReferenceQuery.java index 358f96240..a0190e7d3 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/persistence/ObjectReferenceQuery.java +++ b/lib/taskana-core/src/main/java/pro/taskana/persistence/ObjectReferenceQuery.java @@ -6,14 +6,6 @@ import pro.taskana.model.ObjectReference; * ObjectReferenceQuery for generating dynamic sql. */ public interface ObjectReferenceQuery extends BaseQuery { - /** - * Add your tenant id to your query. - * @param tenantId - * the tenant id as String - * @return the query - */ - ObjectReferenceQuery tenantId(String tenantId); - /** * Add your company to your query. * @param companies @@ -53,5 +45,4 @@ public interface ObjectReferenceQuery extends BaseQuery { * @return the query */ ObjectReferenceQuery value(String... values); - } diff --git a/lib/taskana-core/src/main/java/pro/taskana/persistence/TaskQuery.java b/lib/taskana-core/src/main/java/pro/taskana/persistence/TaskQuery.java index 5ed891e3e..32579dcfa 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/persistence/TaskQuery.java +++ b/lib/taskana-core/src/main/java/pro/taskana/persistence/TaskQuery.java @@ -9,14 +9,6 @@ import pro.taskana.model.TaskState; */ public interface TaskQuery extends BaseQuery { - /** - * Add your tenant id to your query. - * @param tenantId - * the tenant id as String - * @return the query - */ - TaskQuery tenantId(String tenantId); - /** * Add your names to your query. * @param name diff --git a/lib/taskana-core/src/main/resources/sql/taskana-schema.sql b/lib/taskana-core/src/main/resources/sql/taskana-schema.sql index 9dbc7ee40..341ca84cc 100644 --- a/lib/taskana-core/src/main/resources/sql/taskana-schema.sql +++ b/lib/taskana-core/src/main/resources/sql/taskana-schema.sql @@ -7,7 +7,6 @@ INSERT INTO TASKANA_SCHEMA_VERSION VALUES ('1', '0.0.1'); CREATE TABLE TASK ( ID CHAR(40) NOT NULL, - TENANT_ID VARCHAR(32) NULL, CREATED TIMESTAMP NULL, CLAIMED TIMESTAMP NULL, COMPLETED TIMESTAMP NULL, @@ -40,7 +39,6 @@ CREATE TABLE TASK ( CREATE TABLE WORKBASKET( ID CHAR(40) NOT NULL, - TENANT_ID VARCHAR(32) NULL, CREATED TIMESTAMP NULL, MODIFIED TIMESTAMP NULL, NAME VARCHAR(255) NOT NULL, @@ -95,7 +93,6 @@ CREATE TABLE WORKBASKET_ACCESS_LIST( CREATE TABLE OBJECT_REFERENCE( ID CHAR(40) NOT NULL, - TENANT_ID VARCHAR(32) NULL, COMPANY VARCHAR(32) NOT NULL, SYSTEM VARCHAR(32) NOT NULL, SYSTEM_INSTANCE VARCHAR(32) NOT NULL, diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplTransactionTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplTransactionTest.java index 42f1f38a2..8ce52c2ca 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplTransactionTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplTransactionTest.java @@ -111,11 +111,11 @@ public class TaskServiceImplTransactionTest { .parentClassification("pId1", "pId2").category("cat1", "cat2").type("oneType").name("1Name", "name2") .descriptionLike("my desc").priority(1, 2, 1).serviceLevel("me", "and", "you"); - ObjectReferenceQuery objectReferenceQuery = new ObjectReferenceQueryImpl(taskanaEngineImpl).tenantId("tenant1") + ObjectReferenceQuery objectReferenceQuery = new ObjectReferenceQueryImpl(taskanaEngineImpl) .company("first comp", "sonstwo gmbh").system("sys").type("type1", "type2") .systemInstance("sysInst1", "sysInst2").value("val1", "val2", "val3"); - List results = taskServiceImpl.createTaskQuery().tenantId("1").name("bla", "test").descriptionLike("test") + List results = taskServiceImpl.createTaskQuery().name("bla", "test").descriptionLike("test") .priority(1, 2, 2).state(TaskState.CLAIMED).workbasketId("asd", "asdasdasd") .owner("test", "test2", "bla").customFields("test").classification(classificationQuery) .objectReference(objectReferenceQuery).list(); diff --git a/rest/src/main/java/pro/taskana/rest/query/TaskFilter.java b/rest/src/main/java/pro/taskana/rest/query/TaskFilter.java index d40e0050f..115cbb92f 100644 --- a/rest/src/main/java/pro/taskana/rest/query/TaskFilter.java +++ b/rest/src/main/java/pro/taskana/rest/query/TaskFilter.java @@ -26,7 +26,6 @@ public class TaskFilter { private static final String STATE = "state"; private static final String PRIORITY = "priority"; private static final String DESCRIPTION = "description"; - private static final String TENANT_ID = "tenantId"; private static final String NAME = "name"; private static final String OWNER = "owner"; private static final String WORKBASKET_ID = "workbasketId"; @@ -47,7 +46,6 @@ public class TaskFilter { private static final String POR_SYSTEM_INSTANCE = POR + DOT + "systemInstance"; private static final String POR_SYSTEM = POR + DOT + "system"; private static final String POR_COMPANY = POR + DOT + "company"; - private static final String POR_TENANT_ID = POR + DOT + "tenantId"; private static final String CLAIMED = "CLAIMED"; private static final String COMPLETED = "COMPLETED"; @@ -68,9 +66,6 @@ public class TaskFilter { TaskQuery taskQuery = taskService.createTaskQuery(); // apply filters - if (params.containsKey(TENANT_ID)) { - taskQuery.workbasketId(params.get(TENANT_ID).toArray(new String[0])); - } if (params.containsKey(NAME)) { String[] names = extractCommaSeperatedFields(params.get(NAME)); taskQuery.name(names); @@ -131,9 +126,6 @@ public class TaskFilter { // objectReference if (params.keySet().stream().filter(s -> s.startsWith(POR)).toArray().length > 0) { ObjectReferenceQuery objectReferenceQuery = taskQuery.createObjectReferenceQuery(); - if (params.containsKey(POR_TENANT_ID)) { - objectReferenceQuery.tenantId(params.get(POR_TENANT_ID).get(0)); - } if (params.containsKey(POR_COMPANY)) { String[] companies = extractCommaSeperatedFields(params.get(POR_COMPANY)); objectReferenceQuery.company(companies); diff --git a/rest/src/main/resources/sql/sample-data/object-reference.sql b/rest/src/main/resources/sql/sample-data/object-reference.sql index b21e6ce47..eb6cdcd8b 100644 --- a/rest/src/main/resources/sql/sample-data/object-reference.sql +++ b/rest/src/main/resources/sql/sample-data/object-reference.sql @@ -1,3 +1,3 @@ -INSERT INTO OBJECT_REFERENCE VALUES ('1', 'Tenant1', 'Company1', 'System1', 'Instance1', 'Type1', 'Value1'); -INSERT INTO OBJECT_REFERENCE VALUES ('2', 'Tenant2', 'Company2', 'System2', 'Instance2', 'Type2', 'Value2'); -INSERT INTO OBJECT_REFERENCE VALUES ('3', 'Tenant3', 'Company3', 'System3', 'Instance3', 'Type3', 'Value3'); +INSERT INTO OBJECT_REFERENCE VALUES ('1', 'Company1', 'System1', 'Instance1', 'Type1', 'Value1'); +INSERT INTO OBJECT_REFERENCE VALUES ('2', 'Company2', 'System2', 'Instance2', 'Type2', 'Value2'); +INSERT INTO OBJECT_REFERENCE VALUES ('3', 'Company3', 'System3', 'Instance3', 'Type3', 'Value3'); diff --git a/rest/src/main/resources/sql/sample-data/task.sql b/rest/src/main/resources/sql/sample-data/task.sql index fff4fe034..62fe1d90c 100644 --- a/rest/src/main/resources/sql/sample-data/task.sql +++ b/rest/src/main/resources/sql/sample-data/task.sql @@ -1,16 +1,16 @@ -INSERT INTO TASK VALUES('1', '1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, null, CURRENT_TIMESTAMP, null, 'Task1', 'Lorem ipsum dolor sit amet.', 1, 'READY', '1', '1', 'Stefan', '1', true, false, null, null, null, null, null, null, null, null, null, null, null); -INSERT INTO TASK VALUES('2', '1', CURRENT_TIMESTAMP, null, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task2', 'Lorem ipsum dolor sit amet. ', 1, 'READY', '2', '1', 'Frank', '2', false, false, null, null, null, null, null, null, null, null, null, null, null); -INSERT INTO TASK VALUES('3', '1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task3', 'Lorem ipsum dolor sit amet. ', 1, 'CLAIMED', '3', '1', 'Stefan', '3', true, false, null, null, null, null, null, null, null, null, null, null, null); -INSERT INTO TASK VALUES('4', '1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task4', 'Lorem ipsum dolor sit amet.', 1, 'CLAIMED', '4', '1', 'Frank', '1', false, true, null, null, null, null, null, null, null, null, null, null, null); -INSERT INTO TASK VALUES('5', '1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task5', 'Lorem ipsum dolor sit amet. ', 1, 'COMPLETED', '11', '1', 'Stefan', '2', false, false, null, null, null, null, null, null, null, null, null, null, null); -INSERT INTO TASK VALUES('6', '1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task6', 'Lorem ipsum dolor sit amet.', 1, 'COMPLETED', '12', '1', 'Frank', '3', false, false, null, null, null, null, null, null, null, null, null, null, null); +INSERT INTO TASK VALUES('1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, null, CURRENT_TIMESTAMP, null, 'Task1', 'Lorem ipsum dolor sit amet.', 1, 'READY', '1', '1', 'Stefan', '1', true, false, null, null, null, null, null, null, null, null, null, null, null); +INSERT INTO TASK VALUES('2', CURRENT_TIMESTAMP, null, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task2', 'Lorem ipsum dolor sit amet. ', 1, 'READY', '2', '1', 'Frank', '2', false, false, null, null, null, null, null, null, null, null, null, null, null); +INSERT INTO TASK VALUES('3', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task3', 'Lorem ipsum dolor sit amet. ', 1, 'CLAIMED', '3', '1', 'Stefan', '3', true, false, null, null, null, null, null, null, null, null, null, null, null); +INSERT INTO TASK VALUES('4', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task4', 'Lorem ipsum dolor sit amet.', 1, 'CLAIMED', '4', '1', 'Frank', '1', false, true, null, null, null, null, null, null, null, null, null, null, null); +INSERT INTO TASK VALUES('5', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task5', 'Lorem ipsum dolor sit amet. ', 1, 'COMPLETED', '11', '1', 'Stefan', '2', false, false, null, null, null, null, null, null, null, null, null, null, null); +INSERT INTO TASK VALUES('6', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task6', 'Lorem ipsum dolor sit amet.', 1, 'COMPLETED', '12', '1', 'Frank', '3', false, false, null, null, null, null, null, null, null, null, null, null, null); -INSERT INTO TASK VALUES('7', '1', CURRENT_TIMESTAMP, null, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task7', 'Lorem ipsum dolor sit amet.', 1, 'READY', '13', '2', 'Stefan', '1', false, false, null, null, null, null, null, null, null, null, null, null, null); -INSERT INTO TASK VALUES('8', '1', CURRENT_TIMESTAMP, null, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task8', 'Lorem ipsum dolor sit amet. ', 1, 'READY', '14', '2', 'Frank', '2', false, false, null, null, null, null, null, null, null, null, null, null, null); -INSERT INTO TASK VALUES('9', '1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task9', 'Lorem ipsum dolor sit amet. ', 1, 'CLAIMED', '1', '2', 'Stefan', '3', true, false, null, null, null, null, null, null, null, null, null, null, null); -INSERT INTO TASK VALUES('10', '1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task10', 'Lorem ipsum dolor sit amet.', 1, 'CLAIMED', '2', '2', 'Frank', '1', false, false, null, null, null, null, null, null, null, null, null, null, null); -INSERT INTO TASK VALUES('11', '1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task11', 'Lorem ipsum dolor sit amet. ', 1, 'COMPLETED', '3', '2', 'Stefan', '2', false, false, null, null, null, null, null, null, null, null, null, null, null); -INSERT INTO TASK VALUES('12', '1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task12', 'Lorem ipsum dolor sit amet.', 1, 'COMPLETED', '4', '2', 'Frank', '3', false, false, null, null, null, null, null, null, null, null, null, null, null); +INSERT INTO TASK VALUES('7', CURRENT_TIMESTAMP, null, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task7', 'Lorem ipsum dolor sit amet.', 1, 'READY', '13', '2', 'Stefan', '1', false, false, null, null, null, null, null, null, null, null, null, null, null); +INSERT INTO TASK VALUES('8', CURRENT_TIMESTAMP, null, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task8', 'Lorem ipsum dolor sit amet. ', 1, 'READY', '14', '2', 'Frank', '2', false, false, null, null, null, null, null, null, null, null, null, null, null); +INSERT INTO TASK VALUES('9', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task9', 'Lorem ipsum dolor sit amet. ', 1, 'CLAIMED', '1', '2', 'Stefan', '3', true, false, null, null, null, null, null, null, null, null, null, null, null); +INSERT INTO TASK VALUES('10', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task10', 'Lorem ipsum dolor sit amet.', 1, 'CLAIMED', '2', '2', 'Frank', '1', false, false, null, null, null, null, null, null, null, null, null, null, null); +INSERT INTO TASK VALUES('11', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task11', 'Lorem ipsum dolor sit amet. ', 1, 'COMPLETED', '3', '2', 'Stefan', '2', false, false, null, null, null, null, null, null, null, null, null, null, null); +INSERT INTO TASK VALUES('12', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task12', 'Lorem ipsum dolor sit amet.', 1, 'COMPLETED', '4', '2', 'Frank', '3', false, false, null, null, null, null, null, null, null, null, null, null, null); -INSERT INTO TASK VALUES('13', '1', CURRENT_TIMESTAMP, null, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task12', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus massa turpis, pellentesque ut libero sit aet, malesuada suscipit dolor. Sed volutpat euismod felis sit amet molestie. Fusce ornare purus dui. ', 1, 'READY', '11', '2', 'Frank', '1', false, false, null, null, null, null, null, null, null, null, null, null, null); -INSERT INTO TASK VALUES('14', '1', CURRENT_TIMESTAMP, null, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task6', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce sagittis vulputate nibh ut malesuada. Etiam ac dictum tellus, nec cursus nunc. Curabitur velit eros, feugiat volutpat laoreet vitae, cursus eu dui. Nulla ut purus sem. Vivamus aliquet odio vitae erat cursus, vitae mattis urna mollis. Nam quam tellus, auctor id volutpat congue, viverra vitae ante. Duis nisi dolor, elementum et mattis at, maximus id velit. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Duis eu condimentum risus. Praesent libero velit, facilisis sit amet maximus non, scelerisque ullamcorper leo. Ut sit amet iaculis eros. Mauris sagittis nibh lacus, at facilisis magna suscipit at. Aliquam finibus tempor odio id commodo. Vivamus aliquam, justo id porta imperdiet, mi.', 1, 'READY', '12', '1', 'Frank', '2', false, false, null, null, null, null, null, null, null, null, null, null, null); +INSERT INTO TASK VALUES('13', CURRENT_TIMESTAMP, null, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task12', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus massa turpis, pellentesque ut libero sit aet, malesuada suscipit dolor. Sed volutpat euismod felis sit amet molestie. Fusce ornare purus dui. ', 1, 'READY', '11', '2', 'Frank', '1', false, false, null, null, null, null, null, null, null, null, null, null, null); +INSERT INTO TASK VALUES('14', CURRENT_TIMESTAMP, null, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task6', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce sagittis vulputate nibh ut malesuada. Etiam ac dictum tellus, nec cursus nunc. Curabitur velit eros, feugiat volutpat laoreet vitae, cursus eu dui. Nulla ut purus sem. Vivamus aliquet odio vitae erat cursus, vitae mattis urna mollis. Nam quam tellus, auctor id volutpat congue, viverra vitae ante. Duis nisi dolor, elementum et mattis at, maximus id velit. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Duis eu condimentum risus. Praesent libero velit, facilisis sit amet maximus non, scelerisque ullamcorper leo. Ut sit amet iaculis eros. Mauris sagittis nibh lacus, at facilisis magna suscipit at. Aliquam finibus tempor odio id commodo. Vivamus aliquam, justo id porta imperdiet, mi.', 1, 'READY', '12', '1', 'Frank', '2', false, false, null, null, null, null, null, null, null, null, null, null, null); diff --git a/rest/src/main/resources/sql/sample-data/workbasket.sql b/rest/src/main/resources/sql/sample-data/workbasket.sql index eaa874245..14ecd62b2 100644 --- a/rest/src/main/resources/sql/sample-data/workbasket.sql +++ b/rest/src/main/resources/sql/sample-data/workbasket.sql @@ -1,3 +1,3 @@ -INSERT INTO WORKBASKET VALUES ('1', '1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basket1', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 'Peter'); -INSERT INTO WORKBASKET VALUES ('2', '2', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basket2', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 'Susanne'); -INSERT INTO WORKBASKET VALUES ('3', '2', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basket3', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 'Max'); +INSERT INTO WORKBASKET VALUES ('1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basket1', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 'Peter'); +INSERT INTO WORKBASKET VALUES ('2', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basket2', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 'Susanne'); +INSERT INTO WORKBASKET VALUES ('3', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basket3', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 'Max'); diff --git a/workplace/src/app/model/task.ts b/workplace/src/app/model/task.ts index cb5f1a3f1..2ccfe1318 100644 --- a/workplace/src/app/model/task.ts +++ b/workplace/src/app/model/task.ts @@ -1,7 +1,6 @@ export class Task { id: string; - tenantId: string; created: any; claimed: any; completed: any; @@ -22,7 +21,6 @@ export class Task { constructor(data){ this.id = data.id; - this.tenantId = data.tenantId; this.created = data.created; this.claimed = data.claimed; this.completed = data.completed; diff --git a/workplace/src/app/taskdetails/taskdetails.component.html b/workplace/src/app/taskdetails/taskdetails.component.html index 7b2370c78..ab9be0288 100644 --- a/workplace/src/app/taskdetails/taskdetails.component.html +++ b/workplace/src/app/taskdetails/taskdetails.component.html @@ -5,7 +5,6 @@

{{ task.description }}

Owner: {{ task.owner }}

-

Tenant ID: {{ task.tenantId }}

Creation Date: {{ task.created | date:'medium' }}

Claim Date: {{ task.claimed | date:'medium' }}

Completion Date: {{ task.completed | date:'medium' }}