add theme to snapshot list api

Author: Thomasr

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/repository/ApplicationHistorySnapshotRepository.java

@@ -12,8 +12,10 @@
 @Repository
 public interface ApplicationHistorySnapshotRepository extends ReactiveMongoRepository<ApplicationHistorySnapshot, String> {
 
-    @Query(fields = "{applicationId : 1, context: 1, createdBy : 1, createdAt : 1}")
-    Flux<ApplicationHistorySnapshot> findAllByApplicationId(String applicationId, Pageable pageable);
+    @Query(value = "{ 'applicationId': ?0, $and: [{$or: [ { 'context.operations': { $elemMatch: { 'compName': ?1 } } }, { $expr: { $eq: [?1, null] } } ]}" +
+            ", {$or: [ { 'dsl.settings.themeId': ?2 }, { $expr: { $eq: [?2, null] } } ] } ] }",
+            fields = "{applicationId : 1, context: 1, createdBy : 1, createdAt : 1}")
+    Flux<ApplicationHistorySnapshot> findAllByApplicationId(String applicationId, String compName, String theme, Pageable pageable);
 
     Mono<Long> countByApplicationId(String applicationId);
 }

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationHistorySnapshotService.java

@@ -6,17 +6,16 @@
 import org.lowcoder.domain.application.model.ApplicationHistorySnapshot;
 import org.springframework.data.domain.PageRequest;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import reactor.core.publisher.Mono;
 
 public interface ApplicationHistorySnapshotService {
 
     Mono<Boolean> createHistorySnapshot(String applicationId, Map<String, Object> dsl, Map<String, Object> context, String userId);
 
-    Mono<List<ApplicationHistorySnapshot>> listAllHistorySnapshotBriefInfo(String applicationId, PageRequest pageRequest);
+    Mono<List<ApplicationHistorySnapshot>> listAllHistorySnapshotBriefInfo(String applicationId, String compName, String theme, PageRequest pageRequest);
 
     Mono<Long> countByApplicationId(String applicationId);
 
     Mono<ApplicationHistorySnapshot> getHistorySnapshotDetail(String historySnapshotId);
-
-    Mono<ApplicationHistorySnapshot> getLastSnapshotByApp(String applicationId);
 }

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/impl/ApplicationHistorySnapshotServiceImpl.java

@@ -19,6 +19,7 @@
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Service;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import reactor.core.publisher.Mono;
 
 @RequiredArgsConstructor
@@ -39,8 +40,8 @@ public Mono<Boolean> createHistorySnapshot(String applicationId, Map<String, Obj
     }
 
     @Override
-    public Mono<List<ApplicationHistorySnapshot>> listAllHistorySnapshotBriefInfo(String applicationId, PageRequest pageRequest) {
-        return repository.findAllByApplicationId(applicationId, pageRequest.withSort(Direction.DESC, "id"))
+    public Mono<List<ApplicationHistorySnapshot>> listAllHistorySnapshotBriefInfo(String applicationId, String compName, String theme, PageRequest pageRequest) {
+        return repository.findAllByApplicationId(applicationId, compName, theme, pageRequest.withSort(Direction.DESC, "id"))
                 .collectList()
                 .onErrorMap(Exception.class, e -> ofException(BizError.FETCH_HISTORY_SNAPSHOT_FAILURE, "FETCH_HISTORY_SNAPSHOT_FAILURE"));
     }
@@ -58,13 +59,4 @@ public Mono<ApplicationHistorySnapshot> getHistorySnapshotDetail(String historyS
         return repository.findById(historySnapshotId)
                 .switchIfEmpty(deferredError(INVALID_HISTORY_SNAPSHOT, "INVALID_HISTORY_SNAPSHOT", historySnapshotId));
     }
-
-    @Override
-    public Mono<ApplicationHistorySnapshot> getLastSnapshotByApp(String applicationId) {
-        ApplicationHistorySnapshot _default = new ApplicationHistorySnapshot();
-        _default.setCreatedAt(Instant.ofEpochMilli(0));
-        _default.setCreatedBy("");
-        return repository.findAllByApplicationId(applicationId, PageRequest.of(0, 1).withSort(Direction.DESC, "createdAt"))
-                .switchIfEmpty(Mono.just(_default)).next();
-    }
 }

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationHistorySnapshotController.java

@@ -55,15 +55,14 @@ 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 = "10") int size) {
+            @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size, @RequestParam String compName, @RequestParam String theme) {
 
         Pagination pagination = Pagination.of(page, size).check();
 
         return sessionUserService.getVisitorId()
                 .delayUntil(visitor -> resourcePermissionService.checkResourcePermissionWithError(visitor, applicationId,
                         ResourceAction.EDIT_APPLICATIONS))
-                .flatMap(__ -> applicationHistorySnapshotService.listAllHistorySnapshotBriefInfo(applicationId,
-                        pagination.toPageRequest()))
+                .flatMap(__ -> applicationHistorySnapshotService.listAllHistorySnapshotBriefInfo(applicationId, compName, theme, pagination.toPageRequest()))
                 .flatMap(snapshotList -> {
                     Mono<List<ApplicationHistorySnapshotBriefInfo>> snapshotBriefInfoList = multiBuild(snapshotList,
                             ApplicationHistorySnapshot::getCreatedBy,

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationHistorySnapshotEndpoints.java

@@ -2,6 +2,7 @@
 
 import java.util.Map;
 
+import jakarta.annotation.Nullable;
 import org.lowcoder.api.application.view.HistorySnapshotDslView;
 import org.lowcoder.api.framework.view.ResponseView;
 import org.lowcoder.infra.constant.NewUrl;
@@ -39,7 +40,8 @@ public interface ApplicationHistorySnapshotEndpoints
 	)
     @GetMapping("/{applicationId}")
     public Mono<ResponseView<Map<String, Object>>> listAllHistorySnapshotBriefInfo(@PathVariable String applicationId,
-            @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size);
+            @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size,
+			@RequestParam(required = false ) @Nullable String compName, @RequestParam(required = false ) @Nullable String theme);
 
 	@Operation(
 			tags = TAG_APPLICATION_HISTORY_MANAGEMENT,

server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/service/impl/ApplicationHistorySnapshotServiceTest.java

@@ -44,7 +44,7 @@ public void testServiceMethods() {
                 .verifyComplete();
 
 
-        StepVerifier.create(service.listAllHistorySnapshotBriefInfo(applicationId, PageRequest.of(0, 5)))
+        StepVerifier.create(service.listAllHistorySnapshotBriefInfo(applicationId, null, null, PageRequest.of(0, 5)))
                 .assertNext(list -> {
                     assertEquals(2, list.size());
 
@@ -64,7 +64,7 @@ public void testServiceMethods() {
                 })
                 .verifyComplete();
 
-        StepVerifier.create(service.listAllHistorySnapshotBriefInfo(applicationId, PageRequest.of(1, 1)))
+        StepVerifier.create(service.listAllHistorySnapshotBriefInfo(applicationId, null, null, PageRequest.of(1, 1)))
                 .assertNext(list -> {
                     assertEquals(1, list.size());
                     ApplicationHistorySnapshot one = list.get(0);
@@ -75,7 +75,7 @@ public void testServiceMethods() {
                 .verifyComplete();
 
 
-        StepVerifier.create(service.listAllHistorySnapshotBriefInfo(applicationId, PageRequest.of(0, 5))
+        StepVerifier.create(service.listAllHistorySnapshotBriefInfo(applicationId, null, null, PageRequest.of(0, 5))
                         .map(it -> it.get(0))
                         .map(HasIdAndAuditing::getId)
                         .flatMap(id -> service.getHistorySnapshotDetail(id)))