rez_core 2.1.75 → 2.1.76

package/src/module/meta/service/entity-service-impl.service.ts

@@ -41,6 +41,7 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     }
     const entityMaster = await this.entityMasterService.getEntityData(
       entityData.entity_type,
+      loggedInUser,
     );
 
     const validationErrors =
@@ -68,11 +69,12 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
       );
     }
 
-    if (!entityData.code) {
+    if (!entityData.code && loggedInUser) {
       let maxSeqNo = await this.getMaxSequenceNumber(
         entityData.entity_type,
         entityData.parent_id,
         entityData.parent_type,
+        loggedInUser,
       );
       maxSeqNo = Number(maxSeqNo) + 1;
       entityData.code = entityData.entity_type + maxSeqNo;
@@ -94,9 +96,11 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     return repo.save(entityData);
   }
 
-  async deleteEntity(entityType: string, entityId: number) {
-    const entityMaster =
-      await this.entityMasterService.getEntityData(entityType);
+  async deleteEntity(entityType: string, entityId: number, loggedInUser) {
+    const entityMaster = await this.entityMasterService.getEntityData(
+      entityType,
+      loggedInUser,
+    );
 
     const repoService = this.reflectionHelper.getRepoService(
       entityMaster.entity_data_class,
@@ -121,8 +125,15 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     };
   }
 
-  async findByCode(entityType: string, code: string): Promise<BaseEntity> {
-    const entityData = await this.entityMasterService.getEntityData(entityType);
+  async findByCode(
+    entityType: string,
+    code: string,
+    loggedInUser,
+  ): Promise<BaseEntity> {
+    const entityData = await this.entityMasterService.getEntityData(
+      entityType,
+      loggedInUser,
+    );
 
     const repoService = this.reflectionHelper.getRepoService(
       entityData.entity_data_class,
@@ -143,8 +154,12 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
   async getEntityData(
     entityType: string,
     id: number,
+    loggedInUser,
   ): Promise<BaseEntity | null> {
-    const entityData = await this.entityMasterService.getEntityData(entityType);
+    const entityData = await this.entityMasterService.getEntityData(
+      entityType,
+      loggedInUser,
+    );
 
     const repoService = this.reflectionHelper.getRepoService(
       entityData.entity_data_class,
@@ -160,8 +175,12 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
   async getEntityDataAll(
     entityType: string,
     type: {},
+    loggedInUser: UserData,
   ): Promise<BaseEntity[] | null> {
-    const entityData = await this.entityMasterService.getEntityData(entityType);
+    const entityData = await this.entityMasterService.getEntityData(
+      entityType,
+      loggedInUser,
+    );
 
     const repoService = this.reflectionHelper.getRepoService(
       entityData.entity_data_class,
@@ -177,8 +196,12 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
   async getEntityList(
     entityType: string,
     filters: Record<string, any> = {},
+    loggedInUser: UserData,
   ): Promise<BaseEntity[]> {
-    const entityData = await this.entityMasterService.getEntityData(entityType);
+    const entityData = await this.entityMasterService.getEntityData(
+      entityType,
+      loggedInUser,
+    );
     const repoService = this.reflectionHelper.getRepoService(
       entityData.entity_data_class,
     );
@@ -203,6 +226,7 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
   ) {
     const entityMaster = await this.entityMasterService.getEntityData(
       entityData.entity_type,
+      loggedInUser,
     );
 
     const repoService = this.reflectionHelper.getRepoService(
@@ -342,13 +366,16 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     entityType: string,
     parentId: number,
     parentType: string,
+    loggedInUser: UserData,
   ): Promise<number> {
     let tableName: string;
     if (ENTITYTYPE_ENTITYMASTER === entityType) {
       tableName = 'cr_entity_master';
     } else {
-      let entityMaster =
-        await this.entityMasterService.getEntityData(entityType);
+      let entityMaster = await this.entityMasterService.getEntityData(
+        entityType,
+        loggedInUser,
+      );
       tableName = entityMaster.db_table_name;
     }
     return await this.entityListService.getMaxSequenceNumber(

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

@@ -6,6 +6,7 @@ import { DISPLAY_LIST } from '../../../constant/global.constant';
 import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
 import { SavedFilterService } from 'src/module/filter/service/saved-filter.service';
 import { SavedFilterRepositoryService } from 'src/module/filter/repository/saved-filter.repository';
+import { UserData } from 'src/module/user/entity/user.entity';
 
 @Injectable()
 export class EntityTableService {
@@ -20,11 +21,12 @@ export class EntityTableService {
     private readonly savedFilterRepoService: SavedFilterRepositoryService,
   ) {}
 
-  async getEntityData(mappedEntityType: string | null) {
+  async getEntityData(mappedEntityType: string | null, loggedInUser) {
     if (mappedEntityType) {
       const tableMaster =
         await this.entityTableRepository.findByMappedEntityType(
           mappedEntityType,
+          loggedInUser.organization_id,
         );
 
       if (!tableMaster) {
@@ -50,24 +52,26 @@ export class EntityTableService {
     entityType: string,
     listType: string,
     displayType: string,
+    organization_id: number | null = null,
   ) {
     return await this.entityTableRepository.findByEntityTypeAndListTypeAndDisplayType(
       entityType,
       listType,
       displayType,
+      organization_id ? organization_id : null,
     );
   }
 
   async getTableMetaDataForListing(
     entityType: string,
     listType: string,
-    userId?: number,
+    loggedInUser: any,
   ) {
     return await this.getTableMetaData(
       entityType,
       listType,
       DISPLAY_LIST,
-      userId,
+      loggedInUser,
     );
   }
 
@@ -75,12 +79,13 @@ export class EntityTableService {
     entityType: string,
     listType: string,
     displayType: string,
-    userId?: number,
+    loggedInUser: any,
   ) {
     let entityTable = await this.findByEntityTypeAndListTypeAndDisplayType(
       entityType,
       listType,
       displayType,
+      loggedInUser?.organization_id,
     );
 
     let entityTableDto = entityTable as EntityTableDto;
@@ -103,10 +108,10 @@ export class EntityTableService {
         await this.savedFilterRepoService.getDefaultFilterByEntityType(
           entityTable.list_type,
         );
-      if (userId) {
+      if (loggedInUser.id) {
         entityTableDto.saved_filter =
           await this.savedFilterRepoService.getSavedFiltersByUserIdAndEntityType(
-            userId,
+            loggedInUser.id,
             entityTable.list_type,
           );
       }

package/src/module/meta/service/entity-validation.service.ts

@@ -129,6 +129,7 @@ export class EntityValidationService {
     const attributes =
       await this.attributeMasterService.findAttributesByMappedEntityType(
         entityData.entity_type,
+        loggedInUser.organization_id,
       );
 
     const requiredErrors = this.validateRequiredFields(entityData, attributes);
@@ -143,19 +144,19 @@ export class EntityValidationService {
     return [...requiredErrors, ...uniqueErrors, ...regexErros];
   }
 
-  async validateExcelEntityData(
-    entityData: Record<string, any>,
-    entityMaster,
-  ): Promise<ValidationError[]> {
-    const attributes =
-      await this.attributeMasterService.findAttributesByMappedEntityType(
-        entityData.entity_type,
-      );
-
-    const requiredErrors = this.validateRequiredFields(entityData, attributes);
-    const regexErros = await this.validateRegexFields(entityData, attributes);
-    return [...requiredErrors, ...regexErros];
-  }
+  // async validateExcelEntityData(
+  //   entityData: Record<string, any>,
+  //   entityMaster,
+  // ): Promise<ValidationError[]> {
+  //   const attributes =
+  //     await this.attributeMasterService.findAttributesByMappedEntityType(
+  //       entityData.entity_type,
+  //     );
+
+  //   const requiredErrors = this.validateRequiredFields(entityData, attributes);
+  //   const regexErros = await this.validateRegexFields(entityData, attributes);
+  //   return [...requiredErrors, ...regexErros];
+  // }
   private hasValidValue(value: any): boolean {
     if (value === null || value === undefined) return false;
     if (typeof value === 'string' && value.trim() === '') return false;

package/src/module/meta/service/entity.service.ts

@@ -13,9 +13,14 @@ export interface EntityService<T extends BaseEntity> {
   getEntityData(
     entityType: string,
     entityId: number,
+    loggedInUser: UserData,
   ): Promise<BaseEntity | null>;
 
-  getEntityList(entityType: string): Promise<BaseEntity[]>;
+  getEntityList(
+    entityType: string,
+    loggedInUser: UserData,
+    filters?: Record<string, any>,
+  ): Promise<BaseEntity[]>;
 
   updateEntity(
     entityData: T,
@@ -29,7 +34,11 @@ export interface EntityService<T extends BaseEntity> {
     loggedInUserData: UserData,
   ): void;
 
-  findByCode(entityType: string, code: string): Promise<BaseEntity>;
+  findByCode(
+    entityType: string,
+    code: string,
+    loggedInUser: UserData,
+  ): Promise<BaseEntity>;
 
   getFilterDataWithTabs(
     entityType: string,

package/src/module/meta/service/field-group.service.ts

@@ -13,11 +13,12 @@ export class FieldGroupService extends EntityServiceImpl {
 
   async createEntity(
     entityData: BaseEntity,
-    loggedInUser: UserData | null,
+    loggedInUser: UserData,
     manager?: EntityManager,
   ): Promise<BaseEntity> {
     const entityMaster = await this.entityMasterService.getEntityData(
       entityData.entity_type,
+      loggedInUser,
     );
     entityData.parent_id = entityMaster.id;
     entityData.parent_type = entityMaster.entity_type;

package/src/module/meta/service/media-data.service.ts

@@ -4,12 +4,14 @@ import { MediaDataRepository } from '../repository/media-data.repository';
 import { ConfigService } from '@nestjs/config';
 import { S3 } from 'aws-sdk';
 import { MediaData } from '../entity/media-data.entity';
-import { ENTITYTYPE_MEDIA, STATUS_PENDING } from '../../../constant/global.constant';
+import {
+  ENTITYTYPE_MEDIA,
+  STATUS_PENDING,
+} from '../../../constant/global.constant';
 import { v4 as uuidv4 } from 'uuid';
 
 @Injectable()
 export class MediaDataService extends EntityServiceImpl {
-
   constructor(
     private readonly configService: ConfigService,
     private readonly mediaRepository: MediaDataRepository,
@@ -32,6 +34,7 @@ export class MediaDataService extends EntityServiceImpl {
   async generateMediaUploadDetails(
     fileName: string,
     mappedAttributeKey: string,
+    loggedInUser,
     mappedEntityType?: string,
     mappedEntityId?: number,
   ) {
@@ -62,7 +65,7 @@ export class MediaDataService extends EntityServiceImpl {
     }
     mediaData.media_url = s3Key;
 
-    let savedEntity = await super.createEntity(mediaData, null);
+    let savedEntity = await super.createEntity(mediaData, loggedInUser);
 
     if (savedEntity) {
       return { id: savedEntity.id, path: s3Key, uploadUrl };
@@ -115,16 +118,20 @@ export class MediaDataService extends EntityServiceImpl {
   }
 
   // New method to get the signed URL for the media (download link)
-  async getMediaDownloadUrl(id: number) {
+  async getMediaDownloadUrl(id: number, loggedInUser) {
     try {
-      const entityData = await this.getEntityData(ENTITYTYPE_MEDIA, id);
+      const entityData = await this.getEntityData(
+        ENTITYTYPE_MEDIA,
+        id,
+        loggedInUser,
+      );
       let mediaData = entityData as MediaData;
       const signedUrl = await this.s3.getSignedUrlPromise('getObject', {
         Bucket: this.bucketName,
         Key: mediaData.media_url,
         Expires: 60 * 5, // URL valid for 5 mins
       });
-      return {signedUrl,fileName: mediaData.file_name,id:mediaData.id};
+      return { signedUrl, fileName: mediaData.file_name, id: mediaData.id };
     } catch (error) {
       console.error('Error generating signed URL for media:', error);
       throw new Error('Failed to generate signed URL');

package/src/module/meta/service/section-master.service.ts

@@ -13,11 +13,12 @@ export class SectionMasterService extends EntityServiceImpl {
 
   async createEntity(
     entityData: BaseEntity,
-    loggedInUser: UserData | null,
+    loggedInUser: UserData,
     manager?: EntityManager,
   ): Promise<BaseEntity> {
     const entityMaster = await this.entityMasterService.getEntityData(
       entityData.entity_type,
+      loggedInUser,
     );
     entityData.parent_id = entityMaster.id;
     entityData.parent_type = entityMaster.entity_type;

package/src/module/meta/service/view-master.service.ts

@@ -21,11 +21,12 @@ export class ViewMasterService extends EntityServiceImpl {
 
   async createEntity(
     entityData: ViewMaster,
-    loggedInUser: UserData | null,
+    loggedInUser: UserData,
     manager?: EntityManager,
   ): Promise<BaseEntity> {
     const entityMaster = await this.entityMasterService.getEntityData(
       entityData.entity_type,
+      loggedInUser,
     );
     entityData.parent_id = entityMaster.id;
     entityData.parent_type = entityMaster.entity_type;

package/src/module/module/controller/module-access.controller.ts

@@ -111,8 +111,9 @@ export class ModuleAccessController {
     const appcode = userData?.appcode;
     const level_type = userData?.level_type;
     const level_id = userData?.level_id;
+    const organization_id = userData?.organization_id;
 
-    if (!userId || !appcode || !level_type || !level_id) {
+    if (!userId || !appcode || !level_type || !level_id || !organization_id) {
       throw new BadRequestException('Invalid token data');
     }
 
@@ -121,6 +122,7 @@ export class ModuleAccessController {
       appcode,
       level_type,
       level_id,
+      organization_id,
     });
   }
 }

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

@@ -14,6 +14,7 @@ import { UserRoleMapping } from '../user/entity/user-role-mapping.entity';
 import { UserModule } from '../user/user.module';
 import { Role } from '../user/entity/role.entity';
 import { ModuleAccess } from './entity/module-access.entity';
+import { ListMasterModule } from '../listmaster/listmaster.module';
 
 @Module({
   imports: [
@@ -27,6 +28,7 @@ import { ModuleAccess } from './entity/module-access.entity';
     ]),
     UtilsModule,
     UserModule,
+    ListMasterModule,
   ],
   controllers: [MenuController, ModuleAccessController],
   providers: [

package/src/module/module/service/module-access.service.ts

@@ -2,11 +2,15 @@ import { BadRequestException, Inject, Injectable } from '@nestjs/common';
 import { ModuleAccessRepository } from '../repository/module-access.repository';
 import { RoleRepository } from 'src/module/user/repository/role.repository';
 import { RoleService } from '../../user/service/role.service';
-import { ENTITYTYPE_ROLE } from '../../../constant/global.constant';
+import {
+  ENTITYTYPE_ROLE,
+  STATUS_INACTIVE,
+} from '../../../constant/global.constant';
 import { Role } from '../../user/entity/role.entity';
 import { DataSource, EntityManager } from 'typeorm';
 import { UserData } from 'src/module/user/entity/user.entity';
 import { MenuRepository } from '../repository/menu.repository';
+import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
 
 @Injectable()
 export class ModuleAccessService {
@@ -14,6 +18,8 @@ export class ModuleAccessService {
     private readonly moduleAccessRepository: ModuleAccessRepository,
     private readonly menuRepository: MenuRepository,
     private readonly dataSource: DataSource,
+    @Inject('ListMasterService')
+    private readonly listMasterService: ListMasterService,
   ) {}
 
   async getModules({ appcode }: { appcode: string }) {
@@ -129,11 +135,13 @@ export class ModuleAccessService {
     appcode,
     level_type,
     level_id,
+    organization_id,
   }: {
     userId: number;
     appcode: string;
     level_type: string;
     level_id: number;
+    organization_id: number;
   }) {
     // Step 1: Resolve roles
     const roleCodes = await this.menuRepository.resolveUserRoles(
@@ -165,7 +173,12 @@ export class ModuleAccessService {
 
       const school = result?.[0];
 
-      if (!school || school.status === 'INACTIVE') {
+      const resolveStatus = await this.listMasterService.getResolvedListCode(
+        STATUS_INACTIVE,
+        organization_id || 0,
+      );
+
+      if (!school || school.status === resolveStatus.id || 'INACTIVE') {
         // Return only VIEW permissions
         return allPermissions.filter((perm) => perm.action === 'VIEW');
       }

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

@@ -9,6 +9,8 @@ import { UserService } from './user.service';
 import { ConfigService } from '@nestjs/config';
 import { InjectRepository } from '@nestjs/typeorm';
 import { DataSource, Repository } from 'typeorm';
+import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
+import { STATUS_ACTIVE } from 'src/constant/global.constant';
 
 @Injectable()
 export class LoginService {
@@ -22,6 +24,8 @@ export class LoginService {
     private readonly roleRepo: Repository<Role>,
     private readonly dataSource: DataSource,
     private readonly organizationRepository: OrganizationRepository,
+    @Inject('ListMasterService')
+    private readonly listMasterService: ListMasterService,
   ) {}
 
   masterKey: string = this.configService.get('MASTER_KEY') || '';
@@ -41,7 +45,15 @@ export class LoginService {
       user.organization_id,
     );
 
-    if (user.status !== 'ACTIVE' || userOrgData?.status !== 'ACTIVE') {
+    const resolveStatus = await this.listMasterService.getResolvedListCode(
+      STATUS_ACTIVE,
+      user?.organization_id || 0,
+    );
+
+    if (
+      user.status != resolveStatus.id ||
+      userOrgData?.status != resolveStatus.id
+    ) {
       return {
         success: false,
         message: 'Your account is inactive.',

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

@@ -1,14 +1,15 @@
-import { BadRequestException, Injectable } from '@nestjs/common';
+import { BadRequestException, Inject, Injectable } from '@nestjs/common';
 import { EntityServiceImpl } from '../../meta/service/entity-service-impl.service';
 import { BaseEntity } from '../../meta/entity/base-entity.entity';
 import { UserData } from '../entity/user.entity';
 import { Role } from '../entity/role.entity';
-import { ENTITYTYPE_ROLE } from 'src/constant/global.constant';
+import { ENTITYTYPE_ROLE, STATUS_INACTIVE } from 'src/constant/global.constant';
 import { RoleRepository } from '../repository/role.repository';
 import { EntityManager, Repository } from 'typeorm';
 import { InjectRepository } from '@nestjs/typeorm';
 import { ModuleAccess } from '../../module/entity/module-access.entity';
 import { ServiceResult } from 'src/dtos/response';
+import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
 
 @Injectable()
 export class RoleService extends EntityServiceImpl {
@@ -17,6 +18,8 @@ export class RoleService extends EntityServiceImpl {
     private readonly entityManager: EntityManager,
     @InjectRepository(ModuleAccess)
     private readonly moduleAccessRepo: Repository<ModuleAccess>,
+    @Inject('ListMasterService')
+    private readonly listMasterService: ListMasterService,
   ) {
     super();
   }
@@ -45,7 +48,11 @@ export class RoleService extends EntityServiceImpl {
     }
 
     const sourceRole = role.copy_from_role_id
-      ? await this.getEntityData(ENTITYTYPE_ROLE, role.copy_from_role_id)
+      ? await this.getEntityData(
+          ENTITYTYPE_ROLE,
+          role.copy_from_role_id,
+          loggedInUser,
+        )
       : null;
 
     if (role.copy_from_role_id && !sourceRole) {
@@ -83,11 +90,17 @@ export class RoleService extends EntityServiceImpl {
     }
     const role = entityData as Role;
 
-    if (entityData.status === 'INACTIVE') {
+    const resolveStatus = await this.listMasterService.getResolvedListCode(
+      STATUS_INACTIVE,
+      loggedInUser?.organization_id || 0,
+    );
+
+    if (entityData.status == resolveStatus.id || 'INACTIVE') {
       //get role by id
       const existingRole = await this.getEntityData(
         ENTITYTYPE_ROLE,
         entityData.id,
+        loggedInUser,
       );
 
       if (!existingRole) {
@@ -97,7 +110,7 @@ export class RoleService extends EntityServiceImpl {
       const associatedUsers = await this.entityManager.query(`SELECT map.*
                                                               FROM cr_user_role_mapping map
                                                                      JOIN cr_user usr ON map.user_id = usr.id
-                                                              WHERE usr.status = 'ACTIVE'
+                                                              WHERE usr.status = ${resolveStatus.id}
                                                                 and map.role_id = ${existingRole?.id}`);
 
       if (associatedUsers.length > 0) {
@@ -134,6 +147,7 @@ export class RoleService extends EntityServiceImpl {
       const sourceRole = await this.getEntityData(
         ENTITYTYPE_ROLE,
         role.copy_from_role_id,
+        loggedInUser,
       );
 
       if (!sourceRole) {

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

@@ -18,6 +18,7 @@ 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';
 
 @Injectable()
 export class UserService extends EntityServiceImpl {
@@ -28,6 +29,8 @@ export class UserService extends EntityServiceImpl {
     private configService: ConfigService,
     private readonly userAppMappingService: UserAppMappingService,
     @Inject('RoleService') private readonly roleService: RoleService,
+    @Inject('ListMasterService')
+    private readonly listMasterService: ListMasterService,
   ) {
     super();
   }
@@ -58,6 +61,11 @@ export class UserService extends EntityServiceImpl {
       return { success: false, error: 'User with this mobile already exists' };
     }
 
+    const resolveStatus = await this.listMasterService.getResolvedListCode(
+      STATUS_ACTIVE,
+      loggedInUser?.organization_id || 0,
+    );
+
     userData.name = (userData.first_name || '') + (userData.last_name || '');
     userData.password = EncryptUtilService.encryptGCM(
       userData.password || 'Admin@123',
@@ -67,7 +75,7 @@ export class UserService extends EntityServiceImpl {
     userData.is_firstlogin = 1;
     userData.roles = [];
     userData.invitation_status = 'SENT';
-    userData.status = STATUS_ACTIVE;
+    userData.status = resolveStatus.id || 'ACTIVE';
 
     const savedData = await super.createEntity(userData, loggedInUser);
 
@@ -114,6 +122,7 @@ export class UserService extends EntityServiceImpl {
   async getEntityData(
     entityType: string,
     id: number,
+    loggedInUser?: UserData,
   ): Promise<BaseEntity | null> {
     const user = await this.userRepository.findById(id);
     if (user) {
@@ -125,7 +134,11 @@ export class UserService extends EntityServiceImpl {
         for (let i in userRoleMappings) {
           const userRoleMapping = userRoleMappings[i];
           const roleId = userRoleMapping.role_id;
-          const role = await super.getEntityData(ENTITYTYPE_ROLE, roleId);
+          const role = await super.getEntityData(
+            ENTITYTYPE_ROLE,
+            roleId,
+            loggedInUser,
+          );
           roles.push(role);
         }
         userDto.roles = roles;

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

@@ -21,6 +21,7 @@ import { UserRoleMappingService } from './service/user-role-mapping.service';
 import { RoleRepository } from './repository/role.repository';
 import { ModuleAccess } from '../module/entity/module-access.entity';
 import { EnterpriseModule } from '../enterprise/enterprise.module';
+import { ListMasterModule } from '../listmaster/listmaster.module';
 
 @Module({
   imports: [
@@ -34,6 +35,7 @@ import { EnterpriseModule } from '../enterprise/enterprise.module';
     forwardRef(() => AuthModule),
     EntityModule,
     UtilsModule,
+    ListMasterModule,
     forwardRef(() => EnterpriseModule),
   ],
   providers: [