fix #30

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/context/RepositoryHolderContext.java

@@ -222,17 +222,14 @@ private void saveTodoMargeRecords() {
             List<FlowTodoRecord> flowTodoRecords = new ArrayList<>();
             for (FlowRecord flowRecord : flowRecords) {
                 if (flowRecord.isTodo()) {
-                    FlowTodoRecord todoMargeRecord = null;
-                    if (flowRecord.isMergeable()) {
-                        todoMargeRecord = flowTodoRecordRepository.getByMergeKey(flowRecord.getMergeKey());
-                        if (todoMargeRecord == null) {
-                            todoMargeRecord = new FlowTodoRecord(flowRecord);
-                        } else {
-                            todoMargeRecord.update(flowRecord);
+                    FlowTodoRecord todoMargeRecord = flowTodoRecordRepository.getByMergeKey(flowRecord.getMergeKey());
+                    if (todoMargeRecord == null) {
+                        todoMargeRecord = new FlowTodoRecord(flowRecord);
+                    } else {
+                        todoMargeRecord.update(flowRecord);
+                        if (flowRecord.isMergeable()) {
                             todoMargeRecord.addMargeCount();
                         }
-                    } else {
-                        todoMargeRecord = new FlowTodoRecord(flowRecord);
                     }
                     flowTodoRecords.add(todoMargeRecord);
                 }
@@ -259,7 +256,7 @@ private void saveRecords() {
         }
 
 
-        private void removeTodoMargeRecords() {
+        private void removeTodoMergeRecords() {
             for (FlowRecord flowRecord : flowRecords) {
                 if (flowRecord.isDone()) {
                     if (flowRecord.isMergeable()) {
@@ -293,7 +290,7 @@ private void removeTodoMargeRecords() {
         public void saveAll() {
             this.saveRecords();
             this.saveTodoMargeRecords();
-            this.removeTodoMargeRecords();
+            this.removeTodoMergeRecords();
         }
 
 

flow-engine-framework/src/main/java/com/codingapi/flow/record/FlowTodoRecord.java

@@ -137,7 +137,7 @@ public void divMargeCount(){
     }
 
     public boolean hasMargeCount(){
-        return this.mergeable && this.margeCount > 0;
+        return this.mergeable && this.margeCount >= 0;
     }
 
 }

flow-engine-framework/src/test/java/com/codingapi/flow/repository/FlowTodoMergeRepositoryImpl.java

@@ -38,4 +38,9 @@ public List<FlowTodoMerge> findByTodoId(long todoId) {
                 filter(relation -> relation.getTodoId() == todoId)
                 .toList();
     }
+
+
+    public List<FlowTodoMerge> findAll() {
+        return cache.values().stream().toList();
+    }
 }

flow-engine-framework/src/test/java/com/codingapi/flow/repository/FlowTodoRecordRepositoryImpl.java

@@ -45,4 +45,8 @@ public List<FlowTodoRecord> findByOperatorId(long operatorId) {
         return cache.values().stream().filter(record -> record.getCurrentOperatorId() == operatorId).toList();
     }
 
+    public List<FlowTodoRecord> findAll() {
+        return cache.values().stream().toList();
+    }
+
 }

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

@@ -37,16 +37,16 @@
 
 public class FlowMergeableServiceTest {
 
-    private final FlowTodoRecordRepositoryImpl flowTodoMargeRecordRepository = new FlowTodoRecordRepositoryImpl();
-    private final FlowTodoMergeRepositoryImpl flowTodoMargeRelationRepository = new FlowTodoMergeRepositoryImpl();
+    private final FlowTodoRecordRepositoryImpl flowTodoRecordRepository = new FlowTodoRecordRepositoryImpl();
+    private final FlowTodoMergeRepositoryImpl flowTodoMergeRepository = new FlowTodoMergeRepositoryImpl();
     private final FlowRecordRepositoryImpl flowRecordRepository = new FlowRecordRepositoryImpl();
     private final UserGateway userGateway = new UserGateway();
     private final WorkflowBackupRepository workflowBackupRepository = new WorkflowBackupRepositoryImpl();
     private final WorkflowRepository workflowRepository = new WorkflowRepositoryImpl();
     private final ParallelBranchRepository parallelBranchRepository = new ParallelBranchRepositoryImpl();
     private final DelayTaskRepository delayTaskRepository = new DelayTaskRepositoryImpl();
     private final UrgeIntervalRepository urgeIntervalRepository = new UrgeIntervalRepositoryImpl();
-    private final FlowService flowService = new FlowService(workflowRepository, userGateway, flowRecordRepository,flowTodoMargeRecordRepository,flowTodoMargeRelationRepository, workflowBackupRepository, parallelBranchRepository, delayTaskRepository, urgeIntervalRepository);
+    private final FlowService flowService = new FlowService(workflowRepository, userGateway, flowRecordRepository, flowTodoRecordRepository, flowTodoMergeRepository, workflowBackupRepository, parallelBranchRepository, delayTaskRepository, urgeIntervalRepository);
 
 
     /**
@@ -143,12 +143,12 @@ void mergeableRecords() {
         Set<String> set = new HashSet<>(mergeIdList);
         assertEquals(1,set.size());
 
-        List<FlowTodoRecord> todoMargeRecords = flowTodoMargeRecordRepository.findByOperatorId(boss.getUserId());
-        assertEquals(1, todoMargeRecords.size());
+        List<FlowTodoRecord> todoRecords = flowTodoRecordRepository.findByOperatorId(boss.getUserId());
+        assertEquals(1, todoRecords.size());
 
-        FlowTodoRecord todoMargeRecord = todoMargeRecords.get(0);
-        List<FlowTodoMerge> relationList = flowTodoMargeRelationRepository.findByTodoId(todoMargeRecord.getId());
-        assertEquals(count, relationList.size());
+        FlowTodoRecord todoMargeRecord = todoRecords.get(0);
+        List<FlowTodoMerge> mergeList = flowTodoMergeRepository.findByTodoId(todoMargeRecord.getId());
+        assertEquals(count, mergeList.size());
 
 
         List<IFlowAction> bossActions = bossNode.actionManager().getActions();
@@ -167,5 +167,12 @@ void mergeableRecords() {
             assertEquals(3, records.stream().filter(FlowRecord::isFinish).toList().size());
         }
 
-    }
+        List<FlowTodoRecord> todoRecordList = flowTodoRecordRepository.findAll();
+        assertEquals(0, todoRecordList.size());
+
+        List<FlowTodoMerge> todoMargeList = flowTodoMergeRepository.findAll();
+        assertEquals(0, todoMargeList.size());
+
+
+     }
 }

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

@@ -29,16 +29,16 @@
 
 class FlowParallelServiceTest {
 
-    private final FlowTodoRecordRepositoryImpl flowTodoMargeRecordRepository = new FlowTodoRecordRepositoryImpl();
-    private final FlowTodoMergeRepositoryImpl flowTodoMargeRelationRepository = new FlowTodoMergeRepositoryImpl();
+    private final FlowTodoRecordRepositoryImpl flowTodoRecordRepository = new FlowTodoRecordRepositoryImpl();
+    private final FlowTodoMergeRepositoryImpl flowTodoMergeRepository = new FlowTodoMergeRepositoryImpl();
     private final FlowRecordRepositoryImpl flowRecordRepository = new FlowRecordRepositoryImpl();
     private final UserGateway userGateway = new UserGateway();
     private final WorkflowBackupRepository workflowBackupRepository = new WorkflowBackupRepositoryImpl();
     private final WorkflowRepository workflowRepository = new WorkflowRepositoryImpl();
     private final ParallelBranchRepository parallelBranchRepository = new ParallelBranchRepositoryImpl();
     private final DelayTaskRepository delayTaskRepository = new DelayTaskRepositoryImpl();
     private final UrgeIntervalRepository urgeIntervalRepository = new UrgeIntervalRepositoryImpl();
-    private final FlowService flowService = new FlowService(workflowRepository, userGateway, flowRecordRepository,flowTodoMargeRecordRepository,flowTodoMargeRelationRepository, workflowBackupRepository, parallelBranchRepository, delayTaskRepository, urgeIntervalRepository);
+    private final FlowService flowService = new FlowService(workflowRepository, userGateway, flowRecordRepository, flowTodoRecordRepository, flowTodoMergeRepository, workflowBackupRepository, parallelBranchRepository, delayTaskRepository, urgeIntervalRepository);
 
 
     /**

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

@@ -37,16 +37,16 @@
 
 class FlowSampleServiceTest {
 
-    private final FlowTodoRecordRepositoryImpl flowTodoMargeRecordRepository = new FlowTodoRecordRepositoryImpl();
-    private final FlowTodoMergeRepositoryImpl flowTodoMargeRelationRepository = new FlowTodoMergeRepositoryImpl();
+    private final FlowTodoRecordRepositoryImpl flowTodoRecordRepository = new FlowTodoRecordRepositoryImpl();
+    private final FlowTodoMergeRepositoryImpl flowTodoMergeRepository = new FlowTodoMergeRepositoryImpl();
     private final FlowRecordRepositoryImpl flowRecordRepository = new FlowRecordRepositoryImpl();
     private final UserGateway userGateway = new UserGateway();
     private final WorkflowBackupRepository workflowBackupRepository = new WorkflowBackupRepositoryImpl();
     private final WorkflowRepository workflowRepository = new WorkflowRepositoryImpl();
     private final ParallelBranchRepository parallelBranchRepository = new ParallelBranchRepositoryImpl();
     private final DelayTaskRepository delayTaskRepository = new DelayTaskRepositoryImpl();
     private final UrgeIntervalRepository urgeIntervalRepository = new UrgeIntervalRepositoryImpl();
-    private final FlowService flowService = new FlowService(workflowRepository, userGateway, flowRecordRepository,flowTodoMargeRecordRepository,flowTodoMargeRelationRepository, workflowBackupRepository, parallelBranchRepository, delayTaskRepository, urgeIntervalRepository);
+    private final FlowService flowService = new FlowService(workflowRepository, userGateway, flowRecordRepository, flowTodoRecordRepository, flowTodoMergeRepository, workflowBackupRepository, parallelBranchRepository, delayTaskRepository, urgeIntervalRepository);
 
     @Test
     void create() {