add gid test

Thomas · ludomikula · commit 2d8ced29ae37 · 2024-07-03T16:33:01.000+02:00
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bundle/BundleApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bundle/BundleApiServiceImpl.java
@@ -629,6 +629,7 @@ public Mono<BundleInfoView> buildBundleInfoView(Bundle bundle, boolean visible,
                 .map(user -> BundleInfoView.builder()
                         .userId(bundle.getCreatedBy())
                         .bundleId(bundle.getId())
+                        .bundleGid(bundle.getGid())
                         .title(bundle.getTitle())
                         .name(bundle.getName())
                         .description(bundle.getDescription())
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bundle/view/BundleInfoView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/bundle/view/BundleInfoView.java
@@ -18,6 +18,7 @@ public class BundleInfoView {
 
     private final String userId;
     private final String bundleId;
+    private final String bundleGid;
     private final String name;
     private final String title;
     private final String description;
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceTest.java
@@ -20,6 +20,7 @@
 import org.lowcoder.domain.application.service.ApplicationService;
 import org.lowcoder.domain.permission.model.ResourceHolder;
 import org.lowcoder.domain.permission.model.ResourceRole;
+import org.lowcoder.sdk.constants.FieldName;
 import org.lowcoder.sdk.exception.BizError;
 import org.lowcoder.sdk.exception.BizException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -274,4 +275,21 @@ public void testPermissions() {
                 .verifyComplete();
     }
 
+    @Test
+    @WithMockUser
+    public void testAppCreateAndRetrievalByGID() {
+
+        Mono<Application> applicationMono = createApplication("test", null)
+                .map(applicationView -> applicationView.getApplicationInfoView().getApplicationGid())
+                .delayUntil(applicationGid -> applicationApiService.recycle(applicationGid))
+                .delayUntil(applicationGid -> applicationApiService.delete(applicationGid))
+                .flatMap(applicationGid -> applicationService.findById(applicationGid));
+        StepVerifier.create(applicationMono)
+                .assertNext(application -> {
+                    Assertions.assertSame(application.getApplicationStatus(), ApplicationStatus.DELETED);
+                    Assertions.assertNotNull(application.getGid());
+                    Assertions.assertTrue(FieldName.isGID(application.getGid()));
+                })
+                .verifyComplete();
+    }
 }
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/bundle/BundleApiServiceImplTest.java b/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/bundle/BundleApiServiceImplTest.java
@@ -15,6 +15,7 @@
 import org.lowcoder.domain.bundle.service.BundleService;
 import org.lowcoder.domain.permission.model.ResourceHolder;
 import org.lowcoder.domain.permission.model.ResourceRole;
+import org.lowcoder.sdk.constants.FieldName;
 import org.lowcoder.sdk.exception.BizError;
 import org.lowcoder.sdk.exception.BizException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,6 +73,8 @@ public void createBundleTestAdminUser() {
                     assertFalse(bundleInfoView.getPublicToMarketplace());
                     assertFalse(bundleInfoView.getAgencyProfile());
                     assertNull(bundleInfoView.getFolderId());
+                    assertNotNull(bundleInfoView.getBundleGid());
+                    assertTrue(FieldName.isGID(bundleInfoView.getBundleGid()));
                 })
                 .verifyComplete();
     }
@@ -100,6 +103,8 @@ public void createBundleTestDevUser() {
                     assertFalse(bundleInfoView.getPublicToMarketplace());
                     assertFalse(bundleInfoView.getAgencyProfile());
                     assertNull(bundleInfoView.getFolderId());
+                    assertNotNull(bundleInfoView.getBundleGid());
+                    assertTrue(FieldName.isGID(bundleInfoView.getBundleGid()));
                 })
                 .verifyComplete();
     }
