diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml index 08282e3d0e..34c1247ea9 100644 --- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml @@ -162,11 +162,13 @@ diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapperTest.java index 93df32d048..0aa0f3afc6 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapperTest.java @@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.dao.mapper; import org.apache.dolphinscheduler.dao.BaseDaoTest; import org.apache.dolphinscheduler.dao.entity.Project; +import org.apache.dolphinscheduler.dao.entity.ProjectUser; import org.apache.dolphinscheduler.dao.entity.User; import java.util.Arrays; @@ -41,6 +42,9 @@ public class ProjectMapperTest extends BaseDaoTest { @Autowired private UserMapper userMapper; + @Autowired + private ProjectUserMapper projectUserMapper; + /** * insert * @@ -143,14 +147,14 @@ public class ProjectMapperTest extends BaseDaoTest { Page page = new Page(1, 3); IPage projectIPage = projectMapper.queryProjectListPaging( - page, - null, - null + page, + null, + null ); IPage projectIPage1 = projectMapper.queryProjectListPaging( - page, - null, - project.getName() + page, + null, + project.getName() ); Assert.assertEquals(projectIPage.getTotal(), 1); Assert.assertEquals(projectIPage1.getTotal(), 1); @@ -170,7 +174,7 @@ public class ProjectMapperTest extends BaseDaoTest { } /** - * test query authed prject list by userId + * test query authed project list by userId */ @Test public void testQueryAuthedProjectListByUserId() { @@ -189,20 +193,42 @@ public class ProjectMapperTest extends BaseDaoTest { Project project = insertOne(); List projects = projectMapper.queryProjectExceptUserId( - 100000 + 100000 ); Assert.assertNotEquals(projects.size(), 0); } + @Test + public void testQueryAllProject() { + User user = new User(); + user.setUserName("ut user"); + userMapper.insert(user); + + Project project = insertOne(); + project.setUserId(user.getId()); + projectMapper.updateById(project); + + ProjectUser projectUser = new ProjectUser(); + projectUser.setProjectId(project.getId()); + projectUser.setUserId(user.getId()); + projectUser.setCreateTime(new Date()); + projectUser.setUpdateTime(new Date()); + projectUserMapper.insert(projectUser); + + List allProject = projectMapper.queryAllProject(user.getId()); + + Assert.assertNotEquals(allProject.size(), 0); + } + /** * test query project permission */ @Test - public void testListAuthorizedProjects(){ + public void testListAuthorizedProjects() { Project project = insertOne(); - List projects = projectMapper.listAuthorizedProjects(1, Collections.singletonList(project.getId())); - Assert.assertEquals(projects.size(),0); + List projects = projectMapper.listAuthorizedProjects(1, Collections.singletonList(project.getId())); + Assert.assertEquals(projects.size(), 0); } } \ No newline at end of file