rez_core 3.1.199 → 3.1.200

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

@@ -1,103 +1,103 @@
-import { Injectable } from '@nestjs/common';
-import { EntityServiceImpl } from './entity-service-impl.service';
-import { BaseEntity } from '../entity/base-entity.entity';
-import { UserData } from '../../user/entity/user.entity';
-import { EntityManager } from 'typeorm';
-import { ViewMaster } from '../entity/view-master.entity';
-
-@Injectable()
-export class FieldGroupService extends EntityServiceImpl {
-  constructor() {
-    super();
-  }
-
-  async createEntity(
-    entityData: BaseEntity,
-    loggedInUser: UserData,
-    manager?: EntityManager,
-  ): Promise<BaseEntity> {
-    const entityMaster = await this.entityMasterService.getEntityData(
-      entityData.entity_type,
-      loggedInUser,
-    );
-    entityData.parent_id = entityMaster.id;
-    entityData.parent_type = entityMaster.entity_type;
-
-    const savedEntity = await super.createEntity(
-      entityData,
-      loggedInUser,
-      manager,
-    );
-    return savedEntity;
-  }
-
-  async updateEntity(
-    entityData: ViewMaster,
-    loggedInUserData: UserData | null,
-  ): Promise<BaseEntity> {
-    return entityData;
-  }
-
-  parseLayout(layoutJson: any) {
-    const stepsData: {
-      stepType: string;
-      stepId: string;
-      stepLabel: string;
-      stepPosition: number;
-      fields: {
-        type: string;
-        label: string;
-        id: string;
-      }[];
-    }[] = [];
-
-    if (layoutJson?.form?.children && Array.isArray(layoutJson.form.children)) {
-      const firstChild = layoutJson.form.children[0];
-
-      if (firstChild.type === 'wizard' && Array.isArray(firstChild.steps)) {
-        let i = 0;
-        for (const step of firstChild.steps) {
-          if (step.type === 'step') {
-            const fields = this.extractFields(step.fields);
-
-            stepsData.push({
-              stepType: step.type,
-              stepId: step.id,
-              stepLabel: step.label,
-              stepPosition: ++i,
-              fields: fields,
-            });
-          }
-        }
-      }
-    }
-    return stepsData;
-  }
-
-  extractFields(fieldsArray: any[]): {
-    type: string;
-    label: string;
-    id: string;
-  }[] {
-    const extractedFields: { type: string; label: string; id: string }[] = [];
-
-    function traverse(fields: any[]) {
-      for (const field of fields) {
-        if (field.type === 'field-set') {
-          extractedFields.push({
-            type: field.type,
-            label: field.label || 'No Label',
-            id: field.id || 'No ID',
-          });
-        }
-        if (Array.isArray(field.fields)) {
-          traverse(field.fields); // 📢 Recursive call
-        }
-      }
-    }
-
-    traverse(fieldsArray);
-
-    return extractedFields;
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { EntityServiceImpl } from './entity-service-impl.service';
+import { BaseEntity } from '../entity/base-entity.entity';
+import { UserData } from '../../user/entity/user.entity';
+import { EntityManager } from 'typeorm';
+import { ViewMaster } from '../entity/view-master.entity';
+
+@Injectable()
+export class FieldGroupService extends EntityServiceImpl {
+  constructor() {
+    super();
+  }
+
+  async createEntity(
+    entityData: BaseEntity,
+    loggedInUser: UserData,
+    manager?: EntityManager,
+  ): Promise<BaseEntity> {
+    const entityMaster = await this.entityMasterService.getEntityData(
+      entityData.entity_type,
+      loggedInUser,
+    );
+    entityData.parent_id = entityMaster.id;
+    entityData.parent_type = entityMaster.entity_type;
+
+    const savedEntity = await super.createEntity(
+      entityData,
+      loggedInUser,
+      manager,
+    );
+    return savedEntity;
+  }
+
+  async updateEntity(
+    entityData: ViewMaster,
+    loggedInUserData: UserData | null,
+  ): Promise<BaseEntity> {
+    return entityData;
+  }
+
+  parseLayout(layoutJson: any) {
+    const stepsData: {
+      stepType: string;
+      stepId: string;
+      stepLabel: string;
+      stepPosition: number;
+      fields: {
+        type: string;
+        label: string;
+        id: string;
+      }[];
+    }[] = [];
+
+    if (layoutJson?.form?.children && Array.isArray(layoutJson.form.children)) {
+      const firstChild = layoutJson.form.children[0];
+
+      if (firstChild.type === 'wizard' && Array.isArray(firstChild.steps)) {
+        let i = 0;
+        for (const step of firstChild.steps) {
+          if (step.type === 'step') {
+            const fields = this.extractFields(step.fields);
+
+            stepsData.push({
+              stepType: step.type,
+              stepId: step.id,
+              stepLabel: step.label,
+              stepPosition: ++i,
+              fields: fields,
+            });
+          }
+        }
+      }
+    }
+    return stepsData;
+  }
+
+  extractFields(fieldsArray: any[]): {
+    type: string;
+    label: string;
+    id: string;
+  }[] {
+    const extractedFields: { type: string; label: string; id: string }[] = [];
+
+    function traverse(fields: any[]) {
+      for (const field of fields) {
+        if (field.type === 'field-set') {
+          extractedFields.push({
+            type: field.type,
+            label: field.label || 'No Label',
+            id: field.id || 'No ID',
+          });
+        }
+        if (Array.isArray(field.fields)) {
+          traverse(field.fields); // 📢 Recursive call
+        }
+      }
+    }
+
+    traverse(fieldsArray);
+
+    return extractedFields;
+  }
+}

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

@@ -1,149 +1,240 @@
-import { Injectable } from '@nestjs/common';
-import { EntityServiceImpl } from './entity-service-impl.service';
-import { MediaDataRepository } from '../repository/media-data.repository';
-import { ConfigService } from '@nestjs/config';
-import { S3 } from 'aws-sdk';
-import { MediaData } from '../entity/media-data.entity';
-import {
-  ENTITYTYPE_MEDIA,
-  STATUS_PENDING,
-} from '../../../constant/global.constant';
-import { v4 as uuidv4 } from 'uuid';
-
-@Injectable()
-export class MediaDataService extends EntityServiceImpl {
-  constructor(
-    private readonly configService: ConfigService,
-    private readonly mediaRepository: MediaDataRepository,
-  ) {
-    super();
-  }
-
-  s3AccessKeyID = this.configService.get('AWS.S3.AWS_ACCESS_KEY_ID');
-  s3AccessKeySecret = this.configService.get('AWS.S3.AWS_SECRET_KEY');
-  s3Region = this.configService.get('AWS.S3.AWS_REGION');
-  bucketName = this.configService.get<string>('AWS.S3.BUCKET_NAME');
-
-  s3 = new S3({
-    accessKeyId: this.s3AccessKeyID,
-    secretAccessKey: this.s3AccessKeySecret,
-    region: this.s3Region,
-    signatureVersion: 'v4',
-  });
-
-  async generateMediaUploadDetails(
-    fileName: string,
-    mappedAttributeKey: string,
-    loggedInUser,
-    mappedEntityType?: string,
-    mappedEntityId?: number,
-  ) {
-    if (!fileName || !mappedAttributeKey) {
-      return null;
-    }
-    const ext = fileName.split('.').pop()?.toLowerCase() ?? '';
-
-    const id = uuidv4();
-    const s3Key = `uploads/${id}.${ext}`;
-
-    const uploadUrl = await this.s3.getSignedUrlPromise('putObject', {
-      Bucket: this.bucketName,
-      Key: s3Key,
-      Expires: 60 * 5, // URL valid for 5 mins
-      ContentType: this.getContentType(ext),
-    });
-
-    const mediaData = new MediaData();
-    mediaData.file_name = fileName;
-    mediaData.mapped_attribute_key = mappedAttributeKey;
-    mediaData.status = STATUS_PENDING;
-    if (mappedEntityType) {
-      mediaData.mapped_entity_type = mappedEntityType;
-    }
-    if (mappedEntityId) {
-      mediaData.mapped_entity_id = mappedEntityId;
-    }
-    mediaData.media_url = s3Key;
-
-    const savedEntity = await super.createEntity(mediaData, loggedInUser);
-
-    if (savedEntity) {
-      return { id: savedEntity.id, path: s3Key, uploadUrl };
-    }
-    return null;
-  }
-
-  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,
-    );
-  }
-
-  private getContentType(ext: string): string {
-    const map = {
-      pdf: 'application/pdf',
-      jpg: 'image/jpeg',
-      jpeg: 'image/jpeg',
-      png: 'image/png',
-    };
-    return map[ext] || 'application/octet-stream';
-  }
-
-  // New method to get the signed URL for the media (download link)
-  async getMediaDownloadUrl(id: number, loggedInUser, expiresIn?: number) {
-    try {
-      const entityData = await this.getEntityData(
-        ENTITYTYPE_MEDIA,
-        id,
-        loggedInUser,
-      );
-      const mediaData = entityData as MediaData;
-      let fileSize: number | undefined;
-      if (this.bucketName) {
-        const head = await this.s3.headObject({
-          Bucket: this.bucketName,
-          Key: mediaData.media_url,
-        }).promise();
-        fileSize = head.ContentLength;
-      }
-
-      const signedUrl = await this.s3.getSignedUrlPromise('getObject', {
-        Bucket: this.bucketName,
-        Key: mediaData.media_url,
-        Expires: Number(expiresIn) || 60 * 5,
-      });
-      return { signedUrl, fileName: mediaData.file_name, id: mediaData.id, size: fileSize};
-    } catch (error) {
-      console.error('Error generating signed URL for media:', error);
-      throw new Error('Failed to generate signed URL');
-    }
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { EntityServiceImpl } from './entity-service-impl.service';
+import { MediaDataRepository } from '../repository/media-data.repository';
+import { ConfigService } from '@nestjs/config';
+import { S3 } from 'aws-sdk';
+import { MediaData } from '../entity/media-data.entity';
+import {
+  ENTITYTYPE_MEDIA,
+  STATUS_PENDING,
+} from '../../../constant/global.constant';
+import { v4 as uuidv4 } from 'uuid';
+import { OrganizationService } from '../../enterprise/service/organization.service';
+import { EntityMasterService } from './entity-master.service';
+import { DataSource } from 'typeorm';
+
+@Injectable()
+export class MediaDataService extends EntityServiceImpl {
+  constructor(
+    private readonly configService: ConfigService,
+    private readonly mediaRepository: MediaDataRepository,
+    private dataSource: DataSource,
+  ) {
+    super();
+  }
+
+  s3AccessKeyID = this.configService.get('AWS.S3.AWS_ACCESS_KEY_ID');
+  s3AccessKeySecret = this.configService.get('AWS.S3.AWS_SECRET_KEY');
+  s3Region = this.configService.get('AWS.S3.AWS_REGION');
+  bucketName = this.configService.get<string>('AWS.S3.BUCKET_NAME');
+
+  s3 = new S3({
+    accessKeyId: this.s3AccessKeyID,
+    secretAccessKey: this.s3AccessKeySecret,
+    region: this.s3Region,
+    signatureVersion: 'v4',
+  });
+
+  async generateMediaUploadDetails(
+    fileName: string,
+    mappedAttributeKey: string,
+    loggedInUser,
+    mappedEntityType?: string,
+    mappedEntityId?: number,
+  ) {
+    if (!fileName || !mappedAttributeKey) {
+      return null;
+    }
+    const ext = fileName.split('.').pop()?.toLowerCase() ?? '';
+
+    const id = uuidv4();
+
+    //TODO:
+    const s3Key = `uploads/${id}.${ext}`;
+
+    const uploadUrl = await this.s3.getSignedUrlPromise('putObject', {
+      Bucket: this.bucketName,
+      Key: s3Key,
+      Expires: 60 * 5, // URL valid for 5 mins
+      ContentType: this.getContentType(ext),
+    });
+
+    const mediaData = new MediaData();
+    mediaData.file_name = fileName;
+    mediaData.mapped_attribute_key = mappedAttributeKey;
+    mediaData.status = STATUS_PENDING;
+    if (mappedEntityType) {
+      mediaData.mapped_entity_type = mappedEntityType;
+    }
+    if (mappedEntityId) {
+      mediaData.mapped_entity_id = mappedEntityId;
+    }
+    mediaData.media_url = s3Key;
+
+    const savedEntity = await super.createEntity(mediaData, loggedInUser);
+
+    if (savedEntity) {
+      return { id: savedEntity.id, path: s3Key, uploadUrl };
+    }
+    return null;
+  }
+
+  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,
+    );
+  }
+
+  private getContentType(ext: string): string {
+    const map = {
+      pdf: 'application/pdf',
+      jpg: 'image/jpeg',
+      jpeg: 'image/jpeg',
+      png: 'image/png',
+    };
+    return map[ext] || 'application/octet-stream';
+  }
+
+  // New method to get the signed URL for the media (download link)
+  async getMediaDownloadUrl(id: number, loggedInUser, expiresIn?: number) {
+    try {
+      const entityData = await this.getEntityData(
+        ENTITYTYPE_MEDIA,
+        id,
+        loggedInUser,
+      );
+      const mediaData = entityData as MediaData;
+      let fileSize: number | undefined;
+      if (this.bucketName) {
+        const head = await this.s3.headObject({
+          Bucket: this.bucketName,
+          Key: mediaData.media_url,
+        }).promise();
+        fileSize = head.ContentLength;
+      }
+
+      const signedUrl = await this.s3.getSignedUrlPromise('getObject', {
+        Bucket: this.bucketName,
+        Key: mediaData.media_url,
+        Expires: Number(expiresIn) || 60 * 5,
+      });
+      return { signedUrl, fileName: mediaData.file_name, id: mediaData.id, size: fileSize };
+    } catch (error) {
+      console.error('Error generating signed URL for media:', error);
+      throw new Error('Failed to generate signed URL');
+    }
+  }
+
+  public async buildUploadPathGeneric(
+    mappedEntityType: string,
+    loggedInUser,
+    mappedEntityId?: number,
+    parentId?: number,
+    parentType?: string,
+  ) {
+    // 1️⃣ Fetch entity metadata
+    const entityMaster = await this.entityMasterService.getEntityData(mappedEntityType, loggedInUser);
+    if (!entityMaster) {
+      throw new Error(`Entity master not found for ${mappedEntityType}`);
+    }
+
+    let pathTemplate = entityMaster.doc_upload_path ?? '';
+    const entityOverwrite = entityMaster.overwrite_path ?? 0;
+
+    if (!pathTemplate) {
+      throw new Error(`doc_upload_path not defined for ${mappedEntityType}`);
+    }
+
+    // 2️⃣ Prepare replacement map
+    const replacements: Record<string, string | null> = {};
+
+    // --- ORG ---
+    let organizationData = await this.dataSource.query('SELECT * FROM sso_organization WHERE id = ?', [loggedInUser.organization_id]);
+    replacements['org_code'] = organizationData[0].code;
+
+    // --- LEVEL CODE ---
+    // Determine which entity to use for level_code
+    const levelEntityId = entityOverwrite ? mappedEntityId : loggedInUser.level_id;
+    const levelEntityData = await super.getEntityData(loggedInUser.level_type, levelEntityId, loggedInUser);
+    if (levelEntityData?.code) {
+      replacements['level_code'] = levelEntityData.code; // universal alias
+    }
+
+    // --- Dynamic variables inside path ---
+    const matches = pathTemplate.match(/\$\{(\w+)\}/g) || [];
+
+    for (const variable of matches) {
+      const key = variable.replace(/\$\{|\}/g, '');
+      if (replacements[key]) continue; // already resolved
+
+      if (key === 'org_code') continue; // already set
+      if (key.endsWith('_code')) {
+        // derive entity type dynamically
+        const entityType = key.replace('_code', '').toUpperCase();
+
+        let entityId: number | undefined;
+        if (parentType?.toUpperCase() === entityType && parentId) {
+          entityId = parentId;
+        } else {
+          entityId = mappedEntityId;
+        }
+
+        // Generic lookup
+        if (entityId) {
+          const entityData = await super.getEntityData(entityType, entityId, loggedInUser);
+          replacements[key] = entityData?.code ?? null;
+        }
+      }
+    }
+
+    // --- ORG special case ---
+    // If ORG level & overwrite = 0 → remove level_code variable
+    if (loggedInUser.level_type === 'ORG' && entityOverwrite === 0) {
+      replacements['level_code'] = null;
+    }
+
+    // 3️⃣ Final substitution and cleanup
+    if (pathTemplate) {
+      const finalPath = this.resolveUploadPath(pathTemplate, replacements);
+      return finalPath;
+    }
+    return null;
+  }
+
+  /**
+   * Replace placeholders with actual values, remove missing variables
+   */
+  private resolveUploadPath(template: string, replacements: Record<string, string | null>) {
+    let path = template;
+    path = path.replace(/\$\{(\w+)\}/g, (_, key) => replacements[key] || '');
+    return path.replace(/\/+/g, '/').replace(/\/$/, '');
+  }
+}