rez_core 2.2.166 → 2.2.169

package/src/module/user/service/login.service.ts

@@ -31,17 +31,22 @@ export class LoginService {
     @Inject('ListMasterService')
     private readonly listMasterService: ListMasterService,
     private readonly jwtAuthService: JwtAuthService,
+    @InjectRepository(UserData)
+    private readonly userRepository: Repository<UserData>,
   ) {}
 
   masterKey: string = this.configService.get('MASTER_KEY') || '';
   masterIv: string = this.configService.get('MASTER_IV') || '';
 
-  async login(
-    email: string,
-    password?: string,
-    is_otp = false,
-    subdomain?: string,
-  ) {
+  async login(data: {
+    email: string;
+    password?: string;
+    subdomain: string;
+    fcm_token: string;
+    is_otp?: boolean;
+  }) {
+    const { email, password, is_otp = false, subdomain, fcm_token } = data;
+
     let organization;
 
     // 🔹 Step 1: If subdomain is provided, resolve the organization
@@ -63,6 +68,10 @@ export class LoginService {
       throw new BadRequestException('User not found in organization.');
     }
 
+    if (fcm_token) {
+      await this.userRepository.update({ id: user.id }, { fcm_token });
+    }
+
     // 🔹 Step 3: Verify org status
     const userOrgData = await this.organizationRepository.findOrganizationById(
       user.organization_id,
@@ -245,7 +254,14 @@ export class LoginService {
     );
   }
 
-  async loginWithGoogle(email: string, name) {
+  async loginWithGoogle(data: {
+    email: string;
+    password: string;
+    name;
+    subdomain: string;
+    fcm_token: string;
+  }) {
+    const { email, password, name, subdomain, fcm_token } = data;
     const user = await this.userService.findByEmailId(email);
 
     if (!user) {
@@ -269,7 +285,7 @@ export class LoginService {
     }
 
     // Create session (Same as JWT login flow)
-    return await this.login(email, undefined, true);
+    return await this.login(data);
   }
 
   async logout(sessionKey: string) {

package/src/module/user/service/user.service.ts

@@ -19,12 +19,14 @@ import {
 import { CreateUserDto } from '../dto/create-user.dto';
 import { UserRoleMappingService } from './user-role-mapping.service';
 import { UserRoleMapping } from '../entity/user-role-mapping.entity';
-import { EntityManager } from 'typeorm';
+import { EntityManager, Repository } from 'typeorm';
 import { UpdateUserDto } from '../dto/update-user.dto';
 import { ConfigService } from '@nestjs/config';
 // import { UserAppMappingService } from 'src/module/meta/service/user-app-mapping.service';
 import { ServiceResult } from 'src/dtos/response.dto';
 import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
+import { OrganizationRepository } from 'src/module/enterprise/repository/organization.repository';
+import { InjectRepository } from '@nestjs/typeorm';
 
 @Injectable()
 export class UserService extends EntityServiceImpl {
@@ -33,6 +35,7 @@ export class UserService extends EntityServiceImpl {
     private userRoleMappingService: UserRoleMappingService,
     private readonly clockIDGenService: ClockIDGenService,
     private configService: ConfigService,
+    private readonly organizationRepository: OrganizationRepository,
     // private readonly userAppMappingService: UserAppMappingService,
     @Inject('RoleService') private readonly roleService: RoleService,
     @Inject('ListMasterService')
@@ -53,7 +56,7 @@ export class UserService extends EntityServiceImpl {
 
     let existingUser = await this.userRepository.findByEmailId(
       userData.email_id,
-      // loggedInUser?.organization_id,
+      loggedInUser?.organization_id,
     );
     if (existingUser) {
       return { success: false, error: 'User with this email already exists' };
@@ -61,7 +64,7 @@ export class UserService extends EntityServiceImpl {
 
     existingUser = await this.userRepository.findByMobile(
       userData.mobile,
-      // loggedInUser?.organization_id,
+      loggedInUser?.organization_id,
     );
     if (existingUser) {
       return { success: false, error: 'User with this mobile already exists' };
@@ -298,13 +301,36 @@ export class UserService extends EntityServiceImpl {
     await this.userRepository.saveUser(user); // This persists the updated field
   }
 
-  async checkEmailExists(email: string) {
-    if (!email) {
-      return { success: false, message: 'Email is required' };
+  async checkEmailExists(data: {
+    email: string;
+    subdomain: string;
+  }): Promise<any> {
+    const { email, subdomain } = data;
+
+    if (!email || !subdomain) {
+      return { success: false, message: 'Email and Subdomain is required' };
     }
 
+    let organization;
+
+    if (subdomain) {
+      organization =
+        await this.organizationRepository.findOrganizationBySubdomain(
+          subdomain,
+        );
+
+      if (!organization) {
+        throw new BadRequestException('Organization not found.');
+      }
+    }
+
+    // 🔹 Step 2: Find the user by email + organization check
     const user = await this.userRepository.findByEmailId(email);
 
+    if (!user || (organization && user.organization_id !== organization.id)) {
+      throw new BadRequestException('User not found in organization.');
+    }
+
     if (user) {
       return {
         success: true,

package/src/module/workflow/entity/task-data.entity.ts

@@ -56,7 +56,7 @@ export class TaskDataEntity extends BaseEntity {
   @Column({ nullable: true })
   due_date: Date;
 
-  @Column({ nullable: true, type: 'varchar' })
+  @Column({ nullable: true, type: 'time' })
   due_time: string;
 
   @Column({ nullable: true, type: 'varchar' })
@@ -67,4 +67,10 @@ export class TaskDataEntity extends BaseEntity {
 
   @Column({ nullable: true, type: 'varchar' })
   category: string;
+
+  @Column({ nullable: true })
+  remainder_date: Date;
+
+  @Column({ nullable: true, type: 'varchar' })
+  remainder_time: string;
 }

package/src/module/workflow/repository/task.repository.ts

@@ -50,6 +50,13 @@ export class TaskRepository {
           [act.action_requirement, loggedInUser.organization_id],
         );
 
+        const now = new Date();
+
+        const dueDateTime = new Date(now.setDate(now.getDate() + 2));
+
+        const due_date = dueDateTime.toISOString().split('T')[0];
+        const due_time = dueDateTime.toTimeString().split(' ')[0];
+
         const taskData = this.TaskRepository.create({
           stage_id: act.stage_id,
           user_id: loggedInUser.id,
@@ -60,12 +67,13 @@ export class TaskRepository {
           is_mandatory: is_mandatory[0]?.code === 'mandatory' ? true : false,
           mapped_entity_id,
           mapped_entity_type,
-          due_date: new Date(new Date().setDate(new Date().getDate() + 2)),
+          due_date,
+          due_time,
           is_system: true,
           status: todoListMasterItemId[0]?.id,
           category: act?.action_category_code,
           task_owner: leadData[0]?.lead_owner,
-        } as TaskDataEntity);
+        });
         await this.TaskRepository.save(taskData);
       }
     }

package/src/module/workflow/service/task.service.ts

@@ -8,6 +8,8 @@ import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { ActivityLogService } from './activity-log.service';
 import { ACTIVITY_CATEGORIES } from '../repository/activity-log.repository';
 import { MediaDataService } from 'src/module/meta/service/media-data.service';
+import { Cron, CronExpression } from '@nestjs/schedule';
+import { NotificationsService } from 'src/module/notification/service/firebase.service';
 
 @Injectable()
 export class TaskService extends EntityServiceImpl {
@@ -18,6 +20,7 @@ export class TaskService extends EntityServiceImpl {
     @Inject('ActivityLogService')
     private readonly activityLogService: ActivityLogService,
     private readonly mediaDataService: MediaDataService,
+    private readonly notificationsService: NotificationsService, // 👈 inject here
   ) {
     super();
   }
@@ -438,4 +441,57 @@ export class TaskService extends EntityServiceImpl {
     console.log(notePayload);
     return await super.createEntity(notePayload, loggedInUser);
   }
+
+  @Cron(CronExpression.EVERY_30_MINUTES)
+  async fetchTasksDueIn30Mins() {
+    const now = new Date();
+    const in30Min = new Date(now.getTime() + 30 * 60 * 1000);
+
+    const completedStatus = await this.dataSource.query(
+      `SELECT id FROM cr_list_master_items WHERE name = 'completed' AND listtype = 'TKST' LIMIT 1;`,
+    );
+    const completedId = completedStatus[0]?.id;
+
+    const tasks = await this.dataSource.query(
+      `
+    SELECT * 
+    FROM cr_wf_task_data
+    WHERE status != ?
+      AND TIMESTAMP(due_date, due_time) BETWEEN ? AND ?
+    `,
+      [completedId, now, in30Min],
+    );
+
+    if (!tasks.length) {
+      console.log('No tasks due in 30 mins');
+      return;
+    }
+
+    for (const task of tasks) {
+      const message = `Reminder: Task ${task.name} is due at ${task.due_time}`;
+
+      await this.dataSource.query(
+        `
+      INSERT INTO cr_notification (user_id, event_type, message, entity_type, organization_id, created_date, mapped_entity_id, mapped_entity_type, level_id, level_type)
+      VALUES (?, ?, ?, ?, ?, NOW(), ?, ?, ?, ?)
+      `,
+        [
+          task.task_owner,
+          'Task Remainder',
+          message,
+          'NOTF',
+          task.organization_id,
+          task.mapped_entity_id,
+          task.mapped_entity_type,
+          task.level_id,
+          task.level_type,
+        ],
+      );
+      await this.notificationsService.sendToUser(
+        String(task.task_owner), // userId as string
+        'Task Reminder',
+        message,
+      );
+    }
+  }
 }

package/src/module/workflow/workflow.module.ts

@@ -62,6 +62,7 @@ import { ActivityLog } from './entity/activity-log.entity';
 import { ActivityLogService } from './service/activity-log.service';
 import { ActivityLogRepository } from './repository/activity-log.repository';
 import { ActivityLogController } from './controller/activity-log.controller';
+import { NotificationModule } from '../notification/notification.module';
 
 @Module({
   imports: [
@@ -87,6 +88,7 @@ import { ActivityLogController } from './controller/activity-log.controller';
     ]),
     EntityModule,
     ListMasterModule,
+    NotificationModule,
   ],
   providers: [
     { provide: 'ActionCategoryService', useClass: ActionCategoryService },

package/tsconfig.json

@@ -16,8 +16,9 @@
     "forceConsistentCasingInFileNames": true,
     "noImplicitAny": false,
     "strictBindCallApply": false,
-    "noFallthroughCasesInSwitch": false
-  },
-  "include": ["src/**/*"],
-  "exclude": ["node_modules", "dist", "test"]
+    "noFallthroughCasesInSwitch": false,
+  "resolveJsonModule": true,
+},
+"include": ["src/**/*"],
+"exclude": ["node_modules", "dist", "test"]
 }