Skip to content

Commit 1707366

Browse files
committed
feat: delete invitation on role delete
1 parent 9d2a225 commit 1707366

18 files changed

+99
-5
lines changed

api/src/chat/controllers/block.controller.spec.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ import { LanguageService } from '@/i18n/services/language.service';
2525
import { LoggerService } from '@/logger/logger.service';
2626
import { PluginService } from '@/plugins/plugins.service';
2727
import { SettingService } from '@/setting/services/setting.service';
28+
import { InvitationRepository } from '@/user/repositories/invitation.repository';
2829
import { PermissionRepository } from '@/user/repositories/permission.repository';
2930
import { RoleRepository } from '@/user/repositories/role.repository';
3031
import { UserRepository } from '@/user/repositories/user.repository';
32+
import { InvitationModel } from '@/user/schemas/invitation.schema';
3133
import { PermissionModel } from '@/user/schemas/permission.schema';
3234
import { RoleModel } from '@/user/schemas/role.schema';
3335
import { UserModel } from '@/user/schemas/user.schema';
@@ -86,6 +88,7 @@ describe('BlockController', () => {
8688
LabelModel,
8789
CategoryModel,
8890
ContentModel,
91+
InvitationModel,
8992
AttachmentModel,
9093
UserModel,
9194
RoleModel,
@@ -102,6 +105,7 @@ describe('BlockController', () => {
102105
UserRepository,
103106
RoleRepository,
104107
PermissionRepository,
108+
InvitationRepository,
105109
LanguageRepository,
106110
BlockService,
107111
LabelService,

api/src/chat/controllers/label.controller.spec.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@ import { AttachmentRepository } from '@/attachment/repositories/attachment.repos
1515
import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
1616
import { AttachmentService } from '@/attachment/services/attachment.service';
1717
import { LoggerService } from '@/logger/logger.service';
18+
import { InvitationRepository } from '@/user/repositories/invitation.repository';
1819
import { RoleRepository } from '@/user/repositories/role.repository';
1920
import { UserRepository } from '@/user/repositories/user.repository';
21+
import { InvitationModel } from '@/user/schemas/invitation.schema';
2022
import { PermissionModel } from '@/user/schemas/permission.schema';
2123
import { RoleModel } from '@/user/schemas/role.schema';
2224
import { UserModel } from '@/user/schemas/user.schema';
@@ -61,6 +63,7 @@ describe('LabelController', () => {
6163
RoleModel,
6264
PermissionModel,
6365
SubscriberModel,
66+
InvitationModel,
6467
AttachmentModel,
6568
]),
6669
],
@@ -73,6 +76,7 @@ describe('LabelController', () => {
7376
UserRepository,
7477
RoleService,
7578
RoleRepository,
79+
InvitationRepository,
7680
SubscriberService,
7781
SubscriberRepository,
7882
EventEmitter2,

api/src/chat/controllers/message.controller.spec.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ import { I18nService } from '@/i18n/services/i18n.service';
2222
import { LoggerService } from '@/logger/logger.service';
2323
import { NlpService } from '@/nlp/services/nlp.service';
2424
import { SettingService } from '@/setting/services/setting.service';
25+
import { InvitationRepository } from '@/user/repositories/invitation.repository';
2526
import { RoleRepository } from '@/user/repositories/role.repository';
2627
import { UserRepository } from '@/user/repositories/user.repository';
28+
import { InvitationModel } from '@/user/schemas/invitation.schema';
2729
import { PermissionModel } from '@/user/schemas/permission.schema';
2830
import { RoleModel } from '@/user/schemas/role.schema';
2931
import { User, UserModel } from '@/user/schemas/user.schema';
@@ -71,6 +73,7 @@ describe('MessageController', () => {
7173
MessageModel,
7274
UserModel,
7375
RoleModel,
76+
InvitationModel,
7477
PermissionModel,
7578
AttachmentModel,
7679
MenuModel,
@@ -85,6 +88,7 @@ describe('MessageController', () => {
8588
UserRepository,
8689
RoleService,
8790
RoleRepository,
91+
InvitationRepository,
8892
SubscriberRepository,
8993
ChannelService,
9094
AttachmentService,

api/src/chat/controllers/subscriber.controller.spec.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ import { AttachmentRepository } from '@/attachment/repositories/attachment.repos
1414
import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
1515
import { AttachmentService } from '@/attachment/services/attachment.service';
1616
import { LoggerService } from '@/logger/logger.service';
17+
import { InvitationRepository } from '@/user/repositories/invitation.repository';
1718
import { RoleRepository } from '@/user/repositories/role.repository';
1819
import { UserRepository } from '@/user/repositories/user.repository';
20+
import { InvitationModel } from '@/user/schemas/invitation.schema';
1921
import { PermissionModel } from '@/user/schemas/permission.schema';
2022
import { RoleModel } from '@/user/schemas/role.schema';
2123
import { User, UserModel } from '@/user/schemas/user.schema';
@@ -63,6 +65,7 @@ describe('SubscriberController', () => {
6365
LabelModel,
6466
UserModel,
6567
RoleModel,
68+
InvitationModel,
6669
PermissionModel,
6770
AttachmentModel,
6871
]),
@@ -79,6 +82,7 @@ describe('SubscriberController', () => {
7982
UserRepository,
8083
RoleService,
8184
RoleRepository,
85+
InvitationRepository,
8286
EventEmitter2,
8387
AttachmentService,
8488
AttachmentRepository,

api/src/chat/services/message.service.spec.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ import { AttachmentRepository } from '@/attachment/repositories/attachment.repos
1414
import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
1515
import { AttachmentService } from '@/attachment/services/attachment.service';
1616
import { LoggerService } from '@/logger/logger.service';
17+
import { InvitationRepository } from '@/user/repositories/invitation.repository';
1718
import { RoleRepository } from '@/user/repositories/role.repository';
1819
import { UserRepository } from '@/user/repositories/user.repository';
20+
import { InvitationModel } from '@/user/schemas/invitation.schema';
1921
import { PermissionModel } from '@/user/schemas/permission.schema';
2022
import { RoleModel } from '@/user/schemas/role.schema';
2123
import { User, UserModel } from '@/user/schemas/user.schema';
@@ -62,6 +64,7 @@ describe('MessageService', () => {
6264
UserModel,
6365
RoleModel,
6466
PermissionModel,
67+
InvitationModel,
6568
SubscriberModel,
6669
MessageModel,
6770
AttachmentModel,
@@ -75,6 +78,7 @@ describe('MessageService', () => {
7578
UserRepository,
7679
RoleService,
7780
RoleRepository,
81+
InvitationRepository,
7882
SubscriberService,
7983
SubscriberRepository,
8084
MessageService,

api/src/chat/services/subscriber.service.spec.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ import { AttachmentRepository } from '@/attachment/repositories/attachment.repos
1414
import { AttachmentModel } from '@/attachment/schemas/attachment.schema';
1515
import { AttachmentService } from '@/attachment/services/attachment.service';
1616
import { LoggerService } from '@/logger/logger.service';
17+
import { InvitationRepository } from '@/user/repositories/invitation.repository';
1718
import { RoleRepository } from '@/user/repositories/role.repository';
1819
import { UserRepository } from '@/user/repositories/user.repository';
20+
import { InvitationModel } from '@/user/schemas/invitation.schema';
1921
import { PermissionModel } from '@/user/schemas/permission.schema';
2022
import { RoleModel } from '@/user/schemas/role.schema';
2123
import { User, UserModel } from '@/user/schemas/user.schema';
@@ -55,6 +57,7 @@ describe('SubscriberService', () => {
5557
LabelModel,
5658
UserModel,
5759
RoleModel,
60+
InvitationModel,
5861
PermissionModel,
5962
AttachmentModel,
6063
]),
@@ -68,6 +71,7 @@ describe('SubscriberService', () => {
6871
UserRepository,
6972
RoleService,
7073
RoleRepository,
74+
InvitationRepository,
7175
LoggerService,
7276
EventEmitter2,
7377
AttachmentService,

api/src/user/controllers/model.controller.spec.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ import {
2424
rootMongooseTestModule,
2525
} from '@/utils/test/test';
2626

27+
import { InvitationRepository } from '../repositories/invitation.repository';
2728
import { ModelRepository } from '../repositories/model.repository';
2829
import { PermissionRepository } from '../repositories/permission.repository';
2930
import { RoleRepository } from '../repositories/role.repository';
3031
import { UserRepository } from '../repositories/user.repository';
32+
import { InvitationModel } from '../schemas/invitation.schema';
3133
import { ModelFull, ModelModel } from '../schemas/model.schema';
3234
import { PermissionModel } from '../schemas/permission.schema';
3335
import { RoleModel } from '../schemas/role.schema';
@@ -53,6 +55,7 @@ describe('ModelController', () => {
5355
UserModel,
5456
RoleModel,
5557
PermissionModel,
58+
InvitationModel,
5659
ModelModel,
5760
AttachmentModel,
5861
]),
@@ -68,6 +71,7 @@ describe('ModelController', () => {
6871
UserRepository,
6972
RoleService,
7073
RoleRepository,
74+
InvitationRepository,
7175
PermissionRepository,
7276
EventEmitter2,
7377
{

api/src/user/controllers/permission.controller.spec.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ import {
2020
} from '@/utils/test/test';
2121

2222
import { PermissionCreateDto } from '../dto/permission.dto';
23+
import { InvitationRepository } from '../repositories/invitation.repository';
2324
import { ModelRepository } from '../repositories/model.repository';
2425
import { PermissionRepository } from '../repositories/permission.repository';
2526
import { RoleRepository } from '../repositories/role.repository';
27+
import { InvitationModel } from '../schemas/invitation.schema';
2628
import { Model, ModelModel } from '../schemas/model.schema';
2729
import {
2830
Permission,
@@ -53,7 +55,12 @@ describe('PermissionController', () => {
5355
controllers: [PermissionController],
5456
imports: [
5557
rootMongooseTestModule(installPermissionFixtures),
56-
MongooseModule.forFeature([PermissionModel, ModelModel, RoleModel]),
58+
MongooseModule.forFeature([
59+
PermissionModel,
60+
ModelModel,
61+
RoleModel,
62+
InvitationModel,
63+
]),
5764
],
5865
providers: [
5966
LoggerService,
@@ -62,6 +69,7 @@ describe('PermissionController', () => {
6269
PermissionService,
6370
PermissionRepository,
6471
RoleRepository,
72+
InvitationRepository,
6573
ModelRepository,
6674
EventEmitter2,
6775
{

api/src/user/controllers/role.controller.spec.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ import {
2626
} from '@/utils/test/test';
2727

2828
import { RoleCreateDto, RoleUpdateDto } from '../dto/role.dto';
29+
import { InvitationRepository } from '../repositories/invitation.repository';
2930
import { PermissionRepository } from '../repositories/permission.repository';
3031
import { RoleRepository } from '../repositories/role.repository';
3132
import { UserRepository } from '../repositories/user.repository';
33+
import { InvitationModel } from '../schemas/invitation.schema';
3234
import { PermissionModel } from '../schemas/permission.schema';
3335
import { Role, RoleFull, RoleModel } from '../schemas/role.schema';
3436
import { UserModel } from '../schemas/user.schema';
@@ -55,6 +57,7 @@ describe('RoleController', () => {
5557
RoleModel,
5658
PermissionModel,
5759
UserModel,
60+
InvitationModel,
5861
AttachmentModel,
5962
]),
6063
],
@@ -65,6 +68,7 @@ describe('RoleController', () => {
6568
UserRepository,
6669
RoleService,
6770
RoleRepository,
71+
InvitationRepository,
6872
PermissionRepository,
6973
EventEmitter2,
7074
AttachmentService,

api/src/user/repositories/permission.repository.spec.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import {
2323
import { ModelRepository } from '../repositories/model.repository';
2424
import { PermissionRepository } from '../repositories/permission.repository';
2525
import { RoleRepository } from '../repositories/role.repository';
26+
import { InvitationModel } from '../schemas/invitation.schema';
2627
import { ModelModel, Model as ModelSchema } from '../schemas/model.schema';
2728
import {
2829
Permission,
@@ -32,6 +33,8 @@ import {
3233
import { Role, RoleModel } from '../schemas/role.schema';
3334
import { Action } from '../types/action.type';
3435

36+
import { InvitationRepository } from './invitation.repository';
37+
3538
describe('PermissionRepository', () => {
3639
let modelRepository: ModelRepository;
3740
let roleRepository: RoleRepository;
@@ -44,12 +47,18 @@ describe('PermissionRepository', () => {
4447
const module: TestingModule = await Test.createTestingModule({
4548
imports: [
4649
rootMongooseTestModule(installPermissionFixtures),
47-
MongooseModule.forFeature([ModelModel, PermissionModel, RoleModel]),
50+
MongooseModule.forFeature([
51+
ModelModel,
52+
PermissionModel,
53+
RoleModel,
54+
InvitationModel,
55+
]),
4856
],
4957
providers: [
5058
ModelRepository,
5159
RoleRepository,
5260
PermissionRepository,
61+
InvitationRepository,
5362
EventEmitter2,
5463
],
5564
}).compile();

0 commit comments

Comments
 (0)