Skip to content

fix(ticket): failed to approve ticket when input over-sized comment #2565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yhilmare merged 1 commit into from
Jun 3, 2024
Merged

fix(ticket): failed to approve ticket when input over-sized comment #2565

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions server/odc-service/src/main/java/com/oceanbase/odc/service/flow/FlowInstanceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import javax.annotation.PreDestroy;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;

import org.apache.commons.collections4.CollectionUtils;
import org.flowable.engine.HistoryService;
Expand Down Expand Up @@ -656,7 +657,10 @@ private FlowInstanceDetailResp cancel(@NotNull FlowInstance flowInstance, Boolea
return FlowInstanceDetailResp.withIdAndType(id, taskTypeHolder.getValue());
}

public FlowInstanceDetailResp approve(@NotNull Long id, String message, Boolean skipAuth) throws IOException {
@Transactional(rollbackFor = Exception.class)
Comment thread
smallsheeeep marked this conversation as resolved.
public FlowInstanceDetailResp approve(@NotNull Long id,
@Size(max = 1024, message = "The approval comment is out of range [0,1024]") String message,
Boolean skipAuth) throws IOException {
TaskEntity taskEntity = getTaskByFlowInstanceId(id);
if (taskEntity.getTaskType() == TaskType.IMPORT && !dispatchChecker.isTaskEntityOnThisMachine(taskEntity)) {
/**
Expand All @@ -681,7 +685,9 @@ public FlowInstanceDetailResp approve(@NotNull Long id, String message, Boolean
}

@Transactional(rollbackFor = Exception.class)
public FlowInstanceDetailResp reject(@NotNull Long id, String message, Boolean skipAuth) {
public FlowInstanceDetailResp reject(@NotNull Long id,
@Size(max = 1024, message = "The approval comment is out of range [0,1024]") String message,
Boolean skipAuth) {
if (notificationProperties.isEnabled()) {
try {
Event event =
Expand Down