Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1fc4e6c

Browse files
Thomasrludomikula
Thomasr
authored andcommitted
modify update endpoint to restore deleted objects
1 parent28cb34f commit1fc4e6c

File tree

11 files changed

+38
-18
lines changed

11 files changed

+38
-18
lines changed

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/Datasource.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ public class Datasource extends HasIdAndAuditing {
8787

8888
publicDatasourcemergeWith(DatasourceupdatedDatasource) {
8989
setName(updatedDatasource.getName());
90+
setDatasourceStatus(updatedDatasource.getDatasourceStatus());
9091
Optional.of(getDetailConfig())
9192
.ifPresentOrElse(currentDetailConfig -> {
9293
if (updatedDatasource.getDetailConfig()instanceofJsDatasourceConnectionConfigjsDatasourceConnectionConfig) {

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ public Mono<ResponseView<ApplicationView>> delete(@PathVariable String applicati
8484
}
8585

8686
@Override
87-
publicMono<ResponseView<ApplicationView>>getEditingApplication(@PathVariableStringapplicationId,@PathVariableBooleanwithDeleted) {
87+
publicMono<ResponseView<ApplicationView>>getEditingApplication(@PathVariableStringapplicationId,@RequestParam(required =false)BooleanwithDeleted) {
8888
returngidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
8989
applicationApiService.getEditingApplication(appId,withDeleted)
9090
.delayUntil(__ ->applicationApiService.updateUserApplicationLastViewTime(appId))
9191
.map(ResponseView::success));
9292
}
9393

9494
@Override
95-
publicMono<ResponseView<ApplicationView>>getPublishedApplication(@PathVariableStringapplicationId,@PathVariableBooleanwithDeleted) {
95+
publicMono<ResponseView<ApplicationView>>getPublishedApplication(@PathVariableStringapplicationId,@RequestParam(required =false)BooleanwithDeleted) {
9696
returngidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
9797
applicationApiService.getPublishedApplication(appId,ApplicationRequestType.PUBLIC_TO_ALL,withDeleted)
9898
.delayUntil(applicationView ->applicationApiService.updateUserApplicationLastViewTime(appId))
@@ -120,7 +120,8 @@ public Mono<ResponseView<ApplicationView>> getAgencyProfileApplication(@PathVari
120120

121121
@Override
122122
publicMono<ResponseView<ApplicationView>>update(@PathVariableStringapplicationId,
123-
@RequestBodyApplicationnewApplication) {
123+
@RequestBodyApplicationnewApplication,
124+
@RequestParam(required =false)BooleanupdateStatus) {
124125
returngidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
125126
applicationApiService.update(appId,newApplication)
126127
.delayUntil(applicationView ->businessEventPublisher.publishApplicationCommonEvent(applicationView,APPLICATION_UPDATE))

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public interface ApplicationEndpoints
8989
description ="Retrieve the DSL data of a Lowcoder Application in edit-mode by its ID."
9090
)
9191
@GetMapping("/{applicationId}")
92-
publicMono<ResponseView<ApplicationView>>getEditingApplication(@PathVariableStringapplicationId,@PathVariableBooleanwithDeleted);
92+
publicMono<ResponseView<ApplicationView>>getEditingApplication(@PathVariableStringapplicationId,@RequestParam(required =false)BooleanwithDeleted);
9393

9494
@Operation(
9595
tags =TAG_APPLICATION_MANAGEMENT,
@@ -98,7 +98,7 @@ public interface ApplicationEndpoints
9898
description ="Retrieve the DSL data of a Lowcoder Application in view-mode by its ID."
9999
)
100100
@GetMapping("/{applicationId}/view")
101-
publicMono<ResponseView<ApplicationView>>getPublishedApplication(@PathVariableStringapplicationId,@PathVariableBooleanwithDeleted);
101+
publicMono<ResponseView<ApplicationView>>getPublishedApplication(@PathVariableStringapplicationId,@RequestParam(required =false)BooleanwithDeleted);
102102

103103
@Operation(
104104
tags =TAG_APPLICATION_MANAGEMENT,
@@ -126,7 +126,8 @@ public interface ApplicationEndpoints
126126
)
127127
@PutMapping("/{applicationId}")
128128
publicMono<ResponseView<ApplicationView>>update(@PathVariableStringapplicationId,
129-
@RequestBodyApplicationnewApplication);
129+
@RequestBodyApplicationnewApplication,
130+
@RequestParam(required =false)BooleanupdateStatus);
130131

131132
@Operation(
132133
tags =TAG_APPLICATION_MANAGEMENT,

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/UpsertDatasourceRequest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
importjava.util.Map;
44

5+
importorg.lowcoder.domain.datasource.model.DatasourceStatus;
6+
57
importlombok.Getter;
68
importlombok.Setter;
79

@@ -14,6 +16,7 @@ public class UpsertDatasourceRequest {
1416
privateStringname;
1517
privateStringtype;
1618
privateStringorganizationId;
19+
privateDatasourceStatusstatus;
1720

1821
privateMap<String,Object>datasourceConfig;
1922
}

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/UpsertDatasourceRequestMapper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public Datasource resolve(UpsertDatasourceRequest dto) {
3838
datasource.setName(dto.getName());
3939
datasource.setType(dto.getType());
4040
datasource.setOrganizationId(dto.getOrganizationId());
41+
datasource.setDatasourceStatus(dto.getStatus());
4142
if (datasourceMetaInfoService.isJsDatasourcePlugin(datasource.getType())) {
4243
datasource.setDetailConfig(JsonUtils.fromJson(JsonUtils.toJson(dto.getDatasourceConfig()),JsDatasourceConnectionConfig.class));
4344
}else {

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrgApiServiceImpl.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@ public Mono<Boolean> update(String orgId, UpdateOrgRequest updateOrgRequest) {
291291
updateOrg.setContactEmail(updateOrgRequest.getContactEmail());
292292
updateOrg.setContactPhoneNumber(updateOrgRequest.getContactPhoneNumber());
293293
updateOrg.setContactName(updateOrgRequest.getContactName());
294+
updateOrg.setState(updateOrgRequest.getState());
294295
returnorganizationService.update(orgId,updateOrg);
295296
});
296297
}

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,9 @@ public Mono<ResponseView<Organization>> updateSlug(@PathVariable String orgId, @
194194
}
195195

196196
@Override
197-
publicMono<ResponseView<Organization>>getOrganization(@PathVariableStringorgId,@PathVariableBooleanincludeDeleted) {
197+
publicMono<ResponseView<Organization>>getOrganization(@PathVariableStringorgId,@RequestParam(required =false)BooleanwithDeleted) {
198198
returngidService.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))
200200
.switchIfEmpty(Mono.error(newBizException(BizError.ORGANIZATION_NOT_FOUND,"ORGANIZATION_NOT_FOUND")))
201201
.map(ResponseView::success);
202202
}

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationEndpoints.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public Mono<ResponseView<Boolean>> removeUserFromOrg(@PathVariable String orgId,
191191
description ="Retrieve details of a specific Organization within Lowcoder using its unique ID."
192192
)
193193
@GetMapping("/{orgId}")
194-
publicMono<ResponseView<Organization>>getOrganization(@PathVariableStringorgId,@PathVariableBooleanincludeDeleted);
194+
publicMono<ResponseView<Organization>>getOrganization(@PathVariableStringorgId,@RequestParam(required =false)BooleanwithDeleted);
195195

196196
publicrecordUpdateOrgCommonSettingsRequest(Stringkey,Objectvalue) {
197197

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/UpdateOrgRequest.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
packageorg.lowcoder.api.usermanagement.view;
22

3+
importorg.lowcoder.domain.organization.model.OrganizationState;
4+
35
publicclassUpdateOrgRequest {
46

57
privateStringorgName;
@@ -10,6 +12,16 @@ public class UpdateOrgRequest {
1012

1113
privateStringcontactPhoneNumber;
1214

15+
privateOrganizationStatestate;
16+
17+
publicOrganizationStategetState() {
18+
returnstate;
19+
}
20+
21+
publicvoidsetState(OrganizationStatestate) {
22+
this.state =state;
23+
}
24+
1325
publicStringgetOrgName() {
1426
returnorgName;
1527
}

‎server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public void testUpdateApplicationFailedDueToLackOfDatasourcePermissions() {
131131
publicvoidtestUpdateEditingStateSuccess() {
132132
Mono<ApplicationView>applicationViewMono =applicationApiService.create(newCreateApplicationRequest("org01",null,"app1",ApplicationType.APPLICATION.getValue(),Map.of("comp","list"),null,null,null));
133133
Mono<ApplicationView>updateEditStateMono =applicationViewMono.delayUntil(app ->applicationApiService.updateEditState(app.getApplicationInfoView().getApplicationId(),newApplicationEndpoints.UpdateEditStateRequest(true)));
134-
Mono<ApplicationView>app =updateEditStateMono.flatMap(applicationView ->applicationApiService.getEditingApplication(applicationView.getApplicationInfoView().getApplicationId()));
134+
Mono<ApplicationView>app =updateEditStateMono.flatMap(applicationView ->applicationApiService.getEditingApplication(applicationView.getApplicationInfoView().getApplicationId(),false));
135135
StepVerifier.create(app)
136136
.assertNext(application -> {
137137
Assertions.assertEquals("user01",application.getApplicationInfoView().getEditingUserId());

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp