Add editingUserId to application, overwrite when expired

Author: Thomasr

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

@@ -52,6 +52,9 @@ public class Application extends HasIdAndAuditing {
     private Boolean publicToMarketplace;
     @Setter
     private Boolean agencyProfile;
+    @Getter
+    @Setter
+    private String editingUserId;
 
     public Application(
             @JsonProperty("orgId") String organizationId,
@@ -63,7 +66,8 @@ public Application(
             @JsonProperty("editingApplicationDSL") Map<String, Object> editingApplicationDSL,
             @JsonProperty("publicToAll") Boolean publicToAll,
             @JsonProperty("publicToMarketplace") Boolean publicToMarketplace,
-            @JsonProperty("agencyProfile") Boolean agencyProfile
+            @JsonProperty("agencyProfile") Boolean agencyProfile,
+            @JsonProperty("editingUserId") String editingUserId
     ) {
         this.gid = gid;
         this.organizationId = organizationId;
@@ -75,6 +79,7 @@ public Application(
         this.publicToMarketplace = publicToMarketplace;
         this.agencyProfile = agencyProfile;
         this.editingApplicationDSL = editingApplicationDSL;
+        this.editingUserId = editingUserId;
     }
 
     @Transient

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

@@ -18,4 +18,5 @@ public interface ApplicationHistorySnapshotService {
 
     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

@@ -57,4 +57,9 @@ 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) {
+        return repository.findAllByApplicationId(applicationId, PageRequest.of(0, 1).withSort(Direction.DESC, "createdAt")).last();
+    }
 }

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

@@ -21,10 +21,8 @@
 import org.lowcoder.api.permission.PermissionHelper;
 import org.lowcoder.api.permission.view.PermissionItemView;
 import org.lowcoder.api.usermanagement.OrgDevChecker;
-import org.lowcoder.domain.application.model.Application;
-import org.lowcoder.domain.application.model.ApplicationRequestType;
-import org.lowcoder.domain.application.model.ApplicationStatus;
-import org.lowcoder.domain.application.model.ApplicationType;
+import org.lowcoder.domain.application.model.*;
+import org.lowcoder.domain.application.service.ApplicationHistorySnapshotService;
 import org.lowcoder.domain.application.service.ApplicationService;
 import org.lowcoder.domain.datasource.model.Datasource;
 import org.lowcoder.domain.datasource.service.DatasourceService;
@@ -45,7 +43,6 @@
 import org.lowcoder.sdk.exception.BizException;
 import org.lowcoder.sdk.plugin.common.QueryExecutor;
 import org.lowcoder.sdk.util.ExceptionUtils;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
@@ -58,7 +55,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import static org.lowcoder.domain.application.model.ApplicationStatus.NORMAL;
@@ -94,6 +90,7 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
     private final TemplateService templateService;
     private final PermissionHelper permissionHelper;
     private final DatasourceService datasourceService;
+    private final ApplicationHistorySnapshotService applicationHistorySnapshotService;
 
     @Override
     public Mono<ApplicationView> create(CreateApplicationRequest createApplicationRequest) {
@@ -105,7 +102,7 @@ public Mono<ApplicationView> create(CreateApplicationRequest createApplicationRe
                 NORMAL,
                 createApplicationRequest.publishedApplicationDSL(),
                 createApplicationRequest.editingApplicationDSL(),
-                false, false, false);
+                false, false, false, "");
 
         if (StringUtils.isBlank(application.getOrganizationId())) {
             return deferredError(INVALID_PARAMETER, "ORG_ID_EMPTY");
@@ -259,19 +256,28 @@ 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)
-                .map(tuple -> {
-                    ResourcePermission permission = tuple.getT1();
-                    Application application = tuple.getT2();
-                    List<Application> dependentModules = tuple.getT3();
-                    Map<String, Object> commonSettings = tuple.getT4();
+                .zipWhen(tuple -> sessionUserService.getVisitorId().zipWith(applicationHistorySnapshotService.getLastSnapshotByApp(applicationId)))
+                .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();
+
+                    if(!visitorId.equals(application.getEditingUserId()) && lastSnapshot.getCreatedAt().compareTo(Instant.now().minusSeconds(300)) < 0) {
+                        application.setEditingUserId(visitorId);
+                    }
+
                     Map<String, Map<String, Object>> dependentModuleDsl = dependentModules.stream()
                             .collect(Collectors.toMap(Application::getId, Application::getLiveApplicationDsl, (a, b) -> b));
-                    return ApplicationView.builder()
+                    return applicationService.updateById(applicationId, application).map(__ ->
+                        ApplicationView.builder()
                             .applicationInfoView(buildView(application, permission.getResourceRole().getValue()))
                             .applicationDSL(application.getEditingApplicationDSL())
                             .moduleDSL(dependentModuleDsl)
                             .orgCommonSettings(commonSettings)
-                            .build();
+                            .build());
                 });
     }
 
@@ -540,6 +546,7 @@ private ApplicationInfoView buildView(Application application, String role, @Nul
                 .publicToAll(application.isPublicToAll())
                 .publicToMarketplace(application.isPublicToMarketplace())
                 .agencyProfile(application.agencyProfile())
+                .editingUserId(application.getEditingUserId())
                 .build();
     }
 

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

@@ -38,6 +38,8 @@ public class ApplicationInfoView {
     private final boolean publicToMarketplace;
     private final boolean agencyProfile;
 
+    private final String editingUserId;
+
     public long getLastViewTime() {
         return lastViewTime == null ? 0 : lastViewTime.toEpochMilli();
     }