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

refactor(消息通知): 补充回复消息通知数据

This commit is contained in:
guoyuqi 2023-11-06 14:31:40 +08:00 committed by Craftsman
parent 4b656c4843
commit 9112726e9a
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseNoticeService.java
View File

@ -64,9 +64,12 @@ public class FunctionalCaseNoticeService {
if (!notifierList.contains(replyUser)) { if (!notifierList.contains(replyUser)) {
functionalCaseDTO.setRelatedUsers(replyUser); functionalCaseDTO.setRelatedUsers(replyUser);
} }
}
}
} else { } else {
functionalCaseDTO.setRelatedUsers(replyUser);
}
}
}
else {
if (StringUtils.isNotBlank(replyUser)) { if (StringUtils.isNotBlank(replyUser)) {
StringBuilder notifierStr = new StringBuilder(); StringBuilder notifierStr = new StringBuilder();
if (StringUtils.isNotBlank(notifier)) { if (StringUtils.isNotBlank(notifier)) {

2
backend/services/case-management/src/main/resources/permission.json
View File

@ -2,7 +2,7 @@
{ {
"id": "CASE_MANAGEMENT", "id": "CASE_MANAGEMENT",
"name": "permission.case_management.name", "name": "permission.case_management.name",
"type": "CASE_MANAGEMENT", "type": "PROJECT",
"children": [ "children": [
{ {
"id": "FUNCTIONAL_CASE", "id": "FUNCTIONAL_CASE",

2
backend/services/case-management/src/test/java/io/metersphere/functional/controller/FunctionalCaseCommentControllerTests.java
View File

@ -282,7 +282,7 @@ public class FunctionalCaseCommentControllerTests {
FunctionalCaseCommentRequest functionalCaseCommentRequest = new FunctionalCaseCommentRequest(); FunctionalCaseCommentRequest functionalCaseCommentRequest = new FunctionalCaseCommentRequest();
functionalCaseCommentRequest.setCaseId("xiaomeinvGTestOne"); functionalCaseCommentRequest.setCaseId("xiaomeinvGTestOne");
functionalCaseCommentRequest.setContent("评论你好"); functionalCaseCommentRequest.setContent("评论你好");
functionalCaseCommentRequest.setReplyUser("default-project-member-user-guo"); functionalCaseCommentRequest.setReplyUser("default-project-member-user-guo-5");
functionalCaseCommentRequest.setParentId(functionalCaseComment1.getId()); functionalCaseCommentRequest.setParentId(functionalCaseComment1.getId());
functionalCaseCommentRequest.setEvent(NoticeConstants.Event.REPLY); functionalCaseCommentRequest.setEvent(NoticeConstants.Event.REPLY);
FunctionalCaseComment functionalCaseComment = getFunctionalCaseComment(functionalCaseCommentRequest,SAVE_URL); FunctionalCaseComment functionalCaseComment = getFunctionalCaseComment(functionalCaseCommentRequest,SAVE_URL);

7
backend/services/case-management/src/test/resources/dml/init_case_comment.sql
View File

@ -30,6 +30,9 @@ VALUES ('default-project-member-user-guo', 'default-project-member-user1', 'proj
('default-project-member-user-guo-4', 'default-project-member-user5', 'project-member-guo5@metersphere.io', ('default-project-member-user-guo-4', 'default-project-member-user5', 'project-member-guo5@metersphere.io',
MD5('metersphere'), UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, NULL, NUll, '', 'LOCAL', NULL, 'admin', MD5('metersphere'), UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, NULL, NUll, '', 'LOCAL', NULL, 'admin',
'admin', 0), 'admin', 0),
('default-project-member-user-guo-5', 'default-project-member-user6', 'project-member-guo6@metersphere.io',
MD5('metersphere'), UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, NULL, NUll, '', 'LOCAL', NULL, 'admin',
'admin', 0),
('default-project-member-user-guo-del', 'default-project-member-userDel', ('default-project-member-user-guo-del', 'default-project-member-userDel',
'project-member-guo-del@metersphere.io', MD5('metersphere'), UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000, 'project-member-guo-del@metersphere.io', MD5('metersphere'), UNIX_TIMESTAMP() * 1000, UNIX_TIMESTAMP() * 1000,
NULL, NUll, '', 'LOCAL', NULL, 'admin', 'admin', 1), NULL, NUll, '', 'LOCAL', NULL, 'admin', 'admin', 1),
@ -46,6 +49,8 @@ VALUES (UUID(), 'default-project-member-user-guo', 'org_member', '100001', '1000
'admin'), 'admin'),
(UUID(), 'default-project-member-user-guo-4', 'org_member', '100001', '100001', UNIX_TIMESTAMP() * 1000, (UUID(), 'default-project-member-user-guo-4', 'org_member', '100001', '100001', UNIX_TIMESTAMP() * 1000,
'admin'), 'admin'),
(UUID(), 'default-project-member-user-guo-5', 'org_member', '100001', '100001', UNIX_TIMESTAMP() * 1000,
'admin'),
(UUID(), 'default-project-member-user-guo-del', 'org_member', '100001', '100001', UNIX_TIMESTAMP() * 1000, (UUID(), 'default-project-member-user-guo-del', 'org_member', '100001', '100001', UNIX_TIMESTAMP() * 1000,
'admin'), 'admin'),
(UUID(), 'gyq', 'org_member', '100001', '100001', UNIX_TIMESTAMP() * 1000, (UUID(), 'gyq', 'org_member', '100001', '100001', UNIX_TIMESTAMP() * 1000,
@ -62,6 +67,8 @@ VALUES (UUID(), 'default-project-member-user-guo', 'project_admin', '10000110000
'admin'), 'admin'),
(UUID(), 'default-project-member-user-guo-4', 'project_admin', '100001100001', '100001', UNIX_TIMESTAMP() * 1000, (UUID(), 'default-project-member-user-guo-4', 'project_admin', '100001100001', '100001', UNIX_TIMESTAMP() * 1000,
'admin'), 'admin'),
(UUID(), 'default-project-member-user-guo-5', 'project_admin', '100001100001', '100001', UNIX_TIMESTAMP() * 1000,
'admin'),
(UUID(), 'default-project-member-user-guo-del', 'project_admin', '100001100001', '100001', (UUID(), 'default-project-member-user-guo-del', 'project_admin', '100001100001', '100001',
UNIX_TIMESTAMP() * 1000, 'admin'), UNIX_TIMESTAMP() * 1000, 'admin'),
(UUID(), 'gyq', 'project_admin', '100001100001', '100001', UNIX_TIMESTAMP() * 1000, (UUID(), 'gyq', 'project_admin', '100001100001', '100001', UNIX_TIMESTAMP() * 1000,