modify update endpoint to restore deleted objects

Thomasr · ludomikula · commit 1fc4e6c6cfda · 2025-05-20T18:07:33.000+02:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/Datasource.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/Datasource.java
@@ -87,6 +87,7 @@ public class Datasource extends HasIdAndAuditing {
 
     public Datasource mergeWith(Datasource updatedDatasource) {
         setName(updatedDatasource.getName());
+        setDatasourceStatus(updatedDatasource.getDatasourceStatus());
         Optional.of(getDetailConfig())
                 .ifPresentOrElse(currentDetailConfig -> {
                             if (updatedDatasource.getDetailConfig() instanceof JsDatasourceConnectionConfig jsDatasourceConnectionConfig) {
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
@@ -84,15 +84,15 @@ public Mono<ResponseView<ApplicationView>> delete(@PathVariable String applicati
     }
 
     @Override
-    public Mono<ResponseView<ApplicationView>> getEditingApplication(@PathVariable String applicationId, @PathVariable Boolean withDeleted) {
+    public Mono<ResponseView<ApplicationView>> getEditingApplication(@PathVariable String applicationId, @RequestParam(required = false) Boolean withDeleted) {
         return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
             applicationApiService.getEditingApplication(appId, withDeleted)
                 .delayUntil(__ -> applicationApiService.updateUserApplicationLastViewTime(appId))
                 .map(ResponseView::success));
     }
 
     @Override
-    public Mono<ResponseView<ApplicationView>> getPublishedApplication(@PathVariable String applicationId, @PathVariable Boolean withDeleted) {
+    public Mono<ResponseView<ApplicationView>> getPublishedApplication(@PathVariable String applicationId, @RequestParam(required = false) Boolean withDeleted) {
         return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
             applicationApiService.getPublishedApplication(appId, ApplicationRequestType.PUBLIC_TO_ALL, withDeleted)
                 .delayUntil(applicationView -> applicationApiService.updateUserApplicationLastViewTime(appId))
@@ -120,7 +120,8 @@ public Mono<ResponseView<ApplicationView>> getAgencyProfileApplication(@PathVari
 
     @Override
     public Mono<ResponseView<ApplicationView>> update(@PathVariable String applicationId,
-            @RequestBody Application newApplication) {
+            @RequestBody Application newApplication,
+            @RequestParam(required = false) Boolean updateStatus) {
         return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
             applicationApiService.update(appId, newApplication)
                 .delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, APPLICATION_UPDATE))
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java
@@ -89,7 +89,7 @@ public interface ApplicationEndpoints
 		    description = "Retrieve the DSL data of a Lowcoder Application in edit-mode by its ID."
 	)
     @GetMapping("/{applicationId}")
-    public Mono<ResponseView<ApplicationView>> getEditingApplication(@PathVariable String applicationId, @PathVariable Boolean withDeleted);
+    public Mono<ResponseView<ApplicationView>> getEditingApplication(@PathVariable String applicationId, @RequestParam(required = false) Boolean withDeleted);
 
 	@Operation(
 			tags = TAG_APPLICATION_MANAGEMENT,
@@ -98,7 +98,7 @@ public interface ApplicationEndpoints
 		    description = "Retrieve the DSL data of a Lowcoder Application in view-mode by its ID."
 	)
     @GetMapping("/{applicationId}/view")
-    public Mono<ResponseView<ApplicationView>> getPublishedApplication(@PathVariable String applicationId, @PathVariable Boolean withDeleted);
+    public Mono<ResponseView<ApplicationView>> getPublishedApplication(@PathVariable String applicationId, @RequestParam(required = false) Boolean withDeleted);
 
 	@Operation(
 			tags = TAG_APPLICATION_MANAGEMENT,
@@ -126,7 +126,8 @@ public interface ApplicationEndpoints
 	)
     @PutMapping("/{applicationId}")
     public Mono<ResponseView<ApplicationView>> update(@PathVariable String applicationId,
-            @RequestBody Application newApplication);
+            @RequestBody Application newApplication,
+			@RequestParam(required = false) Boolean updateStatus);
 
 	@Operation(
 			tags = TAG_APPLICATION_MANAGEMENT,
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/UpsertDatasourceRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/UpsertDatasourceRequest.java
@@ -2,6 +2,8 @@
 
 import java.util.Map;
 
+import org.lowcoder.domain.datasource.model.DatasourceStatus;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -14,6 +16,7 @@ public class UpsertDatasourceRequest {
     private String name;
     private String type;
     private String organizationId;
+    private DatasourceStatus status;
 
     private Map<String, Object> datasourceConfig;
 }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/UpsertDatasourceRequestMapper.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/UpsertDatasourceRequestMapper.java
@@ -38,6 +38,7 @@ public Datasource resolve(UpsertDatasourceRequest dto) {
         datasource.setName(dto.getName());
         datasource.setType(dto.getType());
         datasource.setOrganizationId(dto.getOrganizationId());
+        datasource.setDatasourceStatus(dto.getStatus());
         if (datasourceMetaInfoService.isJsDatasourcePlugin(datasource.getType())) {
             datasource.setDetailConfig(JsonUtils.fromJson(JsonUtils.toJson(dto.getDatasourceConfig()), JsDatasourceConnectionConfig.class));
         } else {
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiServiceImpl.java
@@ -291,6 +291,7 @@ public Mono<Boolean> update(String orgId, UpdateOrgRequest updateOrgRequest) {
                     updateOrg.setContactEmail(updateOrgRequest.getContactEmail());
                     updateOrg.setContactPhoneNumber(updateOrgRequest.getContactPhoneNumber());
                     updateOrg.setContactName(updateOrgRequest.getContactName());
+                    updateOrg.setState(updateOrgRequest.getState());
                     return organizationService.update(orgId, updateOrg);
                 });
     }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java
@@ -194,9 +194,9 @@ public Mono<ResponseView<Organization>> updateSlug(@PathVariable String orgId, @
     }
 
     @Override
-    public Mono<ResponseView<Organization>> getOrganization(@PathVariable String orgId, @PathVariable Boolean includeDeleted) {
+    public Mono<ResponseView<Organization>> getOrganization(@PathVariable String orgId, @RequestParam(required = false) Boolean withDeleted) {
         return gidService.convertOrganizationIdToObjectId(orgId)
-                .flatMap(id -> Boolean.TRUE.equals(includeDeleted) ? organizationService.getByIdWithDeleted(id) : organizationService.getById(id))
+                .flatMap(id -> Boolean.TRUE.equals(withDeleted) ? organizationService.getByIdWithDeleted(id) : organizationService.getById(id))
                 .switchIfEmpty(Mono.error(new BizException(BizError.ORGANIZATION_NOT_FOUND, "ORGANIZATION_NOT_FOUND")))
                 .map(ResponseView::success);
     }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationEndpoints.java
@@ -191,7 +191,7 @@ public Mono<ResponseView<Boolean>> removeUserFromOrg(@PathVariable String orgId,
 			description = "Retrieve details of a specific Organization within Lowcoder using its unique ID."
 	)
 	@GetMapping("/{orgId}")
-	public Mono<ResponseView<Organization>> getOrganization(@PathVariable String orgId, @PathVariable Boolean includeDeleted);
+	public Mono<ResponseView<Organization>> getOrganization(@PathVariable String orgId, @RequestParam(required = false) Boolean withDeleted);
 
     public record UpdateOrgCommonSettingsRequest(String key, Object value) {
 
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/UpdateOrgRequest.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/UpdateOrgRequest.java
@@ -1,5 +1,7 @@
 package org.lowcoder.api.usermanagement.view;
 
+import org.lowcoder.domain.organization.model.OrganizationState;
+
 public class UpdateOrgRequest {
 
     private String orgName;
@@ -10,6 +12,16 @@ public class UpdateOrgRequest {
 
     private String contactPhoneNumber;
 
+    private OrganizationState state;
+
+    public OrganizationState getState() {
+        return state;
+    }
+
+    public void setState(OrganizationState state) {
+        this.state = state;
+    }
+
     public String getOrgName() {
         return orgName;
     }
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
@@ -131,7 +131,7 @@ public void testUpdateApplicationFailedDueToLackOfDatasourcePermissions() {
     public void testUpdateEditingStateSuccess() {
         Mono<ApplicationView> applicationViewMono = applicationApiService.create(new CreateApplicationRequest("org01", null, "app1", ApplicationType.APPLICATION.getValue(), Map.of("comp", "list"), null, null, null));
         Mono<ApplicationView> updateEditStateMono = applicationViewMono.delayUntil(app -> applicationApiService.updateEditState(app.getApplicationInfoView().getApplicationId(), new ApplicationEndpoints.UpdateEditStateRequest(true)));
-        Mono<ApplicationView> app = updateEditStateMono.flatMap(applicationView -> applicationApiService.getEditingApplication(applicationView.getApplicationInfoView().getApplicationId()));
+        Mono<ApplicationView> app = updateEditStateMono.flatMap(applicationView -> applicationApiService.getEditingApplication(applicationView.getApplicationInfoView().getApplicationId(), false));
         StepVerifier.create(app)
                 .assertNext(application -> {
                     Assertions.assertEquals("user01", application.getApplicationInfoView().getEditingUserId());
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
@@ -144,12 +144,12 @@ public void testPublishApplication() {
                 .cache();
 
         // edit dsl before publish
-        StepVerifier.create(applicationIdMono.flatMap(id -> applicationApiService.getEditingApplication(id)))
+        StepVerifier.create(applicationIdMono.flatMap(id -> applicationApiService.getEditingApplication(id, false)))
                 .assertNext(applicationView -> Assertions.assertEquals(Map.of("comp", "list"), applicationView.getApplicationDSL()))
                 .verifyComplete();
 
         // published dsl before publish
-        StepVerifier.create(applicationIdMono.flatMap(id -> applicationApiService.getPublishedApplication(id, ApplicationRequestType.PUBLIC_TO_ALL)))
+        StepVerifier.create(applicationIdMono.flatMap(id -> applicationApiService.getPublishedApplication(id, ApplicationRequestType.PUBLIC_TO_ALL, false)))
                 .assertNext(applicationView -> Assertions.assertEquals(Map.of("comp", "list"), applicationView.getApplicationDSL()))
                 .verifyComplete();
 
@@ -158,12 +158,12 @@ public void testPublishApplication() {
                 .delayUntil(id -> applicationApiService.publish(id, new ApplicationPublishRequest("Test Publish", "1.0.0"))).cache();
 
         // edit dsl after publish
-        StepVerifier.create(applicationIdMono.flatMap(id -> applicationApiService.getEditingApplication(id)))
+        StepVerifier.create(applicationIdMono.flatMap(id -> applicationApiService.getEditingApplication(id, false)))
                 .assertNext(applicationView -> Assertions.assertEquals(Map.of("comp", "list"), applicationView.getApplicationDSL()))
                 .verifyComplete();
 
         // published dsl after publish
-        StepVerifier.create(applicationIdMono.flatMap(id -> applicationApiService.getPublishedApplication(id, ApplicationRequestType.PUBLIC_TO_ALL)))
+        StepVerifier.create(applicationIdMono.flatMap(id -> applicationApiService.getPublishedApplication(id, ApplicationRequestType.PUBLIC_TO_ALL, false)))
                 .assertNext(applicationView -> Assertions.assertEquals(Map.of("comp", "list"), applicationView.getApplicationDSL()))
                 .verifyComplete();
 
@@ -172,12 +172,12 @@ public void testPublishApplication() {
                 .delayUntil(id -> applicationApiService.update(id, Application.builder().editingApplicationDSL(Map.of("comp", "table")).build())).cache();
 
         // edit dsl after publish
-        StepVerifier.create(applicationIdMono.flatMap(id -> applicationApiService.getEditingApplication(id)))
+        StepVerifier.create(applicationIdMono.flatMap(id -> applicationApiService.getEditingApplication(id, false)))
                 .assertNext(applicationView -> Assertions.assertEquals(Map.of("comp", "table"), applicationView.getApplicationDSL()))
                 .verifyComplete();
 
         // published dsl after publish
-        StepVerifier.create(applicationIdMono.flatMap(id -> applicationApiService.getPublishedApplication(id, ApplicationRequestType.PUBLIC_TO_ALL)))
+        StepVerifier.create(applicationIdMono.flatMap(id -> applicationApiService.getPublishedApplication(id, ApplicationRequestType.PUBLIC_TO_ALL, false)))
                 .assertNext(applicationView -> Assertions.assertEquals(Map.of("comp", "list"), applicationView.getApplicationDSL()))
                 .verifyComplete();
 
@@ -186,12 +186,12 @@ public void testPublishApplication() {
                 .delayUntil(id -> applicationApiService.publish(id, new ApplicationPublishRequest("Test Publish 2", "2.0.0"))).cache();
 
         // edit dsl after publish
-        StepVerifier.create(applicationIdMono.flatMap(id -> applicationApiService.getEditingApplication(id)))
+        StepVerifier.create(applicationIdMono.flatMap(id -> applicationApiService.getEditingApplication(id, false)))
                 .assertNext(applicationView -> Assertions.assertEquals(Map.of("comp", "table"), applicationView.getApplicationDSL()))
                 .verifyComplete();
 
         // published dsl after publish
-        StepVerifier.create(applicationIdMono.flatMap(id -> applicationApiService.getPublishedApplication(id, ApplicationRequestType.PUBLIC_TO_ALL)))
+        StepVerifier.create(applicationIdMono.flatMap(id -> applicationApiService.getPublishedApplication(id, ApplicationRequestType.PUBLIC_TO_ALL, false)))
                 .assertNext(applicationView -> Assertions.assertEquals(Map.of("comp", "table"), applicationView.getApplicationDSL()))
                 .verifyComplete();
 

Original file line number	Diff line number	Diff line change
`@@ -291,6 +291,7 @@ public Mono<Boolean> update(String orgId, UpdateOrgRequest updateOrgRequest) {`
`291`	`291`	`updateOrg.setContactEmail(updateOrgRequest.getContactEmail());`
`292`	`292`	`updateOrg.setContactPhoneNumber(updateOrgRequest.getContactPhoneNumber());`
`293`	`293`	`updateOrg.setContactName(updateOrgRequest.getContactName());`
	`294`	`+ updateOrg.setState(updateOrgRequest.getState());`
`294`	`295`	`return organizationService.update(orgId, updateOrg);`
`295`	`296`	`});`
`296`	`297`	`}`
Original file line number	Diff line number	Diff line change
`@@ -194,9 +194,9 @@ public Mono<ResponseView<Organization>> updateSlug(@PathVariable String orgId, @`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`@Override`
`197`		`- public Mono<ResponseView<Organization>> getOrganization(@PathVariable String orgId, @PathVariable Boolean includeDeleted) {`
	`197`	`+ public Mono<ResponseView<Organization>> getOrganization(@PathVariable String orgId, @RequestParam(required = false) Boolean withDeleted) {`
`198`	`198`	`return gidService.convertOrganizationIdToObjectId(orgId)`
`199`		`- .flatMap(id -> Boolean.TRUE.equals(includeDeleted) ? organizationService.getByIdWithDeleted(id) : organizationService.getById(id))`
	`199`	`+ .flatMap(id -> Boolean.TRUE.equals(withDeleted) ? organizationService.getByIdWithDeleted(id) : organizationService.getById(id))`
`200`	`200`	`.switchIfEmpty(Mono.error(new BizException(BizError.ORGANIZATION_NOT_FOUND, "ORGANIZATION_NOT_FOUND")))`
`201`	`201`	`.map(ResponseView::success);`
`202`	`202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ public Mono<ResponseView<Boolean>> removeUserFromOrg(@PathVariable String orgId,`
`191`	`191`	`description = "Retrieve details of a specific Organization within Lowcoder using its unique ID."`
`192`	`192`	`)`
`193`	`193`	`@GetMapping("/{orgId}")`
`194`		`- public Mono<ResponseView<Organization>> getOrganization(@PathVariable String orgId, @PathVariable Boolean includeDeleted);`
	`194`	`+ public Mono<ResponseView<Organization>> getOrganization(@PathVariable String orgId, @RequestParam(required = false) Boolean withDeleted);`
`195`	`195`
`196`	`196`	`public record UpdateOrgCommonSettingsRequest(String key, Object value) {`
`197`	`197`