rez_core 6.5.11 → 6.5.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "6.5.11",
+  "version": "6.5.13",
   "description": "",
   "author": "",
   "private": false,

package/src/module/user/entity/user-session.entity.ts

@@ -1,4 +1,4 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+import { Column, CreateDateColumn, Entity, PrimaryGeneratedColumn } from 'typeorm';
 
 @Entity({ name: 'sso_user_session' })
 export class UserSession {
@@ -19,9 +19,8 @@ export class UserSession {
   })
   login_id: string;
 
-  @Column({
-    name: 'login_time',
-    nullable: true,
+  @CreateDateColumn({
+    name: 'login_time'
   })
   login_time: Date;
 

package/src/module/user/repository/userSession.repository.ts

@@ -8,7 +8,7 @@ export class UserSessionRepository {
   constructor(
     @InjectRepository(UserSession)
     private userSessionRepo: Repository<UserSession>,
-  ) {}
+  ) { }
 
   async findBySessionKey(sessionKey: string): Promise<UserSession | null> {
     return this.userSessionRepo.findOne({ where: { session_key: sessionKey } });
@@ -24,6 +24,10 @@ export class UserSessionRepository {
     return this.userSessionRepo.save(session);
   }
 
+  async fetchUserFcmToken(user_id: number) {
+    return await this.userSessionRepo.findOne({ where: { user_id }, select: ['fcm_token'], order: { login_time: 'DESC' } });
+  }
+
   async logoutSession(sessionKey: string): Promise<void> {
     await this.userSessionRepo.update(
       { session_key: sessionKey },

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

@@ -23,15 +23,16 @@ export class UserSessionService {
     @InjectRepository(UserRoleMapping)
     private readonly userRoleMappingRepository: Repository<UserRoleMapping>,
     private readonly reflectionHelper: ReflectionHelper,
-  ) {}
-  async createSession(user, app_id?: number, accessInfo?: any, appcode?:string) {
+  ) { }
+
+  async createSession(user, app_id?: number, accessInfo?: any, appcode?: string) {
     const sessionToken = this.clockIDGenService.idGenerator('SES');
 
     const userSession: any = new UserSession();
     userSession.user_id = user.id;
     userSession.session_key = sessionToken;
     userSession.is_session_loggedout = 0;
-    userSession.login_time = new Date();
+    // userSession.login_time = new Date(); -- Changed login_time to be auto generated by typeorm
 
     const expiryTokenInHours = this.configService.get('TOKEN_EXPIRY') || 1;
     userSession.expiry_date = new Date(
@@ -72,6 +73,10 @@ export class UserSessionService {
     await this.userSessionRepository.saveSession(userSession);
   }
 
+  async fetchUserFcmToken(user_id: number) {
+    return await this.userSessionRepository.fetchUserFcmToken(user_id);
+  };
+
 
   async switchCurrentLevelService(
     currentUser: any,