Create more bundle create test for different permissions

Thomas · ludomikula · commit edc9b8d15898 · 2024-05-29T19:14:32.000+02:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationServiceImpl.java
@@ -15,6 +15,7 @@
 import org.lowcoder.domain.organization.repository.OrganizationRepository;
 import org.lowcoder.domain.organization.service.OrgMemberService;
 import org.lowcoder.domain.permission.model.ResourceRole;
+import org.lowcoder.domain.permission.model.ResourceType;
 import org.lowcoder.domain.permission.service.ResourcePermissionService;
 import org.lowcoder.domain.user.repository.UserRepository;
 import org.lowcoder.domain.user.service.UserService;
@@ -93,7 +94,7 @@ public Mono<Application> publish(String applicationId) {
     @Override
     public Mono<Application> create(Application newApplication, String visitorId) {
         return repository.save(newApplication)
-                .delayUntil(app -> resourcePermissionService.addApplicationPermissionToUser(app.getId(), visitorId, ResourceRole.OWNER));
+                .delayUntil(app -> resourcePermissionService.addResourcePermissionToUser(app.getId(), visitorId, ResourceRole.OWNER, ResourceType.APPLICATION));
     }
 
     /**
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/bundle/service/BundleService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/bundle/service/BundleService.java
@@ -16,7 +16,7 @@ public interface BundleService {
 
     Mono<Bundle> findById(String id);
 
-    Mono<Bundle> create(Bundle bundle);
+    Mono<Bundle> create(Bundle bundle, String userId);
 
     Flux<Bundle> findByUserId(String bundleId);
 
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/bundle/service/BundleServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/bundle/service/BundleServiceImpl.java
@@ -7,6 +7,9 @@
 import org.lowcoder.domain.bundle.model.Bundle;
 import org.lowcoder.domain.bundle.model.BundleRequestType;
 import org.lowcoder.domain.bundle.repository.BundleRepository;
+import org.lowcoder.domain.permission.model.ResourceRole;
+import org.lowcoder.domain.permission.model.ResourceType;
+import org.lowcoder.domain.permission.service.ResourcePermissionService;
 import org.lowcoder.infra.annotation.NonEmptyMono;
 import org.lowcoder.infra.mongo.MongoUpsertHelper;
 import org.lowcoder.sdk.constants.FieldName;
@@ -30,6 +33,7 @@ public class BundleServiceImpl implements BundleService {
 
     private final BundleRepository repository;
     private final MongoUpsertHelper mongoUpsertHelper;
+    private final ResourcePermissionService resourcePermissionService;
 
     @Override
     public Mono<Boolean> updateById(String id, Bundle resource) {
@@ -51,8 +55,9 @@ public Mono<Bundle> findById(String id) {
     }
 
     @Override
-    public Mono<Bundle> create(Bundle bundle) {
-        return repository.save(bundle);
+    public Mono<Bundle> create(Bundle newbundle, String visitorId) {
+        return repository.save(newbundle)
+                .delayUntil(bundle -> resourcePermissionService.addResourcePermissionToUser(bundle.getId(), visitorId, ResourceRole.OWNER, ResourceType.BUNDLE));
     }
 
     @Override
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionService.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionService.java
@@ -34,9 +34,10 @@ Mono<Boolean> addDataSourcePermissionToUser(String dataSourceId,
                                                 String userId,
                                                 ResourceRole role);
 
-    Mono<Boolean> addApplicationPermissionToUser(String applicationId,
+    Mono<Boolean> addResourcePermissionToUser(String resourceId,
                                                  String userId,
-                                                 ResourceRole role);
+                                                 ResourceRole role,
+                                                 ResourceType type);
 
     Mono<Boolean> addApplicationPermissionToGroup(String applicationId,
                                                   String groupId,
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/permission/service/ResourcePermissionServiceImpl.java
@@ -98,10 +98,11 @@ public Mono<Boolean> addDataSourcePermissionToUser(String dataSourceId,
     }
 
     @Override
-    public Mono<Boolean> addApplicationPermissionToUser(String applicationId,
+    public Mono<Boolean> addResourcePermissionToUser(String resourceId,
                                                         String userId,
-                                                        ResourceRole role) {
-        return addPermission(ResourceType.APPLICATION, applicationId, ResourceHolder.USER, userId, role);
+                                                        ResourceRole role,
+                                                        ResourceType type) {
+        return addPermission(type, resourceId, ResourceHolder.USER, userId, role);
     }
 
     @Override
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
@@ -116,7 +116,7 @@ public Mono<BundleInfoView> create(CreateBundleRequest createBundleRequest) {
                 })
                 .flatMap(orgMember -> {
                     bundle.setCreatedBy(orgMember.getUserId());
-                    return bundleService.create(bundle);
+                    return bundleService.create(bundle, orgMember.getUserId());
                 })
                 .delayUntil(created -> autoGrantPermissionsByFolderDefault(created.getId(), createBundleRequest.folderId()))
                 .delayUntil(created -> folderApiService.moveBundle(created.getId(),
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
@@ -26,6 +26,7 @@ public class BundleApiServiceImplTest {
 
     @Test
     public void createBundleTest() {
+        //When org admin user creates bundle it succeed
         when(sessionUserService.getVisitorId()).thenReturn(Mono.just("user01"));
         when(sessionUserService.getVisitorOrgMemberCache()).thenReturn(Mono.just(new OrgMember("org01", "user01", MemberRole.ADMIN, "NORMAL", 0)));
         Mono<BundleInfoView> bundleInfoViewMono = bundleApiService.create(new BundleEndpoints.CreateBundleRequest(
@@ -50,5 +51,46 @@ public void createBundleTest() {
                     assertNull(bundleInfoView.getFolderId());
                 })
                 .verifyComplete();
+
+        //When org dev user creates bundle it succeed
+        when(sessionUserService.getVisitorId()).thenReturn(Mono.just("user02"));
+        when(sessionUserService.getVisitorOrgMemberCache()).thenReturn(Mono.just(new OrgMember("org01", "user02", MemberRole.MEMBER, "NORMAL", 0)));
+        Mono<BundleInfoView> bundleInfoViewMono1 = bundleApiService.create(new BundleEndpoints.CreateBundleRequest(
+                "org01",
+                "name",
+                "title",
+                "description",
+                "category",
+                "image",
+                null));
+        StepVerifier.create(bundleInfoViewMono1)
+                .assertNext(bundleInfoView -> {
+                    assertNotNull(bundleInfoView.getBundleId());
+                    assertEquals("name", bundleInfoView.getName());
+                    assertEquals("title", bundleInfoView.getTitle());
+                    assertEquals("description", bundleInfoView.getDescription());
+                    assertEquals("category", bundleInfoView.getCategory());
+                    assertEquals("image", bundleInfoView.getImage());
+                    assertFalse(bundleInfoView.getPublicToAll());
+                    assertFalse(bundleInfoView.getPublicToMarketplace());
+                    assertFalse(bundleInfoView.getAgencyProfile());
+                    assertNull(bundleInfoView.getFolderId());
+                })
+                .verifyComplete();
+
+        //When non-dev create bundle throws error
+        when(sessionUserService.getVisitorId()).thenReturn(Mono.just("user01"));
+        when(sessionUserService.getVisitorOrgMemberCache()).thenReturn(Mono.just(new OrgMember("org01", "user01", MemberRole.MEMBER, "NORMAL", 0)));
+        Mono<BundleInfoView> bundleInfoViewMono2 = bundleApiService.create(new BundleEndpoints.CreateBundleRequest(
+                "org01",
+                "name",
+                "title",
+                "description",
+                "category",
+                "image",
+                null));
+        StepVerifier.create(bundleInfoViewMono2)
+                .expectError()
+                .verify();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -98,10 +98,11 @@ public Mono<Boolean> addDataSourcePermissionToUser(String dataSourceId,`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`@Override`
`101`		`- public Mono<Boolean> addApplicationPermissionToUser(String applicationId,`
	`101`	`+ public Mono<Boolean> addResourcePermissionToUser(String resourceId,`
`102`	`102`	`String userId,`
`103`		`- ResourceRole role) {`
`104`		`- return addPermission(ResourceType.APPLICATION, applicationId, ResourceHolder.USER, userId, role);`
	`103`	`+ ResourceRole role,`
	`104`	`+ ResourceType type) {`
	`105`	`+ return addPermission(type, resourceId, ResourceHolder.USER, userId, role);`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`@Override`