Merge pull request #289 from hotosm/fix/merge-conflict

fix: merge conflict

src/backend/app/projects/project_schemas.py

@@ -530,12 +530,12 @@ def calculate_status(cls, values):
         completed_task_count = values.completed_task_count
         total_task_count = values.total_task_count
 
-        if completed_task_count == 0 and ongoing_task_count == 0:
+        if ongoing_task_count == 0:
             values.status = "not-started"
-        elif completed_task_count == total_task_count:
-            values.status = "completed"
-        else:
+        elif ongoing_task_count > 0 and ongoing_task_count != completed_task_count:
             values.status = "ongoing"
+        elif ongoing_task_count == total_task_count:
+            values.status = "completed"
 
         return values
 

src/backend/app/tasks/task_routes.py

@@ -96,7 +96,11 @@ async def get_task_stats(
             raw_sql = """
                 SELECT
                     COUNT(CASE WHEN te.state = 'REQUEST_FOR_MAPPING' THEN 1 END) AS request_logs,
+<<<<<<< HEAD
                     COUNT(CASE WHEN te.state IN ('LOCKED_FOR_MAPPING', 'REQUEST_FOR_MAPPING', 'IMAGE_UPLOADED', 'UNFLYABLE_TASK') THEN 1 END) AS ongoing_tasks,
+=======
+                    COUNT(CASE WHEN te.state = 'LOCKED_FOR_MAPPING' THEN 1 END) AS ongoing_tasks,
+>>>>>>> 5e8a37ab505a3c4c12fa2a98348992c427652b61
                     COUNT(CASE WHEN te.state = 'IMAGE_PROCESSED' THEN 1 END) AS completed_tasks,
                     COUNT(CASE WHEN te.state = 'UNFLYABLE_TASK' THEN 1 END) AS unflyable_tasks
                 FROM (