rez_core 5.0.241 → 5.0.246

package/package.json

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

package/src/module/meta/controller/media.controller.ts

@@ -136,11 +136,7 @@ export class MediaController {
   @Post('update/review-status/:id')
   async updateMediaReviewStatus(
     @Param('id') id: number,
-    @Body()
-    body: {
-      review_status: string;
-      remark: string;
-    },
+    @Body() body: any,
     @Req() req: Request & { user: any },
     @Res() res: Response,
   ) {
@@ -148,8 +144,7 @@ export class MediaController {
     try {
       const result = await this.mediaDataService.updateMediaReviewStatus(
         id,
-        body.review_status,
-        body.remark,
+        body,
         loggedInUser,
       );
       res.status(HttpStatus.OK).json({

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

@@ -590,18 +590,12 @@ export class MediaDataService extends EntityServiceImpl {
     );
   }
 
-  async updateMediaReviewStatus(
-    id: number,
-    review_status: string,
-    remark: string,
-    loggedInUser,
-  ) {
+  async updateMediaReviewStatus(id: number, entityData: any, loggedInUser) {
     await super.updateEntity(
       {
         id,
         entity_type: 'MDA',
-        review_status,
-        remark,
+        review_info: entityData,
       } as any,
       loggedInUser,
     );

package/src/module/meta/service/resolver.service.ts

@@ -116,9 +116,17 @@ export class ResolverService {
         attr.element_type === 'date' ||
         attr.element_type === 'datetime'
       ) {
-        const dateFormat =
-          attr.element_type === 'date' ? 'DD-MM-YYYY' : 'DD-MM-YYYY HH:mm:ss';
-        const dateValue = moment(codeValue, dateFormat).utcOffset('+05:30'); // IST
+        // Allow both DD-MM-YYYY and standard ISO YYYY-MM-DD
+        const allowedFormats =
+          attr.element_type === 'date'
+            ? ['DD-MM-YYYY', 'YYYY-MM-DD']
+            : ['DD-MM-YYYY HH:mm:ss', 'YYYY-MM-DD HH:mm:ss', moment.ISO_8601];
+
+        // strict parsing enabled
+        const dateValue = moment(codeValue, allowedFormats, true).utcOffset(
+          '+05:30',
+        );
+
         if (dateValue.isValid()) {
           resolvedEntityData[field] =
             attr.element_type === 'date'

package/src/module/workflow/repository/action-data.repository.ts

@@ -85,7 +85,7 @@ export class ActionDataRepository extends EntityServiceImpl {
             where: {
               value: 'TO_BE_SENT',
               enterprise_id: loggedInUser.enterprise_id,
-              listtype:'FRS'
+              listtype: 'FRS',
             },
             select: ['id'],
           });
@@ -311,9 +311,9 @@ export class ActionDataRepository extends EntityServiceImpl {
         loggedInUser: JSON.stringify(loggedInUser),
       }).toString();
 
-      const { level_id } = loggedInUser;
+      const { organization_id } = loggedInUser;
 
-      const url = `${baseUrl}/organization/public/${level_id}?entity_type=ORGP&${queryParams}`;
+      const url = `${baseUrl}/organization/public/${organization_id}?entity_type=ORGP&${queryParams}`;
 
       const response = await axios.get(url);
 

package/src/module/workflow/service/workflow-meta.service.ts

@@ -38,9 +38,9 @@ export class WorkflowMetaService extends EntityServiceImpl {
     @InjectRepository(StageGroup)
     private readonly stageGroupRepo: Repository<StageGroup>,
     @InjectRepository(ActionDataEntity)
-    private readonly actionDataEntityRepository:Repository<ActionDataEntity>,
+    private readonly actionDataEntityRepository: Repository<ActionDataEntity>,
     @InjectRepository(TaskDataEntity)
-    private readonly taskDataEntityRepository:Repository<TaskDataEntity>,
+    private readonly taskDataEntityRepository: Repository<TaskDataEntity>,
   ) {
     super();
   }
@@ -224,7 +224,8 @@ export class WorkflowMetaService extends EntityServiceImpl {
             );
 
           for (const action of stageActions) {
-            const actionCategoryRepo = this.reflectionHelper.getRepoService('ActionCategory');
+            const actionCategoryRepo =
+              this.reflectionHelper.getRepoService('ActionCategory');
             const actionCategory = await actionCategoryRepo.findOne({
               where: {
                 id: Number(action.action_category),
@@ -345,7 +346,8 @@ export class WorkflowMetaService extends EntityServiceImpl {
       },
     });
 
-    const listMasterItemsRepo = this.reflectionHelper.getRepoService('ListMasterItems');
+    const listMasterItemsRepo =
+      this.reflectionHelper.getRepoService('ListMasterItems');
 
     const assignmentType = await listMasterItemsRepo.findOne({
       where: {
@@ -371,7 +373,7 @@ export class WorkflowMetaService extends EntityServiceImpl {
 
     if (
       actionCategory?.code == 'OWAS' &&
-      assignmentType[0]?.value == 'round_robin'
+      assignmentType?.value == 'round_robin'
     ) {
       console.log('Auto-assigning owner based on round-robin assignment type');
       await this.assignLead(
@@ -415,13 +417,14 @@ export class WorkflowMetaService extends EntityServiceImpl {
       loggedInUser,
     );
 
-    const listMasterItemsRepo = this.reflectionHelper.getRepoService('ListMasterItems');
+    const listMasterItemsRepo =
+      this.reflectionHelper.getRepoService('ListMasterItems');
     const unassignedListMasterItemData = await listMasterItemsRepo.find({
       where: {
         listtype: 'LEST',
         enterprise_id: loggedInUser.enterprise_id,
-        value: In(['unassigned', 'active'])
-      }
+        value: In(['unassigned', 'active']),
+      },
     });
 
     // Find the IDs explicitly
@@ -451,21 +454,22 @@ export class WorkflowMetaService extends EntityServiceImpl {
       .createQueryBuilder()
       .update()
       .set({ user_id: lead_owner })
-      .where("mapped_entity_id = :leadId", { leadId: lead_id })
-      .andWhere("mapped_entity_type = :entityType", { entityType: entity_type })
-      .andWhere("stage_id = :stageId", { stageId: stage_id })
+      .where('mapped_entity_id = :leadId', { leadId: lead_id })
+      .andWhere('mapped_entity_type = :entityType', { entityType: entity_type })
+      .andWhere('stage_id = :stageId', { stageId: stage_id })
       .andWhere("(is_current = 'Y' OR is_current IS NULL)")
       .execute();
 
-    const leadMeetingRepo = this.reflectionHelper.getRepoService('LeadScheduleMeet');
+    const leadMeetingRepo =
+      this.reflectionHelper.getRepoService('LeadScheduleMeet');
 
     await leadMeetingRepo
       .createQueryBuilder()
       .update()
       .set({ user_id: lead_owner })
-      .where("stage_id = :stageId", { stageId: stage_id })
-      .andWhere("mapped_entity_id = :leadId", { leadId: lead_id })
-      .andWhere("mapped_entity_type = :entityType", { entityType: "LEAD" })
+      .where('stage_id = :stageId', { stageId: stage_id })
+      .andWhere('mapped_entity_id = :leadId', { leadId: lead_id })
+      .andWhere('mapped_entity_type = :entityType', { entityType: 'LEAD' })
       .andWhere("(status = 'scheduled' OR status = 'rescheduled')")
       .execute();
 
@@ -473,15 +477,15 @@ export class WorkflowMetaService extends EntityServiceImpl {
       where: {
         mapped_entity_id: lead_id,
         mapped_entity_type: entity_type,
-        stage_id
-      }
+        stage_id,
+      },
     });
 
     for (const task of taskRows) {
       const statusRows = await listMasterItemsRepo.findOne({
         where: {
-          id: task.status
-        }
+          id: task.status,
+        },
       });
 
       const statusName = statusRows?.value?.toLowerCase() || '';
@@ -489,10 +493,9 @@ export class WorkflowMetaService extends EntityServiceImpl {
         ['todo', 'in_progress'].includes(statusName) ||
         statusName === 'todo'
       ) {
-
-        await this.taskDataEntityRepository.update(task.id,{
+        await this.taskDataEntityRepository.update(task.id, {
           user_id: lead_owner,
-          task_owner: lead_owner
+          task_owner: lead_owner,
         });
       }
     }
@@ -581,13 +584,13 @@ export class WorkflowMetaService extends EntityServiceImpl {
 
     const leadRepo = this.reflectionHelper.getRepoService('CRMLead');
     const lastRow = await leadRepo
-      .createQueryBuilder("cl")
-      .select("cl.lead_owner", "lead_owner")
-      .where("cl.organization_id = :orgId", { orgId: organization_id })
-      .andWhere("cl.level_id = :levelId", { levelId: Number(level_id) })
-      .andWhere("cl.level_type = :levelType", { levelType: level_type })
-      .andWhere("cl.lead_owner IN (:...owners)", { owners: userIds })
-      .orderBy("cl.created_date", "DESC")
+      .createQueryBuilder('cl')
+      .select('cl.lead_owner', 'lead_owner')
+      .where('cl.organization_id = :orgId', { orgId: organization_id })
+      .andWhere('cl.level_id = :levelId', { levelId: Number(level_id) })
+      .andWhere('cl.level_type = :levelType', { levelType: level_type })
+      .andWhere('cl.lead_owner IN (:...owners)', { owners: userIds })
+      .orderBy('cl.created_date', 'DESC')
       .limit(1)
       .getRawOne();
 

package/.idea/250218_ether_core.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/codeStyles/Project.xml

@@ -1,59 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <HTMLCodeStyleSettings>
-      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </JSCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <VueCodeStyleSettings>
-      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
-      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
-    </VueCodeStyleSettings>
-    <codeStyleSettings language="HTML">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="Vue">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/250218_ether_core.iml" filepath="$PROJECT_DIR$/.idea/250218_ether_core.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>