Unverified Commit fbb8ff43 authored by Wuv1Up's avatar Wuv1Up Committed by GitHub
Browse files

fix return value of created project (#2804) 



Co-authored-by: default avatardailidong <dailidong66@gmail.com>
parent e89f543f

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProjectService.java

+2 −4
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ public class ProjectService extends BaseService{ 
        project.setUpdateTime(now);



        if (projectMapper.insert(project) > 0) {

            Project insertedProject = projectMapper.queryByName(name);

            result.put(Constants.DATA_LIST, insertedProject);

            putMsg(result, Status.SUCCESS);

        } else {

            putMsg(result, Status.CREATE_PROJECT_ERROR);
@@ -124,9 +126,7 @@ public class ProjectService extends BaseService{ 
     * @return true if the login user have permission to see the project

     */

    public Map<String, Object> checkProjectAndAuth(User loginUser, Project project, String projectName) {



        Map<String, Object> result = new HashMap<>(5);



        if (project == null) {

            putMsg(result, Status.PROJECT_NOT_FOUNT, projectName);

        } else if (!checkReadPermission(loginUser, project)) {
@@ -135,8 +135,6 @@ public class ProjectService extends BaseService{ 
        }else {

            putMsg(result, Status.SUCCESS);

        }





        return result;

    }

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProjectControllerTest.java

+3 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public class ProjectControllerTest extends AbstractControllerTest{ 


        MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();

        paramsMap.add("projectName","project_test1");

        paramsMap.add("desc","the test project");

        paramsMap.add("description","the test project");



        MvcResult mvcResult = mockMvc.perform(post("/projects/create")

                .header(SESSION_ID, sessionId)
@@ -57,6 +57,7 @@ public class ProjectControllerTest extends AbstractControllerTest{ 


        Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);

        Assert.assertEquals(Status.SUCCESS.getCode(), result.getCode().intValue());

        Assert.assertNotNull(result.getData());

        logger.info(mvcResult.getResponse().getContentAsString());

    }