rez_core 1.0.26 → 1.0.28

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

@@ -1,65 +1,65 @@
-import { BaseEntity } from './base-entity.entity';
-import { Column, Entity } from 'typeorm';
-import { ENTITYTYPE_PREFERENCEMASTER } from '../../../constant/global.constant';
-
-@Entity({ name: 'cr_preference_master' })
-export class PreferenceMaster extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_PREFERENCEMASTER;
-  }
-
-  @Column({ name: 'appcode', type: 'varchar', length: 200, nullable: true })
-  appCode: string;
-
-  @Column({
-    name: 'display_name',
-    type: 'varchar',
-    length: 200,
-    nullable: true,
-  })
-  display_name: string;
-
-  @Column({
-    name: 'preference_key',
-    type: 'varchar',
-    length: 200,
-    nullable: true,
-  })
-  preference_key: string;
-
-  @Column({
-    name: 'preference_value',
-    type: 'varchar',
-    length: 200,
-    nullable: true,
-  })
-  preference_value: string;
-
-  @Column({
-    name: 'description',
-    type: 'varchar',
-    length: 2000,
-    nullable: true,
-  })
-  description: string;
-
-  @Column({ name: 'reflect_on', type: 'varchar', length: 200, nullable: true })
-  reflect_on: string;
-
-  @Column({
-    name: 'default_value',
-    type: 'varchar',
-    length: 200,
-    nullable: true,
-  })
-  default_value: string;
-
-  @Column({
-    name: 'possible_values',
-    type: 'varchar',
-    length: 200,
-    nullable: true,
-  })
-  possible_values: string;
-}
+import { BaseEntity } from './base-entity.entity';
+import { Column, Entity } from 'typeorm';
+import { ENTITYTYPE_PREFERENCEMASTER } from '../../../constant/global.constant';
+
+@Entity({ name: 'cr_preference_master' })
+export class PreferenceMaster extends BaseEntity {
+  constructor() {
+    super();
+    this.entity_type = ENTITYTYPE_PREFERENCEMASTER;
+  }
+
+  @Column({ name: 'appcode', type: 'varchar', length: 200, nullable: true })
+  appCode: string;
+
+  @Column({
+    name: 'display_name',
+    type: 'varchar',
+    length: 200,
+    nullable: true,
+  })
+  display_name: string;
+
+  @Column({
+    name: 'preference_key',
+    type: 'varchar',
+    length: 200,
+    nullable: true,
+  })
+  preference_key: string;
+
+  @Column({
+    name: 'preference_value',
+    type: 'varchar',
+    length: 200,
+    nullable: true,
+  })
+  preference_value: string;
+
+  @Column({
+    name: 'description',
+    type: 'varchar',
+    length: 2000,
+    nullable: true,
+  })
+  description: string;
+
+  @Column({ name: 'reflect_on', type: 'varchar', length: 200, nullable: true })
+  reflect_on: string;
+
+  @Column({
+    name: 'default_value',
+    type: 'varchar',
+    length: 200,
+    nullable: true,
+  })
+  default_value: string;
+
+  @Column({
+    name: 'possible_values',
+    type: 'varchar',
+    length: 200,
+    nullable: true,
+  })
+  possible_values: string;
+}

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

@@ -19,6 +19,9 @@ import { EntityTableService } from './service/entity-table.service';
 import { EntityTableColumnRepository } from './repository/entity-table-column.repository';
 import { EntityTableColumnService } from './service/entity-table-column.service';
 import { EntityListService } from './service/entity-list.service';
+import { MediaData } from './entity/media-data.entity';
+import { MediaDataService } from './service/media-data.service';
+import { MediaDataRepository } from './repository/media-data.repository';
 
 @Module({
   imports: [
@@ -28,6 +31,7 @@ import { EntityListService } from './service/entity-list.service';
       PreferenceMaster,
       EntityTable,
       EntityTableColumn,
+      MediaData
     ]),
     UtilsModule,
   ],
@@ -43,6 +47,8 @@ import { EntityListService } from './service/entity-list.service';
     EntityTableColumnRepository,
     EntityTableColumnService,
     EntityListService,
+    MediaDataRepository,
+    MediaDataService,
   ],
   exports: [
     EntityMasterService,
@@ -50,7 +56,8 @@ import { EntityListService } from './service/entity-list.service';
     PreferenceService,
     EntityListService,
     EntityTableService,
-    EntityTableColumnService
+    EntityTableColumnService,
+    MediaDataService,
   ],
   controllers: [EntityController, MasterController],
 })

package/src/module/meta/repository/attribute-master.repository.ts

@@ -1,28 +1,28 @@
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-import { AttributeMaster } from '../entity/attribute-master.entity';
-import { Repository } from 'typeorm';
-
-@Injectable()
-export class AttributeMasterRepository {
-  constructor(
-    @InjectRepository(AttributeMaster)
-    private readonly attributeMasterRepository: Repository<AttributeMaster>,
-  ) {}
-
-  async findByMappedEntityIdAndMappedEntityTypeAndAttributeKeyAndOrganizationId(
-    mappedEntityId: number,
-    mappedEntityType: string,
-    attributeKey: string,
-    organizationId: number,
-  ): Promise<AttributeMaster | null> {
-    return await this.attributeMasterRepository.findOne({
-      where: {
-        mapped_entity_id: mappedEntityId,
-        mapped_entity_type: mappedEntityType,
-        attribute_key: attributeKey,
-        organization_id: organizationId,
-      },
-    });
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { AttributeMaster } from '../entity/attribute-master.entity';
+import { Repository } from 'typeorm';
+
+@Injectable()
+export class AttributeMasterRepository {
+  constructor(
+    @InjectRepository(AttributeMaster)
+    private readonly attributeMasterRepository: Repository<AttributeMaster>,
+  ) {}
+
+  async findByMappedEntityIdAndMappedEntityTypeAndAttributeKeyAndOrganizationId(
+    mappedEntityId: number,
+    mappedEntityType: string,
+    attributeKey: string,
+    organizationId: number,
+  ): Promise<AttributeMaster | null> {
+    return await this.attributeMasterRepository.findOne({
+      where: {
+        mapped_entity_id: mappedEntityId,
+        mapped_entity_type: mappedEntityType,
+        attribute_key: attributeKey,
+        organization_id: organizationId,
+      },
+    });
+  }
+}

package/src/module/meta/repository/media-data.repository.ts

@@ -0,0 +1,50 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { MediaData } from '../entity/media-data.entity';
+import { Repository } from 'typeorm';
+
+@Injectable()
+export class MediaDataRepository {
+  constructor(
+    @InjectRepository(MediaData)
+    private readonly mediaRepository: Repository<MediaData>,
+  ) {}
+
+  async findByAttributeKeyAndMappedEntityIdAndMappedEntityType(
+    attributeKey: string,
+    mappedEntityId: number,
+    mappedEntityType: string,
+  ) {
+    return await this.mediaRepository.findOne({
+      where: {
+        mapped_attribute_key: attributeKey,
+        mapped_entity_id: mappedEntityId,
+        mapped_entity_type: mappedEntityType,
+      },
+    });
+  }
+
+  async findByMappedEntityIdAndMappedEntityType(
+    mappedEntityId: number,
+    mappedEntityType: string,
+  ) {
+    return await this.mediaRepository.find({
+      where: {
+        mapped_entity_id: mappedEntityId,
+        mapped_entity_type: mappedEntityType,
+      },
+    });
+  }
+
+  async deleteByAttributeKeyAndMappedEntityIdAndMappedEntityType(
+    attributeKey: string,
+    mappedEntityId: number,
+    mappedEntityType: string,
+  ) {
+    return await this.mediaRepository.delete({
+      mapped_attribute_key: attributeKey,
+      mapped_entity_id: mappedEntityId,
+      mapped_entity_type: mappedEntityType,
+    });
+  }
+}

package/src/module/meta/repository/preference.repository.ts

@@ -1,20 +1,20 @@
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-import { PreferenceMaster } from '../entity/preference.entity';
-import { Repository } from 'typeorm';
-
-@Injectable()
-export class PreferenceRepository {
-  constructor(
-    @InjectRepository(PreferenceMaster)
-    private readonly preferenceRepository: Repository<PreferenceMaster>,
-  ) {}
-
-  async findByPreferenceKey(
-    preferenceKey: string,
-  ): Promise<PreferenceMaster | null> {
-    return await this.preferenceRepository.findOne({
-      where: { preference_key: preferenceKey },
-    });
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { PreferenceMaster } from '../entity/preference.entity';
+import { Repository } from 'typeorm';
+
+@Injectable()
+export class PreferenceRepository {
+  constructor(
+    @InjectRepository(PreferenceMaster)
+    private readonly preferenceRepository: Repository<PreferenceMaster>,
+  ) {}
+
+  async findByPreferenceKey(
+    preferenceKey: string,
+  ): Promise<PreferenceMaster | null> {
+    return await this.preferenceRepository.findOne({
+      where: { preference_key: preferenceKey },
+    });
+  }
+}

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

@@ -97,10 +97,10 @@ export class EntityListService {
   private getQuery(source: string, groupByColumn: string | null) {
     if (groupByColumn) {
       return `SELECT ${groupByColumn} as tab_value, COUNT(1) AS tab_value_count
-                    FROM ${source}`;
+              FROM ${source}`;
     } else {
       return `SELECT *
-                    FROM ${source}`;
+              FROM ${source}`;
     }
   }
 
@@ -145,4 +145,23 @@ export class EntityListService {
 
     return { query, argumentList: argsObjectList };
   }
+
+  public async getMaxSequenceNumber(
+    tableName: string,
+    parentType: string,
+    parentId: number,
+  ) {
+    let query = `SELECT COUNT(1) seq_no
+                 FROM ${tableName} `;
+    const argsObjectList: any[] = [];
+    if (parentId) {
+      query += `parent_id = ? AND parent_type = ? `;
+      argsObjectList.push(parentId);
+      argsObjectList.push(parentType);
+    }
+
+    let result = await this.entityManager.query(query, argsObjectList);
+
+    return result ? result[0].seq_no : 0;
+  }
 }

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

@@ -1,5 +1,5 @@
 import { EntityService } from './entity.service';
-import { Inject, Injectable } from '@nestjs/common';
+import { BadRequestException, Inject, Injectable } from '@nestjs/common';
 import { UserData } from '../../user/entity/user.entity';
 import { EntityMasterService } from './entity-master.service';
 import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
@@ -15,6 +15,7 @@ import { ExcelHelper } from '../../../utils/service/excel-helper.service';
 import { ExcelsheetData } from '../../../utils/dto/excelsheet-data.dto';
 import { EntityTableService } from './entity-table.service';
 import { EntityTableColumnService } from './entity-table-column.service';
+import { ENTITYTYPE_ENTITYMASTER } from '../../../constant/global.constant';
 
 @Injectable()
 export class EntityServiceImpl implements EntityService<BaseEntity> {
@@ -26,13 +27,14 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
   @Inject() protected readonly entityListService: EntityListService;
   @Inject() protected readonly loggingService: LoggingService;
 
-  constructor() {}
-
   async createEntity(
     entityData: BaseEntity,
     loggedInUser: UserData | null,
     manager?: EntityManager,
   ): Promise<BaseEntity> {
+    if (!entityData.entity_type) {
+      throw new BadRequestException(`EntityType is missing`);
+    }
     const entityMaster = await this.entityMasterService.getEntityData(
       entityData.entity_type,
     );
@@ -46,7 +48,17 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
         `Repository service not found for entityType: ${entityData.entity_type}`,
       );
     }
-    entityData.entity_type = entityMaster.mappedEntityType;
+
+    if (!entityData.code) {
+      let maxSeqNo = await this.getMaxSequenceNumber(
+        entityData.entity_type,
+        entityData.parent_id,
+        entityData.parent_type,
+      );
+      maxSeqNo = Number(maxSeqNo) + 1;
+      entityData.code = entityData.entity_type + maxSeqNo;
+    }
+
     entityData.created_date = new Date();
     if (loggedInUser) {
       entityData.created_by = loggedInUser.id;
@@ -86,13 +98,6 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     id: number,
   ): Promise<BaseEntity | null> {
     const entityData = await this.entityMasterService.getEntityData(entityType);
-    // this.loggingService.log(
-    //   'info',
-    //   EntityServiceImpl.name,
-    //   'GetEntity',
-    //   'STARTED',
-    //   [{ entityData }],
-    // );
 
     const repoService = this.reflectionHelper.getRepoService(
       entityData.entityDataClass,
@@ -244,4 +249,24 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
       excelData.addSheet(sheet);
     }
   }
+
+  private async getMaxSequenceNumber(
+    entityType: string,
+    parentId: number,
+    parentType: string,
+  ): Promise<number> {
+    let tableName: string;
+    if (ENTITYTYPE_ENTITYMASTER === entityType) {
+      tableName = 'cr_entity_master';
+    } else {
+      let entityMaster =
+        await this.entityMasterService.getEntityData(entityType);
+      tableName = entityMaster.dbTableName;
+    }
+    return await this.entityListService.getMaxSequenceNumber(
+      tableName,
+      parentType,
+      parentId,
+    );
+  }
 }

package/src/module/meta/service/media-data.service.ts

@@ -0,0 +1,44 @@
+import { Injectable } from '@nestjs/common';
+import { EntityServiceImpl } from './entity-service-impl.service';
+import { MediaDataRepository } from '../repository/media-data.repository';
+
+@Injectable()
+export class MediaDataService extends EntityServiceImpl {
+  constructor(private readonly mediaRepository: MediaDataRepository) {
+    super();
+  }
+
+  async findByAttributeKeyAndMappedEntityIdAndMappedEntityType(
+    attributeKey: string,
+    mappedEntityId: number,
+    mappedEntityType: string,
+  ) {
+    return await this.mediaRepository.findByAttributeKeyAndMappedEntityIdAndMappedEntityType(
+      attributeKey,
+      mappedEntityId,
+      mappedEntityType,
+    );
+  }
+
+  async findByMappedEntityIdAndMappedEntityType(
+    mappedEntityId: number,
+    mappedEntityType: string,
+  ) {
+    return await this.mediaRepository.findByMappedEntityIdAndMappedEntityType(
+      mappedEntityId,
+      mappedEntityType,
+    );
+  }
+
+  async deleteByAttributeKeyAndMappedEntityIdAndMappedEntityType(
+    attributeKey: string,
+    mappedEntityId: number,
+    mappedEntityType: string,
+  ) {
+    return await this.mediaRepository.deleteByAttributeKeyAndMappedEntityIdAndMappedEntityType(
+      attributeKey,
+      mappedEntityId,
+      mappedEntityType,
+    );
+  }
+}

package/src/module/module/controller/menu.controller.ts

@@ -1,15 +1,15 @@
-import { Controller, Get, Request, UseGuards } from '@nestjs/common';
-import { MenuService } from '../service/menu.service';
-import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
-
-@Controller('menu')
-export class MenuController {
-  constructor(private readonly menuService: MenuService) {}
-
-  @UseGuards(JwtAuthGuard)
-  @Get()
-  async getMenu(@Request() req) {
-    const userId = req.user.userId;
-    return this.menuService.getUserMenu(userId);
-  }
-}
+import { Controller, Get, Request, UseGuards } from '@nestjs/common';
+import { MenuService } from '../service/menu.service';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
+
+@Controller('menu')
+export class MenuController {
+  constructor(private readonly menuService: MenuService) {}
+
+  @UseGuards(JwtAuthGuard)
+  @Get()
+  async getMenu(@Request() req) {
+    const userId = req.user.userId;
+    return this.menuService.getUserMenu(userId);
+  }
+}

package/src/module/module/entity/menu.entity.ts

@@ -1,5 +1,4 @@
 import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-import { StatusType } from '../../../constant/status.constant';
 
 @Entity({ name: 'cr_menu' })
 export class MenuData {
@@ -13,7 +12,7 @@ export class MenuData {
   module_code: string;
 
   @Column({ type: 'varchar', length: 100, nullable: true })
-  status: StatusType;
+  status: string;
 
   @Column({ type: 'varchar', length: 100, nullable: true })
   wbs_code: string;

package/src/module/module/entity/module-access.entity.ts

@@ -1,22 +1,22 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'cr_module_access' })
-export class ModuleAccess {
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column({type: 'varchar', length: 100, nullable: true})
-  module_code: string;
-
-  @Column({type: 'varchar', length: 100, nullable: true })
-  role_code: string;
-
-  @Column({type: 'int', nullable: true })
-  access_flag: number;
-
-  @Column({type: 'varchar', length: 100, nullable: true })
-  action_type: string;
-
-  @Column({type: 'varchar', length: 100, nullable: true})
-  app_code: string;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'cr_module_access' })
+export class ModuleAccess {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({type: 'varchar', length: 100, nullable: true})
+  module_code: string;
+
+  @Column({type: 'varchar', length: 100, nullable: true })
+  role_code: string;
+
+  @Column({type: 'int', nullable: true })
+  access_flag: number;
+
+  @Column({type: 'varchar', length: 100, nullable: true })
+  action_type: string;
+
+  @Column({type: 'varchar', length: 100, nullable: true})
+  app_code: string;
+}

package/src/module/module/entity/module-action.entity.ts

@@ -1,19 +1,19 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'module_action' })
-export class ModuleAction {
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column({type: 'int', nullable: true})
-  module_id: number;
-  
-  @Column({type: 'varchar', length: 100, nullable: true })
-  module_code: string;
-  
-  @Column({type: 'varchar', length: 100, nullable: true })
-  action_name:string
-
-  @Column({type: 'varchar', length: 50, nullable: true })
-  action_type: string;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'module_action' })
+export class ModuleAction {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({type: 'int', nullable: true})
+  module_id: number;
+  
+  @Column({type: 'varchar', length: 100, nullable: true })
+  module_code: string;
+  
+  @Column({type: 'varchar', length: 100, nullable: true })
+  action_name:string
+
+  @Column({type: 'varchar', length: 50, nullable: true })
+  action_type: string;
+}

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

@@ -1,5 +1,4 @@
 import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-import { StatusType } from '../../../constant/status.constant';
 
 @Entity({ name: 'cr_module' })
 export class ModuleData {
@@ -16,7 +15,7 @@ export class ModuleData {
   wbs_code: string;
 
   @Column({ type: 'varchar', length: 100, nullable: true })
-  status: StatusType;
+  status: string;
 
   @Column({ type: 'varchar', length: 100, nullable: true })
   module_level: string;

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

@@ -1,12 +1,17 @@
 import { BadRequestException, Body, Controller, HttpCode, HttpStatus, Post, Query } from '@nestjs/common';
 import { OtpService } from '../service/otp.service';
+import { ConfigService } from '@nestjs/config';
 
 @Controller('otp')
 export class OtpController{
-  otpExpiry = process.env.otp_expiry || '2';
-  otpLength = process.env.otp_length || '6';
-  constructor(private readonly otpService: OtpService) {
+
+  constructor(private readonly otpService: OtpService,
+    private configService: ConfigService,
+  ) {
   }
+  
+  otpExpiry = this.configService.get('OTP_EXPIRY')|| '2';
+  otpLength = this.configService.get('OTP_LENGTH')|| '6';
 
   @Post('generate')
   @HttpCode(HttpStatus.OK)