Fix/update scene info mongo (#451)

* fix：remove the diffDetail in SubSceneInfo
* feat: remove diffDetails in SceneInfo

* feat: remove invalid code

arex-web-api/src/main/resources/application-dev.yaml

@@ -11,7 +11,7 @@ arex:
     service:
       url: http://10.118.1.217:18092
   mongo:
-    uri: mongodb://arex:password@10.118.1.217:37017/arex_storage_db
+    uri: mongodb://arex:iLoveArex@10.118.1.217:37017/arex_storage_db
 
 # standalone without password
 spring:

arex-web-core/src/main/java/com/arextest/web/core/business/iosummary/SceneReportService.java

@@ -13,6 +13,7 @@
 import com.arextest.web.model.dto.PlanItemDto;
 import com.arextest.web.model.dto.ReportPlanStatisticDto;
 import com.arextest.web.model.dto.iosummary.CaseSummary;
+import com.arextest.web.model.dto.iosummary.DiffDetail;
 import com.arextest.web.model.dto.iosummary.SceneInfo;
 import com.arextest.web.model.dto.iosummary.SubSceneInfo;
 import com.arextest.web.model.enums.DiffResultCode;
@@ -65,9 +66,8 @@ public class SceneReportService {
    */
   public void report(CaseSummary caseSummary) {
     SceneInfo sceneInfo = SceneInfo.builder().code(caseSummary.getCode())
-        .categoryKey(caseSummary.categoryKey())
-        .planId(caseSummary.getPlanId()).planItemId(caseSummary.getPlanItemId())
-        .summary(caseSummary).build();
+        .categoryKey(caseSummary.categoryKey()).planId(caseSummary.getPlanId())
+        .planItemId(caseSummary.getPlanItemId()).summary(caseSummary).build();
     sceneInfoRepository.save(sceneInfo);
   }
 
@@ -101,11 +101,10 @@ private List<SceneInfo> checkDuplicateScene(List<SceneInfo> sceneInfos) {
 
   public QuerySceneInfoResponseType querySceneInfo(String planId, String planItemId) {
     QuerySceneInfoResponseType response = new QuerySceneInfoResponseType();
-    List<SceneInfo> sceneInfos = sceneInfoRepository.querySceneInfo(planId, planItemId);
+    List<SceneInfo> sceneInfos = queryCompleteSceneInfo(planId, planItemId);
     sceneInfos = checkDuplicateScene(sceneInfos);
-    List<QuerySceneInfoResponseType.SceneInfoType> sceneInfoTypes =
-        sceneInfos.stream().map(SceneInfoMapper.INSTANCE::contractFromDto)
-            .collect(Collectors.toList());
+    List<QuerySceneInfoResponseType.SceneInfoType> sceneInfoTypes = sceneInfos.stream()
+        .map(SceneInfoMapper.INSTANCE::contractFromDto).collect(Collectors.toList());
 
     // to set recordTime and replayTime
     Map<String, QuerySceneInfoResponseType.SubSceneInfoType> subSceneInfoTypeMap = new HashMap<>();
@@ -118,8 +117,7 @@ public QuerySceneInfoResponseType querySceneInfo(String planId, String planItemI
     if (MapUtils.isNotEmpty(subSceneInfoTypeMap)) {
       List<CompareResultDto> dtos = replayCompareResultRepository.queryCompareResults(planId,
           Collections.singletonList(planItemId), new ArrayList<>(subSceneInfoTypeMap.keySet()),
-          null,
-          Arrays.asList(RECORD_ID, RECORD_TIME, REPLAY_TIME));
+          null, Arrays.asList(RECORD_ID, RECORD_TIME, REPLAY_TIME));
       for (CompareResultDto dto : dtos) {
         String recordId = dto.getRecordId();
         QuerySceneInfoResponseType.SubSceneInfoType subSceneInfoType = subSceneInfoTypeMap.get(
@@ -145,7 +143,7 @@ public boolean feedbackScene(FeedbackSceneRequest request) {
     final Integer feedbackType = request.getFeedbackType();
 
     // update scene
-    List<SceneInfo> sceneInfos = sceneInfoRepository.querySceneInfo(planId, planItemId);
+    List<SceneInfo> sceneInfos = queryCompleteSceneInfo(planId, planItemId);
     sceneInfos.forEach(sceneInfo -> {
       if (MapUtils.isNotEmpty(sceneInfo.getSubSceneInfoMap())) {
         sceneInfo.getSubSceneInfoMap().forEach((groupKey, subSceneInfo) -> {
@@ -176,6 +174,36 @@ public boolean feedbackScene(FeedbackSceneRequest request) {
     return true;
   }
 
+
+  public List<SceneInfo> queryCompleteSceneInfo(String planId, String planItemId) {
+    List<SceneInfo> sceneInfos = sceneInfoRepository.querySceneInfo(planId, planItemId);
+    if (CollectionUtils.isEmpty(sceneInfos)) {
+      return sceneInfos;
+    }
+
+    Map<String, SubSceneInfo> recordIdToSubSceneInfoMap = new HashMap<>();
+    sceneInfos.forEach(item -> {
+      Map<String, SubSceneInfo> subSceneInfoMap = item.getSubSceneInfoMap();
+      if (MapUtils.isEmpty(subSceneInfoMap)) {
+        return;
+      }
+      subSceneInfoMap.forEach(
+          (groupKey, subSceneInfo) -> recordIdToSubSceneInfoMap.put(subSceneInfo.getRecordId(),
+              subSceneInfo)
+      );
+    });
+    List<String> recordIds = new ArrayList<>(recordIdToSubSceneInfoMap.keySet());
+    List<CaseSummary> caseSummaries = caseSummaryRepository.queryCaseSummary(planId, planItemId,
+        recordIds);
+    for (CaseSummary caseSummary : caseSummaries) {
+      String recordId = caseSummary.getRecordId();
+      List<DiffDetail> diffDetails = caseSummary.getDiffs();
+      SubSceneInfo subSceneInfo = recordIdToSubSceneInfoMap.get(recordId);
+      subSceneInfo.setDetails(diffDetails);
+    }
+    return sceneInfos;
+  }
+
   private boolean checkAllSubScenes(SceneInfo sceneInfo) {
     boolean result = true;
     for (SubSceneInfo subSceneInfo : sceneInfo.getSubSceneInfoMap().values()) {
@@ -191,15 +219,13 @@ private boolean passCases(String planId, String planItemId, String groupKey) {
     LOGGER.info("All the scenes has been passed");
     // query other cases in the same subScene
     List<CaseSummary> caseSummaryList = caseSummaryRepository.query(planId, planItemId);
-    List<String> recordIds =
-        caseSummaryList.stream()
-            .filter(caseSummary -> String.valueOf(caseSummary.groupKey()).equals(groupKey))
-            .map(CaseSummary::getRecordId).collect(Collectors.toList());
+    List<String> recordIds = caseSummaryList.stream()
+        .filter(caseSummary -> String.valueOf(caseSummary.groupKey()).equals(groupKey))
+        .map(CaseSummary::getRecordId).collect(Collectors.toList());
 
     // update compareResult
     List<CompareResultDto> compareResultList = replayCompareResultRepository.queryCompareResults(
-        planId,
-        Collections.singletonList(planItemId), recordIds, null,
+        planId, Collections.singletonList(planItemId), recordIds, null,
         Arrays.asList(RECORD_ID, RECORD_TIME, REPLAY_TIME));
     for (CompareResultDto compareResult : compareResultList) {
       compareResult.setDiffResultCode(DiffResultCode.COMPARED_WITHOUT_DIFFERENCE);

arex-web-core/src/main/java/com/arextest/web/core/repository/CaseSummaryRepository.java

@@ -10,4 +10,6 @@ public interface CaseSummaryRepository extends RepositoryProvider {
   boolean upsert(CaseSummary summary);
 
   List<CaseSummary> query(String planId, String planItemId);
+
+  List<CaseSummary> queryCaseSummary(String planId, String planItemId, List<String> recordIds);
 }

arex-web-core/src/main/java/com/arextest/web/core/repository/mongo/CaseSummaryRepositoryImpl.java

@@ -5,8 +5,10 @@
 import com.arextest.web.model.dao.mongodb.iosummary.CaseSummaryCollection;
 import com.arextest.web.model.dto.iosummary.CaseSummary;
 import com.arextest.web.model.mapper.CaseSummaryMapper;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.FindAndModifyOptions;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -59,4 +61,20 @@ public List<CaseSummary> query(String planId, String planItemId) {
     return caseSummaryCollections.stream().map(CaseSummaryMapper.INSTANCE::dtoFromDao)
         .collect(Collectors.toList());
   }
+
+  @Override
+  public List<CaseSummary> queryCaseSummary(String planId, String planItemId,
+      List<String> recordIds) {
+    if (CollectionUtils.isEmpty(recordIds)) {
+      return Collections.emptyList();
+    }
+    Query query = Query.query(Criteria.where(PLAN_ID).is(planId).and(PLAN_ITEM_ID)
+        .is(planItemId).and(RECORD_ID).in(recordIds));
+    List<CaseSummaryCollection> caseSummaryCollections = mongoTemplate.find(query,
+        CaseSummaryCollection.class);
+    return caseSummaryCollections.stream().map(CaseSummaryMapper.INSTANCE::dtoFromDao)
+        .collect(Collectors.toList());
+  }
+
+
 }

arex-web-core/src/main/java/com/arextest/web/core/repository/mongo/SceneInfoRepositoryImpl.java

@@ -68,8 +68,6 @@ public SceneInfo save(SceneInfo sceneInfo) {
           subSceneInfo.getRecordId());
       update.set(toColumnName(groupKeyName, SubSceneInfoDao.Fields.replayId),
           subSceneInfo.getReplayId());
-      update.set(toColumnName(groupKeyName, SubSceneInfoDao.Fields.details),
-          subSceneInfo.getDetails());
     }
 
     SceneInfoCollection andModify = mongoTemplate.findAndModify(query, update,

arex-web-model/src/main/java/com/arextest/web/model/dao/mongodb/iosummary/CaseSummaryCollection.java

@@ -23,5 +23,8 @@ public class CaseSummaryCollection extends ModelBase {
 
   private List<DiffDetailDao> diffs;
 
+  private Long categoryKey;
+  private Long groupKey;
+
   private Date dataCreateTime;
 }

arex-web-model/src/main/java/com/arextest/web/model/dao/mongodb/iosummary/SubSceneInfoDao.java

@@ -1,7 +1,6 @@
 package com.arextest.web.model.dao.mongodb.iosummary;
 
 import com.arextest.web.model.enums.FeedbackTypeEnum;
-import java.util.List;
 import lombok.Data;
 import lombok.experimental.FieldNameConstants;
 
@@ -12,16 +11,15 @@
 @FieldNameConstants
 public class SubSceneInfoDao {
 
-  private int code;
   private int count;
 
+  private int code;
   private String recordId;
   private String replayId;
+
   /**
    * @see FeedbackTypeEnum#getCode() ;
    */
   private Integer feedbackType;
   private String remark;
-
-  private List<DiffDetailDao> details;
 }

pom.xml

@@ -495,7 +495,7 @@
 
   <properties>
     <!-- Maven CI Friendly Versions https://maven.apache.org/maven-ci-friendly.html -->
-    <revision>0.6.5.7</revision>
+    <revision>0.6.5.8</revision>
     <arex-common.version>0.1.28</arex-common.version>
     <arex-extension-interface.version>0.0.1</arex-extension-interface.version>
     <arex-storage-config.version>1.2.24</arex-storage-config.version>