Merge branch 'dev' into subscription-handling

Author: FalkWolsky

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

@@ -20,6 +20,7 @@
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.util.StringUtils;
 
+import java.time.Instant;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
@@ -55,6 +56,9 @@ public class Application extends HasIdAndAuditing {
     @Getter
     @Setter
     private String editingUserId;
+    @Getter
+    @Setter
+    protected Instant lastEditedAt;
 
     public Application(
             @JsonProperty("orgId") String organizationId,
@@ -67,7 +71,8 @@ public Application(
             @JsonProperty("publicToAll") Boolean publicToAll,
             @JsonProperty("publicToMarketplace") Boolean publicToMarketplace,
             @JsonProperty("agencyProfile") Boolean agencyProfile,
-            @JsonProperty("editingUserId") String editingUserId
+            @JsonProperty("editingUserId") String editingUserId,
+            @JsonProperty("lastEditedAt") Instant lastEditedAt
     ) {
         this.gid = gid;
         this.organizationId = organizationId;
@@ -80,6 +85,7 @@ public Application(
         this.agencyProfile = agencyProfile;
         this.editingApplicationDSL = editingApplicationDSL;
         this.editingUserId = editingUserId;
+        this.lastEditedAt = lastEditedAt;
     }
 
     @Transient

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

@@ -7,6 +7,7 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.time.Instant;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -73,4 +74,6 @@ public interface ApplicationService {
     Mono<Set<String>> getPublicAgencyApplicationIds(Collection<String> applicationIds);
 
     Flux<Application> findAll();
+
+    Mono<Boolean> updateLastEditedAt(String applicationId, Instant time, String visitorId);
 }

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

@@ -3,6 +3,7 @@
 
 import static org.lowcoder.domain.application.ApplicationUtil.getDependentModulesFromDsl;
 
+import java.time.Instant;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -345,4 +346,13 @@ public Mono<Set<String>> getPublicAgencyApplicationIds(Collection<String> applic
     public Flux<Application> findAll() {
         return repository.findAll();
     }
+
+    @Override
+    public Mono<Boolean> updateLastEditedAt(String applicationId, Instant time, String visitorId) {
+        return repository.findById(applicationId)
+                .filter(application -> application.getEditingUserId().equals(visitorId))
+                .doOnNext(application -> application.setLastEditedAt(time))
+                .flatMap(repository::save)
+                .hasElement();
+    }
 }

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

@@ -102,7 +102,7 @@ public Mono<ApplicationView> create(CreateApplicationRequest createApplicationRe
                 NORMAL,
                 createApplicationRequest.publishedApplicationDSL(),
                 createApplicationRequest.editingApplicationDSL(),
-                false, false, false, "");
+                false, false, false, "", Instant.now());
 
         if (StringUtils.isBlank(application.getOrganizationId())) {
             return deferredError(INVALID_PARAMETER, "ORG_ID_EMPTY");
@@ -256,17 +256,17 @@ public Mono<ApplicationView> getEditingApplication(String applicationId) {
                         .delayUntil(application -> checkApplicationStatus(application, NORMAL)))
                 .zipWhen(tuple -> applicationService.getAllDependentModulesFromApplication(tuple.getT2(), false), TupleUtils::merge)
                 .zipWhen(tuple -> organizationService.getOrgCommonSettings(tuple.getT2().getOrganizationId()), TupleUtils::merge)
-                .zipWhen(tuple -> sessionUserService.getVisitorId().zipWith(applicationHistorySnapshotService.getLastSnapshotByApp(applicationId)))
+                .zipWhen(tuple -> sessionUserService.getVisitorId())
                 .flatMap(tuple -> {
                     ResourcePermission permission = tuple.getT1().getT1();
                     Application application = tuple.getT1().getT2();
                     List<Application> dependentModules = tuple.getT1().getT3();
                     Map<String, Object> commonSettings = tuple.getT1().getT4();
-                    String visitorId = tuple.getT2().getT1();
-                    ApplicationHistorySnapshot lastSnapshot = tuple.getT2().getT2();
+                    String visitorId = tuple.getT2();
 
-                    if(!visitorId.equals(application.getEditingUserId()) && lastSnapshot.getCreatedAt().compareTo(Instant.now().minusSeconds(300)) < 0) {
+                    if(!visitorId.equals(application.getEditingUserId()) && (application.getLastEditedAt() == null || application.getLastEditedAt().compareTo(Instant.now().minusSeconds(300)) < 0)) {
                         application.setEditingUserId(visitorId);
+                        application.setLastEditedAt(Instant.now());
                     }
 
                     Map<String, Map<String, Object>> dependentModuleDsl = dependentModules.stream()

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

@@ -2,6 +2,7 @@
 
 import static org.lowcoder.api.util.ViewBuilder.multiBuild;
 
+import java.time.Instant;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -43,11 +44,12 @@ public Mono<ResponseView<Boolean>> create(@RequestBody ApplicationHistorySnapsho
         return sessionUserService.getVisitorId()
                 .delayUntil(visitor -> resourcePermissionService.checkResourcePermissionWithError(visitor, request.applicationId(),
                         ResourceAction.EDIT_APPLICATIONS))
-                .flatMap(visitorId -> applicationHistorySnapshotService.createHistorySnapshot(request.applicationId(),
+                .delayUntil(visitorId -> applicationHistorySnapshotService.createHistorySnapshot(request.applicationId(),
                         request.dsl(),
                         request.context(),
                         visitorId)
                 )
+                .flatMap(visitorId -> applicationService.updateLastEditedAt(request.applicationId(), Instant.now(), visitorId))
                 .map(ResponseView::success);
     }