|
|
@@ -1,6 +1,6 @@
|
|
|
import { DataSource } from 'typeorm';
|
|
|
-import { UserEntity } from '@d8d/user-module';
|
|
|
-import { Role } from '@d8d/user-module';
|
|
|
+import { UserEntityMt } from '@d8d/user-module-mt';
|
|
|
+import { RoleMt } from '@d8d/user-module-mt';
|
|
|
|
|
|
/**
|
|
|
* 测试数据工厂类
|
|
|
@@ -9,7 +9,7 @@ export class TestDataFactory {
|
|
|
/**
|
|
|
* 创建测试用户数据
|
|
|
*/
|
|
|
- static createUserData(overrides: Partial<UserEntity> = {}): Partial<UserEntity> {
|
|
|
+ static createUserData(overrides: Partial<UserEntityMt> = {}): Partial<UserEntityMt> {
|
|
|
const timestamp = Date.now();
|
|
|
return {
|
|
|
username: `testuser_${timestamp}`,
|
|
|
@@ -27,7 +27,7 @@ export class TestDataFactory {
|
|
|
/**
|
|
|
* 创建测试角色数据
|
|
|
*/
|
|
|
- static createRoleData(overrides: Partial<Role> = {}): Partial<Role> {
|
|
|
+ static createRoleData(overrides: Partial<RoleMt> = {}): Partial<RoleMt> {
|
|
|
const timestamp = Date.now();
|
|
|
return {
|
|
|
name: `test_role_${timestamp}`,
|
|
|
@@ -39,9 +39,9 @@ export class TestDataFactory {
|
|
|
/**
|
|
|
* 在数据库中创建测试用户
|
|
|
*/
|
|
|
- static async createTestUser(dataSource: DataSource, overrides: Partial<UserEntity> = {}): Promise<UserEntity> {
|
|
|
+ static async createTestUser(dataSource: DataSource, overrides: Partial<UserEntityMt> = {}): Promise<UserEntityMt> {
|
|
|
const userData = this.createUserData(overrides);
|
|
|
- const userRepository = dataSource.getRepository(UserEntity);
|
|
|
+ const userRepository = dataSource.getRepository(UserEntityMt);
|
|
|
|
|
|
const user = userRepository.create(userData);
|
|
|
return await userRepository.save(user);
|
|
|
@@ -50,9 +50,9 @@ export class TestDataFactory {
|
|
|
/**
|
|
|
* 在数据库中创建测试角色
|
|
|
*/
|
|
|
- static async createTestRole(dataSource: DataSource, overrides: Partial<Role> = {}): Promise<Role> {
|
|
|
+ static async createTestRole(dataSource: DataSource, overrides: Partial<RoleMt> = {}): Promise<RoleMt> {
|
|
|
const roleData = this.createRoleData(overrides);
|
|
|
- const roleRepository = dataSource.getRepository(Role);
|
|
|
+ const roleRepository = dataSource.getRepository(RoleMt);
|
|
|
|
|
|
const role = roleRepository.create(roleData);
|
|
|
return await roleRepository.save(role);
|