feat(flow+gateway): 草稿删除端点 DELETE /models/{id}(超管门)
补前端 T2.5 已按占位契约做好测试的草稿删除两层端点:
flowable-service ProcessModelController:DELETE /api/flow/models/{id}——先 getModel 判 null→404
{status:1,msg};存在则 deleteModel(id)(连带 editorSource/metaInfo 一并删)→{status:0}。
网关:FlowableClient +deleteModel(id)(id 走 uri 变量严格编码,DELETE 无既有封装→照 put 补私有
delete() 助手,无请求体,幂等重试安全);ProcessModelerController +DELETE /api/workflow/models/{id}
过 requireSuperAdmin 门后透传,{status:0} 原样回(对齐前端 deleteDraft 只判成功),下游 404 经既有
FlowGatewayExceptionHandler 透传。
测试(严格 TDD,均先红后绿):
- flowable ProcessModelControllerTest 14→16(删存在的 verify deleteModel 调 1 次/删不存在 404 verify 零删)
- gateway FlowableClientTest 18→20(DELETE 按 id 透传/下游 404 透传 FlowRemote 不重试)
- gateway ProcessModelerControllerTest 21→23(超管 200 透传+非超管 403 门拦下游恰调 1 次/404 胶水经 handler 出 FLOW_REMOTE_ERROR)
两模块 mvn -pl flowable-service,platform-flow-gateway -am test 全绿,BUILD SUCCESS,既有测试零改动。
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -18,6 +18,7 @@ import org.slf4j.LoggerFactory;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.util.StreamUtils;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
@@ -168,6 +169,20 @@ public class ProcessModelController {
|
||||
return ResponseEntity.ok(resp);
|
||||
}
|
||||
|
||||
@DeleteMapping("/models/{id}")
|
||||
@Operation(summary = "删草稿",
|
||||
description = "草稿不存在→404;存在则 deleteModel(id)(连带 editorSource/metaInfo 一并删) → {status:0}。")
|
||||
public ResponseEntity<Map<String, Object>> delete(@PathVariable String id) {
|
||||
Model model = repositoryService.getModel(id);
|
||||
if (model == null) {
|
||||
return status(HttpStatus.NOT_FOUND, "草稿不存在: " + id);
|
||||
}
|
||||
repositoryService.deleteModel(id);
|
||||
Map<String, Object> resp = new LinkedHashMap<>();
|
||||
resp.put("status", 0);
|
||||
return ResponseEntity.ok(resp);
|
||||
}
|
||||
|
||||
@PostMapping("/models/from-procdef")
|
||||
@Operation(summary = "从流程定义建草稿",
|
||||
description = "body {procDefId}。读部署 BPMN → BpmnIdSanitizer.sanitize 净化中文 id → 建草稿"
|
||||
|
||||
@@ -6,6 +6,7 @@ import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
|
||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
|
||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
|
||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
|
||||
@@ -237,6 +238,29 @@ class ProcessModelControllerTest {
|
||||
verify(repositoryService, never()).addModelEditorSource(anyString(), any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void 删草稿_存在则删除返status0() throws Exception {
|
||||
Model m = Mockito.mock(Model.class);
|
||||
when(repositoryService.getModel("m1")).thenReturn(m);
|
||||
|
||||
mvc.perform(delete("/api/flow/models/m1"))
|
||||
.andExpect(status().isOk())
|
||||
.andExpect(jsonPath("$.status").value(0));
|
||||
|
||||
verify(repositoryService).deleteModel("m1");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 删草稿_不存在返404不删除() throws Exception {
|
||||
when(repositoryService.getModel("nope")).thenReturn(null);
|
||||
|
||||
mvc.perform(delete("/api/flow/models/nope"))
|
||||
.andExpect(status().isNotFound())
|
||||
.andExpect(jsonPath("$.status").value(1));
|
||||
|
||||
verify(repositoryService, never()).deleteModel(anyString());
|
||||
}
|
||||
|
||||
@Test
|
||||
void fromProcDef_净化XML与idMap落metaInfo() throws Exception {
|
||||
// 存量流程 process id 为中文,from-procdef 净化后建草稿:editorSource 无中文 id,metaInfo JSON 含
|
||||
|
||||
Reference in New Issue
Block a user