Added before/after detail of datasource update event

Author: dragonpoo

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

@@ -11,6 +11,7 @@ public class DatasourceEvent extends AbstractEvent {
     private final String datasourceId;
     private final String name;
     private final String type;
+    private final  String oldName;
 
     private final EventType eventType;
 }

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

@@ -10,6 +10,7 @@
 import org.lowcoder.api.framework.view.PageResponseView;
 import org.lowcoder.api.framework.view.ResponseView;
 import org.lowcoder.api.permission.view.CommonPermissionView;
+import org.lowcoder.api.usermanagement.view.UpdateGroupRequest;
 import org.lowcoder.api.util.BusinessEventPublisher;
 import org.lowcoder.api.util.GidService;
 import org.lowcoder.domain.datasource.model.Datasource;
@@ -52,7 +53,7 @@ public class DatasourceController implements DatasourceEndpoints
 	public Mono<ResponseView<Datasource>> create(@Valid @RequestBody UpsertDatasourceRequest request) {
         return datasourceApiService.create(upsertDatasourceRequestMapper.resolve(request))
                 .delayUntil(datasourceService::removePasswordTypeKeysFromJsDatasourcePluginConfig)
-                .delayUntil(datasource -> businessEventPublisher.publishDatasourceEvent(datasource, DATA_SOURCE_CREATE))
+                .delayUntil(datasource -> businessEventPublisher.publishDatasourceEvent(datasource, DATA_SOURCE_CREATE, null))
                 .map(ResponseView::success);
     }
 
@@ -69,23 +70,25 @@ public Mono<ResponseView<Datasource>> update(@PathVariable String id,
             @RequestBody UpsertDatasourceRequest request) {
         Datasource resolvedDatasource = upsertDatasourceRequestMapper.resolve(request);
         return gidService.convertDatasourceIdToObjectId(id).flatMap(objectId ->
-            datasourceApiService.update(objectId, resolvedDatasource)
-                .delayUntil(datasourceService::removePasswordTypeKeysFromJsDatasourcePluginConfig)
-                .delayUntil(datasource -> businessEventPublisher.publishDatasourceEvent(datasource, DATA_SOURCE_UPDATE))
-                .map(ResponseView::success));
+                datasourceService.getById(id).flatMap(orgDatasource ->
+                    datasourceApiService.update(objectId, resolvedDatasource)
+                        .delayUntil(datasourceService::removePasswordTypeKeysFromJsDatasourcePluginConfig)
+                        .delayUntil(datasource -> businessEventPublisher.publishDatasourceEvent(datasource, DATA_SOURCE_UPDATE, orgDatasource.getName()))
+                        .map(ResponseView::success)));
     }
 
     @Override
     public Mono<ResponseView<Boolean>> delete(@PathVariable String id) {
         return gidService.convertDatasourceIdToObjectId(id).flatMap(objectId ->
-            datasourceApiService.delete(objectId)
-                .delayUntil(result -> {
-                    if (BooleanUtils.isTrue(result)) {
-                        return businessEventPublisher.publishDatasourceEvent(objectId, DATA_SOURCE_DELETE);
-                    }
-                    return Mono.empty();
-                })
-                .map(ResponseView::success));
+                datasourceService.getById(id).flatMap(orgDatasource ->
+                    datasourceApiService.delete(objectId)
+                        .delayUntil(result -> {
+                            if (BooleanUtils.isTrue(result)) {
+                                return businessEventPublisher.publishDatasourceEvent(objectId, DATA_SOURCE_DELETE, orgDatasource.getName());
+                            }
+                            return Mono.empty();
+                        })
+                        .map(ResponseView::success)));
     }
 
     @Override

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

@@ -677,23 +677,24 @@ public void publishQueryExecutionEvent(QueryExecutionEvent queryExecutionEvent)
         applicationEventPublisher.publishEvent(queryExecutionEvent);
     }
 
-    public Mono<Void> publishDatasourceEvent(String id, EventType eventType) {
+    public Mono<Void> publishDatasourceEvent(String id, EventType eventType, String oldName) {
         return datasourceService.getById(id)
-                .flatMap(datasource -> publishDatasourceEvent(datasource, eventType))
+                .flatMap(datasource -> publishDatasourceEvent(datasource, eventType, oldName))
                 .onErrorResume(throwable -> {
                     log.error("publishDatasourceEvent error.", throwable);
                     return Mono.empty();
                 });
     }
 
-    public Mono<Void> publishDatasourceEvent(Datasource datasource, EventType eventType) {
+    public Mono<Void> publishDatasourceEvent(Datasource datasource, EventType eventType, String oldName) {
         return sessionUserService.getVisitorOrgMemberCache()
                 .zipWith(sessionUserService.getVisitorToken())
                 .flatMap(tuple -> {
                     DatasourceEvent event = DatasourceEvent.builder()
                             .datasourceId(datasource.getId())
                             .name(datasource.getName())
                             .type(datasource.getType())
+                            .oldName(oldName)
                             .eventType(eventType)
                             .userId(tuple.getT1().getUserId())
                             .orgId(tuple.getT1().getOrgId())