add gid field to get api response.

Author: Thomasr

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/group/model/Group.java

@@ -42,6 +42,8 @@ public class Group extends HasIdAndAuditing implements Comparable<Group> {
 
     @NotNull
     private String name;
+    @Getter
+    private String gid;
 
     @Getter
     @NotNull

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bundle/BundleApiServiceImpl.java

@@ -295,6 +295,7 @@ public Mono<BundleInfoView> publish(String bundleId) {
                 .flatMap(permission -> bundleService.publish(bundleId)
                         .map(bundleUpdated -> BundleInfoView.builder()
                                 .bundleId(bundleUpdated.getId())
+                                .bundleGid(bundleUpdated.getGid())
                                 .name(bundleUpdated.getName())
                                 .editingBundleDSL(bundleUpdated.getEditingBundleDSL())
                                 .publishedBundleDSL(bundleUpdated.getPublishedBundleDSL())
@@ -423,6 +424,7 @@ public Mono<BundleInfoView> getPublishedBundle(String bundleId, BundleRequestTyp
                     Bundle bundle = tuple.getT2();
                     return BundleInfoView.builder()
                             .bundleId(bundle.getId())
+                            .bundleGid(bundle.getGid())
                             .name(bundle.getName())
                             .title(bundle.getTitle())
                             .category(bundle.getCategory())
@@ -448,6 +450,7 @@ public Mono<BundleInfoView> getEditingBundle(String bundleId) {
                     Bundle bundle = tuple.getT2();
                     return BundleInfoView.builder()
                             .bundleId(bundle.getId())
+                            .bundleGid(bundle.getGid())
                             .name(bundle.getName())
                             .title(bundle.getTitle())
                             .category(bundle.getCategory())

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bundle/view/MarketplaceBundleInfoView.java

@@ -25,6 +25,7 @@ public class MarketplaceBundleInfoView {
 
     // Bundle details
     private final String bundleId;
+    private final String bundleGid;
     private final String name;
     private final long createAt;
     private final String createBy;

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

@@ -303,6 +303,7 @@ public Flux<BundleInfoView> getAllAuthorisedBundles4CurrentOrgMember(@Nullable B
 
                                 BundleInfoView bundleInfoView = BundleInfoView.builder()
                                         .bundleId(bundle.getId())
+                                        .bundleGid(bundle.getGid())
                                         .image(bundle.getImage())
                                         .name(bundle.getName())
                                         .title(bundle.getTitle())
@@ -489,6 +490,7 @@ public Flux<MarketplaceBundleInfoView> getAllMarketplaceBundles() {
 
                                 return MarketplaceBundleInfoView.builder()
                                         .bundleId(bundle.getId())
+                                        .bundleGid(bundle.getGid())
                                         .name(bundle.getName())
                                         .bundleStatus(bundle.getBundleStatus())
                                         .orgId(bundle.getOrganizationId())
@@ -541,6 +543,7 @@ public Flux<MarketplaceBundleInfoView> getAllAgencyProfileBundles() {
                                 Map<String, Organization> orgMap = tuple.getT3();
                                 return MarketplaceBundleInfoView.builder()
                                         .bundleId(bundle.getId())
+                                        .bundleGid(bundle.getGid())
                                         .name(bundle.getName())
                                         .bundleStatus(bundle.getBundleStatus())
                                         .orgId(bundle.getOrganizationId())

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupApiServiceImpl.java

@@ -13,6 +13,7 @@
 import java.util.Map;
 import java.util.Objects;
 
+import com.github.f4b6a3.uuid.UuidCreator;
 import lombok.RequiredArgsConstructor;
 import org.lowcoder.api.bizthreshold.AbstractBizThresholdChecker;
 import org.lowcoder.api.home.SessionUserService;
@@ -229,6 +230,7 @@ public Mono<Group> create(CreateGroupRequest createGroupRequest) {
                 .flatMap(orgMember -> {
                     String orgId = orgMember.getOrgId();
                     Group group = new Group();
+                    group.setGid(UuidCreator.getTimeOrderedEpoch().toString());
                     group.setOrganizationId(orgId);
                     group.setName(createGroupRequest.getName());
                     group.setDynamicRule(createGroupRequest.getDynamicRule());

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java

@@ -2,8 +2,10 @@
 
 import java.util.List;
 
+import com.github.f4b6a3.uuid.UuidCreator;
 import jakarta.validation.Valid;
 
+import org.apache.commons.lang.StringUtils;
 import org.lowcoder.api.authentication.dto.OrganizationDomainCheckResult;
 import org.lowcoder.api.framework.view.ResponseView;
 import org.lowcoder.api.usermanagement.view.OrgMemberListView;
@@ -39,6 +41,7 @@ public class OrganizationController implements OrganizationEndpoints
 
     @Override
     public Mono<ResponseView<OrgView>> create(@Valid @RequestBody Organization organization) {
+        if(StringUtils.isEmpty(organization.getGid())) organization.setGid(UuidCreator.getTimeOrderedEpoch().toString());
         return orgApiService.create(organization)
                 .map(ResponseView::success);
     }

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/view/GroupView.java

@@ -14,6 +14,7 @@
 public class GroupView {
 
     private String groupId;
+    private String groupGid;
     private String groupName;
     private boolean allUsersGroup;
     private boolean isDevGroup;
@@ -28,6 +29,7 @@ public static Mono<GroupView> from(Group group, String memberRole) {
             Locale locale = LocaleUtils.getLocale(contextView);
             GroupView groupView = GroupView.builder()
                     .groupId(group.getId())
+                    .groupGid(group.getGid())
                     .groupName(group.getName(locale))
                     .allUsersGroup(group.isAllUsersGroup())
                     .isDevGroup(group.isDevGroup())