fixed dependencies issues causing inject to work for dev, but fail in tests, and injectmodel to work in test, but fail in dev

since we use inject -for document- we need to pass the name which is the name in our custom shcema compiler 'dbmodule' (the name for example now being User.name) directly, rather than usin getModel() since we are not using the convetional model system

Author: snebo

src/events/events.service.spec.ts

@@ -68,7 +68,7 @@ describe('EventService', () => {
     const module: TestingModule = await Test.createTestingModule({
       providers: [
         EventService,
-        { provide: getModelToken('Event'), useValue: eventModelMock },
+        { provide: Event.name, useValue: eventModelMock },
         { provide: NotificationsService, useValue: notificationsServiceMock },
       ],
     }).compile();

src/events/events.users.module.ts

@@ -1,13 +1,12 @@
 import { Module } from '@nestjs/common';
-import { EventService } from './events.users.service';
-import { EventUserController } from './events.users.controller';
-import { EventAdminsController } from './events.admin.controller';
+import { NotificationsModule } from 'src/notifications/notifications.module';
 import { DBModule } from 'src/shared/schema';
+import { EventAdminsController } from './events.admin.controller';
+import { EventUserController } from './events.users.controller';
+import { EventService } from './events.users.service';
 
 @Module({
-  imports: [
-    DBModule
-  ],
+  imports: [DBModule, NotificationsModule],
   controllers: [EventUserController, EventAdminsController],
   providers: [EventService],
   exports: [EventService],

src/events/events.users.service.ts

@@ -14,7 +14,7 @@ import { UpdateEventDto } from './dto/updateEvent.dto';
 @Injectable()
 export class EventService {
   constructor(
-    @InjectModel(Event.name)
+    @Inject(Event.name)
     private readonly eventModel: Model<EventDocument>,
     private readonly notificationsService: NotificationsService,
   ) {}

src/notifications/notifications.module.ts

@@ -1,9 +1,10 @@
 import { Module } from '@nestjs/common';
-import { UsersService } from 'src/users/users.service';
+import { DBModule } from 'src/shared/schema';
 import { NotificationsController } from './notifications.controller';
 import { NotificationsService } from './notifications.service';
 
 @Module({
+  imports: [DBModule],
   controllers: [NotificationsController],
   providers: [NotificationsService],
   exports: [NotificationsService],

src/users/users.service.spec.ts

@@ -73,23 +73,23 @@ describe('UsersService', () => {
       providers: [
         UsersService,
         {
-          provide: getModelToken(User.name),
+          provide: User.name,
           useValue: mockUserModel,
         },
         {
-          provide: getModelToken(InviteToken.name),
+          provide: InviteToken.name,
           useValue: mockInviteTokenModel,
         },
         {
-          provide: getModelToken(BasicInfo.name),
+          provide: BasicInfo.name,
           useValue: mockBasicInfoModel,
         },
         {
-          provide: getModelToken(ProfessionalInfo.name),
+          provide: ProfessionalInfo.name,
           useValue: mockProfessionalInfoModel,
         },
         {
-          provide: getModelToken(ContactInfo.name),
+          provide: ContactInfo.name,
           useValue: mockContactInfoModel,
         },
         {

src/users/users.service.ts

@@ -53,15 +53,15 @@ import { UserInviteDto } from './dto/user-invite.dto';
 @Injectable()
 export class UsersService {
   constructor(
-    @InjectModel(User.name)
+    @Inject(User.name)
     private readonly userModel: Model<UserDocument>,
-    @InjectModel(InviteToken.name)
+    @Inject(InviteToken.name)
     private readonly inviteTokenModel: Model<TokenDocument>,
-    @InjectModel(BasicInfo.name)
+    @Inject(BasicInfo.name)
     private readonly basicInfoModel: Model<BasicInfo>,
-    @InjectModel(ProfessionalInfo.name)
+    @Inject(ProfessionalInfo.name)
     private readonly professionalInfoModel: Model<ProfessionalInfo>,
-    @InjectModel(ContactInfo.name)
+    @Inject(ContactInfo.name)
     private readonly contactInfoModel: Model<ContactInfo>,
     private readonly configService: ConfigService,
     private readonly notificationsService: NotificationsService,