refactor: sepeare user and auth modules

This commit is contained in:
Abdalhamid Alhamad
2024-12-29 14:17:39 +03:00
parent ebf335eabd
commit ca71632755
29 changed files with 59 additions and 55 deletions

View File

@ -7,7 +7,7 @@ import {
PrimaryGeneratedColumn,
UpdateDateColumn,
} from 'typeorm';
import { User } from '~/auth/entities';
import { User } from '~/user/entities';
import { NotificationChannel, NotificationScope, NotificationStatus } from '../enums';
@Entity('notifications')

View File

@ -2,8 +2,8 @@ import { Module } from '@nestjs/common';
import { ConfigService } from '@nestjs/config';
import { TypeOrmModule } from '@nestjs/typeorm';
import { TwilioModule } from 'nestjs-twilio';
import { AuthModule } from '~/auth/auth.module';
import { buildTwilioOptions } from '~/core/module-options';
import { UserModule } from '~/user/user.module';
import { NotificationsController } from './controllers';
import { Notification } from './entities';
import { NotificationsRepository } from './repositories';
@ -17,7 +17,7 @@ import { TwilioService } from './services/twilio.service';
useFactory: buildTwilioOptions,
inject: [ConfigService],
}),
AuthModule,
UserModule,
],
providers: [NotificationsService, FirebaseService, NotificationsRepository, TwilioService],
exports: [NotificationsService],

View File

@ -1,7 +1,7 @@
import { forwardRef, Inject, Injectable } from '@nestjs/common';
import { Injectable } from '@nestjs/common';
import { EventEmitter2, OnEvent } from '@nestjs/event-emitter';
import { DeviceService } from '~/auth/services';
import { PageOptionsRequestDto } from '~/core/dtos';
import { DeviceService } from '~/user/services';
import { OTP_BODY, OTP_TITLE } from '../../otp/constants';
import { OtpType } from '../../otp/enums';
import { ISendOtp } from '../../otp/interfaces';
@ -18,7 +18,7 @@ export class NotificationsService {
private readonly notificationRepository: NotificationsRepository,
private readonly twilioService: TwilioService,
private readonly eventEmitter: EventEmitter2,
@Inject(forwardRef(() => DeviceService)) private readonly deviceService: DeviceService,
private readonly deviceService: DeviceService,
) {}
async sendPushNotification(userId: string, title: string, body: string) {

View File

@ -1,5 +1,5 @@
import { Column, CreateDateColumn, Entity, Index, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from 'typeorm';
import { User } from '~/auth/entities';
import { User } from '~/user/entities';
import { OtpScope, OtpType } from '../enums';
@Entity('otp')