42381 frontend [ workflows ] When cleaning and changing filters, the results does not match the filter

backend/src/processes/enums.py

@@ -411,6 +411,14 @@ class TaskStatus:
         (SKIPPED, SKIPPED),
     )
 
+    LITERALS = Literal[
+        PENDING,
+        ACTIVE,
+        COMPLETED,
+        DELAYED,
+        SKIPPED,
+    ]
+
 
 class TemplateIntegrationType:
 

backend/src/processes/models/workflows/task.py

@@ -580,8 +580,6 @@ def get_data_for_list(self):
                 if self.due_date else None
             ),
             workflow_name=self.workflow.name,
-            # TODO Remove in https://my.pneumatic.app/workflows/36988/
-            template_task_id=self.workflow.template_id,
             template_task_api_name=self.api_name,
             template_id=self.workflow.template_id,
             is_urgent=self.is_urgent,
@@ -634,8 +632,6 @@ class Meta:
     date_completed = models.DateTimeField(null=True)
     date_completed_tsp = models.FloatField(null=True)
     template_id = models.IntegerField(null=True)
-    # TODO Remove in https://my.pneumatic.app/workflows/36988/
-    template_task_id = models.IntegerField(null=True)
     template_task_api_name = models.CharField(max_length=100, null=True)
     is_urgent = models.BooleanField()
     due_date = models.DateTimeField(null=True)

backend/src/processes/queries.py

@@ -881,7 +881,6 @@ def _get_inner_sql(self):
           )
 
         SELECT
-          tt.id AS template_task_id,
           tt.api_name AS template_task_api_name,
           COALESCE(result.workflows_count, 0) AS workflows_count
         FROM template_tasks tt
@@ -1030,7 +1029,6 @@ def _get_tables(self):
         return result
 
     def _get_inner_sql(self):
-        # TODO Remove in https://my.pneumatic.app/workflows/36988/
         return f"""
             SELECT DISTINCT ON (pt.id) pt.id,
                 pt.name,
@@ -1048,7 +1046,6 @@ def _get_inner_sql(self):
                   EPOCH FROM pt.date_completed AT TIME ZONE 'UTC'
                 ) AS date_completed_tsp,
                 pw.template_id as template_id,
-                pt.id as template_task_id,
                 pt.api_name as template_task_api_name,
                 pt.api_name,
                 pt.is_urgent,
@@ -1648,7 +1645,7 @@ def get_sql(self) -> Tuple[str, dict]:
         return query, self.params
 
 
-class TemplateTitlesEventsQuery(SqlQueryObject):
+class TemplateTitlesByEventsQuery(SqlQueryObject):
     event_types = [
         WorkflowEventType.COMMENT,
         WorkflowEventType.TASK_COMPLETE,
@@ -1707,7 +1704,7 @@ def get_sql(self):
         SELECT
           t.id,
           t.name,
-          COUNT(DISTINCT pw.id) FILTER (WHERE pw.status = 0) AS workflows_count
+          COUNT(DISTINCT pw.id) FILTER (WHERE pw.status = 0) AS count
         FROM processes_template AS t
           INNER JOIN processes_workflow AS pw ON (
             t.id = pw.template_id AND pw.is_deleted = False
@@ -1723,46 +1720,96 @@ def get_sql(self):
             AND t.account_id = %(account_id)s
             AND NOT (t.type IN {template_types})
         GROUP BY t.id, t.name
-        ORDER BY workflows_count DESC, t.name ASC """
+        ORDER BY count DESC, t.name ASC """
         return sql, self.params
 
 
-class TemplateTitlesQuery(SqlQueryObject, DereferencedPerformersMixin):
+class TemplateTitlesByWorkflowsQuery(
+    SqlQueryObject,
+    DereferencedPerformersMixin,
+    DereferencedOwnersMixin,
+):
 
     def __init__(
         self,
         user: User,
-        with_tasks_in_progress: Optional[bool] = None,
-        workflows_status: Optional[WorkflowStatus] = None,
+        status: Optional[WorkflowStatus] = None,
     ):
         self.params = {
             'account_id': user.account.id,
             'user_id': user.id,
         }
-        self.with_tasks_in_progress = with_tasks_in_progress
-        if workflows_status:
-            self.status = WorkflowApiStatus.MAP[workflows_status]
+        if status:
+            self.status = WorkflowApiStatus.MAP[status]
             self.params['status'] = self.status
         else:
             self.status = None
 
-    def _get_from(self):
+    def _get_filter_by_type(self):
+        result, params = self._to_sql_list(
+            values=TemplateType.TYPES_ONBOARDING,
+            prefix='template_type',
+        )
+        self.params.update(params)
+        return f"t.type NOT IN {result}"
+
+    def _get_workflows_count(self):
         result = """
-            FROM processes_template AS t
-              INNER JOIN processes_workflow pw
-                ON t.id = pw.template_id """
-        if self.with_tasks_in_progress is None:
-            result += """
-                INNER JOIN processes_workflow_owners pto
-                  ON pw.id = pto.workflow_id AND pto.user_id = %(user_id)s"""
-        else:
-            result += f"""
-                INNER JOIN processes_task pt
-                  ON pw.id = pt.workflow_id
-                JOIN ({self.dereferenced_performers()}) dereferenced_performers
-                  ON pt.id = dereferenced_performers.task_id"""
+            SELECT template_id, COUNT(id) AS count
+            FROM processes_workflow
+            WHERE is_deleted IS FALSE
+              AND account_id = %(account_id)s
+        """
+        if self.status is not None:
+            result += "AND status = %(status)s"
+        result += """
+          GROUP BY template_id
+        """
         return result
 
+    def get_sql(self) -> Tuple[str, dict]:
+        return f"""
+        SELECT *
+        FROM (
+            SELECT
+              t.id,
+              t.name,
+              COALESCE(pw.count, 0) AS count
+            FROM (
+              {self.dereferenced_owners()}
+            ) pto
+              INNER JOIN processes_template t
+                ON t.id = pto.template_id
+              LEFT JOIN (
+                {self._get_workflows_count()}
+              ) pw
+                ON t.id = pw.template_id
+            WHERE
+              t.is_deleted IS FALSE
+              AND t.account_id = %(account_id)s
+              AND {self._get_filter_by_type()}
+            GROUP BY t.id, pw.count
+        ) result
+        ORDER BY count DESC, name ASC
+        """, self.params
+
+
+class TemplateTitlesByTasksQuery(
+    SqlQueryObject,
+    DereferencedPerformersMixin,
+):
+
+    def __init__(
+        self,
+        user: User,
+        status: TaskStatus.LITERALS = TaskStatus.ACTIVE,
+    ):
+        self.params = {
+            'account_id': user.account.id,
+            'user_id': user.id,
+        }
+        self.status = status
+
     def _get_filter_by_type(self):
         result, params = self._to_sql_list(
             values=TemplateType.TYPES_ONBOARDING,
@@ -1776,31 +1823,40 @@ def _get_where(self):
             WHERE t.is_deleted IS FALSE
               AND t.account_id = %(account_id)s
               AND pw.is_deleted IS FALSE
+              AND pt.is_deleted IS FALSE
               AND {self._get_filter_by_type()}"""
-        if self.with_tasks_in_progress is True:
+
+        if self.status == TaskStatus.ACTIVE:
             result += f"""
-                AND pt.is_deleted IS FALSE
                 AND dereferenced_performers.is_completed IS FALSE
                 AND pt.status = '{TaskStatus.ACTIVE}'
                 AND pw.status = {WorkflowStatus.RUNNING}"""
-        elif self.with_tasks_in_progress is False:
+        elif self.status == TaskStatus.DELAYED:
+            result += f"""
+                AND dereferenced_performers.is_completed IS FALSE
+                AND pt.status = '{TaskStatus.DELAYED}'
+                AND pw.status = {WorkflowStatus.RUNNING}"""
+        else:
             result += """
-                AND pt.is_deleted IS FALSE
                 AND dereferenced_performers.is_completed IS TRUE"""
-        elif self.status is not None:
-            result += "AND pw.status = %(status)s"
         return result
 
     def get_sql(self) -> Tuple[str, dict]:
         return f"""
             SELECT
               t.id,
               t.name,
-              COUNT(DISTINCT pw.id) AS workflows_count
-            {self._get_from()}
+              COUNT(DISTINCT pt.id) AS count
+            FROM processes_template AS t
+              INNER JOIN processes_workflow pw
+                ON t.id = pw.template_id
+              INNER JOIN processes_task pt
+                ON pw.id = pt.workflow_id
+              JOIN ({self.dereferenced_performers()}) dereferenced_performers
+                ON pt.id = dereferenced_performers.task_id
             {self._get_where()}
             GROUP BY t.id
-            ORDER BY workflows_count DESC, t.name ASC
+            ORDER BY count DESC, t.name ASC
         """, self.params
 
 

backend/src/processes/serializers/templates/template.py

@@ -16,7 +16,6 @@
     ModelSerializer,
     Serializer,
     SerializerMethodField,
-    ValidationError,
 )
 
 from src.generics.exceptions import BaseServiceException
@@ -35,7 +34,7 @@
     PerformerType,
     TemplateOrdering,
     TemplateType,
-    WorkflowApiStatus,
+    WorkflowApiStatus, TaskStatus,
 )
 from src.processes.messages import template as messages
 from src.processes.models.templates.kickoff import Kickoff
@@ -800,32 +799,31 @@ def get_response_data(self) -> Dict[str, Any]:
         return self.instance.get_draft()
 
 
-class TemplateTitlesRequestSerializer(
+class TemplateTitlesByWorkflowsSerializer(
     CustomValidationErrorMixin,
     Serializer,
 ):
 
-    with_tasks_in_progress = BooleanField(
-        required=False,
-        allow_null=True,
-        default=None,
-    )
-    workflows_status = ChoiceField(
+    status = ChoiceField(
         choices=WorkflowApiStatus.CHOICES,
         required=False,
         allow_null=False,
     )
 
-    def validate(self, attrs):
-        if (
-            attrs.get('workflows_status') is not None
-            and attrs.get('with_tasks_in_progress') is not None
-        ):
-            raise ValidationError(messages.MSG_PT_0022)
-        return attrs
 
+class TemplateTitlesByTasksSerializer(
+    CustomValidationErrorMixin,
+    Serializer,
+):
 
-class TemplateTitlesEventsRequestSerializer(
+    status = ChoiceField(
+        choices=TaskStatus.CHOICES,
+        required=False,
+        allow_null=False,
+    )
+
+
+class TemplateTitlesByEventsSerializer(
     CustomValidationErrorMixin,
     Serializer,
 ):
@@ -956,4 +954,4 @@ class TemplateTitlesSerializer(Serializer):
 
     id = IntegerField(read_only=True)
     name = CharField(read_only=True)
-    workflows_count = IntegerField(read_only=True)
+    count = IntegerField(read_only=True)

backend/src/processes/serializers/workflows/task.py

@@ -12,7 +12,6 @@
     MSG_PW_0057,
     MSG_PW_0083,
 )
-from src.processes.models.templates.task import TaskTemplate
 from src.processes.models.workflows.task import (
     Task,
     TaskForList,
@@ -191,8 +190,6 @@ class Meta:
             'date_started_tsp',
             'date_completed_tsp',
             'template_id',
-            # TODO Remove in https://my.pneumatic.app/workflows/36988/
-            'template_task_id',
             'template_task_api_name',
             'is_urgent',
             'status',
@@ -213,19 +210,9 @@ class TaskListFilterSerializer(
     search = serializers.CharField(required=False)
     template_id = serializers.IntegerField(required=False)
     template_task_api_name = serializers.CharField(required=False)
-    # TODO Remove in https://my.pneumatic.app/workflows/36988/
-    template_task_id = serializers.IntegerField(required=False)
     limit = serializers.IntegerField(required=False)
     offset = serializers.IntegerField(required=False)
 
-    # TODO Remove in https://my.pneumatic.app/workflows/36988/
-    def validate(self, attrs):
-        if attrs.get('template_task_id') is not None:
-            task = TaskTemplate.objects.get(id=attrs['template_task_id'])
-            attrs['template_task_api_name'] = task.api_name
-        attrs.pop('template_task_id', None)
-        return attrs
-
     def validate_search(self, value: str) -> Optional[str]:
         removed_chars_regex = r'\s\s+'
         clear_text = re.sub(removed_chars_regex, '', value).strip()

backend/src/processes/serializers/workflows/workflow.py

@@ -27,7 +27,6 @@
     WorkflowStatus,
 )
 from src.processes.messages import workflow as messages
-from src.processes.models.templates.task import TaskTemplate
 from src.processes.models.workflows.task import Task
 from src.processes.models.workflows.workflow import Workflow
 from src.processes.paginations import WorkflowListPagination
@@ -429,8 +428,6 @@ class WorkflowListFilterSerializer(
     template_id = serializers.CharField(required=False)
     template_task_api_name = serializers.CharField(required=False)
     fields = serializers.CharField(required=False)
-    # TODO Remove in https://my.pneumatic.app/workflows/36988/
-    template_task_id = serializers.CharField(required=False)
     current_performer = serializers.CharField(required=False)
     current_performer_group_ids = serializers.CharField(required=False)
     workflow_starter = serializers.CharField(required=False)
@@ -464,10 +461,6 @@ def validate_template_task_api_name(self, value):
     def validate_fields(self, value):
         return self.get_valid_list_strings(value)
 
-    # TODO Remove in https://my.pneumatic.app/workflows/36988/
-    def validate_template_task_id(self, value):
-        return self.get_valid_list_integers(value)
-
     def validate_current_performer(self, value):
         return self.get_valid_list_integers(value)
 
@@ -483,15 +476,6 @@ def validate_search(self, value: str) -> str:
         return clear_text if clear_text else None
 
     def validate(self, data):
-        # TODO Remove in https://my.pneumatic.app/workflows/36988/
-        template_task_ids = data.get('template_task_id')
-        if template_task_ids:
-            data['template_task_api_name'] = (
-                TaskTemplate.objects
-                .filter(id__in=template_task_ids)
-                .values_list('api_name', flat=True)
-            )
-        data.pop('template_task_id', None)
         status = data.get('status')
         current_performer = data.get('current_performer')
         current_performer_group_ids = data.get('current_performer_group_ids')