Skip to content

Commit 0838e42

Browse files
Thomasrludomikula
Thomasr
authored and
ludomikula
committed
Fix issue that gid api blocked
1 parent 1500c55 commit 0838e42

File tree

8 files changed

+258
-267
lines changed

8 files changed

+258
-267
lines changed

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

Lines changed: 53 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,18 @@ public Mono<ResponseView<ApplicationView>> createFromTemplate(@RequestParam Stri
5858

5959
@Override
6060
public Mono<ResponseView<Boolean>> recycle(@PathVariable String applicationId) {
61-
String appId = gidService.convertApplicationIdToObjectId(applicationId);
62-
return applicationApiService.recycle(appId)
63-
.delayUntil(__ -> businessEventPublisher.publishApplicationCommonEvent(applicationId, null, APPLICATION_RECYCLED))
64-
.map(ResponseView::success);
61+
return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
62+
applicationApiService.recycle(appId)
63+
.delayUntil(__ -> businessEventPublisher.publishApplicationCommonEvent(applicationId, null, APPLICATION_RECYCLED))
64+
.map(ResponseView::success));
6565
}
6666

6767
@Override
6868
public Mono<ResponseView<Boolean>> restore(@PathVariable String applicationId) {
69-
String appId = gidService.convertApplicationIdToObjectId(applicationId);
70-
return applicationApiService.restore(appId)
69+
return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
70+
applicationApiService.restore(appId)
7171
.delayUntil(__ -> businessEventPublisher.publishApplicationCommonEvent(applicationId, null, APPLICATION_RESTORE))
72-
.map(ResponseView::success);
72+
.map(ResponseView::success));
7373
}
7474

7575
@Override
@@ -81,68 +81,68 @@ public Mono<ResponseView<List<ApplicationInfoView>>> getRecycledApplications(@Re
8181

8282
@Override
8383
public Mono<ResponseView<ApplicationView>> delete(@PathVariable String applicationId) {
84-
String appId = gidService.convertApplicationIdToObjectId(applicationId);
85-
return applicationApiService.delete(appId)
84+
return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
85+
applicationApiService.delete(appId)
8686
.delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, APPLICATION_DELETE))
87-
.map(ResponseView::success);
87+
.map(ResponseView::success));
8888
}
8989

9090
@Override
9191
public Mono<ResponseView<ApplicationView>> getEditingApplication(@PathVariable String applicationId) {
92-
String appId = gidService.convertApplicationIdToObjectId(applicationId);
93-
return applicationApiService.getEditingApplication(appId)
92+
return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
93+
applicationApiService.getEditingApplication(appId)
9494
.delayUntil(__ -> applicationApiService.updateUserApplicationLastViewTime(appId))
95-
.map(ResponseView::success);
95+
.map(ResponseView::success));
9696
}
9797

9898
@Override
9999
public Mono<ResponseView<ApplicationView>> getPublishedApplication(@PathVariable String applicationId) {
100-
String appId = gidService.convertApplicationIdToObjectId(applicationId);
101-
return applicationApiService.getPublishedApplication(appId, ApplicationRequestType.PUBLIC_TO_ALL)
100+
return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
101+
applicationApiService.getPublishedApplication(appId, ApplicationRequestType.PUBLIC_TO_ALL)
102102
.delayUntil(applicationView -> applicationApiService.updateUserApplicationLastViewTime(appId))
103103
.delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, APPLICATION_VIEW))
104-
.map(ResponseView::success);
104+
.map(ResponseView::success));
105105
}
106106

107107
@Override
108108
public Mono<ResponseView<ApplicationView>> getPublishedMarketPlaceApplication(@PathVariable String applicationId) {
109-
String appId = gidService.convertApplicationIdToObjectId(applicationId);
110-
return applicationApiService.getPublishedApplication(appId, ApplicationRequestType.PUBLIC_TO_MARKETPLACE)
109+
return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
110+
applicationApiService.getPublishedApplication(appId, ApplicationRequestType.PUBLIC_TO_MARKETPLACE)
111111
.delayUntil(applicationView -> applicationApiService.updateUserApplicationLastViewTime(appId))
112112
.delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, APPLICATION_VIEW))
113-
.map(ResponseView::success);
113+
.map(ResponseView::success));
114114
}
115115

116116
@Override
117117
public Mono<ResponseView<ApplicationView>> getAgencyProfileApplication(@PathVariable String applicationId) {
118-
String appId = gidService.convertApplicationIdToObjectId(applicationId);
119-
return applicationApiService.getPublishedApplication(appId, ApplicationRequestType.AGENCY_PROFILE)
118+
return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
119+
applicationApiService.getPublishedApplication(appId, ApplicationRequestType.AGENCY_PROFILE)
120120
.delayUntil(applicationView -> applicationApiService.updateUserApplicationLastViewTime(appId))
121121
.delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, APPLICATION_VIEW))
122-
.map(ResponseView::success);
122+
.map(ResponseView::success));
123123
}
124124

125125
@Override
126126
public Mono<ResponseView<ApplicationView>> update(@PathVariable String applicationId,
127127
@RequestBody Application newApplication) {
128-
String appId = gidService.convertApplicationIdToObjectId(applicationId);
129-
return applicationApiService.update(appId, newApplication)
128+
return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
129+
applicationApiService.update(appId, newApplication)
130130
.delayUntil(applicationView -> businessEventPublisher.publishApplicationCommonEvent(applicationView, APPLICATION_UPDATE))
131-
.map(ResponseView::success);
131+
.map(ResponseView::success));
132132
}
133133

134134
@Override
135135
public Mono<ResponseView<ApplicationView>> publish(@PathVariable String applicationId) {
136-
String appId = gidService.convertApplicationIdToObjectId(applicationId);
137-
return applicationApiService.publish(appId)
138-
.map(ResponseView::success);
136+
return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
137+
applicationApiService.publish(appId)
138+
.map(ResponseView::success));
139139
}
140140

141141
@Override
142142
public Mono<ResponseView<Boolean>> updateEditState(@PathVariable String applicationId, @RequestBody UpdateEditStateRequest updateEditStateRequest) {
143-
String appId = gidService.convertApplicationIdToObjectId(applicationId);
144-
return applicationApiService.updateEditState(appId, updateEditStateRequest)
145-
.map(ResponseView::success);
143+
return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
144+
applicationApiService.updateEditState(appId, updateEditStateRequest)
145+
.map(ResponseView::success));
146146
}
147147

148148
@Override
@@ -197,72 +197,71 @@ public Mono<ResponseView<List<MarketplaceApplicationInfoView>>> getAgencyProfile
197197
public Mono<ResponseView<Boolean>> updatePermission(@PathVariable String applicationId,
198198
@PathVariable String permissionId,
199199
@RequestBody UpdatePermissionRequest updatePermissionRequest) {
200-
String appId = gidService.convertApplicationIdToObjectId(applicationId);
200+
201201
ResourceRole role = ResourceRole.fromValue(updatePermissionRequest.role());
202202
if (role == null) {
203203
return ofError(INVALID_PARAMETER, "INVALID_PARAMETER", updatePermissionRequest);
204204
}
205-
206-
return applicationApiService.updatePermission(appId, permissionId, role)
207-
.map(ResponseView::success);
205+
return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
206+
applicationApiService.updatePermission(appId, permissionId, role)
207+
.map(ResponseView::success));
208208
}
209209

210210
@Override
211211
public Mono<ResponseView<Boolean>> removePermission(
212212
@PathVariable String applicationId,
213213
@PathVariable String permissionId) {
214-
String appId = gidService.convertApplicationIdToObjectId(applicationId);
215-
216-
return applicationApiService.removePermission(appId, permissionId)
217-
.map(ResponseView::success);
214+
return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
215+
applicationApiService.removePermission(appId, permissionId)
216+
.map(ResponseView::success));
218217
}
219218

220219
@Override
221220
public Mono<ResponseView<Boolean>> grantPermission(
222221
@PathVariable String applicationId,
223222
@RequestBody BatchAddPermissionRequest request) {
224-
String appId = gidService.convertApplicationIdToObjectId(applicationId);
225223
ResourceRole role = ResourceRole.fromValue(request.role());
226224
if (role == null) {
227225
return ofError(INVALID_PARAMETER, "INVALID_PARAMETER", request.role());
228226
}
229-
return applicationApiService.grantPermission(appId,
227+
return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
228+
applicationApiService.grantPermission(appId,
230229
emptyIfNull(request.userIds()),
231230
emptyIfNull(request.groupIds()),
232231
role)
233-
.map(ResponseView::success);
232+
.map(ResponseView::success));
234233
}
235234

236235

237236
@Override
238237
public Mono<ResponseView<ApplicationPermissionView>> getApplicationPermissions(@PathVariable String applicationId) {
239-
String appId = gidService.convertApplicationIdToObjectId(applicationId);
240-
return applicationApiService.getApplicationPermissions(appId)
241-
.map(ResponseView::success);
238+
return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
239+
applicationApiService.getApplicationPermissions(appId)
240+
.map(ResponseView::success));
242241
}
243242

244243
@Override
245244
public Mono<ResponseView<Boolean>> setApplicationPublicToAll(@PathVariable String applicationId,
246245
@RequestBody ApplicationPublicToAllRequest request) {
247-
String appId = gidService.convertApplicationIdToObjectId(applicationId);
248-
return applicationApiService.setApplicationPublicToAll(appId, request.publicToAll())
249-
.map(ResponseView::success);
246+
return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
247+
applicationApiService.setApplicationPublicToAll(appId, request.publicToAll())
248+
.map(ResponseView::success));
250249
}
251250

252251
@Override
253252
public Mono<ResponseView<Boolean>> setApplicationPublicToMarketplace(@PathVariable String applicationId,
254253
@RequestBody ApplicationPublicToMarketplaceRequest request) {
255-
String appId = gidService.convertApplicationIdToObjectId(applicationId);
256-
return applicationApiService.setApplicationPublicToMarketplace(appId, request)
257-
.map(ResponseView::success);
254+
return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
255+
applicationApiService.setApplicationPublicToMarketplace(appId, request)
256+
.map(ResponseView::success));
258257
}
259258

260259
@Override
261260
public Mono<ResponseView<Boolean>> setApplicationAsAgencyProfile(@PathVariable String applicationId,
262261
@RequestBody ApplicationAsAgencyProfileRequest request) {
263-
String appId = gidService.convertApplicationIdToObjectId(applicationId);
264-
return applicationApiService.setApplicationAsAgencyProfile(appId, request.agencyProfile())
265-
.map(ResponseView::success);
262+
return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
263+
applicationApiService.setApplicationAsAgencyProfile(appId, request.agencyProfile())
264+
.map(ResponseView::success));
266265
}
267266

268267

0 commit comments

Comments
 (0)