This is an automated email from the ASF dual-hosted git repository.
pefernan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-apps.git
The following commit(s) were added to refs/heads/main by this push:
new 1858a1ddd [incubator-kie-issues#2151] Data Index: Add new user task id
field to `userTaskInstance` to store the task definition id (#2275)
1858a1ddd is described below
commit 1858a1ddd4e605bbdc54b3387efa88e5d48f0b68
Author: Pere Fernández <[email protected]>
AuthorDate: Tue Oct 21 16:52:26 2025 +0200
[incubator-kie-issues#2151] Data Index: Add new user task id field to
`userTaskInstance` to store the task definition id (#2275)
---
.../src/main/resources/graphql/basic.schema.graphqls | 1 +
.../org/kie/kogito/index/model/UserTaskInstance.java | 9 +++++++++
.../index/jpa/model/UserTaskInstanceEntity.java | 10 ++++++++++
.../jpa/storage/UserTaskInstanceEntityStorage.java | 1 +
.../data-index/ansi/V1.46.0__add_task_id_column.sql | 20 ++++++++++++++++++++
.../index/mongodb/model/UserTaskInstanceEntity.java | 12 +++++++++++-
.../mongodb/model/UserTaskInstanceEntityMapper.java | 2 ++
.../postgresql/V1.46.0__add_user_task_id_column.sql | 20 ++++++++++++++++++++
8 files changed, 74 insertions(+), 1 deletion(-)
diff --git
a/data-index/data-index-graphql/src/main/resources/graphql/basic.schema.graphqls
b/data-index/data-index-graphql/src/main/resources/graphql/basic.schema.graphqls
index 48a63228e..438eab5d6 100644
---
a/data-index/data-index-graphql/src/main/resources/graphql/basic.schema.graphqls
+++
b/data-index/data-index-graphql/src/main/resources/graphql/basic.schema.graphqls
@@ -386,6 +386,7 @@ type Attachment {
type UserTaskInstance {
id: String!
+ userTaskId: String
description: String
name: String
priority: String
diff --git
a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/UserTaskInstance.java
b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/UserTaskInstance.java
index 0aca4380a..4eddcafe5 100644
---
a/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/UserTaskInstance.java
+++
b/data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/model/UserTaskInstance.java
@@ -32,6 +32,7 @@ public class UserTaskInstance extends UserTaskInstanceMeta {
private String endpoint;
private String externalReferenceId;
private ZonedDateTime slaDueDate;
+ private String userTaskId;
public String getProcessId() {
return processId;
@@ -53,6 +54,14 @@ public class UserTaskInstance extends UserTaskInstanceMeta {
}
}
+ public String getUserTaskId() {
+ return userTaskId;
+ }
+
+ public void setUserTaskId(String userTaskId) {
+ this.userTaskId = userTaskId;
+ }
+
public String getEndpoint() {
return endpoint;
}
diff --git
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntity.java
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntity.java
index 7b97570c7..3df0fc42a 100644
---
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntity.java
+++
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/UserTaskInstanceEntity.java
@@ -47,6 +47,7 @@ public class UserTaskInstanceEntity extends AbstractEntity {
@Id
private String id;
private String description;
+ private String userTaskId;
private String name;
private String priority;
private String processInstanceId;
@@ -302,6 +303,14 @@ public class UserTaskInstanceEntity extends AbstractEntity
{
this.slaDueDate = slaDueDate;
}
+ public String getUserTaskId() {
+ return userTaskId;
+ }
+
+ public void setUserTaskId(String definitionId) {
+ this.userTaskId = definitionId;
+ }
+
@Override
public boolean equals(Object o) {
if (this == o) {
@@ -323,6 +332,7 @@ public class UserTaskInstanceEntity extends AbstractEntity {
public String toString() {
return "UserTaskInstanceEntity{" +
"id='" + id + '\'' +
+ ", taskId='" + userTaskId + '\'' +
", description='" + description + '\'' +
", name='" + name + '\'' +
", priority='" + priority + '\'' +
diff --git
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/UserTaskInstanceEntityStorage.java
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/UserTaskInstanceEntityStorage.java
index 7e673202f..64797d57f 100644
---
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/UserTaskInstanceEntityStorage.java
+++
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/storage/UserTaskInstanceEntityStorage.java
@@ -187,6 +187,7 @@ public class UserTaskInstanceEntityStorage extends
AbstractJPAStorageFetcher<Str
task.setRootProcessId(event.getKogitoRootProcessId());
task.setRootProcessInstanceId(event.getKogitoRootProcessInstanceId());
task.setName(body.getUserTaskName());
+ task.setUserTaskId(event.getData().getUserTaskDefinitionId());
task.setDescription(body.getUserTaskDescription());
task.setState(body.getState());
task.setPriority(body.getUserTaskPriority());
diff --git
a/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi/V1.46.0__add_task_id_column.sql
b/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi/V1.46.0__add_task_id_column.sql
new file mode 100644
index 000000000..b4b7c3bc4
--- /dev/null
+++
b/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi/V1.46.0__add_task_id_column.sql
@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ALTER table tasks ADD COLUMN user_task_id VARCHAR(255);
\ No newline at end of file
diff --git
a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntity.java
b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntity.java
index ca21ba455..b4a9701be 100644
---
a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntity.java
+++
b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntity.java
@@ -79,6 +79,7 @@ public class UserTaskInstanceEntity {
private String externalReferenceId;
private Long slaDueDate;
+ private String userTaskId;
public String getId() {
return id;
@@ -288,6 +289,14 @@ public class UserTaskInstanceEntity {
this.slaDueDate = slaDueDate;
}
+ public String getUserTaskId() {
+ return userTaskId;
+ }
+
+ public void setUserTaskId(String userTaskId) {
+ this.userTaskId = userTaskId;
+ }
+
@Override
public boolean equals(Object o) {
if (this == o) {
@@ -332,7 +341,8 @@ public class UserTaskInstanceEntity {
", endpoint='" + endpoint + '\'' +
", comments='" + comments + '\'' +
", attachments='" + attachments + '\'' +
- ", slaDueDate=" + slaDueDate +
+ ", slaDueDate=" + slaDueDate + '\'' +
+ ", userTaskId=" + userTaskId +
'}';
}
diff --git
a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntityMapper.java
b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntityMapper.java
index 707ea28d7..e188341e2 100644
---
a/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntityMapper.java
+++
b/data-index/data-index-storage/data-index-storage-mongodb/src/main/java/org/kie/kogito/index/mongodb/model/UserTaskInstanceEntityMapper.java
@@ -81,6 +81,7 @@ public class UserTaskInstanceEntityMapper implements
MongoEntityMapper<UserTaskI
entity.setAttachments(Optional.ofNullable(instance.getAttachments()).map(attachments
->
attachments.stream().map(this::fromAttachment).collect(toList())).orElse(null));
entity.setExternalReferenceId(instance.getExternalReferenceId());
entity.setSlaDueDate(zonedDateTimeToInstant(instance.getSlaDueDate()));
+ entity.setUserTaskId(instance.getUserTaskId());
return entity;
}
@@ -117,6 +118,7 @@ public class UserTaskInstanceEntityMapper implements
MongoEntityMapper<UserTaskI
instance.setAttachments(Optional.ofNullable(entity.getAttachments()).map(attachments
->
attachments.stream().map(this::toAttachment).collect(toList())).orElse(null));
instance.setExternalReferenceId(entity.getExternalReferenceId());
instance.setSlaDueDate(instantToZonedDateTime(entity.getSlaDueDate()));
+ instance.setUserTaskId(entity.getUserTaskId());
return instance;
}
diff --git
a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.46.0__add_user_task_id_column.sql
b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.46.0__add_user_task_id_column.sql
new file mode 100644
index 000000000..b4b7c3bc4
--- /dev/null
+++
b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.46.0__add_user_task_id_column.sql
@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ALTER table tasks ADD COLUMN user_task_id VARCHAR(255);
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
