insist777
2 years ago
committed by
GitHub
20 changed files with 998 additions and 51 deletions
@ -0,0 +1,206 @@
|
||||
/* |
||||
* Licensed to the Apache Software Foundation (ASF) under one or more |
||||
* contributor license agreements. See the NOTICE file distributed with |
||||
* this work for additional information regarding copyright ownership. |
||||
* The ASF licenses this file to You under the Apache License, Version 2.0 |
||||
* (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package org.apache.dolphinscheduler.api.controller; |
||||
|
||||
import static org.apache.dolphinscheduler.api.enums.Status.COUNT_PROCESS_DEFINITION_USER_ERROR; |
||||
import static org.apache.dolphinscheduler.api.enums.Status.QUERY_ALL_WORKFLOW_COUNT_ERROR; |
||||
import static org.apache.dolphinscheduler.api.enums.Status.QUERY_ONE_TASK_STATES_COUNT_ERROR; |
||||
import static org.apache.dolphinscheduler.api.enums.Status.QUERY_ONE_WORKFLOW_STATE_COUNT_ERROR; |
||||
import static org.apache.dolphinscheduler.api.enums.Status.QUERY_TASK_STATES_COUNT_ERROR; |
||||
import static org.apache.dolphinscheduler.api.enums.Status.QUERY_WORKFLOW_STATES_COUNT_ERROR; |
||||
|
||||
import org.apache.dolphinscheduler.api.aspect.AccessLogAnnotation; |
||||
import org.apache.dolphinscheduler.api.dto.project.StatisticsStateRequest; |
||||
import org.apache.dolphinscheduler.api.exceptions.ApiException; |
||||
import org.apache.dolphinscheduler.api.service.DataAnalysisService; |
||||
import org.apache.dolphinscheduler.api.utils.Result; |
||||
import org.apache.dolphinscheduler.common.constants.Constants; |
||||
import org.apache.dolphinscheduler.dao.entity.User; |
||||
|
||||
import org.apache.commons.lang3.StringUtils; |
||||
|
||||
import java.util.Map; |
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired; |
||||
import org.springframework.http.HttpStatus; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.PathVariable; |
||||
import org.springframework.web.bind.annotation.RequestAttribute; |
||||
import org.springframework.web.bind.annotation.RequestBody; |
||||
import org.springframework.web.bind.annotation.RequestMapping; |
||||
import org.springframework.web.bind.annotation.ResponseStatus; |
||||
import org.springframework.web.bind.annotation.RestController; |
||||
|
||||
import io.swagger.v3.oas.annotations.Operation; |
||||
import io.swagger.v3.oas.annotations.Parameter; |
||||
import io.swagger.v3.oas.annotations.tags.Tag; |
||||
/** |
||||
* StatisticsV2 controller |
||||
*/ |
||||
@Tag(name = "STATISTICS_V2") |
||||
@RestController |
||||
@RequestMapping("/v2/statistics") |
||||
public class StatisticsV2Controller extends BaseController { |
||||
|
||||
@Autowired |
||||
private DataAnalysisService dataAnalysisService; |
||||
|
||||
/** |
||||
* query all workflow count |
||||
* @param loginUser login user |
||||
* @return workflow count |
||||
*/ |
||||
@Operation(summary = "queryAllWorkflowCount", description = "QUERY_ALL_WORKFLOW_COUNT") |
||||
@GetMapping(value = "/workflows/count") |
||||
@ResponseStatus(HttpStatus.OK) |
||||
@ApiException(QUERY_ALL_WORKFLOW_COUNT_ERROR) |
||||
@AccessLogAnnotation(ignoreRequestArgs = "loginUser") |
||||
public Result queryWorkflowInstanceCounts(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser) { |
||||
Map<String, Object> result = dataAnalysisService.queryAllWorkflowCounts(loginUser); |
||||
return returnDataList(result); |
||||
} |
||||
|
||||
/** |
||||
* query all workflow states count |
||||
* @param loginUser login user |
||||
* @param statisticsStateRequest statisticsStateRequest |
||||
* @return workflow states count |
||||
*/ |
||||
@Operation(summary = "queryAllWorkflowStatesCount", description = "QUERY_ALL_WORKFLOW_STATES_COUNT") |
||||
@GetMapping(value = "/workflows/states/count") |
||||
@ResponseStatus(HttpStatus.OK) |
||||
@ApiException(QUERY_WORKFLOW_STATES_COUNT_ERROR) |
||||
@AccessLogAnnotation(ignoreRequestArgs = "loginUser") |
||||
public Result queryWorkflowStatesCounts(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser, |
||||
@RequestBody(required = false) StatisticsStateRequest statisticsStateRequest) { |
||||
Map<String, Object> result = |
||||
dataAnalysisService.countWorkflowStates(loginUser, statisticsStateRequest); |
||||
return returnDataList(result); |
||||
} |
||||
|
||||
/** |
||||
* query one workflow states count |
||||
* @param loginUser login user |
||||
* @param workflowCode workflowCode |
||||
* @return workflow states count |
||||
*/ |
||||
@Operation(summary = "queryOneWorkflowStatesCount", description = "QUERY_One_WORKFLOW_STATES_COUNT") |
||||
@GetMapping(value = "/{workflowCode}/states/count") |
||||
@ResponseStatus(HttpStatus.OK) |
||||
@ApiException(QUERY_ONE_WORKFLOW_STATE_COUNT_ERROR) |
||||
@AccessLogAnnotation(ignoreRequestArgs = "loginUser") |
||||
public Result queryOneWorkflowStates(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser, |
||||
@PathVariable("workflowCode") Long workflowCode) { |
||||
Map<String, Object> result = |
||||
dataAnalysisService.countOneWorkflowStates(loginUser, workflowCode); |
||||
return returnDataList(result); |
||||
} |
||||
|
||||
/** |
||||
* query all task states count |
||||
* @param loginUser login user |
||||
* @param statisticsStateRequest statisticsStateRequest |
||||
* @return tasks states count |
||||
*/ |
||||
@Operation(summary = "queryAllTaskStatesCount", description = "QUERY_ALL_TASK_STATES_COUNT") |
||||
@GetMapping(value = "/tasks/states/count") |
||||
@ResponseStatus(HttpStatus.OK) |
||||
@ApiException(QUERY_TASK_STATES_COUNT_ERROR) |
||||
@AccessLogAnnotation(ignoreRequestArgs = "loginUser") |
||||
public Result queryTaskStatesCounts(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser, |
||||
@RequestBody(required = false) StatisticsStateRequest statisticsStateRequest) { |
||||
Map<String, Object> result = |
||||
dataAnalysisService.countTaskStates(loginUser, statisticsStateRequest); |
||||
return returnDataList(result); |
||||
} |
||||
|
||||
/** |
||||
* query one task states count |
||||
* @param loginUser login user |
||||
* @param taskCode taskCode |
||||
* @return tasks states count |
||||
*/ |
||||
@Operation(summary = "queryOneTaskStatesCount", description = "QUERY_ONE_TASK_STATES_COUNT") |
||||
@GetMapping(value = "/tasks/{taskCode}/states/count") |
||||
@ResponseStatus(HttpStatus.OK) |
||||
@ApiException(QUERY_ONE_TASK_STATES_COUNT_ERROR) |
||||
@AccessLogAnnotation(ignoreRequestArgs = "loginUser") |
||||
public Result queryOneTaskStatesCounts(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser, |
||||
@PathVariable("taskCode") Long taskCode) { |
||||
Map<String, Object> result = |
||||
dataAnalysisService.countOneTaskStates(loginUser, taskCode); |
||||
return returnDataList(result); |
||||
} |
||||
|
||||
/** |
||||
* statistics the workflow quantities of certain user |
||||
* @param loginUser login user |
||||
* @param statisticsStateRequest statisticsStateRequest |
||||
* @return workflow count in project code |
||||
*/ |
||||
@Operation(summary = "countDefinitionV2ByUserId", description = "COUNT_PROCESS_DEFINITION_V2_BY_USERID_NOTES") |
||||
@GetMapping(value = "/workflows/users/count") |
||||
@ResponseStatus(HttpStatus.OK) |
||||
@ApiException(COUNT_PROCESS_DEFINITION_USER_ERROR) |
||||
@AccessLogAnnotation(ignoreRequestArgs = "loginUser") |
||||
public Result countDefinitionByUser(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser, |
||||
@RequestBody(required = false) StatisticsStateRequest statisticsStateRequest) { |
||||
String projectName = statisticsStateRequest.getProjectName(); |
||||
Long projectCode = statisticsStateRequest.getProjectCode(); |
||||
if (null == projectCode && !StringUtils.isBlank(projectName)) { |
||||
projectCode = dataAnalysisService.getProjectCodeByName(projectName); |
||||
} |
||||
Map<String, Object> result = dataAnalysisService.countDefinitionByUserV2(loginUser, projectCode, null, null); |
||||
return returnDataList(result); |
||||
} |
||||
|
||||
/** |
||||
* statistics the workflow quantities of certain userId |
||||
* @param loginUser login user |
||||
* @param userId userId |
||||
* @return workflow count in project code |
||||
*/ |
||||
@Operation(summary = "countDefinitionV2ByUser", description = "COUNT_PROCESS_DEFINITION_V2_BY_USER_NOTES") |
||||
@GetMapping(value = "/workflows/users/{userId}/count") |
||||
@ResponseStatus(HttpStatus.OK) |
||||
@ApiException(COUNT_PROCESS_DEFINITION_USER_ERROR) |
||||
@AccessLogAnnotation(ignoreRequestArgs = "loginUser") |
||||
public Result countDefinitionByUserId(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser, |
||||
@PathVariable("userId") Integer userId) { |
||||
Map<String, Object> result = dataAnalysisService.countDefinitionByUserV2(loginUser, null, userId, null); |
||||
return returnDataList(result); |
||||
} |
||||
/** |
||||
* statistics the workflow quantities of certain userId and releaseState |
||||
* @param loginUser login user |
||||
* @param userId userId |
||||
* @param releaseState releaseState |
||||
* @return workflow count in project code |
||||
*/ |
||||
@Operation(summary = "countDefinitionV2ByUser", description = "COUNT_PROCESS_DEFINITION_V2_BY_USER_NOTES") |
||||
@GetMapping(value = "/workflows/users/{userId}/{releaseState}/count") |
||||
@ResponseStatus(HttpStatus.OK) |
||||
@ApiException(COUNT_PROCESS_DEFINITION_USER_ERROR) |
||||
@AccessLogAnnotation(ignoreRequestArgs = "loginUser") |
||||
public Result countDefinitionByUserState(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser, |
||||
@PathVariable("userId") Integer userId, |
||||
@PathVariable("releaseState") Integer releaseState) { |
||||
Map<String, Object> result = dataAnalysisService.countDefinitionByUserV2(loginUser, null, userId, releaseState); |
||||
return returnDataList(result); |
||||
} |
||||
} |
||||
@ -0,0 +1,60 @@
|
||||
/* |
||||
* Licensed to the Apache Software Foundation (ASF) under one or more |
||||
* contributor license agreements. See the NOTICE file distributed with |
||||
* this work for additional information regarding copyright ownership. |
||||
* The ASF licenses this file to You under the Apache License, Version 2.0 |
||||
* (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package org.apache.dolphinscheduler.api.dto.project; |
||||
|
||||
import java.util.Date; |
||||
|
||||
import lombok.Data; |
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; |
||||
import com.fasterxml.jackson.annotation.JsonInclude; |
||||
import io.swagger.v3.oas.annotations.media.Schema; |
||||
|
||||
@Data |
||||
@JsonIgnoreProperties(ignoreUnknown = true) |
||||
@JsonInclude(JsonInclude.Include.NON_NULL) |
||||
public class StatisticsStateRequest { |
||||
|
||||
@Schema(name = "isAll", example = "true") |
||||
boolean isAll; |
||||
|
||||
@Schema(name = "projectName", example = "PROJECT-NAME") |
||||
String projectName; |
||||
|
||||
@Schema(name = "projectCode", example = "1234567890") |
||||
Long projectCode; |
||||
|
||||
@Schema(name = "workflowName", example = "WORKFLOW-NAME") |
||||
String workflowName; |
||||
|
||||
@Schema(name = "workflowCode", example = "1234567890") |
||||
Long workflowCode; |
||||
|
||||
@Schema(name = "taskName", example = "TASK-NAME") |
||||
String taskName; |
||||
|
||||
@Schema(name = "taskCode", example = "1234567890") |
||||
Long taskCode; |
||||
|
||||
@Schema(name = "startDate", example = "2022-01-01 10:01:02") |
||||
Date startTime; |
||||
|
||||
@Schema(name = "endDate", example = "2022-01-02 10:01:02") |
||||
Date endTime; |
||||
|
||||
} |
||||
@ -0,0 +1,171 @@
|
||||
/* |
||||
* Licensed to the Apache Software Foundation (ASF) under one or more |
||||
* contributor license agreements. See the NOTICE file distributed with |
||||
* this work for additional information regarding copyright ownership. |
||||
* The ASF licenses this file to You under the Apache License, Version 2.0 |
||||
* (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package org.apache.dolphinscheduler.api.controller; |
||||
|
||||
import org.apache.dolphinscheduler.api.dto.TaskCountDto; |
||||
import org.apache.dolphinscheduler.api.dto.project.StatisticsStateRequest; |
||||
import org.apache.dolphinscheduler.api.enums.Status; |
||||
import org.apache.dolphinscheduler.api.service.impl.DataAnalysisServiceImpl; |
||||
import org.apache.dolphinscheduler.api.utils.Result; |
||||
import org.apache.dolphinscheduler.common.constants.Constants; |
||||
import org.apache.dolphinscheduler.dao.entity.ExecuteStatusCount; |
||||
import org.apache.dolphinscheduler.dao.entity.User; |
||||
|
||||
import java.util.ArrayList; |
||||
import java.util.HashMap; |
||||
import java.util.List; |
||||
import java.util.Map; |
||||
|
||||
import org.junit.jupiter.api.Assertions; |
||||
import org.junit.jupiter.api.Test; |
||||
import org.mockito.InjectMocks; |
||||
import org.mockito.Mock; |
||||
import org.mockito.Mockito; |
||||
|
||||
public class StatisticsV2ControllerTest extends AbstractControllerTest { |
||||
|
||||
@InjectMocks |
||||
private StatisticsV2Controller statisticsV2Controller; |
||||
|
||||
@Mock |
||||
private DataAnalysisServiceImpl dataAnalysisService; |
||||
|
||||
@Test |
||||
public void testQueryWorkflowInstanceCounts() { |
||||
User loginUser = getLoginUser(); |
||||
int count = 0; |
||||
Map<String, Object> result = new HashMap<>(); |
||||
result.put("data", "AllWorkflowCounts = " + count); |
||||
putMsg(result, Status.SUCCESS); |
||||
|
||||
Mockito.when(dataAnalysisService.queryAllWorkflowCounts(loginUser)).thenReturn(result); |
||||
|
||||
Result result1 = statisticsV2Controller.queryWorkflowInstanceCounts(loginUser); |
||||
|
||||
Assertions.assertTrue(result1.isSuccess()); |
||||
|
||||
} |
||||
@Test |
||||
public void testQueryWorkflowStatesCounts() { |
||||
User loginUser = getLoginUser(); |
||||
Map<String, Object> result = new HashMap<>(); |
||||
StatisticsStateRequest statisticsStateRequest = new StatisticsStateRequest(); |
||||
List<ExecuteStatusCount> executeStatusCounts = new ArrayList<>(); |
||||
TaskCountDto taskCountResult = new TaskCountDto(executeStatusCounts); |
||||
result.put(Constants.DATA_LIST, taskCountResult); |
||||
putMsg(result, Status.SUCCESS); |
||||
|
||||
Mockito.when(dataAnalysisService.countWorkflowStates(loginUser, statisticsStateRequest)).thenReturn(result); |
||||
|
||||
Result result1 = statisticsV2Controller.queryWorkflowStatesCounts(loginUser, statisticsStateRequest); |
||||
|
||||
Assertions.assertTrue(result1.isSuccess()); |
||||
} |
||||
@Test |
||||
public void testQueryOneWorkflowStates() { |
||||
User loginUser = getLoginUser(); |
||||
Long workflowCode = 1L; |
||||
Map<String, Object> result = new HashMap<>(); |
||||
List<ExecuteStatusCount> executeStatusCounts = new ArrayList<>(); |
||||
TaskCountDto taskCountResult = new TaskCountDto(executeStatusCounts); |
||||
result.put(Constants.DATA_LIST, taskCountResult); |
||||
putMsg(result, Status.SUCCESS); |
||||
|
||||
Mockito.when(dataAnalysisService.countOneWorkflowStates(loginUser, workflowCode)).thenReturn(result); |
||||
|
||||
Result result1 = statisticsV2Controller.queryOneWorkflowStates(loginUser, workflowCode); |
||||
|
||||
Assertions.assertTrue(result1.isSuccess()); |
||||
|
||||
} |
||||
@Test |
||||
public void testQueryTaskStatesCounts() { |
||||
User loginUser = getLoginUser(); |
||||
Map<String, Object> result = new HashMap<>(); |
||||
StatisticsStateRequest statisticsStateRequest = new StatisticsStateRequest(); |
||||
List<ExecuteStatusCount> executeStatusCounts = new ArrayList<>(); |
||||
TaskCountDto taskCountResult = new TaskCountDto(executeStatusCounts); |
||||
result.put(Constants.DATA_LIST, taskCountResult); |
||||
putMsg(result, Status.SUCCESS); |
||||
|
||||
Mockito.when(dataAnalysisService.countTaskStates(loginUser, statisticsStateRequest)).thenReturn(result); |
||||
|
||||
Result result1 = statisticsV2Controller.queryTaskStatesCounts(loginUser, statisticsStateRequest); |
||||
|
||||
Assertions.assertTrue(result1.isSuccess()); |
||||
|
||||
} |
||||
@Test |
||||
public void testQueryOneTaskStatesCounts() { |
||||
User loginUser = getLoginUser(); |
||||
Long taskCode = 1L; |
||||
Map<String, Object> result = new HashMap<>(); |
||||
|
||||
List<ExecuteStatusCount> executeStatusCounts = new ArrayList<>(); |
||||
TaskCountDto taskCountResult = new TaskCountDto(executeStatusCounts); |
||||
result.put(Constants.DATA_LIST, taskCountResult); |
||||
putMsg(result, Status.SUCCESS); |
||||
|
||||
Mockito.when(dataAnalysisService.countOneTaskStates(loginUser, taskCode)).thenReturn(result); |
||||
|
||||
Result result1 = statisticsV2Controller.queryOneTaskStatesCounts(loginUser, taskCode); |
||||
|
||||
Assertions.assertTrue(result1.isSuccess()); |
||||
|
||||
} |
||||
@Test |
||||
public void testCountDefinitionByUser() { |
||||
User loginUser = getLoginUser(); |
||||
|
||||
Map<String, Object> result = new HashMap<>(); |
||||
StatisticsStateRequest statisticsStateRequest = new StatisticsStateRequest(); |
||||
|
||||
List<ExecuteStatusCount> executeStatusCounts = new ArrayList<>(); |
||||
TaskCountDto taskCountResult = new TaskCountDto(executeStatusCounts); |
||||
result.put(Constants.DATA_LIST, taskCountResult); |
||||
putMsg(result, Status.SUCCESS); |
||||
Mockito.when(dataAnalysisService.countDefinitionByUserV2(loginUser, statisticsStateRequest.getProjectCode(), |
||||
null, null)).thenReturn(result); |
||||
|
||||
Result result1 = statisticsV2Controller.countDefinitionByUser(loginUser, statisticsStateRequest); |
||||
|
||||
Assertions.assertTrue(result1.isSuccess()); |
||||
|
||||
} |
||||
@Test |
||||
public void testCountDefinitionByUserId() { |
||||
User loginUser = getLoginUser(); |
||||
Map<String, Object> result = new HashMap<>(); |
||||
Integer userId = 1; |
||||
|
||||
putMsg(result, Status.SUCCESS); |
||||
|
||||
Mockito.when(dataAnalysisService.countDefinitionByUserV2(loginUser, null, userId, null)).thenReturn(result); |
||||
|
||||
Result result1 = statisticsV2Controller.countDefinitionByUserId(loginUser, userId); |
||||
|
||||
Assertions.assertTrue(result1.isSuccess()); |
||||
} |
||||
|
||||
private User getLoginUser() { |
||||
User user = new User(); |
||||
user.setId(1); |
||||
user.setUserName("admin"); |
||||
return user; |
||||
} |
||||
} |
||||
Loading…
Reference in new issue