Add category and description to ApplicationCommonEvent

Author: dragonpoo

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

@@ -12,6 +12,8 @@ public class ApplicationCommonEvent extends AbstractEvent {
     private final String applicationId;
     private final String applicationGid;
     private final String applicationName;
+    private final String applicationCategory;
+    private final String applicationDescription;
     private final EventType type;
     @Nullable
     private final String folderId;

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

@@ -5,11 +5,13 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
 import org.lowcoder.api.application.view.ApplicationInfoView;
 import org.lowcoder.api.application.view.ApplicationView;
 import org.lowcoder.api.home.SessionUserService;
 import org.lowcoder.api.usermanagement.view.AddMemberRequest;
 import org.lowcoder.api.usermanagement.view.UpdateRoleRequest;
+import org.lowcoder.domain.application.service.ApplicationRecordServiceImpl;
 import org.lowcoder.domain.application.service.ApplicationService;
 import org.lowcoder.domain.datasource.model.Datasource;
 import org.lowcoder.domain.datasource.service.DatasourceService;
@@ -40,6 +42,7 @@
 import org.lowcoder.infra.event.groupmember.GroupMemberRoleUpdateEvent;
 import org.lowcoder.infra.event.user.UserLoginEvent;
 import org.lowcoder.infra.event.user.UserLogoutEvent;
+import org.lowcoder.infra.util.TupleUtils;
 import org.lowcoder.plugin.api.event.LowcoderEvent.EventType;
 import org.lowcoder.sdk.constants.Authentication;
 import org.lowcoder.sdk.util.LocaleUtils;
@@ -65,6 +68,7 @@ public class BusinessEventPublisher {
     private final ApplicationService applicationService;
     private final DatasourceService datasourceService;
     private final ResourcePermissionService resourcePermissionService;
+    private final ApplicationRecordServiceImpl applicationRecordServiceImpl;
 
     public Mono<Void> publishFolderCommonEvent(String folderId, String folderName, EventType eventType) {
 
@@ -126,17 +130,32 @@ public Mono<Void> publishApplicationCommonEvent(ApplicationView applicationView,
                                         .onErrorReturn(Optional.empty());
                             }))
                             .zipWith(sessionUserService.getVisitorToken())
+                            .zipWith(Mono.defer(() -> {
+                                String appId = applicationView.getApplicationInfoView().getApplicationId();
+                                return applicationService.findById(appId)
+                                        .zipWhen(application -> application.getCategory(applicationRecordServiceImpl))
+                                        .zipWhen(application -> application.getT1().getDescription(applicationRecordServiceImpl))
+                                        .map(tuple -> {
+                                            String category = tuple.getT1().getT2();
+                                            String description = tuple.getT2();
+                                            return Pair.of(category, description);
+                                        });
+                            }), TupleUtils::merge)
                             .doOnNext(tuple -> {
                                 OrgMember orgMember = tuple.getT1().getT1();
                                 Optional<Folder> optional = tuple.getT1().getT2();
                                 String token = tuple.getT2();
+                                String category = tuple.getT3().getLeft();
+                                String description = tuple.getT3().getRight();
                                 ApplicationInfoView applicationInfoView = applicationView.getApplicationInfoView();
                                 ApplicationCommonEvent event = ApplicationCommonEvent.builder()
                                         .orgId(orgMember.getOrgId())
                                         .userId(orgMember.getUserId())
                                         .applicationId(applicationInfoView.getApplicationId())
                                         .applicationGid(applicationInfoView.getApplicationGid())
                                         .applicationName(applicationInfoView.getName())
+                                        .applicationCategory(category)
+                                        .applicationDescription(description)
                                         .type(eventType)
                                         .folderId(optional.map(Folder::getId).orElse(null))
                                         .folderName(optional.map(Folder::getName).orElse(null))