rez_core 6.6.6 → 7.0.0

package/dist/module/user/repository/user.repository.js

@@ -24,21 +24,27 @@ let UserRepository = class UserRepository {
     async findById(userId) {
         return this.userRepository.findOne({ where: { id: userId } });
     }
-    async findByEmailId(email, organization_id) {
+    async findByEmailId(email, enterprise_id, getLastApp) {
         if (!email)
             return null;
         const where = { email_id: email };
-        if (organization_id !== undefined) {
-            where.organization_id = organization_id;
+        if (enterprise_id !== undefined) {
+            where.enterprise_id = enterprise_id;
         }
-        return this.userRepository.findOne({ where });
+        const options = { where };
+        if (getLastApp) {
+            options.relations = {
+                last_app: true,
+            };
+        }
+        return this.userRepository.findOne(options);
     }
-    async findByMobile(mobile, organization_id, appCode) {
+    async findByMobile(mobile, enterprise_id, appCode) {
         if (!mobile)
             return null;
         const where = { mobile };
-        if (organization_id !== undefined) {
-            where.organization_id = organization_id;
+        if (enterprise_id !== undefined) {
+            where.enterprise_id = enterprise_id;
         }
         if (appCode !== undefined) {
             where.appcode = appCode;
@@ -48,6 +54,19 @@ let UserRepository = class UserRepository {
     async saveUser(user) {
         return this.userRepository.save(user);
     }
+    async updateUser(id, user) {
+        return await this.userRepository.update(id, user);
+    }
+    async find(options) {
+        return await this.userRepository.find(options);
+    }
+    async findMaxIdRecord() {
+        return await this.userRepository.findOne({
+            order: { id: 'DESC' },
+            select: ['id'],
+            where: {}
+        });
+    }
 };
 exports.UserRepository = UserRepository;
 exports.UserRepository = UserRepository = __decorate([

package/dist/module/user/repository/user.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/user.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,qCAAqC;AACrC,uDAAiD;AACjD,2CAA4C;AAC5C,6CAAmD;AAG5C,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YACsC,cAAoC;QAApC,mBAAc,GAAd,cAAc,CAAsB;IACvE,CAAC;IAEJ,KAAK,CAAC,QAAQ,CAAC,MAAc;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAChE,CAAC;IACD,KAAK,CAAC,aAAa,CACjB,KAAa,EACb,eAAwB;QAExB,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,MAAM,KAAK,GAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QACvC,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;YAClC,KAAK,CAAC,eAAe,GAAG,eAAe,CAAC;QAC1C,CAAC;QACD,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,MAAc,EACd,eAAwB,EACxB,OAAgB;QAEhB,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEzB,MAAM,KAAK,GAAQ,EAAE,MAAM,EAAE,CAAC;QAC9B,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;YAClC,KAAK,CAAC,eAAe,GAAG,eAAe,CAAC;QAC1C,CAAC;QACD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;QAC1B,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAc;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;CACF,CAAA;AA1CY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,sBAAQ,CAAC,CAAA;qCAAyB,oBAAU;GAFrD,cAAc,CA0C1B"}
+{"version":3,"file":"user.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/user.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAqC;AACrC,uDAAiD;AACjD,2CAA4C;AAC5C,6CAAmD;AAG5C,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YACsC,cAAoC;QAApC,mBAAc,GAAd,cAAc,CAAsB;IACtE,CAAC;IAEL,KAAK,CAAC,QAAQ,CAAC,MAAc;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,KAAa,EACb,aAAsB,EACtB,UAAoB;QAEpB,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,MAAM,KAAK,GAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QAEvC,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAChC,KAAK,CAAC,aAAa,GAAG,aAAa,CAAC;QACtC,CAAC;QAED,MAAM,OAAO,GAAQ,EAAE,KAAK,EAAE,CAAC;QAE/B,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,CAAC,SAAS,GAAG;gBAClB,QAAQ,EAAE,IAAI;aACf,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,MAAc,EACd,aAAsB,EACtB,OAAgB;QAEhB,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEzB,MAAM,KAAK,GAAQ,EAAE,MAAM,EAAE,CAAC;QAC9B,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAChC,KAAK,CAAC,aAAa,GAAG,aAAa,CAAC;QACtC,CAAC;QACD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;QAC1B,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAc;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU,EAAE,IAAc;QACzC,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAY;QACrB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;YACvC,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;YACrB,MAAM,EAAE,CAAC,IAAI,CAAC;YACd,KAAK,EAAC,EAAE;SACT,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAtEY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,sBAAQ,CAAC,CAAA;qCAAyB,oBAAU;GAFrD,cAAc,CAsE1B"}

package/dist/module/user/repository/userSession.repository.d.ts

@@ -6,5 +6,6 @@ export declare class UserSessionRepository {
     findBySessionKey(sessionKey: string): Promise<UserSession | null>;
     findActiveSessionByUserId(userId: number): Promise<UserSession | null>;
     saveSession(session: UserSession): Promise<UserSession>;
+    fetchUserFcmToken(user_id: number): Promise<UserSession | null>;
     logoutSession(sessionKey: string): Promise<void>;
 }

package/dist/module/user/repository/userSession.repository.js

@@ -32,6 +32,9 @@ let UserSessionRepository = class UserSessionRepository {
     async saveSession(session) {
         return this.userSessionRepo.save(session);
     }
+    async fetchUserFcmToken(user_id) {
+        return await this.userSessionRepo.findOne({ where: { user_id }, select: ['fcm_token'], order: { login_time: 'DESC' } });
+    }
     async logoutSession(sessionKey) {
         await this.userSessionRepo.update({ session_key: sessionKey }, { is_session_loggedout: 1, logout_time: new Date() });
     }

package/dist/module/user/repository/userSession.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"userSession.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/userSession.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAqC;AACrC,uEAA4D;AAC5D,2CAA4C;AAC5C,6CAAmD;AAG5C,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAChC,YAEU,eAAwC;QAAxC,oBAAe,GAAf,eAAe,CAAyB;IAC/C,CAAC;IAEJ,KAAK,CAAC,gBAAgB,CAAC,UAAkB;QACvC,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,MAAc;QAC5C,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;YAClC,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC,EAAE;SACpD,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAoB;QACpC,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,UAAkB;QACpC,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAC/B,EAAE,WAAW,EAAE,UAAU,EAAE,EAC3B,EAAE,oBAAoB,EAAE,CAAC,EAAE,WAAW,EAAE,IAAI,IAAI,EAAE,EAAE,CACrD,CAAC;IACJ,CAAC;CACF,CAAA;AA1BY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,iCAAW,CAAC,CAAA;qCACL,oBAAU;GAH1B,qBAAqB,CA0BjC"}
+{"version":3,"file":"userSession.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/userSession.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAqC;AACrC,uEAA4D;AAC5D,2CAA4C;AAC5C,6CAAmD;AAG5C,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAChC,YAEU,eAAwC;QAAxC,oBAAe,GAAf,eAAe,CAAyB;IAC9C,CAAC;IAEL,KAAK,CAAC,gBAAgB,CAAC,UAAkB;QACvC,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,MAAc;QAC5C,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;YAClC,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC,EAAE;SACpD,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAoB;QACpC,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAAe;QACrC,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAC1H,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,UAAkB;QACpC,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAC/B,EAAE,WAAW,EAAE,UAAU,EAAE,EAC3B,EAAE,oBAAoB,EAAE,CAAC,EAAE,WAAW,EAAE,IAAI,IAAI,EAAE,EAAE,CACrD,CAAC;IACJ,CAAC;CACF,CAAA;AA9BY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,iCAAW,CAAC,CAAA;qCACL,oBAAU;GAH1B,qBAAqB,CA8BjC"}

package/dist/module/user/service/login.service.d.ts

@@ -1,22 +1,20 @@
 import { ConfigService } from '@nestjs/config';
-import { OrganizationRepository } from 'src/module/enterprise/repository/organization.repository';
-import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
 import { Repository } from 'typeorm';
 import { UserRoleMapping } from '../entity/user-role-mapping.entity';
 import { UserSessionService } from './user-session.service';
 import { UserService } from './user.service';
 import { JwtAuthService } from 'src/module/auth/services/jwt.service';
 import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
+import { EnterpriseRepository } from 'src/module/enterprise/repository/enterprise.repository';
 export declare class LoginService {
     private readonly userService;
     private userSessionService;
     private configService;
     private readonly userRoleMappingRepository;
-    private readonly organizationRepository;
-    private readonly listMasterService;
+    private readonly enterpriseRepository;
     private readonly jwtAuthService;
     private readonly reflectionHelper;
-    constructor(userService: UserService, userSessionService: UserSessionService, configService: ConfigService, userRoleMappingRepository: Repository<UserRoleMapping>, organizationRepository: OrganizationRepository, listMasterService: ListMasterService, jwtAuthService: JwtAuthService, reflectionHelper: ReflectionHelper);
+    constructor(userService: UserService, userSessionService: UserSessionService, configService: ConfigService, userRoleMappingRepository: Repository<UserRoleMapping>, enterpriseRepository: EnterpriseRepository, jwtAuthService: JwtAuthService, reflectionHelper: ReflectionHelper);
     masterKey: string;
     masterIv: string;
     login(data: {

package/dist/module/user/service/login.service.js

@@ -17,8 +17,6 @@ const common_1 = require("@nestjs/common");
 const config_1 = require("@nestjs/config");
 const typeorm_1 = require("@nestjs/typeorm");
 const global_constant_1 = require("../../../constant/global.constant");
-const organization_repository_1 = require("../../enterprise/repository/organization.repository");
-const list_master_service_1 = require("../../listmaster/service/list-master.service");
 const typeorm_2 = require("typeorm");
 const encryptUtil_service_1 = require("../../../utils/service/encryptUtil.service");
 const user_role_mapping_entity_1 = require("../entity/user-role-mapping.entity");
@@ -26,14 +24,15 @@ const user_session_service_1 = require("./user-session.service");
 const user_service_1 = require("./user.service");
 const jwt_service_1 = require("../../auth/services/jwt.service");
 const reflection_helper_service_1 = require("../../../utils/service/reflection-helper.service");
+const enterprise_repository_1 = require("../../enterprise/repository/enterprise.repository");
+const status_constant_1 = require("../../../constant/status.constant");
 let LoginService = class LoginService {
-    constructor(userService, userSessionService, configService, userRoleMappingRepository, organizationRepository, listMasterService, jwtAuthService, reflectionHelper) {
+    constructor(userService, userSessionService, configService, userRoleMappingRepository, enterpriseRepository, jwtAuthService, reflectionHelper) {
         this.userService = userService;
         this.userSessionService = userSessionService;
         this.configService = configService;
         this.userRoleMappingRepository = userRoleMappingRepository;
-        this.organizationRepository = organizationRepository;
-        this.listMasterService = listMasterService;
+        this.enterpriseRepository = enterpriseRepository;
         this.jwtAuthService = jwtAuthService;
         this.reflectionHelper = reflectionHelper;
         this.masterKey = this.configService.get('MASTER_KEY') || '';
@@ -41,31 +40,30 @@ let LoginService = class LoginService {
     }
     async login(data) {
         const { email_id, password, is_otp = false, subdomain } = data;
-        let organization;
+        let enterprise;
         if (subdomain) {
-            organization =
-                await this.organizationRepository.findOrganizationBySubdomain(subdomain);
-            if (!organization) {
+            enterprise =
+                await this.enterpriseRepository.findEnterpriseBySubdomain(subdomain);
+            if (!enterprise) {
                 return {
                     success: false,
-                    message: 'Organization not found.',
+                    message: 'Enterprise not found.',
                 };
             }
         }
-        const user = await this.userService.findByEmailId(email_id, organization?.id);
-        if (!user || (organization && user.organization_id !== organization.id)) {
+        const user = await this.userService.findByEmailId(email_id, enterprise?.id, true);
+        if (!user || (enterprise && user.enterprise_id !== enterprise.id)) {
             return {
                 success: false,
-                message: 'User not found in organization.',
+                message: 'User not found in Enterprise.',
             };
         }
-        const userOrgData = await this.organizationRepository.findOrganizationById(user.organization_id);
-        const resolveStatus = await this.listMasterService.getResolvedListCode(global_constant_1.STATUS_ACTIVE, user?.organization_id || 0);
-        if (user.status != resolveStatus.id ||
-            userOrgData?.status != resolveStatus.id) {
+        const userOrgData = await this.enterpriseRepository.findById(user.enterprise_id);
+        if (user.status != status_constant_1.StatusConstant.ACTIVE ||
+            userOrgData?.status != status_constant_1.StatusConstant.ACTIVE) {
             return {
                 success: false,
-                message: 'Your account or organization is inactive. Please contact admin.',
+                message: 'Your account or Enterprise is inactive. Please contact admin.',
             };
         }
         if (!is_otp) {
@@ -78,16 +76,19 @@ let LoginService = class LoginService {
                 };
             }
         }
-        let appcode = user.last_app_access;
-        if (!user.last_app_access || user.last_app_access == '') {
-            await this.userService.setDefaultLastAccess(user.id, appcode);
+        let app_id = user.last_app_access_id;
+        if (!user.last_app_access_id) {
+            await this.userService.setDefaultLastAccess(user.id, app_id);
         }
         const whereCondition = { user_id: user.id };
-        if (appcode && appcode !== '') {
-            whereCondition.appcode = appcode;
+        if (app_id) {
+            whereCondition.app_id = app_id;
         }
         const roleMappings = await this.userRoleMappingRepository.find({
             where: whereCondition,
+            relations: {
+                app: true
+            }
         });
         if (!roleMappings.length) {
             return {
@@ -96,16 +97,15 @@ let LoginService = class LoginService {
             };
         }
         const defaultAccess = await this.getDefaultAccess(user, roleMappings);
-        await this.userService.setLastLevelTypeAndId(user.id, defaultAccess.level_type, defaultAccess.level_id, defaultAccess.appcode);
-        const token = await this.userSessionService.createSession(user, defaultAccess.appcode, defaultAccess);
-        const resolvedInvitationStatus = await this.listMasterService.getResolvedListCode(global_constant_1.INVITATION_STATUS_ACCEPTED, user?.organization_id || 0);
+        await this.userService.setLastLevelTypeAndId(user.id, defaultAccess.level_type, defaultAccess.level_id, defaultAccess.app_id);
+        const token = await this.userSessionService.createSession(user, defaultAccess.app_id, defaultAccess, defaultAccess.appcode);
         if (user.is_firstlogin === 1) {
-            user.invitation_status = resolvedInvitationStatus.id;
+            user.invitation_status = global_constant_1.INVITATION_STATUS_ACCEPTED;
             user.is_firstlogin = 0;
             const { password, ...userWithoutPassword } = user;
-            await this.userService.updateEntity(userWithoutPassword, user);
+            await this.userService.updateUser(user.id, userWithoutPassword, user);
         }
-        const org = await this.organizationRepository.findOrganizationById(user.organization_id);
+        const org = await this.enterpriseRepository.findById(user.enterprise_id);
         let slug;
         if (org) {
             slug = org.slug;
@@ -113,21 +113,22 @@ let LoginService = class LoginService {
         else {
             return {
                 success: false,
-                message: 'Organization not found for the user.',
+                message: 'Enterprise not found for the user.',
             };
         }
         return {
             success: true,
             accessToken: token,
-            appcode: defaultAccess.appcode,
+            app_id: defaultAccess.app_id,
             level_type: defaultAccess.level_type,
             level_id: defaultAccess.level_id,
             slug: slug,
+            appcode: defaultAccess.appcode
         };
     }
     async formLogin(body) {
         if (body) {
-            const { entity_type, entity_id } = body;
+            const { entity_id } = body;
             const leadRepo = this.reflectionHelper.getRepoService('CRMLead');
             const entityData = await leadRepo.findOne({
                 where: { id: entity_id },
@@ -135,11 +136,11 @@ let LoginService = class LoginService {
             if (entityData) {
                 const level_id = entityData.level_id;
                 const level_type = entityData.level_type;
-                const organization_id = entityData.organization_id;
+                const enterprise_id = entityData.enterprise_id;
                 const token = this.jwtAuthService.generateJwt({
                     level_id: level_id,
                     level_type: level_type,
-                    organization_id: organization_id,
+                    enterprise_id: enterprise_id,
                 });
                 return {
                     success: true,
@@ -153,7 +154,7 @@ let LoginService = class LoginService {
         const brnAccesses = roleMappings.filter((r) => r.level_type === 'BRN');
         const schAccesses = roleMappings.filter((r) => r.level_type === 'SCH');
         let validURM;
-        validURM = roleMappings.some((r) => r.level_type == 'ORG' && r.level_id == user.organization_id);
+        validURM = roleMappings.some((r) => r.level_type == 'ORG' && r.level_id == user.enterprise_id);
         if (!validURM) {
             validURM = roleMappings.some((r) => r.level_type === user.last_level_type &&
                 r.level_id === user.last_level_id);
@@ -162,14 +163,16 @@ let LoginService = class LoginService {
             return {
                 level_type: user.last_level_type,
                 level_id: user.last_level_id,
-                appcode: user.last_app_access,
+                app_id: user.last_app_access_id,
+                appcode: user.last_app.code
             };
         }
         if (orgAccess) {
             return {
                 level_type: 'ORG',
                 level_id: orgAccess.level_id,
-                appcode: orgAccess.appcode,
+                app_id: orgAccess.app_id,
+                appcode: orgAccess.app.code
             };
         }
         if (brnAccesses.length) {
@@ -187,7 +190,7 @@ let LoginService = class LoginService {
                 return {
                     level_type: 'SCH',
                     level_id: rows.id,
-                    appcode: brnAccesses[0].appcode,
+                    app_id: brnAccesses[0].app_id,
                 };
             }
             else {
@@ -198,7 +201,7 @@ let LoginService = class LoginService {
             return {
                 level_type: 'SCH',
                 level_id: schAccesses[0].level_id,
-                appcode: schAccesses[0].appcode,
+                app_id: schAccesses[0].app_id,
             };
         }
         throw new common_1.BadRequestException('User does not have ORG, BRN, or SCH access for this app.');
@@ -229,13 +232,11 @@ exports.LoginService = LoginService = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, common_1.Inject)('UserService')),
     __param(3, (0, typeorm_1.InjectRepository)(user_role_mapping_entity_1.UserRoleMapping)),
-    __param(5, (0, common_1.Inject)('ListMasterService')),
     __metadata("design:paramtypes", [user_service_1.UserService,
         user_session_service_1.UserSessionService,
         config_1.ConfigService,
         typeorm_2.Repository,
-        organization_repository_1.OrganizationRepository,
-        list_master_service_1.ListMasterService,
+        enterprise_repository_1.EnterpriseRepository,
         jwt_service_1.JwtAuthService,
         reflection_helper_service_1.ReflectionHelper])
 ], LoginService);

package/dist/module/user/service/login.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/login.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"login.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/login.service.ts"],"names":[],"mappings":"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"}

package/dist/module/user/service/role.service.d.ts

@@ -1,25 +1,38 @@
-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 { RoleRepository } from '../repository/role.repository';
-import { EntityManager, Repository } from 'typeorm';
+import { Repository } from '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';
 import { UserRoleMapping } from '../entity/user-role-mapping.entity';
-export declare class RoleService extends EntityServiceImpl {
+export declare class RoleService {
     private readonly roleRepository;
-    private readonly entityManager;
     private readonly moduleAccessRepo;
-    private readonly listMasterService;
     private readonly userRoleMappingRepo;
-    constructor(roleRepository: RoleRepository, entityManager: EntityManager, moduleAccessRepo: Repository<ModuleAccess>, listMasterService: ListMasterService, userRoleMappingRepo: Repository<UserRoleMapping>);
-    createEntity(entityData: BaseEntity, loggedInUser: UserData): Promise<ServiceResult<BaseEntity>>;
-    updateEntity(entityData: BaseEntity, loggedInUser: UserData): Promise<ServiceResult<BaseEntity>>;
+    constructor(roleRepository: RoleRepository, moduleAccessRepo: Repository<ModuleAccess>, userRoleMappingRepo: Repository<UserRoleMapping>);
+    createRole(role: Role, loggedInUser: any): Promise<{
+        success: boolean;
+        error: string;
+        data?: undefined;
+    } | {
+        success: boolean;
+        data: Role;
+        error?: undefined;
+    }>;
+    updateRole(id: number, role: Role, loggedInUser: UserData): Promise<{
+        success: boolean;
+        error: string;
+        data?: undefined;
+    } | {
+        success: boolean;
+        data: import("typeorm").UpdateResult;
+        error?: undefined;
+    }>;
     getDefaultRole(data: {
         is_factory?: boolean;
         level_id?: number;
         level_type?: string;
     }): Promise<Role[] | null>;
+    findByCode(code: string): Promise<Role | null>;
+    findById(id: number): Promise<Role | null>;
+    find(options: any): Promise<Role[]>;
 }

package/dist/module/user/service/role.service.js

@@ -14,78 +14,84 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoleService = void 0;
 const common_1 = require("@nestjs/common");
-const entity_service_impl_service_1 = require("../../meta/service/entity-service-impl.service");
-const global_constant_1 = require("../../../constant/global.constant");
+const role_entity_1 = require("../entity/role.entity");
 const role_repository_1 = require("../repository/role.repository");
 const typeorm_1 = require("typeorm");
 const typeorm_2 = require("@nestjs/typeorm");
 const module_access_entity_1 = require("../../module/entity/module-access.entity");
-const list_master_service_1 = require("../../listmaster/service/list-master.service");
 const user_role_mapping_entity_1 = require("../entity/user-role-mapping.entity");
-let RoleService = class RoleService extends entity_service_impl_service_1.EntityServiceImpl {
-    constructor(roleRepository, entityManager, moduleAccessRepo, listMasterService, userRoleMappingRepo) {
-        super();
+const class_transformer_1 = require("class-transformer");
+const status_constant_1 = require("../../../constant/status.constant");
+let RoleService = class RoleService {
+    constructor(roleRepository, moduleAccessRepo, userRoleMappingRepo) {
         this.roleRepository = roleRepository;
-        this.entityManager = entityManager;
         this.moduleAccessRepo = moduleAccessRepo;
-        this.listMasterService = listMasterService;
         this.userRoleMappingRepo = userRoleMappingRepo;
     }
-    async createEntity(entityData, loggedInUser) {
-        const role = entityData;
-        role.level_type = entityData.level_type || loggedInUser.level_type;
-        role.level_id = entityData.level_id || loggedInUser.level_id;
-        role.appcode = entityData.appcode || loggedInUser.appcode;
+    async createRole(role, loggedInUser) {
+        role.level_type = role.level_type || loggedInUser.level_type;
+        role.level_id = role.level_id || loggedInUser.level_id;
+        role.created_by = loggedInUser.id;
+        role.enterprise_id = loggedInUser.enterprise_id;
+        role.app_id = role.app_id || loggedInUser.app_id;
         if (await this.roleRepository.isRoleNameWithLevelExists(role.name, {
-            organization_id: loggedInUser?.organization_id || undefined,
-            level_type: entityData.level_type || loggedInUser?.level_type,
-            level_id: parseInt(entityData.level_id) ||
+            enterprise_id: loggedInUser.enterprise_id,
+            level_type: role.level_type || loggedInUser?.level_type,
+            level_id: parseInt(role.level_id) ||
                 parseInt(loggedInUser?.level_id || '', 10),
         })) {
             return { success: false, error: 'Role name already exists.' };
         }
+        if (!role.code) {
+            const maxId = await this.roleRepository.findMaxIdRecord();
+            if (maxId && maxId.id) {
+                role.code = `ROL${maxId.id + 1}`;
+            }
+            else {
+                role.code = `ROL1`;
+            }
+        }
         const sourceRole = role.copy_from_role_id
-            ? await this.getEntityData(global_constant_1.ENTITYTYPE_ROLE, role.copy_from_role_id, loggedInUser)
+            ? await this.roleRepository.findById(role.copy_from_role_id)
             : null;
         if (role.copy_from_role_id && !sourceRole) {
             return { success: false, error: 'Source role not found.' };
         }
-        const savedRole = await super.createEntity(role, loggedInUser);
+        role.status = status_constant_1.StatusConstant.ACTIVE;
+        const savedRole = await this.roleRepository.saveRole(role);
         if (sourceRole) {
             const sourcePermissions = await this.moduleAccessRepo.find({
                 where: { role_code: sourceRole.code },
             });
             const clonedPermissions = sourcePermissions.map((perm) => this.moduleAccessRepo.create({
                 role_code: savedRole.code,
-                module_code: perm.module_code,
                 action_type: perm.action_type,
                 access_flag: perm.access_flag,
                 level_type: perm.level_type,
                 appcode: perm.appcode,
+                module_id: perm.module_id,
             }));
             await this.moduleAccessRepo.save(clonedPermissions);
         }
         return { success: true, data: savedRole };
     }
-    async updateEntity(entityData, loggedInUser) {
-        if (!entityData.name) {
+    async updateRole(id, role, loggedInUser) {
+        if (!role.name) {
             return { success: false, error: 'Role name is required' };
         }
-        const role = entityData;
-        const resolveStatus = await this.listMasterService.getResolvedListCode(global_constant_1.STATUS_INACTIVE, loggedInUser?.organization_id || 0);
-        if (entityData.status == resolveStatus.id) {
-            const existingRole = await this.getEntityData(global_constant_1.ENTITYTYPE_ROLE, entityData.id, loggedInUser);
+        if (role.status == status_constant_1.StatusConstant.INACTIVE) {
+            const existingRole = await this.roleRepository.findById(id);
             if (!existingRole) {
                 return { success: false, error: 'Role not found' };
             }
             const associatedUsers = await this.userRoleMappingRepo
-                .createQueryBuilder("map")
-                .innerJoin("sso_user", "usr", "map.user_id = usr.id")
-                .where("usr.status::text = :status", { status: String(resolveStatus.id) })
-                .andWhere("map.role_id::text = :roleId", {
+                .createQueryBuilder('map')
+                .innerJoin('sso_user', 'usr', 'map.user_id = usr.id')
+                .where('usr.status::text = :status', { status: status_constant_1.StatusConstant.INACTIVE })
+                .andWhere('map.role_id::text = :roleId', {
                 roleId: String(existingRole?.id),
             })
-                .select("map")
+                .select('map')
                 .getRawMany();
             if (associatedUsers.length > 0) {
                 return {
@@ -100,9 +106,9 @@ let RoleService = class RoleService extends entity_service_impl_service_1.Entity
                 };
             }
         }
-        if (await this.roleRepository.isRoleNameExists(entityData.name, {
-            excludeRoleId: entityData.id,
-            organization_id: loggedInUser?.organization_id,
+        if (await this.roleRepository.isRoleNameExists(role.name, {
+            excludeRoleId: role.id,
+            enterprise_id: loggedInUser?.enterprise_id,
         })) {
             return {
                 success: false,
@@ -110,9 +116,10 @@ let RoleService = class RoleService extends entity_service_impl_service_1.Entity
             };
         }
         const { copy_from_role_id, ...persistableData } = role;
-        const updatedRole = await super.updateEntity(persistableData, loggedInUser);
+        const entity = (0, class_transformer_1.plainToInstance)(role_entity_1.Role, persistableData);
+        const updatedRole = await this.roleRepository.updateRole(id, entity);
         if (role.copy_from_role_id) {
-            const sourceRole = await this.getEntityData(global_constant_1.ENTITYTYPE_ROLE, role.copy_from_role_id, loggedInUser);
+            const sourceRole = await this.roleRepository.findById(role.copy_from_role_id);
             if (!sourceRole) {
                 return {
                     success: false,
@@ -125,7 +132,7 @@ let RoleService = class RoleService extends entity_service_impl_service_1.Entity
             });
             const clonedPermissions = sourcePermissions.map((perm) => this.moduleAccessRepo.create({
                 role_code: role.code,
-                module_code: perm.module_code,
+                module_id: perm.module_id,
                 action_type: perm.action_type,
                 access_flag: perm.access_flag,
                 appcode: perm.appcode,
@@ -138,17 +145,23 @@ let RoleService = class RoleService extends entity_service_impl_service_1.Entity
     async getDefaultRole(data) {
         return await this.roleRepository.find(data);
     }
+    async findByCode(code) {
+        return await this.roleRepository.findByCode(code);
+    }
+    async findById(id) {
+        return await this.roleRepository.findById(id);
+    }
+    async find(options) {
+        return await this.roleRepository.findRoles(options);
+    }
 };
 exports.RoleService = RoleService;
 exports.RoleService = RoleService = __decorate([
     (0, common_1.Injectable)(),
-    __param(2, (0, typeorm_2.InjectRepository)(module_access_entity_1.ModuleAccess)),
-    __param(3, (0, common_1.Inject)('ListMasterService')),
-    __param(4, (0, typeorm_2.InjectRepository)(user_role_mapping_entity_1.UserRoleMapping)),
+    __param(1, (0, typeorm_2.InjectRepository)(module_access_entity_1.ModuleAccess)),
+    __param(2, (0, typeorm_2.InjectRepository)(user_role_mapping_entity_1.UserRoleMapping)),
     __metadata("design:paramtypes", [role_repository_1.RoleRepository,
-        typeorm_1.EntityManager,
         typeorm_1.Repository,
-        list_master_service_1.ListMasterService,
         typeorm_1.Repository])
 ], RoleService);
 //# sourceMappingURL=role.service.js.map