rez_core 2.1.133 → 2.2.1

package/dist/utils/service/wbsCodeGen.service.d.ts

@@ -0,0 +1,3 @@
+export declare class WBSCodeGenService {
+    padCode(num: number): string;
+}

package/dist/{module/enterprise/service/school.service.js → utils/service/wbsCodeGen.service.js}

@@ -6,13 +6,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SchoolService = void 0;
+exports.WBSCodeGenService = void 0;
 const common_1 = require("@nestjs/common");
-const entity_service_impl_service_1 = require("../../meta/service/entity-service-impl.service");
-let SchoolService = class SchoolService extends entity_service_impl_service_1.EntityServiceImpl {
+let WBSCodeGenService = class WBSCodeGenService {
+    padCode(num) {
+        return num.toString().padStart(5, '0');
+    }
 };
-exports.SchoolService = SchoolService;
-exports.SchoolService = SchoolService = __decorate([
+exports.WBSCodeGenService = WBSCodeGenService;
+exports.WBSCodeGenService = WBSCodeGenService = __decorate([
     (0, common_1.Injectable)()
-], SchoolService);
-//# sourceMappingURL=school.service.js.map
+], WBSCodeGenService);
+//# sourceMappingURL=wbsCodeGen.service.js.map

package/dist/utils/service/wbsCodeGen.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wbsCodeGen.service.js","sourceRoot":"","sources":["../../../src/utils/service/wbsCodeGen.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AAG7C,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC5B,OAAO,CAAC,GAAW;QACjB,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACzC,CAAC;CACF,CAAA;AAJY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;GACA,iBAAiB,CAI7B"}

package/dist/utils/utils.module.js

@@ -12,14 +12,27 @@ const loggingUtil_service_1 = require("./service/loggingUtil.service");
 const reflection_helper_service_1 = require("./service/reflection-helper.service");
 const excelUtil_service_1 = require("./service/excelUtil.service");
 const clockIDGenUtil_service_1 = require("./service/clockIDGenUtil.service");
+const wbsCodeGen_service_1 = require("./service/wbsCodeGen.service");
 let UtilsModule = class UtilsModule {
 };
 exports.UtilsModule = UtilsModule;
 exports.UtilsModule = UtilsModule = __decorate([
     (0, common_1.Global)(),
     (0, common_1.Module)({
-        providers: [loggingUtil_service_1.LoggingService, reflection_helper_service_1.ReflectionHelper, excelUtil_service_1.ExcelUtil, clockIDGenUtil_service_1.ClockIDGenService],
-        exports: [loggingUtil_service_1.LoggingService, reflection_helper_service_1.ReflectionHelper, excelUtil_service_1.ExcelUtil, clockIDGenUtil_service_1.ClockIDGenService],
+        providers: [
+            loggingUtil_service_1.LoggingService,
+            reflection_helper_service_1.ReflectionHelper,
+            excelUtil_service_1.ExcelUtil,
+            clockIDGenUtil_service_1.ClockIDGenService,
+            wbsCodeGen_service_1.WBSCodeGenService,
+        ],
+        exports: [
+            loggingUtil_service_1.LoggingService,
+            reflection_helper_service_1.ReflectionHelper,
+            excelUtil_service_1.ExcelUtil,
+            clockIDGenUtil_service_1.ClockIDGenService,
+            wbsCodeGen_service_1.WBSCodeGenService,
+        ],
     })
 ], UtilsModule);
 //# sourceMappingURL=utils.module.js.map

package/dist/utils/utils.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.module.js","sourceRoot":"","sources":["../../src/utils/utils.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAgD;AAChD,uEAA+D;AAC/D,mFAAuE;AACvE,mEAAwD;AACxD,6EAAqE;AAO9D,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,kCAAW;sBAAX,WAAW;IALvB,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC;QACN,SAAS,EAAE,CAAC,oCAAc,EAAE,4CAAgB,EAAE,6BAAS,EAAE,0CAAiB,CAAC;QAC3E,OAAO,EAAE,CAAC,oCAAc,EAAE,4CAAgB,EAAE,6BAAS,EAAE,0CAAiB,CAAC;KAC1E,CAAC;GACW,WAAW,CAAG"}
+{"version":3,"file":"utils.module.js","sourceRoot":"","sources":["../../src/utils/utils.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAgD;AAChD,uEAA+D;AAC/D,mFAAuE;AACvE,mEAAwD;AACxD,6EAAqE;AACrE,qEAAiE;AAmB1D,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,kCAAW;sBAAX,WAAW;IAjBvB,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC;QACN,SAAS,EAAE;YACT,oCAAc;YACd,4CAAgB;YAChB,6BAAS;YACT,0CAAiB;YACjB,sCAAiB;SAClB;QACD,OAAO,EAAE;YACP,oCAAc;YACd,4CAAgB;YAChB,6BAAS;YACT,0CAAiB;YACjB,sCAAiB;SAClB;KACF,CAAC;GACW,WAAW,CAAG"}

package/package.json

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

package/src/module/enterprise/controller/organization.controller.ts

@@ -1,9 +1,8 @@
 import { Controller, Get, Inject, Req, UseGuards } from '@nestjs/common';
-import { OrganizationService } from '../service/organization.service';
 import { Request } from 'express';
 import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
 import { UserService } from 'src/module/user/service/user.service';
-import { ENTITYTYPE_USER } from '../../../constant/global.constant';
+import { OrganizationService } from '../service/organization.service';
 
 @Controller('organization')
 export class OrganizationController {

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

@@ -1,29 +1,19 @@
 import { forwardRef, Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { OrganizationService } from './service/organization.service';
-import { OrganizationData } from './entity/organization.entity';
-import { OrganizationController } from './controller/organization.controller';
 import { UserModule } from '../user/user.module';
-import { OrganizationAppMappingService } from './service/organization-app-mapping.service';
+import { OrganizationController } from './controller/organization.controller';
 import { OrganizationAppMapping } from './entity/organization-app-mapping.entity';
-import { BrandData } from './entity/brand.entity';
-import { SchoolData } from './entity/school.entity';
-import { BrandRepository } from './repository/brand.repository';
-import { SchoolRepository } from './repository/school.repository';
+import { OrganizationData } from './entity/organization.entity';
+import { OrganizationAppMappingService } from './service/organization-app-mapping.service';
+import { OrganizationService } from './service/organization.service';
 import { UtilsModule } from 'src/utils/utils.module';
-import { BrandService } from './service/brand.service';
-import { OrganizationRepository } from './repository/organization.repository';
-import { SchoolService } from './service/school.service';
 import { EntityModule } from '../meta/entity.module';
+import { OrganizationRepository } from './repository/organization.repository';
+import { SchoolRepository } from './repository/school.repository';
 
 @Module({
   imports: [
-    TypeOrmModule.forFeature([
-      OrganizationData,
-      OrganizationAppMapping,
-      BrandData,
-      SchoolData,
-    ]),
+    TypeOrmModule.forFeature([OrganizationData, OrganizationAppMapping]),
     forwardRef(() => UserModule),
     UtilsModule,
     EntityModule,
@@ -32,17 +22,8 @@ import { EntityModule } from '../meta/entity.module';
   providers: [
     OrganizationService,
     OrganizationAppMappingService,
-    BrandRepository,
     SchoolRepository,
     OrganizationRepository,
-    {
-      provide: 'BrandService',
-      useClass: BrandService,
-    },
-    {
-      provide: 'SchoolService',
-      useClass: SchoolService,
-    },
   ],
   exports: [OrganizationService, OrganizationRepository],
 })

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

@@ -83,4 +83,7 @@ export class OrganizationData {
 
   @Column({ name: 'type', nullable: true })
   type: string;
+
+  @Column({ name: 'wbs_code', nullable: true })
+  wbs_code: string;
 }

package/src/module/enterprise/repository/school.repository.ts

@@ -1,27 +1,29 @@
 import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
+// import { InjectRepository } from '@nestjs/typeorm';
 import { DataSource, Repository } from 'typeorm';
-import { SchoolData } from '../entity/school.entity';
+// import { SchoolData } from '../entity/school.entity';
 import { UserRoleMapping } from 'src/module/user/entity/user-role-mapping.entity';
 
 @Injectable()
 export class SchoolRepository {
-  constructor(
-    @InjectRepository(SchoolData)
-    private readonly schoolRepo: Repository<SchoolData>,
-    private readonly dataSource: DataSource,
-  ) {}
-
-  async findAllByOrgId(brdId: number): Promise<SchoolData[]> {
-    return await this.schoolRepo.find({
-      where: { brand_id: brdId },
-    });
+  constructor(private readonly dataSource: DataSource) {}
+
+  async findAllByOrgId(orgId: number): Promise<any[]> {
+    return await this.dataSource
+      .createQueryBuilder()
+      .select(['*'])
+      .from('eth_school_profile', 'sch')
+      .where('sch.organization_id = :orgId', { orgId })
+      .getRawMany();
   }
 
-  async findAllByBrandId(brdId: number): Promise<SchoolData[]> {
-    return await this.schoolRepo.find({
-      where: { brand_id: brdId },
-    });
+  async findAllByBrandId(brdId: number): Promise<any[]> {
+    return await this.dataSource
+      .createQueryBuilder()
+      .select(['*'])
+      .from('eth_school_profile', 'sch')
+      .where('sch.brand_id = :brdId', { brdId })
+      .getRawMany();
   }
 
   async getUserContextDropdown(userId: number, appCode: string, org_id) {
@@ -34,6 +36,8 @@ export class SchoolRepository {
       .andWhere('urm.level_type = :levelType', { levelType: 'ORG' })
       .getRawMany();
 
+    console.log('hasOrgAccess', hasOrgAccess);
+
     let currentORGLevel_id = hasOrgAccess[0]?.urm_level_id;
     if (hasOrgAccess[0]?.urm_level_id == 1) {
       currentORGLevel_id = org_id;
@@ -47,18 +51,27 @@ export class SchoolRepository {
           'org.name AS org_name',
           'org.address AS org_address',
           'org.status AS org_status',
-          'br.id AS brand_id',
-          'br.name AS brand_name',
-          'br.status AS brand_status',
-          'sch.id AS school_id',
-          'sch.name AS school_name',
-          'sch.location AS school_location',
-          'sch.status AS school_status',
+
+          'brn.id AS brand_id',
+          'brand_profile.name AS brand_name',
+          'brand_profile.status AS brand_status',
+
+          'school.id AS school_id',
+          'school.name AS school_name',
+          'school.location AS school_location',
+          'school.status AS school_status',
         ])
-        .from('cr_school', 'sch')
-        .innerJoin('cr_brand', 'br', 'sch.brand_id = br.id')
-        .innerJoin('cr_organization', 'org', 'br.organization_id = org.id')
-        .where('org.id = :orgId', { orgId: currentORGLevel_id })
+        .from('cr_organization', 'org')
+        .innerJoin('cr_organization', 'brn', "brn.type = 'BRN'")
+        .innerJoin(
+          'eth_brand_profile',
+          'brand_profile',
+          'brand_profile.parent_id = brn.id AND brand_profile.organization_id = org.id',
+        )
+        .innerJoin('eth_school_profile', 'school', 'school.brand_id = brn.id')
+        .where('org.id = :orgId', {
+          orgId: currentORGLevel_id,
+        })
         .getRawMany();
 
       if (schools.length > 0) {
@@ -175,8 +188,8 @@ export class SchoolRepository {
           'school.status AS school_status',
         ])
         .from('cr_user_role_mapping', 'urm')
-        .innerJoin('cr_brand', 'brand', 'brand.id = urm.level_id')
-        .innerJoin('cr_school', 'school', 'school.brand_id = brand.id')
+        .innerJoin('cr_organization', 'brand', 'brand.id = urm.level_id')
+        .innerJoin('eth_school_profile', 'school', 'school.brand_id = brand.id')
         .where('urm.user_id = :userId', { userId })
         .andWhere('urm.appcode = :appCode', { appCode })
         .andWhere('urm.level_type = :levelType', { levelType: 'BRN' })
@@ -194,8 +207,8 @@ export class SchoolRepository {
           'school.status AS school_status',
         ])
         .from('cr_user_role_mapping', 'urm')
-        .innerJoin('cr_school', 'school', 'school.id = urm.level_id')
-        .innerJoin('cr_brand', 'brand', 'brand.id = school.brand_id')
+        .innerJoin('eth_school_profile', 'school', 'school.id = urm.level_id')
+        .innerJoin('cr_organization', 'brand', 'brand.id = school.brand_id')
         .where('urm.user_id = :userId', { userId })
         .andWhere('urm.appcode = :appCode', { appCode })
         .andWhere('urm.level_type = :levelType', { levelType: 'SCH' })

package/src/module/enterprise/service/brand.service.ts

@@ -1,4 +1,5 @@
 import { Injectable } from '@nestjs/common';
+import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
 
 @Injectable()
-export class BrandService {}
+export class BrandService extends EntityServiceImpl {}

package/src/module/enterprise/service/organization.service.ts

@@ -1,11 +1,10 @@
-import { Inject, Injectable } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { EntityManager, Repository } from 'typeorm';
-import { OrganizationData } from '../entity/organization.entity';
 import { ClockIDGenService } from 'src/utils/service/clockIDGenUtil.service';
-import { UserService } from 'src/module/user/service/user.service';
-import { ENTITYTYPE_USER } from 'src/constant/global.constant';
-import { BrandRepository } from '../repository/brand.repository';
+import { EntityManager, IsNull, Repository } from 'typeorm';
+import { OrganizationData } from '../entity/organization.entity';
+// import { BrandRepository } from '../repository/brand.repository';
+import { WBSCodeGenService } from 'src/utils/service/wbsCodeGen.service';
 import { SchoolRepository } from '../repository/school.repository';
 
 @Injectable()
@@ -13,10 +12,9 @@ export class OrganizationService {
   constructor(
     @InjectRepository(OrganizationData)
     private readonly organizationRepository: Repository<OrganizationData>,
-    private readonly brandRepository: BrandRepository,
-    private readonly schoolRepository: SchoolRepository,
     private readonly idGen: ClockIDGenService,
-    @Inject('UserService') private readonly userService: UserService,
+    private readonly wbcCodeGenService: WBSCodeGenService,
+    private readonly schoolRepository: SchoolRepository,
   ) {}
 
   async create(
@@ -27,9 +25,64 @@ export class OrganizationService {
       ? manager.getRepository(OrganizationData)
       : this.organizationRepository;
 
+    const isBrand = organizationDto.type === 'BRN';
+
+    if (isBrand) {
+      // BRN case
+      const parentOrgId = organizationDto.parent_id;
+
+      if (!parentOrgId) {
+        throw new Error('Parent Org ID is required to create a brand.');
+      }
+
+      const parentOrg = await repo.findOne({
+        where: { id: parentOrgId },
+      });
+
+      if (!parentOrg) {
+        throw new Error('Parent organization not found.');
+      }
+
+      const existingBrands = await repo.find({
+        where: {
+          type: 'BRN',
+          parent_id: parentOrgId,
+        },
+        select: ['wbs_code'],
+      });
+
+      const brandCodes = existingBrands
+        .map((b) => b.wbs_code?.split('.')[1])
+        .filter(Boolean)
+        .map(Number);
+
+      const nextBrnCode = brandCodes.length ? Math.max(...brandCodes) + 1 : 1;
+
+      const brnWbsCode = this.wbcCodeGenService.padCode(nextBrnCode);
+      organizationDto.wbs_code = `${parentOrg.wbs_code}.${brnWbsCode}`;
+    } else {
+      // ORG case
+      const existingOrgs = await repo.find({
+        where: {
+          type: IsNull(),
+        },
+        select: ['wbs_code'],
+      });
+
+      const orgCodes = existingOrgs
+        .map((org) => org.wbs_code)
+        .filter(Boolean)
+        .map(Number);
+
+      const nextOrgCode = orgCodes.length ? Math.max(...orgCodes) + 1 : 1;
+
+      organizationDto.wbs_code = this.wbcCodeGenService.padCode(nextOrgCode);
+    }
+
     organizationDto.code = this.idGen.idGenerator('ORG');
-    organizationDto.status = 'ACTIVE';
+    // organizationDto.status = 'ACTIVE';
     organizationDto.created_date = new Date();
+
     const organization = repo.create(organizationDto);
     return await repo.save(organization);
   }

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

@@ -163,7 +163,7 @@ export class FilterService {
     // layout preference query
     const layoutPreference = await this.dataSource.query(
       `SELECT layout_json
-      FROM cr_layout_preference
+      FROM cr_entity_layout_pref
       WHERE user_id = ? AND mapped_entity_type = ?`,
       [user_id, entity_type],
     );

package/src/module/layout_preference/controller/layout_preference.controller.ts

@@ -31,13 +31,13 @@ export class LayoutPreferenceController {
     @Query('sort_by') sort_by: string,
     @Req() req: Request & { user: any },
   ) {
-    const loggedInUser = req.user.userData;
+    const userData = req.user.userData;
 
     return this.layoutPreferenceService.getColumnValue(
       entity_type,
       column,
       sort_by,
-      loggedInUser,
+      userData,
     );
   }
 }

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

@@ -1,7 +1,7 @@
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
 
-@Entity({ name: 'cr_layout_preference' })
+@Entity({ name: 'cr_entity_layout_pref' })
 export class LayoutPreference extends BaseEntity {
   @Column({ length: 50, nullable: true })
   user_id: string;

package/src/module/layout_preference/service/layout_preference.service.ts

@@ -77,13 +77,6 @@ export class LayoutPreferenceService extends EntityServiceImpl {
         .addSelect(`COUNT(*) AS count`)
         .from(tableName, tableName)
         .where(`${column} IS NOT NULL`)
-        .andWhere(`organization_id = :organizationId`, {
-          organizationId: loggedInUser?.organization_id,
-        })
-        .andWhere(`level_id = :levelId`, { levelId: loggedInUser?.level_id })
-        .andWhere(`level_type = :levelType`, {
-          levelType: loggedInUser?.level_type,
-        })
         .groupBy(column)
         .getRawMany();
 

package/src/module/lead/lead.module.ts

@@ -4,13 +4,9 @@ import { LeadService } from './service/lead.service';
 import { LeadRepository } from './repository/lead.repository';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { OrganizationData } from '../enterprise/entity/organization.entity';
-import { BrandData } from '../enterprise/entity/brand.entity';
-import { SchoolData } from '../enterprise/entity/school.entity';
 
 @Module({
-  imports: [
-    TypeOrmModule.forFeature([OrganizationData, BrandData, SchoolData]),
-  ],
+  imports: [TypeOrmModule.forFeature([OrganizationData])],
   providers: [LeadService, LeadRepository],
   controllers: [],
   exports: [LeadService],

package/src/module/lead/repository/lead.repository.ts

@@ -1,37 +1,41 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { BrandData } from 'src/module/enterprise/entity/brand.entity';
+// import { BrandData } from 'src/module/enterprise/entity/brand.entity';
 import { OrganizationData } from 'src/module/enterprise/entity/organization.entity';
-import { SchoolData } from 'src/module/enterprise/entity/school.entity';
-import { Repository } from 'typeorm';
+// import { SchoolData } from 'src/module/enterprise/entity/school.entity';
+import { DataSource, Repository } from 'typeorm';
 
 @Injectable()
 export class LeadRepository {
   constructor(
     @InjectRepository(OrganizationData)
     private organizationRepository: Repository<OrganizationData>,
-    @InjectRepository(BrandData)
-    private brandRepository: Repository<BrandData>,
-    @InjectRepository(SchoolData)
-    private schoolRepository: Repository<SchoolData>,
+    private readonly dataSource: DataSource,
   ) {}
 
   async getAllOrganizations(): Promise<OrganizationData[]> {
     return this.organizationRepository.find();
   }
 
-  async getBrandsByOrganization(organization_id: number): Promise<BrandData[]> {
-    return this.brandRepository.find({
-      where: { organization_id },
-    });
+  async getBrandsByOrganization(organization_id: number): Promise<any[]> {
+    return await this.dataSource
+      .createQueryBuilder()
+      .select(['*'])
+      .from('eth_brand_profile', 'brd')
+      .where('brd.organization_id = :orgId', { orgId: organization_id })
+      .getRawMany();
   }
 
   async getSchoolsByBrandAndOrganization(
     brand_id: number,
     organization_id: number,
-  ): Promise<SchoolData[]> {
-    return this.schoolRepository.find({
-      where: { brand_id, organization_id },
-    });
+  ): Promise<any[]> {
+    return await this.dataSource
+      .createQueryBuilder()
+      .select(['*'])
+      .from('eth_school_profile', 'sch')
+      .where('sch.brand_id = :brdId', { brdId: brand_id })
+      .andWhere('sch.organization_id = :orgId', { orgId: organization_id })
+      .getRawMany();
   }
 }

package/src/module/meta/entity/brand-profile.entity.ts

@@ -0,0 +1,5 @@
+import { Entity } from 'typeorm';
+import { BaseEntity } from './base-entity.entity';
+
+@Entity({ name: 'eth_brand_profile' })
+export class BrandProfile extends BaseEntity {}

package/src/module/meta/entity/field-group.entity.ts

@@ -1,25 +1,25 @@
-import { ENTITYTYPE_FIELDMASTER } from 'src/constant/global.constant';
-import { BaseEntity } from './base-entity.entity';
-import { Column, Entity } from 'typeorm';
+// import { ENTITYTYPE_FIELDMASTER } from 'src/constant/global.constant';
+// import { BaseEntity } from './base-entity.entity';
+// import { Column, Entity } from 'typeorm';
 
-@Entity({ name: 'cr_field_group' })
-export class FieldGroup extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_FIELDMASTER;
-  }
-  @Column({ length: 50, nullable: true })
-  mapped_entity_type: string;
+// @Entity({ name: 'cr_field_group' })
+// export class FieldGroup extends BaseEntity {
+//   constructor() {
+//     super();
+//     this.entity_type = ENTITYTYPE_FIELDMASTER;
+//   }
+//   @Column({ length: 50, nullable: true })
+//   mapped_entity_type: string;
 
-  @Column({ length: 50, nullable: true })
-  field_type: string;
+//   @Column({ length: 50, nullable: true })
+//   field_type: string;
 
-  @Column({ nullable: true })
-  description: string;
+//   @Column({ nullable: true })
+//   description: string;
 
-  @Column({ type: 'varchar', nullable: true })
-  label: string;
+//   @Column({ type: 'varchar', nullable: true })
+//   label: string;
 
-  @Column({ type: 'int', nullable: true })
-  view_id: number;
-}
+//   @Column({ type: 'int', nullable: true })
+//   view_id: number;
+// }

package/src/module/meta/entity/section-master.entity.ts

@@ -1,28 +1,28 @@
-import { ENTITYTYPE_SECTIONMASTER } from 'src/constant/global.constant';
-import { BaseEntity } from './base-entity.entity';
-import { Column, Entity } from 'typeorm';
+// import { ENTITYTYPE_SECTIONMASTER } from 'src/constant/global.constant';
+// import { BaseEntity } from './base-entity.entity';
+// import { Column, Entity } from 'typeorm';
 
-@Entity({ name: 'cr_section_master' })
-export class SectionMaster extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_SECTIONMASTER;
-  }
-  @Column({ length: 50, nullable: true })
-  mapped_entity_type: string;
+// @Entity({ name: 'cr_section_master' })
+// export class SectionMaster extends BaseEntity {
+//   constructor() {
+//     super();
+//     this.entity_type = ENTITYTYPE_SECTIONMASTER;
+//   }
+//   @Column({ length: 50, nullable: true })
+//   mapped_entity_type: string;
 
-  @Column({ length: 50, nullable: true })
-  section_type: string;
+//   @Column({ length: 50, nullable: true })
+//   section_type: string;
 
-  @Column({ nullable: true })
-  description: string;
+//   @Column({ nullable: true })
+//   description: string;
 
-  @Column({ type: 'varchar', nullable: true })
-  tooltip: string;
+//   @Column({ type: 'varchar', nullable: true })
+//   tooltip: string;
 
-  @Column({ type: 'int', nullable: true })
-  visible_in_add: number;
+//   @Column({ type: 'int', nullable: true })
+//   visible_in_add: number;
 
-  @Column({ type: 'int', nullable: true })
-  position: number;
-}
+//   @Column({ type: 'int', nullable: true })
+//   position: number;
+// }

package/src/module/meta/entity/user-app-mapping.entity.ts

@@ -1,21 +1,21 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+// import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
 
-@Entity({ name: 'cr_user_app_mapping' })
-export class UserAppMapping {
-  constructor(user_id: number) {
-    this.user_id = user_id;
-    this.entity_type = 'UAP';
-  }
+// @Entity({ name: 'cr_user_app_mapping' })
+// export class UserAppMapping {
+//   constructor(user_id: number) {
+//     this.user_id = user_id;
+//     this.entity_type = 'UAP';
+//   }
 
-  @PrimaryGeneratedColumn()
-  id: number;
+//   @PrimaryGeneratedColumn()
+//   id: number;
 
-  @Column({ type: 'bigint', nullable: true })
-  user_id: number;
+//   @Column({ type: 'bigint', nullable: true })
+//   user_id: number;
 
-  @Column({ type: 'varchar', nullable: true })
-  appcode: string;
+//   @Column({ type: 'varchar', nullable: true })
+//   appcode: string;
 
-  @Column({ type: 'varchar' })
-  entity_type: string;
-}
+//   @Column({ type: 'varchar' })
+//   entity_type: string;
+// }