rez_core 6.5.28 → 6.5.29

package/dist/module/user/service/user-role-mapping.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-role-mapping.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user-role-mapping.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"user-role-mapping.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user-role-mapping.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAA4C;AAC5C,6FAAuF;AAIhF,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YACmB,yBAAoD;QAApD,8BAAyB,GAAzB,yBAAyB,CAA2B;IACpE,CAAC;IAEJ,KAAK,CAAC,cAAc,CAAC,eAAgC;QACnD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,qBAAqB,CACzE,eAAe,CAAC,OAAO,EACvB,eAAe,CAAC,OAAO,EACvB,eAAe,CAAC,OAAO,EACvB,eAAe,CAAC,QAAQ,EACxB,eAAe,CAAC,UAAU,CAC3B,CAAC;QAEF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,eAAgC;QAEvD,IAAI,eAAe,CAAC,EAAE,EAAE,CAAC;YACvB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,WAAW,CAC/D,eAAe,CAAC,EAAE,CACnB,CAAC;YACF,IAAI,QAAQ,EAAE,CAAC;gBACb,QAAQ,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC;gBAC3C,QAAQ,CAAC,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC;gBAC7C,QAAQ,CAAC,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC;gBACjD,QAAQ,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC;gBAE3C,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC;QAGD,MAAM,SAAS,GACb,MAAM,IAAI,CAAC,yBAAyB,CAAC,qBAAqB,CACxD,eAAe,CAAC,OAAO,EACvB,eAAe,CAAC,OAAO,EACvB,eAAe,CAAC,OAAO,EACvB,eAAe,CAAC,QAAQ,EACxB,eAAe,CAAC,UAAU,CAC3B,CAAC;QAEJ,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAc;QAC/B,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,MAAc,EACd,SAAkB,EAClB,OAAQ;QAER,MAAM,IAAI,CAAC,yBAAyB,CAAC,cAAc,CACjD,MAAM,EACN,SAAS,EACT,OAAO,CACR,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,qBAAqB,CACzB,MAAc,EACd,OAAe;QAEf,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,sBAAsB,CAChE,MAAM,EACN,OAAO,CACR,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,0BAA0B,CAC9B,MAAc,EACd,OAAe,EACf,SAAiB,EACjB,OAAe;QAEf,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,8BAA8B,CACxE,MAAM,EACN,OAAO,EACP,SAAS,EACT,OAAO,CACR,CAAC;IACJ,CAAC;CACF,CAAA;AA3FY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;qCAGmC,wDAAyB;GAF5D,sBAAsB,CA2FlC"}

package/dist/module/user/service/user-session.service.d.ts

@@ -4,6 +4,7 @@ import { UserSessionRepository } from '../repository/userSession.repository';
 import { JwtAuthService } from 'src/module/auth/services/jwt.service';
 import { ConfigService } from '@nestjs/config';
 import { Repository } from 'typeorm';
+import { UserRoleMapping } from '../entity/user-role-mapping.entity';
 import { UserData } from '../entity/user.entity';
 import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 export declare class UserSessionService {
@@ -12,12 +13,12 @@ export declare class UserSessionService {
     private readonly clockIDGenService;
     private configService;
     private readonly userDataRepository;
+    private readonly userRoleMappingRepository;
     private readonly reflectionHelper;
-    constructor(userSessionRepository: UserSessionRepository, jwtAuthService: JwtAuthService, clockIDGenService: ClockIDGenService, configService: ConfigService, userDataRepository: Repository<UserData>, reflectionHelper: ReflectionHelper);
-    createSession(user: any, app_id?: number, accessInfo?: any, appcode?: string): Promise<string>;
+    constructor(userSessionRepository: UserSessionRepository, jwtAuthService: JwtAuthService, clockIDGenService: ClockIDGenService, configService: ConfigService, userDataRepository: Repository<UserData>, userRoleMappingRepository: Repository<UserRoleMapping>, reflectionHelper: ReflectionHelper);
+    createSession(user: any, appcode?: string, accessInfo?: any): Promise<string>;
     findBySessionKey(sessionKey: string): Promise<UserSession | null>;
     updateSession(userSession: UserSession): Promise<void>;
-    fetchUserFcmToken(user_id: number): Promise<UserSession | null>;
     switchCurrentLevelService(currentUser: any, data: any): Promise<{
         success: boolean;
         accessToken: string;

package/dist/module/user/service/user-session.service.js

@@ -20,41 +20,44 @@ const userSession_repository_1 = require("../repository/userSession.repository")
 const jwt_service_1 = require("../../auth/services/jwt.service");
 const config_1 = require("@nestjs/config");
 const typeorm_1 = require("typeorm");
+const user_role_mapping_entity_1 = require("../entity/user-role-mapping.entity");
 const user_entity_1 = require("../entity/user.entity");
 const typeorm_2 = require("@nestjs/typeorm");
 const reflection_helper_service_1 = require("../../../utils/service/reflection-helper.service");
 let UserSessionService = class UserSessionService {
-    constructor(userSessionRepository, jwtAuthService, clockIDGenService, configService, userDataRepository, reflectionHelper) {
+    constructor(userSessionRepository, jwtAuthService, clockIDGenService, configService, userDataRepository, userRoleMappingRepository, reflectionHelper) {
         this.userSessionRepository = userSessionRepository;
         this.jwtAuthService = jwtAuthService;
         this.clockIDGenService = clockIDGenService;
         this.configService = configService;
         this.userDataRepository = userDataRepository;
+        this.userRoleMappingRepository = userRoleMappingRepository;
         this.reflectionHelper = reflectionHelper;
     }
-    async createSession(user, app_id, accessInfo, appcode) {
+    async createSession(user, appcode, accessInfo) {
         const sessionToken = this.clockIDGenService.idGenerator('SES');
         const userSession = new user_session_entity_1.UserSession();
         userSession.user_id = user.id;
         userSession.session_key = sessionToken;
         userSession.is_session_loggedout = 0;
+        userSession.login_time = new Date();
         const expiryTokenInHours = this.configService.get('TOKEN_EXPIRY') || 1;
         userSession.expiry_date = new Date(Date.now() + expiryTokenInHours * 60 * 60 * 1000);
         await this.userSessionRepository.saveSession(userSession);
         const payload = {
             id: user.id,
             sessionToken,
-            app_id,
+            appcode,
             email_id: user.email_id,
             organization_id: user.organization_id,
             enterprise_id: user.enterprise_id,
-            appcode,
         };
         if (accessInfo) {
             payload.level_type = accessInfo.level_type;
             payload.level_id = accessInfo.level_id;
         }
         const accessToken = this.jwtAuthService.generateJwt(payload);
+        userSession.access_token = accessToken;
         await this.userSessionRepository.saveSession(userSession);
         return accessToken;
     }
@@ -64,10 +67,6 @@ let UserSessionService = class UserSessionService {
     async updateSession(userSession) {
         await this.userSessionRepository.saveSession(userSession);
     }
-    async fetchUserFcmToken(user_id) {
-        return await this.userSessionRepository.fetchUserFcmToken(user_id);
-    }
-    ;
     async switchCurrentLevelService(currentUser, data) {
         let payload;
         payload = {
@@ -84,11 +83,11 @@ let UserSessionService = class UserSessionService {
                 },
             });
         }
-        if (getUserDetails?.enterprise_id == 1 && payload.level_type == 'ORG') {
+        if (getUserDetails?.organization_id == 1 && payload.level_type == 'ORG') {
             payload.organization_id = payload.level_id;
         }
         await this.userDataRepository.update(currentUser.id, {
-            last_app_access_id: data.app_id,
+            last_app_access: data.appcode,
             last_level_type: data.level_type,
             last_level_id: data.level_id,
         });
@@ -149,11 +148,13 @@ exports.UserSessionService = UserSessionService;
 exports.UserSessionService = UserSessionService = __decorate([
     (0, common_1.Injectable)(),
     __param(4, (0, typeorm_2.InjectRepository)(user_entity_1.UserData)),
+    __param(5, (0, typeorm_2.InjectRepository)(user_role_mapping_entity_1.UserRoleMapping)),
     __metadata("design:paramtypes", [userSession_repository_1.UserSessionRepository,
         jwt_service_1.JwtAuthService,
         clockIDGenUtil_service_1.ClockIDGenService,
         config_1.ConfigService,
         typeorm_1.Repository,
+        typeorm_1.Repository,
         reflection_helper_service_1.ReflectionHelper])
 ], UserSessionService);
 //# sourceMappingURL=user-session.service.js.map

package/dist/module/user/service/user-session.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-session.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user-session.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAA4D;AAC5D,0FAAkF;AAClF,2CAAiE;AACjE,iFAA6E;AAC7E,iEAAsE;AACtE,2CAA+C;AAC/C,qCAAqC;AAErC,uDAAiD;AACjD,6CAAmD;AACnD,gGAAoF;AAG7E,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,YACmB,qBAA4C,EAC5C,cAA8B,EAC9B,iBAAoC,EAC7C,aAA4B,EAEnB,kBAAwC,EACxC,gBAAkC;QANlC,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,mBAAc,GAAd,cAAc,CAAgB;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAmB;QAC7C,kBAAa,GAAb,aAAa,CAAe;QAEnB,uBAAkB,GAAlB,kBAAkB,CAAsB;QACxC,qBAAgB,GAAhB,gBAAgB,CAAkB;IAErD,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,MAAe,EAAE,UAAgB,EAAE,OAAgB;QAC3E,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAE/D,MAAM,WAAW,GAAQ,IAAI,iCAAW,EAAE,CAAC;QAC3C,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC;QAC9B,WAAW,CAAC,WAAW,GAAG,YAAY,CAAC;QACvC,WAAW,CAAC,oBAAoB,GAAG,CAAC,CAAC;QAGrC,MAAM,kBAAkB,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACvE,WAAW,CAAC,WAAW,GAAG,IAAI,IAAI,CAChC,IAAI,CAAC,GAAG,EAAE,GAAG,kBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CACjD,CAAC;QAEF,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAE1D,MAAM,OAAO,GAAQ;YACnB,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,YAAY;YACZ,MAAM;YACN,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,OAAO;SACR,CAAC;QAGF,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,CAAC,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;YAC3C,OAAO,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;QACzC,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAE7D,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAE1D,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,UAAkB;QACvC,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,WAAwB;QAC1C,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAAe;QACrC,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACrE,CAAC;IAAA,CAAC;IAGF,KAAK,CAAC,yBAAyB,CAC7B,WAAgB,EAChB,IAAS;QAQT,IAAI,OAAO,CAAC;QAEZ,OAAO,GAAG;YACR,GAAG,WAAW;YACd,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC;QAEF,IAAI,cAAc,GAAoB,IAAI,CAAC;QAE3C,IAAI,WAAW,EAAE,CAAC;YAGhB,cAAc,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;gBACrD,KAAK,EAAE;oBACL,EAAE,EAAE,WAAW,CAAC,EAAE;iBACnB;aACF,CAAC,CAAC;QACL,CAAC;QAED,IAAI,cAAc,EAAE,aAAa,IAAI,CAAC,IAAI,OAAO,CAAC,UAAU,IAAI,KAAK,EAAE,CAAC;YACtE,OAAO,CAAC,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC;QAC7C,CAAC;QAED,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE;YACnD,kBAAkB,EAAE,IAAI,CAAC,MAAM;YAC/B,eAAe,EAAE,IAAI,CAAC,UAAU;YAChC,aAAa,EAAE,IAAI,CAAC,QAAQ;SAC7B,CAAC,CAAC;QAEH,OAAO;YACL,OAAO,EAAE,IAAI;YACb,WAAW,EAAE,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,OAAO,CAAC;YACrD,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,qBAAqB,CACzB,MAAc,EACd,OAAe,EACf,SAAiB,EACjB,OAAe;QAGf,MAAM,mBAAmB,GACvB,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;QAC1D,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QAGxE,MAAM,KAAK,GAAG,MAAM,mBAAmB;aACpC,kBAAkB,CAAC,KAAK,CAAC;aACzB,SAAS,CACR,aAAa,CAAC,QAAQ,CAAC,SAAS,EAChC,KAAK,EACL,2BAA2B,CAC5B;aACA,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,CAAC;aAC1C,QAAQ,CAAC,wBAAwB,EAAE,EAAE,OAAO,EAAE,CAAC;aAC/C,QAAQ,CAAC,6BAA6B,EAAE,EAAE,SAAS,EAAE,CAAC;aACtD,QAAQ,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,CAAC;aAChD,QAAQ,CAAC,uBAAuB,CAAC;aACjC,QAAQ,EAAE,CAAC;QAEd,OAAO,KAAK,GAAG,CAAC,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,MAAc,EAAE,OAAe;QAC5D,MAAM,mBAAmB,GACvB,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;QAC1D,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QAExE,MAAM,OAAO,GAAG,MAAM,mBAAmB;aACtC,kBAAkB,CAAC,KAAK,CAAC;aACzB,SAAS,CACR,aAAa,CAAC,QAAQ,CAAC,SAAS,EAChC,KAAK,EACL,2BAA2B,CAC5B;aACA,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,CAAC;aAC1C,QAAQ,CAAC,wBAAwB,EAAE,EAAE,OAAO,EAAE,CAAC;aAC/C,QAAQ,CAAC,uBAAuB,CAAC;aACjC,MAAM,EAAE,CAAC;QAEZ,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,4BAAmB,CAC3B,4CAA4C,OAAO,EAAE,CACtD,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;YACjC,OAAO,OAAO,CAAC;QACjB,CAAC;QAGD,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QACrE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACtC,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE;YACrC,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE;SACrB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,4BAAmB,CAC3B,gCAAgC,OAAO,CAAC,QAAQ,EAAE,CACnD,CAAC;QACJ,CAAC;QAED,OAAO;YACL,GAAG,OAAO;YACV,UAAU,EAAE,KAAK;YACjB,QAAQ,EAAE,MAAM,CAAC,EAAE;SACpB,CAAC;IACJ,CAAC;CACF,CAAA;AA7LY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;IAOR,WAAA,IAAA,0BAAgB,EAAC,sBAAQ,CAAC,CAAA;qCAJa,8CAAqB;QAC5B,4BAAc;QACX,0CAAiB;QAC9B,sBAAa;QAEC,oBAAU;QACZ,4CAAgB;GAR1C,kBAAkB,CA6L9B"}
+{"version":3,"file":"user-session.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user-session.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAA4D;AAC5D,0FAAkF;AAClF,2CAAiE;AACjE,iFAA6E;AAC7E,iEAAsE;AACtE,2CAA+C;AAE/C,qCAAiD;AACjD,iFAAqE;AACrE,uDAAiD;AACjD,6CAAmD;AACnD,gGAAoF;AAG7E,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,YACmB,qBAA4C,EAC5C,cAA8B,EAC9B,iBAAoC,EAC7C,aAA4B,EAEnB,kBAAwC,EAExC,yBAAsD,EACtD,gBAAkC;QARlC,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,mBAAc,GAAd,cAAc,CAAgB;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAmB;QAC7C,kBAAa,GAAb,aAAa,CAAe;QAEnB,uBAAkB,GAAlB,kBAAkB,CAAsB;QAExC,8BAAyB,GAAzB,yBAAyB,CAA6B;QACtD,qBAAgB,GAAhB,gBAAgB,CAAkB;IAClD,CAAC;IACJ,KAAK,CAAC,aAAa,CAAC,IAAI,EAAE,OAAgB,EAAE,UAAgB;QAC1D,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAE/D,MAAM,WAAW,GAAQ,IAAI,iCAAW,EAAE,CAAC;QAC3C,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC;QAC9B,WAAW,CAAC,WAAW,GAAG,YAAY,CAAC;QACvC,WAAW,CAAC,oBAAoB,GAAG,CAAC,CAAC;QACrC,WAAW,CAAC,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;QAEpC,MAAM,kBAAkB,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACvE,WAAW,CAAC,WAAW,GAAG,IAAI,IAAI,CAChC,IAAI,CAAC,GAAG,EAAE,GAAG,kBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CACjD,CAAC;QAEF,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAE1D,MAAM,OAAO,GAAQ;YACnB,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,YAAY;YACZ,OAAO;YACP,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC;QAGF,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,CAAC,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;YAC3C,OAAO,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;QACzC,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAE7D,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC;QACvC,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAE1D,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,UAAkB;QACvC,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,WAAwB;QAC1C,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAC5D,CAAC;IAGD,KAAK,CAAC,yBAAyB,CAC7B,WAAgB,EAChB,IAAS;QAQT,IAAI,OAAO,CAAC;QAEZ,OAAO,GAAG;YACR,GAAG,WAAW;YACd,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC;QAEF,IAAI,cAAc,GAAoB,IAAI,CAAC;QAE3C,IAAI,WAAW,EAAE,CAAC;YAGhB,cAAc,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;gBACrD,KAAK,EAAE;oBACL,EAAE,EAAE,WAAW,CAAC,EAAE;iBACnB;aACF,CAAC,CAAC;QACL,CAAC;QAED,IAAI,cAAc,EAAE,eAAe,IAAI,CAAC,IAAI,OAAO,CAAC,UAAU,IAAI,KAAK,EAAE,CAAC;YACxE,OAAO,CAAC,eAAe,GAAG,OAAO,CAAC,QAAQ,CAAC;QAC7C,CAAC;QAED,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE;YACnD,eAAe,EAAE,IAAI,CAAC,OAAO;YAC7B,eAAe,EAAE,IAAI,CAAC,UAAU;YAChC,aAAa,EAAE,IAAI,CAAC,QAAQ;SAC7B,CAAC,CAAC;QAEH,OAAO;YACL,OAAO,EAAE,IAAI;YACb,WAAW,EAAE,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,OAAO,CAAC;YACrD,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,qBAAqB,CACzB,MAAc,EACd,OAAe,EACf,SAAiB,EACjB,OAAe;QAGf,MAAM,mBAAmB,GACvB,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;QAC1D,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QAGxE,MAAM,KAAK,GAAG,MAAM,mBAAmB;aACpC,kBAAkB,CAAC,KAAK,CAAC;aACzB,SAAS,CACR,aAAa,CAAC,QAAQ,CAAC,SAAS,EAChC,KAAK,EACL,2BAA2B,CAC5B;aACA,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,CAAC;aAC1C,QAAQ,CAAC,wBAAwB,EAAE,EAAE,OAAO,EAAE,CAAC;aAC/C,QAAQ,CAAC,6BAA6B,EAAE,EAAE,SAAS,EAAE,CAAC;aACtD,QAAQ,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,CAAC;aAChD,QAAQ,CAAC,uBAAuB,CAAC;aACjC,QAAQ,EAAE,CAAC;QAEd,OAAO,KAAK,GAAG,CAAC,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,MAAc,EAAE,OAAe;QAC5D,MAAM,mBAAmB,GACvB,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;QAC1D,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QAExE,MAAM,OAAO,GAAG,MAAM,mBAAmB;aACtC,kBAAkB,CAAC,KAAK,CAAC;aACzB,SAAS,CACR,aAAa,CAAC,QAAQ,CAAC,SAAS,EAChC,KAAK,EACL,2BAA2B,CAC5B;aACA,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,CAAC;aAC1C,QAAQ,CAAC,wBAAwB,EAAE,EAAE,OAAO,EAAE,CAAC;aAC/C,QAAQ,CAAC,uBAAuB,CAAC;aACjC,MAAM,EAAE,CAAC;QAEZ,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,4BAAmB,CAC3B,4CAA4C,OAAO,EAAE,CACtD,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;YACjC,OAAO,OAAO,CAAC;QACjB,CAAC;QAGD,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QACrE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACtC,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE;YACrC,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE;SACrB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,4BAAmB,CAC3B,gCAAgC,OAAO,CAAC,QAAQ,EAAE,CACnD,CAAC;QACJ,CAAC;QAED,OAAO;YACL,GAAG,OAAO;YACV,UAAU,EAAE,KAAK;YACjB,QAAQ,EAAE,MAAM,CAAC,EAAE;SACpB,CAAC;IACJ,CAAC;CACF,CAAA;AAzLY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;IAOR,WAAA,IAAA,0BAAgB,EAAC,sBAAQ,CAAC,CAAA;IAE1B,WAAA,IAAA,0BAAgB,EAAC,0CAAe,CAAC,CAAA;qCANM,8CAAqB;QAC5B,4BAAc;QACX,0CAAiB;QAC9B,sBAAa;QAEC,oBAAU;QAEH,oBAAU;QACnB,4CAAgB;GAV1C,kBAAkB,CAyL9B"}

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

@@ -1,47 +1,38 @@
+import { RoleService } from './role.service';
+import { EntityServiceImpl } from '../../meta/service/entity-service-impl.service';
 import { UserData } from '../entity/user.entity';
+import { BaseEntity } from '../../meta/entity/base-entity.entity';
 import { UserRepository } from '../repository/user.repository';
-import { CreateUserDto } from '../dto/create-user.dto';
+import { ClockIDGenService } from '../../../utils/service/clockIDGenUtil.service';
 import { UserRoleMappingService } from './user-role-mapping.service';
+import { EntityManager } from 'typeorm';
 import { ConfigService } from '@nestjs/config';
+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 { Action } from 'src/module/workflow-automation/interface/action.interface';
-import { UpdateUserDto } from '../dto/update-user.dto';
-import { EnterpriseRepository } from 'src/module/enterprise/repository/enterprise.repository';
-export declare class UserService implements Action {
+export declare class UserService extends EntityServiceImpl implements Action {
     private userRepository;
     private userRoleMappingService;
+    private readonly clockIDGenService;
     private configService;
-    private readonly enterpriseRepository;
-    constructor(userRepository: UserRepository, userRoleMappingService: UserRoleMappingService, configService: ConfigService, enterpriseRepository: EnterpriseRepository);
+    private readonly organizationRepository;
+    private readonly roleService;
+    private readonly listMasterService;
+    constructor(userRepository: UserRepository, userRoleMappingService: UserRoleMappingService, clockIDGenService: ClockIDGenService, configService: ConfigService, organizationRepository: OrganizationRepository, roleService: RoleService, listMasterService: ListMasterService);
     masterKey: any;
     masterIv: any;
-    createUser(entityData: CreateUserDto, loggedInUser: UserData): Promise<{
-        success: boolean;
-        error: string;
-        data?: undefined;
-    } | {
-        success: boolean;
-        data: UserData;
-        error?: undefined;
-    }>;
+    createEntity(entityData: BaseEntity, loggedInUser: UserData | null, manager?: EntityManager): Promise<ServiceResult<BaseEntity>>;
     name: string;
     execute(payload: any): Promise<any>;
-    getUserData(id: number): Promise<UserData | null>;
-    updateUser(id: number, userDto: UpdateUserDto, loggedInUserData: UserData): Promise<{
-        success: boolean;
-        error: string;
-        data?: undefined;
-    } | {
-        success: boolean;
-        data: import("typeorm").UpdateResult;
-        error?: undefined;
-    }>;
-    findByEmailId(email_id: string, enterprise_id?: number, getLastApp?: boolean): Promise<UserData | null>;
+    getEntityData(entityType: string, id: number, loggedInUser?: UserData): Promise<BaseEntity | null>;
+    updateEntity(entityData: BaseEntity, loggedInUserData: UserData): Promise<ServiceResult<BaseEntity>>;
+    findByEmailId(email_id: string, organization_id?: number): Promise<UserData | null>;
     findByMobile(mobile: string, organization_id?: number, appCode?: string): Promise<UserData | null>;
-    setDefaultLastAccess(userId: number, app_id: number): Promise<void>;
-    setLastLevelTypeAndId(userId: number, levelType: string, levelId: string, app_id: number): Promise<void>;
+    setDefaultLastAccess(userId: number, appcode: string): Promise<void>;
+    setLastLevelTypeAndId(userId: number, levelType: string, levelId: string, appcode: string): Promise<void>;
     checkEmailExists(data: {
         email_id: string;
         subdomain: string;
     }): Promise<any>;
-    find(options: any): Promise<UserData[]>;
 }

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

@@ -8,52 +8,58 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserService = void 0;
+const role_service_1 = require("./role.service");
 const common_1 = require("@nestjs/common");
-const user_entity_1 = require("../entity/user.entity");
+const entity_service_impl_service_1 = require("../../meta/service/entity-service-impl.service");
 const user_repository_1 = require("../repository/user.repository");
+const encryptUtil_service_1 = require("../../../utils/service/encryptUtil.service");
+const clockIDGenUtil_service_1 = require("../../../utils/service/clockIDGenUtil.service");
 const global_constant_1 = require("../../../constant/global.constant");
 const user_role_mapping_service_1 = require("./user-role-mapping.service");
 const user_role_mapping_entity_1 = require("../entity/user-role-mapping.entity");
 const config_1 = require("@nestjs/config");
+const list_master_service_1 = require("../../listmaster/service/list-master.service");
+const organization_repository_1 = require("../../enterprise/repository/organization.repository");
 const action_decorator_1 = require("../../workflow-automation/interface/action.decorator");
-const encryptUtil_service_1 = require("../../../utils/service/encryptUtil.service");
-const class_transformer_1 = require("class-transformer");
-const enterprise_repository_1 = require("../../enterprise/repository/enterprise.repository");
-const status_constant_1 = require("../../../constant/status.constant");
-let UserService = class UserService {
-    constructor(userRepository, userRoleMappingService, configService, enterpriseRepository) {
+let UserService = class UserService extends entity_service_impl_service_1.EntityServiceImpl {
+    constructor(userRepository, userRoleMappingService, clockIDGenService, configService, organizationRepository, roleService, listMasterService) {
+        super();
         this.userRepository = userRepository;
         this.userRoleMappingService = userRoleMappingService;
+        this.clockIDGenService = clockIDGenService;
         this.configService = configService;
-        this.enterpriseRepository = enterpriseRepository;
+        this.organizationRepository = organizationRepository;
+        this.roleService = roleService;
+        this.listMasterService = listMasterService;
         this.masterKey = this.configService.get('MASTER_KEY') || '';
         this.masterIv = this.configService.get('MASTER_IV') || '';
         this.name = 'UserService';
     }
-    async createUser(entityData, loggedInUser) {
+    async createEntity(entityData, loggedInUser, manager) {
         const userData = entityData;
-        let existingUser = await this.userRepository.findByEmailId(userData.email_id, loggedInUser?.enterprise_id);
+        let existingUser = await this.userRepository.findByEmailId(userData.email_id, loggedInUser?.organization_id);
         if (existingUser) {
             return { success: false, error: 'User with this email already exists' };
         }
-        existingUser = await this.userRepository.findByMobile(userData.mobile, loggedInUser?.enterprise_id);
+        existingUser = await this.userRepository.findByMobile(userData.mobile, loggedInUser?.organization_id);
         if (existingUser) {
             return { success: false, error: 'User with this mobile already exists' };
         }
-        ;
+        const resolveStatus = await this.listMasterService.getResolvedListCode(global_constant_1.STATUS_ACTIVE, loggedInUser?.organization_id || 0);
+        const resolvedInvitationStatus = await this.listMasterService.getResolvedListCode(global_constant_1.INVITATION_STATUS_SENT, loggedInUser?.organization_id || 0);
+        userData.name =
+            (userData.first_name || '') + ' ' + (userData.last_name || '');
         userData.password = encryptUtil_service_1.EncryptUtilService.encryptGCM(userData.password || 'Admin@123', this.masterKey, this.masterIv);
-        userData.enterprise_id = loggedInUser.enterprise_id;
-        userData.level_type = loggedInUser.level_type;
-        userData.level_id = loggedInUser.level_id;
         userData.is_firstlogin = 1;
         userData.roles = [];
-        userData.invitation_status = global_constant_1.INVITATION_STATUS_SENT;
-        userData.status = status_constant_1.StatusConstant.ACTIVE;
-        const entity = (0, class_transformer_1.plainToInstance)(user_entity_1.UserData, userData);
-        entity.created_by = loggedInUser.created_by;
-        const savedData = await this.userRepository.saveUser(entity);
+        userData.invitation_status = resolvedInvitationStatus.id;
+        userData.status = resolveStatus.id || 'ACTIVE';
+        const savedData = await super.createEntity(userData, loggedInUser);
         const insertPromises = [];
         for (const entry of userData.access || []) {
             const { level_type, level_ids, app_code, role_id } = entry;
@@ -69,7 +75,7 @@ let UserService = class UserService {
                 userRoleMapping.level_type = level_type;
                 userRoleMapping.level_id = String(levelId);
                 userRoleMapping.appcode = app_code;
-                userRoleMapping.enterprise_id = loggedInUser?.enterprise_id || 0;
+                userRoleMapping.organization_id = loggedInUser?.organization_id || 0;
                 insertPromises.push(this.userRoleMappingService.assignUserRole(userRoleMapping));
             }
         }
@@ -87,7 +93,7 @@ let UserService = class UserService {
     async execute(payload) {
         console.log('payload', payload);
     }
-    async getUserData(id) {
+    async getEntityData(entityType, id, loggedInUser) {
         const user = await this.userRepository.findById(id);
         if (user) {
             const userRoleMappings = await this.userRoleMappingService.findByUserId(id);
@@ -97,6 +103,8 @@ let UserService = class UserService {
                 for (const i in userRoleMappings) {
                     const userRoleMapping = userRoleMappings[i];
                     const roleId = userRoleMapping.role_id;
+                    const role = await super.getEntityData(global_constant_1.ENTITYTYPE_ROLE, roleId, loggedInUser);
+                    roles.push(role);
                 }
                 userDto.roles = roles;
             }
@@ -104,8 +112,9 @@ let UserService = class UserService {
         }
         return null;
     }
-    async updateUser(id, userDto, loggedInUserData) {
-        const existingUser = await this.userRepository.findById(id);
+    async updateEntity(entityData, loggedInUserData) {
+        const userDto = entityData;
+        const existingUser = await this.userRepository.findById(entityData.id);
         if (!existingUser) {
             return { success: false, error: 'User not found' };
         }
@@ -121,7 +130,7 @@ let UserService = class UserService {
         }
         const updatedUserData = { ...userDto };
         delete updatedUserData.access;
-        const savedData = await this.userRepository.updateUser(id, updatedUserData);
+        const savedData = await super.updateEntity(updatedUserData, loggedInUserData);
         if (userDto.access && userDto.access.length > 0) {
             if (loggedInUserData.level_type == 'ORG') {
                 await this.userRoleMappingService.deleteByUserId(existingUser.id);
@@ -136,11 +145,12 @@ let UserService = class UserService {
                     return { success: false, error: 'Invalid access level entry' };
                 }
                 for (const levelId of level_ids) {
-                    const userRoleMapping = new user_role_mapping_entity_1.UserRoleMapping(id, role_id);
+                    const userRoleMapping = new user_role_mapping_entity_1.UserRoleMapping(savedData.id, role_id);
                     userRoleMapping.level_type = level_type;
                     userRoleMapping.level_id = String(levelId);
                     userRoleMapping.appcode = app_code;
-                    userRoleMapping.enterprise_id = loggedInUserData.enterprise_id;
+                    userRoleMapping.organization_id =
+                        loggedInUserData?.organization_id || 0;
                     insertPromises.push(this.userRoleMappingService.assignUserRole(userRoleMapping));
                 }
             }
@@ -154,28 +164,28 @@ let UserService = class UserService {
         }
         return { success: true, data: savedData };
     }
-    async findByEmailId(email_id, enterprise_id, getLastApp) {
-        return await this.userRepository.findByEmailId(email_id, enterprise_id, getLastApp);
+    async findByEmailId(email_id, organization_id) {
+        return await this.userRepository.findByEmailId(email_id, organization_id);
     }
     async findByMobile(mobile, organization_id, appCode) {
         return await this.userRepository.findByMobile(mobile, organization_id, appCode);
     }
-    async setDefaultLastAccess(userId, app_id) {
+    async setDefaultLastAccess(userId, appcode) {
         const user = await this.userRepository.findById(userId);
         if (!user) {
             throw new common_1.BadRequestException('User not found');
         }
-        user.last_app_access_id = app_id;
+        user.last_app_access = appcode;
         await this.userRepository.saveUser(user);
     }
-    async setLastLevelTypeAndId(userId, levelType, levelId, app_id) {
+    async setLastLevelTypeAndId(userId, levelType, levelId, appcode) {
         const user = await this.userRepository.findById(userId);
         if (!user) {
             throw new common_1.BadRequestException('User not found');
         }
         user.last_level_type = levelType;
         user.last_level_id = levelId;
-        user.last_app_access_id = app_id;
+        user.last_app_access = appcode;
         await this.userRepository.saveUser(user);
     }
     async checkEmailExists(data) {
@@ -183,22 +193,22 @@ let UserService = class UserService {
         if (!email_id || !subdomain) {
             return { success: false, message: 'Email and Subdomain is required' };
         }
-        let enterprise;
+        let organization;
         if (subdomain) {
-            enterprise =
-                await this.enterpriseRepository.findEnterpriseBySubdomain(subdomain);
-            if (!enterprise) {
+            organization =
+                await this.organizationRepository.findOrganizationBySubdomain(subdomain);
+            if (!organization) {
                 return {
                     success: false,
                     message: 'Organization not found.',
                 };
             }
         }
-        const user = await this.userRepository.findByEmailId(email_id, enterprise?.id);
-        if (!user || (enterprise && user.enterprise_id !== enterprise.id)) {
+        const user = await this.userRepository.findByEmailId(email_id, organization?.id);
+        if (!user || (organization && user.organization_id !== organization.id)) {
             return {
                 success: false,
-                message: 'User not found in enterprise.',
+                message: 'User not found in organization.',
             };
         }
         if (user) {
@@ -215,17 +225,19 @@ let UserService = class UserService {
             };
         }
     }
-    async find(options) {
-        return await this.userRepository.find(options);
-    }
 };
 exports.UserService = UserService;
 exports.UserService = UserService = __decorate([
     (0, common_1.Injectable)(),
     (0, action_decorator_1.ActionHandler)('User'),
+    __param(5, (0, common_1.Inject)('RoleService')),
+    __param(6, (0, common_1.Inject)('ListMasterService')),
     __metadata("design:paramtypes", [user_repository_1.UserRepository,
         user_role_mapping_service_1.UserRoleMappingService,
+        clockIDGenUtil_service_1.ClockIDGenService,
         config_1.ConfigService,
-        enterprise_repository_1.EnterpriseRepository])
+        organization_repository_1.OrganizationRepository,
+        role_service_1.RoleService,
+        list_master_service_1.ListMasterService])
 ], UserService);
 //# sourceMappingURL=user.service.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAiE;AACjE,uDAAiD;AACjD,mEAA+D;AAC/D,uEAA2E;AAE3E,2EAAqE;AACrE,iFAAqE;AACrE,2CAA+C;AAE/C,2FAA0F;AAC1F,oFAAgF;AAChF,yDAAoD;AAEpD,6FAA8F;AAC9F,uEAAmE;AAI5D,IAAM,WAAW,GAAjB,MAAM,WAAW;IACtB,YACU,cAA8B,EAC9B,sBAA8C,EAC9C,aAA4B,EACnB,oBAA0C;QAHnD,mBAAc,GAAd,cAAc,CAAgB;QAC9B,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,kBAAa,GAAb,aAAa,CAAe;QACnB,yBAAoB,GAApB,oBAAoB,CAAsB;QAI7D,cAAS,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;QACvD,aAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAqFrD,SAAI,GAAW,aAAa,CAAC;IAxF7B,CAAC;IAKD,KAAK,CAAC,UAAU,CACd,UAAyB,EACzB,YAAsB;QAEtB,MAAM,QAAQ,GAAG,UAAU,CAAC;QAE5B,IAAI,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CACxD,QAAQ,CAAC,QAAQ,EACjB,YAAY,EAAE,aAAa,CAC5B,CAAC;QACF,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,qCAAqC,EAAE,CAAC;QAC1E,CAAC;QAED,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CACnD,QAAQ,CAAC,MAAM,EACf,YAAY,EAAE,aAAa,CAC5B,CAAC;QACF,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,sCAAsC,EAAE,CAAC;QAC3E,CAAC;QACD,CAAC;QAED,QAAQ,CAAC,QAAQ,GAAG,wCAAkB,CAAC,UAAU,CAC/C,QAAQ,CAAC,QAAQ,IAAI,WAAW,EAChC,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,QAAQ,CACd,CAAC;QAEF,QAAQ,CAAC,aAAa,GAAG,YAAY,CAAC,aAAa,CAAC;QACpD,QAAQ,CAAC,UAAU,GAAG,YAAY,CAAC,UAAU,CAAC;QAC9C,QAAQ,CAAC,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC;QAE1C,QAAQ,CAAC,aAAa,GAAG,CAAC,CAAC;QAC3B,QAAQ,CAAC,KAAK,GAAG,EAAE,CAAC;QACpB,QAAQ,CAAC,iBAAiB,GAAG,wCAAsB,CAAC;QACpD,QAAQ,CAAC,MAAM,GAAG,gCAAc,CAAC,MAAM,CAAC;QAExC,MAAM,MAAM,GAAG,IAAA,mCAAe,EAAC,sBAAQ,EAAE,QAAQ,CAAC,CAAC;QACnD,MAAM,CAAC,UAAU,GAAG,YAAY,CAAC,UAAU,CAAC;QAE5C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAE7D,MAAM,cAAc,GAClB,EAAE,CAAC;QAEL,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;YAC1C,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;YAE3D,IACE,CAAC,UAAU;gBACX,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;gBACzB,CAAC,SAAS,CAAC,MAAM;gBACjB,CAAC,QAAQ;gBACT,CAAC,OAAO,EACR,CAAC;gBACD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,4BAA4B,EAAE,CAAC;YACjE,CAAC;YAED,KAAK,MAAM,OAAO,IAAI,SAAS,EAAE,CAAC;gBAChC,MAAM,eAAe,GAAG,IAAI,0CAAe,CAAC,SAAS,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;gBACnE,eAAe,CAAC,UAAU,GAAG,UAAU,CAAC;gBACxC,eAAe,CAAC,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;gBAC3C,eAAe,CAAC,OAAO,GAAG,QAAQ,CAAC;gBACnC,eAAe,CAAC,aAAa,GAAG,YAAY,EAAE,aAAa,IAAI,CAAC,CAAC;gBACjE,cAAc,CAAC,IAAI,CACjB,IAAI,CAAC,sBAAsB,CAAC,cAAc,CAAC,eAAe,CAAC,CAC5D,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,CAAC;YACH,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9B,MAAM,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YACpC,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC;YACpD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,6BAA6B,EAAE,CAAC;QAClE,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAC5C,CAAC;IAID,KAAK,CAAC,OAAO,CAAC,OAAY;QACxB,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,WAAW,CACf,EAAU;QAEV,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACpD,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,gBAAgB,GACpB,MAAM,IAAI,CAAC,sBAAsB,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YACrD,IAAI,gBAAgB,EAAE,CAAC;gBACrB,MAAM,OAAO,GAAG,IAAgC,CAAC;gBACjD,MAAM,KAAK,GAAU,EAAE,CAAC;gBACxB,KAAK,MAAM,CAAC,IAAI,gBAAgB,EAAE,CAAC;oBACjC,MAAM,eAAe,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;oBAC5C,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC;gBAOzC,CAAC;gBACD,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;YACxB,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,UAAU,CACd,EAAU,EACV,OAAsB,EACtB,gBAA0B;QAG1B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAE5D,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC;QACrD,CAAC;QAED,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACrB,MAAM,iBAAiB,GAAG,wCAAkB,CAAC,UAAU,CACrD,YAAY,CAAC,QAAQ,EACrB,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,QAAQ,CACd,CAAC;YAEF,IAAI,iBAAiB,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAC;gBAC3C,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,yDAAyD;iBACjE,CAAC;YACJ,CAAC;YAED,OAAO,CAAC,QAAQ,GAAG,wCAAkB,CAAC,UAAU,CAC9C,OAAO,CAAC,QAAQ,EAChB,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,QAAQ,CACd,CAAC;QACJ,CAAC;QAED,MAAM,eAAe,GAAG,EAAE,GAAG,OAAO,EAAS,CAAC;QAC9C,OAAO,eAAe,CAAC,MAAM,CAAC;QAE9B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,EAAE,eAAe,CAAC,CAAC;QAG5E,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChD,IAAI,gBAAgB,CAAC,UAAU,IAAI,KAAK,EAAE,CAAC;gBACzC,MAAM,IAAI,CAAC,sBAAsB,CAAC,cAAc,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YACpE,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,CAAC,sBAAsB,CAAC,cAAc,CAC9C,YAAY,CAAC,EAAE,EACf,gBAAgB,CAAC,UAAU,EAC3B,gBAAgB,CAAC,QAAQ,CAC1B,CAAC;YACJ,CAAC;YAED,MAAM,cAAc,GAAU,EAAE,CAAC;YAEjC,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnC,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;gBAE3D,IAAI,CAAC,UAAU,IAAI,CAAC,QAAQ,IAAI,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;oBACtE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,4BAA4B,EAAE,CAAC;gBACjE,CAAC;gBAED,KAAK,MAAM,OAAO,IAAI,SAAS,EAAE,CAAC;oBAChC,MAAM,eAAe,GAAG,IAAI,0CAAe,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;oBACzD,eAAe,CAAC,UAAU,GAAG,UAAU,CAAC;oBACxC,eAAe,CAAC,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;oBAC3C,eAAe,CAAC,OAAO,GAAG,QAAQ,CAAC;oBACnC,eAAe,CAAC,aAAa,GAAG,gBAAgB,CAAC,aAAa,CAAC;oBAE/D,cAAc,CAAC,IAAI,CACjB,IAAI,CAAC,sBAAsB,CAAC,cAAc,CAAC,eAAe,CAAC,CAC5D,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,IAAI,CAAC;gBACH,MAAM,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YACpC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;gBACtD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,gCAAgC,EAAE,CAAC;YACrE,CAAC;QACH,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,QAAgB,EAChB,aAAsB,EACtB,UAAoB;QAEpB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,QAAQ,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;IACtF,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,MAAc,EACd,eAAwB,EACxB,OAAgB;QAEhB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAC3C,MAAM,EACN,eAAe,EACf,OAAO,CACR,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,MAAc,EAAE,MAAc;QACvD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAExD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,4BAAmB,CAAC,gBAAgB,CAAC,CAAC;QAClD,CAAC;QAED,IAAI,CAAC,kBAAkB,GAAG,MAAM,CAAC;QAEjC,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,qBAAqB,CACzB,MAAc,EACd,SAAiB,EACjB,OAAe,EACf,MAAc;QAEd,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAExD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,4BAAmB,CAAC,gBAAgB,CAAC,CAAC;QAClD,CAAC;QAED,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;QACjC,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC;QAC7B,IAAI,CAAC,kBAAkB,GAAG,MAAM,CAAC;QAEjC,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,IAGtB;QACC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QAErC,IAAI,CAAC,QAAQ,IAAI,CAAC,SAAS,EAAE,CAAC;YAC5B,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,iCAAiC,EAAE,CAAC;QACxE,CAAC;QAED,IAAI,UAAU,CAAC;QAEf,IAAI,SAAS,EAAE,CAAC;YACd,UAAU;gBACR,MAAM,IAAI,CAAC,oBAAoB,CAAC,yBAAyB,CACvD,SAAS,CACV,CAAC;YAEJ,IAAI,CAAC,UAAU,EAAE,CAAC;gBAEhB,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,OAAO,EAAE,yBAAyB;iBACnC,CAAC;YACJ,CAAC;QACH,CAAC;QAGD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAClD,QAAQ,EACR,UAAU,EAAE,EAAE,CACf,CAAC;QAEF,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,aAAa,KAAK,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC;YAElE,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,+BAA+B;aACzC,CAAC;QACJ,CAAC;QAED,IAAI,IAAI,EAAE,CAAC;YACT,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,OAAO,EACL,sGAAsG;gBACxG,MAAM,EAAE,IAAI,CAAC,EAAE;aAChB,CAAC;QACJ,CAAC;aAAM,CAAC;YAEN,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,2CAA2C;aACrD,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAY;QACrB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;CACF,CAAA;AAlUY,kCAAW;sBAAX,WAAW;IAFvB,IAAA,mBAAU,GAAE;IACZ,IAAA,gCAAa,EAAC,MAAM,CAAC;qCAGM,gCAAc;QACN,kDAAsB;QAC/B,sBAAa;QACG,4CAAoB;GALlD,WAAW,CAkUvB"}
+{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user.service.ts"],"names":[],"mappings":"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"}

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

@@ -12,6 +12,7 @@ const typeorm_1 = require("@nestjs/typeorm");
 const user_entity_1 = require("./entity/user.entity");
 const user_service_1 = require("./service/user.service");
 const utils_module_1 = require("../../utils/utils.module");
+const entity_module_1 = require("../meta/entity.module");
 const user_repository_1 = require("./repository/user.repository");
 const user_session_service_1 = require("./service/user-session.service");
 const user_session_entity_1 = require("./entity/user-session.entity");
@@ -29,6 +30,8 @@ const user_role_mapping_service_1 = require("./service/user-role-mapping.service
 const role_repository_1 = require("./repository/role.repository");
 const module_access_entity_1 = require("../module/entity/module-access.entity");
 const enterprise_module_1 = require("../enterprise/enterprise.module");
+const listmaster_module_1 = require("../listmaster/listmaster.module");
+const integration_module_1 = require("../integration/integration.module");
 let UserModule = class UserModule {
 };
 exports.UserModule = UserModule;
@@ -43,8 +46,11 @@ exports.UserModule = UserModule = __decorate([
                 module_access_entity_1.ModuleAccess,
             ]),
             (0, common_1.forwardRef)(() => auth_module_1.AuthModule),
+            entity_module_1.EntityModule,
             utils_module_1.UtilsModule,
-            (0, common_1.forwardRef)(() => enterprise_module_1.EnterpriseModule)
+            listmaster_module_1.ListMasterModule,
+            integration_module_1.IntegrationModule,
+            (0, common_1.forwardRef)(() => enterprise_module_1.EnterpriseModule),
         ],
         providers: [
             { provide: 'UserService', useClass: user_service_1.UserService },

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

@@ -1 +1 @@
-{"version":3,"file":"user.module.js","sourceRoot":"","sources":["../../../src/module/user/user.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,6CAAgD;AAChD,sDAAgD;AAChD,yDAAqD;AACrD,2DAAuD;AAEvD,kEAA8D;AAC9D,yEAAoE;AACpE,sEAA2D;AAC3D,oEAAgE;AAChE,2DAAuD;AACvD,gFAA4E;AAC5E,qCAAyC;AACzC,qDAAiD;AACjD,kEAA8D;AAC9D,sDAA4C;AAC5C,yDAAqD;AACrD,gFAAoE;AACpE,4FAAsF;AACtF,mFAA6E;AAC7E,kEAA8D;AAC9D,gFAAqE;AACrE,uEAAmE;AAwC5D,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAI,CAAA;AAAd,gCAAU;qBAAV,UAAU;IAnCtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC;gBACvB,sBAAQ;gBACR,iCAAW;gBACX,kBAAI;gBACJ,0CAAe;gBACf,mCAAY;aACb,CAAC;YACF,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,wBAAU,CAAC;YAC5B,0BAAW;YACX,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,oCAAgB,CAAC;SACnC;QACD,SAAS,EAAE;YACT,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,0BAAW,EAAE;YACjD,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,0BAAW,EAAE;YACjD,gCAAc;YACd,yCAAkB;YAClB,4BAAY;YACZ,8CAAqB;YACrB,gBAAU;YACV,wDAAyB;YACzB,kDAAsB;YACtB,gCAAc;SACf;QACD,OAAO,EAAE;YACP,aAAa;YACb,yCAAkB;YAClB,aAAa;YACb,kDAAsB;YACtB,gCAAc;YACd,4BAAY;SACb;QACD,WAAW,EAAE,CAAC,kCAAe,EAAE,gCAAc,CAAC;KAC/C,CAAC;GACW,UAAU,CAAI"}
+{"version":3,"file":"user.module.js","sourceRoot":"","sources":["../../../src/module/user/user.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,6CAAgD;AAChD,sDAAgD;AAChD,yDAAqD;AACrD,2DAAuD;AACvD,yDAAqD;AACrD,kEAA8D;AAC9D,yEAAoE;AACpE,sEAA2D;AAC3D,oEAAgE;AAChE,2DAAuD;AACvD,gFAA4E;AAC5E,qCAAyC;AACzC,qDAAiD;AACjD,kEAA8D;AAC9D,sDAA4C;AAC5C,yDAAqD;AACrD,gFAAoE;AACpE,4FAAsF;AACtF,mFAA6E;AAC7E,kEAA8D;AAC9D,gFAAqE;AACrE,uEAAmE;AACnE,uEAAmE;AACnE,0EAAsE;AAwC/D,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,gCAAU;qBAAV,UAAU;IAtCtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC;gBACvB,sBAAQ;gBACR,iCAAW;gBACX,kBAAI;gBACJ,0CAAe;gBACf,mCAAY;aACb,CAAC;YACF,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,wBAAU,CAAC;YAC5B,4BAAY;YACZ,0BAAW;YACX,oCAAgB;YAChB,sCAAiB;YACjB,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,oCAAgB,CAAC;SACnC;QACD,SAAS,EAAE;YACT,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,0BAAW,EAAE;YACjD,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,0BAAW,EAAE;YACjD,gCAAc;YACd,yCAAkB;YAClB,4BAAY;YACZ,8CAAqB;YACrB,gBAAU;YACV,wDAAyB;YACzB,kDAAsB;YACtB,gCAAc;SACf;QACD,OAAO,EAAE;YACP,aAAa;YACb,yCAAkB;YAClB,aAAa;YACb,kDAAsB;YACtB,gCAAc;YACd,4BAAY;SACb;QACD,WAAW,EAAE,CAAC,kCAAe,EAAE,gCAAc,CAAC;KAC/C,CAAC;GACW,UAAU,CAAG"}

package/dist/module/workflow/repository/action-data.repository.d.ts

@@ -13,7 +13,7 @@ export declare class ActionDataRepository extends EntityServiceImpl {
     constructor(actionDataRepo: Repository<ActionDataEntity>, TaskRepository: Repository<TaskDataEntity>, configService: ConfigService, workflowAutomationEngineService: WorkflowAutomationEngineService);
     saveActionData(action: any, loggedInUser: UserData, mapped_entity_id: any, mapped_entity_type: any): Promise<any>;
     updateActionStatus(loggedInUser: UserData, mapped_entity_type: string, mapped_entity_id: number, stage_id: number, action_id: number): Promise<any>;
-    resubmitAction(loggedInUser: UserData, mapped_entity_type: string, mapped_entity_id: number, stage_id: number, action_id: number): Promise<{
+    resubmitAction(organization_id: number, mapped_entity_type: string, mapped_entity_id: number, stage_id: number, action_id: number): Promise<{
         message: string;
         revertedTo: ActionDataEntity;
         updated: ActionDataEntity;

package/dist/module/workflow/repository/action-data.repository.js

@@ -50,6 +50,7 @@ let ActionDataRepository = class ActionDataRepository extends entity_service_imp
                     action_id: act.id,
                     sequence: act.sequence,
                     name: act.name,
+                    organization_id: loggedInUser.organization_id,
                     enterprise_id: loggedInUser.enterprise_id,
                     mapped_entity_id,
                     mapped_entity_type,
@@ -89,6 +90,7 @@ let ActionDataRepository = class ActionDataRepository extends entity_service_imp
                     if (relationData) {
                         const entityRelationDataRepo = this.reflectionHelper.getRepoService('EntityRelationData');
                         await entityRelationDataRepo.save({
+                            organization_id: loggedInUser.organization_id,
                             enterprise_id: loggedInUser.enterprise_id,
                             source_entity_id: createdEntity.mapped_entity_id,
                             source_entity_type: createdEntity.mapped_entity_type,
@@ -133,10 +135,10 @@ let ActionDataRepository = class ActionDataRepository extends entity_service_imp
         }
         return { finished: actionData, activated: nextAction ?? null };
     }
-    async resubmitAction(loggedInUser, mapped_entity_type, mapped_entity_id, stage_id, action_id) {
+    async resubmitAction(organization_id, mapped_entity_type, mapped_entity_id, stage_id, action_id) {
         const currentAction = await this.actionDataRepo.findOne({
             where: {
-                enterprise_id: loggedInUser.enterprise_id,
+                organization_id,
                 stage_id,
                 mapped_entity_id,
                 mapped_entity_type,
@@ -149,7 +151,7 @@ let ActionDataRepository = class ActionDataRepository extends entity_service_imp
         }
         const previousAction = await this.actionDataRepo.findOne({
             where: {
-                enterprise_id: loggedInUser.enterprise_id,
+                organization_id,
                 stage_id,
                 mapped_entity_id,
                 mapped_entity_type,
@@ -162,13 +164,13 @@ let ActionDataRepository = class ActionDataRepository extends entity_service_imp
         }
         currentAction.is_current = null;
         currentAction.modified_date = new Date();
-        currentAction.modified_by = loggedInUser.id;
+        currentAction.modified_by = organization_id;
         currentAction.start_time = null;
         currentAction.resubmit_count = (currentAction.resubmit_count ?? 0) + 1;
         await this.actionDataRepo.update(currentAction.id, currentAction);
         previousAction.is_current = 'Y';
         previousAction.modified_date = new Date();
-        previousAction.modified_by = loggedInUser.id;
+        previousAction.modified_by = organization_id;
         previousAction.end_time = null;
         previousAction.is_done = false;
         await this.actionDataRepo.update(previousAction.id, previousAction);
@@ -189,7 +191,7 @@ let ActionDataRepository = class ActionDataRepository extends entity_service_imp
                 const listMasterItem = await listMasterItemRepo.findOne({
                     where: {
                         code: 'in_progress',
-                        enterprise_id: loggedInUser.enterprise_id,
+                        organization_id: organization_id,
                         listtype: 'TKST',
                     },
                 });