rez_core 4.0.111 → 4.0.113

package/src/module/dashboard/repository/dashboard.repository.ts

@@ -1,42 +1,42 @@
-import { Injectable } from '@nestjs/common';
-import { DataSource } from 'typeorm';
-import { DashboardPageData } from '../entity/dashboard_page_data.entity';
-import { WidgetMaster } from '../entity/widget_master.entity';
-
-@Injectable()
-export class DashboardRepository {
-  constructor(private readonly dataSource: DataSource) {}
-
-  async getPages(mapped_entity_type: string, loggedInUser: any) {
-    return await this.dataSource.query(
-      `SELECT * FROM frm_dashboard_page_data WHERE mapped_entity_type='${mapped_entity_type}' AND applicable_type='${loggedInUser.level_type}' AND applicable_id='${loggedInUser.level_id}' AND organization_id='${loggedInUser.organization_id}' `,
-    );
-  }
-
-  async getDashboardPageData(
-    pageId: number,
-    organization_id: number,
-  ): Promise<DashboardPageData | null> {
-    return await this.dataSource
-      .getRepository(DashboardPageData)
-      .createQueryBuilder('page')
-      .where('page.id = :pageId', { pageId })
-      .andWhere('page.organization_id = :organization_id', { organization_id })
-      .getOne();
-  }
-
-  async getWidgetsByIds(
-    widgetIds: number[],
-    organization_id: number,
-  ): Promise<WidgetMaster[]> {
-    if (!widgetIds.length) return [];
-    return await this.dataSource
-      .getRepository(WidgetMaster)
-      .createQueryBuilder('widget')
-      .where('widget.id IN (:...widgetIds)', { widgetIds })
-      .andWhere('widget.organization_id = :organization_id', {
-        organization_id,
-      })
-      .getMany();
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { DataSource } from 'typeorm';
+import { DashboardPageData } from '../entity/dashboard_page_data.entity';
+import { WidgetMaster } from '../entity/widget_master.entity';
+
+@Injectable()
+export class DashboardRepository {
+  constructor(private readonly dataSource: DataSource) {}
+
+  async getPages(mapped_entity_type: string, loggedInUser: any) {
+    return await this.dataSource.query(
+      `SELECT * FROM frm_dashboard_page_data WHERE mapped_entity_type='${mapped_entity_type}' AND applicable_type='${loggedInUser.level_type}' AND applicable_id='${loggedInUser.level_id}' AND organization_id='${loggedInUser.organization_id}' `,
+    );
+  }
+
+  async getDashboardPageData(
+    pageId: number,
+    organization_id: number,
+  ): Promise<DashboardPageData | null> {
+    return await this.dataSource
+      .getRepository(DashboardPageData)
+      .createQueryBuilder('page')
+      .where('page.id = :pageId', { pageId })
+      .andWhere('page.organization_id = :organization_id', { organization_id })
+      .getOne();
+  }
+
+  async getWidgetsByIds(
+    widgetIds: number[],
+    organization_id: number,
+  ): Promise<WidgetMaster[]> {
+    if (!widgetIds.length) return [];
+    return await this.dataSource
+      .getRepository(WidgetMaster)
+      .createQueryBuilder('widget')
+      .where('widget.id IN (:...widgetIds)', { widgetIds })
+      .andWhere('widget.organization_id = :organization_id', {
+        organization_id,
+      })
+      .getMany();
+  }
+}

package/src/module/dashboard/service/dashboard.service.ts

@@ -1,73 +1,73 @@
-import { Injectable, NotFoundException } from '@nestjs/common';
-import { DashboardRepository } from '../repository/dashboard.repository';
-import { ModuleAccessService } from 'src/module/module/service/module-access.service';
-
-@Injectable()
-export class DashboardService {
-  constructor(
-    private readonly dashboardRepo: DashboardRepository,
-    private readonly moduleAccessService: ModuleAccessService,
-  ) {}
-
-  async getPages(mapped_entity_type: string, loggedInUser: any) {
-    const pages = await this.dashboardRepo.getPages(
-      mapped_entity_type,
-      loggedInUser,
-    );
-
-    const access = await this.moduleAccessService.getUserPermissions({
-      userId: loggedInUser.id,
-      appcode: loggedInUser.appcode,
-      level_type: loggedInUser.level_type,
-      level_id: loggedInUser.level_id,
-      organization_id: loggedInUser.organization_id,
-    });
-
-    // Build a set of accessible codes
-    const allowedCodes = new Set(
-      access
-        .filter((a) => a.action === 'VIEW' && a.access === 1)
-        .map((a) => a.code),
-    );
-
-    // Filter pages based on access
-    const filteredPages = pages.filter((page) => allowedCodes.has(page.code));
-
-    return filteredPages;
-  }
-
-  async getDashboardPage(pageId: number, loggedInUser: any) {
-    const organizationId = loggedInUser.organization_id;
-    // 1. Get page data
-    const page = await this.dashboardRepo.getDashboardPageData(
-      pageId,
-      organizationId,
-    );
-    if (!page)
-      throw new NotFoundException(`Dashboard Page ${pageId} not found`);
-
-    const layout = page.layout_json || [];
-    const widgetIds = layout.map((b: any) => Number(b.w_id));
-
-    // 2. Fetch widget details
-    const widgets = await this.dashboardRepo.getWidgetsByIds(
-      widgetIds,
-      organizationId,
-    );
-
-    // Convert to map
-    const widgetMap = {};
-    widgets.forEach((w) => {
-      widgetMap[w.id] = w;
-    });
-
-    const { layout_json, ...pageData } = page;
-
-    // 3. Return
-    return {
-      page_data: pageData,
-      layout_json: layout,
-      widget_json: widgetMap,
-    };
-  }
-}
+import { Injectable, NotFoundException } from '@nestjs/common';
+import { DashboardRepository } from '../repository/dashboard.repository';
+import { ModuleAccessService } from 'src/module/module/service/module-access.service';
+
+@Injectable()
+export class DashboardService {
+  constructor(
+    private readonly dashboardRepo: DashboardRepository,
+    private readonly moduleAccessService: ModuleAccessService,
+  ) {}
+
+  async getPages(mapped_entity_type: string, loggedInUser: any) {
+    const pages = await this.dashboardRepo.getPages(
+      mapped_entity_type,
+      loggedInUser,
+    );
+
+    const access = await this.moduleAccessService.getUserPermissions({
+      userId: loggedInUser.id,
+      appcode: loggedInUser.appcode,
+      level_type: loggedInUser.level_type,
+      level_id: loggedInUser.level_id,
+      organization_id: loggedInUser.organization_id,
+    });
+
+    // Build a set of accessible codes
+    const allowedCodes = new Set(
+      access
+        .filter((a) => a.action === 'VIEW' && a.access === 1)
+        .map((a) => a.code),
+    );
+
+    // Filter pages based on access
+    const filteredPages = pages.filter((page) => allowedCodes.has(page.code));
+
+    return filteredPages;
+  }
+
+  async getDashboardPage(pageId: number, loggedInUser: any) {
+    const organizationId = loggedInUser.organization_id;
+    // 1. Get page data
+    const page = await this.dashboardRepo.getDashboardPageData(
+      pageId,
+      organizationId,
+    );
+    if (!page)
+      throw new NotFoundException(`Dashboard Page ${pageId} not found`);
+
+    const layout = page.layout_json || [];
+    const widgetIds = layout.map((b: any) => Number(b.w_id));
+
+    // 2. Fetch widget details
+    const widgets = await this.dashboardRepo.getWidgetsByIds(
+      widgetIds,
+      organizationId,
+    );
+
+    // Convert to map
+    const widgetMap = {};
+    widgets.forEach((w) => {
+      widgetMap[w.id] = w;
+    });
+
+    const { layout_json, ...pageData } = page;
+
+    // 3. Return
+    return {
+      page_data: pageData,
+      layout_json: layout,
+      widget_json: widgetMap,
+    };
+  }
+}

package/src/module/dev/dev.module.ts

@@ -1,12 +1,12 @@
-import { Module } from '@nestjs/common';
-import { EntityModule } from '../meta/entity.module';
-import { UserModule } from '../user/user.module';
-import { ModuleModule } from '../module/module.module';
-import { DevService } from './service/dev.service';
-
-@Module({
-  imports: [EntityModule, UserModule, ModuleModule],
-  controllers: [],
-  providers: [DevService],
-})
-export class DevModule {}
+import { Module } from '@nestjs/common';
+import { EntityModule } from '../meta/entity.module';
+import { UserModule } from '../user/user.module';
+import { ModuleModule } from '../module/module.module';
+import { DevService } from './service/dev.service';
+
+@Module({
+  imports: [EntityModule, UserModule, ModuleModule],
+  controllers: [],
+  providers: [DevService],
+})
+export class DevModule {}

package/src/module/dev/service/dev.service.ts

@@ -1,7 +1,7 @@
-import { Injectable } from '@nestjs/common';
-import { UserService } from '../../user/service/user.service';
-
-@Injectable()
-export class DevService {
-  constructor(private readonly userService: UserService) {}
-}
+import { Injectable } from '@nestjs/common';
+import { UserService } from '../../user/service/user.service';
+
+@Injectable()
+export class DevService {
+  constructor(private readonly userService: UserService) {}
+}

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

@@ -1,36 +1,36 @@
-import { Controller, Get, Inject, Req, UseGuards } from '@nestjs/common';
-import { Request } from 'express';
-import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
-import { UserService } from 'src/module/user/service/user.service';
-import { OrganizationService } from '../service/organization.service';
-
-@Controller('organization')
-export class OrganizationController {
-  constructor(
-    private readonly orgService: OrganizationService,
-    @Inject('UserService') private readonly userService: UserService,
-  ) {}
-
-  @UseGuards(JwtAuthGuard)
-  @Get('dropdown')
-  async getOrganizationDropdown(@Req() req: Request & { user: any }) {
-    const userData = req.user.userData;
-    // const userData = await this.userService.getEntityData(ENTITYTYPE_USER, userId);
-    // const enterpriseId = req.user['enterpriseId']; // or adapt based on your user structure
-    return this.orgService.findById(userData?.organization_id);
-  }
-
-  @UseGuards(JwtAuthGuard)
-  @Get('hierarchy')
-  async getOrganizationHierarchy(@Req() req: Request & { user: any }) {
-    const userId = req.user.userData?.id;
-    const appcode = req.user.userData?.appcode;
-    const org_id = req.user.userData?.organization_id;
-
-    return await this.orgService.getOrganizationHierarchy(
-      userId,
-      appcode,
-      org_id,
-    );
-  }
-}
+import { Controller, Get, Inject, Req, UseGuards } from '@nestjs/common';
+import { Request } from 'express';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
+import { UserService } from 'src/module/user/service/user.service';
+import { OrganizationService } from '../service/organization.service';
+
+@Controller('organization')
+export class OrganizationController {
+  constructor(
+    private readonly orgService: OrganizationService,
+    @Inject('UserService') private readonly userService: UserService,
+  ) {}
+
+  @UseGuards(JwtAuthGuard)
+  @Get('dropdown')
+  async getOrganizationDropdown(@Req() req: Request & { user: any }) {
+    const userData = req.user.userData;
+    // const userData = await this.userService.getEntityData(ENTITYTYPE_USER, userId);
+    // const enterpriseId = req.user['enterpriseId']; // or adapt based on your user structure
+    return this.orgService.findById(userData?.organization_id);
+  }
+
+  @UseGuards(JwtAuthGuard)
+  @Get('hierarchy')
+  async getOrganizationHierarchy(@Req() req: Request & { user: any }) {
+    const userId = req.user.userData?.id;
+    const appcode = req.user.userData?.appcode;
+    const org_id = req.user.userData?.organization_id;
+
+    return await this.orgService.getOrganizationHierarchy(
+      userId,
+      appcode,
+      org_id,
+    );
+  }
+}

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

@@ -1,30 +1,30 @@
-import { forwardRef, Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-import { UserModule } from '../user/user.module';
-import { OrganizationController } from './controller/organization.controller';
-import { OrganizationAppMapping } from './entity/organization-app-mapping.entity';
-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 { EntityModule } from '../meta/entity.module';
-import { OrganizationRepository } from './repository/organization.repository';
-import { SchoolRepository } from './repository/school.repository';
-
-@Module({
-  imports: [
-    TypeOrmModule.forFeature([OrganizationData, OrganizationAppMapping]),
-    forwardRef(() => UserModule),
-    UtilsModule,
-    EntityModule,
-  ],
-  controllers: [OrganizationController],
-  providers: [
-    OrganizationService,
-    OrganizationAppMappingService,
-    SchoolRepository,
-    OrganizationRepository,
-  ],
-  exports: [OrganizationService, OrganizationRepository],
-})
-export class EnterpriseModule {}
+import { forwardRef, Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { UserModule } from '../user/user.module';
+import { OrganizationController } from './controller/organization.controller';
+import { OrganizationAppMapping } from './entity/organization-app-mapping.entity';
+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 { EntityModule } from '../meta/entity.module';
+import { OrganizationRepository } from './repository/organization.repository';
+import { SchoolRepository } from './repository/school.repository';
+
+@Module({
+  imports: [
+    TypeOrmModule.forFeature([OrganizationData, OrganizationAppMapping]),
+    forwardRef(() => UserModule),
+    UtilsModule,
+    EntityModule,
+  ],
+  controllers: [OrganizationController],
+  providers: [
+    OrganizationService,
+    OrganizationAppMappingService,
+    SchoolRepository,
+    OrganizationRepository,
+  ],
+  exports: [OrganizationService, OrganizationRepository],
+})
+export class EnterpriseModule {}

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

@@ -1,37 +1,37 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'sso_enterprise' })
-export class EnterpriseData {
-  @PrimaryGeneratedColumn({ name: 'id', type: 'bigint' })
-  id: number;
-
-  @Column({ name: 'entity_type', type: 'varchar', nullable: true, length: 50 })
-  entity_type: string;
-
-  @Column({ name: 'code', type: 'varchar', nullable: true, length: 50 })
-  code: string;
-
-  @Column({ name: 'name', type: 'varchar', nullable: true, length: 50 })
-  name: string;
-
-  @Column({ name: 'status', type: 'varchar', nullable: true, length: 50 })
-  status: string;
-
-  @Column({ name: 'created_by', type: 'int', nullable: true })
-  created_by: number;
-
-  @Column({ name: 'modified_by', type: 'int', nullable: true })
-  modified_by: number;
-
-  @Column({ name: 'created_date', nullable: true })
-  created_date: Date;
-
-  @Column({ name: 'modified_date', nullable: true })
-  modified_date: Date;
-
-  @Column({ name: 'appcode', type: 'varchar', nullable: true, length: 50 })
-  appcode: string;
-
-  @Column({ name: 'app_url_name', type: 'varchar', nullable: true, length: 50 })
-  app_url_name: string;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'sso_enterprise' })
+export class EnterpriseData {
+  @PrimaryGeneratedColumn({ name: 'id', type: 'bigint' })
+  id: number;
+
+  @Column({ name: 'entity_type', type: 'varchar', nullable: true, length: 50 })
+  entity_type: string;
+
+  @Column({ name: 'code', type: 'varchar', nullable: true, length: 50 })
+  code: string;
+
+  @Column({ name: 'name', type: 'varchar', nullable: true, length: 50 })
+  name: string;
+
+  @Column({ name: 'status', type: 'varchar', nullable: true, length: 50 })
+  status: string;
+
+  @Column({ name: 'created_by', type: 'int', nullable: true })
+  created_by: number;
+
+  @Column({ name: 'modified_by', type: 'int', nullable: true })
+  modified_by: number;
+
+  @Column({ name: 'created_date', nullable: true })
+  created_date: Date;
+
+  @Column({ name: 'modified_date', nullable: true })
+  modified_date: Date;
+
+  @Column({ name: 'appcode', type: 'varchar', nullable: true, length: 50 })
+  appcode: string;
+
+  @Column({ name: 'app_url_name', type: 'varchar', nullable: true, length: 50 })
+  app_url_name: string;
+}

package/src/module/enterprise/entity/organization-app-mapping.entity.ts

@@ -1,13 +1,13 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'sso_organization_app_mapping' })
-export class OrganizationAppMapping {
-  @PrimaryGeneratedColumn({ name: 'id', type: 'int' })
-  id: number;
-
-  @Column({ name: 'organization_id', nullable: true })
-  organization_id: string;
-
-  @Column({ name: 'appcode', nullable: true })
-  appcode: string;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'sso_organization_app_mapping' })
+export class OrganizationAppMapping {
+  @PrimaryGeneratedColumn({ name: 'id', type: 'int' })
+  id: number;
+
+  @Column({ name: 'organization_id', nullable: true })
+  organization_id: string;
+
+  @Column({ name: 'appcode', nullable: true })
+  appcode: string;
+}