Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 70 additions & 1 deletion server/api-service/lowcoder-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@

<properties>
<java.version>17</java.version>
<skipTests>false</skipTests>
<skipUnitTests>${skipTests}</skipUnitTests>
<skipIntegrationTests>${skipTests}</skipIntegrationTests>
</properties>

<dependencies>
Expand Down Expand Up @@ -175,6 +178,13 @@
<version>2.0.0.AM26</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.9.3</version>
<scope>test</scope>
</dependency>

</dependencies>

<build>
Expand All @@ -186,7 +196,66 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12.4</version>
<version>3.1.2</version>
<configuration>
<skipTests>${skipUnitTests}</skipTests>
<excludes>
<exclude>**/*IntegrationTest.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skipTests>${skipIntegrationTests}</skipTests>
<includes>
<include>**/*IntegrationTest.java</include>
</includes>
<argLine>
-Dpf4j.pluginsDir=../lowcoder-plugins/plugins
</argLine>
</configuration>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>copy-plugins-jar-for-integration-tests</id>
<phase>pre-integration-test</phase>
<configuration>
<target>
<copy todir="../lowcoder-plugins/plugins">
<fileset dir="../lowcoder-plugins" includes="/*/target/*shaded.jar" />
<mapper type="flatten"/>
</copy>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>delete-plugins-after-integration-tests-phase</id>
<phase>post-integration-test</phase>
<configuration>
<target>
<delete dir="../lowcoder-plugins/plugins"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
package org.lowcoder.api.application;


import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.lowcoder.api.application.ApplicationController.CreateApplicationRequest;
import org.lowcoder.api.application.view.ApplicationView;
import org.lowcoder.api.common.mockuser.WithMockUser;
import org.lowcoder.api.datasource.DatasourceApiService;
import org.lowcoder.api.datasource.DatasourceApiServiceIntegrationTest;
import org.lowcoder.api.permission.view.CommonPermissionView;
import org.lowcoder.api.permission.view.PermissionItemView;
import org.lowcoder.domain.application.model.Application;
import org.lowcoder.domain.application.model.ApplicationType;
import org.lowcoder.domain.datasource.model.Datasource;
import org.lowcoder.domain.permission.model.ResourceRole;
import org.lowcoder.sdk.exception.BizError;
import org.lowcoder.sdk.exception.BizException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;

import java.util.Map;
import java.util.Set;

@SuppressWarnings({"OptionalGetWithoutIsPresent"})
@SpringBootTest
@RunWith(SpringRunner.class)
@Slf4j(topic = "ApplicationApiServiceIntegrationTest")
public class ApplicationApiServiceIntegrationTest {

@Autowired
private ApplicationApiService applicationApiService;
@Autowired
private DatasourceApiService datasourceApiService;

@SuppressWarnings("ConstantConditions")
@Test
@WithMockUser(id = "user02")
public void testCreateApplicationSuccess() {

Mono<Datasource> datasourceMono = datasourceApiService.create(DatasourceApiServiceIntegrationTest.buildMysqlDatasource("mysql07")).cache();
Mono<CommonPermissionView> commonPermissionViewMono =
datasourceMono.flatMap(datasource -> datasourceApiService.getPermissions(datasource.getId()));
Mono<Boolean> deleteMono = commonPermissionViewMono.flatMap(commonPermissionView -> {
String permissionId = commonPermissionView.getUserPermissions().stream()
.filter(permissionItemView -> permissionItemView.getId().equals("user02"))
.findFirst()
.map(PermissionItemView::getPermissionId)
.get();
return datasourceApiService.updatePermission(permissionId, ResourceRole.VIEWER);
});
//
Mono<ApplicationView> applicationViewMono = datasourceMono.map(datasource -> new CreateApplicationRequest(
"org01",
"app05",
ApplicationType.APPLICATION.getValue(),
Map.of("comp", "table"),
Map.of("comp", "list", "queries", Set.of(Map.of("datasourceId", datasource.getId()))),
null))
.delayUntil(__ -> deleteMono)
.flatMap(createApplicationRequest -> applicationApiService.create(createApplicationRequest));

StepVerifier.create(applicationViewMono)
.assertNext(applicationView -> Assert.assertNotNull(applicationView.getApplicationInfoView().getApplicationId()))
.verifyComplete();
}

@Ignore
@SuppressWarnings("ConstantConditions")
@Test
@WithMockUser(id = "user02")
public void testUpdateApplicationFailedDueToLackOfDatasourcePermissions() {

Mono<Datasource> datasourceMono = datasourceApiService.create(DatasourceApiServiceIntegrationTest.buildMysqlDatasource("mysql08")).cache();
Mono<CommonPermissionView> commonPermissionViewMono =
datasourceMono.flatMap(datasource -> datasourceApiService.getPermissions(datasource.getId()));
Mono<Boolean> deleteMono = commonPermissionViewMono.flatMap(commonPermissionView -> {
String permissionId = commonPermissionView.getUserPermissions().stream()
.filter(permissionItemView -> permissionItemView.getId().equals("user02"))
.findFirst()
.map(PermissionItemView::getPermissionId)
.get();
return datasourceApiService.deletePermission(permissionId);
});
//
Mono<ApplicationView> applicationViewMono = datasourceMono.map(datasource -> new CreateApplicationRequest(
"org01",
"app03",
ApplicationType.APPLICATION.getValue(),
Map.of("comp", "table"),
Map.of("comp", "list", "queries", Set.of(Map.of("datasourceId", datasource.getId()))),
null))
.delayUntil(__ -> deleteMono)
.flatMap(createApplicationRequest -> applicationApiService.create(createApplicationRequest))
.flatMap(applicationView -> {
Application application = Application.builder()
.editingApplicationDSL(applicationView.getApplicationDSL())
.name("app03")
.build();
return applicationApiService.update(applicationView.getApplicationInfoView().getApplicationId(), application);
});

StepVerifier.create(applicationViewMono)
.expectErrorMatches(throwable -> throwable instanceof BizException bizException
&& bizException.getError() == BizError.NOT_AUTHORIZED
&& bizException.getMessageKey().equals("APPLICATION_EDIT_ERROR_LACK_OF_DATASOURCE_PERMISSIONS"))
.verify();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,23 @@

import lombok.extern.slf4j.Slf4j;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.lowcoder.api.application.ApplicationController.CreateApplicationRequest;
import org.lowcoder.api.application.view.ApplicationPermissionView;
import org.lowcoder.api.application.view.ApplicationView;
import org.lowcoder.api.common.mockuser.WithMockUser;
import org.lowcoder.api.datasource.DatasourceApiService;
import org.lowcoder.api.datasource.DatasourceApiServiceTest;
import org.lowcoder.api.home.FolderApiService;
import org.lowcoder.api.permission.view.CommonPermissionView;
import org.lowcoder.api.permission.view.PermissionItemView;
import org.lowcoder.domain.application.model.Application;
import org.lowcoder.domain.application.model.ApplicationStatus;
import org.lowcoder.domain.application.model.ApplicationType;
import org.lowcoder.domain.application.service.ApplicationService;
import org.lowcoder.domain.datasource.model.Datasource;
import org.lowcoder.domain.permission.model.ResourceHolder;
import org.lowcoder.domain.permission.model.ResourceRole;
import org.lowcoder.sdk.exception.BizError;
import org.lowcoder.sdk.exception.BizException;
import org.pf4j.PluginManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
Expand All @@ -35,7 +29,6 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
@SuppressWarnings({"OptionalGetWithoutIsPresent"})
@SpringBootTest
@RunWith(SpringRunner.class)
@Slf4j(topic = "ApplicationApiServiceTest")
Expand All @@ -50,19 +43,6 @@ public class ApplicationApiServiceTest {
@Autowired
private DatasourceApiService datasourceApiService;

@Autowired
private PluginManager pluginManager;

@Before
public void init() {
try {
pluginManager.loadPlugins();
pluginManager.startPlugins();
} catch (Exception e) {
log.error("Failed to load/start plugins. Exception: " + e);
}
}

@Test
@WithMockUser
public void testAutoInheritFoldersPermissionsOnAppCreate() {
Expand Down Expand Up @@ -284,78 +264,4 @@ public void testPermissions() {
.verifyComplete();
}

@Ignore
@SuppressWarnings("ConstantConditions")
@Test
@WithMockUser(id = "user02")
public void testCreateApplicationSuccess() {

Mono<Datasource> datasourceMono = datasourceApiService.create(DatasourceApiServiceTest.buildMysqlDatasource("mysql07")).cache();
Mono<CommonPermissionView> commonPermissionViewMono =
datasourceMono.flatMap(datasource -> datasourceApiService.getPermissions(datasource.getId()));
Mono<Boolean> deleteMono = commonPermissionViewMono.flatMap(commonPermissionView -> {
String permissionId = commonPermissionView.getUserPermissions().stream()
.filter(permissionItemView -> permissionItemView.getId().equals("user02"))
.findFirst()
.map(PermissionItemView::getPermissionId)
.get();
return datasourceApiService.updatePermission(permissionId, ResourceRole.VIEWER);
});
//
Mono<ApplicationView> applicationViewMono = datasourceMono.map(datasource -> new CreateApplicationRequest(
"org01",
"app05",
ApplicationType.APPLICATION.getValue(),
Map.of("comp", "table"),
Map.of("comp", "list", "queries", Set.of(Map.of("datasourceId", datasource.getId()))),
null))
.delayUntil(__ -> deleteMono)
.flatMap(createApplicationRequest -> applicationApiService.create(createApplicationRequest));

StepVerifier.create(applicationViewMono)
.assertNext(applicationView -> Assert.assertNotNull(applicationView.getApplicationInfoView().getApplicationId()))
.verifyComplete();
}

@Ignore
@SuppressWarnings("ConstantConditions")
@Test
@WithMockUser(id = "user02")
public void testUpdateApplicationFailedDueToLackOfDatasourcePermissions() {

Mono<Datasource> datasourceMono = datasourceApiService.create(DatasourceApiServiceTest.buildMysqlDatasource("mysql08")).cache();
Mono<CommonPermissionView> commonPermissionViewMono =
datasourceMono.flatMap(datasource -> datasourceApiService.getPermissions(datasource.getId()));
Mono<Boolean> deleteMono = commonPermissionViewMono.flatMap(commonPermissionView -> {
String permissionId = commonPermissionView.getUserPermissions().stream()
.filter(permissionItemView -> permissionItemView.getId().equals("user02"))
.findFirst()
.map(PermissionItemView::getPermissionId)
.get();
return datasourceApiService.deletePermission(permissionId);
});
//
Mono<ApplicationView> applicationViewMono = datasourceMono.map(datasource -> new CreateApplicationRequest(
"org01",
"app03",
ApplicationType.APPLICATION.getValue(),
Map.of("comp", "table"),
Map.of("comp", "list", "queries", Set.of(Map.of("datasourceId", datasource.getId()))),
null))
.delayUntil(__ -> deleteMono)
.flatMap(createApplicationRequest -> applicationApiService.create(createApplicationRequest))
.flatMap(applicationView -> {
Application application = Application.builder()
.editingApplicationDSL(applicationView.getApplicationDSL())
.name("app03")
.build();
return applicationApiService.update(applicationView.getApplicationInfoView().getApplicationId(), application);
});

StepVerifier.create(applicationViewMono)
.expectErrorMatches(throwable -> throwable instanceof BizException bizException
&& bizException.getError() == BizError.NOT_AUTHORIZED
&& bizException.getMessageKey().equals("APPLICATION_EDIT_ERROR_LACK_OF_DATASOURCE_PERMISSIONS"))
.verify();
}
}

This file was deleted.

Loading