rez_core 2.0.80 → 2.0.82

package/package.json

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

package/src/app.module.ts

@@ -12,6 +12,7 @@ import { ListMasterModule } from './module/listmaster/listmaster.module';
 import { ThirdPartyModule } from './module/third-party-module/third-party.module';
 import { FilterModule } from './module/filter/filter.module';
 import { LeadModule } from './module/lead/lead.module';
+import { LayoutPreferenceModule } from './module/layout_preference/layout_preference.module';
 
 @Module({
   imports: [
@@ -28,6 +29,7 @@ import { LeadModule } from './module/lead/lead.module';
     ThirdPartyModule,
     FilterModule,
     LeadModule,
+    LayoutPreferenceModule,
   ],
 })
 export class AppModule {}

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

@@ -21,7 +21,6 @@ export class FilterService {
   ) {}
   private readonly skipLevelFilterEntities = ['USR','UPR'];
 
-
   private async gettab_value_counts(
     tableName: string,
     column: string | undefined,
@@ -142,7 +141,6 @@ export class FilterService {
         },
       });
     }
-    
 
     // Build query for tab counts (no tab.value filter here)
     const allTabs = await this.gettab_value_counts(

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

@@ -0,0 +1,33 @@
+import {
+  Controller,
+  Get,
+  Inject,
+  Param,
+  Query,
+  Req,
+  UseGuards,
+} from '@nestjs/common';
+import { LayoutPreferenceService } from '../service/layout_preference.service';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
+
+@Controller('layout-preference')
+export class LayoutPreferenceController {
+  constructor(
+    @Inject('LayoutPreferenceService')
+    private readonly layoutPreferenceService: LayoutPreferenceService,
+  ) {}
+
+  @Get('')
+  @UseGuards(JwtAuthGuard)
+  async getFilterById(
+    @Query('entity_type') entity_type: string,
+    @Req() req: Request & { user: any },
+  ) {
+    const userId = req.user.userData.id;
+
+    return this.layoutPreferenceService.getLayoutPreferenceByUserID(
+      userId,
+      entity_type,
+    );
+  }
+}

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

@@ -0,0 +1,14 @@
+import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'cr_layout_preference' })
+export class LayoutPreference extends BaseEntity {
+  @Column({ length: 50, nullable: true })
+  user_id: string;
+
+  @Column({ nullable: true, type: 'json' })
+  layout_json: any;
+
+  @Column({ length: 50, nullable: true, type: 'varchar' })
+  mapped_entity_type: string;
+}

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

@@ -0,0 +1,17 @@
+import { Module } from '@nestjs/common';
+import { LayoutPreferenceController } from './controller/layout_preference.controller';
+import { LayoutPreferenceService } from './service/layout_preference.service';
+import { EntityModule } from '../meta/entity.module';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { LayoutPreference } from './entity/layout_preference.entity';
+import { LayoutPreferenceRepository } from './repository/layout_preference.repository';
+
+@Module({
+  imports: [EntityModule, TypeOrmModule.forFeature([LayoutPreference])],
+  controllers: [LayoutPreferenceController],
+  providers: [
+    { provide: 'LayoutPreferenceService', useClass: LayoutPreferenceService },
+    LayoutPreferenceRepository,
+  ],
+})
+export class LayoutPreferenceModule {}

package/src/module/layout_preference/repository/layout_preference.repository.ts

@@ -0,0 +1,24 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Repository } from 'typeorm';
+import { LayoutPreference } from '../entity/layout_preference.entity';
+
+@Injectable()
+export class LayoutPreferenceRepository {
+  constructor(
+    @InjectRepository(LayoutPreference)
+    private readonly layoutPreferenceRepo: Repository<LayoutPreference>,
+  ) {}
+
+  async findByEntityUserId(
+    entity_type: string,
+    userId: number,
+  ): Promise<LayoutPreference | null> {
+    return this.layoutPreferenceRepo.findOne({
+      where: {
+        user_id: userId.toString(),
+        mapped_entity_type: entity_type,
+      },
+    });
+  }
+}

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

@@ -0,0 +1,47 @@
+import { Injectable } from '@nestjs/common';
+import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
+import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+import { UserData } from 'src/module/user/entity/user.entity';
+import { LayoutPreferenceRepository } from '../repository/layout_preference.repository';
+
+@Injectable()
+export class LayoutPreferenceService extends EntityServiceImpl {
+  constructor(private layoutPreferenceRepository: LayoutPreferenceRepository) {
+    super();
+  }
+
+  async createEntity(entityData: BaseEntity, loggedInUser: UserData | null) {
+    const { mapped_entity_type } = entityData as any;
+    const userId = loggedInUser?.id;
+
+    if (userId === undefined) {
+      throw new Error('User ID is required to create layout preference.');
+    }
+
+    const existingLayoutPreference =
+      await this.layoutPreferenceRepository.findByEntityUserId(
+        mapped_entity_type,
+        userId,
+      );
+
+    console.log('existing', userId);
+
+    if (existingLayoutPreference) {
+      console.log('existing preference');
+
+      return await super.updateEntity(
+        { ...entityData, id: existingLayoutPreference.id },
+        loggedInUser,
+      );
+    }
+
+    return await super.createEntity(entityData, loggedInUser);
+  }
+
+  async getLayoutPreferenceByUserID(user_id, mapped_entity_type) {
+    return await this.layoutPreferenceRepository.findByEntityUserId(
+      mapped_entity_type,
+      user_id,
+    );
+  }
+}

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

@@ -94,6 +94,7 @@ export class EntityTableService {
         date: await this.listMasterService.getDropdownOptions('OPD', {}),
         select: await this.listMasterService.getDropdownOptions('OPS', {}),
         multiselect: await this.listMasterService.getDropdownOptions('OPM', {}),
+        year: await this.listMasterService.getDropdownOptions('OPY', {}),
         // Add any other operations you want to include
       };
       entityTableDto.default_filter =