novalon/novalon-manage-system
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: migrate SysNotice to manage-notify module

Browse Source
This commit is contained in:
张翔
2026-03-14 10:24:06 +08:00
parent 4f4331f2d9
commit 4f1caaf758
155 changed files with 3272 additions and 865 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/DictionaryServiceTest.java
+3 -3
View File
@@ -1,9 +1,9 @@
package cn.novalon.manage.sys.core.service.impl;
import cn.novalon.manage.common.domain.Dictionary;
import cn.novalon.manage.sys.core.domain.Dictionary;
import cn.novalon.manage.sys.core.exception.DictionaryAlreadyExistsException;
import cn.novalon.manage.sys.core.service.IDictionaryService;
import cn.novalon.manage.db.repository.DictionaryRepository;
import cn.novalon.manage.sys.core.repository.IDictionaryRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -22,7 +22,7 @@ import static org.mockito.Mockito.*;
class DictionaryServiceTest {
@Mock
private DictionaryRepository repository;
private IDictionaryRepository repository;
private IDictionaryService service;
novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysConfigServiceTest.java
+2 -2
View File
@@ -1,7 +1,7 @@
package cn.novalon.manage.sys.core.service.impl;
import cn.novalon.manage.common.domain.SysConfig;
import cn.novalon.manage.db.repository.ISysConfigRepository;
import cn.novalon.manage.sys.core.domain.SysConfig;
import cn.novalon.manage.sys.core.repository.ISysConfigRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysRoleServiceTest.java
+14 -5
View File
@@ -1,8 +1,10 @@
package cn.novalon.manage.sys.core.service.impl;
import cn.novalon.manage.common.util.StatusConstants;
import cn.novalon.manage.common.domain.SysRole;
import cn.novalon.manage.db.repository.ISysRoleRepository;
import cn.novalon.manage.sys.core.domain.SysRole;
import cn.novalon.manage.sys.core.query.SysRoleQuery;
import cn.novalon.manage.sys.core.repository.ISysRoleRepository;
import cn.novalon.manage.sys.core.service.ISysUserService;
import cn.novalon.manage.common.dto.PageRequest;
import cn.novalon.manage.common.dto.PageResponse;
import org.junit.jupiter.api.BeforeEach;
@@ -28,13 +30,16 @@ class SysRoleServiceTest {
@Mock
private ISysRoleRepository roleRepository;
@Mock
private ISysUserService userService;
private SysRoleService roleService;
private SysRole testRole;
@BeforeEach
void setUp() {
roleService = new SysRoleService(roleRepository);
roleService = new SysRoleService(roleRepository, userService);
testRole = new SysRole();
testRole.setId(1L);
@@ -78,14 +83,14 @@ class SysRoleServiceTest {
pageResponse.setContent(List.of(testRole));
pageResponse.setTotalElements(1L);
when(roleRepository.findByQueryWithPagination(any(Query.class), eq(pageRequest)))
when(roleRepository.findByQueryWithPagination(any(SysRoleQuery.class), eq(pageRequest)))
.thenReturn(Mono.just(pageResponse));
StepVerifier.create(roleService.findRolesByPage(pageRequest))
.expectNextMatches(response -> response.getTotalElements() == 1L)
.verifyComplete();
verify(roleRepository).findByQueryWithPagination(any(Query.class), eq(pageRequest));
verify(roleRepository).findByQueryWithPagination(any(SysRoleQuery.class), eq(pageRequest));
}
@Test
@@ -133,11 +138,15 @@ class SysRoleServiceTest {
@Test
void testDeleteRole() {
when(roleRepository.findById(1L)).thenReturn(Mono.just(testRole));
when(userService.updateRoleIdToNullByRoleId(1L)).thenReturn(Mono.empty());
when(roleRepository.deleteById(1L)).thenReturn(Mono.empty());
StepVerifier.create(roleService.deleteRole(1L))
.verifyComplete();
verify(roleRepository).findById(1L);
verify(userService).updateRoleIdToNullByRoleId(1L);
verify(roleRepository).deleteById(1L);
}
novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/core/service/impl/SysUserServiceTest.java
+8 -6
View File
@@ -1,8 +1,9 @@
package cn.novalon.manage.sys.core.service.impl;
import cn.novalon.manage.common.util.StatusConstants;
import cn.novalon.manage.common.domain.SysUser;
import cn.novalon.manage.db.repository.ISysUserRepository;
import cn.novalon.manage.sys.core.domain.SysUser;
import cn.novalon.manage.sys.core.query.SysUserQuery;
import cn.novalon.manage.sys.core.repository.ISysUserRepository;
import cn.novalon.manage.common.dto.PageRequest;
import cn.novalon.manage.common.dto.PageResponse;
import org.junit.jupiter.api.BeforeEach;
@@ -107,14 +108,14 @@ class SysUserServiceTest {
pageResponse.setContent(List.of(testUser));
pageResponse.setTotalElements(1L);
when(userRepository.findByQueryWithPagination(any(Query.class), eq(pageRequest)))
when(userRepository.findByQueryWithPagination(any(SysUserQuery.class), eq(pageRequest)))
.thenReturn(Mono.just(pageResponse));
StepVerifier.create(userService.findUsersByPage(pageRequest))
.expectNextMatches(response -> response.getTotalElements() == 1L)
.verifyComplete();
verify(userRepository).findByQueryWithPagination(any(Query.class), eq(pageRequest));
verify(userRepository).findByQueryWithPagination(any(SysUserQuery.class), eq(pageRequest));
}
@Test
@@ -127,14 +128,14 @@ class SysUserServiceTest {
pageResponse.setContent(List.of(testUser));
pageResponse.setTotalElements(1L);
when(userRepository.findByQueryWithPagination(any(Query.class), eq(pageRequest)))
when(userRepository.findByQueryWithPagination(any(SysUserQuery.class), eq(pageRequest)))
.thenReturn(Mono.just(pageResponse));
StepVerifier.create(userService.findUsersByPage(pageRequest))
.expectNextMatches(response -> response.getTotalElements() == 1L)
.verifyComplete();
verify(userRepository).findByQueryWithPagination(any(Query.class), eq(pageRequest));
verify(userRepository).findByQueryWithPagination(any(SysUserQuery.class), eq(pageRequest));
}
@Test
@@ -199,6 +200,7 @@ class SysUserServiceTest {
@Test
void testDeleteUser() {
when(userRepository.findById(1L)).thenReturn(Mono.just(testUser));
when(userRepository.deleteById(1L)).thenReturn(Mono.empty());
StepVerifier.create(userService.deleteUser(1L))
novalon-manage-api/manage-sys/src/test/java/cn/novalon/manage/sys/handler/dictionary/DictionaryHandlerTest.java
+1 -1
View File
@@ -1,6 +1,6 @@
package cn.novalon.manage.sys.handler.dictionary;
import cn.novalon.manage.common.domain.Dictionary;
import cn.novalon.manage.sys.core.domain.Dictionary;
import cn.novalon.manage.sys.core.service.IDictionaryService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;