rez_core 7.0.13 → 7.1.1

package/src/module/notification/controller/notification.controller.ts

@@ -1,58 +1,58 @@
-import {
-  Body,
-  Controller,
-  Get,
-  Post,
-  Query,
-  Req,
-  UseGuards,
-} from '@nestjs/common';
-import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
-import { NotificationsService } from '../service/notification.service';
-
-@Controller('notifications')
-export class NotificationsController {
-  constructor(private readonly notificationsService: NotificationsService) {}
-
-  // Store token from frontend
-  @Post('register-token')
-  async registerToken(@Body() body: { userId?: string; token: string }) {
-    // Optional: associate token with userId if provided
-    return this.notificationsService.saveToken(body.userId, body.token);
-  }
-
-  @Post('send')
-  async sendNotification(
-    @Body()
-    body: {
-      token: string;
-      title: string;
-      message: string;
-      data?: Record<string, any>;
-    },
-  ) {
-    return this.notificationsService.sendToDevice(
-      body.token,
-      body.title,
-      body.message,
-      body.data,
-    );
-  }
-
-  @Get('all')
-  @UseGuards(JwtAuthGuard)
-  async getNotifications(@Req() req: any, @Query() filterQuery: any) {
-    const loggedInUser = req.user.userData;
-    return this.notificationsService.getAllNotifications(
-      loggedInUser,
-      filterQuery,
-    );
-  }
-
-  @Post('mark-all-read')
-  @UseGuards(JwtAuthGuard)
-  async markAllAsRead(@Req() req: any) {
-    const loggedInUser = req.user.userData;
-    return this.notificationsService.markAllAsRead(loggedInUser);
-  }
-}
+import {
+  Body,
+  Controller,
+  Get,
+  Post,
+  Query,
+  Req,
+  UseGuards,
+} from '@nestjs/common';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
+import { NotificationsService } from '../service/notification.service';
+
+@Controller('notifications')
+export class NotificationsController {
+  constructor(private readonly notificationsService: NotificationsService) {}
+
+  // Store token from frontend
+  @Post('register-token')
+  async registerToken(@Body() body: { userId?: string; token: string }) {
+    // Optional: associate token with userId if provided
+    return this.notificationsService.saveToken(body.userId, body.token);
+  }
+
+  @Post('send')
+  async sendNotification(
+    @Body()
+    body: {
+      token: string;
+      title: string;
+      message: string;
+      data?: Record<string, any>;
+    },
+  ) {
+    return this.notificationsService.sendToDevice(
+      body.token,
+      body.title,
+      body.message,
+      body.data,
+    );
+  }
+
+  @Get('all')
+  @UseGuards(JwtAuthGuard)
+  async getNotifications(@Req() req: any, @Query() filterQuery: any) {
+    const loggedInUser = req.user.userData;
+    return this.notificationsService.getAllNotifications(
+      loggedInUser,
+      filterQuery,
+    );
+  }
+
+  @Post('mark-all-read')
+  @UseGuards(JwtAuthGuard)
+  async markAllAsRead(@Req() req: any) {
+    const loggedInUser = req.user.userData;
+    return this.notificationsService.markAllAsRead(loggedInUser);
+  }
+}

package/src/module/notification/entity/notification.entity.ts

@@ -1,76 +1,76 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'frm_notification' })
-export class NotificationData {
-  @PrimaryGeneratedColumn({ type: 'bigint' })
-  id: number;
-
-  @Column({ name: 'entity_type', type: 'varchar', length: 100, nullable: true })
-  entity_type: string;
-
-  @Column({ name: 'name', type: 'varchar', length: 100, nullable: true })
-  name: string;
-
-  @Column({ name: 'status', type: 'varchar', nullable: true, length: 100 })
-  status: string;
-
-  @Column({ name: 'parent_type', type: 'varchar', length: 100, nullable: true })
-  parent_type: string;
-
-  @Column({ name: 'parent_id', type: 'bigint', nullable: true })
-  parent_id: number;
-
-  @Column({ name: 'code', type: 'varchar', length: 100, nullable: true })
-  code: string;
-
-  @Column({ name: 'created_by', type: 'bigint', nullable: true })
-  created_by: number;
-
-  @Column({
-    name: 'created_date',
-    nullable: true,
-  })
-  created_date: Date;
-
-  @Column({ name: 'modified_by', type: 'bigint', nullable: true })
-  modified_by: number;
-
-  @Column({ name: 'modified_date', nullable: true })
-  modified_date: Date;
-
-  @Column({ name: 'enterprise_id', type: 'int', nullable: true })
-  enterprise_id: number;
-
-  @Column({ name: 'organization_id', type: 'int', nullable: true })
-  organization_id: number;
-
-  @Column({ name: 'appcode', type: 'varchar', length: 100, nullable: true })
-  appcode: string;
-
-  @Column({ name: 'level_id', type: 'varchar', length: 100, nullable: true })
-  level_id: string;
-
-  @Column({ name: 'level_type', type: 'varchar', length: 100, nullable: true })
-  level_type: string;
-
-  @Column({ name: 'user_id', type: 'int', nullable: true })
-  user_id: number | null;
-
-  @Column({ name: 'event_type', type: 'varchar', length: 255, nullable: true })
-  event_type: string | null;
-
-  @Column({ name: 'message', type: 'text', nullable: true })
-  message: string | null;
-
-  @Column({ nullable: true })
-  mapped_entity_id: number;
-
-  @Column({ nullable: true })
-  mapped_entity_type: string;
-
-  @Column({ nullable: true })
-  task_id: number;
-
-  @Column({ name: 'is_read', type: 'boolean', default: false })
-  is_read: boolean;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'frm_notification' })
+export class NotificationData {
+  @PrimaryGeneratedColumn({ type: 'bigint' })
+  id: number;
+
+  @Column({ name: 'entity_type', type: 'varchar', length: 100, nullable: true })
+  entity_type: string;
+
+  @Column({ name: 'name', type: 'varchar', length: 100, nullable: true })
+  name: string;
+
+  @Column({ name: 'status', type: 'varchar', nullable: true, length: 100 })
+  status: string;
+
+  @Column({ name: 'parent_type', type: 'varchar', length: 100, nullable: true })
+  parent_type: string;
+
+  @Column({ name: 'parent_id', type: 'bigint', nullable: true })
+  parent_id: number;
+
+  @Column({ name: 'code', type: 'varchar', length: 100, nullable: true })
+  code: string;
+
+  @Column({ name: 'created_by', type: 'bigint', nullable: true })
+  created_by: number;
+
+  @Column({
+    name: 'created_date',
+    nullable: true,
+  })
+  created_date: Date;
+
+  @Column({ name: 'modified_by', type: 'bigint', nullable: true })
+  modified_by: number;
+
+  @Column({ name: 'modified_date', nullable: true })
+  modified_date: Date;
+
+  @Column({ name: 'enterprise_id', type: 'int', nullable: true })
+  enterprise_id: number;
+
+  @Column({ name: 'organization_id', type: 'int', nullable: true })
+  organization_id: number;
+
+  @Column({ name: 'appcode', type: 'varchar', length: 100, nullable: true })
+  appcode: string;
+
+  @Column({ name: 'level_id', type: 'varchar', length: 100, nullable: true })
+  level_id: string;
+
+  @Column({ name: 'level_type', type: 'varchar', length: 100, nullable: true })
+  level_type: string;
+
+  @Column({ name: 'user_id', type: 'int', nullable: true })
+  user_id: number | null;
+
+  @Column({ name: 'event_type', type: 'varchar', length: 255, nullable: true })
+  event_type: string | null;
+
+  @Column({ name: 'message', type: 'text', nullable: true })
+  message: string | null;
+
+  @Column({ nullable: true })
+  mapped_entity_id: number;
+
+  @Column({ nullable: true })
+  mapped_entity_type: string;
+
+  @Column({ nullable: true })
+  task_id: number;
+
+  @Column({ name: 'is_read', type: 'boolean', default: false })
+  is_read: boolean;
+}

package/src/module/notification/entity/otp.entity.ts

@@ -1,28 +1,28 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'sso_user_session_otp' })
-export class Otp {
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column({ name: 'otp_id', type: 'varchar', length: 50, nullable: true })
-  otp_id: string;
-
-  @Column({ name: 'service', type: 'varchar', length: 50, nullable: true })
-  service: string;
-
-  @Column({ name: 'otp', type: 'varchar', length: 50, nullable: true })
-  otp: string;
-
-  @Column({ name: 'identifier', type: 'varchar', nullable: true })
-  identifier: string;
-
-  @Column({ name: 'created_date', nullable: true })
-  created_date: Date;
-
-  @Column({ name: 'expiration_date' , nullable: true})
-  expiration_date: Date;
-
-  @Column({ name: 'verified', type: 'int', nullable: true })
-  verified: number;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'sso_user_session_otp' })
+export class Otp {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({ name: 'otp_id', type: 'varchar', length: 50, nullable: true })
+  otp_id: string;
+
+  @Column({ name: 'service', type: 'varchar', length: 50, nullable: true })
+  service: string;
+
+  @Column({ name: 'otp', type: 'varchar', length: 50, nullable: true })
+  otp: string;
+
+  @Column({ name: 'identifier', type: 'varchar', nullable: true })
+  identifier: string;
+
+  @Column({ name: 'created_date', nullable: true })
+  created_date: Date;
+
+  @Column({ name: 'expiration_date' , nullable: true})
+  expiration_date: Date;
+
+  @Column({ name: 'verified', type: 'int', nullable: true })
+  verified: number;
+}

package/src/module/notification/firebase-admin.config.ts

@@ -1,22 +1,22 @@
-// firebase-admin.provider.ts
-import { ConfigService } from '@nestjs/config';
-import * as admin from 'firebase-admin';
-
-export const FirebaseAdminProvider = {
-  provide: 'FIREBASE_ADMIN',
-  inject: [ConfigService],
-  useFactory: async (configService: ConfigService) => {
-    if (!admin.apps.length) {
-      admin.initializeApp({
-        credential: admin.credential.cert({
-          projectId: configService.get<string>('FIREBASE_PROJECT_ID'),
-          clientEmail: configService.get<string>('FIREBASE_CLIENT_EMAIL'),
-          privateKey: configService
-            .get<string>('FIREBASE_PRIVATE_KEY')
-            ?.replace(/\\n/g, '\n'),
-        }),
-      });
-    }
-    return admin;
-  },
-};
+// firebase-admin.provider.ts
+import { ConfigService } from '@nestjs/config';
+import * as admin from 'firebase-admin';
+
+export const FirebaseAdminProvider = {
+  provide: 'FIREBASE_ADMIN',
+  inject: [ConfigService],
+  useFactory: async (configService: ConfigService) => {
+    if (!admin.apps.length) {
+      admin.initializeApp({
+        credential: admin.credential.cert({
+          projectId: configService.get<string>('FIREBASE_PROJECT_ID'),
+          clientEmail: configService.get<string>('FIREBASE_CLIENT_EMAIL'),
+          privateKey: configService
+            .get<string>('FIREBASE_PRIVATE_KEY')
+            ?.replace(/\\n/g, '\n'),
+        }),
+      });
+    }
+    return admin;
+  },
+};

package/src/module/notification/notification.module.ts

@@ -1,63 +1,65 @@
-import { Module } from '@nestjs/common';
-import { OtpRepository } from './repository/otp.repository';
-import { TypeOrmModule } from '@nestjs/typeorm';
-import { Otp } from './entity/otp.entity';
-import { MailerModule } from '@nestjs-modules/mailer';
-import { HandlebarsAdapter } from '@nestjs-modules/mailer/dist/adapters/handlebars.adapter';
-import { EmailService } from './service/email.service';
-import { join } from 'path';
-import { ConfigModule, ConfigService } from '@nestjs/config';
-import { AuthModule } from '../auth/auth.module';
-import { IcsMeetingModule } from '../ics/ics.module';
-import { NotificationData } from './entity/notification.entity';
-import { NotificationsController } from './controller/notification.controller';
-import { NotificationsService } from './service/notification.service';
-import { FirebaseAdminProvider } from './firebase-admin.config';
-import { PreferenceData } from '../preference_master/entity/preference.entity';
-
-@Module({
-  imports: [
-    TypeOrmModule.forFeature([Otp, NotificationData, PreferenceData]),
-    MailerModule.forRootAsync({
-      imports: [ConfigModule],
-      inject: [ConfigService],
-      useFactory: (configService: ConfigService) => ({
-        transport: {
-          host: 'smtp.gmail.com',
-          port: 465,
-          secure: true,
-          auth: {
-            user: configService.get('EMAIL_USER'),
-            pass: configService.get('EMAIL_PASSWORD'),
-          },
-        },
-        defaults: {
-          from: '"Support" <' + process.env.EMAIL_USER + '>',
-        },
-        template: {
-          dir: join(__dirname, '..', '..', 'templates'),
-          adapter: new HandlebarsAdapter(),
-          options: {
-            strict: true,
-          },
-        },
-      }),
-    }),
-    AuthModule,
-    IcsMeetingModule,
-  ],
-  providers: [
-    OtpRepository,
-    EmailService,
-    NotificationsService,
-    FirebaseAdminProvider,
-  ],
-  exports: [
-    EmailService,
-    FirebaseAdminProvider,
-    NotificationsService,
-  ],
-  controllers: [NotificationsController],
-})
-export class NotificationModule {
-}
+import { Module } from '@nestjs/common';
+import { OtpRepository } from './repository/otp.repository';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { Otp } from './entity/otp.entity';
+import { MailerModule } from '@nestjs-modules/mailer';
+import { HandlebarsAdapter } from '@nestjs-modules/mailer/dist/adapters/handlebars.adapter';
+import { EmailService } from './service/email.service';
+import { join } from 'path';
+import { ConfigModule, ConfigService } from '@nestjs/config';
+import { AuthModule } from '../auth/auth.module';
+import { IcsMeetingModule } from '../ics/ics.module';
+import { NotificationData } from './entity/notification.entity';
+import { NotificationsController } from './controller/notification.controller';
+import { NotificationsService } from './service/notification.service';
+import { FirebaseAdminProvider } from './firebase-admin.config';
+import { PreferenceData } from '../preference_master/entity/preference.entity';
+import { NotificationRepository } from './repository/notification.repository';
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([Otp, NotificationData, PreferenceData]),
+    MailerModule.forRootAsync({
+      imports: [ConfigModule],
+      inject: [ConfigService],
+      useFactory: (configService: ConfigService) => ({
+        transport: {
+          host: 'smtp.gmail.com',
+          port: 465,
+          secure: true,
+          auth: {
+            user: configService.get('EMAIL_USER'),
+            pass: configService.get('EMAIL_PASSWORD'),
+          },
+        },
+        defaults: {
+          from: '"Support" <' + process.env.EMAIL_USER + '>',
+        },
+        template: {
+          dir: join(__dirname, '..', '..', 'templates'),
+          adapter: new HandlebarsAdapter(),
+          options: {
+            strict: true,
+          },
+        },
+      }),
+    }),
+    AuthModule,
+    IcsMeetingModule,
+  ],
+  providers: [
+    OtpRepository,
+    EmailService,
+    NotificationsService,
+    FirebaseAdminProvider,
+    NotificationRepository,
+  ],
+  exports: [
+    EmailService,
+    FirebaseAdminProvider,
+    NotificationsService,
+  ],
+  controllers: [NotificationsController],
+})
+export class NotificationModule {
+}

package/src/module/notification/repository/notification.repository.ts

@@ -0,0 +1,33 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Repository, EntityManager } from 'typeorm';
+import { NotificationData } from '../entity/notification.entity';
+
+@Injectable()
+export class NotificationRepository {
+  constructor(
+    @InjectRepository(NotificationData)
+    private readonly notificationRepo: Repository<NotificationData>,
+  ) {}
+
+  async getAllNotifications(
+    userId: number,
+    levelId: number,
+    levelType: string,
+    isReadFilter?,
+  ) {
+    const qb = this.notificationRepo
+      .createQueryBuilder('n')
+      .where('n.user_id = :userId', { userId })
+      .andWhere('n.level_id = :levelId', { levelId })
+      .andWhere('n.level_type = :levelType', { levelType });
+
+    if (isReadFilter !== undefined) {
+      qb.andWhere('n.is_read = :isRead', { isRead: isReadFilter });
+    }
+
+    qb.orderBy('n.created_date', 'DESC');
+
+    return await qb.getMany();
+  }
+}

package/src/module/notification/repository/otp.repository.ts

@@ -1,27 +1,27 @@
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-import { Otp } from '../entity/otp.entity';
-import { Repository } from 'typeorm';
-
-@Injectable()
-export class OtpRepository {
-  constructor(
-    @InjectRepository(Otp) private readonly otpRepository: Repository<Otp>,
-  ) {}
-
-  async save(otp: Otp) {
-    return await this.otpRepository.save(otp);
-  }
-
-  async findByOtpId(otpId: string) {
-    return await this.otpRepository.findOne({
-      where: {
-        otp_id: otpId,
-      },
-    });
-  }
-
-  async update(id: number, otp: Otp) {
-    return await this.otpRepository.update(id, otp);
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Otp } from '../entity/otp.entity';
+import { Repository } from 'typeorm';
+
+@Injectable()
+export class OtpRepository {
+  constructor(
+    @InjectRepository(Otp) private readonly otpRepository: Repository<Otp>,
+  ) {}
+
+  async save(otp: Otp) {
+    return await this.otpRepository.save(otp);
+  }
+
+  async findByOtpId(otpId: string) {
+    return await this.otpRepository.findOne({
+      where: {
+        otp_id: otpId,
+      },
+    });
+  }
+
+  async update(id: number, otp: Otp) {
+    return await this.otpRepository.update(id, otp);
+  }
+}