Merge pull request #1169 from lowcoder-org/feature/editlock

set editingUserId, lastEditedAt on put endpoint, get editingUserId, lastEditedAt on get endpoint

Author: FalkWolsky

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

@@ -352,6 +352,7 @@ public Mono<Boolean> updateLastEditedAt(String applicationId, Instant time, Stri
         return repository.findByIdIn(List.of(applicationId))
                 .filter(application -> application.getEditingUserId().equals(visitorId))
                 .doOnNext(application -> application.setLastEditedAt(time))
+                .doOnNext(application -> application.setEditingUserId(visitorId))
                 .flatMap(repository::save)
                 .hasElements();
     }

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

@@ -256,18 +256,11 @@ 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())
                 .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();
-
-                    if(!visitorId.equals(application.getEditingUserId()) && (application.getLastEditedAt() == null || application.getLastEditedAt().compareTo(Instant.now().minusSeconds(300)) < 0)) {
-                        application.setEditingUserId(visitorId);
-                        application.setLastEditedAt(Instant.now());
-                    }
+                    ResourcePermission permission = tuple.getT1();
+                    Application application = tuple.getT2();
+                    List<Application> dependentModules = tuple.getT3();
+                    Map<String, Object> commonSettings = tuple.getT4();
 
                     Map<String, Map<String, Object>> dependentModuleDsl = dependentModules.stream()
                             .collect(Collectors.toMap(Application::getId, Application::getLiveApplicationDsl, (a, b) -> b));