Add GID to folder

Thomas · Thomas · commit 3d00ac1e171e · 2024-06-17T05:18:00.000-04:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/model/Folder.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/model/Folder.java
@@ -1,6 +1,7 @@
 package org.lowcoder.domain.folder.model;
 
 
+import com.github.f4b6a3.uuid.UuidCreator;
 import jakarta.annotation.Nullable;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -15,8 +16,10 @@
 public class Folder extends HasIdAndAuditing {
 
     private String organizationId;
+    private String gid = UuidCreator.getTimeOrderedEpoch().toString();
     @Nullable
     private String parentFolderId; // null represents folder in the root folder
+    private String parentFolderGid; // null represents folder in the root folder
     private String name;
     private String title;
     private String description;
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/repository/FolderRepository.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/repository/FolderRepository.java
@@ -5,9 +5,14 @@
 import org.springframework.stereotype.Repository;
 
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.Collection;
 
 @Repository
 public interface FolderRepository extends ReactiveMongoRepository<Folder, String> {
 
     Flux<Folder> findByOrganizationId(String organizationId);
+    Mono<Folder> findByGid(String organizationGid);
+    Mono<Void> deleteAllByGid(Collection<String> gids);
 }
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/service/FolderServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/service/FolderServiceImpl.java
@@ -39,6 +39,9 @@ public Mono<Folder> findById(String id) {
             return Mono.error(new BizException(BizError.INVALID_PARAMETER, "INVALID_PARAMETER", FieldName.ID));
         }
 
+        if(FieldName.isGID(id))
+            return repository.findByGid(id)
+                    .switchIfEmpty(Mono.error(new BizException(BizError.NO_RESOURCE_FOUND, "FOLDER_NOT_FOUND", id)));
         return repository.findById(id)
                 .switchIfEmpty(Mono.error(new BizException(BizError.NO_RESOURCE_FOUND, "FOLDER_NOT_FOUND", id)));
     }
@@ -55,6 +58,8 @@ public Flux<Folder> findByOrganizationId(String organizationId) {
 
     @Override
     public Mono<Void> deleteAllById(Collection<String> ids) {
+        if(!ids.isEmpty() && FieldName.isGID(ids.stream().findFirst().get()))
+            return repository.deleteAllByGid(ids);
         return repository.deleteAllById(ids);
     }
 
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiServiceImpl.java
@@ -315,7 +315,9 @@ private Mono<Tree<ApplicationInfoView, FolderInfoView>> buildApplicationInfoView
                             return FolderInfoView.builder()
                                     .orgId(orgMember.getOrgId())
                                     .folderId(folder.getId())
+                                    .folderGid(folder.getGid())
                                     .parentFolderId(folder.getParentFolderId())
+                                    .parentFolderGid(folder.getParentFolderGid())
                                     .name(folder.getName())
                                     .createAt(folder.getCreatedAt().toEpochMilli())
                                     .createBy(creator == null ? null : creator.getName())
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderInfoView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderInfoView.java
@@ -18,7 +18,9 @@ public class FolderInfoView {
 
     private final String orgId;
     private final String folderId;
+    private final String folderGid;
     private final String parentFolderId;
+    private final String parentFolderGid;
     private final String name;
     private final String title;
     private final String description;

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,9 @@ public Mono<Folder> findById(String id) {`
`39`	`39`	`return Mono.error(new BizException(BizError.INVALID_PARAMETER, "INVALID_PARAMETER", FieldName.ID));`
`40`	`40`	`}`
`41`	`41`
	`42`	`+ if(FieldName.isGID(id))`
	`43`	`+ return repository.findByGid(id)`
	`44`	`+ .switchIfEmpty(Mono.error(new BizException(BizError.NO_RESOURCE_FOUND, "FOLDER_NOT_FOUND", id)));`
`42`	`45`	`return repository.findById(id)`
`43`	`46`	`.switchIfEmpty(Mono.error(new BizException(BizError.NO_RESOURCE_FOUND, "FOLDER_NOT_FOUND", id)));`
`44`	`47`	`}`
`@@ -55,6 +58,8 @@ public Flux<Folder> findByOrganizationId(String organizationId) {`
`55`	`58`
`56`	`59`	`@Override`
`57`	`60`	`public Mono<Void> deleteAllById(Collection<String> ids) {`
	`61`	`+ if(!ids.isEmpty() && FieldName.isGID(ids.stream().findFirst().get()))`
	`62`	`+ return repository.deleteAllByGid(ids);`
`58`	`63`	`return repository.deleteAllById(ids);`
`59`	`64`	`}`
`60`	`65`