Merge pull request #238 from chanyoung1998/#234

fix : AnnotationStatus of Data not changing appropriatly when submitting
xtreme1-io · Apr 19, 2024 · 973ee1c · 973ee1c
2 parents ec6085a + 815baa7
commit 973ee1c
Showing 1 changed file with 25 additions and 9 deletions.
diff --git a/backend/src/main/java/ai/basic/x1/usecase/DataFlowUseCase.java b/backend/src/main/java/ai/basic/x1/usecase/DataFlowUseCase.java
@@ -14,8 +14,8 @@
 import java.util.Optional;
 
 /**
- * @author chenchao
- * @date 2022/8/26
+ * @author chenchao, chanYoung
+ * @date 2024/4/15
  */
 public class DataFlowUseCase {
 
@@ -51,19 +51,35 @@ public void submit(Long itemId) {
         if (DataStatusEnum.VALID.equals(status)) {
             annotationStatus = DataAnnotationStatusEnum.ANNOTATED;
         }
-        dataInfoDAO.updateById(DataInfo.builder().id(itemId).annotationStatus(annotationStatus).build());
+        dataInfoDAO.updateById(DataInfo.builder().id(itemId).status(status).annotationStatus(annotationStatus).build());
         var sceneId = dataEdit.getSceneId();
-        if (ObjectUtil.isNotNull(sceneId) && DataStatusEnum.INVALID.equals(status)) {
-            dataInfoDAO.updateById(DataInfo.builder().id(sceneId).annotationStatus(DataAnnotationStatusEnum.INVALID).build());
-        } else if (ObjectUtil.isNotNull(sceneId) &&  DataStatusEnum.VALID.equals(status)) {
+        if (ObjectUtil.isNotNull(sceneId)) {
             var lambdaQueryWrapper = Wrappers.lambdaQuery(DataInfo.class);
             lambdaQueryWrapper.eq(DataInfo::getDatasetId, dataEdit.getDatasetId());
             lambdaQueryWrapper.eq(DataInfo::getParentId, sceneId);
             lambdaQueryWrapper.eq(DataInfo::getStatus, DataStatusEnum.INVALID);
-            if (dataInfoDAO.count() == 0) {
-                dataInfoDAO.updateById(DataInfo.builder().id(sceneId).annotationStatus(DataAnnotationStatusEnum.ANNOTATED).build());
+            if (dataInfoDAO.count(lambdaQueryWrapper) == 0) {
+                dataInfoDAO.updateById(DataInfo.builder().id(sceneId).status(DataStatusEnum.VALID).annotationStatus(DataAnnotationStatusEnum.ANNOTATED).build());
+                var dataInfoLambdaUpdateWrapper = Wrappers.lambdaUpdate(DataInfo.class)
+                        .eq(DataInfo::getDatasetId, dataEdit.getDatasetId())
+                        .eq(DataInfo::getParentId, sceneId);
+                dataInfoLambdaUpdateWrapper.set(DataInfo::getAnnotationStatus, DataAnnotationStatusEnum.ANNOTATED);
+                dataInfoDAO.update(dataInfoLambdaUpdateWrapper);
             } else {
-                dataInfoDAO.updateById(DataInfo.builder().id(sceneId).annotationStatus(DataAnnotationStatusEnum.INVALID).build());
+                dataInfoDAO.updateById(DataInfo.builder().id(sceneId).status(DataStatusEnum.INVALID).annotationStatus(DataAnnotationStatusEnum.INVALID).build());
+                var dataInfoLambdaUpdateWrapper = Wrappers.lambdaUpdate(DataInfo.class)
+                        .eq(DataInfo::getDatasetId, dataEdit.getDatasetId())
+                        .eq(DataInfo::getParentId, sceneId)
+                        .eq(DataInfo::getStatus, DataStatusEnum.VALID);
+                dataInfoLambdaUpdateWrapper.set(DataInfo::getAnnotationStatus, DataAnnotationStatusEnum.ANNOTATED);
+                dataInfoDAO.update(dataInfoLambdaUpdateWrapper);
+
+                var dataInfoLambdaUpdateWrapper2 = Wrappers.lambdaUpdate(DataInfo.class)
+                        .eq(DataInfo::getDatasetId, dataEdit.getDatasetId())
+                        .eq(DataInfo::getParentId, sceneId)
+                        .eq(DataInfo::getStatus, DataStatusEnum.INVALID);
+                dataInfoLambdaUpdateWrapper2.set(DataInfo::getAnnotationStatus, DataAnnotationStatusEnum.INVALID);
+                dataInfoDAO.update(dataInfoLambdaUpdateWrapper2);
             }
         }
     }