rez_core 0.0.6 → 1.0.7

package/package.json

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

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

@@ -7,6 +7,7 @@ import { BaseEntity } from '../entity/base-entity.entity';
 import { LoggingService } from '../../../utils/service/loggingUtil.service';
 import { EntityListData } from '../dto/entity-list-data.dto';
 import { EntityListService } from './entity-list.service';
+import { EntityManager } from 'typeorm';
 
 @Injectable()
 export class EntityServiceImpl implements EntityService<BaseEntity> {
@@ -20,15 +21,17 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
   async createEntity(
     entityData: BaseEntity,
     loggedInUser: UserData | null,
+    manager?: EntityManager
   ): Promise<BaseEntity> {
     const entityMaster = await this.entityMasterService.getEntityData(
       entityData.entity_type,
     );
 
-    const repoService = this.reflectionHelper.getRepoService(
-      entityMaster.entityDataClass,
-    );
-    if (!repoService) {
+    const repo = manager
+      ? manager.getRepository(entityMaster.entityDataClass) // <-- Use transaction-safe repo
+      : this.reflectionHelper.getRepoService(entityMaster.entityDataClass);
+
+    if (!repo) {
       throw new Error(
         `Repository service not found for entityType: ${entityData.entity_type}`,
       );
@@ -39,7 +42,7 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
       entityData.created_by = loggedInUser.id;
     }
 
-    const savedEntity = repoService.save(entityData);
+    const savedEntity = repo.save(entityData);
     return savedEntity;
   }
 

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

@@ -1,9 +1,10 @@
 import { UserData } from '../../user/entity/user.entity';
 import { BaseEntity } from '../entity/base-entity.entity';
 import { EntityListData } from '../dto/entity-list-data.dto';
+import { EntityManager } from 'typeorm';
 
 export interface EntityService<T extends BaseEntity> {
-  createEntity(entityData: T, loggedInUser: UserData): Promise<BaseEntity>;
+  createEntity(entityData: T, loggedInUser: UserData, manager?: EntityManager): Promise<BaseEntity>;
 
   getEntityData(
     entityType: string,

package/src/module/user/dto/update-user.dto.ts

@@ -0,0 +1,4 @@
+import { PartialType } from '@nestjs/mapped-types';
+import { CreateUserDto } from './create-user.dto';
+
+export class UpdateUserDto extends PartialType(CreateUserDto) {}

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

@@ -16,6 +16,8 @@ import { UserRoleMappingService } from './user-role-mapping.service';
 import { UserRoleMapping } from '../entity/user-role-mapping.entity';
 import { plainToInstance } from 'class-transformer';
 import { EntityListService } from '../../meta/service/entity-list.service';
+import { EntityManager } from 'typeorm';
+import {UpdateUserDto} from "../dto/update-user.dto";
 
 
 
@@ -43,6 +45,7 @@ export class UserService extends EntityServiceImpl {
   async createEntity(
     entityData: BaseEntity,
     loggedInUser: UserData | null,
+    manager?: EntityManager,
   ): Promise<BaseEntity> {
     let userData = entityData as CreateUserDto;
     let existingUser = await this.userRepository.findByEmailId(
@@ -118,7 +121,7 @@ export class UserService extends EntityServiceImpl {
     entityData: BaseEntity,
     loggedInUserData: UserData,
   ): Promise<BaseEntity> {
-    let userDto = entityData as CreateUserDto;
+    let userDto = entityData as UpdateUserDto;
 
     if (userDto.password) {
       const password = EncryptUtilService.encryptGCM(
@@ -129,9 +132,7 @@ export class UserService extends EntityServiceImpl {
       userDto.password = password;
     }
 
-    let userData = plainToInstance(UserData, userDto, {
-      excludeExtraneousValues: true,
-    });
+    let userData = plainToInstance(UserData, userDto);
     let savedData = await super.updateEntity(userData, loggedInUserData);
     if (userDto.roles) {
       let roles = userDto.roles;