Add GID to ApplicationInfoView

Thomas · Thomas · commit 065b657af0c1 · 2024-06-14T11:31:56.000-04:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/bundle/model/Bundle.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/bundle/model/Bundle.java
@@ -9,12 +9,16 @@
 import org.lowcoder.sdk.models.HasIdAndAuditing;
 import org.springframework.data.mongodb.core.mapping.Document;
 
+import java.util.UUID;
+
 @Getter
 @Setter
 @Document
 @NoArgsConstructor
 @SuperBuilder
 public class Bundle extends HasIdAndAuditing {
+    @Getter
+    private String gid = UUID.randomUUID().toString();
     private String organizationId;
     @Nullable
     private String name;
diff --git a/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/ApplicationCommonEvent.java b/server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/ApplicationCommonEvent.java
@@ -10,6 +10,7 @@
 public class ApplicationCommonEvent extends AbstractEvent {
 
     private final String applicationId;
+    private final String applicationGid;
     private final String applicationName;
     private final EventType type;
     @Nullable
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java
@@ -501,6 +501,7 @@ private ApplicationInfoView buildView(Application application, String role) {
     private ApplicationInfoView buildView(Application application, String role, @Nullable String folderId) {
         return ApplicationInfoView.builder()
                 .applicationId(application.getId())
+                .applicationGid(application.getGid())
                 .orgId(application.getOrganizationId())
                 .name(application.getName())
                 .createBy(application.getCreatedBy())
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/view/ApplicationInfoView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/view/ApplicationInfoView.java
@@ -15,6 +15,7 @@
 public class ApplicationInfoView {
     private final String orgId;
     private final String applicationId;
+    private final String applicationGid;
     private final String name;
     private final long createAt;
     private final String createBy;
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/UserHomeApiServiceImpl.java
@@ -559,6 +559,7 @@ private ApplicationInfoView buildView(Application application, ResourceRole maxR
                                           Integer bundlePosition, boolean withContainerSize) {
         ApplicationInfoViewBuilder applicationInfoViewBuilder = ApplicationInfoView.builder()
                 .applicationId(application.getId())
+                .applicationGid(application.getGid())
                 .orgId(application.getOrganizationId())
                 .name(application.getName())
                 .createBy(Optional.ofNullable(userMap.get(application.getCreatedBy()))
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/BusinessEventPublisher.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/util/BusinessEventPublisher.java
@@ -135,6 +135,7 @@ public Mono<Void> publishApplicationCommonEvent(ApplicationView applicationView,
                                         .orgId(orgMember.getOrgId())
                                         .userId(orgMember.getUserId())
                                         .applicationId(applicationInfoView.getApplicationId())
+                                        .applicationGid(applicationInfoView.getApplicationGid())
                                         .applicationName(applicationInfoView.getName())
                                         .type(eventType)
                                         .folderId(optional.map(Folder::getId).orElse(null))
