feat: add last id

arex-storage-model/src/main/java/com/arextest/model/replay/QuerySceneRequestType.java

@@ -7,5 +7,6 @@
 public class QuerySceneRequestType extends PagedRequestType {
 
     private String categoryType;
+    private String lastId;
 
 }

arex-storage-model/src/main/java/com/arextest/model/replay/dto/SceneDTO.java

@@ -13,4 +13,5 @@
 public class SceneDTO {
     private List<String> sceneList;
     private Long total;
+    private String lastId;
 }

arex-storage-web-api/src/main/java/com/arextest/storage/model/Constants.java

@@ -41,5 +41,8 @@ public interface Constants{
   String AGENT_VERSION = "agentVersion";
   String CLAZZ_NAME_AREX_MOCKER = AREXMocker.class.getSimpleName();
   String CLAZZ_NAME_AREX_QUERY_MOCKER = AREXQueryMocker.class.getSimpleName();
+  String QUERY_CONFIG_URL = "query.config.url";
+  String QUERY_SCHEDULE_REPLAY_CONFIG_URL = "query.schedule.replay.config.url";
+  String UPDATE_CASE_STATUS_URL = "update.case.status.url";
 
 }

arex-storage-web-api/src/main/java/com/arextest/storage/repository/scenepool/ScenePoolProvider.java

@@ -17,7 +17,7 @@ public interface ScenePoolProvider {
 
   Scene findByRecordId(String recordId);
 
-  List<String> findRecordsByAppId(String appId, int pageIndex, int pageSize);
+  List<Scene> findRecordsByAppId(String appId, String lastId, int pageSize);
 
   long countByAppId(String appId);
 }

arex-storage-web-api/src/main/java/com/arextest/storage/repository/scenepool/ScenePoolProviderImpl.java

@@ -6,12 +6,9 @@
 import java.time.ZoneId;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 import lombok.AllArgsConstructor;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.mongodb.core.FindAndModifyOptions;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
@@ -81,16 +78,16 @@ public Scene findByRecordId(String recordId) {
   }
 
   @Override
-  public List<String> findRecordsByAppId(String appId, int pageIndex, int pageSize) {
-    Query filter = Query.query(Criteria.where(Fields.appId).is(appId));
-
-    filter.fields().include(Fields.recordId);
-
-    Pageable pageableRequest = PageRequest.of(pageIndex, pageSize, Sort.by(Direction.ASC, Fields.id));
-    filter.with(pageableRequest);
-    return getTemplate().find(filter, Scene.class, getCollectionName()).stream()
-        .map(Scene::getRecordId)
-        .collect(Collectors.toList());
+  public List<Scene> findRecordsByAppId(String appId, String lastId, int pageSize) {
+    Criteria criteria = Criteria.where(Fields.appId).is(appId);
+    if (StringUtils.isNotBlank(lastId)) {
+      criteria.and(Fields.id).gt(lastId);
+    }
+    Query filter = Query.query(criteria);
+    filter.fields().include(Fields.recordId, Fields.id);
+    filter.limit(pageSize);
+    filter.with(Sort.by(Sort.Order.asc(Fields.id)));
+    return getTemplate().find(filter, Scene.class, getCollectionName());
   }
 
   @Override

arex-storage-web-api/src/main/java/com/arextest/storage/service/QueryConfigService.java

@@ -2,6 +2,7 @@
 
 import static com.arextest.diff.utils.JacksonHelperUtil.objectMapper;
 import com.arextest.common.cache.CacheProvider;
+import com.arextest.common.config.DefaultApplicationConfig;
 import com.arextest.config.model.dao.config.SystemConfigurationCollection.KeySummary;
 import com.arextest.config.model.dto.ComparisonExclusionsConfiguration;
 import com.arextest.config.model.dto.application.AppContract;
@@ -18,6 +19,7 @@
 import com.arextest.model.mock.Mocker;
 import com.arextest.storage.cache.CacheKeyUtils;
 import com.arextest.storage.client.HttpWebServiceApiClient;
+import com.arextest.storage.model.Constants;
 import com.arextest.storage.repository.AppContractRepository;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -73,6 +75,8 @@ public class QueryConfigService {
 
   @Resource
   private AppContractRepository appContractRepository;
+  @Resource
+  private DefaultApplicationConfig defaultApplicationConfig;
 
   public QueryConfigOfCategory queryConfigOfCategory(Mocker mocker) {
     if (mocker.getCategoryType().isSkipComparison()) {
@@ -94,7 +98,8 @@ public QueryConfigOfCategory queryConfigOfCategory(Mocker mocker) {
     queryConfigOfCategoryRequest.setEntryPoint(mocker.getCategoryType().isEntryPoint());
     queryConfigOfCategoryRequest.setOperationName(operationName);
     QueryConfigOfCategoryResponse queryConfigOfCategoryResponse =
-        httpWebServiceApiClient.jsonPost(queryConfigOfCategoryUrl,
+        httpWebServiceApiClient.jsonPost(defaultApplicationConfig.getConfigAsString(Constants.QUERY_CONFIG_URL,
+                queryConfigOfCategoryUrl),
             queryConfigOfCategoryRequest, QueryConfigOfCategoryResponse.class);
     if (queryConfigOfCategoryResponse != null && queryConfigOfCategoryResponse.getBody() != null) {
       putConfigCache(appId, categoryName, operationName, queryConfigOfCategoryResponse.getBody());
@@ -104,7 +109,8 @@ public QueryConfigOfCategory queryConfigOfCategory(Mocker mocker) {
   }
 
   public ScheduleReplayConfigurationResponse queryScheduleReplayConfiguration(String appId) {
-    String url = String.format(queryScheduleReplayConfigurationUrl, appId);
+    String url = String.format(defaultApplicationConfig.getConfigAsString(Constants.QUERY_SCHEDULE_REPLAY_CONFIG_URL,
+        queryScheduleReplayConfigurationUrl), appId);
     return httpWebServiceApiClient.get(url, Collections.emptyMap(),
         ScheduleReplayConfigurationResponse.class);
   }

arex-storage-web-api/src/main/java/com/arextest/storage/service/ScenePoolService.java

@@ -12,8 +12,10 @@
 import java.util.Date;
 import java.util.List;
 import jakarta.annotation.Resource;
+import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 /**
  * created by xinyuan_wang on 2024/2/2
@@ -72,9 +74,8 @@ public AREXMocker findByRecordId(String recordId, MockCategoryType categoryType)
     return convert(provider.findByRecordId(recordId));
   }
 
-  public SceneDTO findRecordsByAppId(String appId, String category, Integer pageIndex, int pageSize) {
-    if (StringUtils.isEmpty(appId) || StringUtils.isEmpty(category) || pageIndex == null
-        || pageIndex < 0 || pageSize == 0) {
+  public SceneDTO findRecordsByAppId(String appId, String lastId, String category, int pageSize) {
+    if (StringUtils.isEmpty(appId) || StringUtils.isEmpty(category) || pageSize == 0) {
       return null;
     }
 
@@ -93,8 +94,16 @@ public SceneDTO findRecordsByAppId(String appId, String category, Integer pageIn
       return sceneDTO;
     }
 
-    List<String> scenes = provider.findRecordsByAppId(appId, pageIndex, pageSize);
-    sceneDTO.setSceneList(scenes);
+    List<Scene> scenes = provider.findRecordsByAppId(appId, lastId, pageSize);
+    if (CollectionUtils.isEmpty(scenes)) {
+      sceneDTO.setSceneList(Collections.emptyList());
+      return sceneDTO;
+    }
+
+    List<String> recordIds = scenes.stream().map(Scene::getRecordId).collect(Collectors.toList());
+    Scene last = scenes.getLast();
+    sceneDTO.setSceneList(recordIds);
+    sceneDTO.setLastId(last.getId());
     return sceneDTO;
   }
 

arex-storage-web-api/src/main/java/com/arextest/storage/service/UpdateCaseStatusService.java

@@ -1,8 +1,10 @@
 package com.arextest.storage.service;
 
+import com.arextest.common.config.DefaultApplicationConfig;
 import com.arextest.model.replay.UpdateCaseStatusRequestType;
 import com.arextest.model.replay.UpdateCaseStatusResponseType;
 import com.arextest.storage.client.HttpWebServiceApiClient;
+import com.arextest.storage.model.Constants;
 import com.arextest.storage.trace.MDCTracer;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -22,6 +24,8 @@ public class UpdateCaseStatusService {
   private String updateCaseStatusUrl;
   @Resource
   private HttpWebServiceApiClient httpWebServiceApiClient;
+  @Resource
+  private DefaultApplicationConfig defaultApplicationConfig;
   private static final String TITLE = "[[title=updateCaseStatus]]";
 
   public void updateStatusOfCase(String recordId, int caseStatus) {
@@ -32,7 +36,7 @@ public void updateStatusOfCase(String recordId, int caseStatus) {
     try {
       MDCTracer.addRecordId(recordId);
       UpdateCaseStatusResponseType response = httpWebServiceApiClient.jsonPost(
-          updateCaseStatusUrl,
+          defaultApplicationConfig.getConfigAsString(Constants.UPDATE_CASE_STATUS_URL, updateCaseStatusUrl),
           new UpdateCaseStatusRequestType(recordId, caseStatus),
           UpdateCaseStatusResponseType.class
       );

arex-storage-web-api/src/main/java/com/arextest/storage/web/controller/ScenePoolController.java

@@ -39,7 +39,7 @@ public Response clearReplayPool(@PathVariable("appId") String appId) {
   @ResponseBody
   public Response findRecordsByAppId(@RequestBody QuerySceneRequestType requestType) {
     return ResponseUtils.successResponse(
-        scenePoolService.findRecordsByAppId(requestType.getAppId(), requestType.getCategoryType(),
-            requestType.getPageIndex(), requestType.getPageSize()));
+        scenePoolService.findRecordsByAppId(requestType.getAppId(), requestType.getLastId(), requestType.getCategoryType(),
+            requestType.getPageSize()));
   }
 }

pom.xml

@@ -443,13 +443,12 @@
       <id>jar-local</id>
       <properties>
         <packagingType>jar</packagingType>
-        <snapshots.repo></snapshots.repo>
       </properties>
     </profile>
   </profiles>
 
   <properties>
-    <revision>2.0.7</revision>
+    <revision>2.0.8</revision>
     <commons-lang3.version>3.3.2</commons-lang3.version>
     <java.version>1.8</java.version>