This is an automated email from the ASF dual-hosted git repository. wangyang pushed a commit to branch dev in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push: new e5a512803e [Bug] [Audit log] Fix Audit log UI query error (#15427) e5a512803e is described below commit e5a512803ec6f8728fe05f4a5433231ab1d13c7e Author: 旺阳 <w...@lqwang.net> AuthorDate: Fri Jan 5 13:25:54 2024 +0800 [Bug] [Audit log] Fix Audit log UI query error (#15427) --- .../dolphinscheduler/dao/mapper/AuditLogMapper.xml | 3 ++ .../dao/mapper/AuditLogMapperTest.java | 32 ++++++++++++++++++---- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AuditLogMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AuditLogMapper.xml index 8b7482be5b..09ba57075f 100644 --- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AuditLogMapper.xml +++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/AuditLogMapper.xml @@ -60,5 +60,8 @@ <if test="resourceType != null and resourceType == 'USER'"> select user_name from t_ds_user where id = #{resourceId} </if> + <if test="resourceType != null and resourceType == 'PROJECT'"> + select name from t_ds_project where id = #{resourceId} + </if> </select> </mapper> diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AuditLogMapperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AuditLogMapperTest.java index cc320def36..36b4c39a7c 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AuditLogMapperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/AuditLogMapperTest.java @@ -17,8 +17,10 @@ package org.apache.dolphinscheduler.dao.mapper; +import org.apache.dolphinscheduler.common.enums.AuditResourceType; import org.apache.dolphinscheduler.dao.BaseDaoTest; import org.apache.dolphinscheduler.dao.entity.AuditLog; +import org.apache.dolphinscheduler.dao.entity.Project; import java.util.Date; @@ -34,26 +36,41 @@ public class AuditLogMapperTest extends BaseDaoTest { @Autowired AuditLogMapper logMapper; + @Autowired + private ProjectMapper projectMapper; + /** * insert * @return */ - private void insertOne() { + private void insertOne(AuditResourceType resourceType) { AuditLog auditLog = new AuditLog(); auditLog.setUserId(1); auditLog.setTime(new Date()); - auditLog.setResourceType(0); + auditLog.setResourceType(resourceType.getCode()); auditLog.setOperation(0); auditLog.setResourceId(0); logMapper.insert(auditLog); } + private Project insertProject() { + Project project = new Project(); + project.setName("ut project"); + project.setUserId(111); + project.setCode(1L); + project.setCreateTime(new Date()); + project.setUpdateTime(new Date()); + projectMapper.insert(project); + return project; + } + /** * test page query */ @Test public void testQueryAuditLog() { - insertOne(); + insertOne(AuditResourceType.USER_MODULE); + insertOne(AuditResourceType.PROJECT_MODULE); Page<AuditLog> page = new Page<>(1, 3); int[] resourceType = new int[0]; int[] operationType = new int[0]; @@ -64,7 +81,12 @@ public class AuditLogMapperTest extends BaseDaoTest { @Test public void testQueryResourceNameByType() { - String resourceName = logMapper.queryResourceNameByType("USER", 1); - Assertions.assertEquals("admin", resourceName); + String resourceNameByUser = logMapper.queryResourceNameByType(AuditResourceType.USER_MODULE.getMsg(), 1); + Assertions.assertEquals("admin", resourceNameByUser); + Project project = insertProject(); + String resourceNameByProject = logMapper.queryResourceNameByType(AuditResourceType.PROJECT_MODULE.getMsg(), 1); + Assertions.assertEquals(project.getName(), resourceNameByProject); + int delete = projectMapper.deleteById(project.getId()); + Assertions.assertEquals(delete, 1); } }