From 41cc8a89af5b8d6dc9fa92bb1d585e1bc7287544 Mon Sep 17 00:00:00 2001
From: jasquat <jasquat@users.noreply.github.com>
Date: Mon, 20 Mar 2023 12:04:22 -0400
Subject: [PATCH] some more updates w/ burnettk

---
 .../routes/process_instances_controller.py    | 30 +++++++++++++++++++
 spiffworkflow-frontend/src/interfaces.ts      | 15 +++++++++-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_instances_controller.py b/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_instances_controller.py
index 70987c7f..59399f2f 100644
--- a/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_instances_controller.py
+++ b/spiffworkflow-backend/src/spiffworkflow_backend/routes/process_instances_controller.py
@@ -1,5 +1,6 @@
 """APIs for dealing with process groups, process models, and process instances."""
 import base64
+from spiffworkflow_backend.models.bpmn_process import BpmnProcessModel
 import json
 from typing import Any
 from typing import Dict
@@ -635,6 +636,18 @@ def process_instance_task_list(
     #             task = bpmn_process_instance.get_task(subprocess_id)
     #             task._set_state(TaskState.WAITING)
 
+    # guid: string;
+    # bpmn_identifier: string;
+    #
+    # bpmn_name?: string;
+    #
+    # state: string;
+    # typename: string;
+
+    # calling_subprocess_task_guid: string;
+    # call_activity_process_bpmn_identifier?: string;
+
+
     task_model_query = db.session.query(TaskModel).filter(
         TaskModel.process_instance_id == process_instance.id,
     )
@@ -651,6 +664,23 @@ def process_instance_task_list(
             )
         task_model_query = task_model_query.filter(TaskModel.end_in_seconds <= to_task_model.end_in_seconds)
 
+    task_model_query = (
+        task_model_query.order_by(
+            ProcessInstanceEventModel.timestamp.desc(), ProcessInstanceEventModel.id.desc()  # type: ignore
+        )
+        .join(TaskDefinitionModel, TaskDefinitionModel.id == TaskModel.task_definition_id)
+        .join(BpmnProcessModel, BpmnProcessModel.id == TaskModel.bpmn_process_id)
+        .join(
+            BpmnProcessDefinitionModel, BpmnProcessDefinitionModel.id == TaskDefinitionModel.bpmn_process_definition_id
+        )
+        .add_columns(
+            BpmnProcessDefinitionModel.bpmn_identifier.label("bpmn_process_definition_identifier"),  # type: ignore
+            BpmnProcessDefinitionModel.bpmn_name.label("bpmn_process_definition_name"),  # type: ignore
+            TaskDefinitionModel.bpmn_identifier.label("task_definition_identifier"),  # type: ignore
+            TaskDefinitionModel.bpmn_name.label("task_definition_name"),  # type: ignore
+            TaskDefinitionModel.typename.label("bpmn_task_type"),  # type: ignore
+        )
+    )
     task_models = task_model_query.all()
 
     # processor = ProcessInstanceProcessor(process_instance)
diff --git a/spiffworkflow-frontend/src/interfaces.ts b/spiffworkflow-frontend/src/interfaces.ts
index a8d73690..aaf11ade 100644
--- a/spiffworkflow-frontend/src/interfaces.ts
+++ b/spiffworkflow-frontend/src/interfaces.ts
@@ -21,8 +21,21 @@ export interface RecentProcessModel {
   processModelDisplayName: string;
 }
 
+export interface Task {
+  guid: string;
+  bpmn_identifier: string;
+
+  bpmn_name?: string;
+
+  calling_subprocess_task_guid: string;
+  data: any;
+  state: string;
+  typename: string;
+  call_activity_process_bpmn_identifier?: string;
+}
+
 export interface ProcessInstanceTask {
-  id: number;
+  id: string;
   task_id: string;
 
   calling_subprocess_task_id: string;