feature batch activate user (192c54cd) · Commits · SUMMER2020 / students / proj-2002251

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UsersController.java

+23 −0

Original line number	Diff line number	Diff line
		@@ -35,7 +35,9 @@ import org.springframework.http.HttpStatus;
		import org.springframework.web.bind.annotation.*;
		import springfox.documentation.annotations.ApiIgnore;

		import java.util.List;
		import java.util.Map;
		import java.util.stream.Collectors;

		import static org.apache.dolphinscheduler.api.enums.Status.*;

		@@ -462,4 +464,25 @@ public class UsersController extends BaseController {
		Map<String, Object> result = usersService.activateUser(loginUser, userName);
		return returnDataList(result);
		}

		/**
		* user batch activate
		*
		* @param userNames user names
		*/
		@ApiOperation(value="batchActivateUser",notes = "BATCH_ACTIVATE_USER_NOTES")
		@ApiImplicitParams({
		@ApiImplicitParam(name = "userName", value = "USER_NAME", type = "String"),
		})
		@PostMapping("/batch/activate")
		@ResponseStatus(HttpStatus.OK)
		@ApiException(UPDATE_USER_ERROR)
		public Result<Object> batchActivateUser(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
		@RequestBody List<String> userNames) {
		logger.info("login user {}, activate user, userNames: {}",
		loginUser.getUserName(), userNames);
		List<String> formatUserNames = userNames.stream().map(ParameterUtils::handleEscapes).collect(Collectors.toList());
		Map<String, Object> result = usersService.batchActivateUser(loginUser, formatUserNames);
		return returnDataList(result);
		}
		}

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

+50 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ import org.springframework.stereotype.Service;
		import org.springframework.transaction.annotation.Transactional;

		import java.io.IOException;
		import java.text.MessageFormat;
		import java.util.*;
		import java.util.stream.Collectors;

		@@ -946,6 +947,7 @@ public class UsersService extends BaseService {
		* activate user, only system admin have permission, change user state code 0 to 1
		*
		* @param loginUser login user
		* @param userName user name
		* @return create result code
		*/
		public Map<String, Object> activateUser(User loginUser, String userName) {
		@@ -983,4 +985,52 @@ public class UsersService extends BaseService {
		result.put(Constants.DATA_LIST, responseUser);
		return result;
		}

		/**
		* activate user, only system admin have permission, change users state code 0 to 1
		*
		* @param loginUser login user
		* @param userNames user name
		* @return create result code
		*/
		public Map<String, Object> batchActivateUser(User loginUser, List<String> userNames) {
		Map<String, Object> result = new HashMap<>();

		if (!isAdmin(loginUser)) {
		putMsg(result, Status.USER_NO_OPERATION_PERM);
		return result;
		}

		int totalSuccess = 0;
		List<String> successUserNames = new ArrayList<>();
		Map<String, Object> successRes = new HashMap<>();
		int totalFailed = 0;
		List<Map<String, String>> failedInfo = new ArrayList<>();
		Map<String, Object> failedRes = new HashMap<>();
		for (String userName : userNames) {
		Map<String, Object> tmpResult = activateUser(loginUser, userName);
		if (tmpResult.get(Constants.STATUS) != Status.SUCCESS) {
		totalFailed++;
		Map<String, String> failedBody = new HashMap<>();
		failedBody.put("userName", userName);
		Status status = (Status) tmpResult.get(Constants.STATUS);
		String errorMessage= MessageFormat.format(status.getMsg(), userName);
		failedBody.put("msg", errorMessage);
		failedInfo.add(failedBody);
		} else {
		totalSuccess++;
		successUserNames.add(userName);
		}
		}
		successRes.put("sum", totalSuccess);
		successRes.put("userName", successUserNames);
		failedRes.put("sum", totalFailed);
		failedRes.put("info", failedInfo);
		Map<String, Object> res = new HashMap<>();
		res.put("success", successRes);
		res.put("failed", failedRes);
		putMsg(result, Status.SUCCESS);
		result.put(Constants.DATA_LIST, res);
		return result;
		}
		}

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

+21 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,9 @@ import org.springframework.test.web.servlet.MvcResult;
		import org.springframework.util.LinkedMultiValueMap;
		import org.springframework.util.MultiValueMap;

		import java.util.ArrayList;
		import java.util.List;

		import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
		import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
		import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
		@@ -302,4 +305,22 @@ public class UsersControllerTest extends AbstractControllerTest{
		Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
		Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
		}

		@Test
		public void testBatchActivateUser() throws Exception {
		List<String> userNames = new ArrayList<>();
		userNames.add("user_sky_cxl");
		userNames.add("19990323");
		userNames.add("test_sky_post_11");
		String jsonUserNames = JSONUtils.toJsonString(userNames);
		MvcResult mvcResult = mockMvc.perform(post("/users/batch/activate")
		.header(SESSION_ID, sessionId)
		.contentType(MediaType.APPLICATION_JSON)
		.content(jsonUserNames))
		.andExpect(status().isOk())
		.andReturn();

		Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
		Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
		}
		}

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java

+35 −0

Original line number	Diff line number	Diff line
		@@ -528,6 +528,41 @@ public class UsersServiceTest {
		}
		}

		@Test
		public void testBatchActivateUser() {
		User user = new User();
		user.setUserType(UserType.GENERAL_USER);
		List<String> userNames = new ArrayList<>();
		userNames.add("userTest0001");
		userNames.add("userTest0002");
		userNames.add("userTest0003~");
		userNames.add("userTest0004");

		try {
		//not admin
		Map<String, Object> result = usersService.batchActivateUser(user, userNames);
		Assert.assertEquals(Status.USER_NO_OPERATION_PERM, result.get(Constants.STATUS));

		//batch activate user names
		user.setUserType(UserType.ADMIN_USER);
		when(userMapper.queryByUserNameAccurately("userTest0001")).thenReturn(getUser());
		when(userMapper.queryByUserNameAccurately("userTest0002")).thenReturn(getDisabledUser());
		result = usersService.batchActivateUser(user, userNames);
		Map<String, Object> responseData = (Map<String, Object>) result.get(Constants.DATA_LIST);
		Map<String, Object> successData = (Map<String, Object>) responseData.get("success");
		int totalSuccess = (Integer) successData.get("sum");

		Map<String, Object> failedData = (Map<String, Object>) responseData.get("failed");
		int totalFailed = (Integer) failedData.get("sum");

		Assert.assertEquals(1, totalSuccess);
		Assert.assertEquals(3, totalFailed);
		Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
		} catch (Exception e) {
		Assert.assertTrue(false);
		}
		}

		/**
		* get disabled user
		* @return