rez_core 2.0.73 → 2.0.75

package/package.json

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

package/src/module/enterprise/entity/enterprise.entity.ts

@@ -23,10 +23,10 @@ export class EnterpriseData {
   @Column({ name: 'modified_by', type: 'int', nullable: true })
   modified_by: number;
 
-  @Column({ name: 'created_date', type: 'datetime', nullable: true })
+  @Column({ name: 'created_date', nullable: true })
   created_date: Date;
 
-  @Column({ name: 'modified_date', type: 'datetime', nullable: true })
+  @Column({ name: 'modified_date', nullable: true })
   modified_date: Date;
 
   @Column({ name: 'appcode', type: 'varchar', nullable: true, length: 50 })

package/src/module/filter/service/filter.service.ts

@@ -297,7 +297,7 @@ export class FilterService {
       case 'contains':
         return {
           query: `LOWER(e.${attr}) LIKE :${key}`,
-          params: { [key]: `%${val.toLowerCase()}%` },
+          params: { [key]: `%${val?val.toLowerCase():""}%` },
         };
       case 'equal':
         return {

package/src/module/meta/entity/base-entity.entity.ts

@@ -40,7 +40,6 @@ export class BaseEntity {
 
   @Column({
     name: 'created_date',
-    type: 'datetime',
     nullable: true,
   })
   @Expose()
@@ -50,7 +49,7 @@ export class BaseEntity {
   @Expose()
   modified_by: number;
 
-  @Column({ name: 'modified_date', type: 'datetime', nullable: true })
+  @Column({ name: 'modified_date',  nullable: true })
   @Expose()
   modified_date: Date;
 

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

@@ -36,7 +36,6 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     manager?: EntityManager | null,
     appcode?: string,
   ) {
-
     if (!entityData.entity_type) {
       throw new BadRequestException(`EntityType is missing`);
     }
@@ -85,6 +84,7 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
         entityData.enterprise_id = loggedInUser.enterprise_id;
       if (!entityData.level_type)
         entityData.level_type = loggedInUser.level_type;
+
       if (!entityData.level_id) entityData.level_id = loggedInUser.level_id;
     }
 

package/src/module/notification/entity/otp.entity.ts

@@ -17,10 +17,10 @@ export class Otp {
   @Column({ name: 'identifier', type: 'varchar', nullable: true })
   identifier: string;
 
-  @Column({ name: 'created_date', type: 'datetime', nullable: true })
+  @Column({ name: 'created_date', nullable: true })
   created_date: Date;
 
-  @Column({name: 'expiration_date', type: 'datetime'})
+  @Column({name: 'expiration_date'})
   expiration_date: Date;
 
   @Column({name: 'verified', type: 'int', nullable: true})

package/src/module/third-party-module/entity/third-party-api-registry.entity.ts

@@ -38,10 +38,10 @@ export class ThirdPartyApiRegistry {
   @Column({ nullable: true })
   is_active: number;
 
-  @Column({ nullable: true, type: 'datetime' })
+  @Column({ nullable: true })
   created_date: Date;
 
-  @Column({ nullable: true, type: 'datetime' })
+  @Column({ nullable: true })
   modified_date: Date;
 
   @Column({ nullable: true})

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

@@ -36,8 +36,10 @@ export class RoleService extends EntityServiceImpl {
     if (
       await this.roleRepository.isRoleNameWithLevelExists(role.name, {
         organization_id: loggedInUser?.organization_id || undefined,
-        level_type: loggedInUser?.level_type,
-        level_id: parseInt(loggedInUser?.level_id || '', 10),
+        level_type: entityData.level_type || loggedInUser?.level_type,
+        level_id:
+          parseInt(entityData.level_id) ||
+          parseInt(loggedInUser?.level_id || '', 10),
       })
     ) {
       throw new BadRequestException('Role code already exists.');