Skip to content

Commit 603edca

Browse files
dragonpooludomikula
authored andcommitted
Added before/after detail of app folder rename event
1 parent 35fed69 commit 603edca

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ public class FolderCommonEvent extends AbstractEvent {
99

1010
private final String id;
1111
private final String name;
12+
private final String fromName;
1213
private final EventType type;
1314

1415
@Override

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@ public class FolderController implements FolderEndpoints
4242
public Mono<ResponseView<FolderInfoView>> create(@RequestBody Folder folder) {
4343
return folderApiService.create(folder)
4444
.delayUntil(folderInfoView -> folderApiService.upsertLastViewTime(folderInfoView.getFolderId()))
45-
.delayUntil(f -> businessEventPublisher.publishFolderCommonEvent(f.getFolderId(), f.getName(), EventType.FOLDER_CREATE))
45+
.delayUntil(f -> businessEventPublisher.publishFolderCommonEvent(f.getFolderId(), f.getName(), null, EventType.FOLDER_CREATE))
4646
.map(ResponseView::success);
4747
}
4848

4949
@Override
5050
public Mono<ResponseView<Void>> delete(@PathVariable("id") String folderId) {
5151
return gidService.convertFolderIdToObjectId(folderId).flatMap(objectId ->
5252
folderApiService.delete(objectId.orElse(null))
53-
.delayUntil(f -> businessEventPublisher.publishFolderCommonEvent(f.getId(), f.getName(), EventType.FOLDER_DELETE))
53+
.delayUntil(f -> businessEventPublisher.publishFolderCommonEvent(f.getId(), f.getName(), f.getName(), EventType.FOLDER_DELETE))
5454
.then(Mono.fromSupplier(() -> ResponseView.success(null))));
5555
}
5656

@@ -63,7 +63,7 @@ public Mono<ResponseView<FolderInfoView>> update(@RequestBody Folder folder) {
6363
.zipWhen(__ -> folderApiService.update(folder))
6464
.delayUntil(tuple2 -> {
6565
Folder old = tuple2.getT1();
66-
return businessEventPublisher.publishFolderCommonEvent(folder.getId(), old.getName() + " => " + folder.getName(),
66+
return businessEventPublisher.publishFolderCommonEvent(folder.getId(), folder.getName(), old.getName(),
6767
EventType.FOLDER_UPDATE);
6868
})
6969
.map(tuple2 -> ResponseView.success(tuple2.getT2()));

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public class BusinessEventPublisher {
7575
private final ResourcePermissionService resourcePermissionService;
7676
private final ApplicationRecordServiceImpl applicationRecordServiceImpl;
7777

78-
public Mono<Void> publishFolderCommonEvent(String folderId, String folderName, EventType eventType) {
78+
public Mono<Void> publishFolderCommonEvent(String folderId, String folderName, String fromName, EventType eventType) {
7979

8080
return sessionUserService.getVisitorToken()
8181
.zipWith(sessionUserService.getVisitorOrgMemberCache())
@@ -89,6 +89,7 @@ public Mono<Void> publishFolderCommonEvent(String folderId, String folderName, E
8989
.userId(orgMember.getUserId())
9090
.orgId(orgMember.getOrgId())
9191
.type(eventType)
92+
.fromName(fromName)
9293
.isAnonymous(Authentication.isAnonymousUser(orgMember.getUserId()))
9394
.sessionHash(Hashing.sha512().hashString(token, StandardCharsets.UTF_8).toString())
9495
.build();

0 commit comments

Comments
 (0)