application snapshot history count logic fix

dragonpoo · ludomikula · commit a28b90f24b14 · 2024-11-22T11:40:47.000+01:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationHistorySnapshotService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationHistorySnapshotService.java
@@ -17,6 +17,7 @@ public interface ApplicationHistorySnapshotService {
     Mono<List<ApplicationHistorySnapshotTS>> listAllHistorySnapshotBriefInfoArchived(String applicationId, String compName, String theme, Instant from, Instant to, PageRequest pageRequest);
 
     Mono<Long> countByApplicationId(String applicationId);
+    Mono<Long> countByApplicationIdArchived(String applicationId);
 
     Mono<ApplicationHistorySnapshot> getHistorySnapshotDetail(String historySnapshotId);
 
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/impl/ApplicationHistorySnapshotServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/impl/ApplicationHistorySnapshotServiceImpl.java
@@ -59,6 +59,13 @@ public Mono<Long> countByApplicationId(String applicationId) {
                         e -> ofException(BizError.FETCH_HISTORY_SNAPSHOT_COUNT_FAILURE, "FETCH_HISTORY_SNAPSHOT_COUNT_FAILURE"));
     }
 
+    @Override
+    public Mono<Long> countByApplicationIdArchived(String applicationId) {
+        return repositoryArchived.countByApplicationId(applicationId)
+                .onErrorMap(Exception.class,
+                        e -> ofException(BizError.FETCH_HISTORY_SNAPSHOT_COUNT_FAILURE, "FETCH_HISTORY_SNAPSHOT_COUNT_FAILURE"));
+    }
+
 
     @Override
     public Mono<ApplicationHistorySnapshot> getHistorySnapshotDetail(String historySnapshotId) {
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationHistorySnapshotController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationHistorySnapshotController.java
@@ -55,7 +55,7 @@ public Mono<ResponseView<Boolean>> create(@RequestBody ApplicationHistorySnapsho
 
     @Override
     public Mono<ResponseView<Map<String, Object>>> listAllHistorySnapshotBriefInfo(@PathVariable String applicationId,
-            @RequestParam(defaultValue = "0") int page,
+            @RequestParam(defaultValue = "1") int page,
             @RequestParam(defaultValue = "10") int size,
             @RequestParam String compName,
             @RequestParam String theme,
@@ -92,7 +92,7 @@ public Mono<ResponseView<Map<String, Object>>> listAllHistorySnapshotBriefInfo(@
 
     @Override
     public Mono<ResponseView<Map<String, Object>>> listAllHistorySnapshotBriefInfoArchived(@PathVariable String applicationId,
-                                                                                   @RequestParam(defaultValue = "0") int page,
+                                                                                   @RequestParam(defaultValue = "1") int page,
                                                                                    @RequestParam(defaultValue = "10") int size,
                                                                                    @RequestParam String compName,
                                                                                    @RequestParam String theme,
@@ -119,7 +119,7 @@ public Mono<ResponseView<Map<String, Object>>> listAllHistorySnapshotBriefInfoAr
                             )
                     );
 
-                    Mono<Long> applicationHistorySnapshotCount = applicationHistorySnapshotService.countByApplicationId(applicationId);
+                    Mono<Long> applicationHistorySnapshotCount = applicationHistorySnapshotService.countByApplicationIdArchived(applicationId);
 
                     return Mono.zip(snapshotBriefInfoList, applicationHistorySnapshotCount)
                             .map(tuple -> ImmutableMap.of("list", tuple.getT1(), "count", tuple.getT2()));
