fix(backend): use task ids to count validated and mapped status (#1485)

* fix: use task ids to count validated and mapped status

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

src/backend/app/tasks/tasks_crud.py

@@ -332,11 +332,10 @@ async def get_project_task_history(
     comment: bool,
     end_date: datetime,
     db: Session,
-):
+) -> list:
     """Retrieves the task history records for a specific project.
 
     Args:
-        project_id (int): The ID of the project.
         task_id (int): The task_id of the project.
         comment (bool): True or False, True to get comments
             from the project tasks and False by default for
@@ -382,7 +381,7 @@ async def get_project_task_history(
 
 
 async def count_validated_and_mapped_tasks(
-    task_history: list[db_models.DbTaskHistory], end_date: datetime
+    task_history: list, end_date: datetime
 ) -> list[tasks_schemas.TaskHistoryCount]:
     """Counts the number of validated and mapped tasks.
 
@@ -407,16 +406,19 @@ async def count_validated_and_mapped_tasks(
         current_date += timedelta(days=1)
 
     # Populate cumulative_counts with counts from task_history
-    for result in task_history:
-        task_status = (result.get("action_text")).split()[5]
-        date_str = (result.get("action_date")).strftime("%m/%d")
-        entry = next((entry for entry in results if entry["date"] == date_str), None)
-
-        if entry:
-            if task_status == "VALIDATED":
-                entry["validated"] += 1
-            elif task_status == "MAPPED":
-                entry["mapped"] += 1
+    for history in task_history:
+        for result in history:
+            task_status = result.get("status")
+            date_str = (result.get("action_date")).strftime("%m/%d")
+            entry = next(
+                (entry for entry in results if entry["date"] == date_str), None
+            )
+
+            if entry:
+                if task_status == "VALIDATED":
+                    entry["validated"] += 1
+                elif task_status == "MAPPED":
+                    entry["mapped"] += 1
 
     total_validated = 0
     total_mapped = 0

src/backend/app/tasks/tasks_routes.py

@@ -17,6 +17,7 @@
 #
 """Routes for FMTM tasks."""
 
+import asyncio
 from datetime import datetime, timedelta
 from typing import List
 
@@ -171,10 +172,13 @@ async def task_activity(
 
     """
     end_date = datetime.now() - timedelta(days=days)
-    task_history = await tasks_crud.get_project_task_history(
-        project_id, False, end_date, None, db
-    )
-
+    task_list = await tasks_crud.get_task_id_list(db, project_id)
+    tasks = []
+    for task_id in task_list:
+        tasks.extend(
+            [tasks_crud.get_project_task_history(task_id, False, end_date, db)]
+        )
+    task_history = await asyncio.gather(*tasks)
     return await tasks_crud.count_validated_and_mapped_tasks(
         task_history,
         end_date,