rez_core 2.1.121 → 2.1.123

package/package.json

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

package/src/constant/global.constant.ts

@@ -26,6 +26,10 @@ export const STATUS_ACTIVE = 'STATUS_ACTIVE';
 export const STATUS_INACTIVE = 'STATUS_INACTIVE';
 export const STATUS_PENDING = 'PENDING';
 
+// Invitation Status
+export const INVITATION_STATUS_SENT = 'SENT';
+export const INVITATION_STATUS_ACCEPTED = 'ACCEPTED';
+
 // Entity Status
 export const ENTITYSTATUS_TO_BE_PUBLISHED = 'to_be_published';
 export const ENTITYSTATUS_PUBLISHED = 'published';

package/src/module/master/controller/master.controller.ts

@@ -19,7 +19,7 @@ import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.s
 import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
 
 @Controller('master')
-// @UseGuards(JwtAuthGuard)
+@UseGuards(JwtAuthGuard)
 export class MasterController {
   constructor(
     private readonly masterService: MasterService,

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

@@ -1,9 +1,10 @@
 import { Module } from '@nestjs/common';
 import { ResolverService } from './service/resolver.service';
+import { ResolverController } from './controller/resolver.controller';
 
 @Module({
   imports: [],
-  controllers: [],
+  controllers: [ResolverController],
   providers: [ResolverService],
   exports: [ResolverService],
 })

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

@@ -1,16 +1,19 @@
 import { BadRequestException, Inject, Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import { InjectRepository } from '@nestjs/typeorm';
+import {
+  INVITATION_STATUS_ACCEPTED,
+  STATUS_ACTIVE,
+} from 'src/constant/global.constant';
 import { OrganizationRepository } from 'src/module/enterprise/repository/organization.repository';
+import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
+import { DataSource, Repository } from 'typeorm';
 import { EncryptUtilService } from '../../../utils/service/encryptUtil.service';
 import { Role } from '../entity/role.entity';
 import { UserRoleMapping } from '../entity/user-role-mapping.entity';
 import { UserData } from '../entity/user.entity';
 import { UserSessionService } from './user-session.service';
 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 {
@@ -34,7 +37,7 @@ export class LoginService {
   async login(email: string, password: string) {
     const user = await this.userService.findByEmailId(email);
 
-    console.log(user," user data");
+    console.log(user, ' user data');
     if (!user) {
       return {
         success: false,
@@ -46,14 +49,14 @@ export class LoginService {
       user.organization_id,
     );
 
-    console.log(userOrgData ," user org data");
+    console.log(userOrgData, ' user org data');
 
     const resolveStatus = await this.listMasterService.getResolvedListCode(
       STATUS_ACTIVE,
       user?.organization_id || 0,
     );
 
-    console.log(resolveStatus," resolve status");
+    console.log(resolveStatus, ' resolve status');
 
     if (
       user.status != resolveStatus.id ||
@@ -110,8 +113,14 @@ export class LoginService {
       defaultAccess,
     );
 
+    const resolvedInvitationStatus =
+      await this.listMasterService.getResolvedListCode(
+        INVITATION_STATUS_ACCEPTED,
+        user?.organization_id || 0,
+      );
+
     if (user.is_firstlogin === 1) {
-      user.invitation_status = 'ACCEPTED';
+      user.invitation_status = resolvedInvitationStatus.id;
       user.is_firstlogin = 0;
       const { password, ...userWithoutPassword } = user;
       await this.userService.updateEntity(userWithoutPassword, user);

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

@@ -9,6 +9,7 @@ import { ClockIDGenService } from '../../../utils/service/clockIDGenUtil.service
 import {
   ENTITYTYPE_ROLE,
   STATUS_ACTIVE,
+  INVITATION_STATUS_SENT,
 } from '../../../constant/global.constant';
 import { CreateUserDto } from '../dto/create-user.dto';
 import { UserRoleMappingService } from './user-role-mapping.service';
@@ -66,6 +67,12 @@ export class UserService extends EntityServiceImpl {
       loggedInUser?.organization_id || 0,
     );
 
+    const resolvedInvitationStatus =
+      await this.listMasterService.getResolvedListCode(
+        INVITATION_STATUS_SENT,
+        loggedInUser?.organization_id || 0,
+      );
+
     userData.name = (userData.first_name || '') + (userData.last_name || '');
     userData.password = EncryptUtilService.encryptGCM(
       userData.password || 'Admin@123',
@@ -74,7 +81,7 @@ export class UserService extends EntityServiceImpl {
     );
     userData.is_firstlogin = 1;
     userData.roles = [];
-    userData.invitation_status = 'SENT';
+    userData.invitation_status = resolvedInvitationStatus.id;
     userData.status = resolveStatus.id || 'ACTIVE';
 
     const savedData = await super.createEntity(userData, loggedInUser);