rez_core 1.0.95 → 1.0.97

package/package.json

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

package/src/module/auth/auth.module.ts

@@ -18,11 +18,19 @@ import { RolesGuard } from './guards/role.guard';
     JwtModule.registerAsync({
       imports: [ConfigModule],
       inject: [ConfigService],
-      useFactory: async (configService: ConfigService) => ({
-        secret:  configService.get('SECRET_KEY'),
-        signOptions: { expiresIn: '1800s' },
-      }),
+      useFactory: async (configService: ConfigService) => {
+        const expiryInHours = parseFloat(
+          configService.get('TOKEN_EXPIRY') || '1',
+        );
+        const expiryInSeconds = expiryInHours * 60 * 60;
+
+        return {
+          secret: configService.get('SECRET_KEY'),
+          signOptions: { expiresIn: expiryInSeconds },
+        };
+      },
     }),
+
     TypeOrmModule.forFeature([UserSession]),
   ],
   providers: [

package/src/module/master/service/master.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { EntityManager } from 'typeorm';
+import { Brackets, EntityManager } from 'typeorm';
 import { ExcelUtil } from 'src/utils/service/excelUtil.service';
 import { EntityMasterService } from '../../meta/service/entity-master.service';
 import { AttributeMasterService } from 'src/module/meta/service/attribute-master.service';
@@ -97,6 +97,10 @@ export class MasterService {
       table: 'cr_organization',
       unique_fields: ['code'],
     },
+    {
+      table: 'eth_academic_year',
+      unique_fields: ['code'],
+    },
   ];
   private readonly dataSequence = [
     {
@@ -357,29 +361,35 @@ export class MasterService {
       const qb = this.entityManager
         .createQueryBuilder()
         .select('*')
-        .from(entityMaster.db_table_name, entityMaster.db_table_name);
-
-      // Build OR conditions dynamically for unique fields
-      uniqueFields.forEach((field, index) => {
-        const condition = `${entityMaster.db_table_name}.${field} = :val${index}`;
-        const param = { [`val${index}`]: row[field] };
-
-        if (index === 0) {
-          qb.where(condition, param);
-        } else {
-          qb.orWhere(condition, param);
-        }
-      });
+        .from(entityMaster.db_table_name, entityMaster.db_table_name)
+        .where(
+          new Brackets((qbOr) => {
+            uniqueFields.forEach((field, index) => {
+              const condition = `${entityMaster.db_table_name}.${field} = :val${index}`;
+              const param = { [`val${index}`]: row[field] };
+              if (index === 0) {
+                qbOr.where(condition, param);
+              } else {
+                qbOr.orWhere(condition, param);
+              }
+            });
+          }),
+        )
+        .andWhere(`${entityMaster.db_table_name}.organization_id = :orgId`, {
+          orgId: loggedInUser.organization_id,
+        });
 
       const existing = await qb.limit(1).getRawOne();
 
       row.entity_type = entityType;
+      row.organization_id = loggedInUser.organization_id;
 
       if (existing) {
         if (duplicateHandling === 'skip_duplicates') {
           continue; // Skip this row
         } else if (duplicateHandling === 'overwrite_items') {
           row.id = existing.id;
+
           await entityService.updateEntity(row, loggedInUser);
         }
       } else {

package/src/module/meta/entity/entity-table-column.entity.ts

@@ -39,6 +39,17 @@ export class EntityTableColumn extends BaseEntity {
   @Column({ name: 'data_type', nullable: true })
   data_type: string;
 
+  @Column({
+    name: 'data_source_type',
+    type: 'varchar',
+    nullable: true,
+    length: 50,
+  })
+  data_source_type: string;
+
+  @Column({ name: 'datasource_list', type: 'varchar', nullable: true })
+  datasource_list: string;
+
   @Column({ name: 'visible', nullable: true })
   visible: string;
 }

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

@@ -1,3 +1,4 @@
+import { OrganizationData } from './../../enterprise/entity/organization.entity';
 import { Repository } from 'typeorm';
 import { UserData } from '../entity/user.entity';
 import { Injectable } from '@nestjs/common';
@@ -12,18 +13,31 @@ export class UserRepository {
   async findById(userId: number): Promise<UserData | null> {
     return this.userRepository.findOne({ where: { id: userId } });
   }
-  async findByEmailId(email: string): Promise<UserData | null> {
+
+  async findByEmailId(
+    email: string,
+    organization_id?: number,
+  ): Promise<UserData | null> {
     if (!email) return null;
 
     const where: any = { email_id: email };
+    if (organization_id !== undefined) {
+      where.organization_id = organization_id;
+    }
 
     return this.userRepository.findOne({ where });
   }
 
-  async findByMobile(mobile: string): Promise<UserData | null> {
+  async findByMobile(
+    mobile: string,
+    organization_id?: number,
+  ): Promise<UserData | null> {
     if (!mobile) return null;
 
-    const where: any = { mobile: mobile };
+    const where: any = { mobile };
+    if (organization_id !== undefined) {
+      where.organization_id = organization_id;
+    }
 
     return this.userRepository.findOne({ where });
   }

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

@@ -2,7 +2,8 @@ import { UserSession } from '../entity/user-session.entity';
 import { ClockIDGenService } from '../../../utils/service/clockIDGenUtil.service';
 import { Injectable } from '@nestjs/common';
 import { UserSessionRepository } from '../repository/userSession.repository';
-import { JwtAuthService } from '../../../module/auth/services/jwt.service';
+import { JwtAuthService } from 'src/module/auth/services/jwt.service';
+import { ConfigService } from '@nestjs/config';
 
 @Injectable()
 export class UserSessionService {
@@ -10,6 +11,7 @@ export class UserSessionService {
     private readonly userSessionRepository: UserSessionRepository,
     private readonly jwtAuthService: JwtAuthService,
     private readonly clockIDGenService: ClockIDGenService,
+    private configService: ConfigService,
   ) {}
   async createSession(user) {
     const sessionToken = this.clockIDGenService.idGenerator('SES');
@@ -19,7 +21,10 @@ export class UserSessionService {
     userSession.session_key = sessionToken;
     userSession.is_session_loggedout = 0;
     userSession.login_time = new Date();
-    userSession.expiry_date = new Date(Date.now() + 60 * 60 * 1000); // 1-hour expiry
+    const expiryTokenInHours = this.configService.get('TOKEN_EXPIRY') || 1;
+    userSession.expiry_date = new Date(
+      Date.now() + expiryTokenInHours * 60 * 60 * 1000,
+    );
 
     await this.userSessionRepository.saveSession(userSession);
 
@@ -29,7 +34,7 @@ export class UserSessionService {
     userSession.access_token = accessToken;
     await this.userSessionRepository.saveSession(userSession);
 
-    return  accessToken ;
+    return accessToken;
   }
 
   async findBySessionKey(sessionKey: string): Promise<UserSession | null> {

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

@@ -38,14 +38,16 @@ export class UserService extends EntityServiceImpl {
   ): Promise<BaseEntity> {
     let userData = entityData as CreateUserDto;
     let existingUser = await this.userRepository.findByEmailId(
-      userData.email_id
+      userData.email_id,
+      loggedInUser?.organization_id,
     );
     if (existingUser) {
       throw new BadRequestException('User already exists');
     }
 
     existingUser = await this.userRepository.findByMobile(
-      userData.mobile
+      userData.mobile,
+      loggedInUser?.organization_id,
     );
     if (existingUser) {
       throw new BadRequestException('User already exists');
@@ -62,7 +64,7 @@ export class UserService extends EntityServiceImpl {
       );
     } else {
       password = EncryptUtilService.encryptGCM(
-        "Admin@123",
+        'Admin@123',
         this.masterKey,
         this.masterIv,
       );
@@ -116,14 +118,14 @@ export class UserService extends EntityServiceImpl {
     loggedInUserData: UserData,
   ): Promise<BaseEntity> {
     const userDto = entityData as UpdateUserDto;
-  
+
     // Fetch the current user data from DB to get the existing encrypted password
     const existingUser = await this.userRepository.findById(entityData.id);
-  
+
     if (!existingUser) {
       throw new BadRequestException('User not found');
     }
-  
+
     // If password is being updated, check if it's the same as existing one
     if (userDto.password) {
       const decryptedPassword = EncryptUtilService.decryptGCM(
@@ -131,13 +133,13 @@ export class UserService extends EntityServiceImpl {
         this.masterKey,
         this.masterIv,
       );
-  
+
       if (decryptedPassword === userDto.password) {
         throw new BadRequestException(
           'New password cannot be the same as the current password',
         );
       }
-  
+
       // Encrypt new password
       const encryptedPassword = EncryptUtilService.encryptGCM(
         userDto.password,
@@ -146,26 +148,22 @@ export class UserService extends EntityServiceImpl {
       );
       userDto.password = encryptedPassword;
     }
-  
+
     const userData = plainToInstance(UserData, userDto);
-  
+
     const savedData = await super.updateEntity(userData, loggedInUserData);
-  
+
     // Update roles if provided
     if (userDto.roles) {
       await this.userRoleMappingService.deleteByUserId(savedData.id); // prevent duplicates
       for (const role of userDto.roles) {
-        const userRoleMapping = new UserRoleMapping(
-          savedData.id,
-          Number(role),
-        );
+        const userRoleMapping = new UserRoleMapping(savedData.id, Number(role));
         await this.userRoleMappingService.assignUserRole(userRoleMapping);
       }
     }
-  
+
     return savedData;
   }
-  
 
   async findByEmailId(email_id: string): Promise<UserData | null> {
     return await this.userRepository.findByEmailId(email_id);

package/src/resources/dev.properties.yaml

@@ -14,3 +14,10 @@ OTP_EXPIRY: "10"
 OTP_LENGTH: "6"
 VERIFY_OTP: "false"
 DEFAULT_OTP: "123456"
+TOKEN_EXPIRY: 1
+# AWS:
+#   S3:
+#     AWS_ACCESS_KEY_ID: "AKIAYYKIBDDSQF3KILGE"
+#     AWS_SECRET_KEY: "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"
+#     AWS_REGION: "ap-south-1"
+#     BUCKET_NAME: "testether"

package/src/resources/uat.properties.yaml

@@ -12,4 +12,5 @@ CALLBACK_URL: "http://localhost:3000/auth/google/callback"
 OTP_EXPIRY: "10"
 OTP_LENGTH: "6"
 VERIFY_OTP: "false"
-DEFAULT_OTP: "123456"
+DEFAULT_OTP: "123456"
+TOKEN_EXPIRY: 1