Updated deleted app

dragonpoo · ludomikula · commit 3ad5240d854f · 2025-05-21T23:10:38.000+02:00
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java
@@ -34,7 +34,7 @@ public interface ApplicationApiService {
 
     Mono<Void> updateUserApplicationLastViewTime(String applicationId);
 
-    Mono<ApplicationView> update(String applicationId, Application application);
+    Mono<ApplicationView> update(String applicationId, Application application, Boolean updateStatus);
 
     Mono<ApplicationView> publish(String applicationId, ApplicationPublishRequest applicationPublishRequest);
 
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
@@ -346,23 +346,24 @@ public Mono<Void> updateUserApplicationLastViewTime(String applicationId) {
     }
 
     @Override
-    public Mono<ApplicationView> update(String applicationId, Application application) {
-        return checkApplicationStatus(applicationId, NORMAL)
+    public Mono<ApplicationView> update(String applicationId, Application application, Boolean updateStatus) {
+        return Boolean.TRUE.equals(updateStatus) ? Mono.empty() : checkApplicationStatus(applicationId, NORMAL)
                 .then(sessionUserService.getVisitorId())
                 .flatMap(userId -> resourcePermissionService.checkAndReturnMaxPermission(userId,
                         applicationId, EDIT_APPLICATIONS))
                 .delayUntil(__ -> checkDatasourcePermissions(application))
-                .flatMap(permission -> doUpdateApplication(applicationId, application)
+                .flatMap(permission -> doUpdateApplication(applicationId, application, updateStatus)
                         .flatMap(applicationUpdated -> buildView(applicationUpdated, permission.getResourceRole().getValue()).map(appInfoView -> ApplicationView.builder()
                                 .applicationInfoView(appInfoView)
                                 .applicationDSL(applicationUpdated.getEditingApplicationDSL())
                                 .build())));
     }
 
-    private Mono<Application> doUpdateApplication(String applicationId, Application application) {
+    private Mono<Application> doUpdateApplication(String applicationId, Application application, Boolean updateStatus) {
         Application applicationUpdate = Application.builder()
                 .editingApplicationDSL(application.getEditingApplicationDSLOrNull())
                 .name(application.getName())
+                .applicationStatus(Boolean.TRUE.equals(updateStatus) ? application.getApplicationStatus() : null)
                 .build();
         return applicationService.updateById(applicationId, applicationUpdate)
                 .then(applicationService.findById(applicationId));
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java
@@ -123,7 +123,7 @@ public Mono<ResponseView<ApplicationView>> update(@PathVariable String applicati
             @RequestBody Application newApplication,
             @RequestParam(required = false) Boolean updateStatus) {
         return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
-            applicationApiService.update(appId, newApplication)
+            applicationApiService.update(appId, newApplication, updateStatus)
                 .delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, APPLICATION_UPDATE))
                 .map(ResponseView::success));
     }
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceIntegrationTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceIntegrationTest.java
@@ -116,7 +116,7 @@ public void testUpdateApplicationFailedDueToLackOfDatasourcePermissions() {
                             .editingApplicationDSL(applicationView.getApplicationDSL())
                             .name("app03")
                             .build();
-                    return applicationApiService.update(applicationView.getApplicationInfoView().getApplicationId(), application);
+                    return applicationApiService.update(applicationView.getApplicationInfoView().getApplicationId(), application, false);
                 });
 
         StepVerifier.create(applicationViewMono)
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceTest.java
@@ -169,7 +169,7 @@ public void testPublishApplication() {
 
         // update
         applicationIdMono = applicationIdMono
-                .delayUntil(id -> applicationApiService.update(id, Application.builder().editingApplicationDSL(Map.of("comp", "table")).build())).cache();
+                .delayUntil(id -> applicationApiService.update(id, Application.builder().editingApplicationDSL(Map.of("comp", "table")).build(), false)).cache();
 
         // edit dsl after publish
         StepVerifier.create(applicationIdMono.flatMap(id -> applicationApiService.getEditingApplication(id, false)))

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public Mono<ResponseView<ApplicationView>> update(@PathVariable String applicati`
`123`	`123`	`@RequestBody Application newApplication,`
`124`	`124`	`@RequestParam(required = false) Boolean updateStatus) {`
`125`	`125`	`return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->`
`126`		`- applicationApiService.update(appId, newApplication)`
	`126`	`+ applicationApiService.update(appId, newApplication, updateStatus)`
`127`	`127`	`.delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, APPLICATION_UPDATE))`
`128`	`128`	`.map(ResponseView::success));`
`129`	`129`	`}`