test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
This commit is contained in:
wenyann 2020-10-19 12:28:55 +08:00
parent d838073c59 8a31d89503
commit eccbaa639d
9 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.java
View File

@ -12,12 +12,13 @@ public interface ExtTestCaseReviewMapper {
List<TestCaseReviewDTO> list(@Param("request") QueryCaseReviewRequest params);
List<TestCaseReviewDTO> listByWorkspaceId(@Param("workspaceId") String workspaceId);
List<TestCaseReviewDTO> listByWorkspaceId(@Param("workspaceId") String workspaceId, @Param("userId") String userId);
List<TestReviewDTOWithMetric> listRelate(@Param("request") QueryTestReviewRequest request);
/**
* 检查某工作空间下是否有某测试评审
*
* @param reviewId
* @param workspaceId
* @return Review ID

17
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseReviewMapper.xml
View File

@ -27,11 +27,18 @@
<select id="listByWorkspaceId" resultType="io.metersphere.track.dto.TestCaseReviewDTO"
parameterType="io.metersphere.track.request.testreview.QueryCaseReviewRequest">
select distinct test_case_review.*
from test_case_review, project, test_case_review_project
where test_case_review.id = test_case_review_project.review_id
and test_case_review_project.project_id = project.id
and project.workspace_id = #{workspaceId}
order by test_case_review.update_time desc
from test_case_review, project, test_case_review_project, test_case_review_users
<where>
test_case_review.id = test_case_review_project.review_id
and test_case_review_project.project_id = project.id
and project.workspace_id = #{workspaceId}
and (
(test_case_review_users.review_id = test_case_review.id
and test_case_review_users.user_id = #{userId} )
or test_case_review.creator = #{userId}
)
</where>
order by test_case_review.update_time desc
</select>
<select id="listRelate" resultType="io.metersphere.track.dto.TestReviewDTOWithMetric">

3
backend/src/main/java/io/metersphere/service/FileService.java
View File

@ -13,6 +13,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
@ -132,7 +133,7 @@ public class FileService {
final List<TestCaseFile> testCaseFiles = testCaseFileMapper.selectByExample(testCaseFileExample);
if (CollectionUtils.isEmpty(testCaseFiles)) {
return null;
return new ArrayList<>();
}
List<String> fileIds = testCaseFiles.stream().map(TestCaseFile::getFileId).collect(Collectors.toList());

3
backend/src/main/java/io/metersphere/track/service/TestCaseReviewService.java
View File

@ -37,7 +37,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@ -163,7 +162,7 @@ public class TestCaseReviewService {
}
public List<TestCaseReviewDTO> recent(String currentWorkspaceId) {
return extTestCaseReviewMapper.listByWorkspaceId(currentWorkspaceId);
return extTestCaseReviewMapper.listByWorkspaceId(currentWorkspaceId, SessionUtils.getUserId());
}
public void editCaseReview(SaveTestCaseReviewRequest testCaseReview) {

16
backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
View File

@ -15,10 +15,12 @@ import io.metersphere.track.dto.TestReviewCaseDTO;
import io.metersphere.track.request.testplancase.TestReviewCaseBatchRequest;
import io.metersphere.track.request.testreview.DeleteRelevanceRequest;
import io.metersphere.track.request.testreview.QueryCaseReviewRequest;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@ -64,17 +66,17 @@ public class TestReviewTestCaseService {
return testCaseReviewUsers.stream().map(TestCaseReviewUsers::getUserId).collect(Collectors.toList());
}
private String getReviewName(List<String> userIds, Map userMap) {
StringBuilder stringBuilder = new StringBuilder();
String name = "";
private String getReviewName(List<String> userIds, Map<String, String> userMap) {
List<String> userNames = new ArrayList<>();
if (userIds.size() > 0) {
for (String id : userIds) {
stringBuilder.append(userMap.get(id)).append("、");
String n = userMap.get(id);
if (StringUtils.isNotBlank(n)) {
userNames.add(n);
}
}
name = stringBuilder.toString().substring(0, stringBuilder.length() - 1);
}
return name;
return StringUtils.join(userNames, "、");
}
public int deleteTestCase(DeleteRelevanceRequest request) {

7
backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
View File

@ -95,11 +95,12 @@ public class XmindCaseParser {
}
String path = "";
for (int i = 0; i < nodes.length; i++) {
path += nodes[i].trim() + "/";
if (i != 0 && StringUtils.equals(nodes[i].trim(), "")) {
process.append(path + "：" + Translator.get("module_not_null") + "; ");
process.append(Translator.get("module") + "：【" + path + "】" + Translator.get("module_not_null") + "; ");
} else if (nodes[i].trim().length() > 30) {
process.append(nodes[i].trim() + "：" + Translator.get("test_track.length_less_than") + "30 ;");
} else {
path += nodes[i].trim() + "/";
}
}
});
@ -124,7 +125,7 @@ public class XmindCaseParser {
}
for (int i = 0; i < nodes.length; i++) {
if (i != 0 && StringUtils.equals(nodes[i].trim(), "")) {
stringBuilder.append(Translator.get("test_case") + "，" + data.getName() + Translator.get("module_not_null") + "; ");
stringBuilder.append(Translator.get("test_case") + "：【" + data.getName() + "】" + Translator.get("module_not_null") + "; ");
break;
} else if (nodes[i].trim().length() > 30) {
stringBuilder.append(nodes[i].trim() + "：" + Translator.get("module") + Translator.get("test_track.length_less_than") + "30 ;");

2
frontend/src/i18n/en-US.js
View File

@ -668,7 +668,7 @@ export default {
length_less_than: "The length less than",
recent_plan: "My recent plan",
recent_case: "My recent case",
recent_review: "Recent review",
recent_review: "My recent review",
pass_rate: "Pass rate",
execution_result: ": Please select the execution result",
actual_result: ": The actual result is empty",

2
frontend/src/i18n/zh-CN.js
View File

@ -672,7 +672,7 @@ export default {
length_less_than: "长度必须小于",
recent_plan: "我最近的计划",
recent_case: "我最近的用例",
recent_review: "最近的评审",
recent_review: "我最近的评审",
pass_rate: "通过率",
execution_result: ": 请选择执行结果",
actual_result: ": 实际结果为空",

2
frontend/src/i18n/zh-TW.js
View File

@ -672,7 +672,7 @@ export default {
length_less_than: "長度必須小於",
recent_plan: "我最近的計劃",
recent_case: "我最近的用例",
recent_review: "最近的評審",
recent_review: "我最近的評審",
pass_rate: "通過率",
execution_result: ": 請選擇執行結果",
actual_result: ": 實際結果為空",