Skip to content

Commit

Permalink
[JBPM-9126] Missing "subject" attribute in the UserTaskInstanceDesc
Browse files Browse the repository at this point in the history 
Adding subject to existing constructor.
Changing query
  • Loading branch information
@elguardian
Javier authored and elguardian committed May 26, 2020
1 parent 907a55e commit 63014d6
Show file tree
Hide file tree
Showing 6 changed files with 95 additions and 43 deletions.
86 changes: 49 additions & 37 deletions ...bpm-kie-services/src/main/java/org/jbpm/kie/services/impl/model/UserTaskInstanceDesc.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,55 +41,58 @@ public class UserTaskInstanceDesc implements org.jbpm.services.api.model.UserTas
private Long workItemId;
private Date slaDueDate;
private Integer slaCompliance;
private String subject;


public UserTaskInstanceDesc(Long taskId, String status,
Date activationTime, String name, String description,
Integer priority, String actualOwner, String createdBy,
String deploymentId, String processId, Long processInstanceId,
Date createdOn, Date dueDate) {
this(taskId, status, activationTime, name, description, priority, actualOwner, createdBy, deploymentId, processId, processInstanceId, createdOn, dueDate, null);

}

public UserTaskInstanceDesc(Long taskId, String status, Date activationTime, String name, String description,
Integer priority, String actualOwner, String createdBy, String deploymentId,
String processId, Long processInstanceId, Date createdOn, Date dueDate, Long workItemId,
Date slaDueDate, Integer slaCompliance) {
this(taskId, status, activationTime, name, description, priority, actualOwner, createdBy, deploymentId,
processId, processInstanceId, createdOn, dueDate,workItemId);
this.slaDueDate = slaDueDate;
this.slaCompliance = slaCompliance;
}
public UserTaskInstanceDesc(Long taskId, String status, Date activationTime, String name, String description,
Integer priority, String actualOwner, String createdBy, String deploymentId,
String processId, Long processInstanceId, Date createdOn, Date dueDate, Long workItemId) {
this(taskId, status, activationTime, name, description, priority, actualOwner, createdBy, deploymentId,
processId, processInstanceId, createdOn, dueDate);
this.workItemId = workItemId;
processId, processInstanceId, createdOn, dueDate, workItemId, null, null);
}

public UserTaskInstanceDesc(Long taskId, String status, Date activationTime, String name, String description,
Integer priority, String actualOwner, String createdBy, String deploymentId,
String processId, Long processInstanceId, Date createdOn, Date dueDate, Long workItemId, String formName) {
String processId, Long processInstanceId, Date createdOn, Date dueDate, Long workItemId, String formName, String subject) {
this(taskId, status, activationTime, name, description, priority, actualOwner, createdBy, deploymentId,
processId, processInstanceId, createdOn, dueDate, workItemId);
processId, processInstanceId, createdOn, dueDate, workItemId, formName, subject, null, null);
}

public UserTaskInstanceDesc(Long taskId, String status, Date activationTime, String name,
String description,
Integer priority, String actualOwner, String createdBy, String deploymentId,
String processId, Long processInstanceId, Date createdOn, Date dueDate, Long workItemId, String formName, String subject,
Date slaDueDate, Integer slaCompliance) {
this.taskId = taskId;
this.status = status;
this.activationTime = activationTime;
this.name = name;
this.description = description;
this.priority = priority;
this.actualOwner = actualOwner;
this.createdBy = createdBy;
this.deploymentId = deploymentId;
this.processId = processId;
this.processInstanceId = processInstanceId;
this.createdOn = createdOn;
this.dueDate = dueDate;
this.workItemId = workItemId;
this.formName = formName;
this.subject = subject;
this.slaDueDate = slaDueDate;
this.slaCompliance = slaCompliance;
}

public UserTaskInstanceDesc(Long taskId, String status,
Date activationTime, String name, String description,
Integer priority, String actualOwner, String createdBy,
String deploymentId, String processId, Long processInstanceId,
Date createdOn, Date dueDate) {
super();
this.taskId = taskId;
this.status = status;
this.activationTime = activationTime;
this.name = name;
this.description = description;
this.priority = priority;
this.actualOwner = actualOwner;
this.createdBy = createdBy;
this.deploymentId = deploymentId;
this.processId = processId;
this.processInstanceId = processInstanceId;
this.createdOn = createdOn;
this.dueDate = dueDate;
}

public UserTaskInstanceDesc(Long taskId, String name, String description, Integer priority, Date dueDate, String formName) {
super();
this.taskId = taskId;
this.name = name;
this.description = description;
Expand All @@ -102,7 +105,6 @@ public UserTaskInstanceDesc(Long taskId, String status, String actualOwner,
String name, Integer priority, String createdBy, String processId,
Long processInstanceId, Date createdOn, String formName,
String deploymentId, Date dueDate) {
super();
this.taskId = taskId;
this.status = status;
this.name = name;
Expand Down Expand Up @@ -244,12 +246,22 @@ public void setSlaCompliance(Integer slaCompliance) {
this.slaCompliance = slaCompliance;
}


public String getSubject() {
return subject;
}

public void setSubject(String subject) {
this.subject = subject;
}

@Override
public String toString() {
return "UserTaskInstanceDesc [taskId=" + taskId + ", name=" + name
+ ", deploymentId=" + deploymentId + ", processInstanceId="
+ processInstanceId + ", workItemId=" + workItemId
+ processInstanceId + ", workItemId=" + workItemId + ", subject=" + subject
+ ", slaCompliance=" + slaCompliance + ", slaDueDate=" + slaDueDate +"]";
}


}
4 changes: 3 additions & 1 deletion ...es/src/main/java/org/jbpm/kie/services/impl/query/mapper/UserTaskInstanceQueryMapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ protected UserTaskInstanceDesc buildInstance(DataSet dataSetResult, int index) {
getColumnLongValue(dataSetResult, COLUMN_TASK_PROCESSINSTANCEID, index),//processInstanceId,
getColumnDateValue(dataSetResult, COLUMN_CREATEDON, index),//createdOn,
getColumnDateValue(dataSetResult, COLUMN_DUEDATE, index),//dueDate
getColumnLongValue(dataSetResult, COLUMN_WORKITEMID, index)//workItemId
getColumnLongValue(dataSetResult, COLUMN_WORKITEMID, index), //workItemId
getColumnStringValue(dataSetResult, COLUMN_FORM_NAME, index),
getColumnStringValue(dataSetResult, COLUMN_SUBJECT, index)
);
return userTask;
}
Expand Down
11 changes: 7 additions & 4 deletions jbpm-services/jbpm-kie-services/src/main/resources/META-INF/Servicesorm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,8 +715,9 @@
a.processInstanceId,
a.createdOn,
a.dueDate,
a.workItemId,
t.formName
a.workItemId,
t.formName,
t.subject
)
from
AuditTaskImpl a
Expand Down Expand Up @@ -745,7 +746,8 @@
a.createdOn,
a.dueDate,
a.workItemId,
t.formName
t.formName,
t.subject
)
from
AuditTaskImpl a
Expand Down Expand Up @@ -775,7 +777,8 @@
a.createdOn,
a.dueDate,
a.workItemId,
t.formName
t.formName,
t.subject
)
from
AuditTaskImpl a
Expand Down
6 changes: 5 additions & 1 deletion ...ices/jbpm-kie-services/src/test/java/org/jbpm/kie/services/test/TaskQueryBuilderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@
import org.slf4j.LoggerFactory;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.kie.scanner.KieMavenRepository.getKieMavenRepository;

public class TaskQueryBuilderTest extends AbstractKieServicesBaseTest {
Expand Down Expand Up @@ -332,6 +335,7 @@ public void testFormName() {

UserTaskInstanceDesc userTask = runtimeDataService.getTaskById(taskIds.get(2));
assertEquals("CreateProposal", userTask.getFormName());
assertEquals("Proposal for: ", userTask.getSubject());

userTask = runtimeDataService.getTaskByWorkItemId(taskIds.get(0));
assertEquals("HRInterview", userTask.getFormName());
Expand Down
19 changes: 19 additions & 0 deletions jbpm-services/jbpm-services-api/src/build/revapi-config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,25 @@
"elementKind": "method",
"justification": "new extra data for process variables / case variables"
}
,
{
"code": "java.method.addedToInterface",
"new": "method java.lang.String org.jbpm.services.api.model.UserTaskInstanceDesc::getSubject()",
"package": "org.jbpm.services.api.model",
"classSimpleName": "UserTaskInstanceDesc",
"methodName": "getSubject",
"elementKind": "method",
"justification": "subject should be returned by REST service"
},
{
"code": "java.method.addedToInterface",
"new": "method void org.jbpm.services.api.model.UserTaskInstanceDesc::setSubject(java.lang.String)",
"package": "org.jbpm.services.api.model",
"classSimpleName": "UserTaskInstanceDesc",
"methodName": "setSubject",
"elementKind": "method",
"justification": "subject should be returned by REST service"
}
]
}
}
Expand Down
12 changes: 12 additions & 0 deletions ...ces/jbpm-services-api/src/main/java/org/jbpm/services/api/model/UserTaskInstanceDesc.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,4 +133,16 @@ public interface UserTaskInstanceDesc {
* @param slaDueDate SLA due date
*/
void setSlaDueDate(Date slaDueDate);

/**
* Returns task subject
* @return task subject
*/
String getSubject();

/**
* Set task subject
* @param subject task subject
*/
void setSubject(String subject);
}

0 comments on commit 63014d6

Please sign in to comment.