fix #82

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/mock/MockInstanceFactory.java

@@ -2,16 +2,19 @@
 
 import com.codingapi.flow.gateway.FlowOperatorGateway;
 import com.codingapi.flow.mock.service.FlowRecordQueryMockService;
+import com.codingapi.flow.repository.WorkflowRepository;
 import com.codingapi.flow.service.FlowService;
 import com.codingapi.flow.utils.RandomUtils;
 import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 模拟示例构建工厂
  */
+@Slf4j
 public class MockInstanceFactory {
 
     private final Map<String, MockInstance> cache;
@@ -23,13 +26,14 @@ private MockInstanceFactory() {
         this.cache = new ConcurrentHashMap<>();
     }
 
-    public MockInstance create(FlowOperatorGateway flowOperatorGateway) {
+    public MockInstance create(FlowOperatorGateway flowOperatorGateway, WorkflowRepository workflowRepository ) {
         String key = RandomUtils.generateStringId();
-        MockRepositoryHolder mockRepositoryHolder = new MockRepositoryHolder(flowOperatorGateway);
+        MockRepositoryHolder mockRepositoryHolder = new MockRepositoryHolder(flowOperatorGateway,workflowRepository);
         FlowService flowService = new FlowService(mockRepositoryHolder);
         FlowRecordQueryMockService flowRecordQueryMockService = new FlowRecordQueryMockService(mockRepositoryHolder);
         MockInstance mockInstance = new MockInstance(key, mockRepositoryHolder, flowService, flowRecordQueryMockService);
         this.cache.put(key, mockInstance);
+        log.info("create mock:{}",key);
         return mockInstance;
     }
 
@@ -44,6 +48,7 @@ public MockInstance getMockInstance(String key) {
 
     public void clear(String key) {
         this.cache.remove(key);
+        log.info("clear mock:{}",key);
     }
 
 }

flow-engine-framework/src/main/java/com/codingapi/flow/mock/MockRepositoryHolder.java

@@ -37,15 +37,16 @@ public class MockRepositoryHolder implements IRepositoryHolder {
     private final WorkflowService workflowService;
     private final FlowOperatorGateway flowOperatorGateway;
 
-    public MockRepositoryHolder(FlowOperatorGateway flowOperatorGateway) {
+    public MockRepositoryHolder(FlowOperatorGateway flowOperatorGateway,
+                                WorkflowRepository workflowRepository) {
         this.flowOperatorGateway = flowOperatorGateway;
         this.delayTaskRepository = new DelayTaskRepositoryMockImpl();
         this.flowRecordRepository = new FlowRecordRepositoryMockImpl();
         this.flowTodoMergeRepository = new FlowTodoMergeRepositoryMockImpl();
         this.flowTodoRecordRepository = new FlowTodoRecordRepositoryMockImpl();
         this.parallelBranchRepository = new ParallelBranchRepositoryMockImpl();
         this.urgeIntervalRepository = new UrgeIntervalRepositoryMockImpl();
-        this.workflowRepository = new WorkflowRepositoryMockImpl();
+        this.workflowRepository = workflowRepository;
         this.workflowRuntimeRepository = new WorkflowRuntimeRepositoryMockImpl();
         this.workflowVersionRepository = new WorkflowVersionRepositoryMockImpl();
         this.flowRecordService = new FlowRecordService(flowTodoRecordRepository, flowTodoMergeRepository, flowRecordRepository);

flow-engine-framework/src/main/java/com/codingapi/flow/mock/repository/WorkflowRepositoryMockImpl.java

@@ -17,7 +17,7 @@
 @AllArgsConstructor
 public class FlowRecordQueryMockService implements FlowRecordQueryService {
 
-    private final static int CURRENT_OFFSET = -1;
+    private final static int CURRENT_OFFSET = 0;
 
     private final MockRepositoryHolder mockRepositoryHolder;
 

flow-engine-framework/src/main/java/com/codingapi/flow/mock/service/FlowRecordQueryMockService.java

@@ -6,6 +6,7 @@
 import com.codingapi.flow.mock.MockRepositoryHolder;
 import com.codingapi.flow.mock.repository.*;
 import com.codingapi.flow.query.FlowRecordQueryService;
+import com.codingapi.flow.repository.WorkflowRepositoryImpl;
 import com.codingapi.flow.service.FlowRecordService;
 import com.codingapi.flow.service.FlowService;
 import com.codingapi.flow.service.WorkflowService;
@@ -17,7 +18,7 @@ public class MyFlowServiceMockFactory {
     public FlowRecordRepositoryMockImpl flowRecordRepository;
     public WorkflowRuntimeRepositoryMockImpl workflowRuntimeRepository;
     public WorkflowVersionRepositoryMockImpl workflowVersionRepository;
-    public WorkflowRepositoryMockImpl workflowRepository;
+    public WorkflowRepositoryImpl workflowRepository;
     public ParallelBranchRepositoryMockImpl parallelBranchRepository;
     public DelayTaskRepositoryMockImpl delayTaskRepository;
     public UrgeIntervalRepositoryMockImpl urgeIntervalRepository;
@@ -30,15 +31,15 @@ public class MyFlowServiceMockFactory {
 
     public MyFlowServiceMockFactory() {
         userGateway = new UserGateway();
-        MockInstance mockInstance = MockInstanceFactory.getInstance().create(userGateway);
+        workflowRepository = new WorkflowRepositoryImpl();
+        MockInstance mockInstance = MockInstanceFactory.getInstance().create(userGateway,workflowRepository);
         flowService = mockInstance.getFlowService();
         repositoryHolder = (MockRepositoryHolder)flowService.getRepositoryHolder();
         flowTodoRecordRepository = (FlowTodoRecordRepositoryMockImpl)repositoryHolder.getFlowTodoRecordRepository();
         flowTodoMergeRepository = (FlowTodoMergeRepositoryMockImpl)repositoryHolder.getFlowTodoMergeRepository();
         flowRecordRepository = (FlowRecordRepositoryMockImpl) repositoryHolder.getFlowRecordRepository();
         workflowRuntimeRepository = (WorkflowRuntimeRepositoryMockImpl) repositoryHolder.getWorkflowRuntimeRepository();
         workflowVersionRepository = (WorkflowVersionRepositoryMockImpl)repositoryHolder.getWorkflowVersionRepository();
-        workflowRepository = (WorkflowRepositoryMockImpl) repositoryHolder.getWorkflowRepository();
         parallelBranchRepository = (ParallelBranchRepositoryMockImpl) repositoryHolder.getParallelBranchRepository();
         delayTaskRepository = (DelayTaskRepositoryMockImpl) repositoryHolder.getDelayTaskRepository();
         urgeIntervalRepository = (UrgeIntervalRepositoryMockImpl) repositoryHolder.getUrgeIntervalRepository();

flow-engine-framework/src/test/java/com/codingapi/flow/factory/MyFlowServiceMockFactory.java

@@ -211,19 +211,19 @@ void pass() {
         assertEquals(2, records.stream().filter(FlowRecord::isFinish).toList().size());
 
 
-        Page<FlowRecordContent> page = factory.flowRecordQueryMockService.findAll(PageRequest.of(1, 10));
+        Page<FlowRecordContent> page = factory.flowRecordQueryMockService.findAll(PageRequest.of(0, 10));
         assertEquals(2, page.getTotalElements());
         assertEquals(2, page.getContent().size());
 
-        page = factory.flowRecordQueryMockService.findDoneRecordPage(user.getUserId(), PageRequest.of(1, 10));
+        page = factory.flowRecordQueryMockService.findDoneRecordPage(user.getUserId(), PageRequest.of(0, 10));
         assertEquals(1, page.getTotalElements());
         assertEquals(1, page.getContent().size());
 
-        page = factory.flowRecordQueryMockService.findNotifyRecordPage(user.getUserId(),PageRequest.of(1, 10));
+        page = factory.flowRecordQueryMockService.findNotifyRecordPage(user.getUserId(),PageRequest.of(0, 10));
         assertEquals(0, page.getTotalElements());
         assertEquals(0, page.getContent().size());
 
-        page = factory.flowRecordQueryMockService.findTodoRecordPage(user.getUserId(),PageRequest.of(1, 10));
+        page = factory.flowRecordQueryMockService.findTodoRecordPage(user.getUserId(),PageRequest.of(0, 10));
         assertEquals(0, page.getTotalElements());
         assertEquals(0, page.getContent().size());
 

flow-engine-framework/src/test/java/com/codingapi/flow/service/FlowMockSampleServiceTest.java

@@ -4,13 +4,16 @@
 import com.codingapi.flow.api.pojo.NodeCreateRequest;
 import com.codingapi.flow.api.pojo.WorkflowUpdateVersionNameRequest;
 import com.codingapi.flow.context.GatewayContext;
+import com.codingapi.flow.context.RepositoryHolderContext;
+import com.codingapi.flow.gateway.FlowOperatorGateway;
 import com.codingapi.flow.mock.MockInstance;
 import com.codingapi.flow.mock.MockInstanceFactory;
 import com.codingapi.flow.node.IBlockNode;
 import com.codingapi.flow.node.IFlowNode;
 import com.codingapi.flow.node.NodeType;
 import com.codingapi.flow.node.factory.NodeFactory;
 import com.codingapi.flow.operator.IFlowOperator;
+import com.codingapi.flow.repository.WorkflowRepository;
 import com.codingapi.flow.service.WorkflowService;
 import com.codingapi.flow.workflow.Workflow;
 import com.codingapi.flow.workflow.WorkflowBuilder;
@@ -32,6 +35,8 @@
 public class WorkflowController {
 
     private final WorkflowService workflowService;
+    private final WorkflowRepository workflowRepository;
+    private final FlowOperatorGateway flowOperatorGateway;
 
     @PostMapping("/remove")
     public Response remove(@RequestBody IdRequest request) {
@@ -74,7 +79,7 @@ public Response changeState(@RequestBody IdRequest request) {
 
     @PostMapping("/mock")
     public SingleResponse<String> mock() {
-        MockInstance mockInstance = MockInstanceFactory.getInstance().create(GatewayContext.getInstance().getFlowOperatorGateway());
+        MockInstance mockInstance = MockInstanceFactory.getInstance().create(flowOperatorGateway,workflowRepository);
         return SingleResponse.of(mockInstance.getMockKey());
     }
 

flow-engine-starter-api/src/main/java/com/codingapi/flow/api/controller/WorkflowController.java

@@ -69,6 +69,7 @@ public MultiResponse<FlowRecordContent> list(SearchRequest request) {
     @GetMapping("/todo")
     public MultiResponse<FlowRecordContent> todo(SearchRequest request) {
         long operatorId = loadCurrentOperatorId();
+        FlowRecordQueryService flowRecordQueryService = loadFlowService();
         PageRequest pageRequest = PageRequest.of(request.getCurrent(), request.getPageSize()).withSort(Sort.by("id").descending());
         return MultiResponse.of(flowRecordQueryService.findTodoRecordPage(operatorId,pageRequest));
     }
@@ -79,6 +80,7 @@ public MultiResponse<FlowRecordContent> todo(SearchRequest request) {
     @GetMapping("/notify")
     public MultiResponse<FlowRecordContent> notify(SearchRequest request) {
         long operatorId = loadCurrentOperatorId();
+        FlowRecordQueryService flowRecordQueryService = loadFlowService();
         PageRequest pageRequest = PageRequest.of(request.getCurrent(), request.getPageSize()).withSort(Sort.by("id").descending());
         return MultiResponse.of(flowRecordQueryService.findNotifyRecordPage(operatorId,pageRequest));
     }
@@ -90,6 +92,7 @@ public MultiResponse<FlowRecordContent> notify(SearchRequest request) {
     @GetMapping("/done")
     public MultiResponse<FlowRecordContent> done(SearchRequest request) {
         long operatorId = loadCurrentOperatorId();
+        FlowRecordQueryService flowRecordQueryService = loadFlowService();
         PageRequest pageRequest = PageRequest.of(request.getCurrent(), request.getPageSize()).withSort(Sort.by("id").descending());
         return MultiResponse.of(flowRecordQueryService.findDoneRecordPage(operatorId,pageRequest));
     }