rez_core 5.0.7 → 5.0.9

package/package.json

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

package/src/module/workflow/service/task.service.ts

@@ -279,129 +279,115 @@ export class TaskService extends EntityServiceImpl {
     const { mapped_entity_type, mapped_entity_id, status, mandatory, overdue } =
       data;
 
-    // Build dynamic WHERE clauses
-    const whereClauses = [`t.mapped_entity_type = ?`, `t.mapped_entity_id = ?`];
-    const params: any[] = [mapped_entity_type, mapped_entity_id];
+    const whereClauses: string[] = [];
+    const params: any[] = [];
+    let idx = 1;
 
+    // Required conditions
+    whereClauses.push(`t.mapped_entity_type = $${idx++}`);
+    params.push(mapped_entity_type);
+
+    whereClauses.push(`t.mapped_entity_id = $${idx++}`);
+    params.push(Number(mapped_entity_id));
+
+    // Optional filters
     if (status) {
-      whereClauses.push(`t.status = ?`);
-      params.push(status);
+      whereClauses.push(`t.status = $${idx++}`);
+      params.push(Number(status));
     }
-    if (mandatory) {
-      whereClauses.push(`t.is_mandatory = ?`);
-      params.push(mandatory ? 1 : 0);
+
+    if (mandatory !== undefined) {
+      whereClauses.push(`t.is_mandatory = $${idx++}`);
+      params.push(mandatory ? true : false);
     }
+
     if (overdue) {
-      whereClauses.push(
-        `(t.due_date < CURDATE() OR (t.due_date = CURDATE() AND t.due_time < CURTIME()))`,
-      );
-      // exclude tasks that are already completed
-      whereClauses.push(`t.is_done = ?`);
-      params.push(0); // Only include tasks that are not done
+      // Use PostgreSQL CURRENT_DATE + CURRENT_TIME
+      whereClauses.push(`
+      (
+        t.due_date < CURRENT_DATE
+        OR (t.due_date = CURRENT_DATE AND t.due_time < CURRENT_TIME)
+      )
+    `);
+
+      // Only if not done
+      whereClauses.push(`t.is_done = $${idx++}`);
+      params.push(false);
     }
 
     const sql = `
-    SELECT
-      t.*,
-      sg.name AS stage_group_name,
-      s.name AS stage_name,
-      a.name AS action_name
-    FROM frm_wf_task_data t
-    LEFT JOIN frm_wf_stage s ON t.stage_id = s.id
-    LEFT JOIN frm_wf_stage_group sg ON s.stage_group_id = sg.id
-    LEFT JOIN frm_wf_action a ON t.action_id = a.id
-    WHERE ${whereClauses.join(' AND ')}
-    ORDER BY t.created_date DESC
-  `;
+        SELECT
+            t.*,
+            sg.name AS stage_group_name,
+            s.name AS stage_name,
+            a.name AS action_name
+        FROM frm_wf_task_data t
+                 LEFT JOIN frm_wf_stage s ON t.stage_id = s.id
+                 LEFT JOIN frm_wf_stage_group sg ON s.stage_group_id = sg.id
+                 LEFT JOIN frm_wf_action a ON t.action_id = a.id
+        WHERE ${whereClauses.join(" AND ")}
+        ORDER BY t.created_date DESC
+    `;
 
     const taskData = await this.dataSource.query(sql, params);
 
-    if (taskData) {
-      let user: any = null;
-      for (const param of taskData as any) {
+    // ------------------------------------------------------
+    // Resolve user profile
+    // ------------------------------------------------------
+    if (taskData?.length) {
+      for (const task of taskData) {
         try {
-          const baseUrl = this.configService.get<string>('REDIRECT_BE_URL');
+          const baseUrl = this.configService.get<string>("REDIRECT_BE_URL");
 
-          // Prepare the query string
           const queryParams = new URLSearchParams({
             loggedInUser: JSON.stringify(loggedInUser),
           }).toString();
 
-          // Make the GET request with query parameters
           const response = await axios.get(
-            `${baseUrl}/users/profile-image-url/${param?.task_owner}?entity_type=USR&${queryParams}`,
-            {
-              headers: {
-                'Content-Type': 'application/json',
-              },
-            },
+            `${baseUrl}/users/profile-image-url/${task?.task_owner}?entity_type=USR&${queryParams}`,
+            { headers: { "Content-Type": "application/json" } },
           );
 
-          user = response.data;
-          param.created_by_name = user.name;
-          param.task_owner_name = user.name;
-          param.task_owner_profile = user.profile_image;
-        } catch (error) {
-          console.error('⚠️ Internal Entity API call failed:', error.message);
+          task.created_by_name = response.data.name;
+          task.task_owner_name = response.data.name;
+          task.task_owner_profile = response.data.profile_image;
+        } catch (err) {
+          console.error("⚠ Error fetching profile:", err.message);
         }
       }
     }
 
-    if (taskData.length === 0) {
-      return [];
-    }
+    if (!taskData.length) return [];
 
-    //  Fetch all TKST statuses in a single query
-    const taskStatusQuery = `
-  SELECT id, name 
-  FROM frm_list_master_items 
-  WHERE organization_id = $1 
-    AND listtype = 'TKST'
-`;
-    const taskAllStatus = await this.dataSource.query(taskStatusQuery, [
+    // ------------------------------------------------------
+    // Load All TKST Statuses
+    // ------------------------------------------------------
+    const statusSql = `
+    SELECT id, name
+    FROM frm_list_master_items
+    WHERE organization_id = $1
+      AND listtype = 'TKST'
+  `;
+
+    const allStatuses = await this.dataSource.query(statusSql, [
       loggedInUser.organization_id,
     ]);
 
-    //  Build a hash map { id → name }
     const statusMap = new Map(
-      taskAllStatus.map((row) => [String(row.id), row.name]),
+      allStatuses.map((row) => [String(row.id), row.name]),
     );
 
-    //  Assign task_status using the map
-
-    const mediaCache = new Map<number, any>();
-
-    for (const task of taskData) {
-      // Map status name
-      task.task_status = task.status
-        ? statusMap.get(String(task.status)) || null
-        : null;
-
-      // Fix action_name for generic tasks
-      task.action_name =
-        task.action_id === '0' || task.action_id === 0
-          ? 'Generic'
-          : task.action_name;
-
-      // Profile media (with caching like notes)
-      // if (task.task_owner_profile) {
-      //   if (!mediaCache.has(task.task_owner_profile)) {
-      //     const url = await this.mediaDataService.getMediaDownloadUrl(
-      //       Number(task.task_owner_profile),
-      //       loggedInUser,
-      //     );
-      //     mediaCache.set(task.task_owner_profile, url);
-      //   }
-      //   task.task_owner_profile = mediaCache.get(task.task_owner_profile);
-      // } else {
-      //   task.task_owner_profile = null;
-      // }
-    }
-
-    // Normalize is_mandatory to '0'/'1' as string
+    // ------------------------------------------------------
+    // Normalize & decorate tasks
+    // ------------------------------------------------------
     return taskData.map((task) => ({
       ...task,
-      is_mandatory: task.is_mandatory ? '1' : '0',
+      task_status: statusMap.get(String(task.status)) || null,
+      action_name:
+        task.action_id === 0 || task.action_id === "0"
+          ? "Generic"
+          : task.action_name,
+      is_mandatory: task.is_mandatory ? "1" : "0",
     }));
   }