feat:add queryPlanStatistic for backend (#335)

Co-authored-by: yushuwang <[email protected]>

arex-web-api/pom.xml

@@ -66,7 +66,7 @@
   <parent>
     <artifactId>arex-web</artifactId>
     <groupId>com.arextest</groupId>
-    <version>0.6.0.11</version>
+    <version>0.6.0.12</version>
   </parent>
   <profiles>
     <profile>

arex-web-api/src/main/java/com/arextest/web/api/service/beans/InterceptorConfiguration.java

@@ -61,6 +61,7 @@ public void addInterceptors(InterceptorRegistry registry) {
     defaultPatterns.add("/api/desensitization/listJar");
     defaultPatterns.add("/api/system/config/list");
     defaultPatterns.add("/api/config/comparison/summary/queryConfigOfCategory");
+    defaultPatterns.add("/api/report/queryPlanStatistic");
 
     // exclude configuration services
     defaultPatterns.add("/api/config/**");

arex-web-api/src/main/java/com/arextest/web/api/service/controller/ReportQueryController.java

@@ -46,6 +46,8 @@
 import com.arextest.web.model.contract.contracts.QueryPlanFailCaseRequestType;
 import com.arextest.web.model.contract.contracts.QueryPlanItemStatisticsRequestType;
 import com.arextest.web.model.contract.contracts.QueryPlanItemStatisticsResponseType;
+import com.arextest.web.model.contract.contracts.QueryPlanStatisticRequestType;
+import com.arextest.web.model.contract.contracts.QueryPlanStatisticResponseType;
 import com.arextest.web.model.contract.contracts.QueryPlanStatisticsRequestType;
 import com.arextest.web.model.contract.contracts.QueryPlanStatisticsResponseType;
 import com.arextest.web.model.contract.contracts.QueryReplayCaseRequestType;
@@ -199,7 +201,18 @@ public Response queryPlanStatistics(@RequestBody QueryPlanStatisticsRequestType
       return ResponseUtils.errorResponse("invalid paging parameter",
           ResponseCode.REQUESTED_PARAMETER_INVALID);
     }
-    QueryPlanStatisticsResponseType response = queryPlanStatisticsService.planStatistic(request);
+    QueryPlanStatisticsResponseType response = queryPlanStatisticsService.planStatistics(request);
+    return ResponseUtils.successResponse(response);
+  }
+
+  @PostMapping("/queryPlanStatistic")
+  @ResponseBody
+  public Response queryPlanStatistic(@RequestBody QueryPlanStatisticRequestType request) {
+    if (request == null) {
+      return ResponseUtils.errorResponse("invalid paging parameter",
+          ResponseCode.REQUESTED_PARAMETER_INVALID);
+    }
+    QueryPlanStatisticResponseType response = queryPlanStatisticsService.planStatistic(request);
     return ResponseUtils.successResponse(response);
   }
 

arex-web-common/pom.xml

@@ -48,6 +48,6 @@
   <parent>
     <artifactId>arex-web</artifactId>
     <groupId>com.arextest</groupId>
-    <version>0.6.0.11</version>
+    <version>0.6.0.12</version>
   </parent>
 </project>

arex-web-core/pom.xml

@@ -95,6 +95,6 @@
   <parent>
     <artifactId>arex-web</artifactId>
     <groupId>com.arextest</groupId>
-    <version>0.6.0.11</version>
+    <version>0.6.0.12</version>
   </parent>
 </project>

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

@@ -1,12 +1,16 @@
 package com.arextest.web.core.business;
 
 import com.arextest.web.core.repository.mongo.ReportPlanStatisticRepositoryImpl;
+import com.arextest.web.model.contract.contracts.QueryPlanStatisticRequestType;
+import com.arextest.web.model.contract.contracts.QueryPlanStatisticResponseType;
 import com.arextest.web.model.contract.contracts.QueryPlanStatisticsRequestType;
 import com.arextest.web.model.contract.contracts.QueryPlanStatisticsResponseType;
 import com.arextest.web.model.contract.contracts.common.CaseCount;
 import com.arextest.web.model.contract.contracts.common.PlanStatistic;
 import com.arextest.web.model.dto.ReportPlanStatisticDto;
 import com.arextest.web.model.mapper.PlanMapper;
+
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -24,7 +28,7 @@ public class QueryPlanStatisticsService {
   @Autowired
   private CaseCountService caseCountService;
 
-  public QueryPlanStatisticsResponseType planStatistic(QueryPlanStatisticsRequestType request) {
+  public QueryPlanStatisticsResponseType planStatistics(QueryPlanStatisticsRequestType request) {
     QueryPlanStatisticsResponseType response = new QueryPlanStatisticsResponseType();
 
     Pair<List<ReportPlanStatisticDto>, Long> result = planStatisticRepository.pageQueryPlanStatistic(
@@ -58,4 +62,27 @@ public QueryPlanStatisticsResponseType planStatistic(QueryPlanStatisticsRequestT
     response.setPlanStatisticList(planStatistics);
     return response;
   }
+
+  public QueryPlanStatisticResponseType planStatistic(QueryPlanStatisticRequestType request) {
+    QueryPlanStatisticResponseType response = new QueryPlanStatisticResponseType();
+    ReportPlanStatisticDto reportPlanStatisticDto = planStatisticRepository.findByPlanId(request.getPlanId());
+    if (reportPlanStatisticDto == null) {
+      return response;
+    }
+    Map<String, CaseCount> caseCountMap = caseCountService.calculateCaseCountsByPlanIds(Collections.singletonList(request.getPlanId()));
+    if (caseCountMap.isEmpty() || !caseCountMap.containsKey(request.getPlanId())) {
+      return response;
+    }
+    CaseCount caseCount = caseCountMap.get(request.getPlanId());
+    reportPlanStatisticDto.setTotalCaseCount(caseCount.getTotalCaseCount());
+    reportPlanStatisticDto.setErrorCaseCount(caseCount.getErrorCaseCount());
+    reportPlanStatisticDto.setSuccessCaseCount(caseCount.getSuccessCaseCount());
+    reportPlanStatisticDto.setFailCaseCount(caseCount.getFailCaseCount());
+    reportPlanStatisticDto.setWaitCaseCount(caseCount.getTotalCaseCount() - caseCount.getReceivedCaseCount());
+    reportPlanStatisticDto.setTotalOperationCount(caseCount.getTotalOperationCount());
+    reportPlanStatisticDto.setSuccessOperationCount(caseCount.getSuccessOperationCount());
+    PlanStatistic planStatistic = PlanMapper.INSTANCE.contractFromDto(reportPlanStatisticDto);
+    response.setPlanStatistic(planStatistic);
+    return response;
+  }
 }

arex-web-core/src/main/java/com/arextest/web/core/business/listener/planfinish/InformPlanFinishedListener.java

@@ -85,7 +85,7 @@ private QueryPlanStatisticsResponseType queryPlan(String appId, String planId) {
     request.setPageSize(1);
     request.setPageIndex(1);
     request.setPlanId(planId);
-    return queryPlanStatisticsService.planStatistic(request);
+    return queryPlanStatisticsService.planStatistics(request);
   }
 
   @Override

arex-web-model-contract/pom.xml

@@ -34,7 +34,7 @@
   <parent>
     <artifactId>arex-web</artifactId>
     <groupId>com.arextest</groupId>
-    <version>0.6.0.11</version>
+    <version>0.6.0.12</version>
   </parent>
 
   <properties>

arex-web-model-contract/src/main/java/com/arextest/web/model/contract/contracts/QueryPlanStatisticRequestType.java

@@ -0,0 +1,15 @@
+package com.arextest.web.model.contract.contracts;
+
+import lombok.Data;
+
+/**
+ * @author wildeslam.
+ * @create 2023/12/8 16:37
+ */
+@Data
+public class QueryPlanStatisticRequestType {
+
+      private String appId;
+      private String planId;
+      private String imageId;
+}

arex-web-model-contract/src/main/java/com/arextest/web/model/contract/contracts/QueryPlanStatisticResponseType.java

@@ -0,0 +1,13 @@
+package com.arextest.web.model.contract.contracts;
+
+import com.arextest.web.model.contract.contracts.common.PlanStatistic;
+import lombok.Data;
+
+/**
+ * @author wildeslam.
+ * @create 2023/12/8 16:41
+ */
+@Data
+public class QueryPlanStatisticResponseType {
+    private PlanStatistic planStatistic;
+}

arex-web-model/pom.xml

@@ -46,6 +46,6 @@
   <parent>
     <artifactId>arex-web</artifactId>
     <groupId>com.arextest</groupId>
-    <version>0.6.0.11</version>
+    <version>0.6.0.12</version>
   </parent>
 </project>

pom.xml

@@ -386,5 +386,5 @@
 
   <url>https://github.com/arextest/arex-report</url>
 
-  <version>0.6.0.11</version>
+  <version>0.6.0.12</version>
 </project>