rez_core 7.1.1 → 7.1.2

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

@@ -1,26 +1,26 @@
-import { Injectable } from '@nestjs/common';
-import { EntityTableColumnRepository } from '../repository/entity-table-column.repository';
-
-@Injectable()
-export class EntityTableColumnService {
-  constructor(
-    private entityTableColumnRepository: EntityTableColumnRepository,
-  ) {}
-
-
-  async findByParentIdAndParentType(
-    parentId: number,
-    parentType: string,
-    enterprise_id,
-    isVisible?: boolean,
-  ) {
-    const entityTableColumns =
-      await this.entityTableColumnRepository.findByParentIdAndParentType(
-        parentId,
-        parentType,
-        enterprise_id,
-        isVisible,
-      );
-    return entityTableColumns;
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { EntityTableColumnRepository } from '../repository/entity-table-column.repository';
+
+@Injectable()
+export class EntityTableColumnService {
+  constructor(
+    private entityTableColumnRepository: EntityTableColumnRepository,
+  ) {}
+
+
+  async findByParentIdAndParentType(
+    parentId: number,
+    parentType: string,
+    enterprise_id,
+    isVisible?: boolean,
+  ) {
+    const entityTableColumns =
+      await this.entityTableColumnRepository.findByParentIdAndParentType(
+        parentId,
+        parentType,
+        enterprise_id,
+        isVisible,
+      );
+    return entityTableColumns;
+  }
+}

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

@@ -1,144 +1,157 @@
-import { forwardRef, Inject, Injectable } from '@nestjs/common';
-import { EntityTableDto } from '../dto/entity-table.dto';
-import { DISPLAY_LIST } from '../../../constant/global.constant';
-import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
-import { SavedFilterRepositoryService } from 'src/module/filter/repository/saved-filter.repository';
-import { LayoutPreferenceService } from 'src/module/layout_preference/service/layout_preference.service';
-
-@Injectable()
-export class EntityTableService {
-  constructor(
-    @Inject(forwardRef(() => 'ListMasterService'))
-    @Inject('ListMasterService')
-    private readonly listMasterService: ListMasterService,
-
-    private readonly savedFilterRepoService: SavedFilterRepositoryService,
-    @Inject(forwardRef(() => 'LayoutPreferenceService'))
-    private readonly layoutPreferenceService: LayoutPreferenceService,
-  ) {}
-
-  async getTableMetaDataForListing(
-    entityType: string,
-    listType: string,
-    loggedInUser: any,
-  ) {
-    return await this.getTableMetaData(
-      entityType,
-      listType,
-      DISPLAY_LIST,
-      loggedInUser,
-    );
-  }
-
-  async getTableMetaData(
-    entityType: string,
-    listType: string,
-    displayType: string,
-    loggedInUser: any,
-  ) {
-    const entityTableDto = new EntityTableDto();
-    
-    // Set basic properties
-    entityTableDto.entity_type = entityType;
-    entityTableDto.list_type = listType;
-    entityTableDto.display_type = displayType;
-
-    // Fetch columns from layout preference using service
-    const layoutPreference =
-      await this.layoutPreferenceService.getLayoutPreferenceByUserID(
-        loggedInUser.id,
-        entityType,
-        loggedInUser.level_id,
-        loggedInUser.level_type,
-        'layout',
-      );
-
-    // Get columns from layout preference or use defaults
-    let columns: { name: string; attribute_key: string }[] = [];
-    if (layoutPreference?.mapped_json?.columns) {
-      columns = layoutPreference.mapped_json.columns.map((col: any) => ({
-        name: col.name || col.attribute_key || col,
-        attribute_key: col.attribute_key || col,
-      }));
-    } else {
-      // Default columns when no layout preference exists
-      columns = [
-        { name: 'id', attribute_key: 'id' },
-        { name: 'code', attribute_key: 'code' },
-        { name: 'name', attribute_key: 'name' },
-        { name: 'status', attribute_key: 'status' },
-        { name: 'description', attribute_key: 'description' },
-      ];
-    }
-
-    // Transform columns to EntityTableColumn format for backward compatibility
-    entityTableDto.column_list = columns.map((col, index) => ({
-      id: index + 1,
-      name: col.name,
-      attribute_key: col.attribute_key,
-      enterprise_id: loggedInUser.enterprise_id,
-    })) as any;
-
-    // Get operation lists
-    entityTableDto.operation_list = {
-      text: await this.listMasterService.getDropdownOptions(
-        'OPT',
-        {},
-        [],
-        loggedInUser,
-      ),
-      number: await this.listMasterService.getDropdownOptions(
-        'OPN',
-        {},
-        [],
-        loggedInUser,
-      ),
-      date: await this.listMasterService.getDropdownOptions(
-        'OPD',
-        {},
-        [],
-        loggedInUser,
-      ),
-      select: await this.listMasterService.getDropdownOptions(
-        'OPS',
-        {},
-        [],
-        loggedInUser,
-      ),
-      multiselect: await this.listMasterService.getDropdownOptions(
-        'OPM',
-        {},
-        [],
-        loggedInUser,
-      ),
-      year: await this.listMasterService.getDropdownOptions(
-        'OPY',
-        {},
-        [],
-        loggedInUser,
-      ),
-    };
-
-    // Get filters
-    entityTableDto.default_filter =
-      await this.savedFilterRepoService.getDefaultFilterByEntityType(listType);
-
-    if (loggedInUser.id) {
-      entityTableDto.saved_filter =
-        await this.savedFilterRepoService.getSavedFiltersByUserIdAndEntityType(
-          loggedInUser,
-          listType,
-        );
-    }
-
-    if (loggedInUser.id) {
-      entityTableDto.shared_filter =
-        await this.savedFilterRepoService.getSharedFiltersByLevelTypeAndLevelId(
-          loggedInUser,
-          listType,
-        );
-    }
-
-    return entityTableDto;
-  }
-}
+import { forwardRef, Inject, Injectable } from '@nestjs/common';
+import { EntityTableRepository } from '../repository/entity-table.repository';
+import { EntityTableColumnRepository } from '../repository/entity-table-column.repository';
+import { EntityTableDto } from '../dto/entity-table.dto';
+import { DISPLAY_LIST } from '../../../constant/global.constant';
+import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
+import { SavedFilterRepositoryService } from 'src/module/filter/repository/saved-filter.repository';
+
+@Injectable()
+export class EntityTableService {
+  constructor(
+    private entityTableRepository: EntityTableRepository,
+    private readonly entityTableColumnRepository: EntityTableColumnRepository,
+
+    @Inject(forwardRef(() => 'ListMasterService'))
+    @Inject('ListMasterService')
+    private readonly listMasterService: ListMasterService,
+
+    private readonly savedFilterRepoService: SavedFilterRepositoryService,
+  ) {}
+
+  async getEntityData(mappedEntityType: string | null, loggedInUser) {
+    if (mappedEntityType) {
+      const tableMaster =
+        await this.entityTableRepository.findByMappedEntityType(
+          mappedEntityType,
+          loggedInUser.enterprise_id,
+        );
+
+      if (!tableMaster) {
+        throw new Error(
+          `Entity with mappedEntityType "${mappedEntityType}" not found.`,
+        );
+      }
+
+      return tableMaster;
+    } else {
+      throw new Error();
+    }
+  }
+
+  async findByEntityTypeAndListType(entityType: string, listType: string) {
+    return await this.entityTableRepository.findByEntityTypeAndListType(
+      entityType,
+      listType,
+    );
+  }
+
+  async findByEntityTypeAndListTypeAndDisplayType(
+    entityType: string,
+    listType: string,
+    displayType: string,
+    enterprise_id: number,
+  ) {
+    return await this.entityTableRepository.findByEntityTypeAndListTypeAndDisplayType(
+      entityType,
+      listType,
+      displayType,
+      enterprise_id,
+    );
+  }
+
+  async getTableMetaDataForListing(
+    entityType: string,
+    listType: string,
+    loggedInUser: any,
+  ) {
+    return await this.getTableMetaData(
+      entityType,
+      listType,
+      DISPLAY_LIST,
+      loggedInUser,
+    );
+  }
+
+  async getTableMetaData(
+    entityType: string,
+    listType: string,
+    displayType: string,
+    loggedInUser: any,
+  ) {
+    const entityTable = await this.findByEntityTypeAndListTypeAndDisplayType(
+      entityType,
+      listType,
+      displayType,
+      loggedInUser?.enterprise_id,
+    );
+    const entityTableDto = entityTable as EntityTableDto;
+    if (entityTable) {
+      entityTableDto.column_list =
+        await this.entityTableColumnRepository.findByParentIdAndParentType(
+          entityTable.id,
+          entityTable.entity_type,
+          loggedInUser.enterprise_id,
+        );
+      entityTableDto.operation_list = {
+        text: await this.listMasterService.getDropdownOptions(
+          'OPT',
+          {},
+          [],
+          loggedInUser,
+        ),
+        number: await this.listMasterService.getDropdownOptions(
+          'OPN',
+          {},
+          [],
+          loggedInUser,
+        ),
+        date: await this.listMasterService.getDropdownOptions(
+          'OPD',
+          {},
+          [],
+          loggedInUser,
+        ),
+        select: await this.listMasterService.getDropdownOptions(
+          'OPS',
+          {},
+          [],
+          loggedInUser,
+        ),
+        multiselect: await this.listMasterService.getDropdownOptions(
+          'OPM',
+          {},
+          [],
+          loggedInUser,
+        ),
+        year: await this.listMasterService.getDropdownOptions(
+          'OPY',
+          {},
+          [],
+          loggedInUser,
+        ),
+        // Add any other operations you want to include
+      };
+      entityTableDto.default_filter =
+        await this.savedFilterRepoService.getDefaultFilterByEntityType(
+          entityTable.list_type,
+        );
+      if (loggedInUser.id) {
+        entityTableDto.saved_filter =
+          await this.savedFilterRepoService.getSavedFiltersByUserIdAndEntityType(
+            loggedInUser,
+            entityTable.list_type,
+          );
+      }
+      if (loggedInUser.id) {
+        entityTableDto.shared_filter =
+          await this.savedFilterRepoService.getSharedFiltersByLevelTypeAndLevelId(
+            loggedInUser,
+            entityTable.list_type,
+          );
+      }
+    }
+
+    return entityTableDto;
+  }
+}