rez_core 5.0.70 → 5.0.72

package/package.json

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

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

@@ -982,7 +982,7 @@ export class FilterService {
         })();
 
         return {
-          query: `${dateColumn} < :${key}`,
+          query: `${dateColumn} <= :${key}`,
           params: { [key]: dayBefore },
         };
 
@@ -1094,7 +1094,7 @@ export class FilterService {
         const targetDate = subtractBusinessDays(numVal);
 
         return {
-          query: `${dateColumn} < :${key}`,
+          query: `${dateColumn} <= :${key}`,
           params: { [key]: targetDate },
         };
       }

package/src/module/integration/service/wrapper.service.ts

@@ -4,6 +4,8 @@ import { GenericMessageDto, IntegrationService } from './integration.service';
 import { GoogleService } from './calendar-event.service';
 import { IcsMeetingService } from 'src/module/ics/service/ics.service';
 import { LoggingService } from 'src/utils/service/loggingUtil.service';
+import { MediaDataService } from 'src/module/meta/service/media-data.service';
+import axios from 'axios';
 
 @Injectable()
 export class WrapperService {
@@ -15,6 +17,7 @@ export class WrapperService {
     private readonly googleService: GoogleService,
     private readonly icsService: IcsMeetingService,
     private readonly loggingService: LoggingService,
+    private readonly mediaService: MediaDataService,
   ) {}
 
   /**
@@ -384,11 +387,45 @@ export class WrapperService {
         user_id: loggedInUser.id,
         entity_type: entity.entity_type,
         entity_id: entity.entity_id,
-        attachments: entity.attachments,
+        attachments: [],
         mediaUrl: entity.mediaUrl,
         organization_id: organization_id,
       } as any;
 
+      // attachments: [1, 2, 3, 4]
+
+      if (entity.attachments && entity.attachments.length > 0) {
+        mailPayload.attachments = [];
+
+        for (const attachmentId of entity.attachments) {
+          // Step 1: Download or get media file
+          const url = await this.mediaService.getMediaDownloadUrl(
+            attachmentId,
+            {},
+            60000,
+          );
+
+          if (!url?.signedUrl) continue;
+
+          // Step 2: Fetch file content
+          const response = await axios.get(url.signedUrl, {
+            responseType: 'arraybuffer',
+          });
+
+          // Step 3: Convert to base64
+          const base64Content = Buffer.from(response.data).toString('base64');
+
+          // Step 4: Push formatted attachment
+          mailPayload.attachments.push({
+            content: base64Content,
+            type:
+              response.headers['content-type'] || 'application/octet-stream',
+            filename: `attachment-${attachmentId}`,
+            disposition: 'attachment',
+          });
+        }
+      }
+
       this.loggingService.log(
         'debug',
         'wrapperService',

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

@@ -1,11 +1,12 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
 import { STATUS_ACTIVE } from 'src/constant/global.constant';
-import { DataSource } from 'typeorm';
+import { DataSource,In } from 'typeorm';
 import { UserData } from 'src/module/user/entity/user.entity';
 import { MediaDataService } from './media-data.service';
 import { ResolverService } from './resolver.service';
 import { ConfigService } from '@nestjs/config';
 import { EntityMasterRepository } from '../repository/entity-master.repository';
+import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 
 @Injectable()
 export class EntityDynamicService {
@@ -15,6 +16,7 @@ export class EntityDynamicService {
     private readonly resolverService: ResolverService,
     private readonly configService: ConfigService,
     private readonly entityMasterRepo: EntityMasterRepository,
+    private readonly reflectionHelper: ReflectionHelper,
   ) {}
 
   // -----------------------------
@@ -160,13 +162,22 @@ export class EntityDynamicService {
   ): Promise<any> {
     const organizationId = loggedInUser.organization_id;
 
-    const getRelation = await this.dataSource.query(
-      `SELECT *
-       FROM frm_entity_relation
-       WHERE organization_id = $1
-         AND source_entity_type = $2`,
-      [organizationId, entityType],
-    );
+     const repo = this.reflectionHelper.getRepoService('EntityRelation')
+
+   const getRelation = await repo.find({
+      where:{
+          organization_id:organizationId,
+        source_entity_type:entityType,
+      }
+    })
+
+    // const getRelation = await this.dataSource.query(
+    //   `SELECT *
+    //    FROM frm_entity_relation
+    //    WHERE organization_id = $1
+    //      AND source_entity_type = $2`,
+    //   [organizationId, entityType],
+    // );
 
     const { mappedEntities, ...mainData } = data;
 
@@ -204,19 +215,30 @@ export class EntityDynamicService {
             mainID, // this will pass for parent_id
           );
 
-          await this.dataSource.query(
-            `INSERT INTO frm_entity_relation_data (organization_id, source_entity_id, source_entity_type,
-                                                   target_entity_id, target_entity_type, relation_type)
-             VALUES ($1, $2, $3, $4, $5, $6)`,
-            [
-              organizationId,
-              mainID,
-              entityType,
-              createdRelatedEntity.id,
-              targetEntityType,
-              relationType,
-            ],
-          );
+          const relationRepo = this.reflectionHelper.getRepoService('EntityRelationData')
+
+          await relationRepo.save({
+            organizationId: organizationId,
+            source_entity_id: mainID,
+            source_entity_type: entityType,
+            target_entity_id: createdRelatedEntity.id,
+            targetEntityType: targetEntityType,
+            relation_type: relationType
+          })
+
+          // await this.dataSource.query(
+          //   `INSERT INTO frm_entity_relation_data (organization_id, source_entity_id, source_entity_type,
+          //                                          target_entity_id, target_entity_type, relation_type)
+          //    VALUES ($1, $2, $3, $4, $5, $6)`,
+          //   [
+          //     organizationId,
+          //     mainID,
+          //     entityType,
+          //     createdRelatedEntity.id,
+          //     targetEntityType,
+          //     relationType,
+          //   ],
+          // );
         }
       }
     }
@@ -241,14 +263,28 @@ export class EntityDynamicService {
       id,
       loggedInUser,
     );
+    const relationRepo = this.reflectionHelper.getRepoService('EntityRelation');
+    const relatedEntityRepo = this.reflectionHelper.getRepoService('EntityRelationData');
 
-    const relatedEntities = await this.dataSource.query(
-      `SELECT *
-       FROM frm_entity_relation_data
-       WHERE source_entity_id = $1
-         AND target_entity_type IN (SELECT target_entity_type FROM frm_entity_relation WHERE source_entity_type = $2)`,
-      [id, entityType],
-    );
+    const relations = await relationRepo.find({
+      where: {source_entity_type: entityType}
+    })
+
+    const targetTypes = relations.map(r=> r.target_entity_type)
+
+    if (targetTypes.length === 0) {
+      return {
+        entity_type: entityType,
+        ...mainEntity,
+      };
+    }
+
+    const relatedEntities = await relatedEntityRepo.find({
+      where: {
+        source_entity_id: id,
+        target_entity_type: In(targetTypes),
+      },
+    });
 
     // Format response to match create entity structure
     const response: any = {