Add from-folder to application related event

Author: dragonpoo

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

@@ -19,6 +19,10 @@ public class ApplicationCommonEvent extends AbstractEvent {
     private final String folderId;
     @Nullable
     private final String folderName;
+    @Nullable
+    private final String oldFolderId;
+    @Nullable
+    private final String oldFolderName;
 
     @Override
     public EventType getEventType() {

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

@@ -59,15 +59,15 @@ public Mono<ResponseView<ApplicationView>> createFromTemplate(@RequestParam Stri
     public Mono<ResponseView<Boolean>> recycle(@PathVariable String applicationId) {
         return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
             applicationApiService.recycle(appId)
-                    .delayUntil(__ -> businessEventPublisher.publishApplicationCommonEvent(applicationId, null, APPLICATION_RECYCLED))
+                    .delayUntil(__ -> businessEventPublisher.publishApplicationCommonEvent(applicationId, null, null, APPLICATION_RECYCLED))
                     .map(ResponseView::success));
     }
 
     @Override
     public Mono<ResponseView<Boolean>> restore(@PathVariable String applicationId) {
         return gidService.convertApplicationIdToObjectId(applicationId).flatMap(appId ->
             applicationApiService.restore(appId)
-                .delayUntil(__ -> businessEventPublisher.publishApplicationCommonEvent(applicationId, null, APPLICATION_RESTORE))
+                .delayUntil(__ -> businessEventPublisher.publishApplicationCommonEvent(applicationId, null, null, APPLICATION_RESTORE))
                 .map(ResponseView::success));
     }
 

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/view/ApplicationInfoView.java

@@ -29,6 +29,9 @@ public class ApplicationInfoView {
     private final Object containerSize; // for module size
     @Nullable
     private String folderId;
+    @Nullable
+    @JsonInclude(Include.NON_NULL)
+    private String folderIdFrom;
 
     @Nullable
     private final Instant lastViewTime; // user last visit time for this app

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

@@ -1,27 +1,29 @@
 package org.lowcoder.api.home;
 
-import static org.lowcoder.plugin.api.event.LowcoderEvent.EventType.APPLICATION_MOVE;
-import static org.lowcoder.sdk.exception.BizError.INVALID_PARAMETER;
-import static org.lowcoder.sdk.util.ExceptionUtils.ofError;
-
+import lombok.RequiredArgsConstructor;
 import org.lowcoder.api.application.view.ApplicationPermissionView;
 import org.lowcoder.api.framework.view.PageResponseView;
 import org.lowcoder.api.framework.view.ResponseView;
 import org.lowcoder.api.util.BusinessEventPublisher;
 import org.lowcoder.api.util.GidService;
 import org.lowcoder.domain.application.model.ApplicationType;
 import org.lowcoder.domain.folder.model.Folder;
+import org.lowcoder.domain.folder.service.FolderElementRelationService;
 import org.lowcoder.domain.folder.service.FolderService;
 import org.lowcoder.domain.permission.model.ResourceRole;
 import org.lowcoder.plugin.api.event.LowcoderEvent.EventType;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-
-import lombok.RequiredArgsConstructor;
 import reactor.core.publisher.Mono;
 
+import java.util.List;
+
+import static org.lowcoder.plugin.api.event.LowcoderEvent.EventType.APPLICATION_MOVE;
+import static org.lowcoder.sdk.exception.BizError.INVALID_PARAMETER;
+import static org.lowcoder.sdk.util.ExceptionUtils.ofError;
+
 @RequiredArgsConstructor
 @RestController
 public class FolderController implements FolderEndpoints 
@@ -31,6 +33,7 @@ public class FolderController implements FolderEndpoints
     private final FolderApiService folderApiService;
     private final BusinessEventPublisher businessEventPublisher;
     private final GidService gidService;
+    private final FolderElementRelationService folderElementRelationService;
 
     @Override
     public Mono<ResponseView<FolderInfoView>> create(@RequestBody Folder folder) {
@@ -89,10 +92,11 @@ public Mono<PageResponseView<?>> getElements(@RequestParam(value = "id", require
     @Override
     public Mono<ResponseView<Void>> move(@PathVariable("id") String applicationLikeId,
             @RequestParam(value = "targetFolderId", required = false) String targetFolderId) {
-        return gidService.convertFolderIdToObjectId(targetFolderId).flatMap(objectId ->
-            folderApiService.move(applicationLikeId, objectId.orElse(null))
-                .then(businessEventPublisher.publishApplicationCommonEvent(applicationLikeId, objectId.orElse(null), APPLICATION_MOVE))
-                .then(Mono.fromSupplier(() -> ResponseView.success(null))));
+        return folderElementRelationService.getByElementIds(List.of(applicationLikeId)).next().flatMap(folderElement ->
+                gidService.convertFolderIdToObjectId(targetFolderId).flatMap(objectId ->
+                    folderApiService.move(applicationLikeId, objectId.orElse(null))
+                        .then(businessEventPublisher.publishApplicationCommonEvent(applicationLikeId, folderElement.folderId(), objectId.orElse(null), APPLICATION_MOVE))
+                        .then(Mono.fromSupplier(() -> ResponseView.success(null)))));
     }
 
     @Override

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

@@ -97,13 +97,14 @@ public Mono<Void> publishFolderCommonEvent(String folderId, String folderName, E
                 });
     }
 
-    public Mono<Void> publishApplicationCommonEvent(String applicationId, @Nullable String folderId, EventType eventType) {
+    public Mono<Void> publishApplicationCommonEvent(String applicationId, @Nullable String folderIdFrom, @Nullable String folderId, EventType eventType) {
         return applicationService.findByIdWithoutDsl(applicationId)
                 .map(application -> {
                     ApplicationInfoView applicationInfoView = ApplicationInfoView.builder()
                             .applicationId(applicationId)
                             .name(application.getName())
                             .folderId(folderId)
+                            .folderIdFrom(folderIdFrom)
                             .build();
                     return ApplicationView.builder()
                             .applicationInfoView(applicationInfoView)
@@ -129,6 +130,15 @@ public Mono<Void> publishApplicationCommonEvent(ApplicationView applicationView,
                                         .map(Optional::of)
                                         .onErrorReturn(Optional.empty());
                             }))
+                            .zipWith(Mono.defer(() -> {
+                                String folderId = applicationView.getApplicationInfoView().getFolderIdFrom();
+                                if (StringUtils.isBlank(folderId)) {
+                                    return Mono.just(Optional.<Folder> empty());
+                                }
+                                return folderService.findById(folderId)
+                                        .map(Optional::of)
+                                        .onErrorReturn(Optional.empty());
+                            }), TupleUtils::merge)
                             .zipWith(sessionUserService.getVisitorToken())
                             .zipWith(Mono.defer(() -> {
                                 String appId = applicationView.getApplicationInfoView().getApplicationId();
@@ -144,6 +154,7 @@ public Mono<Void> publishApplicationCommonEvent(ApplicationView applicationView,
                             .doOnNext(tuple -> {
                                 OrgMember orgMember = tuple.getT1().getT1();
                                 Optional<Folder> optional = tuple.getT1().getT2();
+                                Optional<Folder> optionalFrom = tuple.getT1().getT3();
                                 String token = tuple.getT2();
                                 String category = tuple.getT3().getLeft();
                                 String description = tuple.getT3().getRight();
@@ -159,6 +170,8 @@ public Mono<Void> publishApplicationCommonEvent(ApplicationView applicationView,
                                         .type(eventType)
                                         .folderId(optional.map(Folder::getId).orElse(null))
                                         .folderName(optional.map(Folder::getName).orElse(null))
+                                        .oldFolderId(optionalFrom.map(Folder::getId).orElse(null))
+                                        .oldFolderName(optionalFrom.map(Folder::getName).orElse(null))
                                         .isAnonymous(anonymous)
                                         .sessionHash(Hashing.sha512().hashString(token, StandardCharsets.UTF_8).toString())
                                         .build();