From 891be31e6670825b67c1cc92b0b1f578d3961cce Mon Sep 17 00:00:00 2001 From: Thomasr Date: Wed, 18 Sep 2024 13:44:41 -0400 Subject: [PATCH] set editingUserId, lastEditedAt on put endpoint, get editingUserId, lastEditedAt on get endpoint --- .../service/ApplicationServiceImpl.java | 1 + .../application/ApplicationApiServiceImpl.java | 15 ++++----------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationServiceImpl.java index 1953acbe6..45f3726f2 100644 --- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationServiceImpl.java +++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationServiceImpl.java @@ -352,6 +352,7 @@ public Mono 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(); } diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java index db3e9171f..8a9005c35 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java @@ -256,18 +256,11 @@ public Mono 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 dependentModules = tuple.getT1().getT3(); - Map 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 dependentModules = tuple.getT3(); + Map commonSettings = tuple.getT4(); Map> dependentModuleDsl = dependentModules.stream() .collect(Collectors.toMap(Application::getId, Application::getLiveApplicationDsl, (a, b) -> b));