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

Commiteefe884

Browse files
Thomasrludomikula
Thomasr
authored andcommitted
Added before/after detail of datasource update event
1 parent7468361 commiteefe884

File tree

3 files changed

+21
-16
lines changed

3 files changed

+21
-16
lines changed

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/datasource/DatasourceEvent.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public class DatasourceEvent extends AbstractEvent {
1111
privatefinalStringdatasourceId;
1212
privatefinalStringname;
1313
privatefinalStringtype;
14+
privatefinalStringoldName;
1415

1516
privatefinalEventTypeeventType;
1617
}

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

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
importorg.lowcoder.api.framework.view.PageResponseView;
1111
importorg.lowcoder.api.framework.view.ResponseView;
1212
importorg.lowcoder.api.permission.view.CommonPermissionView;
13+
importorg.lowcoder.api.usermanagement.view.UpdateGroupRequest;
1314
importorg.lowcoder.api.util.BusinessEventPublisher;
1415
importorg.lowcoder.api.util.GidService;
1516
importorg.lowcoder.domain.datasource.model.Datasource;
@@ -52,7 +53,7 @@ public class DatasourceController implements DatasourceEndpoints
5253
publicMono<ResponseView<Datasource>>create(@Valid@RequestBodyUpsertDatasourceRequestrequest) {
5354
returndatasourceApiService.create(upsertDatasourceRequestMapper.resolve(request))
5455
.delayUntil(datasourceService::removePasswordTypeKeysFromJsDatasourcePluginConfig)
55-
.delayUntil(datasource ->businessEventPublisher.publishDatasourceEvent(datasource,DATA_SOURCE_CREATE))
56+
.delayUntil(datasource ->businessEventPublisher.publishDatasourceEvent(datasource,DATA_SOURCE_CREATE,null))
5657
.map(ResponseView::success);
5758
}
5859

@@ -69,23 +70,25 @@ public Mono<ResponseView<Datasource>> update(@PathVariable String id,
6970
@RequestBodyUpsertDatasourceRequestrequest) {
7071
DatasourceresolvedDatasource =upsertDatasourceRequestMapper.resolve(request);
7172
returngidService.convertDatasourceIdToObjectId(id).flatMap(objectId ->
72-
datasourceApiService.update(objectId,resolvedDatasource)
73-
.delayUntil(datasourceService::removePasswordTypeKeysFromJsDatasourcePluginConfig)
74-
.delayUntil(datasource ->businessEventPublisher.publishDatasourceEvent(datasource,DATA_SOURCE_UPDATE))
75-
.map(ResponseView::success));
73+
datasourceService.getById(id).flatMap(orgDatasource ->
74+
datasourceApiService.update(objectId,resolvedDatasource)
75+
.delayUntil(datasourceService::removePasswordTypeKeysFromJsDatasourcePluginConfig)
76+
.delayUntil(datasource ->businessEventPublisher.publishDatasourceEvent(datasource,DATA_SOURCE_UPDATE,orgDatasource.getName()))
77+
.map(ResponseView::success)));
7678
}
7779

7880
@Override
7981
publicMono<ResponseView<Boolean>>delete(@PathVariableStringid) {
8082
returngidService.convertDatasourceIdToObjectId(id).flatMap(objectId ->
81-
datasourceApiService.delete(objectId)
82-
.delayUntil(result -> {
83-
if (BooleanUtils.isTrue(result)) {
84-
returnbusinessEventPublisher.publishDatasourceEvent(objectId,DATA_SOURCE_DELETE);
85-
}
86-
returnMono.empty();
87-
})
88-
.map(ResponseView::success));
83+
datasourceService.getById(id).flatMap(orgDatasource ->
84+
datasourceApiService.delete(objectId)
85+
.delayUntil(result -> {
86+
if (BooleanUtils.isTrue(result)) {
87+
returnbusinessEventPublisher.publishDatasourceEvent(objectId,DATA_SOURCE_DELETE,orgDatasource.getName());
88+
}
89+
returnMono.empty();
90+
})
91+
.map(ResponseView::success)));
8992
}
9093

9194
@Override

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/BusinessEventPublisher.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -677,23 +677,24 @@ public void publishQueryExecutionEvent(QueryExecutionEvent queryExecutionEvent)
677677
applicationEventPublisher.publishEvent(queryExecutionEvent);
678678
}
679679

680-
publicMono<Void>publishDatasourceEvent(Stringid,EventTypeeventType) {
680+
publicMono<Void>publishDatasourceEvent(Stringid,EventTypeeventType,StringoldName) {
681681
returndatasourceService.getById(id)
682-
.flatMap(datasource ->publishDatasourceEvent(datasource,eventType))
682+
.flatMap(datasource ->publishDatasourceEvent(datasource,eventType,oldName))
683683
.onErrorResume(throwable -> {
684684
log.error("publishDatasourceEvent error.",throwable);
685685
returnMono.empty();
686686
});
687687
}
688688

689-
publicMono<Void>publishDatasourceEvent(Datasourcedatasource,EventTypeeventType) {
689+
publicMono<Void>publishDatasourceEvent(Datasourcedatasource,EventTypeeventType,StringoldName) {
690690
returnsessionUserService.getVisitorOrgMemberCache()
691691
.zipWith(sessionUserService.getVisitorToken())
692692
.flatMap(tuple -> {
693693
DatasourceEventevent =DatasourceEvent.builder()
694694
.datasourceId(datasource.getId())
695695
.name(datasource.getName())
696696
.type(datasource.getType())
697+
.oldName(oldName)
697698
.eventType(eventType)
698699
.userId(tuple.getT1().getUserId())
699700
.orgId(tuple.getT1().getOrgId())

0 commit comments

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